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 6d9d28c3 2018-03-11 stsp #include <sys/limits.h>
19 9d31a1d8 2018-03-11 stsp #include <sys/queue.h>
20 133d2798 2019-01-08 stsp #include <sys/tree.h>
22 d1f6d47b 2019-02-04 stsp #include <dirent.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 86c3caaf 2018-03-09 stsp #include <fcntl.h>
28 86c3caaf 2018-03-09 stsp #include <errno.h>
29 86c3caaf 2018-03-09 stsp #include <unistd.h>
30 9d31a1d8 2018-03-11 stsp #include <sha1.h>
31 9d31a1d8 2018-03-11 stsp #include <zlib.h>
32 9d31a1d8 2018-03-11 stsp #include <fnmatch.h>
33 512f0d0e 2019-01-02 stsp #include <libgen.h>
34 ec22038e 2019-03-10 stsp #include <uuid.h>
35 7154f6ce 2019-03-27 stsp #include <util.h>
37 86c3caaf 2018-03-09 stsp #include "got_error.h"
38 86c3caaf 2018-03-09 stsp #include "got_repository.h"
39 5261c201 2018-04-01 stsp #include "got_reference.h"
40 9d31a1d8 2018-03-11 stsp #include "got_object.h"
41 1dd54920 2019-05-11 stsp #include "got_path.h"
42 86c3caaf 2018-03-09 stsp #include "got_worktree.h"
43 511a516b 2018-05-19 stsp #include "got_opentemp.h"
44 234035bc 2019-06-01 stsp #include "got_diff.h"
46 718b3ab0 2018-03-17 stsp #include "got_lib_worktree.h"
47 718b3ab0 2018-03-17 stsp #include "got_lib_sha1.h"
48 718b3ab0 2018-03-17 stsp #include "got_lib_fileindex.h"
49 63581804 2018-07-09 stsp #include "got_lib_inflate.h"
50 718b3ab0 2018-03-17 stsp #include "got_lib_delta.h"
51 718b3ab0 2018-03-17 stsp #include "got_lib_object.h"
52 ed175427 2019-05-09 stsp #include "got_lib_object_parse.h"
53 cf066bf8 2019-05-09 stsp #include "got_lib_object_create.h"
54 24519714 2019-05-09 stsp #include "got_lib_object_idset.h"
55 6353ad76 2019-02-08 stsp #include "got_lib_diff.h"
58 9d31a1d8 2018-03-11 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
61 99724ed4 2018-03-10 stsp static const struct got_error *
62 7ac97322 2018-03-11 stsp create_meta_file(const char *path_got, const char *name, const char *content)
64 99724ed4 2018-03-10 stsp const struct got_error *err = NULL;
67 2c7829a4 2019-06-17 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1)
68 2c7829a4 2019-06-17 stsp return got_error_from_errno("asprintf");
70 2c7829a4 2019-06-17 stsp err = got_path_create_file(path, content);
75 507dc3bb 2018-12-29 stsp static const struct got_error *
76 507dc3bb 2018-12-29 stsp update_meta_file(const char *path_got, const char *name, const char *content)
78 507dc3bb 2018-12-29 stsp const struct got_error *err = NULL;
79 507dc3bb 2018-12-29 stsp FILE *tmpfile = NULL;
80 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
81 507dc3bb 2018-12-29 stsp char *path = NULL;
83 507dc3bb 2018-12-29 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
84 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
85 507dc3bb 2018-12-29 stsp path = NULL;
89 507dc3bb 2018-12-29 stsp err = got_opentemp_named(&tmppath, &tmpfile, path);
93 507dc3bb 2018-12-29 stsp if (content) {
94 507dc3bb 2018-12-29 stsp int len = fprintf(tmpfile, "%s\n", content);
95 507dc3bb 2018-12-29 stsp if (len != strlen(content) + 1) {
96 638f9024 2019-05-13 stsp err = got_error_from_errno2("fprintf", tmppath);
101 507dc3bb 2018-12-29 stsp if (rename(tmppath, path) != 0) {
102 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath, path);
103 2a57020b 2019-02-20 stsp unlink(tmppath);
108 fb43ecf1 2019-02-11 stsp if (fclose(tmpfile) != 0 && err == NULL)
109 638f9024 2019-05-13 stsp err = got_error_from_errno2("fclose", tmppath);
110 230a42bd 2019-05-11 jcs free(tmppath);
111 99724ed4 2018-03-10 stsp return err;
114 09fe317a 2018-03-11 stsp static const struct got_error *
115 7ac97322 2018-03-11 stsp read_meta_file(char **content, const char *path_got, const char *name)
117 09fe317a 2018-03-11 stsp const struct got_error *err = NULL;
118 09fe317a 2018-03-11 stsp char *path;
119 09fe317a 2018-03-11 stsp int fd = -1;
121 09fe317a 2018-03-11 stsp struct stat sb;
123 09fe317a 2018-03-11 stsp *content = NULL;
125 7ac97322 2018-03-11 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
126 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
127 09fe317a 2018-03-11 stsp path = NULL;
131 ef99fdb1 2018-03-11 stsp fd = open(path, O_RDONLY | O_NOFOLLOW);
132 09fe317a 2018-03-11 stsp if (fd == -1) {
133 f02eaa22 2019-03-11 stsp if (errno == ENOENT)
134 f02eaa22 2019-03-11 stsp err = got_error(GOT_ERR_WORKTREE_META);
136 638f9024 2019-05-13 stsp err = got_error_from_errno2("open", path);
139 ef99fdb1 2018-03-11 stsp if (flock(fd, LOCK_SH | LOCK_NB) == -1) {
140 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
141 638f9024 2019-05-13 stsp : got_error_from_errno2("flock", path));
145 d10c9b58 2019-02-19 stsp if (lstat(path, &sb) != 0) {
146 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", path);
149 09fe317a 2018-03-11 stsp *content = calloc(1, sb.st_size);
150 09fe317a 2018-03-11 stsp if (*content == NULL) {
151 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
155 09fe317a 2018-03-11 stsp n = read(fd, *content, sb.st_size);
156 09fe317a 2018-03-11 stsp if (n != sb.st_size) {
157 638f9024 2019-05-13 stsp err = (n == -1 ? got_error_from_errno2("read", path) :
158 0605801d 2018-03-11 stsp got_error(GOT_ERR_WORKTREE_META));
161 09fe317a 2018-03-11 stsp if ((*content)[sb.st_size - 1] != '\n') {
162 09fe317a 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_META);
165 09fe317a 2018-03-11 stsp (*content)[sb.st_size - 1] = '\0';
168 09fe317a 2018-03-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
169 638f9024 2019-05-13 stsp err = got_error_from_errno2("close", path_got);
170 09fe317a 2018-03-11 stsp free(path);
172 09fe317a 2018-03-11 stsp free(*content);
173 09fe317a 2018-03-11 stsp *content = NULL;
175 09fe317a 2018-03-11 stsp return err;
178 024e9686 2019-05-14 stsp static const struct got_error *
179 024e9686 2019-05-14 stsp write_head_ref(const char *path_got, struct got_reference *head_ref)
181 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
182 024e9686 2019-05-14 stsp char *refstr = NULL;
184 024e9686 2019-05-14 stsp if (got_ref_is_symbolic(head_ref)) {
185 024e9686 2019-05-14 stsp refstr = got_ref_to_str(head_ref);
186 024e9686 2019-05-14 stsp if (refstr == NULL)
187 024e9686 2019-05-14 stsp return got_error_from_errno("got_ref_to_str");
189 024e9686 2019-05-14 stsp refstr = strdup(got_ref_get_name(head_ref));
190 024e9686 2019-05-14 stsp if (refstr == NULL)
191 024e9686 2019-05-14 stsp return got_error_from_errno("strdup");
193 024e9686 2019-05-14 stsp err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
194 024e9686 2019-05-14 stsp free(refstr);
195 024e9686 2019-05-14 stsp return err;
198 86c3caaf 2018-03-09 stsp const struct got_error *
199 86c3caaf 2018-03-09 stsp got_worktree_init(const char *path, struct got_reference *head_ref,
200 577ec78f 2018-03-11 stsp const char *prefix, struct got_repository *repo)
202 86c3caaf 2018-03-09 stsp const struct got_error *err = NULL;
203 65596e15 2018-12-24 stsp struct got_object_id *commit_id = NULL;
204 ec22038e 2019-03-10 stsp uuid_t uuid;
205 ec22038e 2019-03-10 stsp uint32_t uuid_status;
206 65596e15 2018-12-24 stsp int obj_type;
207 7ac97322 2018-03-11 stsp char *path_got = NULL;
208 1451e70d 2018-03-10 stsp char *formatstr = NULL;
209 0bb8a95e 2018-03-12 stsp char *absprefix = NULL;
210 65596e15 2018-12-24 stsp char *basestr = NULL;
211 ec22038e 2019-03-10 stsp char *uuidstr = NULL;
213 0c48fee2 2019-03-11 stsp if (strcmp(path, got_repo_get_path(repo)) == 0) {
214 0c48fee2 2019-03-11 stsp err = got_error(GOT_ERR_WORKTREE_REPO);
218 65596e15 2018-12-24 stsp err = got_ref_resolve(&commit_id, repo, head_ref);
220 65596e15 2018-12-24 stsp return err;
221 65596e15 2018-12-24 stsp err = got_object_get_type(&obj_type, repo, commit_id);
223 65596e15 2018-12-24 stsp return err;
224 65596e15 2018-12-24 stsp if (obj_type != GOT_OBJ_TYPE_COMMIT)
225 65596e15 2018-12-24 stsp return got_error(GOT_ERR_OBJ_TYPE);
227 0bb8a95e 2018-03-12 stsp if (!got_path_is_absolute(prefix)) {
228 0bb8a95e 2018-03-12 stsp if (asprintf(&absprefix, "/%s", prefix) == -1)
229 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
232 86c3caaf 2018-03-09 stsp /* Create top-level directory (may already exist). */
233 2cb4bacb 2018-03-11 stsp if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
234 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path);
238 86c3caaf 2018-03-09 stsp /* Create .got directory (may already exist). */
239 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
240 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
243 7ac97322 2018-03-11 stsp if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
244 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path_got);
248 056e7441 2018-03-11 stsp /* Create an empty lock file. */
249 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
253 86c3caaf 2018-03-09 stsp /* Create an empty file index. */
254 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
258 08d425ea 2018-12-24 stsp /* Write the HEAD reference. */
259 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
263 65596e15 2018-12-24 stsp /* Record our base commit. */
264 65596e15 2018-12-24 stsp err = got_object_id_str(&basestr, commit_id);
267 0f92850e 2018-12-25 stsp err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
271 1451e70d 2018-03-10 stsp /* Store path to repository. */
272 7839bc15 2019-01-06 stsp err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
273 7839bc15 2019-01-06 stsp got_repo_get_path(repo));
277 577ec78f 2018-03-11 stsp /* Store in-repository path prefix. */
278 0bb8a95e 2018-03-12 stsp err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
279 0bb8a95e 2018-03-12 stsp absprefix ? absprefix : prefix);
283 ec22038e 2019-03-10 stsp /* Generate UUID. */
284 ec22038e 2019-03-10 stsp uuid_create(&uuid, &uuid_status);
285 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
286 ec22038e 2019-03-10 stsp err = got_error_uuid(uuid_status);
289 ec22038e 2019-03-10 stsp uuid_to_string(&uuid, &uuidstr, &uuid_status);
290 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
291 ec22038e 2019-03-10 stsp err = got_error_uuid(uuid_status);
294 ec22038e 2019-03-10 stsp err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
298 9dce68ed 2018-03-10 stsp /* Stamp work tree with format file. */
299 1451e70d 2018-03-10 stsp if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
300 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
303 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
308 65596e15 2018-12-24 stsp free(commit_id);
309 7ac97322 2018-03-11 stsp free(path_got);
310 1451e70d 2018-03-10 stsp free(formatstr);
311 0bb8a95e 2018-03-12 stsp free(absprefix);
312 65596e15 2018-12-24 stsp free(basestr);
313 ec22038e 2019-03-10 stsp free(uuidstr);
314 86c3caaf 2018-03-09 stsp return err;
317 247140b2 2019-02-05 stsp static const struct got_error *
318 247140b2 2019-02-05 stsp open_worktree(struct got_worktree **worktree, const char *path)
320 6d9d28c3 2018-03-11 stsp const struct got_error *err = NULL;
321 7ac97322 2018-03-11 stsp char *path_got;
322 6d9d28c3 2018-03-11 stsp char *formatstr = NULL;
323 c442a90d 2019-03-10 stsp char *uuidstr = NULL;
324 056e7441 2018-03-11 stsp char *path_lock = NULL;
325 eaccb85f 2018-12-25 stsp char *base_commit_id_str = NULL;
326 6d9d28c3 2018-03-11 stsp int version, fd = -1;
327 6d9d28c3 2018-03-11 stsp const char *errstr;
328 eaccb85f 2018-12-25 stsp struct got_repository *repo = NULL;
329 c442a90d 2019-03-10 stsp uint32_t uuid_status;
331 6d9d28c3 2018-03-11 stsp *worktree = NULL;
333 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
334 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
335 7ac97322 2018-03-11 stsp path_got = NULL;
339 7ac97322 2018-03-11 stsp if (asprintf(&path_lock, "%s/%s", path_got, GOT_WORKTREE_LOCK) == -1) {
340 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
341 056e7441 2018-03-11 stsp path_lock = NULL;
345 056e7441 2018-03-11 stsp fd = open(path_lock, O_RDWR | O_EXLOCK | O_NONBLOCK);
346 6d9d28c3 2018-03-11 stsp if (fd == -1) {
347 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
348 638f9024 2019-05-13 stsp : got_error_from_errno2("open", path_lock));
352 7ac97322 2018-03-11 stsp err = read_meta_file(&formatstr, path_got, GOT_WORKTREE_FORMAT);
356 6d9d28c3 2018-03-11 stsp version = strtonum(formatstr, 1, INT_MAX, &errstr);
357 6d9d28c3 2018-03-11 stsp if (errstr) {
358 6d9d28c3 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_META);
361 6d9d28c3 2018-03-11 stsp if (version != GOT_WORKTREE_FORMAT_VERSION) {
362 6d9d28c3 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_VERS);
366 6d9d28c3 2018-03-11 stsp *worktree = calloc(1, sizeof(**worktree));
367 6d9d28c3 2018-03-11 stsp if (*worktree == NULL) {
368 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
371 056e7441 2018-03-11 stsp (*worktree)->lockfd = -1;
373 0647c563 2019-03-11 stsp (*worktree)->root_path = strdup(path);
374 c88eb298 2018-03-11 stsp if ((*worktree)->root_path == NULL) {
375 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
378 cde76477 2018-03-11 stsp err = read_meta_file(&(*worktree)->repo_path, path_got,
379 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_REPOSITORY);
383 7ac97322 2018-03-11 stsp err = read_meta_file(&(*worktree)->path_prefix, path_got,
384 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_PATH_PREFIX);
388 eaccb85f 2018-12-25 stsp err = read_meta_file(&base_commit_id_str, path_got,
389 0f92850e 2018-12-25 stsp GOT_WORKTREE_BASE_COMMIT);
393 c442a90d 2019-03-10 stsp err = read_meta_file(&uuidstr, path_got, GOT_WORKTREE_UUID);
396 c442a90d 2019-03-10 stsp uuid_from_string(uuidstr, &(*worktree)->uuid, &uuid_status);
397 c442a90d 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
398 c442a90d 2019-03-10 stsp err = got_error_uuid(uuid_status);
402 eaccb85f 2018-12-25 stsp err = got_repo_open(&repo, (*worktree)->repo_path);
406 eaccb85f 2018-12-25 stsp err = got_object_resolve_id_str(&(*worktree)->base_commit_id, repo,
407 eaccb85f 2018-12-25 stsp base_commit_id_str);
411 36a38700 2019-05-10 stsp err = read_meta_file(&(*worktree)->head_ref_name, path_got,
412 36a38700 2019-05-10 stsp GOT_WORKTREE_HEAD_REF);
415 eaccb85f 2018-12-25 stsp got_repo_close(repo);
416 7ac97322 2018-03-11 stsp free(path_got);
417 056e7441 2018-03-11 stsp free(path_lock);
418 eaccb85f 2018-12-25 stsp free(base_commit_id_str);
419 c442a90d 2019-03-10 stsp free(uuidstr);
420 bd165944 2019-03-10 stsp free(formatstr);
422 6d9d28c3 2018-03-11 stsp if (fd != -1)
424 6d9d28c3 2018-03-11 stsp if (*worktree != NULL)
425 6d9d28c3 2018-03-11 stsp got_worktree_close(*worktree);
426 6d9d28c3 2018-03-11 stsp *worktree = NULL;
428 056e7441 2018-03-11 stsp (*worktree)->lockfd = fd;
430 6d9d28c3 2018-03-11 stsp return err;
433 247140b2 2019-02-05 stsp const struct got_error *
434 247140b2 2019-02-05 stsp got_worktree_open(struct got_worktree **worktree, const char *path)
436 247140b2 2019-02-05 stsp const struct got_error *err = NULL;
439 247140b2 2019-02-05 stsp err = open_worktree(worktree, path);
440 f02eaa22 2019-03-11 stsp if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT))
441 247140b2 2019-02-05 stsp return err;
442 247140b2 2019-02-05 stsp if (*worktree)
443 247140b2 2019-02-05 stsp return NULL;
444 247140b2 2019-02-05 stsp path = dirname(path);
445 d1542a27 2019-02-05 stsp if (path == NULL)
446 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
447 d1542a27 2019-02-05 stsp } while (!((path[0] == '.' || path[0] == '/') && path[1] == '\0'));
449 247140b2 2019-02-05 stsp return got_error(GOT_ERR_NOT_WORKTREE);
452 3a6ce05a 2019-02-11 stsp const struct got_error *
453 86c3caaf 2018-03-09 stsp got_worktree_close(struct got_worktree *worktree)
455 3a6ce05a 2019-02-11 stsp const struct got_error *err = NULL;
456 c88eb298 2018-03-11 stsp free(worktree->root_path);
457 cde76477 2018-03-11 stsp free(worktree->repo_path);
458 6d9d28c3 2018-03-11 stsp free(worktree->path_prefix);
459 eaccb85f 2018-12-25 stsp free(worktree->base_commit_id);
460 36a38700 2019-05-10 stsp free(worktree->head_ref_name);
461 056e7441 2018-03-11 stsp if (worktree->lockfd != -1)
462 3a6ce05a 2019-02-11 stsp if (close(worktree->lockfd) != 0)
463 638f9024 2019-05-13 stsp err = got_error_from_errno2("close",
464 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree));
465 6d9d28c3 2018-03-11 stsp free(worktree);
466 3a6ce05a 2019-02-11 stsp return err;
469 2fbdb5ae 2018-12-29 stsp const char *
470 c7f4312f 2019-02-05 stsp got_worktree_get_root_path(struct got_worktree *worktree)
472 c7f4312f 2019-02-05 stsp return worktree->root_path;
475 c7f4312f 2019-02-05 stsp const char *
476 86c3caaf 2018-03-09 stsp got_worktree_get_repo_path(struct got_worktree *worktree)
478 2fbdb5ae 2018-12-29 stsp return worktree->repo_path;
481 49520a32 2018-12-29 stsp const char *
482 49520a32 2018-12-29 stsp got_worktree_get_path_prefix(struct got_worktree *worktree)
484 f609be2e 2018-12-29 stsp return worktree->path_prefix;
487 e5dc7198 2018-12-29 stsp const struct got_error *
488 e5dc7198 2018-12-29 stsp got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
489 e5dc7198 2018-12-29 stsp const char *path_prefix)
491 e5dc7198 2018-12-29 stsp char *absprefix = NULL;
493 e5dc7198 2018-12-29 stsp if (!got_path_is_absolute(path_prefix)) {
494 e5dc7198 2018-12-29 stsp if (asprintf(&absprefix, "/%s", path_prefix) == -1)
495 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
497 e5dc7198 2018-12-29 stsp *match = (strcmp(absprefix ? absprefix : path_prefix,
498 e5dc7198 2018-12-29 stsp worktree->path_prefix) == 0);
499 e5dc7198 2018-12-29 stsp free(absprefix);
500 e5dc7198 2018-12-29 stsp return NULL;
503 bc70eb79 2019-05-09 stsp const char *
504 35be1456 2018-03-11 stsp got_worktree_get_head_ref_name(struct got_worktree *worktree)
506 36a38700 2019-05-10 stsp return worktree->head_ref_name;
509 024e9686 2019-05-14 stsp const struct got_error *
510 024e9686 2019-05-14 stsp got_worktree_set_head_ref(struct got_worktree *worktree,
511 024e9686 2019-05-14 stsp struct got_reference *head_ref)
513 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
514 024e9686 2019-05-14 stsp char *path_got = NULL, *head_ref_name = NULL;
516 024e9686 2019-05-14 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
517 024e9686 2019-05-14 stsp GOT_WORKTREE_GOT_DIR) == -1) {
518 024e9686 2019-05-14 stsp err = got_error_from_errno("asprintf");
519 024e9686 2019-05-14 stsp path_got = NULL;
523 024e9686 2019-05-14 stsp head_ref_name = strdup(got_ref_get_name(head_ref));
524 024e9686 2019-05-14 stsp if (head_ref_name == NULL) {
525 024e9686 2019-05-14 stsp err = got_error_from_errno("strdup");
529 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
533 024e9686 2019-05-14 stsp free(worktree->head_ref_name);
534 024e9686 2019-05-14 stsp worktree->head_ref_name = head_ref_name;
536 024e9686 2019-05-14 stsp free(path_got);
538 024e9686 2019-05-14 stsp free(head_ref_name);
539 024e9686 2019-05-14 stsp return err;
542 b72f483a 2019-02-05 stsp struct got_object_id *
543 507dc3bb 2018-12-29 stsp got_worktree_get_base_commit_id(struct got_worktree *worktree)
545 507dc3bb 2018-12-29 stsp return worktree->base_commit_id;
548 507dc3bb 2018-12-29 stsp const struct got_error *
549 507dc3bb 2018-12-29 stsp got_worktree_set_base_commit_id(struct got_worktree *worktree,
550 507dc3bb 2018-12-29 stsp struct got_repository *repo, struct got_object_id *commit_id)
552 507dc3bb 2018-12-29 stsp const struct got_error *err;
553 507dc3bb 2018-12-29 stsp struct got_object *obj = NULL;
554 507dc3bb 2018-12-29 stsp char *id_str = NULL;
555 507dc3bb 2018-12-29 stsp char *path_got = NULL;
557 507dc3bb 2018-12-29 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
558 507dc3bb 2018-12-29 stsp GOT_WORKTREE_GOT_DIR) == -1) {
559 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
560 507dc3bb 2018-12-29 stsp path_got = NULL;
564 507dc3bb 2018-12-29 stsp err = got_object_open(&obj, repo, commit_id);
566 507dc3bb 2018-12-29 stsp return err;
568 507dc3bb 2018-12-29 stsp if (obj->type != GOT_OBJ_TYPE_COMMIT) {
569 507dc3bb 2018-12-29 stsp err = got_error(GOT_ERR_OBJ_TYPE);
573 507dc3bb 2018-12-29 stsp /* Record our base commit. */
574 507dc3bb 2018-12-29 stsp err = got_object_id_str(&id_str, commit_id);
577 507dc3bb 2018-12-29 stsp err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
581 507dc3bb 2018-12-29 stsp free(worktree->base_commit_id);
582 507dc3bb 2018-12-29 stsp worktree->base_commit_id = got_object_id_dup(commit_id);
583 507dc3bb 2018-12-29 stsp if (worktree->base_commit_id == NULL) {
584 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
589 507dc3bb 2018-12-29 stsp got_object_close(obj);
590 507dc3bb 2018-12-29 stsp free(id_str);
591 507dc3bb 2018-12-29 stsp free(path_got);
592 507dc3bb 2018-12-29 stsp return err;
595 9d31a1d8 2018-03-11 stsp static const struct got_error *
596 9d31a1d8 2018-03-11 stsp lock_worktree(struct got_worktree *worktree, int operation)
598 9d31a1d8 2018-03-11 stsp if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
599 9d31a1d8 2018-03-11 stsp return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
600 638f9024 2019-05-13 stsp : got_error_from_errno2("flock",
601 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree)));
602 86c3caaf 2018-03-09 stsp return NULL;
605 21908da4 2019-01-13 stsp static const struct got_error *
606 4a1ddfc2 2019-01-12 stsp add_dir_on_disk(struct got_worktree *worktree, const char *path)
608 4a1ddfc2 2019-01-12 stsp const struct got_error *err = NULL;
609 4a1ddfc2 2019-01-12 stsp char *abspath;
611 4a1ddfc2 2019-01-12 stsp if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
612 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
614 0cd1c46a 2019-03-11 stsp err = got_path_mkdir(abspath);
615 ddcd8544 2019-03-11 stsp if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
616 ddcd8544 2019-03-11 stsp struct stat sb;
617 ddcd8544 2019-03-11 stsp err = NULL;
618 ddcd8544 2019-03-11 stsp if (lstat(abspath, &sb) == -1) {
619 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
620 ddcd8544 2019-03-11 stsp } else if (!S_ISDIR(sb.st_mode)) {
621 ddcd8544 2019-03-11 stsp /* TODO directory is obstructed; do something */
622 ddcd8544 2019-03-11 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
625 4a1ddfc2 2019-01-12 stsp free(abspath);
626 68c76935 2019-02-19 stsp return err;
629 68c76935 2019-02-19 stsp static const struct got_error *
630 68c76935 2019-02-19 stsp check_file_contents_equal(int *same, FILE *f1, FILE *f2)
632 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
633 68c76935 2019-02-19 stsp uint8_t fbuf1[8192];
634 68c76935 2019-02-19 stsp uint8_t fbuf2[8192];
635 68c76935 2019-02-19 stsp size_t flen1 = 0, flen2 = 0;
640 68c76935 2019-02-19 stsp flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
641 68c76935 2019-02-19 stsp if (flen1 == 0 && ferror(f1)) {
642 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
645 68c76935 2019-02-19 stsp flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
646 68c76935 2019-02-19 stsp if (flen2 == 0 && ferror(f2)) {
647 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
650 68c76935 2019-02-19 stsp if (flen1 == 0) {
651 68c76935 2019-02-19 stsp if (flen2 != 0)
654 68c76935 2019-02-19 stsp } else if (flen2 == 0) {
655 68c76935 2019-02-19 stsp if (flen1 != 0)
658 68c76935 2019-02-19 stsp } else if (flen1 == flen2) {
659 68c76935 2019-02-19 stsp if (memcmp(fbuf1, fbuf2, flen2) != 0) {
669 68c76935 2019-02-19 stsp return err;
672 68c76935 2019-02-19 stsp static const struct got_error *
673 68c76935 2019-02-19 stsp check_files_equal(int *same, const char *f1_path, const char *f2_path)
675 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
676 68c76935 2019-02-19 stsp struct stat sb;
677 68c76935 2019-02-19 stsp size_t size1, size2;
678 68c76935 2019-02-19 stsp FILE *f1 = NULL, *f2 = NULL;
682 68c76935 2019-02-19 stsp if (lstat(f1_path, &sb) != 0) {
683 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", f1_path);
686 68c76935 2019-02-19 stsp size1 = sb.st_size;
688 68c76935 2019-02-19 stsp if (lstat(f2_path, &sb) != 0) {
689 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", f2_path);
692 68c76935 2019-02-19 stsp size2 = sb.st_size;
694 68c76935 2019-02-19 stsp if (size1 != size2) {
696 68c76935 2019-02-19 stsp return NULL;
699 68c76935 2019-02-19 stsp f1 = fopen(f1_path, "r");
700 68c76935 2019-02-19 stsp if (f1 == NULL)
701 638f9024 2019-05-13 stsp return got_error_from_errno2("open", f1_path);
703 68c76935 2019-02-19 stsp f2 = fopen(f2_path, "r");
704 68c76935 2019-02-19 stsp if (f2 == NULL) {
705 638f9024 2019-05-13 stsp err = got_error_from_errno2("open", f2_path);
709 68c76935 2019-02-19 stsp err = check_file_contents_equal(same, f1, f2);
711 68c76935 2019-02-19 stsp if (f1 && fclose(f1) != 0 && err == NULL)
712 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
713 68c76935 2019-02-19 stsp if (f2 && fclose(f2) != 0 && err == NULL)
714 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
716 6353ad76 2019-02-08 stsp return err;
720 46b6ee73 2019-06-04 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
721 46b6ee73 2019-06-04 stsp * blob_deriv acts as the first derived version, and the file on disk
722 234035bc 2019-06-01 stsp * acts as the second derived version.
724 6353ad76 2019-02-08 stsp static const struct got_error *
725 234035bc 2019-06-01 stsp merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
726 46b6ee73 2019-06-04 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
727 46b6ee73 2019-06-04 stsp const char *path, uint16_t st_mode, struct got_blob_object *blob_deriv,
728 818c7501 2019-07-11 stsp struct got_object_id *deriv_base_commit_id,
729 234035bc 2019-06-01 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
730 234035bc 2019-06-01 stsp void *progress_arg)
732 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
733 6353ad76 2019-02-08 stsp int merged_fd = -1;
734 46b6ee73 2019-06-04 stsp FILE *f_deriv = NULL, *f_orig = NULL;
735 46b6ee73 2019-06-04 stsp char *blob_deriv_path = NULL, *blob_orig_path = NULL;
736 af54ae4a 2019-02-19 stsp char *merged_path = NULL, *base_path = NULL;
737 6353ad76 2019-02-08 stsp char *id_str = NULL;
738 818c7501 2019-07-11 stsp char *label_deriv = NULL;
739 234035bc 2019-06-01 stsp int overlapcnt = 0;
740 af54ae4a 2019-02-19 stsp char *parent;
742 234035bc 2019-06-01 stsp *local_changes_subsumed = 0;
744 af54ae4a 2019-02-19 stsp parent = dirname(ondisk_path);
745 af54ae4a 2019-02-19 stsp if (parent == NULL)
746 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", ondisk_path);
748 af54ae4a 2019-02-19 stsp if (asprintf(&base_path, "%s/got-merged", parent) == -1)
749 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
751 af54ae4a 2019-02-19 stsp err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
755 af54ae4a 2019-02-19 stsp free(base_path);
756 46b6ee73 2019-06-04 stsp if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
757 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
758 af54ae4a 2019-02-19 stsp base_path = NULL;
762 46b6ee73 2019-06-04 stsp err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
765 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
766 6c4c42e0 2019-06-24 stsp blob_deriv);
770 af54ae4a 2019-02-19 stsp free(base_path);
771 46b6ee73 2019-06-04 stsp if (asprintf(&base_path, "%s/got-merge-blob-orig", parent) == -1) {
772 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
773 af54ae4a 2019-02-19 stsp base_path = NULL;
777 46b6ee73 2019-06-04 stsp err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
780 46b6ee73 2019-06-04 stsp if (blob_orig) {
781 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
782 46b6ee73 2019-06-04 stsp blob_orig);
787 1430b4e0 2019-03-27 stsp * If the file has no blob, this is an "add vs add" conflict,
788 1430b4e0 2019-03-27 stsp * and we simply use an empty ancestor file to make both files
789 1430b4e0 2019-03-27 stsp * appear in the merged result in their entirety.
793 818c7501 2019-07-11 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
796 818c7501 2019-07-11 stsp if (asprintf(&label_deriv, "commit %s", id_str) == -1) {
797 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
801 46b6ee73 2019-06-04 stsp err = got_merge_diff3(&overlapcnt, merged_fd, blob_deriv_path,
802 818c7501 2019-07-11 stsp blob_orig_path, ondisk_path, label_deriv, path);
806 6353ad76 2019-02-08 stsp (*progress_cb)(progress_arg,
807 6353ad76 2019-02-08 stsp overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
809 816dc654 2019-02-16 stsp if (fsync(merged_fd) != 0) {
810 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
814 68c76935 2019-02-19 stsp /* Check if a clean merge has subsumed all local changes. */
815 68c76935 2019-02-19 stsp if (overlapcnt == 0) {
816 46b6ee73 2019-06-04 stsp err = check_files_equal(local_changes_subsumed, blob_deriv_path,
817 68c76935 2019-02-19 stsp merged_path);
822 70a0c8ec 2019-02-20 stsp if (chmod(merged_path, st_mode) != 0) {
823 638f9024 2019-05-13 stsp err = got_error_from_errno2("chmod", merged_path);
827 6353ad76 2019-02-08 stsp if (rename(merged_path, ondisk_path) != 0) {
828 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", merged_path,
829 230a42bd 2019-05-11 jcs ondisk_path);
830 2a57020b 2019-02-20 stsp unlink(merged_path);
835 3a6ce05a 2019-02-11 stsp if (merged_fd != -1 && close(merged_fd) != 0 && err == NULL)
836 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
837 46b6ee73 2019-06-04 stsp if (f_deriv && fclose(f_deriv) != 0 && err == NULL)
838 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
839 46b6ee73 2019-06-04 stsp if (f_orig && fclose(f_orig) != 0 && err == NULL)
840 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
841 6353ad76 2019-02-08 stsp free(merged_path);
842 af54ae4a 2019-02-19 stsp free(base_path);
843 46b6ee73 2019-06-04 stsp if (blob_deriv_path) {
844 46b6ee73 2019-06-04 stsp unlink(blob_deriv_path);
845 46b6ee73 2019-06-04 stsp free(blob_deriv_path);
847 46b6ee73 2019-06-04 stsp if (blob_orig_path) {
848 46b6ee73 2019-06-04 stsp unlink(blob_orig_path);
849 46b6ee73 2019-06-04 stsp free(blob_orig_path);
851 6353ad76 2019-02-08 stsp free(id_str);
852 818c7501 2019-07-11 stsp free(label_deriv);
853 4a1ddfc2 2019-01-12 stsp return err;
856 4a1ddfc2 2019-01-12 stsp static const struct got_error *
857 13d9040b 2019-03-27 stsp update_blob_fileindex_entry(struct got_worktree *worktree,
858 13d9040b 2019-03-27 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
859 13d9040b 2019-03-27 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
860 13d9040b 2019-03-27 stsp int update_timestamps)
862 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
864 13d9040b 2019-03-27 stsp if (ie == NULL)
865 13d9040b 2019-03-27 stsp ie = got_fileindex_entry_get(fileindex, path);
867 13d9040b 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path,
868 13d9040b 2019-03-27 stsp blob->id.sha1, worktree->base_commit_id->sha1,
869 13d9040b 2019-03-27 stsp update_timestamps);
871 13d9040b 2019-03-27 stsp struct got_fileindex_entry *new_ie;
872 13d9040b 2019-03-27 stsp err = got_fileindex_entry_alloc(&new_ie, ondisk_path,
873 13d9040b 2019-03-27 stsp path, blob->id.sha1, worktree->base_commit_id->sha1);
875 13d9040b 2019-03-27 stsp err = got_fileindex_entry_add(fileindex, new_ie);
877 13d9040b 2019-03-27 stsp return err;
880 13d9040b 2019-03-27 stsp static const struct got_error *
881 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
882 13d9040b 2019-03-27 stsp const char *path, uint16_t te_mode, uint16_t st_mode,
883 13d9040b 2019-03-27 stsp struct got_blob_object *blob, int restoring_missing_file,
884 a129376b 2019-03-28 stsp int reverting_versioned_file, struct got_repository *repo,
885 a129376b 2019-03-28 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
887 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
888 507dc3bb 2018-12-29 stsp int fd = -1;
889 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
890 507dc3bb 2018-12-29 stsp int update = 0;
891 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
893 c34b20a2 2018-03-12 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
894 9d31a1d8 2018-03-11 stsp GOT_DEFAULT_FILE_MODE);
895 9d31a1d8 2018-03-11 stsp if (fd == -1) {
896 21908da4 2019-01-13 stsp if (errno == ENOENT) {
897 21908da4 2019-01-13 stsp char *parent = dirname(path);
898 21908da4 2019-01-13 stsp if (parent == NULL)
899 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
900 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
902 21908da4 2019-01-13 stsp return err;
903 21908da4 2019-01-13 stsp fd = open(ondisk_path,
904 21908da4 2019-01-13 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
905 21908da4 2019-01-13 stsp GOT_DEFAULT_FILE_MODE);
906 21908da4 2019-01-13 stsp if (fd == -1)
907 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
908 230a42bd 2019-05-11 jcs ondisk_path);
909 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
910 b8f41171 2019-02-10 stsp if (!S_ISREG(st_mode)) {
911 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
912 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
915 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
916 507dc3bb 2018-12-29 stsp ondisk_path);
919 507dc3bb 2018-12-29 stsp update = 1;
922 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
925 a378724f 2019-02-10 stsp if (restoring_missing_file)
926 a378724f 2019-02-10 stsp (*progress_cb)(progress_arg, GOT_STATUS_MISSING, path);
927 a129376b 2019-03-28 stsp else if (reverting_versioned_file)
928 a129376b 2019-03-28 stsp (*progress_cb)(progress_arg, GOT_STATUS_REVERT, path);
930 a378724f 2019-02-10 stsp (*progress_cb)(progress_arg,
931 a378724f 2019-02-10 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
933 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
935 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
936 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
939 9d31a1d8 2018-03-11 stsp if (len > 0) {
940 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
941 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
942 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
943 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
945 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
946 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
949 61d6eaa3 2018-12-24 stsp hdrlen = 0;
951 9d31a1d8 2018-03-11 stsp } while (len != 0);
953 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
954 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
958 507dc3bb 2018-12-29 stsp if (update) {
959 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
960 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
961 230a42bd 2019-05-11 jcs ondisk_path);
962 2a57020b 2019-02-20 stsp unlink(tmppath);
967 b8f41171 2019-02-10 stsp if (te_mode & S_IXUSR) {
968 b8f41171 2019-02-10 stsp if (chmod(ondisk_path, st_mode | S_IXUSR) == -1) {
969 638f9024 2019-05-13 stsp err = got_error_from_errno2("chmod", ondisk_path);
973 b8f41171 2019-02-10 stsp if (chmod(ondisk_path, st_mode & ~S_IXUSR) == -1) {
974 638f9024 2019-05-13 stsp err = got_error_from_errno2("chmod", ondisk_path);
980 3a6ce05a 2019-02-11 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
981 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
982 507dc3bb 2018-12-29 stsp free(tmppath);
983 6353ad76 2019-02-08 stsp return err;
986 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
987 6353ad76 2019-02-08 stsp static const struct got_error *
988 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
990 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
991 7154f6ce 2019-03-27 stsp const char *markers[3] = {
992 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
993 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
994 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
997 7154f6ce 2019-03-27 stsp char *line;
998 7154f6ce 2019-03-27 stsp size_t len;
999 7154f6ce 2019-03-27 stsp const char delim[3] = {'\0', '\0', '\0'};
1001 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1002 7154f6ce 2019-03-27 stsp line = fparseln(f, &len, NULL, delim, 0);
1003 7154f6ce 2019-03-27 stsp if (line == NULL) {
1004 7154f6ce 2019-03-27 stsp if (feof(f))
1006 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
1010 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1011 19332e6d 2019-05-13 stsp if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1013 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
1019 7154f6ce 2019-03-27 stsp return err;
1022 7154f6ce 2019-03-27 stsp static const struct got_error *
1023 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1024 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1025 b8f41171 2019-02-10 stsp struct got_repository *repo)
1027 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1028 6353ad76 2019-02-08 stsp struct got_object_id id;
1029 6353ad76 2019-02-08 stsp size_t hdrlen;
1030 6353ad76 2019-02-08 stsp FILE *f = NULL;
1031 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1032 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1033 6353ad76 2019-02-08 stsp size_t flen, blen;
1035 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1037 b8f41171 2019-02-10 stsp if (lstat(abspath, sb) == -1) {
1038 a378724f 2019-02-10 stsp if (errno == ENOENT) {
1040 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1041 2ec1f75b 2019-03-26 stsp *status = GOT_STATUS_MISSING;
1043 2ec1f75b 2019-03-26 stsp *status = GOT_STATUS_DELETE;
1044 b8f41171 2019-02-10 stsp sb->st_mode =
1045 b8f41171 2019-02-10 stsp ((ie->mode >> GOT_FILEIDX_MODE_PERMS_SHIFT)
1046 b8f41171 2019-02-10 stsp & (S_IRWXU | S_IRWXG | S_IRWXO));
1048 b8f41171 2019-02-10 stsp sb->st_mode = GOT_DEFAULT_FILE_MODE;
1049 a378724f 2019-02-10 stsp return NULL;
1051 638f9024 2019-05-13 stsp return got_error_from_errno2("lstat", abspath);
1054 b8f41171 2019-02-10 stsp if (!S_ISREG(sb->st_mode)) {
1055 6353ad76 2019-02-08 stsp *status = GOT_STATUS_OBSTRUCTED;
1056 6353ad76 2019-02-08 stsp return NULL;
1059 b8f41171 2019-02-10 stsp if (ie == NULL)
1060 d00136be 2019-03-26 stsp return NULL;
1062 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1063 2ec1f75b 2019-03-26 stsp *status = GOT_STATUS_DELETE;
1064 2ec1f75b 2019-03-26 stsp return NULL;
1065 2ec1f75b 2019-03-26 stsp } else if (!got_fileindex_entry_has_blob(ie)) {
1066 d00136be 2019-03-26 stsp *status = GOT_STATUS_ADD;
1067 b8f41171 2019-02-10 stsp return NULL;
1070 b8f41171 2019-02-10 stsp if (ie->ctime_sec == sb->st_ctime &&
1071 b8f41171 2019-02-10 stsp ie->ctime_nsec == sb->st_ctimensec &&
1072 b8f41171 2019-02-10 stsp ie->mtime_sec == sb->st_mtime &&
1073 b8f41171 2019-02-10 stsp ie->mtime_sec == sb->st_mtime &&
1074 b8f41171 2019-02-10 stsp ie->mtime_nsec == sb->st_mtimensec &&
1075 b8f41171 2019-02-10 stsp ie->size == (sb->st_size & 0xffffffff))
1076 6353ad76 2019-02-08 stsp return NULL;
1078 6353ad76 2019-02-08 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1079 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1081 6353ad76 2019-02-08 stsp return err;
1083 6353ad76 2019-02-08 stsp f = fopen(abspath, "r");
1084 6353ad76 2019-02-08 stsp if (f == NULL) {
1085 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", abspath);
1086 6353ad76 2019-02-08 stsp goto done;
1088 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1090 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1091 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1093 7154f6ce 2019-03-27 stsp goto done;
1094 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1095 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1096 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1097 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1098 7154f6ce 2019-03-27 stsp goto done;
1100 6353ad76 2019-02-08 stsp if (blen == 0) {
1101 6353ad76 2019-02-08 stsp if (flen != 0)
1102 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1104 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1105 6353ad76 2019-02-08 stsp if (blen != 0)
1106 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1108 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1109 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1110 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1111 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1115 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1118 6353ad76 2019-02-08 stsp hdrlen = 0;
1121 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1122 7154f6ce 2019-03-27 stsp rewind(f);
1123 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1127 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1129 6353ad76 2019-02-08 stsp fclose(f);
1130 9d31a1d8 2018-03-11 stsp return err;
1133 9d31a1d8 2018-03-11 stsp static const struct got_error *
1134 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1135 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1136 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1137 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1138 0584f854 2019-04-06 stsp void *progress_arg)
1140 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1141 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1142 6353ad76 2019-02-08 stsp char *ondisk_path;
1143 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1144 b8f41171 2019-02-10 stsp struct stat sb;
1146 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1147 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1149 b8f41171 2019-02-10 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1151 b8f41171 2019-02-10 stsp goto done;
1153 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1154 b8f41171 2019-02-10 stsp (*progress_cb)(progress_arg, status, path);
1155 b8f41171 2019-02-10 stsp goto done;
1158 b8f41171 2019-02-10 stsp if (ie && status != GOT_STATUS_MISSING) {
1159 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1160 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1161 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1162 b8f41171 2019-02-10 stsp (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1164 6353ad76 2019-02-08 stsp goto done;
1166 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1167 1430b4e0 2019-03-27 stsp memcmp(ie->blob_sha1, te->id->sha1,
1168 1430b4e0 2019-03-27 stsp SHA1_DIGEST_LENGTH) == 0)
1169 b8f41171 2019-02-10 stsp goto done;
1172 8da9e5f4 2019-01-12 stsp err = got_object_open_as_blob(&blob, repo, te->id, 8192);
1174 6353ad76 2019-02-08 stsp goto done;
1176 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1177 234035bc 2019-06-01 stsp int update_timestamps;
1178 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1179 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1180 234035bc 2019-06-01 stsp struct got_object_id id2;
1181 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1182 234035bc 2019-06-01 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1184 234035bc 2019-06-01 stsp goto done;
1186 234035bc 2019-06-01 stsp err = merge_blob(&update_timestamps, worktree, blob2,
1187 818c7501 2019-07-11 stsp ondisk_path, path, sb.st_mode, blob,
1188 818c7501 2019-07-11 stsp worktree->base_commit_id, repo,
1189 234035bc 2019-06-01 stsp progress_cb, progress_arg);
1190 234035bc 2019-06-01 stsp if (blob2)
1191 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
1193 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
1194 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
1195 234035bc 2019-06-01 stsp * unmodified files again.
1197 234035bc 2019-06-01 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1198 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
1199 234035bc 2019-06-01 stsp update_timestamps);
1200 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
1201 13d9040b 2019-03-27 stsp (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1202 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1203 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 0);
1205 13d9040b 2019-03-27 stsp goto done;
1207 13d9040b 2019-03-27 stsp err = install_blob(worktree, ondisk_path, path, te->mode,
1208 a129376b 2019-03-28 stsp sb.st_mode, blob, status == GOT_STATUS_MISSING, 0,
1209 a129376b 2019-03-28 stsp repo, progress_cb, progress_arg);
1211 13d9040b 2019-03-27 stsp goto done;
1212 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1213 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 1);
1215 13d9040b 2019-03-27 stsp goto done;
1217 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
1219 6353ad76 2019-02-08 stsp free(ondisk_path);
1220 8da9e5f4 2019-01-12 stsp return err;
1223 90285c3b 2019-01-08 stsp static const struct got_error *
1224 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
1226 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
1227 90285c3b 2019-01-08 stsp char *ondisk_path = NULL;
1229 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
1230 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1232 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
1233 c97665ae 2019-01-13 stsp if (errno != ENOENT)
1234 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
1236 90285c3b 2019-01-08 stsp char *parent = dirname(ondisk_path);
1237 7a9df742 2019-01-08 stsp while (parent && strcmp(parent, root_path) != 0) {
1238 26c4ac4d 2019-01-08 stsp if (rmdir(parent) == -1) {
1239 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
1240 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
1244 90285c3b 2019-01-08 stsp parent = dirname(parent);
1247 90285c3b 2019-01-08 stsp free(ondisk_path);
1248 90285c3b 2019-01-08 stsp return err;
1251 708d8e67 2019-03-27 stsp static const struct got_error *
1252 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
1253 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
1254 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1256 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
1257 708d8e67 2019-03-27 stsp unsigned char status;
1258 708d8e67 2019-03-27 stsp struct stat sb;
1259 708d8e67 2019-03-27 stsp char *ondisk_path;
1261 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
1263 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1265 708d8e67 2019-03-27 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1267 708d8e67 2019-03-27 stsp return err;
1269 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
1270 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
1271 fc6346c4 2019-03-27 stsp (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
1273 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
1274 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
1276 fc6346c4 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
1279 708d8e67 2019-03-27 stsp return err;
1281 fc6346c4 2019-03-27 stsp (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
1282 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
1283 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
1285 fc6346c4 2019-03-27 stsp return err;
1287 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
1290 fc6346c4 2019-03-27 stsp return err;
1293 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
1294 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
1295 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
1296 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
1297 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
1298 8da9e5f4 2019-01-12 stsp void *progress_arg;
1299 8da9e5f4 2019-01-12 stsp got_worktree_cancel_cb cancel_cb;
1300 8da9e5f4 2019-01-12 stsp void *cancel_arg;
1303 512f0d0e 2019-01-02 stsp static const struct got_error *
1304 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
1305 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
1307 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1309 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1310 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1312 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
1313 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
1316 8da9e5f4 2019-01-12 stsp static const struct got_error *
1317 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1319 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1321 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1322 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1324 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
1325 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1328 9d31a1d8 2018-03-11 stsp static const struct got_error *
1329 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
1331 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1332 8da9e5f4 2019-01-12 stsp const struct got_error *err;
1333 8da9e5f4 2019-01-12 stsp char *path;
1335 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1336 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1338 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
1339 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
1341 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1343 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
1344 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
1346 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
1347 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1349 8da9e5f4 2019-01-12 stsp free(path);
1350 0cd1c46a 2019-03-11 stsp return err;
1353 818c7501 2019-07-11 stsp static const struct got_error *
1354 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
1356 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
1357 0647c563 2019-03-11 stsp char *uuidstr = NULL;
1358 0cd1c46a 2019-03-11 stsp uint32_t uuid_status;
1360 517bab73 2019-03-11 stsp *refname = NULL;
1362 0cd1c46a 2019-03-11 stsp uuid_to_string(&worktree->uuid, &uuidstr, &uuid_status);
1363 0cd1c46a 2019-03-11 stsp if (uuid_status != uuid_s_ok)
1364 0cd1c46a 2019-03-11 stsp return got_error_uuid(uuid_status);
1366 818c7501 2019-07-11 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr)
1368 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1369 0647c563 2019-03-11 stsp *refname = NULL;
1371 517bab73 2019-03-11 stsp free(uuidstr);
1372 517bab73 2019-03-11 stsp return err;
1375 818c7501 2019-07-11 stsp const struct got_error *
1376 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
1378 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
1381 818c7501 2019-07-11 stsp static const struct got_error *
1382 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
1384 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1385 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
1388 818c7501 2019-07-11 stsp static const struct got_error *
1389 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
1391 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
1394 818c7501 2019-07-11 stsp static const struct got_error *
1395 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
1397 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1398 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
1401 818c7501 2019-07-11 stsp static const struct got_error *
1402 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
1404 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1405 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
1410 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
1411 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
1413 517bab73 2019-03-11 stsp static const struct got_error *
1414 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
1416 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
1417 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
1418 517bab73 2019-03-11 stsp char *refname;
1420 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
1422 517bab73 2019-03-11 stsp return err;
1424 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
1426 0cd1c46a 2019-03-11 stsp goto done;
1428 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
1430 0cd1c46a 2019-03-11 stsp free(refname);
1432 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
1433 9d31a1d8 2018-03-11 stsp return err;
1436 ebf99748 2019-05-09 stsp static const struct got_error *
1437 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
1438 ebf99748 2019-05-09 stsp struct got_worktree *worktree)
1440 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
1441 ebf99748 2019-05-09 stsp FILE *index = NULL;
1443 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1444 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
1445 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
1446 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
1448 ebf99748 2019-05-09 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
1449 ebf99748 2019-05-09 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1450 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1451 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1452 ebf99748 2019-05-09 stsp goto done;
1455 ebf99748 2019-05-09 stsp index = fopen(*fileindex_path, "rb");
1456 ebf99748 2019-05-09 stsp if (index == NULL) {
1457 ebf99748 2019-05-09 stsp if (errno != ENOENT)
1458 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
1460 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
1461 ebf99748 2019-05-09 stsp if (fclose(index) != 0 && err == NULL)
1462 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
1465 ebf99748 2019-05-09 stsp if (err) {
1466 ebf99748 2019-05-09 stsp free(*fileindex_path);
1467 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1468 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
1469 ebf99748 2019-05-09 stsp *fileindex = NULL;
1471 ebf99748 2019-05-09 stsp return err;
1474 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
1475 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
1476 c932eeeb 2019-05-22 stsp const char *path;
1477 c932eeeb 2019-05-22 stsp size_t path_len;
1478 c932eeeb 2019-05-22 stsp const char *entry_name;
1479 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
1480 a484d721 2019-06-10 stsp void *progress_arg;
1483 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
1484 c932eeeb 2019-05-22 stsp static const struct got_error *
1485 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
1487 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
1489 c932eeeb 2019-05-22 stsp if (a->entry_name) {
1490 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
1491 c932eeeb 2019-05-22 stsp return NULL;
1492 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
1493 102ff934 2019-06-11 stsp return NULL;
1495 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
1496 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
1497 c932eeeb 2019-05-22 stsp return NULL;
1499 edd02c5e 2019-07-11 stsp if (a->progress_cb)
1500 edd02c5e 2019-07-11 stsp (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
1501 edd02c5e 2019-07-11 stsp ie->path);
1502 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
1503 c932eeeb 2019-05-22 stsp return NULL;
1506 9c6338c4 2019-06-02 stsp static const struct got_error *
1507 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
1509 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
1510 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
1511 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
1513 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
1514 9c6338c4 2019-06-02 stsp fileindex_path);
1516 9c6338c4 2019-06-02 stsp goto done;
1518 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
1520 9c6338c4 2019-06-02 stsp goto done;
1522 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
1523 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
1524 9c6338c4 2019-06-02 stsp fileindex_path);
1525 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
1528 9c6338c4 2019-06-02 stsp if (new_index)
1529 9c6338c4 2019-06-02 stsp fclose(new_index);
1530 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
1531 9c6338c4 2019-06-02 stsp return err;
1534 9d31a1d8 2018-03-11 stsp const struct got_error *
1535 c4cdcb68 2019-04-03 stsp got_worktree_checkout_files(struct got_worktree *worktree, const char *path,
1536 93a30277 2018-12-24 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1537 93a30277 2018-12-24 stsp void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1539 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
1540 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
1541 8da9e5f4 2019-01-12 stsp struct got_object_id *tree_id = NULL;
1542 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
1543 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
1544 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
1545 f44ffd20 2019-02-04 stsp struct got_fileindex_diff_tree_cb diff_cb;
1546 8da9e5f4 2019-01-12 stsp struct diff_cb_arg arg;
1547 c4cdcb68 2019-04-03 stsp char *relpath = NULL, *entry_name = NULL;
1548 af12c6b9 2019-06-04 stsp struct bump_base_commit_id_arg bbc_arg;
1550 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
1552 9d31a1d8 2018-03-11 stsp return err;
1555 51514078 2018-12-25 stsp * Read the file index.
1556 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
1557 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
1559 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
1561 ebf99748 2019-05-09 stsp goto done;
1563 0cd1c46a 2019-03-11 stsp err = ref_base_commit(worktree, repo);
1565 0cd1c46a 2019-03-11 stsp goto done;
1567 eaccb85f 2018-12-25 stsp err = got_object_open_as_commit(&commit, repo,
1568 eaccb85f 2018-12-25 stsp worktree->base_commit_id);
1570 9d31a1d8 2018-03-11 stsp goto done;
1572 c4cdcb68 2019-04-03 stsp if (path[0]) {
1573 c4cdcb68 2019-04-03 stsp char *tree_path;
1574 c4cdcb68 2019-04-03 stsp int obj_type;
1575 c4cdcb68 2019-04-03 stsp relpath = strdup(path);
1576 c4cdcb68 2019-04-03 stsp if (relpath == NULL) {
1577 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1578 c4cdcb68 2019-04-03 stsp goto done;
1580 c4cdcb68 2019-04-03 stsp if (asprintf(&tree_path, "%s%s%s", worktree->path_prefix,
1581 c4cdcb68 2019-04-03 stsp got_path_is_root_dir(worktree->path_prefix) ? "" : "/",
1582 c4cdcb68 2019-04-03 stsp path) == -1) {
1583 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1584 c4cdcb68 2019-04-03 stsp goto done;
1586 c4cdcb68 2019-04-03 stsp err = got_object_id_by_path(&tree_id, repo,
1587 c4cdcb68 2019-04-03 stsp worktree->base_commit_id, tree_path);
1588 c4cdcb68 2019-04-03 stsp free(tree_path);
1590 c4cdcb68 2019-04-03 stsp goto done;
1591 c4cdcb68 2019-04-03 stsp err = got_object_get_type(&obj_type, repo, tree_id);
1593 c4cdcb68 2019-04-03 stsp goto done;
1594 c4cdcb68 2019-04-03 stsp if (obj_type == GOT_OBJ_TYPE_BLOB) {
1595 c4cdcb68 2019-04-03 stsp /* Split provided path into parent dir + entry name. */
1596 c4cdcb68 2019-04-03 stsp if (strchr(path, '/') == NULL) {
1597 c4cdcb68 2019-04-03 stsp relpath = strdup("");
1598 c4cdcb68 2019-04-03 stsp if (relpath == NULL) {
1599 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1600 c4cdcb68 2019-04-03 stsp goto done;
1602 c4cdcb68 2019-04-03 stsp tree_path = strdup(worktree->path_prefix);
1603 c4cdcb68 2019-04-03 stsp if (tree_path == NULL) {
1604 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1605 c4cdcb68 2019-04-03 stsp goto done;
1608 c4cdcb68 2019-04-03 stsp err = got_path_dirname(&relpath, path);
1610 c4cdcb68 2019-04-03 stsp goto done;
1611 c4cdcb68 2019-04-03 stsp if (asprintf(&tree_path, "%s%s%s",
1612 c4cdcb68 2019-04-03 stsp worktree->path_prefix,
1613 c4cdcb68 2019-04-03 stsp got_path_is_root_dir(
1614 c4cdcb68 2019-04-03 stsp worktree->path_prefix) ? "" : "/",
1615 c4cdcb68 2019-04-03 stsp relpath) == -1) {
1616 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1617 c4cdcb68 2019-04-03 stsp goto done;
1620 c4cdcb68 2019-04-03 stsp err = got_object_id_by_path(&tree_id, repo,
1621 c4cdcb68 2019-04-03 stsp worktree->base_commit_id, tree_path);
1622 c4cdcb68 2019-04-03 stsp free(tree_path);
1624 c4cdcb68 2019-04-03 stsp goto done;
1625 c4cdcb68 2019-04-03 stsp entry_name = basename(path);
1626 c4cdcb68 2019-04-03 stsp if (entry_name == NULL) {
1627 638f9024 2019-05-13 stsp err = got_error_from_errno2("basename", path);
1628 c4cdcb68 2019-04-03 stsp goto done;
1632 c4cdcb68 2019-04-03 stsp relpath = strdup("");
1633 c4cdcb68 2019-04-03 stsp if (relpath == NULL) {
1634 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1635 c4cdcb68 2019-04-03 stsp goto done;
1637 c4cdcb68 2019-04-03 stsp err = got_object_id_by_path(&tree_id, repo,
1638 c4cdcb68 2019-04-03 stsp worktree->base_commit_id, worktree->path_prefix);
1640 c4cdcb68 2019-04-03 stsp goto done;
1643 8da9e5f4 2019-01-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1645 c4cdcb68 2019-04-03 stsp goto done;
1647 c4cdcb68 2019-04-03 stsp if (entry_name &&
1648 c4cdcb68 2019-04-03 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
1649 c4cdcb68 2019-04-03 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
1650 8da9e5f4 2019-01-12 stsp goto done;
1653 8da9e5f4 2019-01-12 stsp diff_cb.diff_old_new = diff_old_new;
1654 8da9e5f4 2019-01-12 stsp diff_cb.diff_old = diff_old;
1655 8da9e5f4 2019-01-12 stsp diff_cb.diff_new = diff_new;
1656 8da9e5f4 2019-01-12 stsp arg.fileindex = fileindex;
1657 8da9e5f4 2019-01-12 stsp arg.worktree = worktree;
1658 8da9e5f4 2019-01-12 stsp arg.repo = repo;
1659 8da9e5f4 2019-01-12 stsp arg.progress_cb = progress_cb;
1660 8da9e5f4 2019-01-12 stsp arg.progress_arg = progress_arg;
1661 8da9e5f4 2019-01-12 stsp arg.cancel_cb = cancel_cb;
1662 8da9e5f4 2019-01-12 stsp arg.cancel_arg = cancel_arg;
1663 af12c6b9 2019-06-04 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
1664 c4cdcb68 2019-04-03 stsp entry_name, repo, &diff_cb, &arg);
1666 af12c6b9 2019-06-04 stsp goto sync;
1668 af12c6b9 2019-06-04 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
1669 af12c6b9 2019-06-04 stsp bbc_arg.entry_name = entry_name;
1670 af12c6b9 2019-06-04 stsp bbc_arg.path = path;
1671 af12c6b9 2019-06-04 stsp bbc_arg.path_len = strlen(path);
1672 a484d721 2019-06-10 stsp bbc_arg.progress_cb = progress_cb;
1673 a484d721 2019-06-10 stsp bbc_arg.progress_arg = progress_arg;
1674 af12c6b9 2019-06-04 stsp err = got_fileindex_for_each_entry_safe(fileindex,
1675 af12c6b9 2019-06-04 stsp bump_base_commit_id, &bbc_arg);
1677 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
1678 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
1679 af12c6b9 2019-06-04 stsp err = sync_err;
1681 9c6338c4 2019-06-02 stsp free(fileindex_path);
1682 c4cdcb68 2019-04-03 stsp free(relpath);
1684 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
1685 9d31a1d8 2018-03-11 stsp if (commit)
1686 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
1687 7426bbfd 2018-12-24 stsp got_fileindex_free(fileindex);
1688 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
1689 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
1690 9d31a1d8 2018-03-11 stsp err = unlockerr;
1691 f8d1f275 2019-02-04 stsp return err;
1694 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
1695 234035bc 2019-06-01 stsp struct got_worktree *worktree;
1696 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
1697 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
1698 234035bc 2019-06-01 stsp void *progress_arg;
1699 234035bc 2019-06-01 stsp got_worktree_cancel_cb cancel_cb;
1700 234035bc 2019-06-01 stsp void *cancel_arg;
1701 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
1704 234035bc 2019-06-01 stsp static const struct got_error *
1705 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
1706 234035bc 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
1707 234035bc 2019-06-01 stsp struct got_object_id *id2, const char *path1, const char *path2,
1708 234035bc 2019-06-01 stsp struct got_repository *repo)
1710 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
1711 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
1712 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
1713 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
1714 234035bc 2019-06-01 stsp struct stat sb;
1715 234035bc 2019-06-01 stsp unsigned char status;
1716 234035bc 2019-06-01 stsp int local_changes_subsumed;
1718 234035bc 2019-06-01 stsp if (blob1 && blob2) {
1719 234035bc 2019-06-01 stsp ie = got_fileindex_entry_get(a->fileindex, path2);
1720 234035bc 2019-06-01 stsp if (ie == NULL) {
1721 234035bc 2019-06-01 stsp (*a->progress_cb)(a->progress_arg, GOT_STATUS_MISSING,
1723 234035bc 2019-06-01 stsp return NULL;
1726 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1727 234035bc 2019-06-01 stsp path2) == -1)
1728 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
1730 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1732 234035bc 2019-06-01 stsp goto done;
1734 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
1735 234035bc 2019-06-01 stsp (*a->progress_cb)(a->progress_arg, GOT_STATUS_MERGE,
1737 234035bc 2019-06-01 stsp goto done;
1739 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
1740 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
1741 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
1742 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
1743 234035bc 2019-06-01 stsp (*a->progress_cb)(a->progress_arg, status, path2);
1744 234035bc 2019-06-01 stsp goto done;
1747 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree, blob1,
1748 818c7501 2019-07-11 stsp ondisk_path, path2, sb.st_mode, blob2, a->commit_id2, repo,
1749 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
1750 234035bc 2019-06-01 stsp } else if (blob1) {
1751 234035bc 2019-06-01 stsp ie = got_fileindex_entry_get(a->fileindex, path1);
1752 234035bc 2019-06-01 stsp if (ie == NULL) {
1753 234035bc 2019-06-01 stsp (*a->progress_cb)(a->progress_arg, GOT_STATUS_MISSING,
1755 234035bc 2019-06-01 stsp return NULL;
1758 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1759 2b92fad7 2019-06-02 stsp path1) == -1)
1760 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
1762 2b92fad7 2019-06-02 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1764 2b92fad7 2019-06-02 stsp goto done;
1766 2b92fad7 2019-06-02 stsp switch (status) {
1767 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
1768 2b92fad7 2019-06-02 stsp (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
1770 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
1772 2b92fad7 2019-06-02 stsp goto done;
1774 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
1776 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
1777 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
1778 2b92fad7 2019-06-02 stsp (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
1781 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
1783 2b92fad7 2019-06-02 stsp case GOT_STATUS_ADD:
1784 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
1785 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
1786 2b92fad7 2019-06-02 stsp (*a->progress_cb)(a->progress_arg,
1787 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
1789 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
1790 2b92fad7 2019-06-02 stsp (*a->progress_cb)(a->progress_arg, status, path1);
1795 234035bc 2019-06-01 stsp } else if (blob2) {
1796 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1797 234035bc 2019-06-01 stsp path2) == -1)
1798 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
1799 234035bc 2019-06-01 stsp ie = got_fileindex_entry_get(a->fileindex, path2);
1801 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
1804 234035bc 2019-06-01 stsp goto done;
1805 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
1806 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
1807 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
1808 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
1809 234035bc 2019-06-01 stsp (*a->progress_cb)(a->progress_arg, status,
1811 234035bc 2019-06-01 stsp goto done;
1813 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
1814 818c7501 2019-07-11 stsp NULL, ondisk_path, path2, sb.st_mode, blob2,
1815 818c7501 2019-07-11 stsp a->commit_id2, repo,
1816 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
1817 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
1818 234035bc 2019-06-01 stsp err = update_blob_fileindex_entry(a->worktree,
1819 234035bc 2019-06-01 stsp a->fileindex, ie, ondisk_path, ie->path,
1820 234035bc 2019-06-01 stsp blob2, 0);
1822 234035bc 2019-06-01 stsp goto done;
1825 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
1826 234035bc 2019-06-01 stsp err = install_blob(a->worktree, ondisk_path, path2,
1827 234035bc 2019-06-01 stsp /* XXX get this from parent tree! */
1828 234035bc 2019-06-01 stsp GOT_DEFAULT_FILE_MODE,
1829 234035bc 2019-06-01 stsp sb.st_mode, blob2, 0, 0, repo,
1830 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
1832 234035bc 2019-06-01 stsp goto done;
1833 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_alloc(&ie,
1834 2b92fad7 2019-06-02 stsp ondisk_path, path2, NULL, NULL);
1836 234035bc 2019-06-01 stsp goto done;
1837 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
1838 2b92fad7 2019-06-02 stsp if (err) {
1839 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
1840 2b92fad7 2019-06-02 stsp goto done;
1845 234035bc 2019-06-01 stsp free(ondisk_path);
1846 234035bc 2019-06-01 stsp return err;
1849 234035bc 2019-06-01 stsp struct check_merge_ok_arg {
1850 234035bc 2019-06-01 stsp struct got_worktree *worktree;
1851 234035bc 2019-06-01 stsp struct got_repository *repo;
1854 234035bc 2019-06-01 stsp static const struct got_error *
1855 234035bc 2019-06-01 stsp check_merge_ok(void *arg, struct got_fileindex_entry *ie)
1857 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
1858 234035bc 2019-06-01 stsp struct check_merge_ok_arg *a = arg;
1859 234035bc 2019-06-01 stsp unsigned char status;
1860 234035bc 2019-06-01 stsp struct stat sb;
1861 234035bc 2019-06-01 stsp char *ondisk_path;
1863 234035bc 2019-06-01 stsp /* Reject merges into a work tree with mixed base commits. */
1864 234035bc 2019-06-01 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
1865 234035bc 2019-06-01 stsp SHA1_DIGEST_LENGTH))
1866 234035bc 2019-06-01 stsp return got_error(GOT_ERR_MIXED_COMMITS);
1868 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
1870 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
1872 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
1873 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
1875 234035bc 2019-06-01 stsp return err;
1876 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
1877 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
1879 234035bc 2019-06-01 stsp return NULL;
1882 818c7501 2019-07-11 stsp static const struct got_error *
1883 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
1884 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
1885 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
1886 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
1887 818c7501 2019-07-11 stsp got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1889 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
1890 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
1891 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
1892 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
1894 03415a1a 2019-06-02 stsp if (commit_id1) {
1895 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
1896 03415a1a 2019-06-02 stsp worktree->path_prefix);
1898 03415a1a 2019-06-02 stsp goto done;
1900 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
1902 03415a1a 2019-06-02 stsp goto done;
1905 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
1906 234035bc 2019-06-01 stsp worktree->path_prefix);
1908 234035bc 2019-06-01 stsp goto done;
1910 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
1912 234035bc 2019-06-01 stsp goto done;
1914 234035bc 2019-06-01 stsp arg.worktree = worktree;
1915 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
1916 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
1917 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
1918 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
1919 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
1920 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
1921 234035bc 2019-06-01 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg);
1922 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
1923 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
1924 af12c6b9 2019-06-04 stsp err = sync_err;
1926 234035bc 2019-06-01 stsp if (tree1)
1927 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
1928 234035bc 2019-06-01 stsp if (tree2)
1929 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
1930 818c7501 2019-07-11 stsp return err;
1933 818c7501 2019-07-11 stsp const struct got_error *
1934 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
1935 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
1936 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1937 818c7501 2019-07-11 stsp void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1939 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
1940 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
1941 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
1942 818c7501 2019-07-11 stsp struct check_merge_ok_arg mok_arg;
1944 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
1946 818c7501 2019-07-11 stsp return err;
1948 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
1950 818c7501 2019-07-11 stsp goto done;
1952 818c7501 2019-07-11 stsp mok_arg.worktree = worktree;
1953 818c7501 2019-07-11 stsp mok_arg.repo = repo;
1954 818c7501 2019-07-11 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
1955 818c7501 2019-07-11 stsp &mok_arg);
1957 818c7501 2019-07-11 stsp goto done;
1959 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
1960 818c7501 2019-07-11 stsp commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
1962 818c7501 2019-07-11 stsp if (fileindex)
1963 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
1964 818c7501 2019-07-11 stsp free(fileindex_path);
1965 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
1966 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
1967 234035bc 2019-06-01 stsp err = unlockerr;
1968 234035bc 2019-06-01 stsp return err;
1971 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
1972 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
1973 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
1974 927df6b7 2019-02-10 stsp const char *status_path;
1975 927df6b7 2019-02-10 stsp size_t status_path_len;
1976 f8d1f275 2019-02-04 stsp struct got_repository *repo;
1977 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
1978 f8d1f275 2019-02-04 stsp void *status_arg;
1979 f8d1f275 2019-02-04 stsp got_worktree_cancel_cb cancel_cb;
1980 f8d1f275 2019-02-04 stsp void *cancel_arg;
1983 f8d1f275 2019-02-04 stsp static const struct got_error *
1984 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
1985 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
1986 927df6b7 2019-02-10 stsp struct got_repository *repo)
1988 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
1989 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1990 927df6b7 2019-02-10 stsp struct stat sb;
1991 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
1993 927df6b7 2019-02-10 stsp err = get_file_status(&status, &sb, ie, abspath, repo);
1994 927df6b7 2019-02-10 stsp if (err == NULL && status != GOT_STATUS_NO_CHANGE) {
1995 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1996 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
1997 016a88dd 2019-05-13 stsp err = (*status_cb)(status_arg, status, ie->path, &blob_id,
1998 016a88dd 2019-05-13 stsp &commit_id);
2000 927df6b7 2019-02-10 stsp return err;
2003 927df6b7 2019-02-10 stsp static const struct got_error *
2004 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
2005 f8d1f275 2019-02-04 stsp struct dirent *de, const char *parent_path)
2007 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2008 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2009 f8d1f275 2019-02-04 stsp char *abspath;
2011 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2012 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2014 927df6b7 2019-02-10 stsp if (got_path_cmp(parent_path, a->status_path) != 0 &&
2015 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
2016 927df6b7 2019-02-10 stsp return NULL;
2018 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2019 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
2020 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
2021 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2023 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
2024 f8d1f275 2019-02-04 stsp de->d_name) == -1)
2025 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2028 927df6b7 2019-02-10 stsp err = report_file_status(ie, abspath, a->status_cb, a->status_arg,
2030 f8d1f275 2019-02-04 stsp free(abspath);
2031 9d31a1d8 2018-03-11 stsp return err;
2034 f8d1f275 2019-02-04 stsp static const struct got_error *
2035 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2037 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2038 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
2039 2ec1f75b 2019-03-26 stsp unsigned char status;
2041 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2042 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2044 927df6b7 2019-02-10 stsp if (!got_path_is_child(parent_path, a->status_path, a->status_path_len))
2045 927df6b7 2019-02-10 stsp return NULL;
2047 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2048 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2049 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
2050 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
2052 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
2053 016a88dd 2019-05-13 stsp return (*a->status_cb)(a->status_arg, status, ie->path, &blob_id,
2054 016a88dd 2019-05-13 stsp &commit_id);
2057 f8d1f275 2019-02-04 stsp static const struct got_error *
2058 f8d1f275 2019-02-04 stsp status_new(void *arg, struct dirent *de, const char *parent_path)
2060 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
2061 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2062 f8d1f275 2019-02-04 stsp char *path = NULL;
2064 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2065 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2067 f8d1f275 2019-02-04 stsp if (de->d_type == DT_DIR)
2068 2c201a36 2019-02-10 stsp return NULL;
2070 2c201a36 2019-02-10 stsp /* XXX ignore symlinks for now */
2071 2c201a36 2019-02-10 stsp if (de->d_type == DT_LNK)
2072 f8d1f275 2019-02-04 stsp return NULL;
2074 927df6b7 2019-02-10 stsp if (!got_path_is_child(parent_path, a->status_path, a->status_path_len))
2075 927df6b7 2019-02-10 stsp return NULL;
2077 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2078 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
2079 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2081 f8d1f275 2019-02-04 stsp path = de->d_name;
2084 b72f483a 2019-02-05 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED, path,
2085 016a88dd 2019-05-13 stsp NULL, NULL);
2086 f8d1f275 2019-02-04 stsp if (parent_path[0])
2087 f8d1f275 2019-02-04 stsp free(path);
2088 b72f483a 2019-02-05 stsp return err;
2091 f8d1f275 2019-02-04 stsp const struct got_error *
2092 927df6b7 2019-02-10 stsp got_worktree_status(struct got_worktree *worktree, const char *path,
2093 f8d1f275 2019-02-04 stsp struct got_repository *repo, got_worktree_status_cb status_cb,
2094 f8d1f275 2019-02-04 stsp void *status_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2096 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2097 f8d1f275 2019-02-04 stsp DIR *workdir = NULL;
2098 f8d1f275 2019-02-04 stsp char *fileindex_path = NULL;
2099 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex = NULL;
2100 f8d1f275 2019-02-04 stsp FILE *index = NULL;
2101 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
2102 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
2103 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
2105 f8d1f275 2019-02-04 stsp fileindex = got_fileindex_alloc();
2106 f8d1f275 2019-02-04 stsp if (fileindex == NULL) {
2107 638f9024 2019-05-13 stsp err = got_error_from_errno("got_fileindex_alloc");
2108 f8d1f275 2019-02-04 stsp goto done;
2111 f8d1f275 2019-02-04 stsp if (asprintf(&fileindex_path, "%s/%s/%s", worktree->root_path,
2112 f8d1f275 2019-02-04 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2113 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2114 f8d1f275 2019-02-04 stsp fileindex_path = NULL;
2115 f8d1f275 2019-02-04 stsp goto done;
2118 f8d1f275 2019-02-04 stsp index = fopen(fileindex_path, "rb");
2119 f8d1f275 2019-02-04 stsp if (index == NULL) {
2120 f8d1f275 2019-02-04 stsp if (errno != ENOENT) {
2121 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", fileindex_path);
2122 f8d1f275 2019-02-04 stsp goto done;
2125 f8d1f275 2019-02-04 stsp err = got_fileindex_read(fileindex, index);
2126 f8d1f275 2019-02-04 stsp fclose(index);
2128 f8d1f275 2019-02-04 stsp goto done;
2131 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
2132 927df6b7 2019-02-10 stsp worktree->root_path, path[0] ? "/" : "", path) == -1) {
2133 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2134 c513d110 2019-02-05 stsp goto done;
2136 927df6b7 2019-02-10 stsp workdir = opendir(ondisk_path);
2137 927df6b7 2019-02-10 stsp if (workdir == NULL) {
2138 2ec1f75b 2019-03-26 stsp if (errno == ENOTDIR || errno == ENOENT) {
2139 927df6b7 2019-02-10 stsp struct got_fileindex_entry *ie;
2140 927df6b7 2019-02-10 stsp ie = got_fileindex_entry_get(fileindex, path);
2141 927df6b7 2019-02-10 stsp if (ie == NULL) {
2142 927df6b7 2019-02-10 stsp err = got_error(GOT_ERR_BAD_PATH);
2143 927df6b7 2019-02-10 stsp goto done;
2145 927df6b7 2019-02-10 stsp err = report_file_status(ie, ondisk_path,
2146 927df6b7 2019-02-10 stsp status_cb, status_arg, repo);
2147 927df6b7 2019-02-10 stsp goto done;
2149 638f9024 2019-05-13 stsp err = got_error_from_errno2("opendir", ondisk_path);
2150 927df6b7 2019-02-10 stsp goto done;
2153 d43a8a88 2019-02-05 stsp fdiff_cb.diff_old_new = status_old_new;
2154 d43a8a88 2019-02-05 stsp fdiff_cb.diff_old = status_old;
2155 d43a8a88 2019-02-05 stsp fdiff_cb.diff_new = status_new;
2156 f8d1f275 2019-02-04 stsp arg.fileindex = fileindex;
2157 f8d1f275 2019-02-04 stsp arg.worktree = worktree;
2158 927df6b7 2019-02-10 stsp arg.status_path = path;
2159 927df6b7 2019-02-10 stsp arg.status_path_len = strlen(path);
2160 f8d1f275 2019-02-04 stsp arg.repo = repo;
2161 f8d1f275 2019-02-04 stsp arg.status_cb = status_cb;
2162 f8d1f275 2019-02-04 stsp arg.status_arg = status_arg;
2163 f8d1f275 2019-02-04 stsp arg.cancel_cb = cancel_cb;
2164 f8d1f275 2019-02-04 stsp arg.cancel_arg = cancel_arg;
2165 c7f4312f 2019-02-05 stsp err = got_fileindex_diff_dir(fileindex, workdir, worktree->root_path,
2166 927df6b7 2019-02-10 stsp path, repo, &fdiff_cb, &arg);
2168 f8d1f275 2019-02-04 stsp if (workdir)
2169 f8d1f275 2019-02-04 stsp closedir(workdir);
2170 927df6b7 2019-02-10 stsp free(ondisk_path);
2171 f8d1f275 2019-02-04 stsp free(fileindex_path);
2172 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
2173 f8d1f275 2019-02-04 stsp return err;
2176 6c7ab921 2019-03-18 stsp const struct got_error *
2177 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
2178 6c7ab921 2019-03-18 stsp const char *arg)
2180 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
2181 6c7ab921 2019-03-18 stsp char *resolved, *path = NULL;
2182 6c7ab921 2019-03-18 stsp size_t len;
2184 6c7ab921 2019-03-18 stsp *wt_path = NULL;
2186 6c7ab921 2019-03-18 stsp resolved = realpath(arg, NULL);
2187 6c7ab921 2019-03-18 stsp if (resolved == NULL)
2188 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", arg);
2190 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
2191 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
2192 6c7ab921 2019-03-18 stsp err = got_error(GOT_ERR_BAD_PATH);
2193 6c7ab921 2019-03-18 stsp goto done;
2196 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
2197 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
2198 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
2200 f6d88e1a 2019-05-29 stsp goto done;
2202 f6d88e1a 2019-05-29 stsp path = strdup("");
2203 f6d88e1a 2019-05-29 stsp if (path == NULL) {
2204 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
2205 f6d88e1a 2019-05-29 stsp goto done;
2209 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
2210 6c7ab921 2019-03-18 stsp len = strlen(path);
2211 6c7ab921 2019-03-18 stsp while (path[len - 1] == '/') {
2212 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
2216 6c7ab921 2019-03-18 stsp free(resolved);
2217 6c7ab921 2019-03-18 stsp if (err == NULL)
2218 6c7ab921 2019-03-18 stsp *wt_path = path;
2220 6c7ab921 2019-03-18 stsp free(path);
2221 d00136be 2019-03-26 stsp return err;
2224 07f5b47a 2019-06-02 stsp static const struct got_error *
2225 07f5b47a 2019-06-02 stsp schedule_addition(const char *ondisk_path, struct got_fileindex *fileindex,
2226 07f5b47a 2019-06-02 stsp const char *relpath, got_worktree_status_cb status_cb, void *status_arg,
2227 07f5b47a 2019-06-02 stsp struct got_repository *repo)
2229 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
2230 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
2232 07f5b47a 2019-06-02 stsp /* Re-adding an existing entry is a no-op. */
2233 07f5b47a 2019-06-02 stsp if (got_fileindex_entry_get(fileindex, relpath) != NULL)
2234 07f5b47a 2019-06-02 stsp return NULL;
2236 07f5b47a 2019-06-02 stsp err = got_fileindex_entry_alloc(&ie, ondisk_path, relpath, NULL, NULL);
2238 07f5b47a 2019-06-02 stsp return err;
2240 07f5b47a 2019-06-02 stsp err = got_fileindex_entry_add(fileindex, ie);
2241 07f5b47a 2019-06-02 stsp if (err) {
2242 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
2243 07f5b47a 2019-06-02 stsp return err;
2246 07f5b47a 2019-06-02 stsp return report_file_status(ie, relpath, status_cb, status_arg, repo);
2249 d00136be 2019-03-26 stsp const struct got_error *
2250 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
2251 1dd54920 2019-05-11 stsp struct got_pathlist_head *ondisk_paths,
2252 1dd54920 2019-05-11 stsp got_worktree_status_cb status_cb, void *status_arg,
2253 031a5338 2019-03-26 stsp struct got_repository *repo)
2255 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
2256 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2257 9c6338c4 2019-06-02 stsp FILE *index = NULL;
2258 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2259 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
2261 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
2263 d00136be 2019-03-26 stsp return err;
2266 d00136be 2019-03-26 stsp fileindex = got_fileindex_alloc();
2267 d00136be 2019-03-26 stsp if (fileindex == NULL) {
2268 638f9024 2019-05-13 stsp err = got_error_from_errno("got_fileindex_alloc");
2269 d00136be 2019-03-26 stsp goto done;
2272 d00136be 2019-03-26 stsp if (asprintf(&fileindex_path, "%s/%s/%s", worktree->root_path,
2273 d00136be 2019-03-26 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2274 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2275 d00136be 2019-03-26 stsp fileindex_path = NULL;
2276 d00136be 2019-03-26 stsp goto done;
2279 d00136be 2019-03-26 stsp index = fopen(fileindex_path, "rb");
2280 d00136be 2019-03-26 stsp if (index == NULL) {
2281 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", fileindex_path);
2282 d00136be 2019-03-26 stsp goto done;
2285 d00136be 2019-03-26 stsp err = got_fileindex_read(fileindex, index);
2287 d00136be 2019-03-26 stsp goto done;
2289 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, ondisk_paths, entry) {
2290 1dd54920 2019-05-11 stsp char *relpath;
2291 1dd54920 2019-05-11 stsp err = got_path_skip_common_ancestor(&relpath,
2292 1dd54920 2019-05-11 stsp got_worktree_get_root_path(worktree), pe->path);
2295 07f5b47a 2019-06-02 stsp err = schedule_addition(pe->path, fileindex, relpath,
2296 07f5b47a 2019-06-02 stsp status_cb, status_arg, repo);
2297 1dd54920 2019-05-11 stsp free(relpath);
2301 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2302 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2303 af12c6b9 2019-06-04 stsp err = sync_err;
2305 d00136be 2019-03-26 stsp if (index) {
2306 d00136be 2019-03-26 stsp if (fclose(index) != 0 && err == NULL)
2307 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2309 d00136be 2019-03-26 stsp if (fileindex)
2310 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
2311 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2312 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
2313 d00136be 2019-03-26 stsp err = unlockerr;
2314 6c7ab921 2019-03-18 stsp return err;
2317 17ed4618 2019-06-02 stsp static const struct got_error *
2318 17ed4618 2019-06-02 stsp schedule_for_deletion(const char *ondisk_path, struct got_fileindex *fileindex,
2319 17ed4618 2019-06-02 stsp const char *relpath, int delete_local_mods,
2320 17ed4618 2019-06-02 stsp got_worktree_status_cb status_cb, void *status_arg,
2321 17ed4618 2019-06-02 stsp struct got_repository *repo)
2323 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
2324 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
2325 17ed4618 2019-06-02 stsp unsigned char status;
2326 17ed4618 2019-06-02 stsp struct stat sb;
2328 17ed4618 2019-06-02 stsp ie = got_fileindex_entry_get(fileindex, relpath);
2329 17ed4618 2019-06-02 stsp if (ie == NULL)
2330 17ed4618 2019-06-02 stsp return got_error(GOT_ERR_BAD_PATH);
2332 17ed4618 2019-06-02 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2334 17ed4618 2019-06-02 stsp return err;
2336 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
2337 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
2338 17ed4618 2019-06-02 stsp return got_error_set_errno(ENOENT, ondisk_path);
2339 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_MODIFY)
2340 17ed4618 2019-06-02 stsp return got_error(GOT_ERR_FILE_STATUS);
2341 17ed4618 2019-06-02 stsp if (!delete_local_mods)
2342 17ed4618 2019-06-02 stsp return got_error(GOT_ERR_FILE_MODIFIED);
2345 17ed4618 2019-06-02 stsp if (unlink(ondisk_path) != 0)
2346 17ed4618 2019-06-02 stsp return got_error_from_errno2("unlink", ondisk_path);
2348 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2349 17ed4618 2019-06-02 stsp return report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
2352 2ec1f75b 2019-03-26 stsp const struct got_error *
2353 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
2354 17ed4618 2019-06-02 stsp struct got_pathlist_head *ondisk_paths, int delete_local_mods,
2355 2ec1f75b 2019-03-26 stsp got_worktree_status_cb status_cb, void *status_arg,
2356 2ec1f75b 2019-03-26 stsp struct got_repository *repo)
2358 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
2359 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
2360 9c6338c4 2019-06-02 stsp FILE *index = NULL;
2361 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2362 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
2364 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
2366 2ec1f75b 2019-03-26 stsp return err;
2368 2ec1f75b 2019-03-26 stsp fileindex = got_fileindex_alloc();
2369 2ec1f75b 2019-03-26 stsp if (fileindex == NULL) {
2370 638f9024 2019-05-13 stsp err = got_error_from_errno("got_fileindex_alloc");
2371 2ec1f75b 2019-03-26 stsp goto done;
2374 2ec1f75b 2019-03-26 stsp if (asprintf(&fileindex_path, "%s/%s/%s", worktree->root_path,
2375 2ec1f75b 2019-03-26 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2376 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2377 2ec1f75b 2019-03-26 stsp fileindex_path = NULL;
2378 2ec1f75b 2019-03-26 stsp goto done;
2381 2ec1f75b 2019-03-26 stsp index = fopen(fileindex_path, "rb");
2382 2ec1f75b 2019-03-26 stsp if (index == NULL) {
2383 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", fileindex_path);
2384 2ec1f75b 2019-03-26 stsp goto done;
2387 2ec1f75b 2019-03-26 stsp err = got_fileindex_read(fileindex, index);
2389 2ec1f75b 2019-03-26 stsp goto done;
2391 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, ondisk_paths, entry) {
2392 17ed4618 2019-06-02 stsp char *relpath;
2393 17ed4618 2019-06-02 stsp err = got_path_skip_common_ancestor(&relpath,
2394 17ed4618 2019-06-02 stsp got_worktree_get_root_path(worktree), pe->path);
2397 17ed4618 2019-06-02 stsp err = schedule_for_deletion(pe->path, fileindex, relpath,
2398 17ed4618 2019-06-02 stsp delete_local_mods, status_cb, status_arg, repo);
2399 17ed4618 2019-06-02 stsp free(relpath);
2403 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2404 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2405 af12c6b9 2019-06-04 stsp err = sync_err;
2407 2ec1f75b 2019-03-26 stsp if (index) {
2408 2ec1f75b 2019-03-26 stsp if (fclose(index) != 0 && err == NULL)
2409 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2411 2ec1f75b 2019-03-26 stsp if (fileindex)
2412 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
2413 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2414 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
2415 2ec1f75b 2019-03-26 stsp err = unlockerr;
2416 2ec1f75b 2019-03-26 stsp return err;
2419 e20a8b6f 2019-06-04 stsp static const struct got_error *
2420 e20a8b6f 2019-06-04 stsp revert_file(struct got_worktree *worktree, struct got_fileindex *fileindex,
2421 a129376b 2019-03-28 stsp const char *ondisk_path,
2422 a129376b 2019-03-28 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2423 a129376b 2019-03-28 stsp struct got_repository *repo)
2425 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
2426 e20a8b6f 2019-06-04 stsp char *relpath = NULL, *parent_path = NULL;
2427 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
2428 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
2429 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
2430 a129376b 2019-03-28 stsp const struct got_tree_entry *te;
2431 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
2432 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
2433 a129376b 2019-03-28 stsp unsigned char status;
2434 a129376b 2019-03-28 stsp struct stat sb;
2436 a129376b 2019-03-28 stsp err = got_path_skip_common_ancestor(&relpath,
2437 a129376b 2019-03-28 stsp got_worktree_get_root_path(worktree), ondisk_path);
2439 a129376b 2019-03-28 stsp goto done;
2441 a129376b 2019-03-28 stsp ie = got_fileindex_entry_get(fileindex, relpath);
2442 a129376b 2019-03-28 stsp if (ie == NULL) {
2443 a129376b 2019-03-28 stsp err = got_error(GOT_ERR_BAD_PATH);
2444 a129376b 2019-03-28 stsp goto done;
2447 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
2448 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
2449 a129376b 2019-03-28 stsp if (err) {
2450 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
2451 a129376b 2019-03-28 stsp goto done;
2452 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
2453 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
2454 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
2455 e20a8b6f 2019-06-04 stsp goto done;
2458 a129376b 2019-03-28 stsp if (got_path_is_root_dir(worktree->path_prefix)) {
2459 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
2460 a129376b 2019-03-28 stsp if (tree_path == NULL) {
2461 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
2462 a129376b 2019-03-28 stsp goto done;
2465 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
2466 a129376b 2019-03-28 stsp tree_path = strdup(worktree->path_prefix);
2467 a129376b 2019-03-28 stsp if (tree_path == NULL) {
2468 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
2469 a129376b 2019-03-28 stsp goto done;
2472 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
2473 a129376b 2019-03-28 stsp worktree->path_prefix, parent_path) == -1) {
2474 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2475 a129376b 2019-03-28 stsp goto done;
2480 a129376b 2019-03-28 stsp err = got_object_id_by_path(&tree_id, repo, worktree->base_commit_id,
2481 a129376b 2019-03-28 stsp tree_path);
2483 a129376b 2019-03-28 stsp goto done;
2485 a129376b 2019-03-28 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2487 a129376b 2019-03-28 stsp goto done;
2489 a129376b 2019-03-28 stsp te_name = basename(ie->path);
2490 a129376b 2019-03-28 stsp if (te_name == NULL) {
2491 638f9024 2019-05-13 stsp err = got_error_from_errno2("basename", ie->path);
2492 a129376b 2019-03-28 stsp goto done;
2495 a129376b 2019-03-28 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2497 a129376b 2019-03-28 stsp goto done;
2499 a129376b 2019-03-28 stsp te = got_object_tree_find_entry(tree, te_name);
2500 a129376b 2019-03-28 stsp if (te == NULL && status != GOT_STATUS_ADD) {
2501 a129376b 2019-03-28 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
2502 a129376b 2019-03-28 stsp goto done;
2505 a129376b 2019-03-28 stsp switch (status) {
2506 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
2507 a129376b 2019-03-28 stsp (*progress_cb)(progress_arg, GOT_STATUS_REVERT, ie->path);
2508 a129376b 2019-03-28 stsp got_fileindex_entry_remove(fileindex, ie);
2510 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
2511 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
2512 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
2513 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
2514 e20a8b6f 2019-06-04 stsp struct got_object_id id;
2515 a129376b 2019-03-28 stsp memcpy(id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2516 a129376b 2019-03-28 stsp err = got_object_open_as_blob(&blob, repo, &id, 8192);
2518 a129376b 2019-03-28 stsp goto done;
2519 a129376b 2019-03-28 stsp err = install_blob(worktree, ondisk_path, ie->path,
2520 a129376b 2019-03-28 stsp te->mode, sb.st_mode, blob, 0, 1, repo, progress_cb,
2521 a129376b 2019-03-28 stsp progress_arg);
2523 a129376b 2019-03-28 stsp goto done;
2524 a129376b 2019-03-28 stsp if (status == GOT_STATUS_DELETE) {
2525 a129376b 2019-03-28 stsp err = update_blob_fileindex_entry(worktree,
2526 a129376b 2019-03-28 stsp fileindex, ie, ondisk_path, ie->path, blob, 1);
2528 a129376b 2019-03-28 stsp goto done;
2533 a129376b 2019-03-28 stsp goto done;
2536 a129376b 2019-03-28 stsp free(relpath);
2537 e20a8b6f 2019-06-04 stsp free(parent_path);
2538 a129376b 2019-03-28 stsp free(tree_path);
2540 a129376b 2019-03-28 stsp got_object_blob_close(blob);
2542 a129376b 2019-03-28 stsp got_object_tree_close(tree);
2543 a129376b 2019-03-28 stsp free(tree_id);
2544 e20a8b6f 2019-06-04 stsp return err;
2547 e20a8b6f 2019-06-04 stsp const struct got_error *
2548 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
2549 e20a8b6f 2019-06-04 stsp struct got_pathlist_head *ondisk_paths,
2550 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2551 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
2553 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
2554 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
2555 e20a8b6f 2019-06-04 stsp FILE *index = NULL;
2556 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
2557 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
2558 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
2560 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
2562 e20a8b6f 2019-06-04 stsp return err;
2564 e20a8b6f 2019-06-04 stsp fileindex = got_fileindex_alloc();
2565 e20a8b6f 2019-06-04 stsp if (fileindex == NULL) {
2566 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("got_fileindex_alloc");
2567 e20a8b6f 2019-06-04 stsp goto done;
2570 e20a8b6f 2019-06-04 stsp if (asprintf(&fileindex_path, "%s/%s/%s", worktree->root_path,
2571 e20a8b6f 2019-06-04 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2572 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("asprintf");
2573 e20a8b6f 2019-06-04 stsp fileindex_path = NULL;
2574 e20a8b6f 2019-06-04 stsp goto done;
2577 e20a8b6f 2019-06-04 stsp index = fopen(fileindex_path, "rb");
2578 e20a8b6f 2019-06-04 stsp if (index == NULL) {
2579 e20a8b6f 2019-06-04 stsp err = got_error_from_errno2("fopen", fileindex_path);
2580 e20a8b6f 2019-06-04 stsp goto done;
2583 e20a8b6f 2019-06-04 stsp err = got_fileindex_read(fileindex, index);
2585 e20a8b6f 2019-06-04 stsp goto done;
2587 e20a8b6f 2019-06-04 stsp TAILQ_FOREACH(pe, ondisk_paths, entry) {
2588 e20a8b6f 2019-06-04 stsp err = revert_file(worktree, fileindex, pe->path,
2589 e20a8b6f 2019-06-04 stsp progress_cb, progress_arg, repo);
2593 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2594 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
2595 e20a8b6f 2019-06-04 stsp err = sync_err;
2597 a129376b 2019-03-28 stsp if (index) {
2598 a129376b 2019-03-28 stsp if (fclose(index) != 0 && err == NULL)
2599 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2601 a129376b 2019-03-28 stsp if (fileindex)
2602 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
2603 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2604 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
2605 a129376b 2019-03-28 stsp err = unlockerr;
2606 c4296144 2019-05-09 stsp return err;
2609 cf066bf8 2019-05-09 stsp static void
2610 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
2612 24519714 2019-05-09 stsp free(ct->path);
2613 44d03001 2019-05-09 stsp free(ct->in_repo_path);
2614 768aea60 2019-05-09 stsp free(ct->ondisk_path);
2615 e75eb4da 2019-05-10 stsp free(ct->blob_id);
2616 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
2617 b416585c 2019-05-13 stsp free(ct->base_commit_id);
2621 ed175427 2019-05-09 stsp struct collect_commitables_arg {
2622 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
2623 24519714 2019-05-09 stsp struct got_repository *repo;
2624 24519714 2019-05-09 stsp struct got_worktree *worktree;
2627 c4296144 2019-05-09 stsp static const struct got_error *
2628 036813ee 2019-05-09 stsp collect_commitables(void *arg, unsigned char status, const char *relpath,
2629 016a88dd 2019-05-13 stsp struct got_object_id *blob_id, struct got_object_id *commit_id)
2631 ed175427 2019-05-09 stsp struct collect_commitables_arg *a = arg;
2632 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
2633 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
2634 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
2635 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
2636 768aea60 2019-05-09 stsp struct stat sb;
2638 c4296144 2019-05-09 stsp if (status == GOT_STATUS_CONFLICT)
2639 c4296144 2019-05-09 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
2641 c4296144 2019-05-09 stsp if (status != GOT_STATUS_MODIFY && status != GOT_STATUS_ADD &&
2642 c4296144 2019-05-09 stsp status != GOT_STATUS_DELETE)
2643 c4296144 2019-05-09 stsp return NULL;
2645 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
2646 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2647 036813ee 2019-05-09 stsp goto done;
2649 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
2650 036813ee 2019-05-09 stsp parent_path = strdup("");
2651 69960a46 2019-05-09 stsp if (parent_path == NULL)
2652 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
2654 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
2656 69960a46 2019-05-09 stsp return err;
2659 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
2660 cf066bf8 2019-05-09 stsp if (ct == NULL) {
2661 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
2662 c4296144 2019-05-09 stsp goto done;
2665 768aea60 2019-05-09 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
2666 768aea60 2019-05-09 stsp relpath) == -1) {
2667 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2668 768aea60 2019-05-09 stsp goto done;
2670 768aea60 2019-05-09 stsp if (status == GOT_STATUS_DELETE) {
2671 768aea60 2019-05-09 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2673 768aea60 2019-05-09 stsp if (lstat(ct->ondisk_path, &sb) != 0) {
2674 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
2675 768aea60 2019-05-09 stsp goto done;
2677 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
2680 44d03001 2019-05-09 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
2681 44d03001 2019-05-09 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
2682 44d03001 2019-05-09 stsp relpath) == -1) {
2683 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2684 44d03001 2019-05-09 stsp goto done;
2687 cf066bf8 2019-05-09 stsp ct->status = status;
2688 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
2689 036813ee 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD) {
2690 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
2691 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
2692 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2693 b416585c 2019-05-13 stsp goto done;
2695 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
2696 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
2697 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2698 036813ee 2019-05-09 stsp goto done;
2701 24519714 2019-05-09 stsp ct->path = strdup(path);
2702 24519714 2019-05-09 stsp if (ct->path == NULL) {
2703 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
2704 24519714 2019-05-09 stsp goto done;
2706 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
2708 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
2709 ed175427 2019-05-09 stsp free_commitable(ct);
2710 24519714 2019-05-09 stsp free(parent_path);
2711 036813ee 2019-05-09 stsp free(path);
2712 a129376b 2019-03-28 stsp return err;
2715 036813ee 2019-05-09 stsp static const struct got_error *write_tree(struct got_object_id **,
2716 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
2717 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
2718 036813ee 2019-05-09 stsp struct got_repository *);
2720 ed175427 2019-05-09 stsp static const struct got_error *
2721 036813ee 2019-05-09 stsp write_subtree(struct got_object_id **new_subtree_id,
2722 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
2723 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
2724 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
2725 afa376bf 2019-05-09 stsp struct got_repository *repo)
2727 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
2728 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
2729 036813ee 2019-05-09 stsp char *subpath;
2731 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
2732 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
2733 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2735 036813ee 2019-05-09 stsp err = got_object_open_as_tree(&subtree, repo, te->id);
2737 ed175427 2019-05-09 stsp return err;
2739 036813ee 2019-05-09 stsp err = write_tree(new_subtree_id, subtree, subpath, commitable_paths,
2740 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
2741 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
2742 036813ee 2019-05-09 stsp free(subpath);
2743 036813ee 2019-05-09 stsp return err;
2746 036813ee 2019-05-09 stsp static const struct got_error *
2747 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
2749 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2750 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
2752 036813ee 2019-05-09 stsp *match = 0;
2754 036813ee 2019-05-09 stsp if (strchr(ct->path, '/') == NULL) {
2755 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
2756 0f63689d 2019-05-10 stsp return NULL;
2759 0f63689d 2019-05-10 stsp err = got_path_dirname(&ct_parent_path, ct->path);
2761 0f63689d 2019-05-10 stsp return err;
2762 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
2763 036813ee 2019-05-09 stsp free(ct_parent_path);
2764 036813ee 2019-05-09 stsp return err;
2767 768aea60 2019-05-09 stsp static mode_t
2768 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
2770 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
2773 036813ee 2019-05-09 stsp static const struct got_error *
2774 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
2775 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
2777 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2779 036813ee 2019-05-09 stsp *new_te = NULL;
2781 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
2783 036813ee 2019-05-09 stsp goto done;
2785 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
2787 036813ee 2019-05-09 stsp free((*new_te)->id);
2788 e75eb4da 2019-05-10 stsp (*new_te)->id = got_object_id_dup(ct->blob_id);
2789 036813ee 2019-05-09 stsp if ((*new_te)->id == NULL) {
2790 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2791 036813ee 2019-05-09 stsp goto done;
2794 036813ee 2019-05-09 stsp if (err && *new_te) {
2795 036813ee 2019-05-09 stsp got_object_tree_entry_close(*new_te);
2796 036813ee 2019-05-09 stsp *new_te = NULL;
2798 036813ee 2019-05-09 stsp return err;
2801 036813ee 2019-05-09 stsp static const struct got_error *
2802 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
2803 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
2805 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2806 036813ee 2019-05-09 stsp char *ct_name;
2808 036813ee 2019-05-09 stsp *new_te = NULL;
2810 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
2811 036813ee 2019-05-09 stsp if (*new_te == NULL)
2812 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
2814 036813ee 2019-05-09 stsp ct_name = basename(ct->path);
2815 036813ee 2019-05-09 stsp if (ct_name == NULL) {
2816 638f9024 2019-05-13 stsp err = got_error_from_errno2("basename", ct->path);
2817 036813ee 2019-05-09 stsp goto done;
2819 036813ee 2019-05-09 stsp (*new_te)->name = strdup(ct_name);
2820 036813ee 2019-05-09 stsp if ((*new_te)->name == NULL) {
2821 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
2822 036813ee 2019-05-09 stsp goto done;
2825 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
2827 e75eb4da 2019-05-10 stsp (*new_te)->id = got_object_id_dup(ct->blob_id);
2828 036813ee 2019-05-09 stsp if ((*new_te)->id == NULL) {
2829 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2830 036813ee 2019-05-09 stsp goto done;
2833 036813ee 2019-05-09 stsp if (err && *new_te) {
2834 036813ee 2019-05-09 stsp got_object_tree_entry_close(*new_te);
2835 036813ee 2019-05-09 stsp *new_te = NULL;
2837 036813ee 2019-05-09 stsp return err;
2840 036813ee 2019-05-09 stsp static const struct got_error *
2841 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
2842 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
2844 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2845 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
2847 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
2849 036813ee 2019-05-09 stsp return err;
2850 036813ee 2019-05-09 stsp if (new_pe == NULL)
2851 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
2852 036813ee 2019-05-09 stsp return NULL;
2855 afa376bf 2019-05-09 stsp static const struct got_error *
2856 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
2857 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
2859 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
2860 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
2861 afa376bf 2019-05-09 stsp ct_path++;
2862 016a88dd 2019-05-13 stsp return (*status_cb)(status_arg, ct->status, ct_path, ct->blob_id, NULL);
2865 036813ee 2019-05-09 stsp static const struct got_error *
2866 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
2867 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
2869 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
2870 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
2871 44d03001 2019-05-09 stsp char *te_path;
2873 44d03001 2019-05-09 stsp *modified = 0;
2875 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
2876 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
2877 44d03001 2019-05-09 stsp te->name) == -1)
2878 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2880 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
2881 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
2882 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
2883 44d03001 2019-05-09 stsp strlen(te_path));
2884 44d03001 2019-05-09 stsp if (*modified)
2888 44d03001 2019-05-09 stsp free(te_path);
2889 44d03001 2019-05-09 stsp return err;
2892 44d03001 2019-05-09 stsp static const struct got_error *
2893 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
2894 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
2895 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
2897 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2898 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
2900 036813ee 2019-05-09 stsp *ctp = NULL;
2902 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
2903 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
2904 036813ee 2019-05-09 stsp char *ct_name = NULL;
2905 036813ee 2019-05-09 stsp int path_matches;
2907 036813ee 2019-05-09 stsp if (ct->status != GOT_STATUS_MODIFY &&
2908 036813ee 2019-05-09 stsp ct->status != GOT_STATUS_DELETE)
2911 c4e12a88 2019-05-13 stsp if (got_object_id_cmp(ct->base_blob_id, te->id) != 0)
2914 036813ee 2019-05-09 stsp err = match_ct_parent_path(&path_matches, ct, base_tree_path);
2916 036813ee 2019-05-09 stsp return err;
2917 036813ee 2019-05-09 stsp if (!path_matches)
2920 036813ee 2019-05-09 stsp ct_name = basename(pe->path);
2921 036813ee 2019-05-09 stsp if (ct_name == NULL)
2922 638f9024 2019-05-13 stsp return got_error_from_errno2("basename", pe->path);
2924 036813ee 2019-05-09 stsp if (strcmp(te->name, ct_name) != 0)
2927 036813ee 2019-05-09 stsp *ctp = ct;
2931 2b496619 2019-07-10 stsp return err;
2934 2b496619 2019-07-10 stsp static const struct got_error *
2935 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
2936 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
2937 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
2938 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
2939 2b496619 2019-07-10 stsp struct got_repository *repo)
2941 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
2942 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
2943 2b496619 2019-07-10 stsp char *subtree_path;
2945 2b496619 2019-07-10 stsp *new_tep = NULL;
2947 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
2948 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
2949 2b496619 2019-07-10 stsp child_path) == -1)
2950 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
2952 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
2953 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
2954 2b496619 2019-07-10 stsp new_te->name = strdup(child_path);
2955 2b496619 2019-07-10 stsp if (new_te->name == NULL) {
2956 2b496619 2019-07-10 stsp err = got_error_from_errno("strdup");
2957 2b496619 2019-07-10 stsp got_object_tree_entry_close(new_te);
2958 2b496619 2019-07-10 stsp goto done;
2960 2b496619 2019-07-10 stsp err = write_tree(&new_te->id, NULL, subtree_path,
2961 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
2962 2b496619 2019-07-10 stsp if (err) {
2963 2b496619 2019-07-10 stsp got_object_tree_entry_close(new_te);
2964 2b496619 2019-07-10 stsp goto done;
2967 2b496619 2019-07-10 stsp free(subtree_path);
2968 2b496619 2019-07-10 stsp if (err == NULL)
2969 2b496619 2019-07-10 stsp *new_tep = new_te;
2970 036813ee 2019-05-09 stsp return err;
2973 036813ee 2019-05-09 stsp static const struct got_error *
2974 036813ee 2019-05-09 stsp write_tree(struct got_object_id **new_tree_id,
2975 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
2976 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
2977 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
2978 036813ee 2019-05-09 stsp struct got_repository *repo)
2980 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2981 036813ee 2019-05-09 stsp const struct got_tree_entries *base_entries = NULL;
2982 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
2983 036813ee 2019-05-09 stsp struct got_tree_entries new_tree_entries;
2984 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
2985 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
2987 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
2988 036813ee 2019-05-09 stsp new_tree_entries.nentries = 0;
2989 036813ee 2019-05-09 stsp SIMPLEQ_INIT(&new_tree_entries.head);
2991 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
2992 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
2993 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
2994 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
2996 a3df2849 2019-05-20 stsp if (ct->status != GOT_STATUS_ADD ||
2997 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
3000 036813ee 2019-05-09 stsp if (!got_path_is_child(pe->path, path_base_tree,
3001 2f51b5b3 2019-05-09 stsp strlen(path_base_tree)))
3004 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
3005 036813ee 2019-05-09 stsp pe->path);
3007 036813ee 2019-05-09 stsp goto done;
3009 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
3010 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
3011 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
3013 036813ee 2019-05-09 stsp goto done;
3014 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
3016 afa376bf 2019-05-09 stsp goto done;
3017 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
3018 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
3020 2f51b5b3 2019-05-09 stsp goto done;
3022 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
3023 2b496619 2019-07-10 stsp if (base_tree == NULL ||
3024 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
3025 2b496619 2019-07-10 stsp == NULL) {
3026 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
3027 2b496619 2019-07-10 stsp child_path, path_base_tree,
3028 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
3031 2b496619 2019-07-10 stsp goto done;
3032 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
3034 2b496619 2019-07-10 stsp goto done;
3039 2f51b5b3 2019-05-09 stsp if (base_tree) {
3040 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
3041 2f51b5b3 2019-05-09 stsp base_entries = got_object_tree_get_entries(base_tree);
3042 2f51b5b3 2019-05-09 stsp SIMPLEQ_FOREACH(te, &base_entries->head, entry) {
3043 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
3045 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
3046 44d03001 2019-05-09 stsp int modified;
3047 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
3049 036813ee 2019-05-09 stsp goto done;
3050 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
3051 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
3053 2f51b5b3 2019-05-09 stsp goto done;
3054 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
3055 44d03001 2019-05-09 stsp if (modified) {
3056 44d03001 2019-05-09 stsp free(new_te->id);
3057 44d03001 2019-05-09 stsp err = write_subtree(&new_te->id, te,
3058 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
3059 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
3061 44d03001 2019-05-09 stsp goto done;
3063 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
3065 036813ee 2019-05-09 stsp goto done;
3069 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
3070 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
3072 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
3073 2f51b5b3 2019-05-09 stsp if (ct->status == GOT_STATUS_MODIFY) {
3074 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
3075 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
3077 2f51b5b3 2019-05-09 stsp goto done;
3078 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
3080 2f51b5b3 2019-05-09 stsp goto done;
3082 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
3083 b416585c 2019-05-13 stsp status_arg);
3085 afa376bf 2019-05-09 stsp goto done;
3087 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
3088 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
3090 2f51b5b3 2019-05-09 stsp goto done;
3091 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
3093 2f51b5b3 2019-05-09 stsp goto done;
3098 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
3099 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, &paths, entry) {
3100 0b5cc0d6 2019-05-09 stsp struct got_tree_entry *te = pe->data;
3101 0b5cc0d6 2019-05-09 stsp new_tree_entries.nentries++;
3102 0b5cc0d6 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&new_tree_entries.head, te, entry);
3104 036813ee 2019-05-09 stsp err = got_object_tree_create(new_tree_id, &new_tree_entries, repo);
3106 ca2503ea 2019-05-09 stsp got_object_tree_entries_close(&new_tree_entries);
3107 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
3108 ed175427 2019-05-09 stsp return err;
3111 ebf99748 2019-05-09 stsp static const struct got_error *
3112 ebf99748 2019-05-09 stsp update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
3113 ebf99748 2019-05-09 stsp struct got_object_id *new_base_commit_id, struct got_worktree *worktree)
3115 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err;
3116 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
3117 ebf99748 2019-05-09 stsp struct got_fileindex *fileindex = NULL;
3118 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
3120 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3122 ebf99748 2019-05-09 stsp return err;
3124 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3125 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
3126 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3128 ebf99748 2019-05-09 stsp ie = got_fileindex_entry_get(fileindex, pe->path);
3130 ebf99748 2019-05-09 stsp if (ct->status == GOT_STATUS_DELETE) {
3131 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
3132 ebf99748 2019-05-09 stsp got_fileindex_entry_free(ie);
3134 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
3135 e75eb4da 2019-05-10 stsp ct->ondisk_path, ct->blob_id->sha1,
3136 ebf99748 2019-05-09 stsp new_base_commit_id->sha1, 1);
3138 ebf99748 2019-05-09 stsp err = got_fileindex_entry_alloc(&ie,
3139 e75eb4da 2019-05-10 stsp ct->ondisk_path, pe->path, ct->blob_id->sha1,
3140 ebf99748 2019-05-09 stsp new_base_commit_id->sha1);
3143 ebf99748 2019-05-09 stsp err = got_fileindex_entry_add(fileindex, ie);
3148 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3149 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3150 af12c6b9 2019-06-04 stsp err = sync_err;
3151 ebf99748 2019-05-09 stsp free(fileindex_path);
3152 ebf99748 2019-05-09 stsp got_fileindex_free(fileindex);
3153 d56d26ce 2019-05-10 stsp return err;
3156 d56d26ce 2019-05-10 stsp static const struct got_error *
3157 33ad4cbe 2019-05-12 jcs check_ct_out_of_date(struct got_commitable *ct, struct got_repository *repo,
3158 d56d26ce 2019-05-10 stsp struct got_object_id *head_commit_id)
3160 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
3161 1a36436d 2019-06-10 stsp struct got_object_id *id_in_head = NULL, *id = NULL;
3162 1a36436d 2019-06-10 stsp struct got_commit_object *commit = NULL;
3163 1a36436d 2019-06-10 stsp char *path = NULL;
3164 1a36436d 2019-06-10 stsp const char *ct_path = ct->in_repo_path;
3166 1a36436d 2019-06-10 stsp while (ct_path[0] == '/')
3167 1a36436d 2019-06-10 stsp ct_path++;
3170 1a36436d 2019-06-10 stsp * Ensure that no modifications were made to files *and their parents*
3171 1a36436d 2019-06-10 stsp * in commits between the file's base commit and the branch head.
3173 1a36436d 2019-06-10 stsp * Checking the parents is important for detecting conflicting tree
3174 1a36436d 2019-06-10 stsp * configurations (files or parent folders might have been moved,
3175 1a36436d 2019-06-10 stsp * deleted, added again, etc.). Such changes need to be merged with
3176 1a36436d 2019-06-10 stsp * local changes before a commit can occur.
3178 1a36436d 2019-06-10 stsp * The implication is that the file's (parent) entry in the root
3179 1a36436d 2019-06-10 stsp * directory must have the same ID in all relevant commits.
3181 b416585c 2019-05-13 stsp if (ct->status != GOT_STATUS_ADD) {
3182 1a36436d 2019-06-10 stsp struct got_object_qid *pid;
3183 1a36436d 2019-06-10 stsp char *slash;
3184 1a36436d 2019-06-10 stsp struct got_object_id *root_entry_id = NULL;
3186 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
3187 1a36436d 2019-06-10 stsp if (got_object_id_cmp(ct->base_commit_id, head_commit_id) == 0)
3188 1a36436d 2019-06-10 stsp return NULL;
3190 1a36436d 2019-06-10 stsp /* Compute the path to the root directory's entry. */
3191 1a36436d 2019-06-10 stsp path = strdup(ct_path);
3192 1a36436d 2019-06-10 stsp if (path == NULL) {
3193 1a36436d 2019-06-10 stsp err = got_error_from_errno("strdup");
3194 1a36436d 2019-06-10 stsp goto done;
3196 1a36436d 2019-06-10 stsp slash = strchr(path, '/');
3197 1a36436d 2019-06-10 stsp if (slash)
3198 1a36436d 2019-06-10 stsp *slash = '\0';
3200 1a36436d 2019-06-10 stsp err = got_object_open_as_commit(&commit, repo, head_commit_id);
3202 1a36436d 2019-06-10 stsp goto done;
3204 1a36436d 2019-06-10 stsp err = got_object_id_by_path(&root_entry_id, repo,
3205 1a36436d 2019-06-10 stsp head_commit_id, path);
3207 1a36436d 2019-06-10 stsp goto done;
3209 1a36436d 2019-06-10 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3210 1a36436d 2019-06-10 stsp while (pid) {
3211 1a36436d 2019-06-10 stsp struct got_commit_object *pcommit;
3213 1a36436d 2019-06-10 stsp err = got_object_id_by_path(&id, repo, pid->id, path);
3214 1a36436d 2019-06-10 stsp if (err) {
3215 1a36436d 2019-06-10 stsp if (err->code != GOT_ERR_NO_TREE_ENTRY)
3216 1a36436d 2019-06-10 stsp goto done;
3217 1a36436d 2019-06-10 stsp err = NULL;
3221 1a36436d 2019-06-10 stsp err = got_object_id_by_path(&id, repo, pid->id, path);
3223 1a36436d 2019-06-10 stsp goto done;
3225 1a36436d 2019-06-10 stsp if (got_object_id_cmp(id, root_entry_id) != 0) {
3226 1a36436d 2019-06-10 stsp err = got_error(GOT_ERR_COMMIT_OUT_OF_DATE);
3230 1a36436d 2019-06-10 stsp if (got_object_id_cmp(pid->id, ct->base_commit_id) == 0)
3231 1a36436d 2019-06-10 stsp break; /* all relevant commits scanned */
3233 1a36436d 2019-06-10 stsp err = got_object_open_as_commit(&pcommit, repo,
3236 1a36436d 2019-06-10 stsp goto done;
3238 1a36436d 2019-06-10 stsp got_object_commit_close(commit);
3239 1a36436d 2019-06-10 stsp commit = pcommit;
3240 1a36436d 2019-06-10 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(
3244 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
3245 1a36436d 2019-06-10 stsp err = got_object_id_by_path(&id_in_head, repo, head_commit_id,
3247 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3248 1a36436d 2019-06-10 stsp goto done;
3249 1a36436d 2019-06-10 stsp err = id_in_head ? got_error(GOT_ERR_COMMIT_OUT_OF_DATE) : NULL;
3252 1a36436d 2019-06-10 stsp if (commit)
3253 1a36436d 2019-06-10 stsp got_object_commit_close(commit);
3254 d56d26ce 2019-05-10 stsp free(id_in_head);
3256 1a36436d 2019-06-10 stsp free(path);
3257 1a36436d 2019-06-10 stsp return err;
3260 c4296144 2019-05-09 stsp const struct got_error *
3261 c4296144 2019-05-09 stsp got_worktree_commit(struct got_object_id **new_commit_id,
3262 c4296144 2019-05-09 stsp struct got_worktree *worktree, const char *ondisk_path,
3263 33ad4cbe 2019-05-12 jcs const char *author, const char *committer,
3264 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
3265 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3266 afa376bf 2019-05-09 stsp struct got_repository *repo)
3268 c4296144 2019-05-09 stsp const struct got_error *err = NULL, *unlockerr = NULL;
3269 ed175427 2019-05-09 stsp struct collect_commitables_arg cc_arg;
3270 036813ee 2019-05-09 stsp struct got_pathlist_head commitable_paths;
3271 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
3272 bc70eb79 2019-05-09 stsp char *relpath = NULL;
3273 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
3274 36a38700 2019-05-10 stsp struct got_reference *head_ref = NULL;
3275 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
3276 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id = NULL;
3277 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
3278 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
3279 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
3280 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
3281 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
3282 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
3283 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
3285 c4296144 2019-05-09 stsp *new_commit_id = NULL;
3287 036813ee 2019-05-09 stsp TAILQ_INIT(&commitable_paths);
3288 de18fc63 2019-05-09 stsp SIMPLEQ_INIT(&parent_ids);
3290 c4296144 2019-05-09 stsp if (ondisk_path) {
3291 c4296144 2019-05-09 stsp err = got_path_skip_common_ancestor(&relpath,
3292 c4296144 2019-05-09 stsp worktree->root_path, ondisk_path);
3294 c4296144 2019-05-09 stsp return err;
3297 c4296144 2019-05-09 stsp err = lock_worktree(worktree, LOCK_EX);
3299 c4296144 2019-05-09 stsp goto done;
3301 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
3303 36a38700 2019-05-10 stsp goto done;
3304 36a38700 2019-05-10 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
3306 09f5bd90 2019-05-09 stsp goto done;
3308 036813ee 2019-05-09 stsp cc_arg.commitable_paths = &commitable_paths;
3309 24519714 2019-05-09 stsp cc_arg.worktree = worktree;
3310 24519714 2019-05-09 stsp cc_arg.repo = repo;
3311 675c7539 2019-05-09 stsp err = got_worktree_status(worktree, relpath ? relpath : "",
3312 ed175427 2019-05-09 stsp repo, collect_commitables, &cc_arg, NULL, NULL);
3314 675c7539 2019-05-09 stsp goto done;
3316 33ad4cbe 2019-05-12 jcs if (TAILQ_EMPTY(&commitable_paths)) {
3317 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
3321 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
3323 588edf97 2019-05-10 stsp goto done;
3325 819f385b 2019-05-10 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
3326 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3327 d56d26ce 2019-05-10 stsp err = check_ct_out_of_date(ct, repo, head_commit_id);
3329 819f385b 2019-05-10 stsp goto done;
3332 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
3334 588edf97 2019-05-10 stsp goto done;
3336 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
3337 33ad4cbe 2019-05-12 jcs err = commit_msg_cb(&commitable_paths, &logmsg, commit_arg);
3342 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
3343 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
3347 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
3348 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
3349 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3350 cf066bf8 2019-05-09 stsp char *ondisk_path;
3352 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
3353 cf066bf8 2019-05-09 stsp ct->status != GOT_STATUS_MODIFY)
3356 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
3357 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
3358 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3359 cf066bf8 2019-05-09 stsp goto done;
3361 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
3362 a7055788 2019-05-09 stsp free(ondisk_path);
3364 cf066bf8 2019-05-09 stsp goto done;
3367 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
3368 588edf97 2019-05-10 stsp err = write_tree(&new_tree_id, head_tree, "/", &commitable_paths,
3369 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
3371 036813ee 2019-05-09 stsp goto done;
3373 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
3375 de18fc63 2019-05-09 stsp goto done;
3376 de18fc63 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
3377 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
3378 de18fc63 2019-05-09 stsp 1, author, time(NULL), committer, time(NULL), logmsg, repo);
3379 de18fc63 2019-05-09 stsp got_object_qid_free(pid);
3380 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
3381 33ad4cbe 2019-05-12 jcs free(logmsg);
3383 9d40349a 2019-05-09 stsp goto done;
3385 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
3386 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
3387 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
3388 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
3389 09f5bd90 2019-05-09 stsp goto done;
3391 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
3392 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
3394 09f5bd90 2019-05-09 stsp goto done;
3395 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
3397 ebf99748 2019-05-09 stsp goto done;
3398 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
3399 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
3400 09f5bd90 2019-05-09 stsp goto done;
3402 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
3403 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
3405 f2c16586 2019-05-09 stsp goto done;
3406 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
3408 f2c16586 2019-05-09 stsp goto done;
3410 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
3412 09f5bd90 2019-05-09 stsp goto done;
3414 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
3416 ebf99748 2019-05-09 stsp goto done;
3418 ebf99748 2019-05-09 stsp err = update_fileindex_after_commit(&commitable_paths,
3419 ebf99748 2019-05-09 stsp *new_commit_id, worktree);
3421 ebf99748 2019-05-09 stsp goto done;
3423 c4296144 2019-05-09 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3424 c4296144 2019-05-09 stsp if (unlockerr && err == NULL)
3425 c4296144 2019-05-09 stsp err = unlockerr;
3426 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
3427 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3428 ed175427 2019-05-09 stsp free_commitable(ct);
3430 036813ee 2019-05-09 stsp got_pathlist_free(&commitable_paths);
3431 588edf97 2019-05-10 stsp if (head_tree)
3432 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
3433 588edf97 2019-05-10 stsp if (head_commit)
3434 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
3435 c4296144 2019-05-09 stsp free(relpath);
3436 09f5bd90 2019-05-09 stsp free(head_commit_id);
3437 09f5bd90 2019-05-09 stsp free(head_commit_id2);
3438 36a38700 2019-05-10 stsp if (head_ref)
3439 36a38700 2019-05-10 stsp got_ref_close(head_ref);
3440 2f17228e 2019-05-12 stsp if (head_ref2) {
3441 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
3442 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
3443 2f17228e 2019-05-12 stsp err = unlockerr;
3444 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
3446 c4296144 2019-05-09 stsp return err;
3449 8656d6c4 2019-05-20 stsp const char *
3450 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
3452 8656d6c4 2019-05-20 stsp return ct->path;
3455 8656d6c4 2019-05-20 stsp unsigned int
3456 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
3458 8656d6c4 2019-05-20 stsp return ct->status;
3461 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
3462 818c7501 2019-07-11 stsp struct got_worktree *worktree;
3463 818c7501 2019-07-11 stsp struct got_repository *repo;
3464 818c7501 2019-07-11 stsp int rebase_in_progress;
3467 818c7501 2019-07-11 stsp static const struct got_error *
3468 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
3470 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
3471 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
3472 818c7501 2019-07-11 stsp unsigned char status;
3473 818c7501 2019-07-11 stsp struct stat sb;
3474 818c7501 2019-07-11 stsp char *ondisk_path;
3476 818c7501 2019-07-11 stsp if (!a->rebase_in_progress) {
3477 818c7501 2019-07-11 stsp /* Reject rebase of a work tree with mixed base commits. */
3478 818c7501 2019-07-11 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
3479 818c7501 2019-07-11 stsp SHA1_DIGEST_LENGTH))
3480 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MIXED_COMMITS);
3483 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3485 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
3487 818c7501 2019-07-11 stsp /* Reject rebase of a work tree with modified or conflicted files. */
3488 818c7501 2019-07-11 stsp err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
3489 818c7501 2019-07-11 stsp free(ondisk_path);
3491 818c7501 2019-07-11 stsp return err;
3493 818c7501 2019-07-11 stsp if (a->rebase_in_progress) {
3494 818c7501 2019-07-11 stsp if (status == GOT_STATUS_CONFLICT)
3495 818c7501 2019-07-11 stsp return got_error(GOT_ERR_CONFLICTS);
3496 818c7501 2019-07-11 stsp } else if (status != GOT_STATUS_NO_CHANGE)
3497 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
3499 818c7501 2019-07-11 stsp return NULL;
3502 818c7501 2019-07-11 stsp const struct got_error *
3503 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
3504 818c7501 2019-07-11 stsp struct got_reference **tmp_branch, struct got_worktree *worktree,
3505 818c7501 2019-07-11 stsp struct got_reference *branch, struct got_repository *repo)
3507 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
3508 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
3509 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
3510 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
3511 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
3512 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
3513 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
3515 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
3516 818c7501 2019-07-11 stsp *tmp_branch = NULL;
3518 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
3520 818c7501 2019-07-11 stsp return err;
3522 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3524 818c7501 2019-07-11 stsp goto done;
3526 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
3527 818c7501 2019-07-11 stsp ok_arg.repo = repo;
3528 818c7501 2019-07-11 stsp ok_arg.rebase_in_progress = 0;
3529 818c7501 2019-07-11 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_rebase_ok,
3532 818c7501 2019-07-11 stsp goto done;
3534 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3536 818c7501 2019-07-11 stsp goto done;
3538 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
3540 818c7501 2019-07-11 stsp goto done;
3542 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
3544 818c7501 2019-07-11 stsp goto done;
3546 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
3549 818c7501 2019-07-11 stsp goto done;
3551 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
3552 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
3554 818c7501 2019-07-11 stsp goto done;
3555 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
3557 818c7501 2019-07-11 stsp goto done;
3559 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
3561 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
3563 818c7501 2019-07-11 stsp goto done;
3565 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
3567 818c7501 2019-07-11 stsp goto done;
3569 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
3570 818c7501 2019-07-11 stsp worktree->base_commit_id);
3572 818c7501 2019-07-11 stsp goto done;
3573 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
3575 818c7501 2019-07-11 stsp goto done;
3577 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
3579 818c7501 2019-07-11 stsp goto done;
3581 818c7501 2019-07-11 stsp free(fileindex_path);
3582 818c7501 2019-07-11 stsp if (fileindex)
3583 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
3584 818c7501 2019-07-11 stsp free(tmp_branch_name);
3585 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
3586 818c7501 2019-07-11 stsp free(branch_ref_name);
3587 818c7501 2019-07-11 stsp if (branch_ref)
3588 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
3589 818c7501 2019-07-11 stsp if (wt_branch)
3590 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
3591 818c7501 2019-07-11 stsp if (err) {
3592 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
3593 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
3594 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
3596 818c7501 2019-07-11 stsp if (*tmp_branch) {
3597 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
3598 818c7501 2019-07-11 stsp *tmp_branch = NULL;
3600 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
3602 818c7501 2019-07-11 stsp return err;
3605 818c7501 2019-07-11 stsp const struct got_error *
3606 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
3607 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
3608 818c7501 2019-07-11 stsp struct got_reference **branch, struct got_worktree *worktree,
3609 818c7501 2019-07-11 stsp struct got_repository *repo)
3611 818c7501 2019-07-11 stsp const struct got_error *err;
3612 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
3613 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
3614 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
3616 818c7501 2019-07-11 stsp *commit_id = NULL;
3618 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3620 818c7501 2019-07-11 stsp return err;
3622 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
3624 818c7501 2019-07-11 stsp goto done;
3626 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
3628 818c7501 2019-07-11 stsp goto done;
3630 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
3632 818c7501 2019-07-11 stsp goto done;
3634 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
3636 818c7501 2019-07-11 stsp goto done;
3638 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
3639 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
3641 818c7501 2019-07-11 stsp goto done;
3643 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
3645 818c7501 2019-07-11 stsp goto done;
3647 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
3649 818c7501 2019-07-11 stsp goto done;
3651 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
3652 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
3654 818c7501 2019-07-11 stsp goto done;
3656 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
3658 818c7501 2019-07-11 stsp goto done;
3660 818c7501 2019-07-11 stsp free(commit_ref_name);
3661 818c7501 2019-07-11 stsp free(branch_ref_name);
3662 818c7501 2019-07-11 stsp if (commit_ref)
3663 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
3664 818c7501 2019-07-11 stsp if (branch_ref)
3665 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
3666 818c7501 2019-07-11 stsp if (err) {
3667 818c7501 2019-07-11 stsp free(*commit_id);
3668 818c7501 2019-07-11 stsp *commit_id = NULL;
3669 818c7501 2019-07-11 stsp if (*tmp_branch) {
3670 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
3671 818c7501 2019-07-11 stsp *tmp_branch = NULL;
3673 818c7501 2019-07-11 stsp if (*new_base_branch) {
3674 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
3675 818c7501 2019-07-11 stsp *new_base_branch = NULL;
3677 818c7501 2019-07-11 stsp if (*branch) {
3678 818c7501 2019-07-11 stsp got_ref_close(*branch);
3679 818c7501 2019-07-11 stsp *branch = NULL;
3682 818c7501 2019-07-11 stsp return err;
3685 818c7501 2019-07-11 stsp const struct got_error *
3686 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
3688 818c7501 2019-07-11 stsp const struct got_error *err;
3689 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
3691 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3693 818c7501 2019-07-11 stsp return err;
3695 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
3696 818c7501 2019-07-11 stsp free(tmp_branch_name);
3697 818c7501 2019-07-11 stsp return NULL;
3700 818c7501 2019-07-11 stsp static const struct got_error *
3701 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
3702 818c7501 2019-07-11 stsp char **logmsg, void *arg)
3704 818c7501 2019-07-11 stsp struct got_commit_object *commit = arg;
3706 818c7501 2019-07-11 stsp *logmsg = strdup(got_object_commit_get_logmsg(commit));
3707 818c7501 2019-07-11 stsp if (*logmsg == NULL)
3708 818c7501 2019-07-11 stsp return got_error_from_errno("strdup");
3710 818c7501 2019-07-11 stsp return NULL;
3713 818c7501 2019-07-11 stsp static const struct got_error *
3714 818c7501 2019-07-11 stsp rebase_status(void *arg, unsigned char status, const char *path,
3715 818c7501 2019-07-11 stsp struct got_object_id *blob_id, struct got_object_id *commit_id)
3717 818c7501 2019-07-11 stsp return NULL;
3720 818c7501 2019-07-11 stsp const struct got_error *
3721 818c7501 2019-07-11 stsp got_worktree_rebase_merge_files(struct got_worktree *worktree,
3722 818c7501 2019-07-11 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
3723 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3724 818c7501 2019-07-11 stsp void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
3726 818c7501 2019-07-11 stsp const struct got_error *err;
3727 818c7501 2019-07-11 stsp struct got_fileindex *fileindex;
3728 818c7501 2019-07-11 stsp char *fileindex_path, *commit_ref_name = NULL;
3729 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
3731 818c7501 2019-07-11 stsp /* Work tree is locked/unlocked during rebase prepartion/teardown. */
3733 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3735 818c7501 2019-07-11 stsp return err;
3737 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
3739 818c7501 2019-07-11 stsp goto done;
3740 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
3741 818c7501 2019-07-11 stsp if (err) {
3742 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
3743 818c7501 2019-07-11 stsp goto done;
3744 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
3746 818c7501 2019-07-11 stsp goto done;
3747 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
3749 818c7501 2019-07-11 stsp goto done;
3751 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
3754 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
3756 818c7501 2019-07-11 stsp goto done;
3757 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
3758 818c7501 2019-07-11 stsp free(stored_id);
3759 818c7501 2019-07-11 stsp if (cmp != 0) {
3760 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
3761 818c7501 2019-07-11 stsp goto done;
3765 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
3766 818c7501 2019-07-11 stsp parent_commit_id, commit_id, repo, progress_cb, progress_arg,
3767 818c7501 2019-07-11 stsp cancel_cb, cancel_arg);
3769 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
3770 818c7501 2019-07-11 stsp free(fileindex_path);
3771 818c7501 2019-07-11 stsp if (commit_ref)
3772 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
3773 edd02c5e 2019-07-11 stsp return err;
3776 edd02c5e 2019-07-11 stsp static const struct got_error *
3777 edd02c5e 2019-07-11 stsp bump_all_base_commit_ids(struct got_worktree *worktree,
3778 edd02c5e 2019-07-11 stsp struct got_object_id *base_commit_id)
3780 edd02c5e 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
3781 edd02c5e 2019-07-11 stsp struct got_fileindex *fileindex;
3782 edd02c5e 2019-07-11 stsp char *fileindex_path;
3783 edd02c5e 2019-07-11 stsp struct bump_base_commit_id_arg bbc_arg;
3785 edd02c5e 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3787 edd02c5e 2019-07-11 stsp return err;
3789 edd02c5e 2019-07-11 stsp bbc_arg.base_commit_id = base_commit_id;
3790 edd02c5e 2019-07-11 stsp bbc_arg.entry_name = NULL;
3791 edd02c5e 2019-07-11 stsp bbc_arg.path = "";
3792 edd02c5e 2019-07-11 stsp bbc_arg.path_len = 0;
3793 edd02c5e 2019-07-11 stsp bbc_arg.progress_cb = NULL;
3794 edd02c5e 2019-07-11 stsp bbc_arg.progress_arg = NULL;
3795 edd02c5e 2019-07-11 stsp err = got_fileindex_for_each_entry_safe(fileindex,
3796 edd02c5e 2019-07-11 stsp bump_base_commit_id, &bbc_arg);
3798 edd02c5e 2019-07-11 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3799 edd02c5e 2019-07-11 stsp if (sync_err && err == NULL)
3800 edd02c5e 2019-07-11 stsp err = sync_err;
3802 edd02c5e 2019-07-11 stsp got_fileindex_free(fileindex);
3803 edd02c5e 2019-07-11 stsp free(fileindex_path);
3804 818c7501 2019-07-11 stsp return err;
3807 818c7501 2019-07-11 stsp const struct got_error *
3808 818c7501 2019-07-11 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
3809 818c7501 2019-07-11 stsp struct got_worktree *worktree, struct got_reference *tmp_branch,
3810 818c7501 2019-07-11 stsp struct got_commit_object *orig_commit,
3811 818c7501 2019-07-11 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
3813 818c7501 2019-07-11 stsp const struct got_error *err;
3814 818c7501 2019-07-11 stsp char *commit_ref_name = NULL;
3815 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
3816 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
3818 818c7501 2019-07-11 stsp /* Work tree is locked/unlocked during rebase prepartion/teardown. */
3820 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
3822 818c7501 2019-07-11 stsp goto done;
3823 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
3825 818c7501 2019-07-11 stsp goto done;
3826 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
3828 818c7501 2019-07-11 stsp goto done;
3829 818c7501 2019-07-11 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
3830 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
3831 818c7501 2019-07-11 stsp goto done;
3834 818c7501 2019-07-11 stsp err = got_worktree_commit(new_commit_id, worktree, NULL,
3835 818c7501 2019-07-11 stsp got_object_commit_get_author(orig_commit),
3836 818c7501 2019-07-11 stsp got_object_commit_get_committer(orig_commit),
3837 818c7501 2019-07-11 stsp collect_rebase_commit_msg, orig_commit,
3838 818c7501 2019-07-11 stsp rebase_status, NULL, repo);
3839 ff0d2220 2019-07-11 stsp if (err) {
3840 ff0d2220 2019-07-11 stsp if (err->code == GOT_ERR_COMMIT_NO_CHANGES) {
3841 ff0d2220 2019-07-11 stsp /* No-op change; commit will be elided. */
3842 ff0d2220 2019-07-11 stsp err = got_ref_delete(commit_ref, repo);
3844 ff0d2220 2019-07-11 stsp goto done;
3845 ff0d2220 2019-07-11 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
3847 818c7501 2019-07-11 stsp goto done;
3850 edd02c5e 2019-07-11 stsp /* Prevent out-of-date errors during rebase of subsequent commits. */
3851 edd02c5e 2019-07-11 stsp err = bump_all_base_commit_ids(worktree, *new_commit_id);
3853 edd02c5e 2019-07-11 stsp goto done;
3855 818c7501 2019-07-11 stsp err = got_ref_delete(commit_ref, repo);
3857 818c7501 2019-07-11 stsp goto done;
3859 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
3861 818c7501 2019-07-11 stsp free(commit_ref_name);
3862 818c7501 2019-07-11 stsp if (commit_ref)
3863 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
3864 818c7501 2019-07-11 stsp if (err) {
3865 818c7501 2019-07-11 stsp free(*new_commit_id);
3866 818c7501 2019-07-11 stsp *new_commit_id = NULL;
3868 818c7501 2019-07-11 stsp return err;
3871 818c7501 2019-07-11 stsp const struct got_error *
3872 818c7501 2019-07-11 stsp got_worktree_rebase_postpone(struct got_worktree *worktree)
3874 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
3877 69844fba 2019-07-11 stsp static const struct got_error *
3878 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
3880 69844fba 2019-07-11 stsp const struct got_error *err;
3881 69844fba 2019-07-11 stsp struct got_reference *ref;
3883 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
3884 69844fba 2019-07-11 stsp if (err) {
3885 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
3886 69844fba 2019-07-11 stsp return NULL;
3887 69844fba 2019-07-11 stsp return err;
3890 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
3891 69844fba 2019-07-11 stsp got_ref_close(ref);
3892 69844fba 2019-07-11 stsp return err;
3895 69844fba 2019-07-11 stsp static const struct got_error *
3896 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
3898 69844fba 2019-07-11 stsp const struct got_error *err;
3899 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
3900 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
3902 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3904 69844fba 2019-07-11 stsp goto done;
3905 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
3907 69844fba 2019-07-11 stsp goto done;
3909 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
3911 69844fba 2019-07-11 stsp goto done;
3912 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
3914 69844fba 2019-07-11 stsp goto done;
3916 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
3918 69844fba 2019-07-11 stsp goto done;
3919 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
3921 69844fba 2019-07-11 stsp goto done;
3923 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
3925 69844fba 2019-07-11 stsp goto done;
3926 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
3928 69844fba 2019-07-11 stsp goto done;
3931 69844fba 2019-07-11 stsp free(tmp_branch_name);
3932 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
3933 69844fba 2019-07-11 stsp free(branch_ref_name);
3934 69844fba 2019-07-11 stsp free(commit_ref_name);
3935 69844fba 2019-07-11 stsp return err;
3938 818c7501 2019-07-11 stsp const struct got_error *
3939 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
3940 818c7501 2019-07-11 stsp struct got_reference *new_base_branch, struct got_reference *tmp_branch,
3941 818c7501 2019-07-11 stsp struct got_reference *rebased_branch,
3942 818c7501 2019-07-11 stsp struct got_repository *repo)
3944 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
3945 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
3947 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
3949 818c7501 2019-07-11 stsp return err;
3951 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
3953 818c7501 2019-07-11 stsp goto done;
3955 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
3957 818c7501 2019-07-11 stsp goto done;
3959 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
3961 818c7501 2019-07-11 stsp goto done;
3963 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
3965 818c7501 2019-07-11 stsp free(new_head_commit_id);
3966 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3967 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
3968 818c7501 2019-07-11 stsp err = unlockerr;
3969 818c7501 2019-07-11 stsp return err;
3972 818c7501 2019-07-11 stsp struct collect_revertible_paths_arg {
3973 818c7501 2019-07-11 stsp struct got_pathlist_head *revertible_paths;
3974 818c7501 2019-07-11 stsp struct got_worktree *worktree;
3977 818c7501 2019-07-11 stsp static const struct got_error *
3978 818c7501 2019-07-11 stsp collect_revertible_paths(void *arg, unsigned char status, const char *relpath,
3979 818c7501 2019-07-11 stsp struct got_object_id *blob_id, struct got_object_id *commit_id)
3981 818c7501 2019-07-11 stsp struct collect_revertible_paths_arg *a = arg;
3982 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
3983 818c7501 2019-07-11 stsp struct got_pathlist_entry *new = NULL;
3984 818c7501 2019-07-11 stsp char *path = NULL;
3986 818c7501 2019-07-11 stsp if (status != GOT_STATUS_ADD &&
3987 818c7501 2019-07-11 stsp status != GOT_STATUS_DELETE &&
3988 818c7501 2019-07-11 stsp status != GOT_STATUS_MODIFY &&
3989 818c7501 2019-07-11 stsp status != GOT_STATUS_CONFLICT &&
3990 818c7501 2019-07-11 stsp status != GOT_STATUS_MISSING)
3991 818c7501 2019-07-11 stsp return NULL;
3993 818c7501 2019-07-11 stsp if (asprintf(&path, "%s/%s", a->worktree->root_path, relpath) == -1)
3994 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
3996 818c7501 2019-07-11 stsp err = got_pathlist_insert(&new, a->revertible_paths, path, NULL);
3997 818c7501 2019-07-11 stsp if (err || new == NULL)
3998 818c7501 2019-07-11 stsp free(path);
3999 818c7501 2019-07-11 stsp return err;
4002 818c7501 2019-07-11 stsp const struct got_error *
4003 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
4004 818c7501 2019-07-11 stsp struct got_repository *repo, struct got_reference *new_base_branch,
4005 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
4007 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
4008 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
4009 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
4010 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
4011 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
4012 818c7501 2019-07-11 stsp struct got_pathlist_head revertible_paths;
4013 818c7501 2019-07-11 stsp struct got_pathlist_entry *pe;
4014 818c7501 2019-07-11 stsp struct collect_revertible_paths_arg crp_arg;
4016 818c7501 2019-07-11 stsp TAILQ_INIT(&revertible_paths);
4018 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
4020 818c7501 2019-07-11 stsp return err;
4022 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4024 818c7501 2019-07-11 stsp goto done;
4026 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
4027 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
4029 818c7501 2019-07-11 stsp goto done;
4031 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
4033 818c7501 2019-07-11 stsp goto done;
4036 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
4037 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
4038 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
4040 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
4042 818c7501 2019-07-11 stsp goto done;
4044 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
4046 818c7501 2019-07-11 stsp goto done;
4048 818c7501 2019-07-11 stsp err = got_worktree_checkout_files(worktree, "", repo, progress_cb,
4049 818c7501 2019-07-11 stsp progress_arg, NULL, NULL);
4051 818c7501 2019-07-11 stsp goto done;
4053 818c7501 2019-07-11 stsp crp_arg.revertible_paths = &revertible_paths;
4054 818c7501 2019-07-11 stsp crp_arg.worktree = worktree;
4055 818c7501 2019-07-11 stsp err = got_worktree_status(worktree, "", repo,
4056 818c7501 2019-07-11 stsp collect_revertible_paths, &crp_arg, NULL, NULL);
4058 818c7501 2019-07-11 stsp goto done;
4060 818c7501 2019-07-11 stsp TAILQ_FOREACH(pe, &revertible_paths, entry) {
4061 818c7501 2019-07-11 stsp err = revert_file(worktree, fileindex, pe->path,
4062 818c7501 2019-07-11 stsp progress_cb, progress_arg, repo);
4064 69844fba 2019-07-11 stsp goto done;
4067 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
4069 818c7501 2019-07-11 stsp got_ref_close(resolved);
4070 818c7501 2019-07-11 stsp free(commit_id);
4071 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
4072 818c7501 2019-07-11 stsp free(fileindex_path);
4073 818c7501 2019-07-11 stsp TAILQ_FOREACH(pe, &revertible_paths, entry)
4074 818c7501 2019-07-11 stsp free((char *)pe->path);
4075 818c7501 2019-07-11 stsp got_pathlist_free(&revertible_paths);
4077 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4078 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
4079 818c7501 2019-07-11 stsp err = unlockerr;
4080 818c7501 2019-07-11 stsp return err;
