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 b8f41171 2019-02-10 stsp 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;
1124 1338848f 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
1125 1338848f 2019-12-13 stsp if (fd == -1 && errno != ENOENT)
1126 1338848f 2019-12-13 stsp return got_error_from_errno2("open", abspath);
1127 1338848f 2019-12-13 stsp if (fd == -1 || fstat(fd, sb) == -1) {
1128 a378724f 2019-02-10 stsp if (errno == ENOENT) {
1129 abb4604f 2019-07-27 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1130 abb4604f 2019-07-27 stsp *status = GOT_STATUS_MISSING;
1132 abb4604f 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1133 1338848f 2019-12-13 stsp goto done;
1135 1338848f 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
1136 1338848f 2019-12-13 stsp goto done;
1139 339c298e 2019-07-27 stsp if (!S_ISREG(sb->st_mode)) {
1140 339c298e 2019-07-27 stsp *status = GOT_STATUS_OBSTRUCTED;
1141 1338848f 2019-12-13 stsp goto done;
1144 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1145 339c298e 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1146 1338848f 2019-12-13 stsp goto done;
1147 244725f2 2019-08-03 stsp } else if (!got_fileindex_entry_has_blob(ie) &&
1148 244725f2 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
1149 339c298e 2019-07-27 stsp *status = GOT_STATUS_ADD;
1150 1338848f 2019-12-13 stsp goto done;
1153 e2b1e152 2019-07-13 stsp if (!stat_info_differs(ie, sb))
1154 1338848f 2019-12-13 stsp goto done;
1156 c363b2c1 2019-08-03 stsp if (staged_status == GOT_STATUS_MODIFY ||
1157 c363b2c1 2019-08-03 stsp staged_status == GOT_STATUS_ADD)
1158 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1160 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1162 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1164 1338848f 2019-12-13 stsp goto done;
1166 1338848f 2019-12-13 stsp f = fdopen(fd, "r");
1167 6353ad76 2019-02-08 stsp if (f == NULL) {
1168 339c298e 2019-07-27 stsp err = got_error_from_errno2("fopen", abspath);
1169 6353ad76 2019-02-08 stsp goto done;
1172 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1174 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1175 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1177 7154f6ce 2019-03-27 stsp goto done;
1178 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1179 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1180 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1181 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1182 7154f6ce 2019-03-27 stsp goto done;
1184 6353ad76 2019-02-08 stsp if (blen == 0) {
1185 6353ad76 2019-02-08 stsp if (flen != 0)
1186 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1188 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1189 6353ad76 2019-02-08 stsp if (blen != 0)
1190 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1192 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1193 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1194 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1195 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1199 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1202 6353ad76 2019-02-08 stsp hdrlen = 0;
1205 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1206 7154f6ce 2019-03-27 stsp rewind(f);
1207 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1208 1ebedb77 2019-10-19 stsp } else if (xbit_differs(ie, sb->st_mode))
1209 1ebedb77 2019-10-19 stsp *status = GOT_STATUS_MODE_CHANGE;
1212 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1213 43ff8261 2019-12-13 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
1214 f4d199c9 2019-12-13 stsp err = got_error_from_errno2("fclose", abspath);
1215 1338848f 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1216 1338848f 2019-12-13 stsp err = got_error_from_errno2("close", abspath);
1217 9d31a1d8 2018-03-11 stsp return err;
1221 e2b1e152 2019-07-13 stsp * Update timestamps in the file index if a file is unmodified and
1222 e2b1e152 2019-07-13 stsp * we had to run a full content comparison to find out.
1224 e2b1e152 2019-07-13 stsp static const struct got_error *
1225 e2b1e152 2019-07-13 stsp sync_timestamps(char *ondisk_path, unsigned char status,
1226 e2b1e152 2019-07-13 stsp struct got_fileindex_entry *ie, struct stat *sb)
1228 e2b1e152 2019-07-13 stsp if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1229 e2b1e152 2019-07-13 stsp return got_fileindex_entry_update(ie, ondisk_path,
1230 e2b1e152 2019-07-13 stsp ie->blob_sha1, ie->commit_sha1, 1);
1232 e2b1e152 2019-07-13 stsp return NULL;
1235 9d31a1d8 2018-03-11 stsp static const struct got_error *
1236 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1237 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1238 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1239 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1240 0584f854 2019-04-06 stsp void *progress_arg)
1242 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1243 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1244 6353ad76 2019-02-08 stsp char *ondisk_path;
1245 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1246 b8f41171 2019-02-10 stsp struct stat sb;
1248 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1249 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1252 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1253 a76c42e6 2019-08-03 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1254 a76c42e6 2019-08-03 stsp goto done;
1256 abb4604f 2019-07-27 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1258 abb4604f 2019-07-27 stsp goto done;
1259 abb4604f 2019-07-27 stsp if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1260 abb4604f 2019-07-27 stsp sb.st_mode = got_fileindex_perms_to_st(ie);
1262 abb4604f 2019-07-27 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
1264 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1265 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1266 b8f41171 2019-02-10 stsp goto done;
1269 523b8417 2019-10-19 stsp if (ie && status != GOT_STATUS_MISSING &&
1270 523b8417 2019-10-19 stsp (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR)) {
1271 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1272 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1273 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1274 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1276 e2b1e152 2019-07-13 stsp goto done;
1277 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1279 6353ad76 2019-02-08 stsp goto done;
1281 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1282 56e0773d 2019-11-28 stsp memcmp(ie->blob_sha1, te->id.sha1,
1283 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1284 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1285 b8f41171 2019-02-10 stsp goto done;
1289 56e0773d 2019-11-28 stsp err = got_object_open_as_blob(&blob, repo, &te->id, 8192);
1291 6353ad76 2019-02-08 stsp goto done;
1293 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1294 234035bc 2019-06-01 stsp int update_timestamps;
1295 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1296 f69721c3 2019-10-21 stsp char *label_orig = NULL;
1297 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1298 234035bc 2019-06-01 stsp struct got_object_id id2;
1299 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1300 234035bc 2019-06-01 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1302 f69721c3 2019-10-21 stsp goto done;
1304 f69721c3 2019-10-21 stsp if (got_fileindex_entry_has_commit(ie)) {
1305 f69721c3 2019-10-21 stsp char id_str[SHA1_DIGEST_STRING_LENGTH];
1306 f69721c3 2019-10-21 stsp if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
1307 f69721c3 2019-10-21 stsp sizeof(id_str)) == NULL) {
1308 6dd1ece6 2019-11-10 stsp err = got_error_path(id_str,
1309 6dd1ece6 2019-11-10 stsp GOT_ERR_BAD_OBJ_ID_STR);
1310 f69721c3 2019-10-21 stsp goto done;
1312 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
1313 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
1314 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
1315 234035bc 2019-06-01 stsp goto done;
1318 234035bc 2019-06-01 stsp err = merge_blob(&update_timestamps, worktree, blob2,
1319 f69721c3 2019-10-21 stsp ondisk_path, path, sb.st_mode, label_orig, blob,
1320 818c7501 2019-07-11 stsp worktree->base_commit_id, repo,
1321 234035bc 2019-06-01 stsp progress_cb, progress_arg);
1322 f69721c3 2019-10-21 stsp free(label_orig);
1323 234035bc 2019-06-01 stsp if (blob2)
1324 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
1326 909d120e 2019-09-22 stsp goto done;
1328 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
1329 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
1330 234035bc 2019-06-01 stsp * unmodified files again.
1332 234035bc 2019-06-01 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1333 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
1334 234035bc 2019-06-01 stsp update_timestamps);
1335 1ebedb77 2019-10-19 stsp } else if (status == GOT_STATUS_MODE_CHANGE) {
1336 1ebedb77 2019-10-19 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1337 1ebedb77 2019-10-19 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1338 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
1339 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1341 1ee397ad 2019-07-12 stsp goto done;
1342 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1343 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 0);
1345 13d9040b 2019-03-27 stsp goto done;
1347 13d9040b 2019-03-27 stsp err = install_blob(worktree, ondisk_path, path, te->mode,
1348 a129376b 2019-03-28 stsp sb.st_mode, blob, status == GOT_STATUS_MISSING, 0,
1349 a129376b 2019-03-28 stsp repo, progress_cb, progress_arg);
1351 13d9040b 2019-03-27 stsp goto done;
1352 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1353 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 1);
1355 13d9040b 2019-03-27 stsp goto done;
1357 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
1359 6353ad76 2019-02-08 stsp free(ondisk_path);
1360 8da9e5f4 2019-01-12 stsp return err;
1363 90285c3b 2019-01-08 stsp static const struct got_error *
1364 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
1366 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
1367 90285c3b 2019-01-08 stsp char *ondisk_path = NULL;
1369 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
1370 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1372 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
1373 c97665ae 2019-01-13 stsp if (errno != ENOENT)
1374 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
1376 90285c3b 2019-01-08 stsp char *parent = dirname(ondisk_path);
1377 7a9df742 2019-01-08 stsp while (parent && strcmp(parent, root_path) != 0) {
1378 26c4ac4d 2019-01-08 stsp if (rmdir(parent) == -1) {
1379 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
1380 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
1384 90285c3b 2019-01-08 stsp parent = dirname(parent);
1387 90285c3b 2019-01-08 stsp free(ondisk_path);
1388 90285c3b 2019-01-08 stsp return err;
1391 708d8e67 2019-03-27 stsp static const struct got_error *
1392 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
1393 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
1394 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1396 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
1397 708d8e67 2019-03-27 stsp unsigned char status;
1398 708d8e67 2019-03-27 stsp struct stat sb;
1399 708d8e67 2019-03-27 stsp char *ondisk_path;
1401 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
1402 a76c42e6 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1404 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
1406 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1408 708d8e67 2019-03-27 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1410 708d8e67 2019-03-27 stsp return err;
1412 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
1413 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
1414 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
1416 1ee397ad 2019-07-12 stsp return err;
1418 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
1419 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
1421 fc6346c4 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
1424 708d8e67 2019-03-27 stsp return err;
1426 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
1428 1ee397ad 2019-07-12 stsp return err;
1429 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
1430 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
1432 fc6346c4 2019-03-27 stsp return err;
1434 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
1437 fc6346c4 2019-03-27 stsp return err;
1440 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
1441 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
1442 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
1443 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
1444 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
1445 8da9e5f4 2019-01-12 stsp void *progress_arg;
1446 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
1447 8da9e5f4 2019-01-12 stsp void *cancel_arg;
1450 512f0d0e 2019-01-02 stsp static const struct got_error *
1451 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
1452 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
1454 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1456 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1457 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1459 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
1460 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
1463 8da9e5f4 2019-01-12 stsp static const struct got_error *
1464 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, 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 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
1472 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1475 9d31a1d8 2018-03-11 stsp static const struct got_error *
1476 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
1478 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1479 8da9e5f4 2019-01-12 stsp const struct got_error *err;
1480 8da9e5f4 2019-01-12 stsp char *path;
1482 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1483 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1485 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
1486 63c5ca5d 2019-08-24 stsp return NULL;
1488 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
1489 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
1491 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1493 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
1494 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
1496 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
1497 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1499 8da9e5f4 2019-01-12 stsp free(path);
1500 0cd1c46a 2019-03-11 stsp return err;
1503 818c7501 2019-07-11 stsp static const struct got_error *
1504 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
1506 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
1507 0647c563 2019-03-11 stsp char *uuidstr = NULL;
1508 0cd1c46a 2019-03-11 stsp uint32_t uuid_status;
1510 517bab73 2019-03-11 stsp *refname = NULL;
1512 0cd1c46a 2019-03-11 stsp uuid_to_string(&worktree->uuid, &uuidstr, &uuid_status);
1513 0cd1c46a 2019-03-11 stsp if (uuid_status != uuid_s_ok)
1514 cc483380 2019-09-01 stsp return got_error_uuid(uuid_status, "uuid_to_string");
1516 818c7501 2019-07-11 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr)
1518 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1519 0647c563 2019-03-11 stsp *refname = NULL;
1521 517bab73 2019-03-11 stsp free(uuidstr);
1522 517bab73 2019-03-11 stsp return err;
1525 818c7501 2019-07-11 stsp const struct got_error *
1526 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
1528 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
1531 818c7501 2019-07-11 stsp static const struct got_error *
1532 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
1534 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1535 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
1538 818c7501 2019-07-11 stsp static const struct got_error *
1539 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
1541 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
1544 818c7501 2019-07-11 stsp static const struct got_error *
1545 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
1547 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1548 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
1551 818c7501 2019-07-11 stsp static const struct got_error *
1552 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
1554 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1555 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
1558 0ebf8283 2019-07-24 stsp static const struct got_error *
1559 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
1561 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1562 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
1565 0ebf8283 2019-07-24 stsp static const struct got_error *
1566 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
1568 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1569 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
1572 0ebf8283 2019-07-24 stsp static const struct got_error *
1573 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
1575 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1576 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
1579 0ebf8283 2019-07-24 stsp static const struct got_error *
1580 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
1582 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1583 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
1586 0ebf8283 2019-07-24 stsp const struct got_error *
1587 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
1588 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
1590 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
1591 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
1592 0ebf8283 2019-07-24 stsp *path = NULL;
1593 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
1595 0ebf8283 2019-07-24 stsp return NULL;
1599 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
1600 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
1602 517bab73 2019-03-11 stsp static const struct got_error *
1603 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
1605 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
1606 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
1607 517bab73 2019-03-11 stsp char *refname;
1609 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
1611 517bab73 2019-03-11 stsp return err;
1613 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
1615 0cd1c46a 2019-03-11 stsp goto done;
1617 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
1619 0cd1c46a 2019-03-11 stsp free(refname);
1621 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
1622 3e3a69f1 2019-07-25 stsp return err;
1625 3e3a69f1 2019-07-25 stsp static const struct got_error *
1626 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
1628 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
1630 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
1631 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1632 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
1633 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
1635 9d31a1d8 2018-03-11 stsp return err;
1639 ebf99748 2019-05-09 stsp static const struct got_error *
1640 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
1641 4b55f459 2019-09-08 stsp struct got_worktree *worktree)
1643 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
1644 ebf99748 2019-05-09 stsp FILE *index = NULL;
1646 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1647 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
1648 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
1649 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
1651 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
1653 ebf99748 2019-05-09 stsp goto done;
1655 ebf99748 2019-05-09 stsp index = fopen(*fileindex_path, "rb");
1656 ebf99748 2019-05-09 stsp if (index == NULL) {
1657 ebf99748 2019-05-09 stsp if (errno != ENOENT)
1658 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
1660 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
1661 ebf99748 2019-05-09 stsp if (fclose(index) != 0 && err == NULL)
1662 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
1665 ebf99748 2019-05-09 stsp if (err) {
1666 ebf99748 2019-05-09 stsp free(*fileindex_path);
1667 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1668 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
1669 ebf99748 2019-05-09 stsp *fileindex = NULL;
1671 ebf99748 2019-05-09 stsp return err;
1674 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
1675 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
1676 c932eeeb 2019-05-22 stsp const char *path;
1677 c932eeeb 2019-05-22 stsp size_t path_len;
1678 c932eeeb 2019-05-22 stsp const char *entry_name;
1679 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
1680 a484d721 2019-06-10 stsp void *progress_arg;
1683 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
1684 c932eeeb 2019-05-22 stsp static const struct got_error *
1685 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
1687 1ee397ad 2019-07-12 stsp const struct got_error *err;
1688 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
1690 c932eeeb 2019-05-22 stsp if (a->entry_name) {
1691 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
1692 c932eeeb 2019-05-22 stsp return NULL;
1693 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
1694 102ff934 2019-06-11 stsp return NULL;
1696 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
1697 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
1698 c932eeeb 2019-05-22 stsp return NULL;
1700 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
1701 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
1702 edd02c5e 2019-07-11 stsp ie->path);
1704 1ee397ad 2019-07-12 stsp return err;
1706 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
1707 c932eeeb 2019-05-22 stsp return NULL;
1710 9c6338c4 2019-06-02 stsp static const struct got_error *
1711 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
1713 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
1714 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
1715 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
1717 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
1718 9c6338c4 2019-06-02 stsp fileindex_path);
1720 9c6338c4 2019-06-02 stsp goto done;
1722 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
1724 9c6338c4 2019-06-02 stsp goto done;
1726 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
1727 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
1728 9c6338c4 2019-06-02 stsp fileindex_path);
1729 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
1732 9c6338c4 2019-06-02 stsp if (new_index)
1733 9c6338c4 2019-06-02 stsp fclose(new_index);
1734 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
1735 9c6338c4 2019-06-02 stsp return err;
1738 6ced4176 2019-07-12 stsp static const struct got_error *
1739 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
1740 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
1741 6ced4176 2019-07-12 stsp struct got_worktree *worktree, struct got_repository *repo)
1743 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
1744 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
1745 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
1746 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
1748 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
1749 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
1750 6ced4176 2019-07-12 stsp *tree_id = NULL;
1752 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
1753 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
1754 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
1755 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
1756 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1757 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1758 6ced4176 2019-07-12 stsp goto done;
1760 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
1761 6ced4176 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
1763 6ced4176 2019-07-12 stsp goto done;
1764 6ced4176 2019-07-12 stsp return NULL;
1767 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
1769 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
1770 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
1771 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
1772 6ced4176 2019-07-12 stsp goto done;
1775 6ced4176 2019-07-12 stsp err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
1776 6ced4176 2019-07-12 stsp in_repo_path);
1778 6ced4176 2019-07-12 stsp goto done;
1780 6ced4176 2019-07-12 stsp free(in_repo_path);
1781 6ced4176 2019-07-12 stsp in_repo_path = NULL;
1783 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
1785 6ced4176 2019-07-12 stsp goto done;
1787 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
1788 6ced4176 2019-07-12 stsp /* Check out a single file. */
1789 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
1790 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
1791 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
1792 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
1793 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1794 6ced4176 2019-07-12 stsp goto done;
1796 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
1797 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1798 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1799 6ced4176 2019-07-12 stsp goto done;
1802 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
1803 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
1805 6ced4176 2019-07-12 stsp return err;
1806 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
1807 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
1808 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
1809 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
1810 6ced4176 2019-07-12 stsp goto done;
1813 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
1814 6ced4176 2019-07-12 stsp worktree->base_commit_id, in_repo_path);
1816 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
1817 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
1818 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
1819 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
1820 6ced4176 2019-07-12 stsp goto done;
1822 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
1823 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1824 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1825 6ced4176 2019-07-12 stsp goto done;
1830 6ced4176 2019-07-12 stsp free(in_repo_path);
1831 6ced4176 2019-07-12 stsp if (err) {
1832 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
1833 6ced4176 2019-07-12 stsp free(*tree_relpath);
1834 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
1835 6ced4176 2019-07-12 stsp free(*tree_id);
1836 6ced4176 2019-07-12 stsp *tree_id = NULL;
1838 07ed472d 2019-07-12 stsp return err;
1841 07ed472d 2019-07-12 stsp static const struct got_error *
1842 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
1843 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
1844 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1845 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
1847 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
1848 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
1849 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
1850 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
1851 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
1853 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
1855 07ed472d 2019-07-12 stsp goto done;
1857 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
1858 07ed472d 2019-07-12 stsp worktree->base_commit_id);
1860 07ed472d 2019-07-12 stsp goto done;
1862 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1864 07ed472d 2019-07-12 stsp goto done;
1866 07ed472d 2019-07-12 stsp if (entry_name &&
1867 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
1868 07ed472d 2019-07-12 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
1869 07ed472d 2019-07-12 stsp goto done;
1872 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
1873 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
1874 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
1875 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
1876 07ed472d 2019-07-12 stsp arg.worktree = worktree;
1877 07ed472d 2019-07-12 stsp arg.repo = repo;
1878 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
1879 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
1880 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
1881 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
1882 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
1883 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
1886 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
1887 07ed472d 2019-07-12 stsp if (commit)
1888 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
1889 6ced4176 2019-07-12 stsp return err;
1892 9d31a1d8 2018-03-11 stsp const struct got_error *
1893 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
1894 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
1895 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
1896 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
1898 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
1899 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
1900 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
1901 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
1902 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
1903 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
1904 f2ea84fa 2019-07-27 stsp struct tree_path_data {
1905 f2ea84fa 2019-07-27 stsp SIMPLEQ_ENTRY(tree_path_data) entry;
1906 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
1907 f2ea84fa 2019-07-27 stsp int entry_type;
1908 f2ea84fa 2019-07-27 stsp char *relpath;
1909 f2ea84fa 2019-07-27 stsp char *entry_name;
1910 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
1911 f2ea84fa 2019-07-27 stsp SIMPLEQ_HEAD(tree_paths, tree_path_data) tree_paths;
1913 f2ea84fa 2019-07-27 stsp SIMPLEQ_INIT(&tree_paths);
1915 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
1917 9d31a1d8 2018-03-11 stsp return err;
1919 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
1920 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
1921 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
1922 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
1923 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
1924 f2ea84fa 2019-07-27 stsp goto done;
1927 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
1928 f2ea84fa 2019-07-27 stsp &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
1929 f2ea84fa 2019-07-27 stsp if (err) {
1930 f2ea84fa 2019-07-27 stsp free(tpd);
1931 6ced4176 2019-07-12 stsp goto done;
1934 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
1935 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
1936 f2ea84fa 2019-07-27 stsp if (err) {
1937 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
1938 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
1939 f2ea84fa 2019-07-27 stsp free(tpd);
1940 f2ea84fa 2019-07-27 stsp goto done;
1943 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
1945 f2ea84fa 2019-07-27 stsp SIMPLEQ_INSERT_TAIL(&tree_paths, tpd, entry);
1949 51514078 2018-12-25 stsp * Read the file index.
1950 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
1951 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
1953 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
1955 c4cdcb68 2019-04-03 stsp goto done;
1957 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
1958 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
1959 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
1961 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
1962 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
1963 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
1967 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
1968 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
1969 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
1970 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
1971 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
1972 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
1973 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
1974 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
1978 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_NEXT(tpd, entry);
1980 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
1981 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
1982 af12c6b9 2019-06-04 stsp err = sync_err;
1984 9c6338c4 2019-06-02 stsp free(fileindex_path);
1986 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
1987 9d31a1d8 2018-03-11 stsp if (commit)
1988 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
1989 5ade8233 2019-07-12 stsp if (fileindex)
1990 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
1991 f2ea84fa 2019-07-27 stsp while (!SIMPLEQ_EMPTY(&tree_paths)) {
1992 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
1993 f2ea84fa 2019-07-27 stsp SIMPLEQ_REMOVE_HEAD(&tree_paths, entry);
1994 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
1995 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
1996 f2ea84fa 2019-07-27 stsp free(tpd);
1998 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
1999 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
2000 9d31a1d8 2018-03-11 stsp err = unlockerr;
2001 f8d1f275 2019-02-04 stsp return err;
2004 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
2005 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2006 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
2007 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
2008 234035bc 2019-06-01 stsp void *progress_arg;
2009 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2010 234035bc 2019-06-01 stsp void *cancel_arg;
2011 f69721c3 2019-10-21 stsp const char *label_orig;
2012 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
2015 234035bc 2019-06-01 stsp static const struct got_error *
2016 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
2017 234035bc 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
2018 234035bc 2019-06-01 stsp struct got_object_id *id2, const char *path1, const char *path2,
2019 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
2021 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
2022 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
2023 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
2024 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
2025 234035bc 2019-06-01 stsp struct stat sb;
2026 234035bc 2019-06-01 stsp unsigned char status;
2027 234035bc 2019-06-01 stsp int local_changes_subsumed;
2029 234035bc 2019-06-01 stsp if (blob1 && blob2) {
2030 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2031 d6c87207 2019-08-02 stsp strlen(path2));
2032 1ee397ad 2019-07-12 stsp if (ie == NULL)
2033 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2034 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2036 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2037 234035bc 2019-06-01 stsp path2) == -1)
2038 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2040 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2042 234035bc 2019-06-01 stsp goto done;
2044 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2045 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2046 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
2047 234035bc 2019-06-01 stsp goto done;
2049 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2050 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2051 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2052 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2053 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
2054 234035bc 2019-06-01 stsp goto done;
2057 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree, blob1,
2058 f69721c3 2019-10-21 stsp ondisk_path, path2, sb.st_mode, a->label_orig, blob2,
2059 f69721c3 2019-10-21 stsp a->commit_id2, repo, a->progress_cb, a->progress_arg);
2060 234035bc 2019-06-01 stsp } else if (blob1) {
2061 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2062 d6c87207 2019-08-02 stsp strlen(path1));
2063 1ee397ad 2019-07-12 stsp if (ie == NULL)
2064 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2065 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2067 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2068 2b92fad7 2019-06-02 stsp path1) == -1)
2069 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2071 2b92fad7 2019-06-02 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2073 2b92fad7 2019-06-02 stsp goto done;
2075 2b92fad7 2019-06-02 stsp switch (status) {
2076 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2077 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2078 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2080 1ee397ad 2019-07-12 stsp goto done;
2081 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2083 2b92fad7 2019-06-02 stsp goto done;
2085 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2087 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
2088 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
2089 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2090 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2092 1ee397ad 2019-07-12 stsp goto done;
2094 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2096 2b92fad7 2019-06-02 stsp case GOT_STATUS_ADD:
2097 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
2098 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
2099 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2100 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
2102 1ee397ad 2019-07-12 stsp goto done;
2104 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
2105 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
2107 1ee397ad 2019-07-12 stsp goto done;
2112 234035bc 2019-06-01 stsp } else if (blob2) {
2113 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2114 234035bc 2019-06-01 stsp path2) == -1)
2115 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2116 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2117 d6c87207 2019-08-02 stsp strlen(path2));
2119 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
2122 234035bc 2019-06-01 stsp goto done;
2123 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2124 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2125 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2126 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2127 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2128 1ee397ad 2019-07-12 stsp status, path2);
2129 234035bc 2019-06-01 stsp goto done;
2131 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
2132 f69721c3 2019-10-21 stsp NULL, ondisk_path, path2, sb.st_mode,
2133 f69721c3 2019-10-21 stsp a->label_orig, blob2, a->commit_id2, repo,
2134 f69721c3 2019-10-21 stsp a->progress_cb,
2135 f69721c3 2019-10-21 stsp a->progress_arg);
2136 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2137 234035bc 2019-06-01 stsp err = update_blob_fileindex_entry(a->worktree,
2138 234035bc 2019-06-01 stsp a->fileindex, ie, ondisk_path, ie->path,
2139 234035bc 2019-06-01 stsp blob2, 0);
2141 234035bc 2019-06-01 stsp goto done;
2144 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2145 234035bc 2019-06-01 stsp err = install_blob(a->worktree, ondisk_path, path2,
2146 234035bc 2019-06-01 stsp /* XXX get this from parent tree! */
2147 234035bc 2019-06-01 stsp GOT_DEFAULT_FILE_MODE,
2148 234035bc 2019-06-01 stsp sb.st_mode, blob2, 0, 0, repo,
2149 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
2151 234035bc 2019-06-01 stsp goto done;
2152 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_alloc(&ie,
2153 2b92fad7 2019-06-02 stsp ondisk_path, path2, NULL, NULL);
2155 234035bc 2019-06-01 stsp goto done;
2156 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
2157 2b92fad7 2019-06-02 stsp if (err) {
2158 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
2159 2b92fad7 2019-06-02 stsp goto done;
2164 234035bc 2019-06-01 stsp free(ondisk_path);
2165 234035bc 2019-06-01 stsp return err;
2168 234035bc 2019-06-01 stsp struct check_merge_ok_arg {
2169 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2170 234035bc 2019-06-01 stsp struct got_repository *repo;
2173 234035bc 2019-06-01 stsp static const struct got_error *
2174 234035bc 2019-06-01 stsp check_merge_ok(void *arg, struct got_fileindex_entry *ie)
2176 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
2177 234035bc 2019-06-01 stsp struct check_merge_ok_arg *a = arg;
2178 234035bc 2019-06-01 stsp unsigned char status;
2179 234035bc 2019-06-01 stsp struct stat sb;
2180 234035bc 2019-06-01 stsp char *ondisk_path;
2182 234035bc 2019-06-01 stsp /* Reject merges into a work tree with mixed base commits. */
2183 234035bc 2019-06-01 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
2184 234035bc 2019-06-01 stsp SHA1_DIGEST_LENGTH))
2185 234035bc 2019-06-01 stsp return got_error(GOT_ERR_MIXED_COMMITS);
2187 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
2189 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2191 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
2192 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
2194 234035bc 2019-06-01 stsp return err;
2195 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
2196 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
2198 234035bc 2019-06-01 stsp return NULL;
2201 818c7501 2019-07-11 stsp static const struct got_error *
2202 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2203 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
2204 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
2205 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2206 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2208 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
2209 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
2210 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2211 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
2212 f69721c3 2019-10-21 stsp char *label_orig = NULL;
2214 03415a1a 2019-06-02 stsp if (commit_id1) {
2215 f69721c3 2019-10-21 stsp char *id_str;
2217 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
2218 03415a1a 2019-06-02 stsp worktree->path_prefix);
2220 03415a1a 2019-06-02 stsp goto done;
2222 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
2224 03415a1a 2019-06-02 stsp goto done;
2226 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str, commit_id1);
2228 f69721c3 2019-10-21 stsp goto done;
2230 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
2231 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
2232 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
2233 f69721c3 2019-10-21 stsp free(id_str);
2234 f69721c3 2019-10-21 stsp goto done;
2236 f69721c3 2019-10-21 stsp free(id_str);
2239 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
2240 234035bc 2019-06-01 stsp worktree->path_prefix);
2242 234035bc 2019-06-01 stsp goto done;
2244 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
2246 234035bc 2019-06-01 stsp goto done;
2248 234035bc 2019-06-01 stsp arg.worktree = worktree;
2249 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
2250 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
2251 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
2252 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
2253 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
2254 f69721c3 2019-10-21 stsp arg.label_orig = label_orig;
2255 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
2256 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
2257 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2258 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2259 af12c6b9 2019-06-04 stsp err = sync_err;
2261 234035bc 2019-06-01 stsp if (tree1)
2262 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
2263 234035bc 2019-06-01 stsp if (tree2)
2264 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
2265 f69721c3 2019-10-21 stsp free(label_orig);
2266 818c7501 2019-07-11 stsp return err;
2269 818c7501 2019-07-11 stsp const struct got_error *
2270 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
2271 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
2272 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2273 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2275 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
2276 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
2277 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
2278 818c7501 2019-07-11 stsp struct check_merge_ok_arg mok_arg;
2280 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
2282 818c7501 2019-07-11 stsp return err;
2284 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2286 818c7501 2019-07-11 stsp goto done;
2288 818c7501 2019-07-11 stsp mok_arg.worktree = worktree;
2289 818c7501 2019-07-11 stsp mok_arg.repo = repo;
2290 818c7501 2019-07-11 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
2291 818c7501 2019-07-11 stsp &mok_arg);
2293 818c7501 2019-07-11 stsp goto done;
2295 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
2296 818c7501 2019-07-11 stsp commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
2298 818c7501 2019-07-11 stsp if (fileindex)
2299 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
2300 818c7501 2019-07-11 stsp free(fileindex_path);
2301 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2302 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
2303 234035bc 2019-06-01 stsp err = unlockerr;
2304 234035bc 2019-06-01 stsp return err;
2307 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
2308 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
2309 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
2310 927df6b7 2019-02-10 stsp const char *status_path;
2311 927df6b7 2019-02-10 stsp size_t status_path_len;
2312 f8d1f275 2019-02-04 stsp struct got_repository *repo;
2313 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
2314 f8d1f275 2019-02-04 stsp void *status_arg;
2315 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2316 f8d1f275 2019-02-04 stsp void *cancel_arg;
2317 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
2318 6841da00 2019-08-08 stsp struct got_pathlist_head ignores;
2319 f2a9dc41 2019-12-13 tracey int report_unchanged;
2322 f8d1f275 2019-02-04 stsp static const struct got_error *
2323 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
2324 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
2325 f2a9dc41 2019-12-13 tracey struct got_repository *repo, int report_unchanged)
2327 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
2328 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
2329 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
2330 927df6b7 2019-02-10 stsp struct stat sb;
2331 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
2332 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
2333 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
2335 927df6b7 2019-02-10 stsp err = get_file_status(&status, &sb, ie, abspath, repo);
2337 98eaaa12 2019-08-03 stsp return err;
2339 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
2340 f2a9dc41 2019-12-13 tracey staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
2341 98eaaa12 2019-08-03 stsp return NULL;
2343 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_blob(ie)) {
2344 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2345 98eaaa12 2019-08-03 stsp blob_idp = &blob_id;
2347 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
2348 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2349 98eaaa12 2019-08-03 stsp commit_idp = &commit_id;
2351 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
2352 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
2353 98eaaa12 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
2354 98eaaa12 2019-08-03 stsp SHA1_DIGEST_LENGTH);
2355 98eaaa12 2019-08-03 stsp staged_blob_idp = &staged_blob_id;
2358 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
2359 98eaaa12 2019-08-03 stsp ie->path, blob_idp, staged_blob_idp, commit_idp);
2362 927df6b7 2019-02-10 stsp static const struct got_error *
2363 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
2364 f8d1f275 2019-02-04 stsp struct dirent *de, const char *parent_path)
2366 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2367 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2368 f8d1f275 2019-02-04 stsp char *abspath;
2370 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2371 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2373 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
2374 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
2375 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
2376 927df6b7 2019-02-10 stsp return NULL;
2378 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2379 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
2380 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
2381 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2383 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
2384 f8d1f275 2019-02-04 stsp de->d_name) == -1)
2385 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2388 927df6b7 2019-02-10 stsp err = report_file_status(ie, abspath, a->status_cb, a->status_arg,
2389 f2a9dc41 2019-12-13 tracey a->repo, a->report_unchanged);
2390 f8d1f275 2019-02-04 stsp free(abspath);
2391 9d31a1d8 2018-03-11 stsp return err;
2394 f8d1f275 2019-02-04 stsp static const struct got_error *
2395 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2397 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2398 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
2399 2ec1f75b 2019-03-26 stsp unsigned char status;
2401 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2402 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2404 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
2405 927df6b7 2019-02-10 stsp return NULL;
2407 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2408 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2409 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
2410 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
2412 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
2413 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
2414 537ac44b 2019-08-03 stsp ie->path, &blob_id, NULL, &commit_id);
2418 6841da00 2019-08-08 stsp free_ignorelist(struct got_pathlist_head *ignorelist)
2420 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2422 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignorelist, entry)
2423 6841da00 2019-08-08 stsp free((char *)pe->path);
2424 6841da00 2019-08-08 stsp got_pathlist_free(ignorelist);
2428 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
2430 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2432 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
2433 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
2434 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
2435 6841da00 2019-08-08 stsp free((char *)pe->path);
2437 6841da00 2019-08-08 stsp got_pathlist_free(ignores);
2440 6841da00 2019-08-08 stsp static const struct got_error *
2441 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
2443 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
2444 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
2445 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
2446 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
2447 6841da00 2019-08-08 stsp size_t linesize = 0;
2448 6841da00 2019-08-08 stsp ssize_t linelen;
2450 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
2451 6841da00 2019-08-08 stsp if (ignorelist == NULL)
2452 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
2453 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
2455 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
2456 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
2457 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
2459 bd8de430 2019-10-04 stsp /* Git's ignores may contain comments. */
2460 bd8de430 2019-10-04 stsp if (line[0] == '#')
2463 bd8de430 2019-10-04 stsp /* Git's negated patterns are not (yet?) supported. */
2464 bd8de430 2019-10-04 stsp if (line[0] == '!')
2467 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
2468 6841da00 2019-08-08 stsp line) == -1) {
2469 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
2470 6841da00 2019-08-08 stsp goto done;
2472 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
2474 6841da00 2019-08-08 stsp goto done;
2476 6841da00 2019-08-08 stsp if (ferror(f)) {
2477 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
2478 6841da00 2019-08-08 stsp goto done;
2481 6841da00 2019-08-08 stsp dirpath = strdup(path);
2482 6841da00 2019-08-08 stsp if (dirpath == NULL) {
2483 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
2484 6841da00 2019-08-08 stsp goto done;
2486 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
2488 6841da00 2019-08-08 stsp free(line);
2489 6841da00 2019-08-08 stsp if (err || pe == NULL) {
2490 6841da00 2019-08-08 stsp free(dirpath);
2491 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
2493 6841da00 2019-08-08 stsp return err;
2497 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
2499 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2501 bd8de430 2019-10-04 stsp /* Handle patterns which match in all directories. */
2502 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pe, ignores, entry) {
2503 bd8de430 2019-10-04 stsp struct got_pathlist_head *ignorelist = pe->data;
2504 bd8de430 2019-10-04 stsp struct got_pathlist_entry *pi;
2506 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
2507 bd8de430 2019-10-04 stsp const char *p, *pattern = pi->path;
2509 bd8de430 2019-10-04 stsp if (strncmp(pattern, "**/", 3) != 0)
2511 bd8de430 2019-10-04 stsp pattern += 3;
2513 bd8de430 2019-10-04 stsp while (*p) {
2514 bd8de430 2019-10-04 stsp if (fnmatch(pattern, p,
2515 bd8de430 2019-10-04 stsp FNM_PATHNAME | FNM_LEADING_DIR)) {
2516 bd8de430 2019-10-04 stsp /* Retry in next directory. */
2517 bd8de430 2019-10-04 stsp while (*p && *p != '/')
2519 bd8de430 2019-10-04 stsp while (*p == '/')
2529 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
2530 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
2531 6841da00 2019-08-08 stsp * ignores backwards.
2533 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
2534 6841da00 2019-08-08 stsp while (pe) {
2535 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
2536 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
2537 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
2538 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
2539 bd8de430 2019-10-04 stsp const char *pattern = pi->path;
2540 bd8de430 2019-10-04 stsp int flags = FNM_LEADING_DIR;
2541 bd8de430 2019-10-04 stsp if (strstr(pattern, "/**/") == NULL)
2542 bd8de430 2019-10-04 stsp flags |= FNM_PATHNAME;
2543 bd8de430 2019-10-04 stsp if (fnmatch(pattern, path, flags))
2548 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
2554 6841da00 2019-08-08 stsp static const struct got_error *
2555 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
2556 bd8de430 2019-10-04 stsp const char *path, const char *ignores_filename)
2558 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
2559 6841da00 2019-08-08 stsp char *ignorespath;
2560 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
2562 bd8de430 2019-10-04 stsp if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
2563 bd8de430 2019-10-04 stsp path[0] ? "/" : "", ignores_filename) == -1)
2564 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
2566 6841da00 2019-08-08 stsp ignoresfile = fopen(ignorespath, "r");
2567 6841da00 2019-08-08 stsp if (ignoresfile == NULL) {
2568 40b289d7 2019-09-07 stsp if (errno != ENOENT && errno != EACCES)
2569 6841da00 2019-08-08 stsp err = got_error_from_errno2("fopen",
2570 6841da00 2019-08-08 stsp ignorespath);
2572 6841da00 2019-08-08 stsp err = read_ignores(ignores, path, ignoresfile);
2574 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
2575 4e68cba3 2019-11-23 stsp err = got_error_from_errno2("fclose", path);
2576 6841da00 2019-08-08 stsp free(ignorespath);
2577 6841da00 2019-08-08 stsp return err;
2580 f8d1f275 2019-02-04 stsp static const struct got_error *
2581 f8d1f275 2019-02-04 stsp status_new(void *arg, struct dirent *de, const char *parent_path)
2583 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
2584 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2585 f8d1f275 2019-02-04 stsp char *path = NULL;
2587 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2588 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2590 2c201a36 2019-02-10 stsp /* XXX ignore symlinks for now */
2591 2c201a36 2019-02-10 stsp if (de->d_type == DT_LNK)
2592 927df6b7 2019-02-10 stsp return NULL;
2594 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2595 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
2596 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2598 f8d1f275 2019-02-04 stsp path = de->d_name;
2601 bd8de430 2019-10-04 stsp if (de->d_type == DT_DIR) {
2602 bd8de430 2019-10-04 stsp err = add_ignores(&a->ignores, a->worktree->root_path, path,
2603 bd8de430 2019-10-04 stsp ".cvsignore");
2604 bd8de430 2019-10-04 stsp if (err == NULL)
2605 bd8de430 2019-10-04 stsp err = add_ignores(&a->ignores, a->worktree->root_path,
2606 bd8de430 2019-10-04 stsp path, ".gitignore");
2608 6841da00 2019-08-08 stsp else if (got_path_is_child(path, a->status_path, a->status_path_len)
2609 6841da00 2019-08-08 stsp && !match_ignores(&a->ignores, path))
2610 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
2611 537ac44b 2019-08-03 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL);
2612 f8d1f275 2019-02-04 stsp if (parent_path[0])
2613 f8d1f275 2019-02-04 stsp free(path);
2614 b72f483a 2019-02-05 stsp return err;
2617 347d1d3e 2019-07-12 stsp static const struct got_error *
2618 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
2619 abb4604f 2019-07-27 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
2620 f2a9dc41 2019-12-13 tracey void *status_arg, struct got_repository *repo, int report_unchanged)
2622 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
2623 abb4604f 2019-07-27 stsp struct stat sb;
2625 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
2627 abb4604f 2019-07-27 stsp return report_file_status(ie, ondisk_path, status_cb,
2628 f2a9dc41 2019-12-13 tracey status_arg, repo, report_unchanged);
2630 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
2631 abb4604f 2019-07-27 stsp if (errno != ENOENT)
2632 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
2633 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
2634 2a06fe5f 2019-08-24 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL);
2635 abb4604f 2019-07-27 stsp return NULL;
2638 abb4604f 2019-07-27 stsp if (S_ISREG(sb.st_mode))
2639 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
2640 537ac44b 2019-08-03 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL);
2642 abb4604f 2019-07-27 stsp return NULL;
2645 abb4604f 2019-07-27 stsp static const struct got_error *
2646 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
2647 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
2648 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
2649 f2a9dc41 2019-12-13 tracey got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
2650 f2a9dc41 2019-12-13 tracey int report_unchanged)
2652 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2653 f8d1f275 2019-02-04 stsp DIR *workdir = NULL;
2654 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
2655 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
2656 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
2658 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
2659 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
2660 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
2662 927df6b7 2019-02-10 stsp workdir = opendir(ondisk_path);
2663 927df6b7 2019-02-10 stsp if (workdir == NULL) {
2664 40b289d7 2019-09-07 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES)
2665 638f9024 2019-05-13 stsp err = got_error_from_errno2("opendir", ondisk_path);
2667 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
2668 f2a9dc41 2019-12-13 tracey fileindex, status_cb, status_arg, repo,
2669 f2a9dc41 2019-12-13 tracey report_unchanged);
2671 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
2672 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
2673 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
2674 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
2675 abb4604f 2019-07-27 stsp arg.worktree = worktree;
2676 abb4604f 2019-07-27 stsp arg.status_path = path;
2677 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
2678 abb4604f 2019-07-27 stsp arg.repo = repo;
2679 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
2680 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
2681 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
2682 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
2683 f2a9dc41 2019-12-13 tracey arg.report_unchanged = report_unchanged;
2684 6841da00 2019-08-08 stsp TAILQ_INIT(&arg.ignores);
2685 022fae89 2019-12-06 tracey if (!no_ignores) {
2686 bd8de430 2019-10-04 stsp err = add_ignores(&arg.ignores, worktree->root_path,
2687 022fae89 2019-12-06 tracey path, ".cvsignore");
2688 022fae89 2019-12-06 tracey if (err == NULL)
2689 022fae89 2019-12-06 tracey err = add_ignores(&arg.ignores,
2690 022fae89 2019-12-06 tracey worktree->root_path, path, ".gitignore");
2692 bd8de430 2019-10-04 stsp if (err == NULL)
2693 6841da00 2019-08-08 stsp err = got_fileindex_diff_dir(fileindex, workdir,
2694 6841da00 2019-08-08 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
2695 6841da00 2019-08-08 stsp free_ignores(&arg.ignores);
2698 f8d1f275 2019-02-04 stsp if (workdir)
2699 f8d1f275 2019-02-04 stsp closedir(workdir);
2700 927df6b7 2019-02-10 stsp free(ondisk_path);
2701 347d1d3e 2019-07-12 stsp return err;
2704 347d1d3e 2019-07-12 stsp const struct got_error *
2705 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
2706 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2707 72ea6654 2019-07-27 stsp got_worktree_status_cb status_cb, void *status_arg,
2708 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2710 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
2711 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
2712 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
2713 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
2715 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2717 347d1d3e 2019-07-12 stsp return err;
2719 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2720 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
2721 f2a9dc41 2019-12-13 tracey status_cb, status_arg, cancel_cb, cancel_arg, 0, 0);
2725 f8d1f275 2019-02-04 stsp free(fileindex_path);
2726 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
2727 f8d1f275 2019-02-04 stsp return err;
2730 6c7ab921 2019-03-18 stsp const struct got_error *
2731 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
2732 6c7ab921 2019-03-18 stsp const char *arg)
2734 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
2735 d0710d08 2019-07-22 stsp char *resolved, *cwd = NULL, *path = NULL;
2736 6c7ab921 2019-03-18 stsp size_t len;
2738 6c7ab921 2019-03-18 stsp *wt_path = NULL;
2740 6c7ab921 2019-03-18 stsp resolved = realpath(arg, NULL);
2741 d0710d08 2019-07-22 stsp if (resolved == NULL) {
2742 d0710d08 2019-07-22 stsp if (errno != ENOENT)
2743 d0710d08 2019-07-22 stsp return got_error_from_errno2("realpath", arg);
2744 d0710d08 2019-07-22 stsp cwd = getcwd(NULL, 0);
2745 d0710d08 2019-07-22 stsp if (cwd == NULL)
2746 d0710d08 2019-07-22 stsp return got_error_from_errno("getcwd");
2747 d0710d08 2019-07-22 stsp if (asprintf(&resolved, "%s/%s", cwd, arg) == -1) {
2748 d0710d08 2019-07-22 stsp err = got_error_from_errno("asprintf");
2749 d0710d08 2019-07-22 stsp goto done;
2753 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
2754 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
2755 6c7ab921 2019-03-18 stsp err = got_error(GOT_ERR_BAD_PATH);
2756 6c7ab921 2019-03-18 stsp goto done;
2759 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
2760 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
2761 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
2763 f6d88e1a 2019-05-29 stsp goto done;
2765 f6d88e1a 2019-05-29 stsp path = strdup("");
2766 f6d88e1a 2019-05-29 stsp if (path == NULL) {
2767 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
2768 f6d88e1a 2019-05-29 stsp goto done;
2772 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
2773 6c7ab921 2019-03-18 stsp len = strlen(path);
2774 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
2775 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
2779 6c7ab921 2019-03-18 stsp free(resolved);
2780 d0710d08 2019-07-22 stsp free(cwd);
2781 6c7ab921 2019-03-18 stsp if (err == NULL)
2782 6c7ab921 2019-03-18 stsp *wt_path = path;
2784 6c7ab921 2019-03-18 stsp free(path);
2785 d00136be 2019-03-26 stsp return err;
2788 4e68cba3 2019-11-23 stsp struct schedule_addition_args {
2789 4e68cba3 2019-11-23 stsp struct got_worktree *worktree;
2790 4e68cba3 2019-11-23 stsp struct got_fileindex *fileindex;
2791 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb;
2792 4e68cba3 2019-11-23 stsp void *progress_arg;
2793 4e68cba3 2019-11-23 stsp struct got_repository *repo;
2796 4e68cba3 2019-11-23 stsp static const struct got_error *
2797 4e68cba3 2019-11-23 stsp schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
2798 4e68cba3 2019-11-23 stsp const char *relpath, struct got_object_id *blob_id,
2799 4e68cba3 2019-11-23 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
2801 4e68cba3 2019-11-23 stsp struct schedule_addition_args *a = arg;
2802 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
2803 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
2804 6d022e97 2019-08-04 stsp struct stat sb;
2805 dbb83fbd 2019-12-12 stsp char *ondisk_path;
2807 dbb83fbd 2019-12-12 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2808 dbb83fbd 2019-12-12 stsp relpath) == -1)
2809 dbb83fbd 2019-12-12 stsp return got_error_from_errno("asprintf");
2811 4e68cba3 2019-11-23 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
2813 dbb83fbd 2019-12-12 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
2816 dbb83fbd 2019-12-12 stsp goto done;
2817 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
2818 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
2819 dbb83fbd 2019-12-12 stsp goto done;
2820 dbb83fbd 2019-12-12 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
2822 dbb83fbd 2019-12-12 stsp goto done;
2825 dbb83fbd 2019-12-12 stsp if (status != GOT_STATUS_UNVERSIONED) {
2826 dbb83fbd 2019-12-12 stsp err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
2827 dbb83fbd 2019-12-12 stsp goto done;
2830 dbb83fbd 2019-12-12 stsp err = got_fileindex_entry_alloc(&ie, ondisk_path, relpath, NULL, NULL);
2832 4e68cba3 2019-11-23 stsp goto done;
2834 4e68cba3 2019-11-23 stsp err = got_fileindex_entry_add(a->fileindex, ie);
2835 07f5b47a 2019-06-02 stsp if (err) {
2836 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
2837 4e68cba3 2019-11-23 stsp goto done;
2840 dbb83fbd 2019-12-12 stsp free(ondisk_path);
2842 dbb83fbd 2019-12-12 stsp return err;
2843 dbb83fbd 2019-12-12 stsp if (status == GOT_STATUS_ADD)
2844 dbb83fbd 2019-12-12 stsp return NULL;
2845 dbb83fbd 2019-12-12 stsp return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
2848 d00136be 2019-03-26 stsp const struct got_error *
2849 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
2850 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
2851 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2852 022fae89 2019-12-06 tracey struct got_repository *repo, int no_ignores)
2854 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
2855 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2856 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2857 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
2858 4e68cba3 2019-11-23 stsp struct schedule_addition_args saa;
2860 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
2862 d00136be 2019-03-26 stsp return err;
2864 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2866 d00136be 2019-03-26 stsp goto done;
2868 4e68cba3 2019-11-23 stsp saa.worktree = worktree;
2869 4e68cba3 2019-11-23 stsp saa.fileindex = fileindex;
2870 4e68cba3 2019-11-23 stsp saa.progress_cb = progress_cb;
2871 4e68cba3 2019-11-23 stsp saa.progress_arg = progress_arg;
2872 4e68cba3 2019-11-23 stsp saa.repo = repo;
2874 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
2875 4e68cba3 2019-11-23 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
2876 f2a9dc41 2019-12-13 tracey schedule_addition, &saa, NULL, NULL, no_ignores, 0);
2880 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2881 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2882 af12c6b9 2019-06-04 stsp err = sync_err;
2884 fb399478 2019-07-12 stsp free(fileindex_path);
2885 d00136be 2019-03-26 stsp if (fileindex)
2886 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
2887 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2888 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
2889 d00136be 2019-03-26 stsp err = unlockerr;
2890 6c7ab921 2019-03-18 stsp return err;
2893 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args {
2894 f2a9dc41 2019-12-13 tracey struct got_worktree *worktree;
2895 f2a9dc41 2019-12-13 tracey struct got_fileindex *fileindex;
2896 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb;
2897 f2a9dc41 2019-12-13 tracey void *progress_arg;
2898 f2a9dc41 2019-12-13 tracey struct got_repository *repo;
2899 f2a9dc41 2019-12-13 tracey int delete_local_mods;
2902 f2a9dc41 2019-12-13 tracey static const struct got_error *
2903 f2a9dc41 2019-12-13 tracey schedule_for_deletion(void *arg, unsigned char status,
2904 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *relpath,
2905 f2a9dc41 2019-12-13 tracey struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
2906 f2a9dc41 2019-12-13 tracey struct got_object_id *commit_id)
2908 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args *a = arg;
2909 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
2910 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
2911 17ed4618 2019-06-02 stsp struct stat sb;
2912 f2a9dc41 2019-12-13 tracey char *ondisk_path;
2914 f2a9dc41 2019-12-13 tracey ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
2915 17ed4618 2019-06-02 stsp if (ie == NULL)
2916 17ed4618 2019-06-02 stsp return got_error(GOT_ERR_BAD_PATH);
2918 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
2919 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
2920 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
2921 9acbc4fa 2019-08-03 stsp return NULL;
2922 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
2925 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2926 f2a9dc41 2019-12-13 tracey relpath) == -1)
2927 f2a9dc41 2019-12-13 tracey return got_error_from_errno("asprintf");
2929 f2a9dc41 2019-12-13 tracey err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
2931 f2a9dc41 2019-12-13 tracey goto done;
2933 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
2934 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
2935 f2a9dc41 2019-12-13 tracey goto done;
2936 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
2937 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
2938 f2a9dc41 2019-12-13 tracey goto done;
2940 f2a9dc41 2019-12-13 tracey if (status != GOT_STATUS_MODIFY &&
2941 f2a9dc41 2019-12-13 tracey status != GOT_STATUS_MISSING) {
2942 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
2943 f2a9dc41 2019-12-13 tracey goto done;
2947 f2a9dc41 2019-12-13 tracey if (status != GOT_STATUS_MISSING && unlink(ondisk_path) != 0) {
2948 f2a9dc41 2019-12-13 tracey err = got_error_from_errno2("unlink", ondisk_path);
2949 f2a9dc41 2019-12-13 tracey goto done;
2952 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2954 f2a9dc41 2019-12-13 tracey free(ondisk_path);
2955 f2a9dc41 2019-12-13 tracey if (err)
2956 f2a9dc41 2019-12-13 tracey return err;
2957 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_DELETE)
2958 f2a9dc41 2019-12-13 tracey return NULL;
2959 f2a9dc41 2019-12-13 tracey return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
2960 f2a9dc41 2019-12-13 tracey staged_status, relpath);
2963 2ec1f75b 2019-03-26 stsp const struct got_error *
2964 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
2965 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
2966 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb, void *progress_arg,
2967 2ec1f75b 2019-03-26 stsp struct got_repository *repo)
2969 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
2970 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
2971 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2972 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
2973 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args sda;
2975 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
2977 2ec1f75b 2019-03-26 stsp return err;
2979 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2981 2ec1f75b 2019-03-26 stsp goto done;
2983 f2a9dc41 2019-12-13 tracey sda.worktree = worktree;
2984 f2a9dc41 2019-12-13 tracey sda.fileindex = fileindex;
2985 f2a9dc41 2019-12-13 tracey sda.progress_cb = progress_cb;
2986 f2a9dc41 2019-12-13 tracey sda.progress_arg = progress_arg;
2987 f2a9dc41 2019-12-13 tracey sda.repo = repo;
2988 f2a9dc41 2019-12-13 tracey sda.delete_local_mods = delete_local_mods;
2990 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
2991 f2a9dc41 2019-12-13 tracey err = worktree_status(worktree, pe->path, fileindex, repo,
2992 f2a9dc41 2019-12-13 tracey schedule_for_deletion, &sda, NULL, NULL, 0, 1);
2996 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2997 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2998 af12c6b9 2019-06-04 stsp err = sync_err;
3000 fb399478 2019-07-12 stsp free(fileindex_path);
3001 2ec1f75b 2019-03-26 stsp if (fileindex)
3002 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
3003 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3004 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
3005 2ec1f75b 2019-03-26 stsp err = unlockerr;
3006 33aa809d 2019-08-08 stsp return err;
3009 33aa809d 2019-08-08 stsp static const struct got_error *
3010 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
3012 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
3013 33aa809d 2019-08-08 stsp char *line = NULL;
3014 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
3015 33aa809d 2019-08-08 stsp ssize_t linelen;
3017 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
3018 33aa809d 2019-08-08 stsp if (linelen == -1) {
3019 33aa809d 2019-08-08 stsp if (ferror(infile)) {
3020 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
3021 33aa809d 2019-08-08 stsp goto done;
3023 33aa809d 2019-08-08 stsp return NULL;
3025 33aa809d 2019-08-08 stsp if (outfile) {
3026 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
3027 33aa809d 2019-08-08 stsp if (n != linelen) {
3028 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
3029 33aa809d 2019-08-08 stsp goto done;
3032 33aa809d 2019-08-08 stsp if (rejectfile) {
3033 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
3034 33aa809d 2019-08-08 stsp if (n != linelen)
3035 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
3038 33aa809d 2019-08-08 stsp free(line);
3039 2ec1f75b 2019-03-26 stsp return err;
3042 33aa809d 2019-08-08 stsp static const struct got_error *
3043 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
3045 33aa809d 2019-08-08 stsp char *line = NULL;
3046 33aa809d 2019-08-08 stsp size_t linesize = 0;
3047 33aa809d 2019-08-08 stsp ssize_t linelen;
3049 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
3050 500467ff 2019-09-25 hiltjo if (linelen == -1) {
3051 500467ff 2019-09-25 hiltjo if (ferror(f))
3052 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
3053 500467ff 2019-09-25 hiltjo return NULL;
3055 33aa809d 2019-08-08 stsp free(line);
3056 33aa809d 2019-08-08 stsp return NULL;
3059 33aa809d 2019-08-08 stsp static const struct got_error *
3060 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
3061 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
3062 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
3064 33aa809d 2019-08-08 stsp const struct got_error *err;
3066 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
3067 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
3068 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
3070 33aa809d 2019-08-08 stsp return err;
3071 33aa809d 2019-08-08 stsp (*line_cur1)++;
3073 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
3074 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
3075 33aa809d 2019-08-08 stsp if (rejectfile)
3076 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
3078 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
3080 33aa809d 2019-08-08 stsp return err;
3081 33aa809d 2019-08-08 stsp (*line_cur2)++;
3083 33aa809d 2019-08-08 stsp /* Copy patched lines. */
3084 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
3085 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
3087 33aa809d 2019-08-08 stsp return err;
3088 33aa809d 2019-08-08 stsp (*line_cur2)++;
3090 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
3091 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
3092 33aa809d 2019-08-08 stsp if (rejectfile)
3093 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
3095 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
3097 33aa809d 2019-08-08 stsp return err;
3098 33aa809d 2019-08-08 stsp (*line_cur1)++;
3101 f1e81a05 2019-08-10 stsp return NULL;
3104 f1e81a05 2019-08-10 stsp static const struct got_error *
3105 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
3106 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
3108 f1e81a05 2019-08-10 stsp const struct got_error *err;
3110 f1e81a05 2019-08-10 stsp if (outfile) {
3111 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
3112 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
3113 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
3115 f1e81a05 2019-08-10 stsp return err;
3116 f1e81a05 2019-08-10 stsp (*line_cur1)++;
3119 f1e81a05 2019-08-10 stsp if (rejectfile) {
3120 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
3121 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
3122 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
3124 f1e81a05 2019-08-10 stsp return err;
3125 f1e81a05 2019-08-10 stsp (*line_cur2)++;
3129 33aa809d 2019-08-08 stsp return NULL;
3132 33aa809d 2019-08-08 stsp static const struct got_error *
3133 33aa809d 2019-08-08 stsp apply_or_reject_change(int *choice, struct got_diff_change *change, int n,
3134 33aa809d 2019-08-08 stsp int nchanges, struct got_diff_state *ds, struct got_diff_args *args,
3135 33aa809d 2019-08-08 stsp int diff_flags, const char *relpath, FILE *f1, FILE *f2, int *line_cur1,
3136 33aa809d 2019-08-08 stsp int *line_cur2, FILE *outfile, FILE *rejectfile,
3137 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
3139 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
3140 33aa809d 2019-08-08 stsp int start_old = change->cv.a;
3141 33aa809d 2019-08-08 stsp int end_old = change->cv.b;
3142 33aa809d 2019-08-08 stsp int start_new = change->cv.c;
3143 33aa809d 2019-08-08 stsp int end_new = change->cv.d;
3144 33aa809d 2019-08-08 stsp long pos1, pos2;
3145 33aa809d 2019-08-08 stsp FILE *hunkfile;
3147 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
3149 33aa809d 2019-08-08 stsp hunkfile = got_opentemp();
3150 33aa809d 2019-08-08 stsp if (hunkfile == NULL)
3151 33aa809d 2019-08-08 stsp return got_error_from_errno("got_opentemp");
3153 33aa809d 2019-08-08 stsp pos1 = ftell(f1);
3154 33aa809d 2019-08-08 stsp pos2 = ftell(f2);
3156 33aa809d 2019-08-08 stsp /* XXX TODO needs error checking */
3157 33aa809d 2019-08-08 stsp got_diff_dump_change(hunkfile, change, ds, args, f1, f2, diff_flags);
3159 33aa809d 2019-08-08 stsp if (fseek(f1, pos1, SEEK_SET) == -1) {
3160 33aa809d 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
3161 33aa809d 2019-08-08 stsp goto done;
3163 33aa809d 2019-08-08 stsp if (fseek(f2, pos2, SEEK_SET) == -1) {
3164 33aa809d 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
3165 33aa809d 2019-08-08 stsp goto done;
3167 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
3168 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
3169 33aa809d 2019-08-08 stsp goto done;
3172 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
3173 33aa809d 2019-08-08 stsp hunkfile, n, nchanges);
3175 33aa809d 2019-08-08 stsp goto done;
3177 33aa809d 2019-08-08 stsp switch (*choice) {
3178 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
3179 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
3180 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
3182 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
3183 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
3184 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
3186 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
3189 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
3193 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
3194 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
3195 33aa809d 2019-08-08 stsp return err;
3198 1f1abb7e 2019-08-08 stsp struct revert_file_args {
3199 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
3200 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
3201 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
3202 1f1abb7e 2019-08-08 stsp void *progress_arg;
3203 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
3204 33aa809d 2019-08-08 stsp void *patch_arg;
3205 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
3208 e20a8b6f 2019-06-04 stsp static const struct got_error *
3209 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
3210 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
3211 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
3212 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
3214 33aa809d 2019-08-08 stsp const struct got_error *err;
3215 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
3216 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
3217 1ebedb77 2019-10-19 stsp int fd2 = -1;
3218 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
3219 33aa809d 2019-08-08 stsp struct stat sb1, sb2;
3220 33aa809d 2019-08-08 stsp struct got_diff_changes *changes = NULL;
3221 33aa809d 2019-08-08 stsp struct got_diff_state *ds = NULL;
3222 33aa809d 2019-08-08 stsp struct got_diff_args *args = NULL;
3223 33aa809d 2019-08-08 stsp struct got_diff_change *change;
3224 33aa809d 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, have_content = 0;
3225 33aa809d 2019-08-08 stsp int n = 0;
3227 33aa809d 2019-08-08 stsp *path_outfile = NULL;
3229 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
3231 33aa809d 2019-08-08 stsp return err;
3233 1ebedb77 2019-10-19 stsp fd2 = open(path2, O_RDONLY | O_NOFOLLOW);
3234 1ebedb77 2019-10-19 stsp if (fd2 == -1) {
3235 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("open", path2);
3236 1ebedb77 2019-10-19 stsp goto done;
3238 1ebedb77 2019-10-19 stsp if (fstat(fd2, &sb2) == -1) {
3239 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("fstat", path2);
3240 1ebedb77 2019-10-19 stsp goto done;
3243 1ebedb77 2019-10-19 stsp f2 = fdopen(fd2, "r");
3244 33aa809d 2019-08-08 stsp if (f2 == NULL) {
3245 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fopen", path2);
3246 33aa809d 2019-08-08 stsp goto done;
3250 33aa809d 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
3252 33aa809d 2019-08-08 stsp goto done;
3254 e635744c 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob");
3256 33aa809d 2019-08-08 stsp goto done;
3258 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
3260 33aa809d 2019-08-08 stsp goto done;
3262 33aa809d 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
3263 33aa809d 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
3264 33aa809d 2019-08-08 stsp goto done;
3267 33aa809d 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
3268 33aa809d 2019-08-08 stsp f1, sb1.st_size, id_str, f2, sb2.st_size, path2, 3, NULL);
3270 33aa809d 2019-08-08 stsp goto done;
3272 e635744c 2019-08-08 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
3274 33aa809d 2019-08-08 stsp goto done;
3276 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
3277 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
3278 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
3279 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
3280 33aa809d 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
3281 33aa809d 2019-08-08 stsp int choice;
3282 33aa809d 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
3283 33aa809d 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
3284 33aa809d 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
3285 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
3286 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
3287 e635744c 2019-08-08 stsp patch_cb, patch_arg);
3289 33aa809d 2019-08-08 stsp goto done;
3290 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
3291 33aa809d 2019-08-08 stsp have_content = 1;
3292 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
3295 1ebedb77 2019-10-19 stsp if (have_content) {
3296 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
3297 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
3298 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
3300 1ebedb77 2019-10-19 stsp goto done;
3302 1ebedb77 2019-10-19 stsp if (chmod(*path_outfile, sb2.st_mode) == -1) {
3303 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("chmod", path2);
3304 1ebedb77 2019-10-19 stsp goto done;
3308 33aa809d 2019-08-08 stsp free(id_str);
3310 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
3311 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
3312 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
3313 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
3314 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
3315 1ebedb77 2019-10-19 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3316 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("close", path2);
3317 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
3318 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
3319 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
3320 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
3321 33aa809d 2019-08-08 stsp if (err || !have_content) {
3322 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
3323 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
3324 33aa809d 2019-08-08 stsp free(*path_outfile);
3325 33aa809d 2019-08-08 stsp *path_outfile = NULL;
3327 33aa809d 2019-08-08 stsp free(args);
3329 33aa809d 2019-08-08 stsp got_diff_state_free(ds);
3332 33aa809d 2019-08-08 stsp if (changes)
3333 33aa809d 2019-08-08 stsp got_diff_free_changes(changes);
3334 33aa809d 2019-08-08 stsp free(path1);
3335 33aa809d 2019-08-08 stsp return err;
3338 33aa809d 2019-08-08 stsp static const struct got_error *
3339 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
3340 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
3341 1f1abb7e 2019-08-08 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
3343 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
3344 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
3345 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
3346 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
3347 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
3348 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
3349 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
3350 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
3351 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
3352 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
3354 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
3355 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
3356 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
3357 d3bcc3d1 2019-08-08 stsp return NULL;
3359 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
3360 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
3361 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
3363 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3364 65084dad 2019-08-08 stsp if (ie == NULL)
3365 65084dad 2019-08-08 stsp return got_error(GOT_ERR_BAD_PATH);
3367 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
3368 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
3369 a129376b 2019-03-28 stsp if (err) {
3370 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
3371 a129376b 2019-03-28 stsp goto done;
3372 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
3373 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
3374 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
3375 e20a8b6f 2019-06-04 stsp goto done;
3378 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
3379 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
3380 a129376b 2019-03-28 stsp if (tree_path == NULL) {
3381 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3382 a129376b 2019-03-28 stsp goto done;
3385 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
3386 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
3387 a129376b 2019-03-28 stsp if (tree_path == NULL) {
3388 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3389 a129376b 2019-03-28 stsp goto done;
3392 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
3393 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
3394 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3395 a129376b 2019-03-28 stsp goto done;
3400 1f1abb7e 2019-08-08 stsp err = got_object_id_by_path(&tree_id, a->repo,
3401 1f1abb7e 2019-08-08 stsp a->worktree->base_commit_id, tree_path);
3402 a9fa2909 2019-07-27 stsp if (err) {
3403 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
3404 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
3405 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
3406 a9fa2909 2019-07-27 stsp goto done;
3408 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
3410 a9fa2909 2019-07-27 stsp goto done;
3412 a9fa2909 2019-07-27 stsp te_name = basename(ie->path);
3413 a9fa2909 2019-07-27 stsp if (te_name == NULL) {
3414 a9fa2909 2019-07-27 stsp err = got_error_from_errno2("basename", ie->path);
3415 a9fa2909 2019-07-27 stsp goto done;
3418 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
3419 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
3420 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
3421 a9fa2909 2019-07-27 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
3422 a9fa2909 2019-07-27 stsp goto done;
3426 a129376b 2019-03-28 stsp switch (status) {
3427 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
3428 33aa809d 2019-08-08 stsp if (a->patch_cb) {
3429 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
3430 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
3431 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
3433 33aa809d 2019-08-08 stsp goto done;
3434 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
3437 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
3438 1f1abb7e 2019-08-08 stsp ie->path);
3440 1ee397ad 2019-07-12 stsp goto done;
3441 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
3443 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
3444 33aa809d 2019-08-08 stsp if (a->patch_cb) {
3445 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
3446 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
3447 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
3449 33aa809d 2019-08-08 stsp goto done;
3450 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
3453 33aa809d 2019-08-08 stsp /* fall through */
3454 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
3455 1ebedb77 2019-10-19 stsp case GOT_STATUS_MODE_CHANGE:
3456 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
3457 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
3458 e20a8b6f 2019-06-04 stsp struct got_object_id id;
3459 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3460 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3461 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1,
3462 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3464 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1,
3465 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3466 1f1abb7e 2019-08-08 stsp err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
3468 65084dad 2019-08-08 stsp goto done;
3470 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
3471 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
3472 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
3473 a129376b 2019-03-28 stsp goto done;
3476 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
3477 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
3478 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
3479 33aa809d 2019-08-08 stsp ondisk_path, ie->path, a->repo,
3480 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
3481 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
3483 33aa809d 2019-08-08 stsp if (rename(path_content, ondisk_path) == -1) {
3484 33aa809d 2019-08-08 stsp err = got_error_from_errno3("rename",
3485 33aa809d 2019-08-08 stsp path_content, ondisk_path);
3486 33aa809d 2019-08-08 stsp goto done;
3489 33aa809d 2019-08-08 stsp err = install_blob(a->worktree, ondisk_path, ie->path,
3490 33aa809d 2019-08-08 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
3491 33aa809d 2019-08-08 stsp got_fileindex_perms_to_st(ie), blob, 0, 1,
3492 33aa809d 2019-08-08 stsp a->repo, a->progress_cb, a->progress_arg);
3494 a129376b 2019-03-28 stsp goto done;
3495 1ebedb77 2019-10-19 stsp if (status == GOT_STATUS_DELETE ||
3496 1ebedb77 2019-10-19 stsp status == GOT_STATUS_MODE_CHANGE) {
3497 33aa809d 2019-08-08 stsp err = update_blob_fileindex_entry(a->worktree,
3498 33aa809d 2019-08-08 stsp a->fileindex, ie, ondisk_path, ie->path,
3501 33aa809d 2019-08-08 stsp goto done;
3510 1f1abb7e 2019-08-08 stsp free(ondisk_path);
3511 33aa809d 2019-08-08 stsp free(path_content);
3512 e20a8b6f 2019-06-04 stsp free(parent_path);
3513 a129376b 2019-03-28 stsp free(tree_path);
3515 a129376b 2019-03-28 stsp got_object_blob_close(blob);
3517 a129376b 2019-03-28 stsp got_object_tree_close(tree);
3518 a129376b 2019-03-28 stsp free(tree_id);
3519 e20a8b6f 2019-06-04 stsp return err;
3522 e20a8b6f 2019-06-04 stsp const struct got_error *
3523 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
3524 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
3525 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3526 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
3527 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
3529 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
3530 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
3531 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
3532 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
3533 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
3534 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
3536 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
3538 e20a8b6f 2019-06-04 stsp return err;
3540 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3542 e20a8b6f 2019-06-04 stsp goto done;
3544 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
3545 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
3546 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
3547 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
3548 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
3549 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
3550 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
3551 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
3552 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3553 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
3557 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3558 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
3559 e20a8b6f 2019-06-04 stsp err = sync_err;
3561 fb399478 2019-07-12 stsp free(fileindex_path);
3562 a129376b 2019-03-28 stsp if (fileindex)
3563 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
3564 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3565 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
3566 a129376b 2019-03-28 stsp err = unlockerr;
3567 c4296144 2019-05-09 stsp return err;
3570 cf066bf8 2019-05-09 stsp static void
3571 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
3573 24519714 2019-05-09 stsp free(ct->path);
3574 44d03001 2019-05-09 stsp free(ct->in_repo_path);
3575 768aea60 2019-05-09 stsp free(ct->ondisk_path);
3576 e75eb4da 2019-05-10 stsp free(ct->blob_id);
3577 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
3578 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
3579 b416585c 2019-05-13 stsp free(ct->base_commit_id);
3583 ed175427 2019-05-09 stsp struct collect_commitables_arg {
3584 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
3585 24519714 2019-05-09 stsp struct got_repository *repo;
3586 24519714 2019-05-09 stsp struct got_worktree *worktree;
3587 5f8a88c6 2019-08-03 stsp int have_staged_files;
3590 c4296144 2019-05-09 stsp static const struct got_error *
3591 88d0e355 2019-08-03 stsp collect_commitables(void *arg, unsigned char status,
3592 88d0e355 2019-08-03 stsp unsigned char staged_status, const char *relpath,
3593 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3594 537ac44b 2019-08-03 stsp struct got_object_id *commit_id)
3596 ed175427 2019-05-09 stsp struct collect_commitables_arg *a = arg;
3597 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
3598 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
3599 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
3600 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
3601 768aea60 2019-05-09 stsp struct stat sb;
3603 5f8a88c6 2019-08-03 stsp if (a->have_staged_files) {
3604 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
3605 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
3606 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
3607 5f8a88c6 2019-08-03 stsp return NULL;
3609 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
3610 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
3612 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
3613 1ebedb77 2019-10-19 stsp status != GOT_STATUS_MODE_CHANGE &&
3614 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
3615 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
3616 5f8a88c6 2019-08-03 stsp return NULL;
3619 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
3620 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3621 036813ee 2019-05-09 stsp goto done;
3623 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
3624 036813ee 2019-05-09 stsp parent_path = strdup("");
3625 69960a46 2019-05-09 stsp if (parent_path == NULL)
3626 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
3628 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
3630 69960a46 2019-05-09 stsp return err;
3633 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
3634 cf066bf8 2019-05-09 stsp if (ct == NULL) {
3635 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
3636 c4296144 2019-05-09 stsp goto done;
3639 768aea60 2019-05-09 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
3640 768aea60 2019-05-09 stsp relpath) == -1) {
3641 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3642 768aea60 2019-05-09 stsp goto done;
3644 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_DELETE || staged_status == GOT_STATUS_DELETE) {
3645 768aea60 2019-05-09 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
3647 768aea60 2019-05-09 stsp if (lstat(ct->ondisk_path, &sb) != 0) {
3648 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
3649 768aea60 2019-05-09 stsp goto done;
3651 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
3654 44d03001 2019-05-09 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
3655 44d03001 2019-05-09 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
3656 44d03001 2019-05-09 stsp relpath) == -1) {
3657 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3658 44d03001 2019-05-09 stsp goto done;
3661 cf066bf8 2019-05-09 stsp ct->status = status;
3662 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
3663 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
3664 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
3665 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
3666 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
3667 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
3668 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3669 b416585c 2019-05-13 stsp goto done;
3671 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
3672 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
3673 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
3674 f0b75401 2019-08-03 stsp goto done;
3677 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
3678 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
3679 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
3680 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
3681 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3682 036813ee 2019-05-09 stsp goto done;
3685 24519714 2019-05-09 stsp ct->path = strdup(path);
3686 24519714 2019-05-09 stsp if (ct->path == NULL) {
3687 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3688 24519714 2019-05-09 stsp goto done;
3690 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
3692 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
3693 ed175427 2019-05-09 stsp free_commitable(ct);
3694 24519714 2019-05-09 stsp free(parent_path);
3695 036813ee 2019-05-09 stsp free(path);
3696 a129376b 2019-03-28 stsp return err;
3699 036813ee 2019-05-09 stsp static const struct got_error *write_tree(struct got_object_id **,
3700 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
3701 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3702 036813ee 2019-05-09 stsp struct got_repository *);
3704 ed175427 2019-05-09 stsp static const struct got_error *
3705 036813ee 2019-05-09 stsp write_subtree(struct got_object_id **new_subtree_id,
3706 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
3707 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
3708 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3709 afa376bf 2019-05-09 stsp struct got_repository *repo)
3711 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
3712 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
3713 036813ee 2019-05-09 stsp char *subpath;
3715 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
3716 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
3717 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3719 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, repo, &te->id);
3721 ed175427 2019-05-09 stsp return err;
3723 036813ee 2019-05-09 stsp err = write_tree(new_subtree_id, subtree, subpath, commitable_paths,
3724 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
3725 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
3726 036813ee 2019-05-09 stsp free(subpath);
3727 036813ee 2019-05-09 stsp return err;
3730 036813ee 2019-05-09 stsp static const struct got_error *
3731 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
3733 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3734 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
3736 036813ee 2019-05-09 stsp *match = 0;
3738 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
3739 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
3740 0f63689d 2019-05-10 stsp return NULL;
3743 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
3745 0f63689d 2019-05-10 stsp return err;
3746 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
3747 036813ee 2019-05-09 stsp free(ct_parent_path);
3748 036813ee 2019-05-09 stsp return err;
3751 768aea60 2019-05-09 stsp static mode_t
3752 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
3754 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
3757 036813ee 2019-05-09 stsp static const struct got_error *
3758 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
3759 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
3761 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3763 036813ee 2019-05-09 stsp *new_te = NULL;
3765 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
3767 036813ee 2019-05-09 stsp goto done;
3769 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
3771 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
3772 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
3773 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
3775 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
3777 036813ee 2019-05-09 stsp if (err && *new_te) {
3778 56e0773d 2019-11-28 stsp free(*new_te);
3779 036813ee 2019-05-09 stsp *new_te = NULL;
3781 036813ee 2019-05-09 stsp return err;
3784 036813ee 2019-05-09 stsp static const struct got_error *
3785 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
3786 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
3788 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3789 036813ee 2019-05-09 stsp char *ct_name;
3791 036813ee 2019-05-09 stsp *new_te = NULL;
3793 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
3794 036813ee 2019-05-09 stsp if (*new_te == NULL)
3795 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
3797 036813ee 2019-05-09 stsp ct_name = basename(ct->path);
3798 036813ee 2019-05-09 stsp if (ct_name == NULL) {
3799 638f9024 2019-05-13 stsp err = got_error_from_errno2("basename", ct->path);
3800 036813ee 2019-05-09 stsp goto done;
3802 56e0773d 2019-11-28 stsp if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
3803 56e0773d 2019-11-28 stsp sizeof((*new_te)->name)) {
3804 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
3805 036813ee 2019-05-09 stsp goto done;
3808 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
3810 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
3811 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
3812 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
3814 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
3816 036813ee 2019-05-09 stsp if (err && *new_te) {
3817 56e0773d 2019-11-28 stsp free(*new_te);
3818 036813ee 2019-05-09 stsp *new_te = NULL;
3820 036813ee 2019-05-09 stsp return err;
3823 036813ee 2019-05-09 stsp static const struct got_error *
3824 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
3825 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
3827 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3828 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
3830 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
3832 036813ee 2019-05-09 stsp return err;
3833 036813ee 2019-05-09 stsp if (new_pe == NULL)
3834 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
3835 036813ee 2019-05-09 stsp return NULL;
3838 afa376bf 2019-05-09 stsp static const struct got_error *
3839 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
3840 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
3842 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
3843 5f8a88c6 2019-08-03 stsp unsigned char status;
3845 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
3846 afa376bf 2019-05-09 stsp ct_path++;
3848 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
3849 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
3851 5f8a88c6 2019-08-03 stsp status = ct->status;
3853 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
3854 537ac44b 2019-08-03 stsp ct_path, ct->blob_id, NULL, NULL);
3857 036813ee 2019-05-09 stsp static const struct got_error *
3858 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
3859 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
3861 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
3862 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
3863 44d03001 2019-05-09 stsp char *te_path;
3865 44d03001 2019-05-09 stsp *modified = 0;
3867 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
3868 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
3869 44d03001 2019-05-09 stsp te->name) == -1)
3870 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3872 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3873 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3874 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
3875 44d03001 2019-05-09 stsp strlen(te_path));
3876 44d03001 2019-05-09 stsp if (*modified)
3880 44d03001 2019-05-09 stsp free(te_path);
3881 44d03001 2019-05-09 stsp return err;
3884 44d03001 2019-05-09 stsp static const struct got_error *
3885 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
3886 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
3887 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
3889 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3890 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
3892 036813ee 2019-05-09 stsp *ctp = NULL;
3894 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3895 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3896 036813ee 2019-05-09 stsp char *ct_name = NULL;
3897 036813ee 2019-05-09 stsp int path_matches;
3899 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
3900 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
3901 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE &&
3902 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
3905 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
3906 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
3910 56e0773d 2019-11-28 stsp if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
3913 036813ee 2019-05-09 stsp err = match_ct_parent_path(&path_matches, ct, base_tree_path);
3915 036813ee 2019-05-09 stsp return err;
3916 036813ee 2019-05-09 stsp if (!path_matches)
3919 036813ee 2019-05-09 stsp ct_name = basename(pe->path);
3920 036813ee 2019-05-09 stsp if (ct_name == NULL)
3921 638f9024 2019-05-13 stsp return got_error_from_errno2("basename", pe->path);
3923 036813ee 2019-05-09 stsp if (strcmp(te->name, ct_name) != 0)
3926 036813ee 2019-05-09 stsp *ctp = ct;
3930 2b496619 2019-07-10 stsp return err;
3933 2b496619 2019-07-10 stsp static const struct got_error *
3934 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
3935 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
3936 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
3937 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3938 2b496619 2019-07-10 stsp struct got_repository *repo)
3940 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
3941 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
3942 2b496619 2019-07-10 stsp char *subtree_path;
3943 56e0773d 2019-11-28 stsp struct got_object_id *id = NULL;
3945 2b496619 2019-07-10 stsp *new_tep = NULL;
3947 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
3948 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
3949 2b496619 2019-07-10 stsp child_path) == -1)
3950 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
3952 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
3953 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
3954 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
3955 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
3957 56e0773d 2019-11-28 stsp if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
3958 56e0773d 2019-11-28 stsp sizeof(new_te->name)) {
3959 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
3960 2b496619 2019-07-10 stsp goto done;
3962 56e0773d 2019-11-28 stsp err = write_tree(&id, NULL, subtree_path,
3963 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
3964 2b496619 2019-07-10 stsp if (err) {
3965 56e0773d 2019-11-28 stsp free(new_te);
3966 2b496619 2019-07-10 stsp goto done;
3968 56e0773d 2019-11-28 stsp memcpy(&new_te->id, id, sizeof(new_te->id));
3971 2b496619 2019-07-10 stsp free(subtree_path);
3972 2b496619 2019-07-10 stsp if (err == NULL)
3973 2b496619 2019-07-10 stsp *new_tep = new_te;
3974 036813ee 2019-05-09 stsp return err;
3977 036813ee 2019-05-09 stsp static const struct got_error *
3978 036813ee 2019-05-09 stsp write_tree(struct got_object_id **new_tree_id,
3979 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
3980 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
3981 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3982 036813ee 2019-05-09 stsp struct got_repository *repo)
3984 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3985 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
3986 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
3987 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
3988 56e0773d 2019-11-28 stsp int nentries = 0;
3990 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
3992 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
3993 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3994 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3995 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
3997 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
3998 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
3999 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
4002 036813ee 2019-05-09 stsp if (!got_path_is_child(pe->path, path_base_tree,
4003 2f51b5b3 2019-05-09 stsp strlen(path_base_tree)))
4006 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
4007 036813ee 2019-05-09 stsp pe->path);
4009 036813ee 2019-05-09 stsp goto done;
4011 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
4012 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
4013 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
4015 036813ee 2019-05-09 stsp goto done;
4016 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
4018 afa376bf 2019-05-09 stsp goto done;
4019 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
4020 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
4022 2f51b5b3 2019-05-09 stsp goto done;
4023 56e0773d 2019-11-28 stsp nentries++;
4025 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
4026 2b496619 2019-07-10 stsp if (base_tree == NULL ||
4027 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
4028 2b496619 2019-07-10 stsp == NULL) {
4029 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
4030 2b496619 2019-07-10 stsp child_path, path_base_tree,
4031 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
4034 2b496619 2019-07-10 stsp goto done;
4035 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
4037 2b496619 2019-07-10 stsp goto done;
4038 56e0773d 2019-11-28 stsp nentries++;
4043 2f51b5b3 2019-05-09 stsp if (base_tree) {
4044 56e0773d 2019-11-28 stsp int i, nbase_entries;
4045 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
4046 56e0773d 2019-11-28 stsp nbase_entries = got_object_tree_get_nentries(base_tree);
4047 56e0773d 2019-11-28 stsp for (i = 0; i < nbase_entries; i++) {
4048 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
4050 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(base_tree, i);
4051 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
4052 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
4053 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
4055 63c5ca5d 2019-08-24 stsp goto done;
4056 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
4058 63c5ca5d 2019-08-24 stsp goto done;
4059 56e0773d 2019-11-28 stsp nentries++;
4063 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
4064 44d03001 2019-05-09 stsp int modified;
4065 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
4067 036813ee 2019-05-09 stsp goto done;
4068 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
4069 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
4071 2f51b5b3 2019-05-09 stsp goto done;
4072 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
4073 44d03001 2019-05-09 stsp if (modified) {
4074 56e0773d 2019-11-28 stsp struct got_object_id *new_id;
4075 56e0773d 2019-11-28 stsp err = write_subtree(&new_id, te,
4076 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
4077 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
4079 44d03001 2019-05-09 stsp goto done;
4080 56e0773d 2019-11-28 stsp memcpy(&new_te->id, new_id,
4081 56e0773d 2019-11-28 stsp sizeof(new_te->id));
4082 56e0773d 2019-11-28 stsp free(new_id);
4084 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
4086 036813ee 2019-05-09 stsp goto done;
4087 56e0773d 2019-11-28 stsp nentries++;
4091 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
4092 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
4094 f66c734c 2019-09-22 stsp goto done;
4096 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
4097 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
4098 1ebedb77 2019-10-19 stsp ct->status == GOT_STATUS_MODE_CHANGE ||
4099 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4100 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
4101 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
4103 2f51b5b3 2019-05-09 stsp goto done;
4104 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
4106 2f51b5b3 2019-05-09 stsp goto done;
4107 56e0773d 2019-11-28 stsp nentries++;
4109 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
4110 b416585c 2019-05-13 stsp status_arg);
4112 afa376bf 2019-05-09 stsp goto done;
4114 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
4115 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
4117 2f51b5b3 2019-05-09 stsp goto done;
4118 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
4120 2f51b5b3 2019-05-09 stsp goto done;
4121 56e0773d 2019-11-28 stsp nentries++;
4126 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
4127 56e0773d 2019-11-28 stsp err = got_object_tree_create(new_tree_id, &paths, nentries, repo);
4129 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
4130 ed175427 2019-05-09 stsp return err;
4133 ebf99748 2019-05-09 stsp static const struct got_error *
4134 ebf99748 2019-05-09 stsp update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
4135 72fd46fa 2019-09-06 stsp struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex,
4136 72fd46fa 2019-09-06 stsp int have_staged_files)
4138 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
4139 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
4141 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4142 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
4143 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4145 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
4147 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
4148 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
4149 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
4150 ebf99748 2019-05-09 stsp got_fileindex_entry_free(ie);
4151 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
4152 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4153 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
4154 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
4155 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
4156 5f8a88c6 2019-08-03 stsp ct->ondisk_path, ct->staged_blob_id->sha1,
4157 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
4158 72fd46fa 2019-09-06 stsp !have_staged_files);
4160 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
4161 e75eb4da 2019-05-10 stsp ct->ondisk_path, ct->blob_id->sha1,
4162 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
4163 72fd46fa 2019-09-06 stsp !have_staged_files);
4165 ebf99748 2019-05-09 stsp err = got_fileindex_entry_alloc(&ie,
4166 e75eb4da 2019-05-10 stsp ct->ondisk_path, pe->path, ct->blob_id->sha1,
4167 ebf99748 2019-05-09 stsp new_base_commit_id->sha1);
4170 ebf99748 2019-05-09 stsp err = got_fileindex_entry_add(fileindex, ie);
4175 d56d26ce 2019-05-10 stsp return err;
4179 d56d26ce 2019-05-10 stsp static const struct got_error *
4180 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
4181 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
4182 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
4183 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
4184 735ef5ac 2019-08-03 stsp int ood_errcode)
4186 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
4187 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
4189 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
4190 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
4191 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
4192 1a36436d 2019-06-10 stsp return NULL;
4194 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
4195 9bead371 2019-07-28 stsp * on matches file content in the branch head.
4197 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
4198 735ef5ac 2019-08-03 stsp in_repo_path);
4199 9bead371 2019-07-28 stsp if (err) {
4200 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
4201 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
4202 1a36436d 2019-06-10 stsp goto done;
4203 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
4204 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
4206 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
4207 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
4208 735ef5ac 2019-08-03 stsp in_repo_path);
4209 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
4210 1a36436d 2019-06-10 stsp goto done;
4211 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
4215 1a36436d 2019-06-10 stsp return err;
4218 c4296144 2019-05-09 stsp const struct got_error *
4219 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
4220 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
4221 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id, struct got_worktree *worktree,
4222 5c1e53bc 2019-07-28 stsp const char *author, const char *committer,
4223 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
4224 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4225 afa376bf 2019-05-09 stsp struct got_repository *repo)
4227 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4228 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
4229 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
4230 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
4231 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
4232 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
4233 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
4234 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
4235 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
4236 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
4237 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
4239 c4296144 2019-05-09 stsp *new_commit_id = NULL;
4241 de18fc63 2019-05-09 stsp SIMPLEQ_INIT(&parent_ids);
4243 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
4245 588edf97 2019-05-10 stsp goto done;
4247 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
4249 588edf97 2019-05-10 stsp goto done;
4251 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
4252 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
4257 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
4258 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
4262 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
4263 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4264 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4265 cf066bf8 2019-05-09 stsp char *ondisk_path;
4267 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
4268 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
4269 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
4272 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
4273 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODIFY &&
4274 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE)
4277 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
4278 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
4279 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4280 cf066bf8 2019-05-09 stsp goto done;
4282 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
4283 a7055788 2019-05-09 stsp free(ondisk_path);
4285 cf066bf8 2019-05-09 stsp goto done;
4288 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
4289 39cd0ff6 2019-07-12 stsp err = write_tree(&new_tree_id, head_tree, "/", commitable_paths,
4290 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
4292 036813ee 2019-05-09 stsp goto done;
4294 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
4296 de18fc63 2019-05-09 stsp goto done;
4297 de18fc63 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
4298 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
4299 de18fc63 2019-05-09 stsp 1, author, time(NULL), committer, time(NULL), logmsg, repo);
4300 de18fc63 2019-05-09 stsp got_object_qid_free(pid);
4301 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
4302 33ad4cbe 2019-05-12 jcs free(logmsg);
4304 9d40349a 2019-05-09 stsp goto done;
4306 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
4307 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
4308 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
4309 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
4310 09f5bd90 2019-05-09 stsp goto done;
4312 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
4313 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
4315 09f5bd90 2019-05-09 stsp goto done;
4316 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
4318 ebf99748 2019-05-09 stsp goto done;
4319 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
4320 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
4321 09f5bd90 2019-05-09 stsp goto done;
4323 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
4324 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
4326 f2c16586 2019-05-09 stsp goto done;
4327 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
4329 f2c16586 2019-05-09 stsp goto done;
4331 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
4333 09f5bd90 2019-05-09 stsp goto done;
4335 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
4337 ebf99748 2019-05-09 stsp goto done;
4339 588edf97 2019-05-10 stsp if (head_tree)
4340 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
4341 588edf97 2019-05-10 stsp if (head_commit)
4342 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
4343 09f5bd90 2019-05-09 stsp free(head_commit_id2);
4344 2f17228e 2019-05-12 stsp if (head_ref2) {
4345 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
4346 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
4347 2f17228e 2019-05-12 stsp err = unlockerr;
4348 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
4350 39cd0ff6 2019-07-12 stsp return err;
4353 5c1e53bc 2019-07-28 stsp static const struct got_error *
4354 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
4355 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
4357 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
4358 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
4360 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
4361 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
4362 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
4364 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
4365 5c1e53bc 2019-07-28 stsp ct_path++;
4367 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
4368 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
4372 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
4373 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
4375 5c1e53bc 2019-07-28 stsp return NULL;
4378 f0b75401 2019-08-03 stsp static const struct got_error *
4379 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
4381 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
4383 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
4384 f0b75401 2019-08-03 stsp *have_staged_files = 1;
4385 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
4388 f0b75401 2019-08-03 stsp return NULL;
4391 5f8a88c6 2019-08-03 stsp static const struct got_error *
4392 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
4393 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
4395 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
4396 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
4398 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
4399 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
4401 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
4402 5f8a88c6 2019-08-03 stsp if (ie == NULL)
4403 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
4404 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
4405 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
4406 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
4409 5f8a88c6 2019-08-03 stsp return NULL;
4412 39cd0ff6 2019-07-12 stsp const struct got_error *
4413 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
4414 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
4415 39cd0ff6 2019-07-12 stsp const char *author, const char *committer,
4416 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
4417 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
4418 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
4420 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
4421 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
4422 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
4423 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
4424 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
4425 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
4426 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
4427 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
4428 f0b75401 2019-08-03 stsp int have_staged_files = 0;
4430 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
4432 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
4434 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
4436 39cd0ff6 2019-07-12 stsp goto done;
4438 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
4440 39cd0ff6 2019-07-12 stsp goto done;
4442 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
4444 39cd0ff6 2019-07-12 stsp goto done;
4446 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4448 39cd0ff6 2019-07-12 stsp goto done;
4450 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
4451 5f8a88c6 2019-08-03 stsp &have_staged_files);
4452 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
4453 5f8a88c6 2019-08-03 stsp goto done;
4454 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
4455 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
4457 5f8a88c6 2019-08-03 stsp goto done;
4460 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
4461 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
4462 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
4463 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
4464 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
4465 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4466 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
4468 5c1e53bc 2019-07-28 stsp goto done;
4471 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
4472 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
4473 39cd0ff6 2019-07-12 stsp goto done;
4476 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
4477 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
4479 5c1e53bc 2019-07-28 stsp goto done;
4482 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
4483 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
4484 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
4486 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
4487 f0b75401 2019-08-03 stsp ct_path++;
4488 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
4489 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
4490 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
4492 b50cabdf 2019-07-12 stsp goto done;
4496 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
4497 5c1e53bc 2019-07-28 stsp head_commit_id, worktree, author, committer,
4498 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
4500 39cd0ff6 2019-07-12 stsp goto done;
4502 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
4503 72fd46fa 2019-09-06 stsp fileindex, have_staged_files);
4504 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4505 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
4506 39cd0ff6 2019-07-12 stsp err = sync_err;
4508 39cd0ff6 2019-07-12 stsp if (fileindex)
4509 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
4510 39cd0ff6 2019-07-12 stsp free(fileindex_path);
4511 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4512 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
4513 39cd0ff6 2019-07-12 stsp err = unlockerr;
4514 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
4515 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
4516 39cd0ff6 2019-07-12 stsp free_commitable(ct);
4518 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
4519 c4296144 2019-05-09 stsp return err;
4522 8656d6c4 2019-05-20 stsp const char *
4523 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
4525 8656d6c4 2019-05-20 stsp return ct->path;
4528 8656d6c4 2019-05-20 stsp unsigned int
4529 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
4531 8656d6c4 2019-05-20 stsp return ct->status;
4534 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
4535 818c7501 2019-07-11 stsp struct got_worktree *worktree;
4536 818c7501 2019-07-11 stsp struct got_repository *repo;
4539 818c7501 2019-07-11 stsp static const struct got_error *
4540 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
4542 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
4543 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
4544 818c7501 2019-07-11 stsp unsigned char status;
4545 818c7501 2019-07-11 stsp struct stat sb;
4546 818c7501 2019-07-11 stsp char *ondisk_path;
4548 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
4549 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
4550 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
4551 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
4553 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
4555 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
4557 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
4558 818c7501 2019-07-11 stsp err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
4559 818c7501 2019-07-11 stsp free(ondisk_path);
4561 818c7501 2019-07-11 stsp return err;
4563 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
4564 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
4565 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
4566 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
4568 818c7501 2019-07-11 stsp return NULL;
4571 818c7501 2019-07-11 stsp const struct got_error *
4572 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
4573 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
4574 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
4575 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
4577 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
4578 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
4579 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
4580 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
4581 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
4582 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
4584 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
4585 818c7501 2019-07-11 stsp *tmp_branch = NULL;
4586 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4588 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
4590 818c7501 2019-07-11 stsp return err;
4592 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
4594 818c7501 2019-07-11 stsp goto done;
4596 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
4597 818c7501 2019-07-11 stsp ok_arg.repo = repo;
4598 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
4601 818c7501 2019-07-11 stsp goto done;
4603 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4605 818c7501 2019-07-11 stsp goto done;
4607 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4609 818c7501 2019-07-11 stsp goto done;
4611 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4613 818c7501 2019-07-11 stsp goto done;
4615 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
4618 818c7501 2019-07-11 stsp goto done;
4620 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
4621 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
4623 818c7501 2019-07-11 stsp goto done;
4624 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
4626 818c7501 2019-07-11 stsp goto done;
4628 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
4630 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
4632 818c7501 2019-07-11 stsp goto done;
4634 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
4636 818c7501 2019-07-11 stsp goto done;
4638 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
4639 818c7501 2019-07-11 stsp worktree->base_commit_id);
4641 818c7501 2019-07-11 stsp goto done;
4642 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
4644 818c7501 2019-07-11 stsp goto done;
4646 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
4648 818c7501 2019-07-11 stsp goto done;
4650 818c7501 2019-07-11 stsp free(fileindex_path);
4651 818c7501 2019-07-11 stsp free(tmp_branch_name);
4652 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
4653 818c7501 2019-07-11 stsp free(branch_ref_name);
4654 818c7501 2019-07-11 stsp if (branch_ref)
4655 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
4656 818c7501 2019-07-11 stsp if (wt_branch)
4657 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
4658 818c7501 2019-07-11 stsp if (err) {
4659 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
4660 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
4661 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
4663 818c7501 2019-07-11 stsp if (*tmp_branch) {
4664 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
4665 818c7501 2019-07-11 stsp *tmp_branch = NULL;
4667 3e3a69f1 2019-07-25 stsp if (*fileindex) {
4668 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
4669 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4671 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
4673 818c7501 2019-07-11 stsp return err;
4676 818c7501 2019-07-11 stsp const struct got_error *
4677 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
4678 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
4679 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
4680 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
4682 818c7501 2019-07-11 stsp const struct got_error *err;
4683 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
4684 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
4685 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
4686 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
4687 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
4689 818c7501 2019-07-11 stsp *commit_id = NULL;
4690 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
4691 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
4692 3e3a69f1 2019-07-25 stsp *branch = NULL;
4693 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4695 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
4697 3e3a69f1 2019-07-25 stsp return err;
4699 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
4701 f032f1f7 2019-08-04 stsp goto done;
4703 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
4704 f032f1f7 2019-08-04 stsp &have_staged_files);
4705 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
4706 f032f1f7 2019-08-04 stsp goto done;
4707 f032f1f7 2019-08-04 stsp if (have_staged_files) {
4708 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
4709 3e3a69f1 2019-07-25 stsp goto done;
4712 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4714 f032f1f7 2019-08-04 stsp goto done;
4716 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4718 818c7501 2019-07-11 stsp goto done;
4720 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4722 818c7501 2019-07-11 stsp goto done;
4724 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4726 818c7501 2019-07-11 stsp goto done;
4728 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
4730 818c7501 2019-07-11 stsp goto done;
4732 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
4733 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
4735 818c7501 2019-07-11 stsp goto done;
4737 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4739 818c7501 2019-07-11 stsp goto done;
4741 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
4743 818c7501 2019-07-11 stsp goto done;
4745 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
4746 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
4748 818c7501 2019-07-11 stsp goto done;
4750 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
4752 818c7501 2019-07-11 stsp goto done;
4754 818c7501 2019-07-11 stsp free(commit_ref_name);
4755 818c7501 2019-07-11 stsp free(branch_ref_name);
4756 3e3a69f1 2019-07-25 stsp free(fileindex_path);
4757 818c7501 2019-07-11 stsp if (commit_ref)
4758 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
4759 818c7501 2019-07-11 stsp if (branch_ref)
4760 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
4761 818c7501 2019-07-11 stsp if (err) {
4762 818c7501 2019-07-11 stsp free(*commit_id);
4763 818c7501 2019-07-11 stsp *commit_id = NULL;
4764 818c7501 2019-07-11 stsp if (*tmp_branch) {
4765 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
4766 818c7501 2019-07-11 stsp *tmp_branch = NULL;
4768 818c7501 2019-07-11 stsp if (*new_base_branch) {
4769 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
4770 818c7501 2019-07-11 stsp *new_base_branch = NULL;
4772 818c7501 2019-07-11 stsp if (*branch) {
4773 818c7501 2019-07-11 stsp got_ref_close(*branch);
4774 818c7501 2019-07-11 stsp *branch = NULL;
4776 3e3a69f1 2019-07-25 stsp if (*fileindex) {
4777 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
4778 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4780 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
4782 818c7501 2019-07-11 stsp return err;
4785 818c7501 2019-07-11 stsp const struct got_error *
4786 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
4788 818c7501 2019-07-11 stsp const struct got_error *err;
4789 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
4791 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4793 818c7501 2019-07-11 stsp return err;
4795 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
4796 818c7501 2019-07-11 stsp free(tmp_branch_name);
4797 818c7501 2019-07-11 stsp return NULL;
4800 818c7501 2019-07-11 stsp static const struct got_error *
4801 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
4802 818c7501 2019-07-11 stsp char **logmsg, void *arg)
4804 0ebf8283 2019-07-24 stsp *logmsg = arg;
4805 818c7501 2019-07-11 stsp return NULL;
4808 818c7501 2019-07-11 stsp static const struct got_error *
4809 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
4810 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
4811 537ac44b 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
4813 818c7501 2019-07-11 stsp return NULL;
4816 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
4817 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
4818 01757395 2019-07-12 stsp void *progress_arg;
4819 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
4822 01757395 2019-07-12 stsp static const struct got_error *
4823 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
4825 01757395 2019-07-12 stsp const struct got_error *err;
4826 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
4828 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
4830 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
4832 01757395 2019-07-12 stsp return err;
4834 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
4835 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
4836 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
4837 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
4838 01757395 2019-07-12 stsp return NULL;
4840 01757395 2019-07-12 stsp p = strdup(path);
4841 01757395 2019-07-12 stsp if (p == NULL)
4842 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
4844 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
4845 01757395 2019-07-12 stsp if (err || new == NULL)
4847 01757395 2019-07-12 stsp return err;
4851 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
4853 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
4855 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
4856 01757395 2019-07-12 stsp free((char *)pe->path);
4858 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
4861 0ebf8283 2019-07-24 stsp static const struct got_error *
4862 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
4863 0ebf8283 2019-07-24 stsp struct got_repository *repo)
4865 818c7501 2019-07-11 stsp const struct got_error *err;
4866 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
4868 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4869 818c7501 2019-07-11 stsp if (err) {
4870 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
4871 818c7501 2019-07-11 stsp goto done;
4872 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
4874 818c7501 2019-07-11 stsp goto done;
4875 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
4877 818c7501 2019-07-11 stsp goto done;
4879 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
4882 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
4884 818c7501 2019-07-11 stsp goto done;
4885 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
4886 818c7501 2019-07-11 stsp free(stored_id);
4887 818c7501 2019-07-11 stsp if (cmp != 0) {
4888 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
4889 818c7501 2019-07-11 stsp goto done;
4893 0ebf8283 2019-07-24 stsp if (commit_ref)
4894 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
4895 0ebf8283 2019-07-24 stsp return err;
4898 0ebf8283 2019-07-24 stsp static const struct got_error *
4899 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
4900 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
4901 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
4902 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
4903 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4904 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
4906 0ebf8283 2019-07-24 stsp const struct got_error *err;
4907 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
4908 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
4909 3e3a69f1 2019-07-25 stsp char *fileindex_path;
4911 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
4913 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
4915 0ebf8283 2019-07-24 stsp return err;
4917 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
4918 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
4919 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
4920 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
4921 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
4922 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
4923 818c7501 2019-07-11 stsp if (commit_ref)
4924 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
4925 818c7501 2019-07-11 stsp return err;
4928 818c7501 2019-07-11 stsp const struct got_error *
4929 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
4930 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
4931 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
4932 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
4933 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4934 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
4936 0ebf8283 2019-07-24 stsp const struct got_error *err;
4937 0ebf8283 2019-07-24 stsp char *commit_ref_name;
4939 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4941 0ebf8283 2019-07-24 stsp return err;
4943 0ebf8283 2019-07-24 stsp err = store_commit_id(commit_ref_name, commit_id, repo);
4945 0ebf8283 2019-07-24 stsp goto done;
4947 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
4948 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
4949 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
4951 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4952 0ebf8283 2019-07-24 stsp return err;
4955 0ebf8283 2019-07-24 stsp const struct got_error *
4956 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
4957 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
4958 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
4959 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
4960 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4961 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
4963 0ebf8283 2019-07-24 stsp const struct got_error *err;
4964 0ebf8283 2019-07-24 stsp char *commit_ref_name;
4966 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4968 0ebf8283 2019-07-24 stsp return err;
4970 0ebf8283 2019-07-24 stsp err = store_commit_id(commit_ref_name, commit_id, repo);
4972 0ebf8283 2019-07-24 stsp goto done;
4974 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
4975 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
4976 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
4978 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4979 0ebf8283 2019-07-24 stsp return err;
4982 0ebf8283 2019-07-24 stsp static const struct got_error *
4983 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
4984 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
4985 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
4986 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
4987 3e3a69f1 2019-07-25 stsp const char *new_logmsg, struct got_repository *repo)
4989 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
4990 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
4991 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
4992 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
4993 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
4994 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
4995 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
4997 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
4998 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
5000 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
5002 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5004 3e3a69f1 2019-07-25 stsp return err;
5006 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
5007 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
5008 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
5009 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
5011 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
5012 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
5013 01757395 2019-07-12 stsp * TODO: Ideally, merged_paths would contain a list of commitables
5014 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
5016 01757395 2019-07-12 stsp if (merged_paths) {
5017 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
5018 8f8646e5 2019-07-25 stsp if (TAILQ_EMPTY(merged_paths)) {
5019 8f8646e5 2019-07-25 stsp err = got_error(GOT_ERR_NO_MERGED_PATHS);
5020 8f8646e5 2019-07-25 stsp goto done;
5022 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
5023 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
5024 f2a9dc41 2019-12-13 tracey repo, collect_commitables, &cc_arg, NULL, NULL, 0,
5027 01757395 2019-07-12 stsp goto done;
5030 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
5031 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
5033 01757395 2019-07-12 stsp goto done;
5036 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
5037 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
5038 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
5040 a0e95631 2019-07-12 stsp goto done;
5041 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
5042 a0e95631 2019-07-12 stsp goto done;
5045 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
5047 edd02c5e 2019-07-11 stsp goto done;
5049 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
5051 818c7501 2019-07-11 stsp goto done;
5053 5943eee2 2019-08-13 stsp if (new_logmsg) {
5054 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
5055 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
5056 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
5057 5943eee2 2019-08-13 stsp goto done;
5060 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
5062 5943eee2 2019-08-13 stsp goto done;
5065 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
5066 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
5067 5c1e53bc 2019-07-28 stsp worktree, got_object_commit_get_author(orig_commit),
5068 a0e95631 2019-07-12 stsp got_object_commit_get_committer(orig_commit),
5069 0ebf8283 2019-07-24 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
5071 a0e95631 2019-07-12 stsp goto done;
5073 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
5075 a0e95631 2019-07-12 stsp goto done;
5077 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
5079 a0e95631 2019-07-12 stsp goto done;
5081 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
5082 72fd46fa 2019-09-06 stsp fileindex, 0);
5083 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5084 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
5085 a0e95631 2019-07-12 stsp err = sync_err;
5087 a0e95631 2019-07-12 stsp free(fileindex_path);
5088 a0e95631 2019-07-12 stsp free(head_commit_id);
5089 a0e95631 2019-07-12 stsp if (head_ref)
5090 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
5091 818c7501 2019-07-11 stsp if (err) {
5092 818c7501 2019-07-11 stsp free(*new_commit_id);
5093 818c7501 2019-07-11 stsp *new_commit_id = NULL;
5095 818c7501 2019-07-11 stsp return err;
5098 818c7501 2019-07-11 stsp const struct got_error *
5099 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
5100 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
5101 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5102 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
5103 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
5105 0ebf8283 2019-07-24 stsp const struct got_error *err;
5106 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5107 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
5108 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
5110 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5112 0ebf8283 2019-07-24 stsp return err;
5114 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5116 0ebf8283 2019-07-24 stsp goto done;
5117 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
5119 0ebf8283 2019-07-24 stsp goto done;
5120 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
5121 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
5122 0ebf8283 2019-07-24 stsp goto done;
5125 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
5126 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
5128 0ebf8283 2019-07-24 stsp if (commit_ref)
5129 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
5130 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5131 0ebf8283 2019-07-24 stsp free(commit_id);
5132 0ebf8283 2019-07-24 stsp return err;
5135 0ebf8283 2019-07-24 stsp const struct got_error *
5136 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
5137 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
5138 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5139 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
5140 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
5141 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5143 0ebf8283 2019-07-24 stsp const struct got_error *err;
5144 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5145 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
5146 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
5148 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5150 0ebf8283 2019-07-24 stsp return err;
5152 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5154 0ebf8283 2019-07-24 stsp goto done;
5155 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
5157 0ebf8283 2019-07-24 stsp goto done;
5158 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
5159 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_COMMITID);
5160 0ebf8283 2019-07-24 stsp goto done;
5163 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
5164 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
5166 0ebf8283 2019-07-24 stsp if (commit_ref)
5167 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
5168 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5169 0ebf8283 2019-07-24 stsp free(commit_id);
5170 0ebf8283 2019-07-24 stsp return err;
5173 0ebf8283 2019-07-24 stsp const struct got_error *
5174 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
5175 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
5177 3e3a69f1 2019-07-25 stsp if (fileindex)
5178 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5179 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
5182 69844fba 2019-07-11 stsp static const struct got_error *
5183 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
5185 69844fba 2019-07-11 stsp const struct got_error *err;
5186 69844fba 2019-07-11 stsp struct got_reference *ref;
5188 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
5189 69844fba 2019-07-11 stsp if (err) {
5190 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
5191 69844fba 2019-07-11 stsp return NULL;
5192 69844fba 2019-07-11 stsp return err;
5195 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
5196 69844fba 2019-07-11 stsp got_ref_close(ref);
5197 69844fba 2019-07-11 stsp return err;
5200 69844fba 2019-07-11 stsp static const struct got_error *
5201 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
5203 69844fba 2019-07-11 stsp const struct got_error *err;
5204 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
5205 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
5207 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5209 69844fba 2019-07-11 stsp goto done;
5210 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
5212 69844fba 2019-07-11 stsp goto done;
5214 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5216 69844fba 2019-07-11 stsp goto done;
5217 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
5219 69844fba 2019-07-11 stsp goto done;
5221 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5223 69844fba 2019-07-11 stsp goto done;
5224 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
5226 69844fba 2019-07-11 stsp goto done;
5228 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5230 69844fba 2019-07-11 stsp goto done;
5231 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
5233 69844fba 2019-07-11 stsp goto done;
5236 69844fba 2019-07-11 stsp free(tmp_branch_name);
5237 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
5238 69844fba 2019-07-11 stsp free(branch_ref_name);
5239 69844fba 2019-07-11 stsp free(commit_ref_name);
5240 69844fba 2019-07-11 stsp return err;
5243 818c7501 2019-07-11 stsp const struct got_error *
5244 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
5245 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
5246 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
5247 818c7501 2019-07-11 stsp struct got_repository *repo)
5249 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
5250 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
5252 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
5254 818c7501 2019-07-11 stsp return err;
5256 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
5258 818c7501 2019-07-11 stsp goto done;
5260 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
5262 818c7501 2019-07-11 stsp goto done;
5264 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
5266 818c7501 2019-07-11 stsp goto done;
5268 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
5270 3e3a69f1 2019-07-25 stsp if (fileindex)
5271 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5272 818c7501 2019-07-11 stsp free(new_head_commit_id);
5273 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5274 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
5275 818c7501 2019-07-11 stsp err = unlockerr;
5276 818c7501 2019-07-11 stsp return err;
5279 818c7501 2019-07-11 stsp const struct got_error *
5280 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
5281 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
5282 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
5283 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
5285 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
5286 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
5287 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
5288 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
5289 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
5290 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
5292 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
5294 818c7501 2019-07-11 stsp return err;
5296 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
5297 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
5299 818c7501 2019-07-11 stsp goto done;
5301 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
5303 818c7501 2019-07-11 stsp goto done;
5306 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
5307 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
5308 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
5310 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
5312 818c7501 2019-07-11 stsp goto done;
5314 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
5316 818c7501 2019-07-11 stsp goto done;
5318 ca355955 2019-07-12 stsp err = got_object_id_by_path(&tree_id, repo,
5319 ca355955 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
5321 ca355955 2019-07-12 stsp goto done;
5323 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
5325 ca355955 2019-07-12 stsp goto done;
5327 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5329 818c7501 2019-07-11 stsp goto done;
5331 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
5332 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
5333 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
5334 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
5335 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
5336 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
5337 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
5338 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
5339 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
5341 1f1abb7e 2019-08-08 stsp goto sync;
5343 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
5344 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
5346 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5347 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
5348 ca355955 2019-07-12 stsp err = sync_err;
5350 818c7501 2019-07-11 stsp got_ref_close(resolved);
5351 a3a2faf2 2019-07-12 stsp free(tree_id);
5352 818c7501 2019-07-11 stsp free(commit_id);
5353 0ebf8283 2019-07-24 stsp if (fileindex)
5354 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
5355 0ebf8283 2019-07-24 stsp free(fileindex_path);
5357 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5358 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
5359 0ebf8283 2019-07-24 stsp err = unlockerr;
5360 0ebf8283 2019-07-24 stsp return err;
5363 0ebf8283 2019-07-24 stsp const struct got_error *
5364 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
5365 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
5366 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
5367 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
5369 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5370 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
5371 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
5372 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
5373 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
5374 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
5375 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
5376 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
5378 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5379 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
5380 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
5381 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5383 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
5385 0ebf8283 2019-07-24 stsp return err;
5387 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5389 0ebf8283 2019-07-24 stsp goto done;
5391 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
5392 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
5393 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5396 0ebf8283 2019-07-24 stsp goto done;
5398 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5400 0ebf8283 2019-07-24 stsp goto done;
5402 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5404 0ebf8283 2019-07-24 stsp goto done;
5406 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5407 0ebf8283 2019-07-24 stsp worktree);
5409 0ebf8283 2019-07-24 stsp goto done;
5411 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5414 0ebf8283 2019-07-24 stsp goto done;
5416 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
5418 0ebf8283 2019-07-24 stsp goto done;
5420 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
5422 0ebf8283 2019-07-24 stsp goto done;
5424 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
5425 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
5427 0ebf8283 2019-07-24 stsp goto done;
5428 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
5430 0ebf8283 2019-07-24 stsp goto done;
5431 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
5432 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
5433 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
5434 0ebf8283 2019-07-24 stsp goto done;
5437 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
5438 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
5440 0ebf8283 2019-07-24 stsp goto done;
5441 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
5443 0ebf8283 2019-07-24 stsp goto done;
5445 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
5447 0ebf8283 2019-07-24 stsp goto done;
5449 0ebf8283 2019-07-24 stsp free(fileindex_path);
5450 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
5451 0ebf8283 2019-07-24 stsp free(branch_ref_name);
5452 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
5453 0ebf8283 2019-07-24 stsp if (wt_branch)
5454 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
5455 0ebf8283 2019-07-24 stsp if (err) {
5456 0ebf8283 2019-07-24 stsp if (*branch_ref) {
5457 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
5458 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
5460 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
5461 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
5462 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5464 0ebf8283 2019-07-24 stsp free(*base_commit_id);
5465 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5466 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5467 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5469 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
5471 0ebf8283 2019-07-24 stsp return err;
5474 0ebf8283 2019-07-24 stsp const struct got_error *
5475 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
5476 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
5478 3e3a69f1 2019-07-25 stsp if (fileindex)
5479 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5480 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
5483 0ebf8283 2019-07-24 stsp const struct got_error *
5484 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
5485 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
5487 0ebf8283 2019-07-24 stsp const struct got_error *err;
5488 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
5490 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5492 0ebf8283 2019-07-24 stsp return err;
5494 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
5495 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
5496 0ebf8283 2019-07-24 stsp return NULL;
5499 0ebf8283 2019-07-24 stsp const struct got_error *
5500 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
5501 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
5502 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
5503 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
5505 0ebf8283 2019-07-24 stsp const struct got_error *err;
5506 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
5507 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
5508 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
5509 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
5510 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
5511 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
5513 0ebf8283 2019-07-24 stsp *commit_id = NULL;
5514 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5515 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
5516 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5518 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
5520 3e3a69f1 2019-07-25 stsp return err;
5522 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5524 f032f1f7 2019-08-04 stsp goto done;
5526 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
5527 f032f1f7 2019-08-04 stsp &have_staged_files);
5528 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
5529 f032f1f7 2019-08-04 stsp goto done;
5530 f032f1f7 2019-08-04 stsp if (have_staged_files) {
5531 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
5532 3e3a69f1 2019-07-25 stsp goto done;
5535 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5537 f032f1f7 2019-08-04 stsp goto done;
5539 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5541 0ebf8283 2019-07-24 stsp goto done;
5543 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5545 0ebf8283 2019-07-24 stsp goto done;
5547 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5548 0ebf8283 2019-07-24 stsp worktree);
5550 0ebf8283 2019-07-24 stsp goto done;
5552 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
5554 0ebf8283 2019-07-24 stsp goto done;
5556 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5558 0ebf8283 2019-07-24 stsp goto done;
5559 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
5561 0ebf8283 2019-07-24 stsp goto done;
5563 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
5565 0ebf8283 2019-07-24 stsp goto done;
5566 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
5568 0ebf8283 2019-07-24 stsp goto done;
5570 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
5572 0ebf8283 2019-07-24 stsp goto done;
5574 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5575 0ebf8283 2019-07-24 stsp free(branch_ref_name);
5576 3e3a69f1 2019-07-25 stsp free(fileindex_path);
5577 0ebf8283 2019-07-24 stsp if (commit_ref)
5578 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
5579 0ebf8283 2019-07-24 stsp if (base_commit_ref)
5580 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
5581 0ebf8283 2019-07-24 stsp if (err) {
5582 0ebf8283 2019-07-24 stsp free(*commit_id);
5583 0ebf8283 2019-07-24 stsp *commit_id = NULL;
5584 0ebf8283 2019-07-24 stsp free(*base_commit_id);
5585 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
5586 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
5587 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
5588 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5590 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5591 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5592 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5594 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
5596 0ebf8283 2019-07-24 stsp return err;
5599 0ebf8283 2019-07-24 stsp static const struct got_error *
5600 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
5602 0ebf8283 2019-07-24 stsp const struct got_error *err;
5603 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
5604 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
5606 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5608 0ebf8283 2019-07-24 stsp goto done;
5609 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
5611 0ebf8283 2019-07-24 stsp goto done;
5613 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5614 0ebf8283 2019-07-24 stsp worktree);
5616 0ebf8283 2019-07-24 stsp goto done;
5617 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
5619 0ebf8283 2019-07-24 stsp goto done;
5621 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5623 0ebf8283 2019-07-24 stsp goto done;
5624 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
5626 0ebf8283 2019-07-24 stsp goto done;
5628 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5630 0ebf8283 2019-07-24 stsp goto done;
5631 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
5633 0ebf8283 2019-07-24 stsp goto done;
5635 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
5636 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
5637 0ebf8283 2019-07-24 stsp free(branch_ref_name);
5638 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5639 0ebf8283 2019-07-24 stsp return err;
5642 0ebf8283 2019-07-24 stsp const struct got_error *
5643 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
5644 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
5645 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
5646 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
5648 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
5649 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
5650 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
5651 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
5652 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
5654 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
5656 0ebf8283 2019-07-24 stsp return err;
5658 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
5659 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
5661 0ebf8283 2019-07-24 stsp goto done;
5663 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
5665 0ebf8283 2019-07-24 stsp goto done;
5667 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
5669 0ebf8283 2019-07-24 stsp goto done;
5671 0ebf8283 2019-07-24 stsp err = got_object_id_by_path(&tree_id, repo, base_commit_id,
5672 0ebf8283 2019-07-24 stsp worktree->path_prefix);
5674 0ebf8283 2019-07-24 stsp goto done;
5676 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
5678 0ebf8283 2019-07-24 stsp goto done;
5680 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5682 0ebf8283 2019-07-24 stsp goto done;
5684 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
5685 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
5686 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
5687 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
5688 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
5689 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
5690 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
5691 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
5692 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
5694 1f1abb7e 2019-08-08 stsp goto sync;
5696 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
5697 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
5699 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5700 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
5701 0ebf8283 2019-07-24 stsp err = sync_err;
5703 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
5704 0ebf8283 2019-07-24 stsp free(tree_id);
5705 818c7501 2019-07-11 stsp free(fileindex_path);
5707 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5708 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
5709 818c7501 2019-07-11 stsp err = unlockerr;
5710 818c7501 2019-07-11 stsp return err;
5713 0ebf8283 2019-07-24 stsp const struct got_error *
5714 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
5715 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5716 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
5718 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr;
5719 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
5720 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
5722 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
5724 0ebf8283 2019-07-24 stsp return err;
5726 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
5727 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
5729 0ebf8283 2019-07-24 stsp goto done;
5731 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
5733 0ebf8283 2019-07-24 stsp goto done;
5735 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
5737 0ebf8283 2019-07-24 stsp goto done;
5739 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
5741 0ebf8283 2019-07-24 stsp goto done;
5743 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
5745 3e3a69f1 2019-07-25 stsp if (fileindex)
5746 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5747 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
5748 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5749 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
5750 0ebf8283 2019-07-24 stsp err = unlockerr;
5751 0ebf8283 2019-07-24 stsp return err;
5754 0ebf8283 2019-07-24 stsp const struct got_error *
5755 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
5756 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
5758 0ebf8283 2019-07-24 stsp const struct got_error *err;
5759 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5761 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5763 0ebf8283 2019-07-24 stsp return err;
5765 0ebf8283 2019-07-24 stsp err = store_commit_id(commit_ref_name, commit_id, repo);
5767 0ebf8283 2019-07-24 stsp goto done;
5769 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
5771 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5772 2822a352 2019-10-15 stsp return err;
5775 2822a352 2019-10-15 stsp const struct got_error *
5776 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **fileindex,
5777 2822a352 2019-10-15 stsp struct got_reference **branch_ref, struct got_reference **base_branch_ref,
5778 2822a352 2019-10-15 stsp struct got_worktree *worktree, const char *refname,
5779 2822a352 2019-10-15 stsp struct got_repository *repo)
5781 2822a352 2019-10-15 stsp const struct got_error *err = NULL;
5782 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
5783 2822a352 2019-10-15 stsp struct check_rebase_ok_arg ok_arg;
5785 2822a352 2019-10-15 stsp *fileindex = NULL;
5786 2822a352 2019-10-15 stsp *branch_ref = NULL;
5787 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
5789 2822a352 2019-10-15 stsp err = lock_worktree(worktree, LOCK_EX);
5791 2822a352 2019-10-15 stsp return err;
5793 2822a352 2019-10-15 stsp if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
5794 2822a352 2019-10-15 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
5795 2822a352 2019-10-15 stsp "cannot integrate a branch into itself; "
5796 2822a352 2019-10-15 stsp "update -b or different branch name required");
5797 2822a352 2019-10-15 stsp goto done;
5800 2822a352 2019-10-15 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5802 2822a352 2019-10-15 stsp goto done;
5804 2822a352 2019-10-15 stsp /* Preconditions are the same as for rebase. */
5805 2822a352 2019-10-15 stsp ok_arg.worktree = worktree;
5806 2822a352 2019-10-15 stsp ok_arg.repo = repo;
5807 2822a352 2019-10-15 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5810 2822a352 2019-10-15 stsp goto done;
5812 2822a352 2019-10-15 stsp err = got_ref_open(branch_ref, repo, refname, 1);
5814 2822a352 2019-10-15 stsp goto done;
5816 2822a352 2019-10-15 stsp err = got_ref_open(base_branch_ref, repo,
5817 2822a352 2019-10-15 stsp got_worktree_get_head_ref_name(worktree), 1);
5819 2822a352 2019-10-15 stsp if (err) {
5820 2822a352 2019-10-15 stsp if (*branch_ref) {
5821 2822a352 2019-10-15 stsp got_ref_close(*branch_ref);
5822 2822a352 2019-10-15 stsp *branch_ref = NULL;
5824 2822a352 2019-10-15 stsp if (*base_branch_ref) {
5825 2822a352 2019-10-15 stsp got_ref_close(*base_branch_ref);
5826 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
5828 2822a352 2019-10-15 stsp if (*fileindex) {
5829 2822a352 2019-10-15 stsp got_fileindex_free(*fileindex);
5830 2822a352 2019-10-15 stsp *fileindex = NULL;
5832 2822a352 2019-10-15 stsp lock_worktree(worktree, LOCK_SH);
5834 0cb83759 2019-08-03 stsp return err;
5837 2822a352 2019-10-15 stsp const struct got_error *
5838 2822a352 2019-10-15 stsp got_worktree_integrate_continue(struct got_worktree *worktree,
5839 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
5840 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref,
5841 2822a352 2019-10-15 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
5842 2822a352 2019-10-15 stsp got_cancel_cb cancel_cb, void *cancel_arg)
5844 2822a352 2019-10-15 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
5845 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
5846 2822a352 2019-10-15 stsp struct got_object_id *tree_id = NULL, *commit_id = NULL;
5848 2822a352 2019-10-15 stsp err = get_fileindex_path(&fileindex_path, worktree);
5850 2822a352 2019-10-15 stsp goto done;
5852 2822a352 2019-10-15 stsp err = got_ref_resolve(&commit_id, repo, branch_ref);
5854 2822a352 2019-10-15 stsp goto done;
5856 2822a352 2019-10-15 stsp err = got_object_id_by_path(&tree_id, repo, commit_id,
5857 2822a352 2019-10-15 stsp worktree->path_prefix);
5859 2822a352 2019-10-15 stsp goto done;
5861 2822a352 2019-10-15 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
5863 2822a352 2019-10-15 stsp goto done;
5865 2822a352 2019-10-15 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
5866 2822a352 2019-10-15 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
5868 2822a352 2019-10-15 stsp goto sync;
5870 2822a352 2019-10-15 stsp err = got_ref_change_ref(base_branch_ref, commit_id);
5872 2822a352 2019-10-15 stsp goto sync;
5874 2822a352 2019-10-15 stsp err = got_ref_write(base_branch_ref, repo);
5876 2822a352 2019-10-15 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5877 2822a352 2019-10-15 stsp if (sync_err && err == NULL)
5878 2822a352 2019-10-15 stsp err = sync_err;
5881 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(branch_ref);
5882 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
5883 2822a352 2019-10-15 stsp err = unlockerr;
5884 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
5886 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(base_branch_ref);
5887 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
5888 2822a352 2019-10-15 stsp err = unlockerr;
5889 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
5891 2822a352 2019-10-15 stsp got_fileindex_free(fileindex);
5892 2822a352 2019-10-15 stsp free(fileindex_path);
5893 2822a352 2019-10-15 stsp free(tree_id);
5895 2822a352 2019-10-15 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5896 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
5897 2822a352 2019-10-15 stsp err = unlockerr;
5898 2822a352 2019-10-15 stsp return err;
5901 2822a352 2019-10-15 stsp const struct got_error *
5902 2822a352 2019-10-15 stsp got_worktree_integrate_abort(struct got_worktree *worktree,
5903 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
5904 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref)
5906 8b692cd0 2019-10-21 stsp const struct got_error *err = NULL, *unlockerr = NULL;
5908 8b692cd0 2019-10-21 stsp got_fileindex_free(fileindex);
5910 8b692cd0 2019-10-21 stsp err = lock_worktree(worktree, LOCK_SH);
5912 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(branch_ref);
5913 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
5914 8b692cd0 2019-10-21 stsp err = unlockerr;
5915 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
5917 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(base_branch_ref);
5918 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
5919 8b692cd0 2019-10-21 stsp err = unlockerr;
5920 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
5922 8b692cd0 2019-10-21 stsp return err;
5925 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
5926 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
5927 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
5928 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
5929 2db2652d 2019-08-07 stsp struct got_repository *repo;
5930 2db2652d 2019-08-07 stsp int have_changes;
5933 2db2652d 2019-08-07 stsp const struct got_error *
5934 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
5935 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
5936 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5937 2db2652d 2019-08-07 stsp struct got_object_id *commit_id)
5939 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
5940 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
5941 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
5942 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
5943 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
5944 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
5946 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_UNVERSIONED ||
5947 7b5dc508 2019-10-28 stsp status == GOT_STATUS_NO_CHANGE)
5948 8b13ce36 2019-08-08 stsp return NULL;
5949 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
5950 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
5952 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
5953 735ef5ac 2019-08-03 stsp if (ie == NULL)
5954 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
5956 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
5957 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
5958 735ef5ac 2019-08-03 stsp relpath) == -1)
5959 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
5961 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
5962 735ef5ac 2019-08-03 stsp memcpy(base_commit_id.sha1, ie->commit_sha1,
5963 735ef5ac 2019-08-03 stsp SHA1_DIGEST_LENGTH);
5964 735ef5ac 2019-08-03 stsp base_commit_idp = &base_commit_id;
5967 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_CONFLICT) {
5968 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
5969 3aa5969e 2019-08-06 stsp goto done;
5970 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
5971 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
5972 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
5973 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
5974 735ef5ac 2019-08-03 stsp goto done;
5977 2db2652d 2019-08-07 stsp a->have_changes = 1;
5979 735ef5ac 2019-08-03 stsp p = in_repo_path;
5980 735ef5ac 2019-08-03 stsp while (p[0] == '/')
5982 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
5983 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
5984 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
5986 735ef5ac 2019-08-03 stsp free(in_repo_path);
5987 dc424a06 2019-08-07 stsp return err;
5990 2db2652d 2019-08-07 stsp struct stage_path_arg {
5991 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
5992 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
5993 2db2652d 2019-08-07 stsp struct got_repository *repo;
5994 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
5995 2db2652d 2019-08-07 stsp void *status_arg;
5996 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
5997 2db2652d 2019-08-07 stsp void *patch_arg;
5998 7b5dc508 2019-10-28 stsp int staged_something;
6001 2db2652d 2019-08-07 stsp static const struct got_error *
6002 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
6003 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
6004 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6005 2db2652d 2019-08-07 stsp struct got_object_id *commit_id)
6007 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
6008 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
6009 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
6010 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
6011 0cb83759 2019-08-03 stsp uint32_t stage;
6012 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
6014 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
6015 8b13ce36 2019-08-08 stsp return NULL;
6017 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
6018 d3e7c587 2019-08-03 stsp if (ie == NULL)
6019 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
6021 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
6022 2db2652d 2019-08-07 stsp relpath)== -1)
6023 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
6025 0cb83759 2019-08-03 stsp switch (status) {
6026 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
6027 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
6028 2db2652d 2019-08-07 stsp if (a->patch_cb) {
6029 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
6030 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
6031 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
6032 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
6035 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
6038 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
6039 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
6040 af5a81b2 2019-08-08 stsp ondisk_path, ie->path, a->repo,
6041 2db2652d 2019-08-07 stsp a->patch_cb, a->patch_arg);
6042 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
6046 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
6047 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
6050 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
6051 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
6052 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
6053 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
6055 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
6056 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
6057 7b5dc508 2019-10-28 stsp a->staged_something = 1;
6058 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
6060 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
6061 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
6062 af5a81b2 2019-08-08 stsp new_staged_blob_id, NULL);
6064 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
6065 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
6067 2db2652d 2019-08-07 stsp if (a->patch_cb) {
6068 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
6069 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
6070 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
6073 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
6075 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
6076 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
6080 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
6081 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
6082 7b5dc508 2019-10-28 stsp a->staged_something = 1;
6083 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
6085 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
6086 537ac44b 2019-08-03 stsp get_staged_status(ie), relpath, NULL, NULL, NULL);
6088 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
6090 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
6091 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
6093 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
6094 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
6097 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
6101 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
6102 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
6103 dc424a06 2019-08-07 stsp free(path_content);
6104 2db2652d 2019-08-07 stsp free(ondisk_path);
6105 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
6106 0ebf8283 2019-07-24 stsp return err;
6109 0cb83759 2019-08-03 stsp const struct got_error *
6110 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
6111 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
6112 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
6113 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
6114 1e71573e 2019-08-03 stsp struct got_repository *repo)
6116 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
6117 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
6118 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
6119 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
6120 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
6121 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
6122 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
6123 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
6125 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
6127 0cb83759 2019-08-03 stsp return err;
6129 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
6130 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
6132 735ef5ac 2019-08-03 stsp goto done;
6133 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6135 735ef5ac 2019-08-03 stsp goto done;
6136 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
6138 0cb83759 2019-08-03 stsp goto done;
6140 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
6141 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
6142 2db2652d 2019-08-07 stsp oka.worktree = worktree;
6143 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
6144 2db2652d 2019-08-07 stsp oka.repo = repo;
6145 2db2652d 2019-08-07 stsp oka.have_changes = 0;
6146 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
6147 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
6148 f2a9dc41 2019-12-13 tracey check_stage_ok, &oka, NULL, NULL, 0, 0);
6150 735ef5ac 2019-08-03 stsp goto done;
6152 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
6153 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
6154 2db2652d 2019-08-07 stsp goto done;
6157 2db2652d 2019-08-07 stsp spa.worktree = worktree;
6158 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
6159 2db2652d 2019-08-07 stsp spa.repo = repo;
6160 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
6161 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
6162 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
6163 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
6164 7b5dc508 2019-10-28 stsp spa.staged_something = 0;
6165 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
6166 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
6167 f2a9dc41 2019-12-13 tracey stage_path, &spa, NULL, NULL, 0, 0);
6169 2db2652d 2019-08-07 stsp goto done;
6171 7b5dc508 2019-10-28 stsp if (!spa.staged_something) {
6172 7b5dc508 2019-10-28 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
6173 7b5dc508 2019-10-28 stsp goto done;
6176 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6177 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
6178 0cb83759 2019-08-03 stsp err = sync_err;
6180 735ef5ac 2019-08-03 stsp if (head_ref)
6181 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
6182 735ef5ac 2019-08-03 stsp free(head_commit_id);
6183 0cb83759 2019-08-03 stsp free(fileindex_path);
6184 0cb83759 2019-08-03 stsp if (fileindex)
6185 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
6186 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6187 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
6188 0cb83759 2019-08-03 stsp err = unlockerr;
6189 0cb83759 2019-08-03 stsp return err;
6192 ad493afc 2019-08-03 stsp struct unstage_path_arg {
6193 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
6194 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
6195 ad493afc 2019-08-03 stsp struct got_repository *repo;
6196 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
6197 ad493afc 2019-08-03 stsp void *progress_arg;
6198 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
6199 2e1f37b0 2019-08-08 stsp void *patch_arg;
6202 2e1f37b0 2019-08-08 stsp static const struct got_error *
6203 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
6204 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
6205 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
6206 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
6207 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
6209 2e1f37b0 2019-08-08 stsp const struct got_error *err;
6210 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
6211 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
6212 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
6213 2e1f37b0 2019-08-08 stsp struct stat sb1, sb2;
6214 2e1f37b0 2019-08-08 stsp struct got_diff_changes *changes = NULL;
6215 2e1f37b0 2019-08-08 stsp struct got_diff_state *ds = NULL;
6216 2e1f37b0 2019-08-08 stsp struct got_diff_args *args = NULL;
6217 2e1f37b0 2019-08-08 stsp struct got_diff_change *change;
6218 2e1f37b0 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, n = 0;
6219 2e1f37b0 2019-08-08 stsp int have_content = 0, have_rejected_content = 0;
6221 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
6222 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
6224 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
6226 2e1f37b0 2019-08-08 stsp return err;
6227 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
6229 2e1f37b0 2019-08-08 stsp goto done;
6231 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
6233 2e1f37b0 2019-08-08 stsp goto done;
6235 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
6237 2e1f37b0 2019-08-08 stsp goto done;
6239 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
6241 2e1f37b0 2019-08-08 stsp goto done;
6243 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
6245 2e1f37b0 2019-08-08 stsp goto done;
6247 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
6249 2e1f37b0 2019-08-08 stsp goto done;
6251 2e1f37b0 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
6252 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
6253 2e1f37b0 2019-08-08 stsp goto done;
6256 2e1f37b0 2019-08-08 stsp if (stat(path2, &sb2) == -1) {
6257 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path2);
6258 2e1f37b0 2019-08-08 stsp goto done;
6261 2e1f37b0 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
6262 2e1f37b0 2019-08-08 stsp f1, sb1.st_size, label1, f2, sb2.st_size, path2, 3, NULL);
6264 2e1f37b0 2019-08-08 stsp goto done;
6266 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
6267 2e1f37b0 2019-08-08 stsp "got-unstaged-content");
6269 2e1f37b0 2019-08-08 stsp goto done;
6270 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
6271 2e1f37b0 2019-08-08 stsp "got-new-staged-content");
6273 2e1f37b0 2019-08-08 stsp goto done;
6275 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
6276 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
6277 2e1f37b0 2019-08-08 stsp goto done;
6279 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
6280 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
6281 2e1f37b0 2019-08-08 stsp goto done;
6283 2e1f37b0 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
6284 2e1f37b0 2019-08-08 stsp int choice;
6285 2e1f37b0 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
6286 2e1f37b0 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
6287 2e1f37b0 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
6288 2e1f37b0 2019-08-08 stsp outfile, rejectfile, patch_cb, patch_arg);
6290 2e1f37b0 2019-08-08 stsp goto done;
6291 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
6292 2e1f37b0 2019-08-08 stsp have_content = 1;
6294 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
6295 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
6298 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
6299 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
6300 f1e81a05 2019-08-10 stsp outfile, rejectfile);
6302 2e1f37b0 2019-08-08 stsp free(label1);
6304 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
6305 2e1f37b0 2019-08-08 stsp if (staged_blob)
6306 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
6307 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
6308 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
6309 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
6310 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
6311 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
6312 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
6313 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
6314 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
6315 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
6316 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
6317 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
6318 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
6319 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
6320 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
6321 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
6322 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
6323 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
6324 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
6325 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
6327 2e1f37b0 2019-08-08 stsp if (err || !have_rejected_content) {
6328 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
6329 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
6330 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
6331 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
6332 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
6333 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
6335 2e1f37b0 2019-08-08 stsp free(args);
6337 2e1f37b0 2019-08-08 stsp got_diff_state_free(ds);
6340 2e1f37b0 2019-08-08 stsp if (changes)
6341 2e1f37b0 2019-08-08 stsp got_diff_free_changes(changes);
6342 2e1f37b0 2019-08-08 stsp free(path1);
6343 2e1f37b0 2019-08-08 stsp free(path2);
6344 2e1f37b0 2019-08-08 stsp return err;
6347 ad493afc 2019-08-03 stsp static const struct got_error *
6348 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
6349 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
6350 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6351 ad493afc 2019-08-03 stsp struct got_object_id *commit_id)
6353 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
6354 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
6355 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
6356 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
6357 2e1f37b0 2019-08-08 stsp char *ondisk_path = NULL, *path_unstaged_content = NULL;
6358 2e1f37b0 2019-08-08 stsp char *path_new_staged_content = NULL;
6359 f69721c3 2019-10-21 stsp char *id_str = NULL, *label_orig = NULL;
6360 ad493afc 2019-08-03 stsp int local_changes_subsumed;
6361 9bc94a15 2019-08-03 stsp struct stat sb;
6363 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
6364 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
6365 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
6366 2e1f37b0 2019-08-08 stsp return NULL;
6368 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
6369 ad493afc 2019-08-03 stsp if (ie == NULL)
6370 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
6372 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
6374 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
6376 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str,
6377 f69721c3 2019-10-21 stsp commit_id ? commit_id : a->worktree->base_commit_id);
6379 f69721c3 2019-10-21 stsp goto done;
6380 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
6381 f69721c3 2019-10-21 stsp id_str) == -1) {
6382 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
6383 f69721c3 2019-10-21 stsp goto done;
6386 ad493afc 2019-08-03 stsp switch (staged_status) {
6387 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
6388 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
6389 ad493afc 2019-08-03 stsp blob_id, 8192);
6392 ad493afc 2019-08-03 stsp /* fall through */
6393 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
6394 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
6395 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
6396 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
6397 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
6398 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
6401 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
6404 2e1f37b0 2019-08-08 stsp err = create_unstaged_content(
6405 2e1f37b0 2019-08-08 stsp &path_unstaged_content,
6406 2e1f37b0 2019-08-08 stsp &path_new_staged_content, blob_id,
6407 2e1f37b0 2019-08-08 stsp staged_blob_id, ie->path, a->repo,
6408 2e1f37b0 2019-08-08 stsp a->patch_cb, a->patch_arg);
6409 2e1f37b0 2019-08-08 stsp if (err || path_unstaged_content == NULL)
6411 2e1f37b0 2019-08-08 stsp if (path_new_staged_content) {
6412 2e1f37b0 2019-08-08 stsp err = got_object_blob_create(
6413 2e1f37b0 2019-08-08 stsp &staged_blob_id,
6414 2e1f37b0 2019-08-08 stsp path_new_staged_content,
6418 2e1f37b0 2019-08-08 stsp memcpy(ie->staged_blob_sha1,
6419 2e1f37b0 2019-08-08 stsp staged_blob_id->sha1,
6420 2e1f37b0 2019-08-08 stsp SHA1_DIGEST_LENGTH);
6422 2e1f37b0 2019-08-08 stsp err = merge_file(&local_changes_subsumed,
6423 2e1f37b0 2019-08-08 stsp a->worktree, blob_base, ondisk_path,
6424 2e1f37b0 2019-08-08 stsp relpath, got_fileindex_perms_to_st(ie),
6425 f69721c3 2019-10-21 stsp path_unstaged_content, label_orig,
6426 f69721c3 2019-10-21 stsp "unstaged", a->repo, a->progress_cb,
6427 f69721c3 2019-10-21 stsp a->progress_arg);
6428 2e1f37b0 2019-08-08 stsp if (err == NULL &&
6429 2e1f37b0 2019-08-08 stsp path_new_staged_content == NULL)
6430 2e1f37b0 2019-08-08 stsp got_fileindex_entry_stage_set(ie,
6431 2e1f37b0 2019-08-08 stsp GOT_FILEIDX_STAGE_NONE);
6432 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
6435 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
6436 ad493afc 2019-08-03 stsp staged_blob_id, 8192);
6439 ad493afc 2019-08-03 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
6440 ad493afc 2019-08-03 stsp blob_base, ondisk_path, relpath,
6441 f69721c3 2019-10-21 stsp got_fileindex_perms_to_st(ie), label_orig, blob_staged,
6442 ad493afc 2019-08-03 stsp commit_id ? commit_id : a->worktree->base_commit_id,
6443 ad493afc 2019-08-03 stsp a->repo, a->progress_cb, a->progress_arg);
6444 ad493afc 2019-08-03 stsp if (err == NULL)
6445 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
6446 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
6448 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
6449 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
6450 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
6451 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
6452 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
6455 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
6457 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
6458 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
6462 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
6463 9bc94a15 2019-08-03 stsp err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
6466 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
6470 ad493afc 2019-08-03 stsp free(ondisk_path);
6471 2e1f37b0 2019-08-08 stsp if (path_unstaged_content &&
6472 2e1f37b0 2019-08-08 stsp unlink(path_unstaged_content) == -1 && err == NULL)
6473 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
6474 2e1f37b0 2019-08-08 stsp if (path_new_staged_content &&
6475 2e1f37b0 2019-08-08 stsp unlink(path_new_staged_content) == -1 && err == NULL)
6476 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
6477 2e1f37b0 2019-08-08 stsp free(path_unstaged_content);
6478 2e1f37b0 2019-08-08 stsp free(path_new_staged_content);
6479 ad493afc 2019-08-03 stsp if (blob_base)
6480 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
6481 ad493afc 2019-08-03 stsp if (blob_staged)
6482 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
6483 f69721c3 2019-10-21 stsp free(id_str);
6484 f69721c3 2019-10-21 stsp free(label_orig);
6485 ad493afc 2019-08-03 stsp return err;
6488 ad493afc 2019-08-03 stsp const struct got_error *
6489 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
6490 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
6491 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6492 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
6493 ad493afc 2019-08-03 stsp struct got_repository *repo)
6495 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
6496 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
6497 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
6498 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
6499 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
6501 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
6503 ad493afc 2019-08-03 stsp return err;
6505 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
6507 ad493afc 2019-08-03 stsp goto done;
6509 ad493afc 2019-08-03 stsp upa.worktree = worktree;
6510 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
6511 ad493afc 2019-08-03 stsp upa.repo = repo;
6512 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
6513 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
6514 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
6515 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
6516 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
6517 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
6518 f2a9dc41 2019-12-13 tracey unstage_path, &upa, NULL, NULL, 0, 0);
6520 ad493afc 2019-08-03 stsp goto done;
6523 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6524 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
6525 ad493afc 2019-08-03 stsp err = sync_err;
6527 ad493afc 2019-08-03 stsp free(fileindex_path);
6528 ad493afc 2019-08-03 stsp if (fileindex)
6529 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
6530 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6531 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
6532 ad493afc 2019-08-03 stsp err = unlockerr;
6533 ad493afc 2019-08-03 stsp return err;
