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 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
807 6353ad76 2019-02-08 stsp overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
811 816dc654 2019-02-16 stsp if (fsync(merged_fd) != 0) {
812 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
816 68c76935 2019-02-19 stsp /* Check if a clean merge has subsumed all local changes. */
817 68c76935 2019-02-19 stsp if (overlapcnt == 0) {
818 46b6ee73 2019-06-04 stsp err = check_files_equal(local_changes_subsumed, blob_deriv_path,
819 68c76935 2019-02-19 stsp merged_path);
824 70a0c8ec 2019-02-20 stsp if (chmod(merged_path, st_mode) != 0) {
825 638f9024 2019-05-13 stsp err = got_error_from_errno2("chmod", merged_path);
829 6353ad76 2019-02-08 stsp if (rename(merged_path, ondisk_path) != 0) {
830 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", merged_path,
831 230a42bd 2019-05-11 jcs ondisk_path);
832 2a57020b 2019-02-20 stsp unlink(merged_path);
837 3a6ce05a 2019-02-11 stsp if (merged_fd != -1 && close(merged_fd) != 0 && err == NULL)
838 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
839 46b6ee73 2019-06-04 stsp if (f_deriv && fclose(f_deriv) != 0 && err == NULL)
840 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
841 46b6ee73 2019-06-04 stsp if (f_orig && fclose(f_orig) != 0 && err == NULL)
842 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
843 6353ad76 2019-02-08 stsp free(merged_path);
844 af54ae4a 2019-02-19 stsp free(base_path);
845 46b6ee73 2019-06-04 stsp if (blob_deriv_path) {
846 46b6ee73 2019-06-04 stsp unlink(blob_deriv_path);
847 46b6ee73 2019-06-04 stsp free(blob_deriv_path);
849 46b6ee73 2019-06-04 stsp if (blob_orig_path) {
850 46b6ee73 2019-06-04 stsp unlink(blob_orig_path);
851 46b6ee73 2019-06-04 stsp free(blob_orig_path);
853 6353ad76 2019-02-08 stsp free(id_str);
854 818c7501 2019-07-11 stsp free(label_deriv);
855 4a1ddfc2 2019-01-12 stsp return err;
858 4a1ddfc2 2019-01-12 stsp static const struct got_error *
859 13d9040b 2019-03-27 stsp update_blob_fileindex_entry(struct got_worktree *worktree,
860 13d9040b 2019-03-27 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
861 13d9040b 2019-03-27 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
862 13d9040b 2019-03-27 stsp int update_timestamps)
864 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
866 13d9040b 2019-03-27 stsp if (ie == NULL)
867 13d9040b 2019-03-27 stsp ie = got_fileindex_entry_get(fileindex, path);
869 13d9040b 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path,
870 13d9040b 2019-03-27 stsp blob->id.sha1, worktree->base_commit_id->sha1,
871 13d9040b 2019-03-27 stsp update_timestamps);
873 13d9040b 2019-03-27 stsp struct got_fileindex_entry *new_ie;
874 13d9040b 2019-03-27 stsp err = got_fileindex_entry_alloc(&new_ie, ondisk_path,
875 13d9040b 2019-03-27 stsp path, blob->id.sha1, worktree->base_commit_id->sha1);
877 13d9040b 2019-03-27 stsp err = got_fileindex_entry_add(fileindex, new_ie);
879 13d9040b 2019-03-27 stsp return err;
882 13d9040b 2019-03-27 stsp static const struct got_error *
883 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
884 13d9040b 2019-03-27 stsp const char *path, uint16_t te_mode, uint16_t st_mode,
885 13d9040b 2019-03-27 stsp struct got_blob_object *blob, int restoring_missing_file,
886 a129376b 2019-03-28 stsp int reverting_versioned_file, struct got_repository *repo,
887 a129376b 2019-03-28 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
889 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
890 507dc3bb 2018-12-29 stsp int fd = -1;
891 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
892 507dc3bb 2018-12-29 stsp int update = 0;
893 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
895 c34b20a2 2018-03-12 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
896 9d31a1d8 2018-03-11 stsp GOT_DEFAULT_FILE_MODE);
897 9d31a1d8 2018-03-11 stsp if (fd == -1) {
898 21908da4 2019-01-13 stsp if (errno == ENOENT) {
899 21908da4 2019-01-13 stsp char *parent = dirname(path);
900 21908da4 2019-01-13 stsp if (parent == NULL)
901 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
902 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
904 21908da4 2019-01-13 stsp return err;
905 21908da4 2019-01-13 stsp fd = open(ondisk_path,
906 21908da4 2019-01-13 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
907 21908da4 2019-01-13 stsp GOT_DEFAULT_FILE_MODE);
908 21908da4 2019-01-13 stsp if (fd == -1)
909 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
910 230a42bd 2019-05-11 jcs ondisk_path);
911 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
912 b8f41171 2019-02-10 stsp if (!S_ISREG(st_mode)) {
913 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
914 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
917 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
918 507dc3bb 2018-12-29 stsp ondisk_path);
921 507dc3bb 2018-12-29 stsp update = 1;
924 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
927 a378724f 2019-02-10 stsp if (restoring_missing_file)
928 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING, path);
929 a129376b 2019-03-28 stsp else if (reverting_versioned_file)
930 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT, path);
932 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
933 a378724f 2019-02-10 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
937 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
939 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
940 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
943 9d31a1d8 2018-03-11 stsp if (len > 0) {
944 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
945 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
946 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
947 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
949 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
950 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
953 61d6eaa3 2018-12-24 stsp hdrlen = 0;
955 9d31a1d8 2018-03-11 stsp } while (len != 0);
957 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
958 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
962 507dc3bb 2018-12-29 stsp if (update) {
963 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
964 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
965 230a42bd 2019-05-11 jcs ondisk_path);
966 2a57020b 2019-02-20 stsp unlink(tmppath);
971 b8f41171 2019-02-10 stsp if (te_mode & S_IXUSR) {
972 b8f41171 2019-02-10 stsp if (chmod(ondisk_path, st_mode | S_IXUSR) == -1) {
973 638f9024 2019-05-13 stsp err = got_error_from_errno2("chmod", ondisk_path);
977 b8f41171 2019-02-10 stsp if (chmod(ondisk_path, st_mode & ~S_IXUSR) == -1) {
978 638f9024 2019-05-13 stsp err = got_error_from_errno2("chmod", ondisk_path);
984 3a6ce05a 2019-02-11 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
985 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
986 507dc3bb 2018-12-29 stsp free(tmppath);
987 6353ad76 2019-02-08 stsp return err;
990 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
991 6353ad76 2019-02-08 stsp static const struct got_error *
992 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
994 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
995 7154f6ce 2019-03-27 stsp const char *markers[3] = {
996 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
997 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
998 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
1000 7154f6ce 2019-03-27 stsp int i = 0;
1001 7154f6ce 2019-03-27 stsp char *line;
1002 7154f6ce 2019-03-27 stsp size_t len;
1003 7154f6ce 2019-03-27 stsp const char delim[3] = {'\0', '\0', '\0'};
1005 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1006 7154f6ce 2019-03-27 stsp line = fparseln(f, &len, NULL, delim, 0);
1007 7154f6ce 2019-03-27 stsp if (line == NULL) {
1008 7154f6ce 2019-03-27 stsp if (feof(f))
1010 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
1014 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1015 19332e6d 2019-05-13 stsp if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1017 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
1023 7154f6ce 2019-03-27 stsp return err;
1026 e2b1e152 2019-07-13 stsp static int
1027 e2b1e152 2019-07-13 stsp stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1029 e2b1e152 2019-07-13 stsp return !(ie->ctime_sec == sb->st_ctime &&
1030 e2b1e152 2019-07-13 stsp ie->ctime_nsec == sb->st_ctimensec &&
1031 e2b1e152 2019-07-13 stsp ie->mtime_sec == sb->st_mtime &&
1032 e2b1e152 2019-07-13 stsp ie->mtime_nsec == sb->st_mtimensec &&
1033 e2b1e152 2019-07-13 stsp ie->size == (sb->st_size & 0xffffffff));
1036 7154f6ce 2019-03-27 stsp static const struct got_error *
1037 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1038 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1039 b8f41171 2019-02-10 stsp struct got_repository *repo)
1041 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1042 6353ad76 2019-02-08 stsp struct got_object_id id;
1043 6353ad76 2019-02-08 stsp size_t hdrlen;
1044 6353ad76 2019-02-08 stsp FILE *f = NULL;
1045 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1046 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1047 6353ad76 2019-02-08 stsp size_t flen, blen;
1049 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1051 b8f41171 2019-02-10 stsp if (lstat(abspath, sb) == -1) {
1052 a378724f 2019-02-10 stsp if (errno == ENOENT) {
1054 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1055 2ec1f75b 2019-03-26 stsp *status = GOT_STATUS_MISSING;
1057 2ec1f75b 2019-03-26 stsp *status = GOT_STATUS_DELETE;
1058 b8f41171 2019-02-10 stsp sb->st_mode =
1059 b8f41171 2019-02-10 stsp ((ie->mode >> GOT_FILEIDX_MODE_PERMS_SHIFT)
1060 b8f41171 2019-02-10 stsp & (S_IRWXU | S_IRWXG | S_IRWXO));
1062 b8f41171 2019-02-10 stsp sb->st_mode = GOT_DEFAULT_FILE_MODE;
1063 a378724f 2019-02-10 stsp return NULL;
1065 638f9024 2019-05-13 stsp return got_error_from_errno2("lstat", abspath);
1068 b8f41171 2019-02-10 stsp if (!S_ISREG(sb->st_mode)) {
1069 6353ad76 2019-02-08 stsp *status = GOT_STATUS_OBSTRUCTED;
1070 6353ad76 2019-02-08 stsp return NULL;
1073 b8f41171 2019-02-10 stsp if (ie == NULL)
1074 d00136be 2019-03-26 stsp return NULL;
1076 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1077 2ec1f75b 2019-03-26 stsp *status = GOT_STATUS_DELETE;
1078 2ec1f75b 2019-03-26 stsp return NULL;
1079 2ec1f75b 2019-03-26 stsp } else if (!got_fileindex_entry_has_blob(ie)) {
1080 d00136be 2019-03-26 stsp *status = GOT_STATUS_ADD;
1081 b8f41171 2019-02-10 stsp return NULL;
1084 e2b1e152 2019-07-13 stsp if (!stat_info_differs(ie, sb))
1085 6353ad76 2019-02-08 stsp return NULL;
1087 6353ad76 2019-02-08 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1088 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1090 6353ad76 2019-02-08 stsp return err;
1092 6353ad76 2019-02-08 stsp f = fopen(abspath, "r");
1093 6353ad76 2019-02-08 stsp if (f == NULL) {
1094 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", abspath);
1095 6353ad76 2019-02-08 stsp goto done;
1097 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1099 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1100 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1102 7154f6ce 2019-03-27 stsp goto done;
1103 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1104 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1105 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1106 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1107 7154f6ce 2019-03-27 stsp goto done;
1109 6353ad76 2019-02-08 stsp if (blen == 0) {
1110 6353ad76 2019-02-08 stsp if (flen != 0)
1111 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1113 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1114 6353ad76 2019-02-08 stsp if (blen != 0)
1115 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1117 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1118 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1119 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1120 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1124 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1127 6353ad76 2019-02-08 stsp hdrlen = 0;
1130 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1131 7154f6ce 2019-03-27 stsp rewind(f);
1132 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1136 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1138 6353ad76 2019-02-08 stsp fclose(f);
1139 9d31a1d8 2018-03-11 stsp return err;
1143 e2b1e152 2019-07-13 stsp * Update timestamps in the file index if a file is unmodified and
1144 e2b1e152 2019-07-13 stsp * we had to run a full content comparison to find out.
1146 e2b1e152 2019-07-13 stsp static const struct got_error *
1147 e2b1e152 2019-07-13 stsp sync_timestamps(char *ondisk_path, unsigned char status,
1148 e2b1e152 2019-07-13 stsp struct got_fileindex_entry *ie, struct stat *sb)
1150 e2b1e152 2019-07-13 stsp if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1151 e2b1e152 2019-07-13 stsp return got_fileindex_entry_update(ie, ondisk_path,
1152 e2b1e152 2019-07-13 stsp ie->blob_sha1, ie->commit_sha1, 1);
1154 e2b1e152 2019-07-13 stsp return NULL;
1157 9d31a1d8 2018-03-11 stsp static const struct got_error *
1158 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1159 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1160 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1161 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1162 0584f854 2019-04-06 stsp void *progress_arg)
1164 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1165 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1166 6353ad76 2019-02-08 stsp char *ondisk_path;
1167 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1168 b8f41171 2019-02-10 stsp struct stat sb;
1170 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1171 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1173 b8f41171 2019-02-10 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1175 b8f41171 2019-02-10 stsp goto done;
1177 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1178 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1179 b8f41171 2019-02-10 stsp goto done;
1182 b8f41171 2019-02-10 stsp if (ie && status != GOT_STATUS_MISSING) {
1183 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1184 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1185 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1186 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1188 e2b1e152 2019-07-13 stsp goto done;
1189 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1191 6353ad76 2019-02-08 stsp goto done;
1193 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1194 1430b4e0 2019-03-27 stsp memcmp(ie->blob_sha1, te->id->sha1,
1195 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1196 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1197 b8f41171 2019-02-10 stsp goto done;
1201 8da9e5f4 2019-01-12 stsp err = got_object_open_as_blob(&blob, repo, te->id, 8192);
1203 6353ad76 2019-02-08 stsp goto done;
1205 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1206 234035bc 2019-06-01 stsp int update_timestamps;
1207 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1208 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1209 234035bc 2019-06-01 stsp struct got_object_id id2;
1210 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1211 234035bc 2019-06-01 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1213 234035bc 2019-06-01 stsp goto done;
1215 234035bc 2019-06-01 stsp err = merge_blob(&update_timestamps, worktree, blob2,
1216 818c7501 2019-07-11 stsp ondisk_path, path, sb.st_mode, blob,
1217 818c7501 2019-07-11 stsp worktree->base_commit_id, repo,
1218 234035bc 2019-06-01 stsp progress_cb, progress_arg);
1219 234035bc 2019-06-01 stsp if (blob2)
1220 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
1222 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
1223 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
1224 234035bc 2019-06-01 stsp * unmodified files again.
1226 234035bc 2019-06-01 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1227 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
1228 234035bc 2019-06-01 stsp update_timestamps);
1229 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
1230 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1232 1ee397ad 2019-07-12 stsp goto done;
1233 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1234 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 0);
1236 13d9040b 2019-03-27 stsp goto done;
1238 13d9040b 2019-03-27 stsp err = install_blob(worktree, ondisk_path, path, te->mode,
1239 a129376b 2019-03-28 stsp sb.st_mode, blob, status == GOT_STATUS_MISSING, 0,
1240 a129376b 2019-03-28 stsp repo, progress_cb, progress_arg);
1242 13d9040b 2019-03-27 stsp goto done;
1243 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1244 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 1);
1246 13d9040b 2019-03-27 stsp goto done;
1248 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
1250 6353ad76 2019-02-08 stsp free(ondisk_path);
1251 8da9e5f4 2019-01-12 stsp return err;
1254 90285c3b 2019-01-08 stsp static const struct got_error *
1255 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
1257 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
1258 90285c3b 2019-01-08 stsp char *ondisk_path = NULL;
1260 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
1261 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1263 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
1264 c97665ae 2019-01-13 stsp if (errno != ENOENT)
1265 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
1267 90285c3b 2019-01-08 stsp char *parent = dirname(ondisk_path);
1268 7a9df742 2019-01-08 stsp while (parent && strcmp(parent, root_path) != 0) {
1269 26c4ac4d 2019-01-08 stsp if (rmdir(parent) == -1) {
1270 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
1271 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
1275 90285c3b 2019-01-08 stsp parent = dirname(parent);
1278 90285c3b 2019-01-08 stsp free(ondisk_path);
1279 90285c3b 2019-01-08 stsp return err;
1282 708d8e67 2019-03-27 stsp static const struct got_error *
1283 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
1284 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
1285 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1287 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
1288 708d8e67 2019-03-27 stsp unsigned char status;
1289 708d8e67 2019-03-27 stsp struct stat sb;
1290 708d8e67 2019-03-27 stsp char *ondisk_path;
1292 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
1294 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1296 708d8e67 2019-03-27 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1298 708d8e67 2019-03-27 stsp return err;
1300 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
1301 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
1302 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
1304 1ee397ad 2019-07-12 stsp return err;
1306 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
1307 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
1309 fc6346c4 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
1312 708d8e67 2019-03-27 stsp return err;
1314 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
1316 1ee397ad 2019-07-12 stsp return err;
1317 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
1318 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
1320 fc6346c4 2019-03-27 stsp return err;
1322 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
1325 fc6346c4 2019-03-27 stsp return err;
1328 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
1329 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
1330 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
1331 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
1332 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
1333 8da9e5f4 2019-01-12 stsp void *progress_arg;
1334 8da9e5f4 2019-01-12 stsp got_worktree_cancel_cb cancel_cb;
1335 8da9e5f4 2019-01-12 stsp void *cancel_arg;
1338 512f0d0e 2019-01-02 stsp static const struct got_error *
1339 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
1340 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
1342 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1344 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1345 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1347 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
1348 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
1351 8da9e5f4 2019-01-12 stsp static const struct got_error *
1352 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1354 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1356 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1357 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1359 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
1360 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1363 9d31a1d8 2018-03-11 stsp static const struct got_error *
1364 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
1366 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1367 8da9e5f4 2019-01-12 stsp const struct got_error *err;
1368 8da9e5f4 2019-01-12 stsp char *path;
1370 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1371 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1373 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
1374 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
1376 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1378 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
1379 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
1381 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
1382 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1384 8da9e5f4 2019-01-12 stsp free(path);
1385 0cd1c46a 2019-03-11 stsp return err;
1388 818c7501 2019-07-11 stsp static const struct got_error *
1389 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
1391 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
1392 0647c563 2019-03-11 stsp char *uuidstr = NULL;
1393 0cd1c46a 2019-03-11 stsp uint32_t uuid_status;
1395 517bab73 2019-03-11 stsp *refname = NULL;
1397 0cd1c46a 2019-03-11 stsp uuid_to_string(&worktree->uuid, &uuidstr, &uuid_status);
1398 0cd1c46a 2019-03-11 stsp if (uuid_status != uuid_s_ok)
1399 0cd1c46a 2019-03-11 stsp return got_error_uuid(uuid_status);
1401 818c7501 2019-07-11 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr)
1403 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1404 0647c563 2019-03-11 stsp *refname = NULL;
1406 517bab73 2019-03-11 stsp free(uuidstr);
1407 517bab73 2019-03-11 stsp return err;
1410 818c7501 2019-07-11 stsp const struct got_error *
1411 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
1413 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
1416 818c7501 2019-07-11 stsp static const struct got_error *
1417 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
1419 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1420 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
1423 818c7501 2019-07-11 stsp static const struct got_error *
1424 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
1426 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
1429 818c7501 2019-07-11 stsp static const struct got_error *
1430 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
1432 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1433 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
1436 818c7501 2019-07-11 stsp static const struct got_error *
1437 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
1439 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1440 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
1445 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
1446 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
1448 517bab73 2019-03-11 stsp static const struct got_error *
1449 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
1451 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
1452 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
1453 517bab73 2019-03-11 stsp char *refname;
1455 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
1457 517bab73 2019-03-11 stsp return err;
1459 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
1461 0cd1c46a 2019-03-11 stsp goto done;
1463 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
1465 0cd1c46a 2019-03-11 stsp free(refname);
1467 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
1468 9d31a1d8 2018-03-11 stsp return err;
1471 ebf99748 2019-05-09 stsp static const struct got_error *
1472 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
1473 ebf99748 2019-05-09 stsp struct got_worktree *worktree)
1475 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
1476 ebf99748 2019-05-09 stsp FILE *index = NULL;
1478 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1479 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
1480 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
1481 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
1483 ebf99748 2019-05-09 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
1484 ebf99748 2019-05-09 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1485 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1486 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1487 ebf99748 2019-05-09 stsp goto done;
1490 ebf99748 2019-05-09 stsp index = fopen(*fileindex_path, "rb");
1491 ebf99748 2019-05-09 stsp if (index == NULL) {
1492 ebf99748 2019-05-09 stsp if (errno != ENOENT)
1493 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
1495 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
1496 ebf99748 2019-05-09 stsp if (fclose(index) != 0 && err == NULL)
1497 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
1500 ebf99748 2019-05-09 stsp if (err) {
1501 ebf99748 2019-05-09 stsp free(*fileindex_path);
1502 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1503 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
1504 ebf99748 2019-05-09 stsp *fileindex = NULL;
1506 ebf99748 2019-05-09 stsp return err;
1509 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
1510 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
1511 c932eeeb 2019-05-22 stsp const char *path;
1512 c932eeeb 2019-05-22 stsp size_t path_len;
1513 c932eeeb 2019-05-22 stsp const char *entry_name;
1514 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
1515 a484d721 2019-06-10 stsp void *progress_arg;
1518 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
1519 c932eeeb 2019-05-22 stsp static const struct got_error *
1520 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
1522 1ee397ad 2019-07-12 stsp const struct got_error *err;
1523 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
1525 c932eeeb 2019-05-22 stsp if (a->entry_name) {
1526 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
1527 c932eeeb 2019-05-22 stsp return NULL;
1528 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
1529 102ff934 2019-06-11 stsp return NULL;
1531 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
1532 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
1533 c932eeeb 2019-05-22 stsp return NULL;
1535 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
1536 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
1537 edd02c5e 2019-07-11 stsp ie->path);
1539 1ee397ad 2019-07-12 stsp return err;
1541 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
1542 c932eeeb 2019-05-22 stsp return NULL;
1545 9c6338c4 2019-06-02 stsp static const struct got_error *
1546 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
1548 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
1549 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
1550 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
1552 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
1553 9c6338c4 2019-06-02 stsp fileindex_path);
1555 9c6338c4 2019-06-02 stsp goto done;
1557 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
1559 9c6338c4 2019-06-02 stsp goto done;
1561 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
1562 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
1563 9c6338c4 2019-06-02 stsp fileindex_path);
1564 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
1567 9c6338c4 2019-06-02 stsp if (new_index)
1568 9c6338c4 2019-06-02 stsp fclose(new_index);
1569 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
1570 9c6338c4 2019-06-02 stsp return err;
1573 6ced4176 2019-07-12 stsp static const struct got_error *
1574 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
1575 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
1576 6ced4176 2019-07-12 stsp struct got_worktree *worktree, struct got_repository *repo)
1578 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
1579 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
1580 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
1581 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
1583 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
1584 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
1585 6ced4176 2019-07-12 stsp *tree_id = NULL;
1587 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
1588 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
1589 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
1590 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
1591 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1592 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1593 6ced4176 2019-07-12 stsp goto done;
1595 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
1596 6ced4176 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
1598 6ced4176 2019-07-12 stsp goto done;
1599 6ced4176 2019-07-12 stsp return NULL;
1602 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
1604 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
1605 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
1606 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
1607 6ced4176 2019-07-12 stsp goto done;
1610 6ced4176 2019-07-12 stsp err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
1611 6ced4176 2019-07-12 stsp in_repo_path);
1613 6ced4176 2019-07-12 stsp goto done;
1615 6ced4176 2019-07-12 stsp free(in_repo_path);
1616 6ced4176 2019-07-12 stsp in_repo_path = NULL;
1618 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
1620 6ced4176 2019-07-12 stsp goto done;
1622 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
1623 6ced4176 2019-07-12 stsp /* Check out a single file. */
1624 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
1625 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
1626 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
1627 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
1628 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1629 6ced4176 2019-07-12 stsp goto done;
1631 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
1632 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1633 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1634 6ced4176 2019-07-12 stsp goto done;
1637 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
1638 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
1640 6ced4176 2019-07-12 stsp return err;
1641 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
1642 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
1643 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
1644 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
1645 6ced4176 2019-07-12 stsp goto done;
1648 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
1649 6ced4176 2019-07-12 stsp worktree->base_commit_id, in_repo_path);
1651 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
1652 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
1653 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
1654 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
1655 6ced4176 2019-07-12 stsp goto done;
1657 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
1658 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1659 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1660 6ced4176 2019-07-12 stsp goto done;
1665 6ced4176 2019-07-12 stsp free(in_repo_path);
1666 6ced4176 2019-07-12 stsp if (err) {
1667 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
1668 6ced4176 2019-07-12 stsp free(*tree_relpath);
1669 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
1670 6ced4176 2019-07-12 stsp free(*tree_id);
1671 6ced4176 2019-07-12 stsp *tree_id = NULL;
1673 07ed472d 2019-07-12 stsp return err;
1676 07ed472d 2019-07-12 stsp static const struct got_error *
1677 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
1678 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
1679 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1680 07ed472d 2019-07-12 stsp void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1682 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
1683 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
1684 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
1685 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
1686 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
1688 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
1690 07ed472d 2019-07-12 stsp goto done;
1692 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
1693 07ed472d 2019-07-12 stsp worktree->base_commit_id);
1695 07ed472d 2019-07-12 stsp goto done;
1697 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1699 07ed472d 2019-07-12 stsp goto done;
1701 07ed472d 2019-07-12 stsp if (entry_name &&
1702 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
1703 07ed472d 2019-07-12 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
1704 07ed472d 2019-07-12 stsp goto done;
1707 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
1708 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
1709 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
1710 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
1711 07ed472d 2019-07-12 stsp arg.worktree = worktree;
1712 07ed472d 2019-07-12 stsp arg.repo = repo;
1713 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
1714 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
1715 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
1716 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
1717 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
1718 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
1721 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
1722 07ed472d 2019-07-12 stsp if (commit)
1723 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
1724 6ced4176 2019-07-12 stsp return err;
1727 9d31a1d8 2018-03-11 stsp const struct got_error *
1728 c4cdcb68 2019-04-03 stsp got_worktree_checkout_files(struct got_worktree *worktree, const char *path,
1729 93a30277 2018-12-24 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1730 93a30277 2018-12-24 stsp void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1732 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
1733 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
1734 8da9e5f4 2019-01-12 stsp struct got_object_id *tree_id = NULL;
1735 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
1736 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
1737 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
1738 c4cdcb68 2019-04-03 stsp char *relpath = NULL, *entry_name = NULL;
1739 6ced4176 2019-07-12 stsp int entry_type;
1741 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
1743 9d31a1d8 2018-03-11 stsp return err;
1745 6ced4176 2019-07-12 stsp err = find_tree_entry_for_checkout(&entry_type, &relpath, &tree_id,
1746 6ced4176 2019-07-12 stsp path, worktree, repo);
1748 6ced4176 2019-07-12 stsp goto done;
1750 6ced4176 2019-07-12 stsp if (entry_type == GOT_OBJ_TYPE_BLOB) {
1751 6ced4176 2019-07-12 stsp entry_name = basename(path);
1752 6ced4176 2019-07-12 stsp if (entry_name == NULL) {
1753 6ced4176 2019-07-12 stsp err = got_error_from_errno2("basename", path);
1754 6ced4176 2019-07-12 stsp goto done;
1759 51514078 2018-12-25 stsp * Read the file index.
1760 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
1761 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
1763 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
1765 c4cdcb68 2019-04-03 stsp goto done;
1767 07ed472d 2019-07-12 stsp err = checkout_files(worktree, fileindex, relpath, tree_id, entry_name,
1768 07ed472d 2019-07-12 stsp repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
1769 711d9cd9 2019-07-12 stsp if (err == NULL) {
1770 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
1771 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
1772 711d9cd9 2019-07-12 stsp bbc_arg.entry_name = entry_name;
1773 711d9cd9 2019-07-12 stsp bbc_arg.path = path;
1774 711d9cd9 2019-07-12 stsp bbc_arg.path_len = strlen(path);
1775 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
1776 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
1777 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
1778 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
1780 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
1781 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
1782 af12c6b9 2019-06-04 stsp err = sync_err;
1784 9c6338c4 2019-06-02 stsp free(fileindex_path);
1785 c4cdcb68 2019-04-03 stsp free(relpath);
1787 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
1788 9d31a1d8 2018-03-11 stsp if (commit)
1789 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
1790 5ade8233 2019-07-12 stsp if (fileindex)
1791 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
1792 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
1793 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
1794 9d31a1d8 2018-03-11 stsp err = unlockerr;
1795 f8d1f275 2019-02-04 stsp return err;
1798 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
1799 234035bc 2019-06-01 stsp struct got_worktree *worktree;
1800 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
1801 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
1802 234035bc 2019-06-01 stsp void *progress_arg;
1803 234035bc 2019-06-01 stsp got_worktree_cancel_cb cancel_cb;
1804 234035bc 2019-06-01 stsp void *cancel_arg;
1805 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
1808 234035bc 2019-06-01 stsp static const struct got_error *
1809 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
1810 234035bc 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
1811 234035bc 2019-06-01 stsp struct got_object_id *id2, const char *path1, const char *path2,
1812 234035bc 2019-06-01 stsp struct got_repository *repo)
1814 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
1815 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
1816 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
1817 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
1818 234035bc 2019-06-01 stsp struct stat sb;
1819 234035bc 2019-06-01 stsp unsigned char status;
1820 234035bc 2019-06-01 stsp int local_changes_subsumed;
1822 234035bc 2019-06-01 stsp if (blob1 && blob2) {
1823 234035bc 2019-06-01 stsp ie = got_fileindex_entry_get(a->fileindex, path2);
1824 1ee397ad 2019-07-12 stsp if (ie == NULL)
1825 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
1826 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
1828 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1829 234035bc 2019-06-01 stsp path2) == -1)
1830 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
1832 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1834 234035bc 2019-06-01 stsp goto done;
1836 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
1837 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
1838 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
1839 234035bc 2019-06-01 stsp goto done;
1841 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
1842 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
1843 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
1844 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
1845 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
1846 234035bc 2019-06-01 stsp goto done;
1849 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree, blob1,
1850 818c7501 2019-07-11 stsp ondisk_path, path2, sb.st_mode, blob2, a->commit_id2, repo,
1851 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
1852 234035bc 2019-06-01 stsp } else if (blob1) {
1853 234035bc 2019-06-01 stsp ie = got_fileindex_entry_get(a->fileindex, path1);
1854 1ee397ad 2019-07-12 stsp if (ie == NULL)
1855 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
1856 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
1858 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1859 2b92fad7 2019-06-02 stsp path1) == -1)
1860 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
1862 2b92fad7 2019-06-02 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1864 2b92fad7 2019-06-02 stsp goto done;
1866 2b92fad7 2019-06-02 stsp switch (status) {
1867 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
1868 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
1869 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
1871 1ee397ad 2019-07-12 stsp goto done;
1872 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
1874 2b92fad7 2019-06-02 stsp goto done;
1876 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
1878 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
1879 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
1880 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
1881 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
1883 1ee397ad 2019-07-12 stsp goto done;
1885 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
1887 2b92fad7 2019-06-02 stsp case GOT_STATUS_ADD:
1888 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
1889 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
1890 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
1891 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
1893 1ee397ad 2019-07-12 stsp goto done;
1895 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
1896 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
1898 1ee397ad 2019-07-12 stsp goto done;
1903 234035bc 2019-06-01 stsp } else if (blob2) {
1904 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1905 234035bc 2019-06-01 stsp path2) == -1)
1906 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
1907 234035bc 2019-06-01 stsp ie = got_fileindex_entry_get(a->fileindex, path2);
1909 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
1912 234035bc 2019-06-01 stsp goto done;
1913 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
1914 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
1915 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
1916 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
1917 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
1918 1ee397ad 2019-07-12 stsp status, path2);
1919 234035bc 2019-06-01 stsp goto done;
1921 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
1922 818c7501 2019-07-11 stsp NULL, ondisk_path, path2, sb.st_mode, blob2,
1923 818c7501 2019-07-11 stsp a->commit_id2, repo,
1924 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
1925 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
1926 234035bc 2019-06-01 stsp err = update_blob_fileindex_entry(a->worktree,
1927 234035bc 2019-06-01 stsp a->fileindex, ie, ondisk_path, ie->path,
1928 234035bc 2019-06-01 stsp blob2, 0);
1930 234035bc 2019-06-01 stsp goto done;
1933 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
1934 234035bc 2019-06-01 stsp err = install_blob(a->worktree, ondisk_path, path2,
1935 234035bc 2019-06-01 stsp /* XXX get this from parent tree! */
1936 234035bc 2019-06-01 stsp GOT_DEFAULT_FILE_MODE,
1937 234035bc 2019-06-01 stsp sb.st_mode, blob2, 0, 0, repo,
1938 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
1940 234035bc 2019-06-01 stsp goto done;
1941 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_alloc(&ie,
1942 2b92fad7 2019-06-02 stsp ondisk_path, path2, NULL, NULL);
1944 234035bc 2019-06-01 stsp goto done;
1945 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
1946 2b92fad7 2019-06-02 stsp if (err) {
1947 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
1948 2b92fad7 2019-06-02 stsp goto done;
1953 234035bc 2019-06-01 stsp free(ondisk_path);
1954 234035bc 2019-06-01 stsp return err;
1957 234035bc 2019-06-01 stsp struct check_merge_ok_arg {
1958 234035bc 2019-06-01 stsp struct got_worktree *worktree;
1959 234035bc 2019-06-01 stsp struct got_repository *repo;
1962 234035bc 2019-06-01 stsp static const struct got_error *
1963 234035bc 2019-06-01 stsp check_merge_ok(void *arg, struct got_fileindex_entry *ie)
1965 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
1966 234035bc 2019-06-01 stsp struct check_merge_ok_arg *a = arg;
1967 234035bc 2019-06-01 stsp unsigned char status;
1968 234035bc 2019-06-01 stsp struct stat sb;
1969 234035bc 2019-06-01 stsp char *ondisk_path;
1971 234035bc 2019-06-01 stsp /* Reject merges into a work tree with mixed base commits. */
1972 234035bc 2019-06-01 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
1973 234035bc 2019-06-01 stsp SHA1_DIGEST_LENGTH))
1974 234035bc 2019-06-01 stsp return got_error(GOT_ERR_MIXED_COMMITS);
1976 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
1978 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
1980 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
1981 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
1983 234035bc 2019-06-01 stsp return err;
1984 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
1985 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
1987 234035bc 2019-06-01 stsp return NULL;
1990 818c7501 2019-07-11 stsp static const struct got_error *
1991 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
1992 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
1993 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
1994 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
1995 818c7501 2019-07-11 stsp got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1997 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
1998 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
1999 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2000 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
2002 03415a1a 2019-06-02 stsp if (commit_id1) {
2003 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
2004 03415a1a 2019-06-02 stsp worktree->path_prefix);
2006 03415a1a 2019-06-02 stsp goto done;
2008 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
2010 03415a1a 2019-06-02 stsp goto done;
2013 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
2014 234035bc 2019-06-01 stsp worktree->path_prefix);
2016 234035bc 2019-06-01 stsp goto done;
2018 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
2020 234035bc 2019-06-01 stsp goto done;
2022 234035bc 2019-06-01 stsp arg.worktree = worktree;
2023 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
2024 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
2025 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
2026 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
2027 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
2028 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
2029 234035bc 2019-06-01 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg);
2030 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2031 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2032 af12c6b9 2019-06-04 stsp err = sync_err;
2034 234035bc 2019-06-01 stsp if (tree1)
2035 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
2036 234035bc 2019-06-01 stsp if (tree2)
2037 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
2038 818c7501 2019-07-11 stsp return err;
2041 818c7501 2019-07-11 stsp const struct got_error *
2042 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
2043 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
2044 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2045 818c7501 2019-07-11 stsp void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2047 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
2048 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
2049 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
2050 818c7501 2019-07-11 stsp struct check_merge_ok_arg mok_arg;
2052 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
2054 818c7501 2019-07-11 stsp return err;
2056 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2058 818c7501 2019-07-11 stsp goto done;
2060 818c7501 2019-07-11 stsp mok_arg.worktree = worktree;
2061 818c7501 2019-07-11 stsp mok_arg.repo = repo;
2062 818c7501 2019-07-11 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
2063 818c7501 2019-07-11 stsp &mok_arg);
2065 818c7501 2019-07-11 stsp goto done;
2067 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
2068 818c7501 2019-07-11 stsp commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
2070 818c7501 2019-07-11 stsp if (fileindex)
2071 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
2072 818c7501 2019-07-11 stsp free(fileindex_path);
2073 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2074 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
2075 234035bc 2019-06-01 stsp err = unlockerr;
2076 234035bc 2019-06-01 stsp return err;
2079 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
2080 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
2081 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
2082 927df6b7 2019-02-10 stsp const char *status_path;
2083 927df6b7 2019-02-10 stsp size_t status_path_len;
2084 f8d1f275 2019-02-04 stsp struct got_repository *repo;
2085 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
2086 f8d1f275 2019-02-04 stsp void *status_arg;
2087 f8d1f275 2019-02-04 stsp got_worktree_cancel_cb cancel_cb;
2088 f8d1f275 2019-02-04 stsp void *cancel_arg;
2091 f8d1f275 2019-02-04 stsp static const struct got_error *
2092 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
2093 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
2094 927df6b7 2019-02-10 stsp struct got_repository *repo)
2096 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
2097 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
2098 927df6b7 2019-02-10 stsp struct stat sb;
2099 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
2101 927df6b7 2019-02-10 stsp err = get_file_status(&status, &sb, ie, abspath, repo);
2102 927df6b7 2019-02-10 stsp if (err == NULL && status != GOT_STATUS_NO_CHANGE) {
2103 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2104 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2105 016a88dd 2019-05-13 stsp err = (*status_cb)(status_arg, status, ie->path, &blob_id,
2106 016a88dd 2019-05-13 stsp &commit_id);
2108 927df6b7 2019-02-10 stsp return err;
2111 927df6b7 2019-02-10 stsp static const struct got_error *
2112 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
2113 f8d1f275 2019-02-04 stsp struct dirent *de, const char *parent_path)
2115 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2116 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2117 f8d1f275 2019-02-04 stsp char *abspath;
2119 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2120 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2122 927df6b7 2019-02-10 stsp if (got_path_cmp(parent_path, a->status_path) != 0 &&
2123 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
2124 927df6b7 2019-02-10 stsp return NULL;
2126 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2127 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
2128 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
2129 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2131 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
2132 f8d1f275 2019-02-04 stsp de->d_name) == -1)
2133 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2136 927df6b7 2019-02-10 stsp err = report_file_status(ie, abspath, a->status_cb, a->status_arg,
2138 f8d1f275 2019-02-04 stsp free(abspath);
2139 9d31a1d8 2018-03-11 stsp return err;
2142 f8d1f275 2019-02-04 stsp static const struct got_error *
2143 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2145 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2146 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
2147 2ec1f75b 2019-03-26 stsp unsigned char status;
2149 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2150 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2152 927df6b7 2019-02-10 stsp if (!got_path_is_child(parent_path, a->status_path, a->status_path_len))
2153 927df6b7 2019-02-10 stsp return NULL;
2155 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2156 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2157 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
2158 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
2160 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
2161 016a88dd 2019-05-13 stsp return (*a->status_cb)(a->status_arg, status, ie->path, &blob_id,
2162 016a88dd 2019-05-13 stsp &commit_id);
2165 f8d1f275 2019-02-04 stsp static const struct got_error *
2166 f8d1f275 2019-02-04 stsp status_new(void *arg, struct dirent *de, const char *parent_path)
2168 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
2169 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2170 f8d1f275 2019-02-04 stsp char *path = NULL;
2172 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2173 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2175 f8d1f275 2019-02-04 stsp if (de->d_type == DT_DIR)
2176 2c201a36 2019-02-10 stsp return NULL;
2178 2c201a36 2019-02-10 stsp /* XXX ignore symlinks for now */
2179 2c201a36 2019-02-10 stsp if (de->d_type == DT_LNK)
2180 f8d1f275 2019-02-04 stsp return NULL;
2182 927df6b7 2019-02-10 stsp if (!got_path_is_child(parent_path, a->status_path, a->status_path_len))
2183 927df6b7 2019-02-10 stsp return NULL;
2185 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2186 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
2187 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2189 f8d1f275 2019-02-04 stsp path = de->d_name;
2192 b72f483a 2019-02-05 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED, path,
2193 016a88dd 2019-05-13 stsp NULL, NULL);
2194 f8d1f275 2019-02-04 stsp if (parent_path[0])
2195 f8d1f275 2019-02-04 stsp free(path);
2196 b72f483a 2019-02-05 stsp return err;
2199 347d1d3e 2019-07-12 stsp static const struct got_error *
2200 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
2201 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
2202 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
2203 347d1d3e 2019-07-12 stsp got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2205 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2206 f8d1f275 2019-02-04 stsp DIR *workdir = NULL;
2207 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
2208 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
2209 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
2211 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
2212 927df6b7 2019-02-10 stsp worktree->root_path, path[0] ? "/" : "", path) == -1) {
2213 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2214 c513d110 2019-02-05 stsp goto done;
2216 927df6b7 2019-02-10 stsp workdir = opendir(ondisk_path);
2217 927df6b7 2019-02-10 stsp if (workdir == NULL) {
2218 2ec1f75b 2019-03-26 stsp if (errno == ENOTDIR || errno == ENOENT) {
2219 927df6b7 2019-02-10 stsp struct got_fileindex_entry *ie;
2220 927df6b7 2019-02-10 stsp ie = got_fileindex_entry_get(fileindex, path);
2221 927df6b7 2019-02-10 stsp if (ie == NULL) {
2222 927df6b7 2019-02-10 stsp err = got_error(GOT_ERR_BAD_PATH);
2223 927df6b7 2019-02-10 stsp goto done;
2225 927df6b7 2019-02-10 stsp err = report_file_status(ie, ondisk_path,
2226 927df6b7 2019-02-10 stsp status_cb, status_arg, repo);
2227 927df6b7 2019-02-10 stsp goto done;
2229 638f9024 2019-05-13 stsp err = got_error_from_errno2("opendir", ondisk_path);
2230 927df6b7 2019-02-10 stsp goto done;
2233 d43a8a88 2019-02-05 stsp fdiff_cb.diff_old_new = status_old_new;
2234 d43a8a88 2019-02-05 stsp fdiff_cb.diff_old = status_old;
2235 d43a8a88 2019-02-05 stsp fdiff_cb.diff_new = status_new;
2236 f8d1f275 2019-02-04 stsp arg.fileindex = fileindex;
2237 f8d1f275 2019-02-04 stsp arg.worktree = worktree;
2238 927df6b7 2019-02-10 stsp arg.status_path = path;
2239 927df6b7 2019-02-10 stsp arg.status_path_len = strlen(path);
2240 f8d1f275 2019-02-04 stsp arg.repo = repo;
2241 f8d1f275 2019-02-04 stsp arg.status_cb = status_cb;
2242 f8d1f275 2019-02-04 stsp arg.status_arg = status_arg;
2243 f8d1f275 2019-02-04 stsp arg.cancel_cb = cancel_cb;
2244 f8d1f275 2019-02-04 stsp arg.cancel_arg = cancel_arg;
2245 c7f4312f 2019-02-05 stsp err = got_fileindex_diff_dir(fileindex, workdir, worktree->root_path,
2246 927df6b7 2019-02-10 stsp path, repo, &fdiff_cb, &arg);
2248 f8d1f275 2019-02-04 stsp if (workdir)
2249 f8d1f275 2019-02-04 stsp closedir(workdir);
2250 927df6b7 2019-02-10 stsp free(ondisk_path);
2251 347d1d3e 2019-07-12 stsp return err;
2254 347d1d3e 2019-07-12 stsp const struct got_error *
2255 347d1d3e 2019-07-12 stsp got_worktree_status(struct got_worktree *worktree, const char *path,
2256 347d1d3e 2019-07-12 stsp struct got_repository *repo, got_worktree_status_cb status_cb,
2257 347d1d3e 2019-07-12 stsp void *status_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2259 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
2260 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
2261 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
2263 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2265 347d1d3e 2019-07-12 stsp return err;
2267 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, path, fileindex, repo,
2268 347d1d3e 2019-07-12 stsp status_cb, status_arg, cancel_cb, cancel_arg);
2269 f8d1f275 2019-02-04 stsp free(fileindex_path);
2270 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
2271 f8d1f275 2019-02-04 stsp return err;
2274 6c7ab921 2019-03-18 stsp const struct got_error *
2275 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
2276 6c7ab921 2019-03-18 stsp const char *arg)
2278 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
2279 6c7ab921 2019-03-18 stsp char *resolved, *path = NULL;
2280 6c7ab921 2019-03-18 stsp size_t len;
2282 6c7ab921 2019-03-18 stsp *wt_path = NULL;
2284 6c7ab921 2019-03-18 stsp resolved = realpath(arg, NULL);
2285 6c7ab921 2019-03-18 stsp if (resolved == NULL)
2286 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", arg);
2288 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
2289 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
2290 6c7ab921 2019-03-18 stsp err = got_error(GOT_ERR_BAD_PATH);
2291 6c7ab921 2019-03-18 stsp goto done;
2294 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
2295 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
2296 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
2298 f6d88e1a 2019-05-29 stsp goto done;
2300 f6d88e1a 2019-05-29 stsp path = strdup("");
2301 f6d88e1a 2019-05-29 stsp if (path == NULL) {
2302 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
2303 f6d88e1a 2019-05-29 stsp goto done;
2307 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
2308 6c7ab921 2019-03-18 stsp len = strlen(path);
2309 6c7ab921 2019-03-18 stsp while (path[len - 1] == '/') {
2310 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
2314 6c7ab921 2019-03-18 stsp free(resolved);
2315 6c7ab921 2019-03-18 stsp if (err == NULL)
2316 6c7ab921 2019-03-18 stsp *wt_path = path;
2318 6c7ab921 2019-03-18 stsp free(path);
2319 d00136be 2019-03-26 stsp return err;
2322 07f5b47a 2019-06-02 stsp static const struct got_error *
2323 07f5b47a 2019-06-02 stsp schedule_addition(const char *ondisk_path, struct got_fileindex *fileindex,
2324 07f5b47a 2019-06-02 stsp const char *relpath, got_worktree_status_cb status_cb, void *status_arg,
2325 07f5b47a 2019-06-02 stsp struct got_repository *repo)
2327 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
2328 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
2330 07f5b47a 2019-06-02 stsp /* Re-adding an existing entry is a no-op. */
2331 07f5b47a 2019-06-02 stsp if (got_fileindex_entry_get(fileindex, relpath) != NULL)
2332 07f5b47a 2019-06-02 stsp return NULL;
2334 07f5b47a 2019-06-02 stsp err = got_fileindex_entry_alloc(&ie, ondisk_path, relpath, NULL, NULL);
2336 07f5b47a 2019-06-02 stsp return err;
2338 07f5b47a 2019-06-02 stsp err = got_fileindex_entry_add(fileindex, ie);
2339 07f5b47a 2019-06-02 stsp if (err) {
2340 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
2341 07f5b47a 2019-06-02 stsp return err;
2344 07f5b47a 2019-06-02 stsp return report_file_status(ie, relpath, status_cb, status_arg, repo);
2347 d00136be 2019-03-26 stsp const struct got_error *
2348 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
2349 1dd54920 2019-05-11 stsp struct got_pathlist_head *ondisk_paths,
2350 1dd54920 2019-05-11 stsp got_worktree_status_cb status_cb, void *status_arg,
2351 031a5338 2019-03-26 stsp struct got_repository *repo)
2353 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
2354 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2355 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2356 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
2358 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
2360 d00136be 2019-03-26 stsp return err;
2362 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2364 d00136be 2019-03-26 stsp goto done;
2366 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, ondisk_paths, entry) {
2367 1dd54920 2019-05-11 stsp char *relpath;
2368 1dd54920 2019-05-11 stsp err = got_path_skip_common_ancestor(&relpath,
2369 1dd54920 2019-05-11 stsp got_worktree_get_root_path(worktree), pe->path);
2372 07f5b47a 2019-06-02 stsp err = schedule_addition(pe->path, fileindex, relpath,
2373 07f5b47a 2019-06-02 stsp status_cb, status_arg, repo);
2374 1dd54920 2019-05-11 stsp free(relpath);
2378 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2379 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2380 af12c6b9 2019-06-04 stsp err = sync_err;
2382 fb399478 2019-07-12 stsp free(fileindex_path);
2383 d00136be 2019-03-26 stsp if (fileindex)
2384 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
2385 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2386 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
2387 d00136be 2019-03-26 stsp err = unlockerr;
2388 6c7ab921 2019-03-18 stsp return err;
2391 17ed4618 2019-06-02 stsp static const struct got_error *
2392 17ed4618 2019-06-02 stsp schedule_for_deletion(const char *ondisk_path, struct got_fileindex *fileindex,
2393 17ed4618 2019-06-02 stsp const char *relpath, int delete_local_mods,
2394 17ed4618 2019-06-02 stsp got_worktree_status_cb status_cb, void *status_arg,
2395 17ed4618 2019-06-02 stsp struct got_repository *repo)
2397 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
2398 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
2399 17ed4618 2019-06-02 stsp unsigned char status;
2400 17ed4618 2019-06-02 stsp struct stat sb;
2402 17ed4618 2019-06-02 stsp ie = got_fileindex_entry_get(fileindex, relpath);
2403 17ed4618 2019-06-02 stsp if (ie == NULL)
2404 17ed4618 2019-06-02 stsp return got_error(GOT_ERR_BAD_PATH);
2406 17ed4618 2019-06-02 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2408 17ed4618 2019-06-02 stsp return err;
2410 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
2411 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
2412 17ed4618 2019-06-02 stsp return got_error_set_errno(ENOENT, ondisk_path);
2413 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_MODIFY)
2414 17ed4618 2019-06-02 stsp return got_error(GOT_ERR_FILE_STATUS);
2415 17ed4618 2019-06-02 stsp if (!delete_local_mods)
2416 17ed4618 2019-06-02 stsp return got_error(GOT_ERR_FILE_MODIFIED);
2419 17ed4618 2019-06-02 stsp if (unlink(ondisk_path) != 0)
2420 17ed4618 2019-06-02 stsp return got_error_from_errno2("unlink", ondisk_path);
2422 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2423 17ed4618 2019-06-02 stsp return report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
2426 2ec1f75b 2019-03-26 stsp const struct got_error *
2427 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
2428 17ed4618 2019-06-02 stsp struct got_pathlist_head *ondisk_paths, int delete_local_mods,
2429 2ec1f75b 2019-03-26 stsp got_worktree_status_cb status_cb, void *status_arg,
2430 2ec1f75b 2019-03-26 stsp struct got_repository *repo)
2432 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
2433 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
2434 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2435 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
2437 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
2439 2ec1f75b 2019-03-26 stsp return err;
2441 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2443 2ec1f75b 2019-03-26 stsp goto done;
2445 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, ondisk_paths, entry) {
2446 17ed4618 2019-06-02 stsp char *relpath;
2447 17ed4618 2019-06-02 stsp err = got_path_skip_common_ancestor(&relpath,
2448 17ed4618 2019-06-02 stsp got_worktree_get_root_path(worktree), pe->path);
2451 17ed4618 2019-06-02 stsp err = schedule_for_deletion(pe->path, fileindex, relpath,
2452 17ed4618 2019-06-02 stsp delete_local_mods, status_cb, status_arg, repo);
2453 17ed4618 2019-06-02 stsp free(relpath);
2457 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2458 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2459 af12c6b9 2019-06-04 stsp err = sync_err;
2461 fb399478 2019-07-12 stsp free(fileindex_path);
2462 2ec1f75b 2019-03-26 stsp if (fileindex)
2463 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
2464 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2465 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
2466 2ec1f75b 2019-03-26 stsp err = unlockerr;
2467 2ec1f75b 2019-03-26 stsp return err;
2470 e20a8b6f 2019-06-04 stsp static const struct got_error *
2471 e20a8b6f 2019-06-04 stsp revert_file(struct got_worktree *worktree, struct got_fileindex *fileindex,
2472 a129376b 2019-03-28 stsp const char *ondisk_path,
2473 a129376b 2019-03-28 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2474 a129376b 2019-03-28 stsp struct got_repository *repo)
2476 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
2477 e20a8b6f 2019-06-04 stsp char *relpath = NULL, *parent_path = NULL;
2478 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
2479 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
2480 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
2481 a129376b 2019-03-28 stsp const struct got_tree_entry *te;
2482 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
2483 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
2484 a129376b 2019-03-28 stsp unsigned char status;
2485 a129376b 2019-03-28 stsp struct stat sb;
2487 a129376b 2019-03-28 stsp err = got_path_skip_common_ancestor(&relpath,
2488 a129376b 2019-03-28 stsp got_worktree_get_root_path(worktree), ondisk_path);
2490 a129376b 2019-03-28 stsp goto done;
2492 a129376b 2019-03-28 stsp ie = got_fileindex_entry_get(fileindex, relpath);
2493 a129376b 2019-03-28 stsp if (ie == NULL) {
2494 a129376b 2019-03-28 stsp err = got_error(GOT_ERR_BAD_PATH);
2495 a129376b 2019-03-28 stsp goto done;
2498 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
2499 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
2500 a129376b 2019-03-28 stsp if (err) {
2501 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
2502 a129376b 2019-03-28 stsp goto done;
2503 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
2504 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
2505 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
2506 e20a8b6f 2019-06-04 stsp goto done;
2509 a129376b 2019-03-28 stsp if (got_path_is_root_dir(worktree->path_prefix)) {
2510 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
2511 a129376b 2019-03-28 stsp if (tree_path == NULL) {
2512 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
2513 a129376b 2019-03-28 stsp goto done;
2516 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
2517 a129376b 2019-03-28 stsp tree_path = strdup(worktree->path_prefix);
2518 a129376b 2019-03-28 stsp if (tree_path == NULL) {
2519 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
2520 a129376b 2019-03-28 stsp goto done;
2523 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
2524 a129376b 2019-03-28 stsp worktree->path_prefix, parent_path) == -1) {
2525 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2526 a129376b 2019-03-28 stsp goto done;
2531 a129376b 2019-03-28 stsp err = got_object_id_by_path(&tree_id, repo, worktree->base_commit_id,
2532 a129376b 2019-03-28 stsp tree_path);
2534 a129376b 2019-03-28 stsp goto done;
2536 a129376b 2019-03-28 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2538 a129376b 2019-03-28 stsp goto done;
2540 a129376b 2019-03-28 stsp te_name = basename(ie->path);
2541 a129376b 2019-03-28 stsp if (te_name == NULL) {
2542 638f9024 2019-05-13 stsp err = got_error_from_errno2("basename", ie->path);
2543 a129376b 2019-03-28 stsp goto done;
2546 a129376b 2019-03-28 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2548 a129376b 2019-03-28 stsp goto done;
2550 a129376b 2019-03-28 stsp te = got_object_tree_find_entry(tree, te_name);
2551 a129376b 2019-03-28 stsp if (te == NULL && status != GOT_STATUS_ADD) {
2552 a129376b 2019-03-28 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
2553 a129376b 2019-03-28 stsp goto done;
2556 a129376b 2019-03-28 stsp switch (status) {
2557 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
2558 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT, ie->path);
2560 1ee397ad 2019-07-12 stsp goto done;
2561 a129376b 2019-03-28 stsp got_fileindex_entry_remove(fileindex, ie);
2563 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
2564 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
2565 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
2566 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
2567 e20a8b6f 2019-06-04 stsp struct got_object_id id;
2568 a129376b 2019-03-28 stsp memcpy(id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2569 a129376b 2019-03-28 stsp err = got_object_open_as_blob(&blob, repo, &id, 8192);
2571 a129376b 2019-03-28 stsp goto done;
2572 a129376b 2019-03-28 stsp err = install_blob(worktree, ondisk_path, ie->path,
2573 a129376b 2019-03-28 stsp te->mode, sb.st_mode, blob, 0, 1, repo, progress_cb,
2574 a129376b 2019-03-28 stsp progress_arg);
2576 a129376b 2019-03-28 stsp goto done;
2577 a129376b 2019-03-28 stsp if (status == GOT_STATUS_DELETE) {
2578 a129376b 2019-03-28 stsp err = update_blob_fileindex_entry(worktree,
2579 a129376b 2019-03-28 stsp fileindex, ie, ondisk_path, ie->path, blob, 1);
2581 a129376b 2019-03-28 stsp goto done;
2586 a129376b 2019-03-28 stsp goto done;
2589 a129376b 2019-03-28 stsp free(relpath);
2590 e20a8b6f 2019-06-04 stsp free(parent_path);
2591 a129376b 2019-03-28 stsp free(tree_path);
2593 a129376b 2019-03-28 stsp got_object_blob_close(blob);
2595 a129376b 2019-03-28 stsp got_object_tree_close(tree);
2596 a129376b 2019-03-28 stsp free(tree_id);
2597 e20a8b6f 2019-06-04 stsp return err;
2600 e20a8b6f 2019-06-04 stsp const struct got_error *
2601 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
2602 e20a8b6f 2019-06-04 stsp struct got_pathlist_head *ondisk_paths,
2603 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2604 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
2606 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
2607 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
2608 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
2609 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
2610 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
2612 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
2614 e20a8b6f 2019-06-04 stsp return err;
2616 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2618 e20a8b6f 2019-06-04 stsp goto done;
2620 e20a8b6f 2019-06-04 stsp TAILQ_FOREACH(pe, ondisk_paths, entry) {
2621 e20a8b6f 2019-06-04 stsp err = revert_file(worktree, fileindex, pe->path,
2622 e20a8b6f 2019-06-04 stsp progress_cb, progress_arg, repo);
2626 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2627 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
2628 e20a8b6f 2019-06-04 stsp err = sync_err;
2630 fb399478 2019-07-12 stsp free(fileindex_path);
2631 a129376b 2019-03-28 stsp if (fileindex)
2632 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
2633 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2634 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
2635 a129376b 2019-03-28 stsp err = unlockerr;
2636 c4296144 2019-05-09 stsp return err;
2639 cf066bf8 2019-05-09 stsp static void
2640 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
2642 24519714 2019-05-09 stsp free(ct->path);
2643 44d03001 2019-05-09 stsp free(ct->in_repo_path);
2644 768aea60 2019-05-09 stsp free(ct->ondisk_path);
2645 e75eb4da 2019-05-10 stsp free(ct->blob_id);
2646 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
2647 b416585c 2019-05-13 stsp free(ct->base_commit_id);
2651 ed175427 2019-05-09 stsp struct collect_commitables_arg {
2652 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
2653 24519714 2019-05-09 stsp struct got_repository *repo;
2654 24519714 2019-05-09 stsp struct got_worktree *worktree;
2657 c4296144 2019-05-09 stsp static const struct got_error *
2658 036813ee 2019-05-09 stsp collect_commitables(void *arg, unsigned char status, const char *relpath,
2659 016a88dd 2019-05-13 stsp struct got_object_id *blob_id, struct got_object_id *commit_id)
2661 ed175427 2019-05-09 stsp struct collect_commitables_arg *a = arg;
2662 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
2663 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
2664 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
2665 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
2666 768aea60 2019-05-09 stsp struct stat sb;
2668 c4296144 2019-05-09 stsp if (status == GOT_STATUS_CONFLICT)
2669 c4296144 2019-05-09 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
2671 c4296144 2019-05-09 stsp if (status != GOT_STATUS_MODIFY && status != GOT_STATUS_ADD &&
2672 c4296144 2019-05-09 stsp status != GOT_STATUS_DELETE)
2673 c4296144 2019-05-09 stsp return NULL;
2675 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
2676 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2677 036813ee 2019-05-09 stsp goto done;
2679 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
2680 036813ee 2019-05-09 stsp parent_path = strdup("");
2681 69960a46 2019-05-09 stsp if (parent_path == NULL)
2682 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
2684 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
2686 69960a46 2019-05-09 stsp return err;
2689 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
2690 cf066bf8 2019-05-09 stsp if (ct == NULL) {
2691 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
2692 c4296144 2019-05-09 stsp goto done;
2695 768aea60 2019-05-09 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
2696 768aea60 2019-05-09 stsp relpath) == -1) {
2697 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2698 768aea60 2019-05-09 stsp goto done;
2700 768aea60 2019-05-09 stsp if (status == GOT_STATUS_DELETE) {
2701 768aea60 2019-05-09 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2703 768aea60 2019-05-09 stsp if (lstat(ct->ondisk_path, &sb) != 0) {
2704 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
2705 768aea60 2019-05-09 stsp goto done;
2707 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
2710 44d03001 2019-05-09 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
2711 44d03001 2019-05-09 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
2712 44d03001 2019-05-09 stsp relpath) == -1) {
2713 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2714 44d03001 2019-05-09 stsp goto done;
2717 cf066bf8 2019-05-09 stsp ct->status = status;
2718 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
2719 036813ee 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD) {
2720 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
2721 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
2722 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2723 b416585c 2019-05-13 stsp goto done;
2725 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
2726 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
2727 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2728 036813ee 2019-05-09 stsp goto done;
2731 24519714 2019-05-09 stsp ct->path = strdup(path);
2732 24519714 2019-05-09 stsp if (ct->path == NULL) {
2733 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
2734 24519714 2019-05-09 stsp goto done;
2736 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
2738 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
2739 ed175427 2019-05-09 stsp free_commitable(ct);
2740 24519714 2019-05-09 stsp free(parent_path);
2741 036813ee 2019-05-09 stsp free(path);
2742 a129376b 2019-03-28 stsp return err;
2745 036813ee 2019-05-09 stsp static const struct got_error *write_tree(struct got_object_id **,
2746 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
2747 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
2748 036813ee 2019-05-09 stsp struct got_repository *);
2750 ed175427 2019-05-09 stsp static const struct got_error *
2751 036813ee 2019-05-09 stsp write_subtree(struct got_object_id **new_subtree_id,
2752 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
2753 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
2754 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
2755 afa376bf 2019-05-09 stsp struct got_repository *repo)
2757 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
2758 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
2759 036813ee 2019-05-09 stsp char *subpath;
2761 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
2762 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
2763 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2765 036813ee 2019-05-09 stsp err = got_object_open_as_tree(&subtree, repo, te->id);
2767 ed175427 2019-05-09 stsp return err;
2769 036813ee 2019-05-09 stsp err = write_tree(new_subtree_id, subtree, subpath, commitable_paths,
2770 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
2771 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
2772 036813ee 2019-05-09 stsp free(subpath);
2773 036813ee 2019-05-09 stsp return err;
2776 036813ee 2019-05-09 stsp static const struct got_error *
2777 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
2779 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2780 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
2782 036813ee 2019-05-09 stsp *match = 0;
2784 036813ee 2019-05-09 stsp if (strchr(ct->path, '/') == NULL) {
2785 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
2786 0f63689d 2019-05-10 stsp return NULL;
2789 0f63689d 2019-05-10 stsp err = got_path_dirname(&ct_parent_path, ct->path);
2791 0f63689d 2019-05-10 stsp return err;
2792 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
2793 036813ee 2019-05-09 stsp free(ct_parent_path);
2794 036813ee 2019-05-09 stsp return err;
2797 768aea60 2019-05-09 stsp static mode_t
2798 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
2800 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
2803 036813ee 2019-05-09 stsp static const struct got_error *
2804 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
2805 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
2807 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2809 036813ee 2019-05-09 stsp *new_te = NULL;
2811 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
2813 036813ee 2019-05-09 stsp goto done;
2815 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
2817 036813ee 2019-05-09 stsp free((*new_te)->id);
2818 e75eb4da 2019-05-10 stsp (*new_te)->id = got_object_id_dup(ct->blob_id);
2819 036813ee 2019-05-09 stsp if ((*new_te)->id == NULL) {
2820 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2821 036813ee 2019-05-09 stsp goto done;
2824 036813ee 2019-05-09 stsp if (err && *new_te) {
2825 036813ee 2019-05-09 stsp got_object_tree_entry_close(*new_te);
2826 036813ee 2019-05-09 stsp *new_te = NULL;
2828 036813ee 2019-05-09 stsp return err;
2831 036813ee 2019-05-09 stsp static const struct got_error *
2832 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
2833 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
2835 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2836 036813ee 2019-05-09 stsp char *ct_name;
2838 036813ee 2019-05-09 stsp *new_te = NULL;
2840 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
2841 036813ee 2019-05-09 stsp if (*new_te == NULL)
2842 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
2844 036813ee 2019-05-09 stsp ct_name = basename(ct->path);
2845 036813ee 2019-05-09 stsp if (ct_name == NULL) {
2846 638f9024 2019-05-13 stsp err = got_error_from_errno2("basename", ct->path);
2847 036813ee 2019-05-09 stsp goto done;
2849 036813ee 2019-05-09 stsp (*new_te)->name = strdup(ct_name);
2850 036813ee 2019-05-09 stsp if ((*new_te)->name == NULL) {
2851 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
2852 036813ee 2019-05-09 stsp goto done;
2855 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
2857 e75eb4da 2019-05-10 stsp (*new_te)->id = got_object_id_dup(ct->blob_id);
2858 036813ee 2019-05-09 stsp if ((*new_te)->id == NULL) {
2859 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2860 036813ee 2019-05-09 stsp goto done;
2863 036813ee 2019-05-09 stsp if (err && *new_te) {
2864 036813ee 2019-05-09 stsp got_object_tree_entry_close(*new_te);
2865 036813ee 2019-05-09 stsp *new_te = NULL;
2867 036813ee 2019-05-09 stsp return err;
2870 036813ee 2019-05-09 stsp static const struct got_error *
2871 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
2872 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
2874 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2875 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
2877 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
2879 036813ee 2019-05-09 stsp return err;
2880 036813ee 2019-05-09 stsp if (new_pe == NULL)
2881 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
2882 036813ee 2019-05-09 stsp return NULL;
2885 afa376bf 2019-05-09 stsp static const struct got_error *
2886 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
2887 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
2889 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
2890 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
2891 afa376bf 2019-05-09 stsp ct_path++;
2892 016a88dd 2019-05-13 stsp return (*status_cb)(status_arg, ct->status, ct_path, ct->blob_id, NULL);
2895 036813ee 2019-05-09 stsp static const struct got_error *
2896 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
2897 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
2899 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
2900 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
2901 44d03001 2019-05-09 stsp char *te_path;
2903 44d03001 2019-05-09 stsp *modified = 0;
2905 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
2906 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
2907 44d03001 2019-05-09 stsp te->name) == -1)
2908 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2910 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
2911 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
2912 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
2913 44d03001 2019-05-09 stsp strlen(te_path));
2914 44d03001 2019-05-09 stsp if (*modified)
2918 44d03001 2019-05-09 stsp free(te_path);
2919 44d03001 2019-05-09 stsp return err;
2922 44d03001 2019-05-09 stsp static const struct got_error *
2923 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
2924 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
2925 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
2927 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2928 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
2930 036813ee 2019-05-09 stsp *ctp = NULL;
2932 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
2933 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
2934 036813ee 2019-05-09 stsp char *ct_name = NULL;
2935 036813ee 2019-05-09 stsp int path_matches;
2937 036813ee 2019-05-09 stsp if (ct->status != GOT_STATUS_MODIFY &&
2938 036813ee 2019-05-09 stsp ct->status != GOT_STATUS_DELETE)
2941 c4e12a88 2019-05-13 stsp if (got_object_id_cmp(ct->base_blob_id, te->id) != 0)
2944 036813ee 2019-05-09 stsp err = match_ct_parent_path(&path_matches, ct, base_tree_path);
2946 036813ee 2019-05-09 stsp return err;
2947 036813ee 2019-05-09 stsp if (!path_matches)
2950 036813ee 2019-05-09 stsp ct_name = basename(pe->path);
2951 036813ee 2019-05-09 stsp if (ct_name == NULL)
2952 638f9024 2019-05-13 stsp return got_error_from_errno2("basename", pe->path);
2954 036813ee 2019-05-09 stsp if (strcmp(te->name, ct_name) != 0)
2957 036813ee 2019-05-09 stsp *ctp = ct;
2961 2b496619 2019-07-10 stsp return err;
2964 2b496619 2019-07-10 stsp static const struct got_error *
2965 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
2966 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
2967 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
2968 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
2969 2b496619 2019-07-10 stsp struct got_repository *repo)
2971 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
2972 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
2973 2b496619 2019-07-10 stsp char *subtree_path;
2975 2b496619 2019-07-10 stsp *new_tep = NULL;
2977 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
2978 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
2979 2b496619 2019-07-10 stsp child_path) == -1)
2980 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
2982 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
2983 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
2984 2b496619 2019-07-10 stsp new_te->name = strdup(child_path);
2985 2b496619 2019-07-10 stsp if (new_te->name == NULL) {
2986 2b496619 2019-07-10 stsp err = got_error_from_errno("strdup");
2987 2b496619 2019-07-10 stsp got_object_tree_entry_close(new_te);
2988 2b496619 2019-07-10 stsp goto done;
2990 2b496619 2019-07-10 stsp err = write_tree(&new_te->id, NULL, subtree_path,
2991 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
2992 2b496619 2019-07-10 stsp if (err) {
2993 2b496619 2019-07-10 stsp got_object_tree_entry_close(new_te);
2994 2b496619 2019-07-10 stsp goto done;
2997 2b496619 2019-07-10 stsp free(subtree_path);
2998 2b496619 2019-07-10 stsp if (err == NULL)
2999 2b496619 2019-07-10 stsp *new_tep = new_te;
3000 036813ee 2019-05-09 stsp return err;
3003 036813ee 2019-05-09 stsp static const struct got_error *
3004 036813ee 2019-05-09 stsp write_tree(struct got_object_id **new_tree_id,
3005 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
3006 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
3007 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3008 036813ee 2019-05-09 stsp struct got_repository *repo)
3010 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3011 036813ee 2019-05-09 stsp const struct got_tree_entries *base_entries = NULL;
3012 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
3013 036813ee 2019-05-09 stsp struct got_tree_entries new_tree_entries;
3014 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
3015 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
3017 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
3018 036813ee 2019-05-09 stsp new_tree_entries.nentries = 0;
3019 036813ee 2019-05-09 stsp SIMPLEQ_INIT(&new_tree_entries.head);
3021 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
3022 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3023 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3024 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
3026 a3df2849 2019-05-20 stsp if (ct->status != GOT_STATUS_ADD ||
3027 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
3030 036813ee 2019-05-09 stsp if (!got_path_is_child(pe->path, path_base_tree,
3031 2f51b5b3 2019-05-09 stsp strlen(path_base_tree)))
3034 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
3035 036813ee 2019-05-09 stsp pe->path);
3037 036813ee 2019-05-09 stsp goto done;
3039 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
3040 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
3041 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
3043 036813ee 2019-05-09 stsp goto done;
3044 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
3046 afa376bf 2019-05-09 stsp goto done;
3047 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
3048 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
3050 2f51b5b3 2019-05-09 stsp goto done;
3052 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
3053 2b496619 2019-07-10 stsp if (base_tree == NULL ||
3054 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
3055 2b496619 2019-07-10 stsp == NULL) {
3056 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
3057 2b496619 2019-07-10 stsp child_path, path_base_tree,
3058 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
3061 2b496619 2019-07-10 stsp goto done;
3062 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
3064 2b496619 2019-07-10 stsp goto done;
3069 2f51b5b3 2019-05-09 stsp if (base_tree) {
3070 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
3071 2f51b5b3 2019-05-09 stsp base_entries = got_object_tree_get_entries(base_tree);
3072 2f51b5b3 2019-05-09 stsp SIMPLEQ_FOREACH(te, &base_entries->head, entry) {
3073 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
3075 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
3076 44d03001 2019-05-09 stsp int modified;
3077 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
3079 036813ee 2019-05-09 stsp goto done;
3080 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
3081 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
3083 2f51b5b3 2019-05-09 stsp goto done;
3084 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
3085 44d03001 2019-05-09 stsp if (modified) {
3086 44d03001 2019-05-09 stsp free(new_te->id);
3087 44d03001 2019-05-09 stsp err = write_subtree(&new_te->id, te,
3088 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
3089 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
3091 44d03001 2019-05-09 stsp goto done;
3093 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
3095 036813ee 2019-05-09 stsp goto done;
3099 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
3100 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
3102 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
3103 2f51b5b3 2019-05-09 stsp if (ct->status == GOT_STATUS_MODIFY) {
3104 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
3105 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
3107 2f51b5b3 2019-05-09 stsp goto done;
3108 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
3110 2f51b5b3 2019-05-09 stsp goto done;
3112 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
3113 b416585c 2019-05-13 stsp status_arg);
3115 afa376bf 2019-05-09 stsp goto done;
3117 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
3118 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
3120 2f51b5b3 2019-05-09 stsp goto done;
3121 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
3123 2f51b5b3 2019-05-09 stsp goto done;
3128 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
3129 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, &paths, entry) {
3130 0b5cc0d6 2019-05-09 stsp struct got_tree_entry *te = pe->data;
3131 0b5cc0d6 2019-05-09 stsp new_tree_entries.nentries++;
3132 0b5cc0d6 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&new_tree_entries.head, te, entry);
3134 036813ee 2019-05-09 stsp err = got_object_tree_create(new_tree_id, &new_tree_entries, repo);
3136 ca2503ea 2019-05-09 stsp got_object_tree_entries_close(&new_tree_entries);
3137 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
3138 ed175427 2019-05-09 stsp return err;
3141 ebf99748 2019-05-09 stsp static const struct got_error *
3142 ebf99748 2019-05-09 stsp update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
3143 93ec1b5f 2019-07-12 stsp struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex)
3145 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
3146 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
3148 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3149 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
3150 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3152 ebf99748 2019-05-09 stsp ie = got_fileindex_entry_get(fileindex, pe->path);
3154 ebf99748 2019-05-09 stsp if (ct->status == GOT_STATUS_DELETE) {
3155 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
3156 ebf99748 2019-05-09 stsp got_fileindex_entry_free(ie);
3158 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
3159 e75eb4da 2019-05-10 stsp ct->ondisk_path, ct->blob_id->sha1,
3160 ebf99748 2019-05-09 stsp new_base_commit_id->sha1, 1);
3162 ebf99748 2019-05-09 stsp err = got_fileindex_entry_alloc(&ie,
3163 e75eb4da 2019-05-10 stsp ct->ondisk_path, pe->path, ct->blob_id->sha1,
3164 ebf99748 2019-05-09 stsp new_base_commit_id->sha1);
3167 ebf99748 2019-05-09 stsp err = got_fileindex_entry_add(fileindex, ie);
3172 d56d26ce 2019-05-10 stsp return err;
3175 d56d26ce 2019-05-10 stsp static const struct got_error *
3176 33ad4cbe 2019-05-12 jcs check_ct_out_of_date(struct got_commitable *ct, struct got_repository *repo,
3177 d56d26ce 2019-05-10 stsp struct got_object_id *head_commit_id)
3179 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
3180 1a36436d 2019-06-10 stsp struct got_object_id *id_in_head = NULL, *id = NULL;
3181 1a36436d 2019-06-10 stsp struct got_commit_object *commit = NULL;
3182 1a36436d 2019-06-10 stsp char *path = NULL;
3183 1a36436d 2019-06-10 stsp const char *ct_path = ct->in_repo_path;
3185 1a36436d 2019-06-10 stsp while (ct_path[0] == '/')
3186 1a36436d 2019-06-10 stsp ct_path++;
3189 1a36436d 2019-06-10 stsp * Ensure that no modifications were made to files *and their parents*
3190 1a36436d 2019-06-10 stsp * in commits between the file's base commit and the branch head.
3192 1a36436d 2019-06-10 stsp * Checking the parents is important for detecting conflicting tree
3193 1a36436d 2019-06-10 stsp * configurations (files or parent folders might have been moved,
3194 1a36436d 2019-06-10 stsp * deleted, added again, etc.). Such changes need to be merged with
3195 1a36436d 2019-06-10 stsp * local changes before a commit can occur.
3197 1a36436d 2019-06-10 stsp * The implication is that the file's (parent) entry in the root
3198 1a36436d 2019-06-10 stsp * directory must have the same ID in all relevant commits.
3200 b416585c 2019-05-13 stsp if (ct->status != GOT_STATUS_ADD) {
3201 1a36436d 2019-06-10 stsp struct got_object_qid *pid;
3202 1a36436d 2019-06-10 stsp char *slash;
3203 1a36436d 2019-06-10 stsp struct got_object_id *root_entry_id = NULL;
3205 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
3206 1a36436d 2019-06-10 stsp if (got_object_id_cmp(ct->base_commit_id, head_commit_id) == 0)
3207 1a36436d 2019-06-10 stsp return NULL;
3209 1a36436d 2019-06-10 stsp /* Compute the path to the root directory's entry. */
3210 1a36436d 2019-06-10 stsp path = strdup(ct_path);
3211 1a36436d 2019-06-10 stsp if (path == NULL) {
3212 1a36436d 2019-06-10 stsp err = got_error_from_errno("strdup");
3213 1a36436d 2019-06-10 stsp goto done;
3215 1a36436d 2019-06-10 stsp slash = strchr(path, '/');
3216 1a36436d 2019-06-10 stsp if (slash)
3217 1a36436d 2019-06-10 stsp *slash = '\0';
3219 1a36436d 2019-06-10 stsp err = got_object_open_as_commit(&commit, repo, head_commit_id);
3221 1a36436d 2019-06-10 stsp goto done;
3223 1a36436d 2019-06-10 stsp err = got_object_id_by_path(&root_entry_id, repo,
3224 1a36436d 2019-06-10 stsp head_commit_id, path);
3226 1a36436d 2019-06-10 stsp goto done;
3228 1a36436d 2019-06-10 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3229 1a36436d 2019-06-10 stsp while (pid) {
3230 1a36436d 2019-06-10 stsp struct got_commit_object *pcommit;
3232 1a36436d 2019-06-10 stsp err = got_object_id_by_path(&id, repo, pid->id, path);
3233 1a36436d 2019-06-10 stsp if (err) {
3234 1a36436d 2019-06-10 stsp if (err->code != GOT_ERR_NO_TREE_ENTRY)
3235 1a36436d 2019-06-10 stsp goto done;
3236 1a36436d 2019-06-10 stsp err = NULL;
3240 1a36436d 2019-06-10 stsp err = got_object_id_by_path(&id, repo, pid->id, path);
3242 1a36436d 2019-06-10 stsp goto done;
3244 1a36436d 2019-06-10 stsp if (got_object_id_cmp(id, root_entry_id) != 0) {
3245 1a36436d 2019-06-10 stsp err = got_error(GOT_ERR_COMMIT_OUT_OF_DATE);
3249 1a36436d 2019-06-10 stsp if (got_object_id_cmp(pid->id, ct->base_commit_id) == 0)
3250 1a36436d 2019-06-10 stsp break; /* all relevant commits scanned */
3252 1a36436d 2019-06-10 stsp err = got_object_open_as_commit(&pcommit, repo,
3255 1a36436d 2019-06-10 stsp goto done;
3257 1a36436d 2019-06-10 stsp got_object_commit_close(commit);
3258 1a36436d 2019-06-10 stsp commit = pcommit;
3259 1a36436d 2019-06-10 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(
3263 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
3264 1a36436d 2019-06-10 stsp err = got_object_id_by_path(&id_in_head, repo, head_commit_id,
3266 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3267 1a36436d 2019-06-10 stsp goto done;
3268 1a36436d 2019-06-10 stsp err = id_in_head ? got_error(GOT_ERR_COMMIT_OUT_OF_DATE) : NULL;
3271 1a36436d 2019-06-10 stsp if (commit)
3272 1a36436d 2019-06-10 stsp got_object_commit_close(commit);
3273 d56d26ce 2019-05-10 stsp free(id_in_head);
3275 1a36436d 2019-06-10 stsp free(path);
3276 1a36436d 2019-06-10 stsp return err;
3279 c4296144 2019-05-09 stsp const struct got_error *
3280 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
3281 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
3282 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id, struct got_worktree *worktree,
3283 39cd0ff6 2019-07-12 stsp const char *ondisk_path, const char *author, const char *committer,
3284 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
3285 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3286 afa376bf 2019-05-09 stsp struct got_repository *repo)
3288 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
3289 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
3290 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
3291 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
3292 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
3293 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
3294 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
3295 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
3296 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
3297 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
3298 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
3300 c4296144 2019-05-09 stsp *new_commit_id = NULL;
3302 de18fc63 2019-05-09 stsp SIMPLEQ_INIT(&parent_ids);
3304 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
3306 588edf97 2019-05-10 stsp goto done;
3308 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
3310 588edf97 2019-05-10 stsp goto done;
3312 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
3313 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
3318 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
3319 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
3323 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
3324 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3325 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3326 cf066bf8 2019-05-09 stsp char *ondisk_path;
3328 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
3329 cf066bf8 2019-05-09 stsp ct->status != GOT_STATUS_MODIFY)
3332 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
3333 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
3334 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3335 cf066bf8 2019-05-09 stsp goto done;
3337 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
3338 a7055788 2019-05-09 stsp free(ondisk_path);
3340 cf066bf8 2019-05-09 stsp goto done;
3343 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
3344 39cd0ff6 2019-07-12 stsp err = write_tree(&new_tree_id, head_tree, "/", commitable_paths,
3345 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
3347 036813ee 2019-05-09 stsp goto done;
3349 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
3351 de18fc63 2019-05-09 stsp goto done;
3352 de18fc63 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
3353 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
3354 de18fc63 2019-05-09 stsp 1, author, time(NULL), committer, time(NULL), logmsg, repo);
3355 de18fc63 2019-05-09 stsp got_object_qid_free(pid);
3356 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
3357 33ad4cbe 2019-05-12 jcs free(logmsg);
3359 9d40349a 2019-05-09 stsp goto done;
3361 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
3362 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
3363 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
3364 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
3365 09f5bd90 2019-05-09 stsp goto done;
3367 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
3368 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
3370 09f5bd90 2019-05-09 stsp goto done;
3371 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
3373 ebf99748 2019-05-09 stsp goto done;
3374 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
3375 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
3376 09f5bd90 2019-05-09 stsp goto done;
3378 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
3379 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
3381 f2c16586 2019-05-09 stsp goto done;
3382 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
3384 f2c16586 2019-05-09 stsp goto done;
3386 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
3388 09f5bd90 2019-05-09 stsp goto done;
3390 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
3392 ebf99748 2019-05-09 stsp goto done;
3394 588edf97 2019-05-10 stsp if (head_tree)
3395 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
3396 588edf97 2019-05-10 stsp if (head_commit)
3397 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
3398 09f5bd90 2019-05-09 stsp free(head_commit_id2);
3399 2f17228e 2019-05-12 stsp if (head_ref2) {
3400 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
3401 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
3402 2f17228e 2019-05-12 stsp err = unlockerr;
3403 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
3405 39cd0ff6 2019-07-12 stsp return err;
3408 39cd0ff6 2019-07-12 stsp const struct got_error *
3409 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
3410 39cd0ff6 2019-07-12 stsp struct got_worktree *worktree, const char *ondisk_path,
3411 39cd0ff6 2019-07-12 stsp const char *author, const char *committer,
3412 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
3413 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
3414 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
3416 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
3417 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
3418 39cd0ff6 2019-07-12 stsp char *fileindex_path = NULL, *relpath = NULL;
3419 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
3420 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
3421 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
3422 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
3423 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
3425 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
3427 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
3429 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
3431 39cd0ff6 2019-07-12 stsp goto done;
3433 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
3435 39cd0ff6 2019-07-12 stsp goto done;
3437 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
3439 39cd0ff6 2019-07-12 stsp goto done;
3441 39cd0ff6 2019-07-12 stsp if (ondisk_path) {
3442 39cd0ff6 2019-07-12 stsp err = got_path_skip_common_ancestor(&relpath,
3443 39cd0ff6 2019-07-12 stsp worktree->root_path, ondisk_path);
3445 39cd0ff6 2019-07-12 stsp return err;
3448 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3450 39cd0ff6 2019-07-12 stsp goto done;
3452 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
3453 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
3454 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
3455 39cd0ff6 2019-07-12 stsp err = worktree_status(worktree, relpath ? relpath : "",
3456 39cd0ff6 2019-07-12 stsp fileindex, repo, collect_commitables, &cc_arg, NULL, NULL);
3458 39cd0ff6 2019-07-12 stsp goto done;
3460 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
3461 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
3462 39cd0ff6 2019-07-12 stsp goto done;
3465 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
3466 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
3467 b50cabdf 2019-07-12 stsp err = check_ct_out_of_date(ct, repo, head_commit_id);
3469 b50cabdf 2019-07-12 stsp goto done;
3472 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
3473 39cd0ff6 2019-07-12 stsp head_commit_id, worktree, ondisk_path, author, committer,
3474 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
3476 39cd0ff6 2019-07-12 stsp goto done;
3478 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
3479 93ec1b5f 2019-07-12 stsp fileindex);
3480 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3481 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
3482 39cd0ff6 2019-07-12 stsp err = sync_err;
3484 39cd0ff6 2019-07-12 stsp if (fileindex)
3485 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
3486 39cd0ff6 2019-07-12 stsp free(fileindex_path);
3487 39cd0ff6 2019-07-12 stsp free(relpath);
3488 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3489 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
3490 39cd0ff6 2019-07-12 stsp err = unlockerr;
3491 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
3492 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
3493 39cd0ff6 2019-07-12 stsp free_commitable(ct);
3495 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
3496 c4296144 2019-05-09 stsp return err;
3499 8656d6c4 2019-05-20 stsp const char *
3500 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
3502 8656d6c4 2019-05-20 stsp return ct->path;
3505 8656d6c4 2019-05-20 stsp unsigned int
3506 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
3508 8656d6c4 2019-05-20 stsp return ct->status;
3511 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
3512 818c7501 2019-07-11 stsp struct got_worktree *worktree;
3513 818c7501 2019-07-11 stsp struct got_repository *repo;
3514 818c7501 2019-07-11 stsp int rebase_in_progress;
3517 818c7501 2019-07-11 stsp static const struct got_error *
3518 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
3520 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
3521 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
3522 818c7501 2019-07-11 stsp unsigned char status;
3523 818c7501 2019-07-11 stsp struct stat sb;
3524 818c7501 2019-07-11 stsp char *ondisk_path;
3526 818c7501 2019-07-11 stsp if (!a->rebase_in_progress) {
3527 818c7501 2019-07-11 stsp /* Reject rebase of a work tree with mixed base commits. */
3528 818c7501 2019-07-11 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
3529 818c7501 2019-07-11 stsp SHA1_DIGEST_LENGTH))
3530 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MIXED_COMMITS);
3533 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3535 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
3537 818c7501 2019-07-11 stsp /* Reject rebase of a work tree with modified or conflicted files. */
3538 818c7501 2019-07-11 stsp err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
3539 818c7501 2019-07-11 stsp free(ondisk_path);
3541 818c7501 2019-07-11 stsp return err;
3543 818c7501 2019-07-11 stsp if (a->rebase_in_progress) {
3544 818c7501 2019-07-11 stsp if (status == GOT_STATUS_CONFLICT)
3545 818c7501 2019-07-11 stsp return got_error(GOT_ERR_CONFLICTS);
3546 818c7501 2019-07-11 stsp } else if (status != GOT_STATUS_NO_CHANGE)
3547 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
3549 818c7501 2019-07-11 stsp return NULL;
3552 818c7501 2019-07-11 stsp const struct got_error *
3553 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
3554 818c7501 2019-07-11 stsp struct got_reference **tmp_branch, struct got_worktree *worktree,
3555 818c7501 2019-07-11 stsp struct got_reference *branch, struct got_repository *repo)
3557 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
3558 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
3559 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
3560 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
3561 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
3562 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
3563 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
3565 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
3566 818c7501 2019-07-11 stsp *tmp_branch = NULL;
3568 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
3570 818c7501 2019-07-11 stsp return err;
3572 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3574 818c7501 2019-07-11 stsp goto done;
3576 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
3577 818c7501 2019-07-11 stsp ok_arg.repo = repo;
3578 818c7501 2019-07-11 stsp ok_arg.rebase_in_progress = 0;
3579 818c7501 2019-07-11 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_rebase_ok,
3582 818c7501 2019-07-11 stsp goto done;
3584 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3586 818c7501 2019-07-11 stsp goto done;
3588 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
3590 818c7501 2019-07-11 stsp goto done;
3592 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
3594 818c7501 2019-07-11 stsp goto done;
3596 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
3599 818c7501 2019-07-11 stsp goto done;
3601 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
3602 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
3604 818c7501 2019-07-11 stsp goto done;
3605 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
3607 818c7501 2019-07-11 stsp goto done;
3609 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
3611 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
3613 818c7501 2019-07-11 stsp goto done;
3615 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
3617 818c7501 2019-07-11 stsp goto done;
3619 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
3620 818c7501 2019-07-11 stsp worktree->base_commit_id);
3622 818c7501 2019-07-11 stsp goto done;
3623 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
3625 818c7501 2019-07-11 stsp goto done;
3627 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
3629 818c7501 2019-07-11 stsp goto done;
3631 818c7501 2019-07-11 stsp free(fileindex_path);
3632 818c7501 2019-07-11 stsp if (fileindex)
3633 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
3634 818c7501 2019-07-11 stsp free(tmp_branch_name);
3635 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
3636 818c7501 2019-07-11 stsp free(branch_ref_name);
3637 818c7501 2019-07-11 stsp if (branch_ref)
3638 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
3639 818c7501 2019-07-11 stsp if (wt_branch)
3640 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
3641 818c7501 2019-07-11 stsp if (err) {
3642 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
3643 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
3644 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
3646 818c7501 2019-07-11 stsp if (*tmp_branch) {
3647 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
3648 818c7501 2019-07-11 stsp *tmp_branch = NULL;
3650 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
3652 818c7501 2019-07-11 stsp return err;
3655 818c7501 2019-07-11 stsp const struct got_error *
3656 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
3657 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
3658 818c7501 2019-07-11 stsp struct got_reference **branch, struct got_worktree *worktree,
3659 818c7501 2019-07-11 stsp struct got_repository *repo)
3661 818c7501 2019-07-11 stsp const struct got_error *err;
3662 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
3663 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
3664 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
3666 818c7501 2019-07-11 stsp *commit_id = NULL;
3668 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3670 818c7501 2019-07-11 stsp return err;
3672 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
3674 818c7501 2019-07-11 stsp goto done;
3676 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
3678 818c7501 2019-07-11 stsp goto done;
3680 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
3682 818c7501 2019-07-11 stsp goto done;
3684 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
3686 818c7501 2019-07-11 stsp goto done;
3688 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
3689 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
3691 818c7501 2019-07-11 stsp goto done;
3693 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
3695 818c7501 2019-07-11 stsp goto done;
3697 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
3699 818c7501 2019-07-11 stsp goto done;
3701 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
3702 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
3704 818c7501 2019-07-11 stsp goto done;
3706 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
3708 818c7501 2019-07-11 stsp goto done;
3710 818c7501 2019-07-11 stsp free(commit_ref_name);
3711 818c7501 2019-07-11 stsp free(branch_ref_name);
3712 818c7501 2019-07-11 stsp if (commit_ref)
3713 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
3714 818c7501 2019-07-11 stsp if (branch_ref)
3715 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
3716 818c7501 2019-07-11 stsp if (err) {
3717 818c7501 2019-07-11 stsp free(*commit_id);
3718 818c7501 2019-07-11 stsp *commit_id = NULL;
3719 818c7501 2019-07-11 stsp if (*tmp_branch) {
3720 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
3721 818c7501 2019-07-11 stsp *tmp_branch = NULL;
3723 818c7501 2019-07-11 stsp if (*new_base_branch) {
3724 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
3725 818c7501 2019-07-11 stsp *new_base_branch = NULL;
3727 818c7501 2019-07-11 stsp if (*branch) {
3728 818c7501 2019-07-11 stsp got_ref_close(*branch);
3729 818c7501 2019-07-11 stsp *branch = NULL;
3732 818c7501 2019-07-11 stsp return err;
3735 818c7501 2019-07-11 stsp const struct got_error *
3736 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
3738 818c7501 2019-07-11 stsp const struct got_error *err;
3739 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
3741 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3743 818c7501 2019-07-11 stsp return err;
3745 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
3746 818c7501 2019-07-11 stsp free(tmp_branch_name);
3747 818c7501 2019-07-11 stsp return NULL;
3750 818c7501 2019-07-11 stsp static const struct got_error *
3751 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
3752 818c7501 2019-07-11 stsp char **logmsg, void *arg)
3754 818c7501 2019-07-11 stsp struct got_commit_object *commit = arg;
3756 818c7501 2019-07-11 stsp *logmsg = strdup(got_object_commit_get_logmsg(commit));
3757 818c7501 2019-07-11 stsp if (*logmsg == NULL)
3758 818c7501 2019-07-11 stsp return got_error_from_errno("strdup");
3760 818c7501 2019-07-11 stsp return NULL;
3763 818c7501 2019-07-11 stsp static const struct got_error *
3764 818c7501 2019-07-11 stsp rebase_status(void *arg, unsigned char status, const char *path,
3765 818c7501 2019-07-11 stsp struct got_object_id *blob_id, struct got_object_id *commit_id)
3767 818c7501 2019-07-11 stsp return NULL;
3770 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
3771 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
3772 01757395 2019-07-12 stsp void *progress_arg;
3773 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
3776 01757395 2019-07-12 stsp static const struct got_error *
3777 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
3779 01757395 2019-07-12 stsp const struct got_error *err;
3780 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
3782 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
3784 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
3786 01757395 2019-07-12 stsp return err;
3788 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
3789 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
3790 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
3791 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
3792 01757395 2019-07-12 stsp return NULL;
3794 01757395 2019-07-12 stsp p = strdup(path);
3795 01757395 2019-07-12 stsp if (p == NULL)
3796 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
3798 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
3799 01757395 2019-07-12 stsp if (err || new == NULL)
3801 01757395 2019-07-12 stsp return err;
3805 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
3807 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
3809 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
3810 01757395 2019-07-12 stsp free((char *)pe->path);
3812 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
3815 818c7501 2019-07-11 stsp const struct got_error *
3816 01757395 2019-07-12 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
3817 01757395 2019-07-12 stsp struct got_worktree *worktree, struct got_object_id *parent_commit_id,
3818 01757395 2019-07-12 stsp struct got_object_id *commit_id, struct got_repository *repo,
3819 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3820 01757395 2019-07-12 stsp got_worktree_cancel_cb cancel_cb, void *cancel_arg)
3822 818c7501 2019-07-11 stsp const struct got_error *err;
3823 818c7501 2019-07-11 stsp struct got_fileindex *fileindex;
3824 818c7501 2019-07-11 stsp char *fileindex_path, *commit_ref_name = NULL;
3825 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
3826 01757395 2019-07-12 stsp struct collect_merged_paths_arg cmp_arg;
3828 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
3830 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3832 818c7501 2019-07-11 stsp return err;
3834 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
3836 818c7501 2019-07-11 stsp goto done;
3837 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
3838 818c7501 2019-07-11 stsp if (err) {
3839 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
3840 818c7501 2019-07-11 stsp goto done;
3841 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
3843 818c7501 2019-07-11 stsp goto done;
3844 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
3846 818c7501 2019-07-11 stsp goto done;
3848 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
3851 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
3853 818c7501 2019-07-11 stsp goto done;
3854 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
3855 818c7501 2019-07-11 stsp free(stored_id);
3856 818c7501 2019-07-11 stsp if (cmp != 0) {
3857 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
3858 818c7501 2019-07-11 stsp goto done;
3862 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
3863 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
3864 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
3865 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
3866 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
3867 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
3869 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
3870 818c7501 2019-07-11 stsp free(fileindex_path);
3871 818c7501 2019-07-11 stsp if (commit_ref)
3872 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
3873 818c7501 2019-07-11 stsp return err;
3876 818c7501 2019-07-11 stsp const struct got_error *
3877 818c7501 2019-07-11 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
3878 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
3879 01757395 2019-07-12 stsp struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
3880 818c7501 2019-07-11 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
3882 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
3883 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
3884 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
3885 a0e95631 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
3886 a0e95631 2019-07-12 stsp char *fileindex_path = NULL, *commit_ref_name = NULL;
3887 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
3888 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
3889 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
3890 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
3892 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
3893 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
3895 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
3897 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
3899 a0e95631 2019-07-12 stsp return err;
3900 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
3902 818c7501 2019-07-11 stsp goto done;
3903 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
3905 818c7501 2019-07-11 stsp goto done;
3906 818c7501 2019-07-11 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
3907 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
3908 818c7501 2019-07-11 stsp goto done;
3911 a0e95631 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3913 818c7501 2019-07-11 stsp goto done;
3915 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
3916 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
3917 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
3919 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
3920 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
3921 01757395 2019-07-12 stsp * TODO: Ideally, merged_paths would contain a list of commitables
3922 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
3924 01757395 2019-07-12 stsp if (merged_paths) {
3925 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
3926 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
3927 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
3928 01757395 2019-07-12 stsp repo, collect_commitables, &cc_arg, NULL, NULL);
3930 01757395 2019-07-12 stsp goto done;
3933 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
3934 01757395 2019-07-12 stsp collect_commitables, &cc_arg, NULL, NULL);
3936 01757395 2019-07-12 stsp goto done;
3939 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
3940 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
3941 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
3943 a0e95631 2019-07-12 stsp goto done;
3944 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
3945 a0e95631 2019-07-12 stsp goto done;
3948 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
3950 edd02c5e 2019-07-11 stsp goto done;
3952 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
3954 818c7501 2019-07-11 stsp goto done;
3956 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
3957 a0e95631 2019-07-12 stsp worktree, NULL, got_object_commit_get_author(orig_commit),
3958 a0e95631 2019-07-12 stsp got_object_commit_get_committer(orig_commit),
3959 a0e95631 2019-07-12 stsp collect_rebase_commit_msg, orig_commit,
3960 a0e95631 2019-07-12 stsp rebase_status, NULL, repo);
3962 a0e95631 2019-07-12 stsp goto done;
3964 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
3966 a0e95631 2019-07-12 stsp goto done;
3968 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
3970 a0e95631 2019-07-12 stsp goto done;
3972 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
3973 93ec1b5f 2019-07-12 stsp fileindex);
3974 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3975 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
3976 a0e95631 2019-07-12 stsp err = sync_err;
3978 a0e95631 2019-07-12 stsp if (fileindex)
3979 a0e95631 2019-07-12 stsp got_fileindex_free(fileindex);
3980 a0e95631 2019-07-12 stsp free(fileindex_path);
3981 818c7501 2019-07-11 stsp free(commit_ref_name);
3982 818c7501 2019-07-11 stsp if (commit_ref)
3983 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
3984 a0e95631 2019-07-12 stsp free(head_commit_id);
3985 a0e95631 2019-07-12 stsp if (head_ref)
3986 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
3987 818c7501 2019-07-11 stsp if (err) {
3988 818c7501 2019-07-11 stsp free(*new_commit_id);
3989 818c7501 2019-07-11 stsp *new_commit_id = NULL;
3991 818c7501 2019-07-11 stsp return err;
3994 818c7501 2019-07-11 stsp const struct got_error *
3995 818c7501 2019-07-11 stsp got_worktree_rebase_postpone(struct got_worktree *worktree)
3997 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
4000 69844fba 2019-07-11 stsp static const struct got_error *
4001 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
4003 69844fba 2019-07-11 stsp const struct got_error *err;
4004 69844fba 2019-07-11 stsp struct got_reference *ref;
4006 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
4007 69844fba 2019-07-11 stsp if (err) {
4008 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
4009 69844fba 2019-07-11 stsp return NULL;
4010 69844fba 2019-07-11 stsp return err;
4013 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
4014 69844fba 2019-07-11 stsp got_ref_close(ref);
4015 69844fba 2019-07-11 stsp return err;
4018 69844fba 2019-07-11 stsp static const struct got_error *
4019 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
4021 69844fba 2019-07-11 stsp const struct got_error *err;
4022 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
4023 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
4025 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4027 69844fba 2019-07-11 stsp goto done;
4028 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
4030 69844fba 2019-07-11 stsp goto done;
4032 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4034 69844fba 2019-07-11 stsp goto done;
4035 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
4037 69844fba 2019-07-11 stsp goto done;
4039 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4041 69844fba 2019-07-11 stsp goto done;
4042 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
4044 69844fba 2019-07-11 stsp goto done;
4046 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4048 69844fba 2019-07-11 stsp goto done;
4049 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
4051 69844fba 2019-07-11 stsp goto done;
4054 69844fba 2019-07-11 stsp free(tmp_branch_name);
4055 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
4056 69844fba 2019-07-11 stsp free(branch_ref_name);
4057 69844fba 2019-07-11 stsp free(commit_ref_name);
4058 69844fba 2019-07-11 stsp return err;
4061 818c7501 2019-07-11 stsp const struct got_error *
4062 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
4063 818c7501 2019-07-11 stsp struct got_reference *new_base_branch, struct got_reference *tmp_branch,
4064 818c7501 2019-07-11 stsp struct got_reference *rebased_branch,
4065 818c7501 2019-07-11 stsp struct got_repository *repo)
4067 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
4068 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
4070 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
4072 818c7501 2019-07-11 stsp return err;
4074 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
4076 818c7501 2019-07-11 stsp goto done;
4078 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
4080 818c7501 2019-07-11 stsp goto done;
4082 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
4084 818c7501 2019-07-11 stsp goto done;
4086 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
4088 818c7501 2019-07-11 stsp free(new_head_commit_id);
4089 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4090 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
4091 818c7501 2019-07-11 stsp err = unlockerr;
4092 818c7501 2019-07-11 stsp return err;
4095 818c7501 2019-07-11 stsp struct collect_revertible_paths_arg {
4096 818c7501 2019-07-11 stsp struct got_pathlist_head *revertible_paths;
4097 818c7501 2019-07-11 stsp struct got_worktree *worktree;
4100 818c7501 2019-07-11 stsp static const struct got_error *
4101 818c7501 2019-07-11 stsp collect_revertible_paths(void *arg, unsigned char status, const char *relpath,
4102 818c7501 2019-07-11 stsp struct got_object_id *blob_id, struct got_object_id *commit_id)
4104 818c7501 2019-07-11 stsp struct collect_revertible_paths_arg *a = arg;
4105 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
4106 818c7501 2019-07-11 stsp struct got_pathlist_entry *new = NULL;
4107 818c7501 2019-07-11 stsp char *path = NULL;
4109 818c7501 2019-07-11 stsp if (status != GOT_STATUS_ADD &&
4110 818c7501 2019-07-11 stsp status != GOT_STATUS_DELETE &&
4111 818c7501 2019-07-11 stsp status != GOT_STATUS_MODIFY &&
4112 818c7501 2019-07-11 stsp status != GOT_STATUS_CONFLICT &&
4113 818c7501 2019-07-11 stsp status != GOT_STATUS_MISSING)
4114 818c7501 2019-07-11 stsp return NULL;
4116 818c7501 2019-07-11 stsp if (asprintf(&path, "%s/%s", a->worktree->root_path, relpath) == -1)
4117 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
4119 818c7501 2019-07-11 stsp err = got_pathlist_insert(&new, a->revertible_paths, path, NULL);
4120 818c7501 2019-07-11 stsp if (err || new == NULL)
4121 818c7501 2019-07-11 stsp free(path);
4122 818c7501 2019-07-11 stsp return err;
4125 818c7501 2019-07-11 stsp const struct got_error *
4126 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
4127 818c7501 2019-07-11 stsp struct got_repository *repo, struct got_reference *new_base_branch,
4128 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
4130 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
4131 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
4132 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
4133 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
4134 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
4135 818c7501 2019-07-11 stsp struct got_pathlist_head revertible_paths;
4136 818c7501 2019-07-11 stsp struct got_pathlist_entry *pe;
4137 818c7501 2019-07-11 stsp struct collect_revertible_paths_arg crp_arg;
4138 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
4140 818c7501 2019-07-11 stsp TAILQ_INIT(&revertible_paths);
4142 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
4144 818c7501 2019-07-11 stsp return err;
4146 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
4147 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
4149 818c7501 2019-07-11 stsp goto done;
4151 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
4153 818c7501 2019-07-11 stsp goto done;
4156 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
4157 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
4158 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
4160 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
4162 818c7501 2019-07-11 stsp goto done;
4164 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
4166 818c7501 2019-07-11 stsp goto done;
4168 ca355955 2019-07-12 stsp err = got_object_id_by_path(&tree_id, repo,
4169 ca355955 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
4171 ca355955 2019-07-12 stsp goto done;
4173 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
4175 ca355955 2019-07-12 stsp goto done;
4177 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4179 818c7501 2019-07-11 stsp goto done;
4181 347d1d3e 2019-07-12 stsp crp_arg.revertible_paths = &revertible_paths;
4182 347d1d3e 2019-07-12 stsp crp_arg.worktree = worktree;
4183 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
4184 347d1d3e 2019-07-12 stsp collect_revertible_paths, &crp_arg, NULL, NULL);
4186 55bd499d 2019-07-12 stsp goto done;
4188 818c7501 2019-07-11 stsp TAILQ_FOREACH(pe, &revertible_paths, entry) {
4189 818c7501 2019-07-11 stsp err = revert_file(worktree, fileindex, pe->path,
4190 818c7501 2019-07-11 stsp progress_cb, progress_arg, repo);
4192 ca355955 2019-07-12 stsp goto sync;
4195 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
4196 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
4198 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4199 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
4200 ca355955 2019-07-12 stsp err = sync_err;
4202 818c7501 2019-07-11 stsp got_ref_close(resolved);
4203 a3a2faf2 2019-07-12 stsp free(tree_id);
4204 818c7501 2019-07-11 stsp free(commit_id);
4205 5ade8233 2019-07-12 stsp if (fileindex)
4206 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
4207 818c7501 2019-07-11 stsp free(fileindex_path);
4208 818c7501 2019-07-11 stsp TAILQ_FOREACH(pe, &revertible_paths, entry)
4209 818c7501 2019-07-11 stsp free((char *)pe->path);
4210 818c7501 2019-07-11 stsp got_pathlist_free(&revertible_paths);
4212 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4213 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
4214 818c7501 2019-07-11 stsp err = unlockerr;
4215 818c7501 2019-07-11 stsp return err;
