2 5d56da81 2019-01-13 stsp * Copyright (c) 2018, 2019 Stefan Sperling <stsp@openbsd.org>
4 86c3caaf 2018-03-09 stsp * Permission to use, copy, modify, and distribute this software for any
5 86c3caaf 2018-03-09 stsp * purpose with or without fee is hereby granted, provided that the above
6 86c3caaf 2018-03-09 stsp * copyright notice and this permission notice appear in all copies.
8 86c3caaf 2018-03-09 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 86c3caaf 2018-03-09 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 86c3caaf 2018-03-09 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 86c3caaf 2018-03-09 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 86c3caaf 2018-03-09 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 86c3caaf 2018-03-09 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 86c3caaf 2018-03-09 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 86c3caaf 2018-03-09 stsp #include <sys/stat.h>
18 6d9d28c3 2018-03-11 stsp #include <sys/limits.h>
19 9d31a1d8 2018-03-11 stsp #include <sys/queue.h>
20 133d2798 2019-01-08 stsp #include <sys/tree.h>
22 d1f6d47b 2019-02-04 stsp #include <dirent.h>
23 f5c49f82 2019-01-06 stsp #include <stddef.h>
24 86c3caaf 2018-03-09 stsp #include <string.h>
25 86c3caaf 2018-03-09 stsp #include <stdio.h>
26 86c3caaf 2018-03-09 stsp #include <stdlib.h>
27 86c3caaf 2018-03-09 stsp #include <fcntl.h>
28 86c3caaf 2018-03-09 stsp #include <errno.h>
29 86c3caaf 2018-03-09 stsp #include <unistd.h>
30 9d31a1d8 2018-03-11 stsp #include <sha1.h>
31 9d31a1d8 2018-03-11 stsp #include <zlib.h>
32 9d31a1d8 2018-03-11 stsp #include <fnmatch.h>
33 512f0d0e 2019-01-02 stsp #include <libgen.h>
34 ec22038e 2019-03-10 stsp #include <uuid.h>
35 7154f6ce 2019-03-27 stsp #include <util.h>
37 86c3caaf 2018-03-09 stsp #include "got_error.h"
38 86c3caaf 2018-03-09 stsp #include "got_repository.h"
39 5261c201 2018-04-01 stsp #include "got_reference.h"
40 9d31a1d8 2018-03-11 stsp #include "got_object.h"
41 1dd54920 2019-05-11 stsp #include "got_path.h"
42 86c3caaf 2018-03-09 stsp #include "got_worktree.h"
43 511a516b 2018-05-19 stsp #include "got_opentemp.h"
44 234035bc 2019-06-01 stsp #include "got_diff.h"
46 718b3ab0 2018-03-17 stsp #include "got_lib_worktree.h"
47 718b3ab0 2018-03-17 stsp #include "got_lib_sha1.h"
48 718b3ab0 2018-03-17 stsp #include "got_lib_fileindex.h"
49 63581804 2018-07-09 stsp #include "got_lib_inflate.h"
50 718b3ab0 2018-03-17 stsp #include "got_lib_delta.h"
51 718b3ab0 2018-03-17 stsp #include "got_lib_object.h"
52 ed175427 2019-05-09 stsp #include "got_lib_object_parse.h"
53 cf066bf8 2019-05-09 stsp #include "got_lib_object_create.h"
54 24519714 2019-05-09 stsp #include "got_lib_object_idset.h"
55 6353ad76 2019-02-08 stsp #include "got_lib_diff.h"
58 9d31a1d8 2018-03-11 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
61 99724ed4 2018-03-10 stsp static const struct got_error *
62 7ac97322 2018-03-11 stsp create_meta_file(const char *path_got, const char *name, const char *content)
64 99724ed4 2018-03-10 stsp const struct got_error *err = NULL;
67 2c7829a4 2019-06-17 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1)
68 2c7829a4 2019-06-17 stsp return got_error_from_errno("asprintf");
70 2c7829a4 2019-06-17 stsp err = got_path_create_file(path, content);
75 507dc3bb 2018-12-29 stsp static const struct got_error *
76 507dc3bb 2018-12-29 stsp update_meta_file(const char *path_got, const char *name, const char *content)
78 507dc3bb 2018-12-29 stsp const struct got_error *err = NULL;
79 507dc3bb 2018-12-29 stsp FILE *tmpfile = NULL;
80 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
81 507dc3bb 2018-12-29 stsp char *path = NULL;
83 507dc3bb 2018-12-29 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
84 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
85 507dc3bb 2018-12-29 stsp path = NULL;
89 507dc3bb 2018-12-29 stsp err = got_opentemp_named(&tmppath, &tmpfile, path);
93 507dc3bb 2018-12-29 stsp if (content) {
94 507dc3bb 2018-12-29 stsp int len = fprintf(tmpfile, "%s\n", content);
95 507dc3bb 2018-12-29 stsp if (len != strlen(content) + 1) {
96 638f9024 2019-05-13 stsp err = got_error_from_errno2("fprintf", tmppath);
101 507dc3bb 2018-12-29 stsp if (rename(tmppath, path) != 0) {
102 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath, path);
103 2a57020b 2019-02-20 stsp unlink(tmppath);
108 fb43ecf1 2019-02-11 stsp if (fclose(tmpfile) != 0 && err == NULL)
109 638f9024 2019-05-13 stsp err = got_error_from_errno2("fclose", tmppath);
110 230a42bd 2019-05-11 jcs free(tmppath);
111 99724ed4 2018-03-10 stsp return err;
114 09fe317a 2018-03-11 stsp static const struct got_error *
115 7ac97322 2018-03-11 stsp read_meta_file(char **content, const char *path_got, const char *name)
117 09fe317a 2018-03-11 stsp const struct got_error *err = NULL;
118 09fe317a 2018-03-11 stsp char *path;
119 09fe317a 2018-03-11 stsp int fd = -1;
121 09fe317a 2018-03-11 stsp struct stat sb;
123 09fe317a 2018-03-11 stsp *content = NULL;
125 7ac97322 2018-03-11 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
126 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
127 09fe317a 2018-03-11 stsp path = NULL;
131 ef99fdb1 2018-03-11 stsp fd = open(path, O_RDONLY | O_NOFOLLOW);
132 09fe317a 2018-03-11 stsp if (fd == -1) {
133 f02eaa22 2019-03-11 stsp if (errno == ENOENT)
134 f02eaa22 2019-03-11 stsp err = got_error(GOT_ERR_WORKTREE_META);
136 638f9024 2019-05-13 stsp err = got_error_from_errno2("open", path);
139 ef99fdb1 2018-03-11 stsp if (flock(fd, LOCK_SH | LOCK_NB) == -1) {
140 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
141 638f9024 2019-05-13 stsp : got_error_from_errno2("flock", path));
145 d10c9b58 2019-02-19 stsp if (lstat(path, &sb) != 0) {
146 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", path);
149 09fe317a 2018-03-11 stsp *content = calloc(1, sb.st_size);
150 09fe317a 2018-03-11 stsp if (*content == NULL) {
151 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
155 09fe317a 2018-03-11 stsp n = read(fd, *content, sb.st_size);
156 09fe317a 2018-03-11 stsp if (n != sb.st_size) {
157 638f9024 2019-05-13 stsp err = (n == -1 ? got_error_from_errno2("read", path) :
158 0605801d 2018-03-11 stsp got_error(GOT_ERR_WORKTREE_META));
161 09fe317a 2018-03-11 stsp if ((*content)[sb.st_size - 1] != '\n') {
162 09fe317a 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_META);
165 09fe317a 2018-03-11 stsp (*content)[sb.st_size - 1] = '\0';
168 09fe317a 2018-03-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
169 638f9024 2019-05-13 stsp err = got_error_from_errno2("close", path_got);
170 09fe317a 2018-03-11 stsp free(path);
172 09fe317a 2018-03-11 stsp free(*content);
173 09fe317a 2018-03-11 stsp *content = NULL;
175 09fe317a 2018-03-11 stsp return err;
178 024e9686 2019-05-14 stsp static const struct got_error *
179 024e9686 2019-05-14 stsp write_head_ref(const char *path_got, struct got_reference *head_ref)
181 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
182 024e9686 2019-05-14 stsp char *refstr = NULL;
184 024e9686 2019-05-14 stsp if (got_ref_is_symbolic(head_ref)) {
185 024e9686 2019-05-14 stsp refstr = got_ref_to_str(head_ref);
186 024e9686 2019-05-14 stsp if (refstr == NULL)
187 024e9686 2019-05-14 stsp return got_error_from_errno("got_ref_to_str");
189 024e9686 2019-05-14 stsp refstr = strdup(got_ref_get_name(head_ref));
190 024e9686 2019-05-14 stsp if (refstr == NULL)
191 024e9686 2019-05-14 stsp return got_error_from_errno("strdup");
193 024e9686 2019-05-14 stsp err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
194 024e9686 2019-05-14 stsp free(refstr);
195 024e9686 2019-05-14 stsp return err;
198 86c3caaf 2018-03-09 stsp const struct got_error *
199 86c3caaf 2018-03-09 stsp got_worktree_init(const char *path, struct got_reference *head_ref,
200 577ec78f 2018-03-11 stsp const char *prefix, struct got_repository *repo)
202 86c3caaf 2018-03-09 stsp const struct got_error *err = NULL;
203 65596e15 2018-12-24 stsp struct got_object_id *commit_id = NULL;
204 ec22038e 2019-03-10 stsp uuid_t uuid;
205 ec22038e 2019-03-10 stsp uint32_t uuid_status;
206 65596e15 2018-12-24 stsp int obj_type;
207 7ac97322 2018-03-11 stsp char *path_got = NULL;
208 1451e70d 2018-03-10 stsp char *formatstr = NULL;
209 0bb8a95e 2018-03-12 stsp char *absprefix = NULL;
210 65596e15 2018-12-24 stsp char *basestr = NULL;
211 ec22038e 2019-03-10 stsp char *uuidstr = NULL;
213 0c48fee2 2019-03-11 stsp if (strcmp(path, got_repo_get_path(repo)) == 0) {
214 0c48fee2 2019-03-11 stsp err = got_error(GOT_ERR_WORKTREE_REPO);
218 65596e15 2018-12-24 stsp err = got_ref_resolve(&commit_id, repo, head_ref);
220 65596e15 2018-12-24 stsp return err;
221 65596e15 2018-12-24 stsp err = got_object_get_type(&obj_type, repo, commit_id);
223 65596e15 2018-12-24 stsp return err;
224 65596e15 2018-12-24 stsp if (obj_type != GOT_OBJ_TYPE_COMMIT)
225 65596e15 2018-12-24 stsp return got_error(GOT_ERR_OBJ_TYPE);
227 0bb8a95e 2018-03-12 stsp if (!got_path_is_absolute(prefix)) {
228 0bb8a95e 2018-03-12 stsp if (asprintf(&absprefix, "/%s", prefix) == -1)
229 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
232 86c3caaf 2018-03-09 stsp /* Create top-level directory (may already exist). */
233 2cb4bacb 2018-03-11 stsp if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
234 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path);
238 86c3caaf 2018-03-09 stsp /* Create .got directory (may already exist). */
239 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
240 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
243 7ac97322 2018-03-11 stsp if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
244 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path_got);
248 056e7441 2018-03-11 stsp /* Create an empty lock file. */
249 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
253 86c3caaf 2018-03-09 stsp /* Create an empty file index. */
254 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
258 08d425ea 2018-12-24 stsp /* Write the HEAD reference. */
259 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
263 65596e15 2018-12-24 stsp /* Record our base commit. */
264 65596e15 2018-12-24 stsp err = got_object_id_str(&basestr, commit_id);
267 0f92850e 2018-12-25 stsp err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
271 1451e70d 2018-03-10 stsp /* Store path to repository. */
272 7839bc15 2019-01-06 stsp err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
273 7839bc15 2019-01-06 stsp got_repo_get_path(repo));
277 577ec78f 2018-03-11 stsp /* Store in-repository path prefix. */
278 0bb8a95e 2018-03-12 stsp err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
279 0bb8a95e 2018-03-12 stsp absprefix ? absprefix : prefix);
283 ec22038e 2019-03-10 stsp /* Generate UUID. */
284 ec22038e 2019-03-10 stsp uuid_create(&uuid, &uuid_status);
285 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
286 ec22038e 2019-03-10 stsp err = got_error_uuid(uuid_status);
289 ec22038e 2019-03-10 stsp uuid_to_string(&uuid, &uuidstr, &uuid_status);
290 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
291 ec22038e 2019-03-10 stsp err = got_error_uuid(uuid_status);
294 ec22038e 2019-03-10 stsp err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
298 9dce68ed 2018-03-10 stsp /* Stamp work tree with format file. */
299 1451e70d 2018-03-10 stsp if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
300 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
303 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
308 65596e15 2018-12-24 stsp free(commit_id);
309 7ac97322 2018-03-11 stsp free(path_got);
310 1451e70d 2018-03-10 stsp free(formatstr);
311 0bb8a95e 2018-03-12 stsp free(absprefix);
312 65596e15 2018-12-24 stsp free(basestr);
313 ec22038e 2019-03-10 stsp free(uuidstr);
314 86c3caaf 2018-03-09 stsp return err;
317 247140b2 2019-02-05 stsp static const struct got_error *
318 247140b2 2019-02-05 stsp open_worktree(struct got_worktree **worktree, const char *path)
320 6d9d28c3 2018-03-11 stsp const struct got_error *err = NULL;
321 7ac97322 2018-03-11 stsp char *path_got;
322 6d9d28c3 2018-03-11 stsp char *formatstr = NULL;
323 c442a90d 2019-03-10 stsp char *uuidstr = NULL;
324 056e7441 2018-03-11 stsp char *path_lock = NULL;
325 eaccb85f 2018-12-25 stsp char *base_commit_id_str = NULL;
326 6d9d28c3 2018-03-11 stsp int version, fd = -1;
327 6d9d28c3 2018-03-11 stsp const char *errstr;
328 eaccb85f 2018-12-25 stsp struct got_repository *repo = NULL;
329 c442a90d 2019-03-10 stsp uint32_t uuid_status;
331 6d9d28c3 2018-03-11 stsp *worktree = NULL;
333 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
334 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
335 7ac97322 2018-03-11 stsp path_got = NULL;
339 7ac97322 2018-03-11 stsp if (asprintf(&path_lock, "%s/%s", path_got, GOT_WORKTREE_LOCK) == -1) {
340 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
341 056e7441 2018-03-11 stsp path_lock = NULL;
345 056e7441 2018-03-11 stsp fd = open(path_lock, O_RDWR | O_EXLOCK | O_NONBLOCK);
346 6d9d28c3 2018-03-11 stsp if (fd == -1) {
347 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
348 638f9024 2019-05-13 stsp : got_error_from_errno2("open", path_lock));
352 7ac97322 2018-03-11 stsp err = read_meta_file(&formatstr, path_got, GOT_WORKTREE_FORMAT);
356 6d9d28c3 2018-03-11 stsp version = strtonum(formatstr, 1, INT_MAX, &errstr);
357 6d9d28c3 2018-03-11 stsp if (errstr) {
358 6d9d28c3 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_META);
361 6d9d28c3 2018-03-11 stsp if (version != GOT_WORKTREE_FORMAT_VERSION) {
362 6d9d28c3 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_VERS);
366 6d9d28c3 2018-03-11 stsp *worktree = calloc(1, sizeof(**worktree));
367 6d9d28c3 2018-03-11 stsp if (*worktree == NULL) {
368 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
371 056e7441 2018-03-11 stsp (*worktree)->lockfd = -1;
373 0647c563 2019-03-11 stsp (*worktree)->root_path = strdup(path);
374 c88eb298 2018-03-11 stsp if ((*worktree)->root_path == NULL) {
375 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
378 cde76477 2018-03-11 stsp err = read_meta_file(&(*worktree)->repo_path, path_got,
379 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_REPOSITORY);
383 7ac97322 2018-03-11 stsp err = read_meta_file(&(*worktree)->path_prefix, path_got,
384 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_PATH_PREFIX);
388 eaccb85f 2018-12-25 stsp err = read_meta_file(&base_commit_id_str, path_got,
389 0f92850e 2018-12-25 stsp GOT_WORKTREE_BASE_COMMIT);
393 c442a90d 2019-03-10 stsp err = read_meta_file(&uuidstr, path_got, GOT_WORKTREE_UUID);
396 c442a90d 2019-03-10 stsp uuid_from_string(uuidstr, &(*worktree)->uuid, &uuid_status);
397 c442a90d 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
398 c442a90d 2019-03-10 stsp err = got_error_uuid(uuid_status);
402 eaccb85f 2018-12-25 stsp err = got_repo_open(&repo, (*worktree)->repo_path);
406 eaccb85f 2018-12-25 stsp err = got_object_resolve_id_str(&(*worktree)->base_commit_id, repo,
407 eaccb85f 2018-12-25 stsp base_commit_id_str);
411 36a38700 2019-05-10 stsp err = read_meta_file(&(*worktree)->head_ref_name, path_got,
412 36a38700 2019-05-10 stsp GOT_WORKTREE_HEAD_REF);
415 eaccb85f 2018-12-25 stsp got_repo_close(repo);
416 7ac97322 2018-03-11 stsp free(path_got);
417 056e7441 2018-03-11 stsp free(path_lock);
418 eaccb85f 2018-12-25 stsp free(base_commit_id_str);
419 c442a90d 2019-03-10 stsp free(uuidstr);
420 bd165944 2019-03-10 stsp free(formatstr);
422 6d9d28c3 2018-03-11 stsp if (fd != -1)
424 6d9d28c3 2018-03-11 stsp if (*worktree != NULL)
425 6d9d28c3 2018-03-11 stsp got_worktree_close(*worktree);
426 6d9d28c3 2018-03-11 stsp *worktree = NULL;
428 056e7441 2018-03-11 stsp (*worktree)->lockfd = fd;
430 6d9d28c3 2018-03-11 stsp return err;
433 247140b2 2019-02-05 stsp const struct got_error *
434 247140b2 2019-02-05 stsp got_worktree_open(struct got_worktree **worktree, const char *path)
436 247140b2 2019-02-05 stsp const struct got_error *err = NULL;
439 247140b2 2019-02-05 stsp err = open_worktree(worktree, path);
440 f02eaa22 2019-03-11 stsp if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT))
441 247140b2 2019-02-05 stsp return err;
442 247140b2 2019-02-05 stsp if (*worktree)
443 247140b2 2019-02-05 stsp return NULL;
444 247140b2 2019-02-05 stsp path = dirname(path);
445 d1542a27 2019-02-05 stsp if (path == NULL)
446 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
447 d1542a27 2019-02-05 stsp } while (!((path[0] == '.' || path[0] == '/') && path[1] == '\0'));
449 247140b2 2019-02-05 stsp return got_error(GOT_ERR_NOT_WORKTREE);
452 3a6ce05a 2019-02-11 stsp const struct got_error *
453 86c3caaf 2018-03-09 stsp got_worktree_close(struct got_worktree *worktree)
455 3a6ce05a 2019-02-11 stsp const struct got_error *err = NULL;
456 c88eb298 2018-03-11 stsp free(worktree->root_path);
457 cde76477 2018-03-11 stsp free(worktree->repo_path);
458 6d9d28c3 2018-03-11 stsp free(worktree->path_prefix);
459 eaccb85f 2018-12-25 stsp free(worktree->base_commit_id);
460 36a38700 2019-05-10 stsp free(worktree->head_ref_name);
461 056e7441 2018-03-11 stsp if (worktree->lockfd != -1)
462 3a6ce05a 2019-02-11 stsp if (close(worktree->lockfd) != 0)
463 638f9024 2019-05-13 stsp err = got_error_from_errno2("close",
464 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree));
465 6d9d28c3 2018-03-11 stsp free(worktree);
466 3a6ce05a 2019-02-11 stsp return err;
469 2fbdb5ae 2018-12-29 stsp const char *
470 c7f4312f 2019-02-05 stsp got_worktree_get_root_path(struct got_worktree *worktree)
472 c7f4312f 2019-02-05 stsp return worktree->root_path;
475 c7f4312f 2019-02-05 stsp const char *
476 86c3caaf 2018-03-09 stsp got_worktree_get_repo_path(struct got_worktree *worktree)
478 2fbdb5ae 2018-12-29 stsp return worktree->repo_path;
481 49520a32 2018-12-29 stsp const char *
482 49520a32 2018-12-29 stsp got_worktree_get_path_prefix(struct got_worktree *worktree)
484 f609be2e 2018-12-29 stsp return worktree->path_prefix;
487 e5dc7198 2018-12-29 stsp const struct got_error *
488 e5dc7198 2018-12-29 stsp got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
489 e5dc7198 2018-12-29 stsp const char *path_prefix)
491 e5dc7198 2018-12-29 stsp char *absprefix = NULL;
493 e5dc7198 2018-12-29 stsp if (!got_path_is_absolute(path_prefix)) {
494 e5dc7198 2018-12-29 stsp if (asprintf(&absprefix, "/%s", path_prefix) == -1)
495 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
497 e5dc7198 2018-12-29 stsp *match = (strcmp(absprefix ? absprefix : path_prefix,
498 e5dc7198 2018-12-29 stsp worktree->path_prefix) == 0);
499 e5dc7198 2018-12-29 stsp free(absprefix);
500 e5dc7198 2018-12-29 stsp return NULL;
503 bc70eb79 2019-05-09 stsp const char *
504 35be1456 2018-03-11 stsp got_worktree_get_head_ref_name(struct got_worktree *worktree)
506 36a38700 2019-05-10 stsp return worktree->head_ref_name;
509 024e9686 2019-05-14 stsp const struct got_error *
510 024e9686 2019-05-14 stsp got_worktree_set_head_ref(struct got_worktree *worktree,
511 024e9686 2019-05-14 stsp struct got_reference *head_ref)
513 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
514 024e9686 2019-05-14 stsp char *path_got = NULL, *head_ref_name = NULL;
516 024e9686 2019-05-14 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
517 024e9686 2019-05-14 stsp GOT_WORKTREE_GOT_DIR) == -1) {
518 024e9686 2019-05-14 stsp err = got_error_from_errno("asprintf");
519 024e9686 2019-05-14 stsp path_got = NULL;
523 024e9686 2019-05-14 stsp head_ref_name = strdup(got_ref_get_name(head_ref));
524 024e9686 2019-05-14 stsp if (head_ref_name == NULL) {
525 024e9686 2019-05-14 stsp err = got_error_from_errno("strdup");
529 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
533 024e9686 2019-05-14 stsp free(worktree->head_ref_name);
534 024e9686 2019-05-14 stsp worktree->head_ref_name = head_ref_name;
536 024e9686 2019-05-14 stsp free(path_got);
538 024e9686 2019-05-14 stsp free(head_ref_name);
539 024e9686 2019-05-14 stsp return err;
542 b72f483a 2019-02-05 stsp struct got_object_id *
543 507dc3bb 2018-12-29 stsp got_worktree_get_base_commit_id(struct got_worktree *worktree)
545 507dc3bb 2018-12-29 stsp return worktree->base_commit_id;
548 507dc3bb 2018-12-29 stsp const struct got_error *
549 507dc3bb 2018-12-29 stsp got_worktree_set_base_commit_id(struct got_worktree *worktree,
550 507dc3bb 2018-12-29 stsp struct got_repository *repo, struct got_object_id *commit_id)
552 507dc3bb 2018-12-29 stsp const struct got_error *err;
553 507dc3bb 2018-12-29 stsp struct got_object *obj = NULL;
554 507dc3bb 2018-12-29 stsp char *id_str = NULL;
555 507dc3bb 2018-12-29 stsp char *path_got = NULL;
557 507dc3bb 2018-12-29 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
558 507dc3bb 2018-12-29 stsp GOT_WORKTREE_GOT_DIR) == -1) {
559 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
560 507dc3bb 2018-12-29 stsp path_got = NULL;
564 507dc3bb 2018-12-29 stsp err = got_object_open(&obj, repo, commit_id);
566 507dc3bb 2018-12-29 stsp return err;
568 507dc3bb 2018-12-29 stsp if (obj->type != GOT_OBJ_TYPE_COMMIT) {
569 507dc3bb 2018-12-29 stsp err = got_error(GOT_ERR_OBJ_TYPE);
573 507dc3bb 2018-12-29 stsp /* Record our base commit. */
574 507dc3bb 2018-12-29 stsp err = got_object_id_str(&id_str, commit_id);
577 507dc3bb 2018-12-29 stsp err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
581 507dc3bb 2018-12-29 stsp free(worktree->base_commit_id);
582 507dc3bb 2018-12-29 stsp worktree->base_commit_id = got_object_id_dup(commit_id);
583 507dc3bb 2018-12-29 stsp if (worktree->base_commit_id == NULL) {
584 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
589 507dc3bb 2018-12-29 stsp got_object_close(obj);
590 507dc3bb 2018-12-29 stsp free(id_str);
591 507dc3bb 2018-12-29 stsp free(path_got);
592 507dc3bb 2018-12-29 stsp return err;
595 9d31a1d8 2018-03-11 stsp static const struct got_error *
596 9d31a1d8 2018-03-11 stsp lock_worktree(struct got_worktree *worktree, int operation)
598 9d31a1d8 2018-03-11 stsp if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
599 9d31a1d8 2018-03-11 stsp return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
600 638f9024 2019-05-13 stsp : got_error_from_errno2("flock",
601 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree)));
602 86c3caaf 2018-03-09 stsp return NULL;
605 21908da4 2019-01-13 stsp static const struct got_error *
606 4a1ddfc2 2019-01-12 stsp add_dir_on_disk(struct got_worktree *worktree, const char *path)
608 4a1ddfc2 2019-01-12 stsp const struct got_error *err = NULL;
609 4a1ddfc2 2019-01-12 stsp char *abspath;
611 4a1ddfc2 2019-01-12 stsp if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
612 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
614 0cd1c46a 2019-03-11 stsp err = got_path_mkdir(abspath);
615 ddcd8544 2019-03-11 stsp if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
616 ddcd8544 2019-03-11 stsp struct stat sb;
617 ddcd8544 2019-03-11 stsp err = NULL;
618 ddcd8544 2019-03-11 stsp if (lstat(abspath, &sb) == -1) {
619 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
620 ddcd8544 2019-03-11 stsp } else if (!S_ISDIR(sb.st_mode)) {
621 ddcd8544 2019-03-11 stsp /* TODO directory is obstructed; do something */
622 ddcd8544 2019-03-11 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
625 4a1ddfc2 2019-01-12 stsp free(abspath);
626 68c76935 2019-02-19 stsp return err;
629 68c76935 2019-02-19 stsp static const struct got_error *
630 68c76935 2019-02-19 stsp check_file_contents_equal(int *same, FILE *f1, FILE *f2)
632 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
633 68c76935 2019-02-19 stsp uint8_t fbuf1[8192];
634 68c76935 2019-02-19 stsp uint8_t fbuf2[8192];
635 68c76935 2019-02-19 stsp size_t flen1 = 0, flen2 = 0;
640 68c76935 2019-02-19 stsp flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
641 68c76935 2019-02-19 stsp if (flen1 == 0 && ferror(f1)) {
642 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
645 68c76935 2019-02-19 stsp flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
646 68c76935 2019-02-19 stsp if (flen2 == 0 && ferror(f2)) {
647 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
650 68c76935 2019-02-19 stsp if (flen1 == 0) {
651 68c76935 2019-02-19 stsp if (flen2 != 0)
654 68c76935 2019-02-19 stsp } else if (flen2 == 0) {
655 68c76935 2019-02-19 stsp if (flen1 != 0)
658 68c76935 2019-02-19 stsp } else if (flen1 == flen2) {
659 68c76935 2019-02-19 stsp if (memcmp(fbuf1, fbuf2, flen2) != 0) {
669 68c76935 2019-02-19 stsp return err;
672 68c76935 2019-02-19 stsp static const struct got_error *
673 68c76935 2019-02-19 stsp check_files_equal(int *same, const char *f1_path, const char *f2_path)
675 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
676 68c76935 2019-02-19 stsp struct stat sb;
677 68c76935 2019-02-19 stsp size_t size1, size2;
678 68c76935 2019-02-19 stsp FILE *f1 = NULL, *f2 = NULL;
682 68c76935 2019-02-19 stsp if (lstat(f1_path, &sb) != 0) {
683 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", f1_path);
686 68c76935 2019-02-19 stsp size1 = sb.st_size;
688 68c76935 2019-02-19 stsp if (lstat(f2_path, &sb) != 0) {
689 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", f2_path);
692 68c76935 2019-02-19 stsp size2 = sb.st_size;
694 68c76935 2019-02-19 stsp if (size1 != size2) {
696 68c76935 2019-02-19 stsp return NULL;
699 68c76935 2019-02-19 stsp f1 = fopen(f1_path, "r");
700 68c76935 2019-02-19 stsp if (f1 == NULL)
701 638f9024 2019-05-13 stsp return got_error_from_errno2("open", f1_path);
703 68c76935 2019-02-19 stsp f2 = fopen(f2_path, "r");
704 68c76935 2019-02-19 stsp if (f2 == NULL) {
705 638f9024 2019-05-13 stsp err = got_error_from_errno2("open", f2_path);
709 68c76935 2019-02-19 stsp err = check_file_contents_equal(same, f1, f2);
711 68c76935 2019-02-19 stsp if (f1 && fclose(f1) != 0 && err == NULL)
712 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
713 68c76935 2019-02-19 stsp if (f2 && fclose(f2) != 0 && err == NULL)
714 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
716 6353ad76 2019-02-08 stsp return err;
720 46b6ee73 2019-06-04 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
721 46b6ee73 2019-06-04 stsp * blob_deriv acts as the first derived version, and the file on disk
722 234035bc 2019-06-01 stsp * acts as the second derived version.
724 6353ad76 2019-02-08 stsp static const struct got_error *
725 234035bc 2019-06-01 stsp merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
726 46b6ee73 2019-06-04 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
727 46b6ee73 2019-06-04 stsp const char *path, uint16_t st_mode, struct got_blob_object *blob_deriv,
728 818c7501 2019-07-11 stsp struct got_object_id *deriv_base_commit_id,
729 234035bc 2019-06-01 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
730 234035bc 2019-06-01 stsp void *progress_arg)
732 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
733 6353ad76 2019-02-08 stsp int merged_fd = -1;
734 46b6ee73 2019-06-04 stsp FILE *f_deriv = NULL, *f_orig = NULL;
735 46b6ee73 2019-06-04 stsp char *blob_deriv_path = NULL, *blob_orig_path = NULL;
736 af54ae4a 2019-02-19 stsp char *merged_path = NULL, *base_path = NULL;
737 6353ad76 2019-02-08 stsp char *id_str = NULL;
738 818c7501 2019-07-11 stsp char *label_deriv = NULL;
739 234035bc 2019-06-01 stsp int overlapcnt = 0;
740 af54ae4a 2019-02-19 stsp char *parent;
742 234035bc 2019-06-01 stsp *local_changes_subsumed = 0;
744 af54ae4a 2019-02-19 stsp parent = dirname(ondisk_path);
745 af54ae4a 2019-02-19 stsp if (parent == NULL)
746 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", ondisk_path);
748 af54ae4a 2019-02-19 stsp if (asprintf(&base_path, "%s/got-merged", parent) == -1)
749 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
751 af54ae4a 2019-02-19 stsp err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
755 af54ae4a 2019-02-19 stsp free(base_path);
756 46b6ee73 2019-06-04 stsp if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
757 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
758 af54ae4a 2019-02-19 stsp base_path = NULL;
762 46b6ee73 2019-06-04 stsp err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
765 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
766 6c4c42e0 2019-06-24 stsp blob_deriv);
770 af54ae4a 2019-02-19 stsp free(base_path);
771 46b6ee73 2019-06-04 stsp if (asprintf(&base_path, "%s/got-merge-blob-orig", parent) == -1) {
772 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
773 af54ae4a 2019-02-19 stsp base_path = NULL;
777 46b6ee73 2019-06-04 stsp err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
780 46b6ee73 2019-06-04 stsp if (blob_orig) {
781 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
782 46b6ee73 2019-06-04 stsp blob_orig);
787 1430b4e0 2019-03-27 stsp * If the file has no blob, this is an "add vs add" conflict,
788 1430b4e0 2019-03-27 stsp * and we simply use an empty ancestor file to make both files
789 1430b4e0 2019-03-27 stsp * appear in the merged result in their entirety.
793 818c7501 2019-07-11 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
796 818c7501 2019-07-11 stsp if (asprintf(&label_deriv, "commit %s", id_str) == -1) {
797 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
801 46b6ee73 2019-06-04 stsp err = got_merge_diff3(&overlapcnt, merged_fd, blob_deriv_path,
802 818c7501 2019-07-11 stsp blob_orig_path, ondisk_path, label_deriv, path);
806 6353ad76 2019-02-08 stsp (*progress_cb)(progress_arg,
807 6353ad76 2019-02-08 stsp overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
809 816dc654 2019-02-16 stsp if (fsync(merged_fd) != 0) {
810 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
814 68c76935 2019-02-19 stsp /* Check if a clean merge has subsumed all local changes. */
815 68c76935 2019-02-19 stsp if (overlapcnt == 0) {
816 46b6ee73 2019-06-04 stsp err = check_files_equal(local_changes_subsumed, blob_deriv_path,
817 68c76935 2019-02-19 stsp merged_path);
822 70a0c8ec 2019-02-20 stsp if (chmod(merged_path, st_mode) != 0) {
823 638f9024 2019-05-13 stsp err = got_error_from_errno2("chmod", merged_path);
827 6353ad76 2019-02-08 stsp if (rename(merged_path, ondisk_path) != 0) {
828 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", merged_path,
829 230a42bd 2019-05-11 jcs ondisk_path);
830 2a57020b 2019-02-20 stsp unlink(merged_path);
835 3a6ce05a 2019-02-11 stsp if (merged_fd != -1 && close(merged_fd) != 0 && err == NULL)
836 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
837 46b6ee73 2019-06-04 stsp if (f_deriv && fclose(f_deriv) != 0 && err == NULL)
838 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
839 46b6ee73 2019-06-04 stsp if (f_orig && fclose(f_orig) != 0 && err == NULL)
840 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
841 6353ad76 2019-02-08 stsp free(merged_path);
842 af54ae4a 2019-02-19 stsp free(base_path);
843 46b6ee73 2019-06-04 stsp if (blob_deriv_path) {
844 46b6ee73 2019-06-04 stsp unlink(blob_deriv_path);
845 46b6ee73 2019-06-04 stsp free(blob_deriv_path);
847 46b6ee73 2019-06-04 stsp if (blob_orig_path) {
848 46b6ee73 2019-06-04 stsp unlink(blob_orig_path);
849 46b6ee73 2019-06-04 stsp free(blob_orig_path);
851 6353ad76 2019-02-08 stsp free(id_str);
852 818c7501 2019-07-11 stsp free(label_deriv);
853 4a1ddfc2 2019-01-12 stsp return err;
856 4a1ddfc2 2019-01-12 stsp static const struct got_error *
857 13d9040b 2019-03-27 stsp update_blob_fileindex_entry(struct got_worktree *worktree,
858 13d9040b 2019-03-27 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
859 13d9040b 2019-03-27 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
860 13d9040b 2019-03-27 stsp int update_timestamps)
862 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
864 13d9040b 2019-03-27 stsp if (ie == NULL)
865 13d9040b 2019-03-27 stsp ie = got_fileindex_entry_get(fileindex, path);
867 13d9040b 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path,
868 13d9040b 2019-03-27 stsp blob->id.sha1, worktree->base_commit_id->sha1,
869 13d9040b 2019-03-27 stsp update_timestamps);
871 13d9040b 2019-03-27 stsp struct got_fileindex_entry *new_ie;
872 13d9040b 2019-03-27 stsp err = got_fileindex_entry_alloc(&new_ie, ondisk_path,
873 13d9040b 2019-03-27 stsp path, blob->id.sha1, worktree->base_commit_id->sha1);
875 13d9040b 2019-03-27 stsp err = got_fileindex_entry_add(fileindex, new_ie);
877 13d9040b 2019-03-27 stsp return err;
880 13d9040b 2019-03-27 stsp static const struct got_error *
881 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
882 13d9040b 2019-03-27 stsp const char *path, uint16_t te_mode, uint16_t st_mode,
883 13d9040b 2019-03-27 stsp struct got_blob_object *blob, int restoring_missing_file,
884 a129376b 2019-03-28 stsp int reverting_versioned_file, struct got_repository *repo,
885 a129376b 2019-03-28 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
887 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
888 507dc3bb 2018-12-29 stsp int fd = -1;
889 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
890 507dc3bb 2018-12-29 stsp int update = 0;
891 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
893 c34b20a2 2018-03-12 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
894 9d31a1d8 2018-03-11 stsp GOT_DEFAULT_FILE_MODE);
895 9d31a1d8 2018-03-11 stsp if (fd == -1) {
896 21908da4 2019-01-13 stsp if (errno == ENOENT) {
897 21908da4 2019-01-13 stsp char *parent = dirname(path);
898 21908da4 2019-01-13 stsp if (parent == NULL)
899 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
900 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
902 21908da4 2019-01-13 stsp return err;
903 21908da4 2019-01-13 stsp fd = open(ondisk_path,
904 21908da4 2019-01-13 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
905 21908da4 2019-01-13 stsp GOT_DEFAULT_FILE_MODE);
906 21908da4 2019-01-13 stsp if (fd == -1)
907 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
908 230a42bd 2019-05-11 jcs ondisk_path);
909 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
910 b8f41171 2019-02-10 stsp if (!S_ISREG(st_mode)) {
911 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
912 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
915 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
916 507dc3bb 2018-12-29 stsp ondisk_path);
919 507dc3bb 2018-12-29 stsp update = 1;
922 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
925 a378724f 2019-02-10 stsp if (restoring_missing_file)
926 a378724f 2019-02-10 stsp (*progress_cb)(progress_arg, GOT_STATUS_MISSING, path);
927 a129376b 2019-03-28 stsp else if (reverting_versioned_file)
928 a129376b 2019-03-28 stsp (*progress_cb)(progress_arg, GOT_STATUS_REVERT, path);
930 a378724f 2019-02-10 stsp (*progress_cb)(progress_arg,
931 a378724f 2019-02-10 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
933 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
935 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
936 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
939 9d31a1d8 2018-03-11 stsp if (len > 0) {
940 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
941 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
942 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
943 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
945 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
946 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
949 61d6eaa3 2018-12-24 stsp hdrlen = 0;
951 9d31a1d8 2018-03-11 stsp } while (len != 0);
953 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
954 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
958 507dc3bb 2018-12-29 stsp if (update) {
959 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
960 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
961 230a42bd 2019-05-11 jcs ondisk_path);
962 2a57020b 2019-02-20 stsp unlink(tmppath);
967 b8f41171 2019-02-10 stsp if (te_mode & S_IXUSR) {
968 b8f41171 2019-02-10 stsp if (chmod(ondisk_path, st_mode | S_IXUSR) == -1) {
969 638f9024 2019-05-13 stsp err = got_error_from_errno2("chmod", ondisk_path);
973 b8f41171 2019-02-10 stsp if (chmod(ondisk_path, st_mode & ~S_IXUSR) == -1) {
974 638f9024 2019-05-13 stsp err = got_error_from_errno2("chmod", ondisk_path);
980 3a6ce05a 2019-02-11 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
981 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
982 507dc3bb 2018-12-29 stsp free(tmppath);
983 6353ad76 2019-02-08 stsp return err;
986 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
987 6353ad76 2019-02-08 stsp static const struct got_error *
988 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
990 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
991 7154f6ce 2019-03-27 stsp const char *markers[3] = {
992 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
993 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
994 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
997 7154f6ce 2019-03-27 stsp char *line;
998 7154f6ce 2019-03-27 stsp size_t len;
999 7154f6ce 2019-03-27 stsp const char delim[3] = {'\0', '\0', '\0'};
1001 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1002 7154f6ce 2019-03-27 stsp line = fparseln(f, &len, NULL, delim, 0);
1003 7154f6ce 2019-03-27 stsp if (line == NULL) {
1004 7154f6ce 2019-03-27 stsp if (feof(f))
1006 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
1010 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1011 19332e6d 2019-05-13 stsp if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1013 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
1019 7154f6ce 2019-03-27 stsp return err;
1022 7154f6ce 2019-03-27 stsp static const struct got_error *
1023 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1024 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1025 b8f41171 2019-02-10 stsp struct got_repository *repo)
1027 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1028 6353ad76 2019-02-08 stsp struct got_object_id id;
1029 6353ad76 2019-02-08 stsp size_t hdrlen;
1030 6353ad76 2019-02-08 stsp FILE *f = NULL;
1031 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1032 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1033 6353ad76 2019-02-08 stsp size_t flen, blen;
1035 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1037 b8f41171 2019-02-10 stsp if (lstat(abspath, sb) == -1) {
1038 a378724f 2019-02-10 stsp if (errno == ENOENT) {
1040 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1041 2ec1f75b 2019-03-26 stsp *status = GOT_STATUS_MISSING;
1043 2ec1f75b 2019-03-26 stsp *status = GOT_STATUS_DELETE;
1044 b8f41171 2019-02-10 stsp sb->st_mode =
1045 b8f41171 2019-02-10 stsp ((ie->mode >> GOT_FILEIDX_MODE_PERMS_SHIFT)
1046 b8f41171 2019-02-10 stsp & (S_IRWXU | S_IRWXG | S_IRWXO));
1048 b8f41171 2019-02-10 stsp sb->st_mode = GOT_DEFAULT_FILE_MODE;
1049 a378724f 2019-02-10 stsp return NULL;
1051 638f9024 2019-05-13 stsp return got_error_from_errno2("lstat", abspath);
1054 b8f41171 2019-02-10 stsp if (!S_ISREG(sb->st_mode)) {
1055 6353ad76 2019-02-08 stsp *status = GOT_STATUS_OBSTRUCTED;
1056 6353ad76 2019-02-08 stsp return NULL;
1059 b8f41171 2019-02-10 stsp if (ie == NULL)
1060 d00136be 2019-03-26 stsp return NULL;
1062 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1063 2ec1f75b 2019-03-26 stsp *status = GOT_STATUS_DELETE;
1064 2ec1f75b 2019-03-26 stsp return NULL;
1065 2ec1f75b 2019-03-26 stsp } else if (!got_fileindex_entry_has_blob(ie)) {
1066 d00136be 2019-03-26 stsp *status = GOT_STATUS_ADD;
1067 b8f41171 2019-02-10 stsp return NULL;
1070 b8f41171 2019-02-10 stsp if (ie->ctime_sec == sb->st_ctime &&
1071 b8f41171 2019-02-10 stsp ie->ctime_nsec == sb->st_ctimensec &&
1072 b8f41171 2019-02-10 stsp ie->mtime_sec == sb->st_mtime &&
1073 b8f41171 2019-02-10 stsp ie->mtime_sec == sb->st_mtime &&
1074 b8f41171 2019-02-10 stsp ie->mtime_nsec == sb->st_mtimensec &&
1075 b8f41171 2019-02-10 stsp ie->size == (sb->st_size & 0xffffffff))
1076 6353ad76 2019-02-08 stsp return NULL;
1078 6353ad76 2019-02-08 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1079 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1081 6353ad76 2019-02-08 stsp return err;
1083 6353ad76 2019-02-08 stsp f = fopen(abspath, "r");
1084 6353ad76 2019-02-08 stsp if (f == NULL) {
1085 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", abspath);
1086 6353ad76 2019-02-08 stsp goto done;
1088 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1090 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1091 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1093 7154f6ce 2019-03-27 stsp goto done;
1094 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1095 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1096 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1097 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1098 7154f6ce 2019-03-27 stsp goto done;
1100 6353ad76 2019-02-08 stsp if (blen == 0) {
1101 6353ad76 2019-02-08 stsp if (flen != 0)
1102 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1104 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1105 6353ad76 2019-02-08 stsp if (blen != 0)
1106 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1108 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1109 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1110 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1111 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1115 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1118 6353ad76 2019-02-08 stsp hdrlen = 0;
1121 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1122 7154f6ce 2019-03-27 stsp rewind(f);
1123 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1127 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1129 6353ad76 2019-02-08 stsp fclose(f);
1130 9d31a1d8 2018-03-11 stsp return err;
1133 9d31a1d8 2018-03-11 stsp static const struct got_error *
1134 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1135 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1136 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1137 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1138 0584f854 2019-04-06 stsp void *progress_arg)
1140 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1141 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1142 6353ad76 2019-02-08 stsp char *ondisk_path;
1143 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1144 b8f41171 2019-02-10 stsp struct stat sb;
1146 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1147 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1149 b8f41171 2019-02-10 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1151 b8f41171 2019-02-10 stsp goto done;
1153 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1154 b8f41171 2019-02-10 stsp (*progress_cb)(progress_arg, status, path);
1155 b8f41171 2019-02-10 stsp goto done;
1158 b8f41171 2019-02-10 stsp if (ie && status != GOT_STATUS_MISSING) {
1159 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1160 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1161 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1162 b8f41171 2019-02-10 stsp (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1164 6353ad76 2019-02-08 stsp goto done;
1166 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1167 1430b4e0 2019-03-27 stsp memcmp(ie->blob_sha1, te->id->sha1,
1168 1430b4e0 2019-03-27 stsp SHA1_DIGEST_LENGTH) == 0)
1169 b8f41171 2019-02-10 stsp goto done;
1172 8da9e5f4 2019-01-12 stsp err = got_object_open_as_blob(&blob, repo, te->id, 8192);
1174 6353ad76 2019-02-08 stsp goto done;
1176 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1177 234035bc 2019-06-01 stsp int update_timestamps;
1178 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1179 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1180 234035bc 2019-06-01 stsp struct got_object_id id2;
1181 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1182 234035bc 2019-06-01 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1184 234035bc 2019-06-01 stsp goto done;
1186 234035bc 2019-06-01 stsp err = merge_blob(&update_timestamps, worktree, blob2,
1187 818c7501 2019-07-11 stsp ondisk_path, path, sb.st_mode, blob,
1188 818c7501 2019-07-11 stsp worktree->base_commit_id, repo,
1189 234035bc 2019-06-01 stsp progress_cb, progress_arg);
1190 234035bc 2019-06-01 stsp if (blob2)
1191 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
1193 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
1194 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
1195 234035bc 2019-06-01 stsp * unmodified files again.
1197 234035bc 2019-06-01 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1198 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
1199 234035bc 2019-06-01 stsp update_timestamps);
1200 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
1201 13d9040b 2019-03-27 stsp (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1202 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1203 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 0);
1205 13d9040b 2019-03-27 stsp goto done;
1207 13d9040b 2019-03-27 stsp err = install_blob(worktree, ondisk_path, path, te->mode,
1208 a129376b 2019-03-28 stsp sb.st_mode, blob, status == GOT_STATUS_MISSING, 0,
1209 a129376b 2019-03-28 stsp repo, progress_cb, progress_arg);
1211 13d9040b 2019-03-27 stsp goto done;
1212 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1213 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 1);
1215 13d9040b 2019-03-27 stsp goto done;
1217 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
1219 6353ad76 2019-02-08 stsp free(ondisk_path);
1220 8da9e5f4 2019-01-12 stsp return err;
1223 90285c3b 2019-01-08 stsp static const struct got_error *
1224 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
1226 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
1227 90285c3b 2019-01-08 stsp char *ondisk_path = NULL;
1229 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
1230 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1232 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
1233 c97665ae 2019-01-13 stsp if (errno != ENOENT)
1234 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
1236 90285c3b 2019-01-08 stsp char *parent = dirname(ondisk_path);
1237 7a9df742 2019-01-08 stsp while (parent && strcmp(parent, root_path) != 0) {
1238 26c4ac4d 2019-01-08 stsp if (rmdir(parent) == -1) {
1239 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
1240 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
1244 90285c3b 2019-01-08 stsp parent = dirname(parent);
1247 90285c3b 2019-01-08 stsp free(ondisk_path);
1248 90285c3b 2019-01-08 stsp return err;
1251 708d8e67 2019-03-27 stsp static const struct got_error *
1252 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
1253 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
1254 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1256 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
1257 708d8e67 2019-03-27 stsp unsigned char status;
1258 708d8e67 2019-03-27 stsp struct stat sb;
1259 708d8e67 2019-03-27 stsp char *ondisk_path;
1261 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
1263 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1265 708d8e67 2019-03-27 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1267 708d8e67 2019-03-27 stsp return err;
1269 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
1270 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
1271 fc6346c4 2019-03-27 stsp (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
1273 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
1274 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
1276 fc6346c4 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
1279 708d8e67 2019-03-27 stsp return err;
1281 fc6346c4 2019-03-27 stsp (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
1282 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
1283 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
1285 fc6346c4 2019-03-27 stsp return err;
1287 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
1290 fc6346c4 2019-03-27 stsp return err;
1293 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
1294 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
1295 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
1296 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
1297 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
1298 8da9e5f4 2019-01-12 stsp void *progress_arg;
1299 8da9e5f4 2019-01-12 stsp got_worktree_cancel_cb cancel_cb;
1300 8da9e5f4 2019-01-12 stsp void *cancel_arg;
1303 512f0d0e 2019-01-02 stsp static const struct got_error *
1304 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
1305 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
1307 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1309 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1310 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1312 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
1313 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
1316 8da9e5f4 2019-01-12 stsp static const struct got_error *
1317 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1319 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1321 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1322 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1324 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
1325 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1328 9d31a1d8 2018-03-11 stsp static const struct got_error *
1329 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
1331 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1332 8da9e5f4 2019-01-12 stsp const struct got_error *err;
1333 8da9e5f4 2019-01-12 stsp char *path;
1335 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1336 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1338 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
1339 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
1341 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1343 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
1344 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
1346 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
1347 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1349 8da9e5f4 2019-01-12 stsp free(path);
1350 0cd1c46a 2019-03-11 stsp return err;
1353 818c7501 2019-07-11 stsp static const struct got_error *
1354 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
1356 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
1357 0647c563 2019-03-11 stsp char *uuidstr = NULL;
1358 0cd1c46a 2019-03-11 stsp uint32_t uuid_status;
1360 517bab73 2019-03-11 stsp *refname = NULL;
1362 0cd1c46a 2019-03-11 stsp uuid_to_string(&worktree->uuid, &uuidstr, &uuid_status);
1363 0cd1c46a 2019-03-11 stsp if (uuid_status != uuid_s_ok)
1364 0cd1c46a 2019-03-11 stsp return got_error_uuid(uuid_status);
1366 818c7501 2019-07-11 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr)
1368 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1369 0647c563 2019-03-11 stsp *refname = NULL;
1371 517bab73 2019-03-11 stsp free(uuidstr);
1372 517bab73 2019-03-11 stsp return err;
1375 818c7501 2019-07-11 stsp const struct got_error *
1376 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
1378 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
1381 818c7501 2019-07-11 stsp static const struct got_error *
1382 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
1384 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1385 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
1388 818c7501 2019-07-11 stsp static const struct got_error *
1389 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
1391 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
1394 818c7501 2019-07-11 stsp static const struct got_error *
1395 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
1397 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1398 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
1401 818c7501 2019-07-11 stsp static const struct got_error *
1402 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
1404 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1405 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
1410 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
1411 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
1413 517bab73 2019-03-11 stsp static const struct got_error *
1414 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
1416 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
1417 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
1418 517bab73 2019-03-11 stsp char *refname;
1420 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
1422 517bab73 2019-03-11 stsp return err;
1424 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
1426 0cd1c46a 2019-03-11 stsp goto done;
1428 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
1430 0cd1c46a 2019-03-11 stsp free(refname);
1432 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
1433 9d31a1d8 2018-03-11 stsp return err;
1436 ebf99748 2019-05-09 stsp static const struct got_error *
1437 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
1438 ebf99748 2019-05-09 stsp struct got_worktree *worktree)
1440 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
1441 ebf99748 2019-05-09 stsp FILE *index = NULL;
1443 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1444 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
1445 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
1446 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
1448 ebf99748 2019-05-09 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
1449 ebf99748 2019-05-09 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1450 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1451 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1452 ebf99748 2019-05-09 stsp goto done;
1455 ebf99748 2019-05-09 stsp index = fopen(*fileindex_path, "rb");
1456 ebf99748 2019-05-09 stsp if (index == NULL) {
1457 ebf99748 2019-05-09 stsp if (errno != ENOENT)
1458 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
1460 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
1461 ebf99748 2019-05-09 stsp if (fclose(index) != 0 && err == NULL)
1462 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
1465 ebf99748 2019-05-09 stsp if (err) {
1466 ebf99748 2019-05-09 stsp free(*fileindex_path);
1467 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1468 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
1469 ebf99748 2019-05-09 stsp *fileindex = NULL;
1471 ebf99748 2019-05-09 stsp return err;
1474 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
1475 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
1476 c932eeeb 2019-05-22 stsp const char *path;
1477 c932eeeb 2019-05-22 stsp size_t path_len;
1478 c932eeeb 2019-05-22 stsp const char *entry_name;
1479 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
1480 a484d721 2019-06-10 stsp void *progress_arg;
1483 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
1484 c932eeeb 2019-05-22 stsp static const struct got_error *
1485 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
1487 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
1489 c932eeeb 2019-05-22 stsp if (a->entry_name) {
1490 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
1491 c932eeeb 2019-05-22 stsp return NULL;
1492 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
1493 102ff934 2019-06-11 stsp return NULL;
1495 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
1496 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
1497 c932eeeb 2019-05-22 stsp return NULL;
1499 edd02c5e 2019-07-11 stsp if (a->progress_cb)
1500 edd02c5e 2019-07-11 stsp (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
1501 edd02c5e 2019-07-11 stsp ie->path);
1502 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
1503 c932eeeb 2019-05-22 stsp return NULL;
1506 9c6338c4 2019-06-02 stsp static const struct got_error *
1507 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
1509 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
1510 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
1511 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
1513 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
1514 9c6338c4 2019-06-02 stsp fileindex_path);
1516 9c6338c4 2019-06-02 stsp goto done;
1518 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
1520 9c6338c4 2019-06-02 stsp goto done;
1522 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
1523 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
1524 9c6338c4 2019-06-02 stsp fileindex_path);
1525 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
1528 9c6338c4 2019-06-02 stsp if (new_index)
1529 9c6338c4 2019-06-02 stsp fclose(new_index);
1530 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
1531 9c6338c4 2019-06-02 stsp return err;
1534 6ced4176 2019-07-12 stsp static const struct got_error *
1535 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
1536 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
1537 6ced4176 2019-07-12 stsp struct got_worktree *worktree, struct got_repository *repo)
1539 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
1540 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
1541 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
1542 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
1544 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
1545 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
1546 6ced4176 2019-07-12 stsp *tree_id = NULL;
1548 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
1549 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
1550 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
1551 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
1552 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1553 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1554 6ced4176 2019-07-12 stsp goto done;
1556 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
1557 6ced4176 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
1559 6ced4176 2019-07-12 stsp goto done;
1560 6ced4176 2019-07-12 stsp return NULL;
1563 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
1565 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
1566 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
1567 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
1568 6ced4176 2019-07-12 stsp goto done;
1571 6ced4176 2019-07-12 stsp err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
1572 6ced4176 2019-07-12 stsp in_repo_path);
1574 6ced4176 2019-07-12 stsp goto done;
1576 6ced4176 2019-07-12 stsp free(in_repo_path);
1577 6ced4176 2019-07-12 stsp in_repo_path = NULL;
1579 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
1581 6ced4176 2019-07-12 stsp goto done;
1583 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
1584 6ced4176 2019-07-12 stsp /* Check out a single file. */
1585 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
1586 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
1587 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
1588 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
1589 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1590 6ced4176 2019-07-12 stsp goto done;
1592 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
1593 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1594 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1595 6ced4176 2019-07-12 stsp goto done;
1598 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
1599 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
1601 6ced4176 2019-07-12 stsp return err;
1602 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
1603 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
1604 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
1605 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
1606 6ced4176 2019-07-12 stsp goto done;
1609 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
1610 6ced4176 2019-07-12 stsp worktree->base_commit_id, in_repo_path);
1612 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
1613 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
1614 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
1615 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
1616 6ced4176 2019-07-12 stsp goto done;
1618 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
1619 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1620 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1621 6ced4176 2019-07-12 stsp goto done;
1626 6ced4176 2019-07-12 stsp free(in_repo_path);
1627 6ced4176 2019-07-12 stsp if (err) {
1628 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
1629 6ced4176 2019-07-12 stsp free(*tree_relpath);
1630 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
1631 6ced4176 2019-07-12 stsp free(*tree_id);
1632 6ced4176 2019-07-12 stsp *tree_id = NULL;
1634 07ed472d 2019-07-12 stsp return err;
1637 07ed472d 2019-07-12 stsp static const struct got_error *
1638 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
1639 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
1640 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1641 07ed472d 2019-07-12 stsp void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1643 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
1644 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
1645 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
1646 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
1647 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
1649 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
1651 07ed472d 2019-07-12 stsp goto done;
1653 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
1654 07ed472d 2019-07-12 stsp worktree->base_commit_id);
1656 07ed472d 2019-07-12 stsp goto done;
1658 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1660 07ed472d 2019-07-12 stsp goto done;
1662 07ed472d 2019-07-12 stsp if (entry_name &&
1663 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
1664 07ed472d 2019-07-12 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
1665 07ed472d 2019-07-12 stsp goto done;
1668 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
1669 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
1670 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
1671 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
1672 07ed472d 2019-07-12 stsp arg.worktree = worktree;
1673 07ed472d 2019-07-12 stsp arg.repo = repo;
1674 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
1675 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
1676 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
1677 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
1678 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
1679 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
1682 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
1683 07ed472d 2019-07-12 stsp if (commit)
1684 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
1685 6ced4176 2019-07-12 stsp return err;
1688 9d31a1d8 2018-03-11 stsp const struct got_error *
1689 c4cdcb68 2019-04-03 stsp got_worktree_checkout_files(struct got_worktree *worktree, const char *path,
1690 93a30277 2018-12-24 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1691 93a30277 2018-12-24 stsp void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1693 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
1694 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
1695 8da9e5f4 2019-01-12 stsp struct got_object_id *tree_id = NULL;
1696 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
1697 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
1698 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
1699 c4cdcb68 2019-04-03 stsp char *relpath = NULL, *entry_name = NULL;
1700 6ced4176 2019-07-12 stsp int entry_type;
1702 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
1704 9d31a1d8 2018-03-11 stsp return err;
1706 6ced4176 2019-07-12 stsp err = find_tree_entry_for_checkout(&entry_type, &relpath, &tree_id,
1707 6ced4176 2019-07-12 stsp path, worktree, repo);
1709 6ced4176 2019-07-12 stsp goto done;
1711 6ced4176 2019-07-12 stsp if (entry_type == GOT_OBJ_TYPE_BLOB) {
1712 6ced4176 2019-07-12 stsp entry_name = basename(path);
1713 6ced4176 2019-07-12 stsp if (entry_name == NULL) {
1714 6ced4176 2019-07-12 stsp err = got_error_from_errno2("basename", path);
1715 6ced4176 2019-07-12 stsp goto done;
1720 51514078 2018-12-25 stsp * Read the file index.
1721 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
1722 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
1724 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
1726 c4cdcb68 2019-04-03 stsp goto done;
1728 07ed472d 2019-07-12 stsp err = checkout_files(worktree, fileindex, relpath, tree_id, entry_name,
1729 07ed472d 2019-07-12 stsp repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
1730 711d9cd9 2019-07-12 stsp if (err == NULL) {
1731 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
1732 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
1733 711d9cd9 2019-07-12 stsp bbc_arg.entry_name = entry_name;
1734 711d9cd9 2019-07-12 stsp bbc_arg.path = path;
1735 711d9cd9 2019-07-12 stsp bbc_arg.path_len = strlen(path);
1736 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
1737 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
1738 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
1739 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
1741 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
1742 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
1743 af12c6b9 2019-06-04 stsp err = sync_err;
1745 9c6338c4 2019-06-02 stsp free(fileindex_path);
1746 c4cdcb68 2019-04-03 stsp free(relpath);
1748 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
1749 9d31a1d8 2018-03-11 stsp if (commit)
1750 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
1751 5ade8233 2019-07-12 stsp if (fileindex)
1752 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
1753 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
1754 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
1755 9d31a1d8 2018-03-11 stsp err = unlockerr;
1756 f8d1f275 2019-02-04 stsp return err;
1759 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
1760 234035bc 2019-06-01 stsp struct got_worktree *worktree;
1761 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
1762 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
1763 234035bc 2019-06-01 stsp void *progress_arg;
1764 234035bc 2019-06-01 stsp got_worktree_cancel_cb cancel_cb;
1765 234035bc 2019-06-01 stsp void *cancel_arg;
1766 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
1769 234035bc 2019-06-01 stsp static const struct got_error *
1770 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
1771 234035bc 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
1772 234035bc 2019-06-01 stsp struct got_object_id *id2, const char *path1, const char *path2,
1773 234035bc 2019-06-01 stsp struct got_repository *repo)
1775 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
1776 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
1777 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
1778 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
1779 234035bc 2019-06-01 stsp struct stat sb;
1780 234035bc 2019-06-01 stsp unsigned char status;
1781 234035bc 2019-06-01 stsp int local_changes_subsumed;
1783 234035bc 2019-06-01 stsp if (blob1 && blob2) {
1784 234035bc 2019-06-01 stsp ie = got_fileindex_entry_get(a->fileindex, path2);
1785 234035bc 2019-06-01 stsp if (ie == NULL) {
1786 234035bc 2019-06-01 stsp (*a->progress_cb)(a->progress_arg, GOT_STATUS_MISSING,
1788 234035bc 2019-06-01 stsp return NULL;
1791 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1792 234035bc 2019-06-01 stsp path2) == -1)
1793 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
1795 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1797 234035bc 2019-06-01 stsp goto done;
1799 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
1800 234035bc 2019-06-01 stsp (*a->progress_cb)(a->progress_arg, GOT_STATUS_MERGE,
1802 234035bc 2019-06-01 stsp goto done;
1804 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
1805 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
1806 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
1807 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
1808 234035bc 2019-06-01 stsp (*a->progress_cb)(a->progress_arg, status, path2);
1809 234035bc 2019-06-01 stsp goto done;
1812 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree, blob1,
1813 818c7501 2019-07-11 stsp ondisk_path, path2, sb.st_mode, blob2, a->commit_id2, repo,
1814 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
1815 234035bc 2019-06-01 stsp } else if (blob1) {
1816 234035bc 2019-06-01 stsp ie = got_fileindex_entry_get(a->fileindex, path1);
1817 234035bc 2019-06-01 stsp if (ie == NULL) {
1818 234035bc 2019-06-01 stsp (*a->progress_cb)(a->progress_arg, GOT_STATUS_MISSING,
1820 234035bc 2019-06-01 stsp return NULL;
1823 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1824 2b92fad7 2019-06-02 stsp path1) == -1)
1825 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
1827 2b92fad7 2019-06-02 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1829 2b92fad7 2019-06-02 stsp goto done;
1831 2b92fad7 2019-06-02 stsp switch (status) {
1832 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
1833 2b92fad7 2019-06-02 stsp (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
1835 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
1837 2b92fad7 2019-06-02 stsp goto done;
1839 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
1841 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
1842 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
1843 2b92fad7 2019-06-02 stsp (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
1846 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
1848 2b92fad7 2019-06-02 stsp case GOT_STATUS_ADD:
1849 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
1850 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
1851 2b92fad7 2019-06-02 stsp (*a->progress_cb)(a->progress_arg,
1852 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
1854 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
1855 2b92fad7 2019-06-02 stsp (*a->progress_cb)(a->progress_arg, status, path1);
1860 234035bc 2019-06-01 stsp } else if (blob2) {
1861 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1862 234035bc 2019-06-01 stsp path2) == -1)
1863 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
1864 234035bc 2019-06-01 stsp ie = got_fileindex_entry_get(a->fileindex, path2);
1866 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
1869 234035bc 2019-06-01 stsp goto done;
1870 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
1871 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
1872 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
1873 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
1874 234035bc 2019-06-01 stsp (*a->progress_cb)(a->progress_arg, status,
1876 234035bc 2019-06-01 stsp goto done;
1878 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
1879 818c7501 2019-07-11 stsp NULL, ondisk_path, path2, sb.st_mode, blob2,
1880 818c7501 2019-07-11 stsp a->commit_id2, repo,
1881 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
1882 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
1883 234035bc 2019-06-01 stsp err = update_blob_fileindex_entry(a->worktree,
1884 234035bc 2019-06-01 stsp a->fileindex, ie, ondisk_path, ie->path,
1885 234035bc 2019-06-01 stsp blob2, 0);
1887 234035bc 2019-06-01 stsp goto done;
1890 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
1891 234035bc 2019-06-01 stsp err = install_blob(a->worktree, ondisk_path, path2,
1892 234035bc 2019-06-01 stsp /* XXX get this from parent tree! */
1893 234035bc 2019-06-01 stsp GOT_DEFAULT_FILE_MODE,
1894 234035bc 2019-06-01 stsp sb.st_mode, blob2, 0, 0, repo,
1895 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
1897 234035bc 2019-06-01 stsp goto done;
1898 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_alloc(&ie,
1899 2b92fad7 2019-06-02 stsp ondisk_path, path2, NULL, NULL);
1901 234035bc 2019-06-01 stsp goto done;
1902 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
1903 2b92fad7 2019-06-02 stsp if (err) {
1904 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
1905 2b92fad7 2019-06-02 stsp goto done;
1910 234035bc 2019-06-01 stsp free(ondisk_path);
1911 234035bc 2019-06-01 stsp return err;
1914 234035bc 2019-06-01 stsp struct check_merge_ok_arg {
1915 234035bc 2019-06-01 stsp struct got_worktree *worktree;
1916 234035bc 2019-06-01 stsp struct got_repository *repo;
1919 234035bc 2019-06-01 stsp static const struct got_error *
1920 234035bc 2019-06-01 stsp check_merge_ok(void *arg, struct got_fileindex_entry *ie)
1922 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
1923 234035bc 2019-06-01 stsp struct check_merge_ok_arg *a = arg;
1924 234035bc 2019-06-01 stsp unsigned char status;
1925 234035bc 2019-06-01 stsp struct stat sb;
1926 234035bc 2019-06-01 stsp char *ondisk_path;
1928 234035bc 2019-06-01 stsp /* Reject merges into a work tree with mixed base commits. */
1929 234035bc 2019-06-01 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
1930 234035bc 2019-06-01 stsp SHA1_DIGEST_LENGTH))
1931 234035bc 2019-06-01 stsp return got_error(GOT_ERR_MIXED_COMMITS);
1933 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
1935 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
1937 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
1938 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
1940 234035bc 2019-06-01 stsp return err;
1941 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
1942 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
1944 234035bc 2019-06-01 stsp return NULL;
1947 818c7501 2019-07-11 stsp static const struct got_error *
1948 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
1949 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
1950 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
1951 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
1952 818c7501 2019-07-11 stsp got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1954 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
1955 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
1956 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
1957 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
1959 03415a1a 2019-06-02 stsp if (commit_id1) {
1960 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
1961 03415a1a 2019-06-02 stsp worktree->path_prefix);
1963 03415a1a 2019-06-02 stsp goto done;
1965 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
1967 03415a1a 2019-06-02 stsp goto done;
1970 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
1971 234035bc 2019-06-01 stsp worktree->path_prefix);
1973 234035bc 2019-06-01 stsp goto done;
1975 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
1977 234035bc 2019-06-01 stsp goto done;
1979 234035bc 2019-06-01 stsp arg.worktree = worktree;
1980 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
1981 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
1982 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
1983 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
1984 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
1985 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
1986 234035bc 2019-06-01 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg);
1987 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
1988 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
1989 af12c6b9 2019-06-04 stsp err = sync_err;
1991 234035bc 2019-06-01 stsp if (tree1)
1992 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
1993 234035bc 2019-06-01 stsp if (tree2)
1994 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
1995 818c7501 2019-07-11 stsp return err;
1998 818c7501 2019-07-11 stsp const struct got_error *
1999 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
2000 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
2001 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2002 818c7501 2019-07-11 stsp void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2004 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
2005 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
2006 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
2007 818c7501 2019-07-11 stsp struct check_merge_ok_arg mok_arg;
2009 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
2011 818c7501 2019-07-11 stsp return err;
2013 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2015 818c7501 2019-07-11 stsp goto done;
2017 818c7501 2019-07-11 stsp mok_arg.worktree = worktree;
2018 818c7501 2019-07-11 stsp mok_arg.repo = repo;
2019 818c7501 2019-07-11 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
2020 818c7501 2019-07-11 stsp &mok_arg);
2022 818c7501 2019-07-11 stsp goto done;
2024 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
2025 818c7501 2019-07-11 stsp commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
2027 818c7501 2019-07-11 stsp if (fileindex)
2028 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
2029 818c7501 2019-07-11 stsp free(fileindex_path);
2030 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2031 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
2032 234035bc 2019-06-01 stsp err = unlockerr;
2033 234035bc 2019-06-01 stsp return err;
2036 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
2037 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
2038 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
2039 927df6b7 2019-02-10 stsp const char *status_path;
2040 927df6b7 2019-02-10 stsp size_t status_path_len;
2041 f8d1f275 2019-02-04 stsp struct got_repository *repo;
2042 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
2043 f8d1f275 2019-02-04 stsp void *status_arg;
2044 f8d1f275 2019-02-04 stsp got_worktree_cancel_cb cancel_cb;
2045 f8d1f275 2019-02-04 stsp void *cancel_arg;
2048 f8d1f275 2019-02-04 stsp static const struct got_error *
2049 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
2050 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
2051 927df6b7 2019-02-10 stsp struct got_repository *repo)
2053 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
2054 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
2055 927df6b7 2019-02-10 stsp struct stat sb;
2056 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
2058 927df6b7 2019-02-10 stsp err = get_file_status(&status, &sb, ie, abspath, repo);
2059 927df6b7 2019-02-10 stsp if (err == NULL && status != GOT_STATUS_NO_CHANGE) {
2060 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2061 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2062 016a88dd 2019-05-13 stsp err = (*status_cb)(status_arg, status, ie->path, &blob_id,
2063 016a88dd 2019-05-13 stsp &commit_id);
2065 927df6b7 2019-02-10 stsp return err;
2068 927df6b7 2019-02-10 stsp static const struct got_error *
2069 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
2070 f8d1f275 2019-02-04 stsp struct dirent *de, const char *parent_path)
2072 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2073 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2074 f8d1f275 2019-02-04 stsp char *abspath;
2076 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2077 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2079 927df6b7 2019-02-10 stsp if (got_path_cmp(parent_path, a->status_path) != 0 &&
2080 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
2081 927df6b7 2019-02-10 stsp return NULL;
2083 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2084 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
2085 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
2086 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2088 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
2089 f8d1f275 2019-02-04 stsp de->d_name) == -1)
2090 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2093 927df6b7 2019-02-10 stsp err = report_file_status(ie, abspath, a->status_cb, a->status_arg,
2095 f8d1f275 2019-02-04 stsp free(abspath);
2096 9d31a1d8 2018-03-11 stsp return err;
2099 f8d1f275 2019-02-04 stsp static const struct got_error *
2100 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2102 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2103 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
2104 2ec1f75b 2019-03-26 stsp unsigned char status;
2106 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2107 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2109 927df6b7 2019-02-10 stsp if (!got_path_is_child(parent_path, a->status_path, a->status_path_len))
2110 927df6b7 2019-02-10 stsp return NULL;
2112 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2113 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2114 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
2115 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
2117 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
2118 016a88dd 2019-05-13 stsp return (*a->status_cb)(a->status_arg, status, ie->path, &blob_id,
2119 016a88dd 2019-05-13 stsp &commit_id);
2122 f8d1f275 2019-02-04 stsp static const struct got_error *
2123 f8d1f275 2019-02-04 stsp status_new(void *arg, struct dirent *de, const char *parent_path)
2125 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
2126 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2127 f8d1f275 2019-02-04 stsp char *path = NULL;
2129 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2130 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2132 f8d1f275 2019-02-04 stsp if (de->d_type == DT_DIR)
2133 2c201a36 2019-02-10 stsp return NULL;
2135 2c201a36 2019-02-10 stsp /* XXX ignore symlinks for now */
2136 2c201a36 2019-02-10 stsp if (de->d_type == DT_LNK)
2137 f8d1f275 2019-02-04 stsp return NULL;
2139 927df6b7 2019-02-10 stsp if (!got_path_is_child(parent_path, a->status_path, a->status_path_len))
2140 927df6b7 2019-02-10 stsp return NULL;
2142 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2143 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
2144 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2146 f8d1f275 2019-02-04 stsp path = de->d_name;
2149 b72f483a 2019-02-05 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED, path,
2150 016a88dd 2019-05-13 stsp NULL, NULL);
2151 f8d1f275 2019-02-04 stsp if (parent_path[0])
2152 f8d1f275 2019-02-04 stsp free(path);
2153 b72f483a 2019-02-05 stsp return err;
2156 347d1d3e 2019-07-12 stsp static const struct got_error *
2157 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
2158 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
2159 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
2160 347d1d3e 2019-07-12 stsp got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2162 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2163 f8d1f275 2019-02-04 stsp DIR *workdir = NULL;
2164 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
2165 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
2166 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
2168 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
2169 927df6b7 2019-02-10 stsp worktree->root_path, path[0] ? "/" : "", path) == -1) {
2170 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2171 c513d110 2019-02-05 stsp goto done;
2173 927df6b7 2019-02-10 stsp workdir = opendir(ondisk_path);
2174 927df6b7 2019-02-10 stsp if (workdir == NULL) {
2175 2ec1f75b 2019-03-26 stsp if (errno == ENOTDIR || errno == ENOENT) {
2176 927df6b7 2019-02-10 stsp struct got_fileindex_entry *ie;
2177 927df6b7 2019-02-10 stsp ie = got_fileindex_entry_get(fileindex, path);
2178 927df6b7 2019-02-10 stsp if (ie == NULL) {
2179 927df6b7 2019-02-10 stsp err = got_error(GOT_ERR_BAD_PATH);
2180 927df6b7 2019-02-10 stsp goto done;
2182 927df6b7 2019-02-10 stsp err = report_file_status(ie, ondisk_path,
2183 927df6b7 2019-02-10 stsp status_cb, status_arg, repo);
2184 927df6b7 2019-02-10 stsp goto done;
2186 638f9024 2019-05-13 stsp err = got_error_from_errno2("opendir", ondisk_path);
2187 927df6b7 2019-02-10 stsp goto done;
2190 d43a8a88 2019-02-05 stsp fdiff_cb.diff_old_new = status_old_new;
2191 d43a8a88 2019-02-05 stsp fdiff_cb.diff_old = status_old;
2192 d43a8a88 2019-02-05 stsp fdiff_cb.diff_new = status_new;
2193 f8d1f275 2019-02-04 stsp arg.fileindex = fileindex;
2194 f8d1f275 2019-02-04 stsp arg.worktree = worktree;
2195 927df6b7 2019-02-10 stsp arg.status_path = path;
2196 927df6b7 2019-02-10 stsp arg.status_path_len = strlen(path);
2197 f8d1f275 2019-02-04 stsp arg.repo = repo;
2198 f8d1f275 2019-02-04 stsp arg.status_cb = status_cb;
2199 f8d1f275 2019-02-04 stsp arg.status_arg = status_arg;
2200 f8d1f275 2019-02-04 stsp arg.cancel_cb = cancel_cb;
2201 f8d1f275 2019-02-04 stsp arg.cancel_arg = cancel_arg;
2202 c7f4312f 2019-02-05 stsp err = got_fileindex_diff_dir(fileindex, workdir, worktree->root_path,
2203 927df6b7 2019-02-10 stsp path, repo, &fdiff_cb, &arg);
2205 f8d1f275 2019-02-04 stsp if (workdir)
2206 f8d1f275 2019-02-04 stsp closedir(workdir);
2207 927df6b7 2019-02-10 stsp free(ondisk_path);
2208 347d1d3e 2019-07-12 stsp return err;
2211 347d1d3e 2019-07-12 stsp const struct got_error *
2212 347d1d3e 2019-07-12 stsp got_worktree_status(struct got_worktree *worktree, const char *path,
2213 347d1d3e 2019-07-12 stsp struct got_repository *repo, got_worktree_status_cb status_cb,
2214 347d1d3e 2019-07-12 stsp void *status_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2216 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
2217 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
2218 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
2220 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2222 347d1d3e 2019-07-12 stsp return err;
2224 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, path, fileindex, repo,
2225 347d1d3e 2019-07-12 stsp status_cb, status_arg, cancel_cb, cancel_arg);
2226 f8d1f275 2019-02-04 stsp free(fileindex_path);
2227 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
2228 f8d1f275 2019-02-04 stsp return err;
2231 6c7ab921 2019-03-18 stsp const struct got_error *
2232 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
2233 6c7ab921 2019-03-18 stsp const char *arg)
2235 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
2236 6c7ab921 2019-03-18 stsp char *resolved, *path = NULL;
2237 6c7ab921 2019-03-18 stsp size_t len;
2239 6c7ab921 2019-03-18 stsp *wt_path = NULL;
2241 6c7ab921 2019-03-18 stsp resolved = realpath(arg, NULL);
2242 6c7ab921 2019-03-18 stsp if (resolved == NULL)
2243 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", arg);
2245 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
2246 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
2247 6c7ab921 2019-03-18 stsp err = got_error(GOT_ERR_BAD_PATH);
2248 6c7ab921 2019-03-18 stsp goto done;
2251 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
2252 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
2253 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
2255 f6d88e1a 2019-05-29 stsp goto done;
2257 f6d88e1a 2019-05-29 stsp path = strdup("");
2258 f6d88e1a 2019-05-29 stsp if (path == NULL) {
2259 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
2260 f6d88e1a 2019-05-29 stsp goto done;
2264 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
2265 6c7ab921 2019-03-18 stsp len = strlen(path);
2266 6c7ab921 2019-03-18 stsp while (path[len - 1] == '/') {
2267 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
2271 6c7ab921 2019-03-18 stsp free(resolved);
2272 6c7ab921 2019-03-18 stsp if (err == NULL)
2273 6c7ab921 2019-03-18 stsp *wt_path = path;
2275 6c7ab921 2019-03-18 stsp free(path);
2276 d00136be 2019-03-26 stsp return err;
2279 07f5b47a 2019-06-02 stsp static const struct got_error *
2280 07f5b47a 2019-06-02 stsp schedule_addition(const char *ondisk_path, struct got_fileindex *fileindex,
2281 07f5b47a 2019-06-02 stsp const char *relpath, got_worktree_status_cb status_cb, void *status_arg,
2282 07f5b47a 2019-06-02 stsp struct got_repository *repo)
2284 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
2285 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
2287 07f5b47a 2019-06-02 stsp /* Re-adding an existing entry is a no-op. */
2288 07f5b47a 2019-06-02 stsp if (got_fileindex_entry_get(fileindex, relpath) != NULL)
2289 07f5b47a 2019-06-02 stsp return NULL;
2291 07f5b47a 2019-06-02 stsp err = got_fileindex_entry_alloc(&ie, ondisk_path, relpath, NULL, NULL);
2293 07f5b47a 2019-06-02 stsp return err;
2295 07f5b47a 2019-06-02 stsp err = got_fileindex_entry_add(fileindex, ie);
2296 07f5b47a 2019-06-02 stsp if (err) {
2297 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
2298 07f5b47a 2019-06-02 stsp return err;
2301 07f5b47a 2019-06-02 stsp return report_file_status(ie, relpath, status_cb, status_arg, repo);
2304 d00136be 2019-03-26 stsp const struct got_error *
2305 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
2306 1dd54920 2019-05-11 stsp struct got_pathlist_head *ondisk_paths,
2307 1dd54920 2019-05-11 stsp got_worktree_status_cb status_cb, void *status_arg,
2308 031a5338 2019-03-26 stsp struct got_repository *repo)
2310 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
2311 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2312 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2313 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
2315 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
2317 d00136be 2019-03-26 stsp return err;
2319 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2321 d00136be 2019-03-26 stsp goto done;
2323 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, ondisk_paths, entry) {
2324 1dd54920 2019-05-11 stsp char *relpath;
2325 1dd54920 2019-05-11 stsp err = got_path_skip_common_ancestor(&relpath,
2326 1dd54920 2019-05-11 stsp got_worktree_get_root_path(worktree), pe->path);
2329 07f5b47a 2019-06-02 stsp err = schedule_addition(pe->path, fileindex, relpath,
2330 07f5b47a 2019-06-02 stsp status_cb, status_arg, repo);
2331 1dd54920 2019-05-11 stsp free(relpath);
2335 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2336 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2337 af12c6b9 2019-06-04 stsp err = sync_err;
2339 fb399478 2019-07-12 stsp free(fileindex_path);
2340 d00136be 2019-03-26 stsp if (fileindex)
2341 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
2342 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2343 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
2344 d00136be 2019-03-26 stsp err = unlockerr;
2345 6c7ab921 2019-03-18 stsp return err;
2348 17ed4618 2019-06-02 stsp static const struct got_error *
2349 17ed4618 2019-06-02 stsp schedule_for_deletion(const char *ondisk_path, struct got_fileindex *fileindex,
2350 17ed4618 2019-06-02 stsp const char *relpath, int delete_local_mods,
2351 17ed4618 2019-06-02 stsp got_worktree_status_cb status_cb, void *status_arg,
2352 17ed4618 2019-06-02 stsp struct got_repository *repo)
2354 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
2355 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
2356 17ed4618 2019-06-02 stsp unsigned char status;
2357 17ed4618 2019-06-02 stsp struct stat sb;
2359 17ed4618 2019-06-02 stsp ie = got_fileindex_entry_get(fileindex, relpath);
2360 17ed4618 2019-06-02 stsp if (ie == NULL)
2361 17ed4618 2019-06-02 stsp return got_error(GOT_ERR_BAD_PATH);
2363 17ed4618 2019-06-02 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2365 17ed4618 2019-06-02 stsp return err;
2367 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
2368 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
2369 17ed4618 2019-06-02 stsp return got_error_set_errno(ENOENT, ondisk_path);
2370 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_MODIFY)
2371 17ed4618 2019-06-02 stsp return got_error(GOT_ERR_FILE_STATUS);
2372 17ed4618 2019-06-02 stsp if (!delete_local_mods)
2373 17ed4618 2019-06-02 stsp return got_error(GOT_ERR_FILE_MODIFIED);
2376 17ed4618 2019-06-02 stsp if (unlink(ondisk_path) != 0)
2377 17ed4618 2019-06-02 stsp return got_error_from_errno2("unlink", ondisk_path);
2379 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2380 17ed4618 2019-06-02 stsp return report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
2383 2ec1f75b 2019-03-26 stsp const struct got_error *
2384 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
2385 17ed4618 2019-06-02 stsp struct got_pathlist_head *ondisk_paths, int delete_local_mods,
2386 2ec1f75b 2019-03-26 stsp got_worktree_status_cb status_cb, void *status_arg,
2387 2ec1f75b 2019-03-26 stsp struct got_repository *repo)
2389 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
2390 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
2391 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2392 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
2394 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
2396 2ec1f75b 2019-03-26 stsp return err;
2398 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2400 2ec1f75b 2019-03-26 stsp goto done;
2402 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, ondisk_paths, entry) {
2403 17ed4618 2019-06-02 stsp char *relpath;
2404 17ed4618 2019-06-02 stsp err = got_path_skip_common_ancestor(&relpath,
2405 17ed4618 2019-06-02 stsp got_worktree_get_root_path(worktree), pe->path);
2408 17ed4618 2019-06-02 stsp err = schedule_for_deletion(pe->path, fileindex, relpath,
2409 17ed4618 2019-06-02 stsp delete_local_mods, status_cb, status_arg, repo);
2410 17ed4618 2019-06-02 stsp free(relpath);
2414 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2415 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2416 af12c6b9 2019-06-04 stsp err = sync_err;
2418 fb399478 2019-07-12 stsp free(fileindex_path);
2419 2ec1f75b 2019-03-26 stsp if (fileindex)
2420 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
2421 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2422 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
2423 2ec1f75b 2019-03-26 stsp err = unlockerr;
2424 2ec1f75b 2019-03-26 stsp return err;
2427 e20a8b6f 2019-06-04 stsp static const struct got_error *
2428 e20a8b6f 2019-06-04 stsp revert_file(struct got_worktree *worktree, struct got_fileindex *fileindex,
2429 a129376b 2019-03-28 stsp const char *ondisk_path,
2430 a129376b 2019-03-28 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2431 a129376b 2019-03-28 stsp struct got_repository *repo)
2433 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
2434 e20a8b6f 2019-06-04 stsp char *relpath = NULL, *parent_path = NULL;
2435 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
2436 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
2437 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
2438 a129376b 2019-03-28 stsp const struct got_tree_entry *te;
2439 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
2440 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
2441 a129376b 2019-03-28 stsp unsigned char status;
2442 a129376b 2019-03-28 stsp struct stat sb;
2444 a129376b 2019-03-28 stsp err = got_path_skip_common_ancestor(&relpath,
2445 a129376b 2019-03-28 stsp got_worktree_get_root_path(worktree), ondisk_path);
2447 a129376b 2019-03-28 stsp goto done;
2449 a129376b 2019-03-28 stsp ie = got_fileindex_entry_get(fileindex, relpath);
2450 a129376b 2019-03-28 stsp if (ie == NULL) {
2451 a129376b 2019-03-28 stsp err = got_error(GOT_ERR_BAD_PATH);
2452 a129376b 2019-03-28 stsp goto done;
2455 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
2456 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
2457 a129376b 2019-03-28 stsp if (err) {
2458 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
2459 a129376b 2019-03-28 stsp goto done;
2460 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
2461 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
2462 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
2463 e20a8b6f 2019-06-04 stsp goto done;
2466 a129376b 2019-03-28 stsp if (got_path_is_root_dir(worktree->path_prefix)) {
2467 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
2468 a129376b 2019-03-28 stsp if (tree_path == NULL) {
2469 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
2470 a129376b 2019-03-28 stsp goto done;
2473 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
2474 a129376b 2019-03-28 stsp tree_path = strdup(worktree->path_prefix);
2475 a129376b 2019-03-28 stsp if (tree_path == NULL) {
2476 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
2477 a129376b 2019-03-28 stsp goto done;
2480 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
2481 a129376b 2019-03-28 stsp worktree->path_prefix, parent_path) == -1) {
2482 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2483 a129376b 2019-03-28 stsp goto done;
2488 a129376b 2019-03-28 stsp err = got_object_id_by_path(&tree_id, repo, worktree->base_commit_id,
2489 a129376b 2019-03-28 stsp tree_path);
2491 a129376b 2019-03-28 stsp goto done;
2493 a129376b 2019-03-28 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2495 a129376b 2019-03-28 stsp goto done;
2497 a129376b 2019-03-28 stsp te_name = basename(ie->path);
2498 a129376b 2019-03-28 stsp if (te_name == NULL) {
2499 638f9024 2019-05-13 stsp err = got_error_from_errno2("basename", ie->path);
2500 a129376b 2019-03-28 stsp goto done;
2503 a129376b 2019-03-28 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2505 a129376b 2019-03-28 stsp goto done;
2507 a129376b 2019-03-28 stsp te = got_object_tree_find_entry(tree, te_name);
2508 a129376b 2019-03-28 stsp if (te == NULL && status != GOT_STATUS_ADD) {
2509 a129376b 2019-03-28 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
2510 a129376b 2019-03-28 stsp goto done;
2513 a129376b 2019-03-28 stsp switch (status) {
2514 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
2515 a129376b 2019-03-28 stsp (*progress_cb)(progress_arg, GOT_STATUS_REVERT, ie->path);
2516 a129376b 2019-03-28 stsp got_fileindex_entry_remove(fileindex, ie);
2518 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
2519 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
2520 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
2521 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
2522 e20a8b6f 2019-06-04 stsp struct got_object_id id;
2523 a129376b 2019-03-28 stsp memcpy(id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2524 a129376b 2019-03-28 stsp err = got_object_open_as_blob(&blob, repo, &id, 8192);
2526 a129376b 2019-03-28 stsp goto done;
2527 a129376b 2019-03-28 stsp err = install_blob(worktree, ondisk_path, ie->path,
2528 a129376b 2019-03-28 stsp te->mode, sb.st_mode, blob, 0, 1, repo, progress_cb,
2529 a129376b 2019-03-28 stsp progress_arg);
2531 a129376b 2019-03-28 stsp goto done;
2532 a129376b 2019-03-28 stsp if (status == GOT_STATUS_DELETE) {
2533 a129376b 2019-03-28 stsp err = update_blob_fileindex_entry(worktree,
2534 a129376b 2019-03-28 stsp fileindex, ie, ondisk_path, ie->path, blob, 1);
2536 a129376b 2019-03-28 stsp goto done;
2541 a129376b 2019-03-28 stsp goto done;
2544 a129376b 2019-03-28 stsp free(relpath);
2545 e20a8b6f 2019-06-04 stsp free(parent_path);
2546 a129376b 2019-03-28 stsp free(tree_path);
2548 a129376b 2019-03-28 stsp got_object_blob_close(blob);
2550 a129376b 2019-03-28 stsp got_object_tree_close(tree);
2551 a129376b 2019-03-28 stsp free(tree_id);
2552 e20a8b6f 2019-06-04 stsp return err;
2555 e20a8b6f 2019-06-04 stsp const struct got_error *
2556 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
2557 e20a8b6f 2019-06-04 stsp struct got_pathlist_head *ondisk_paths,
2558 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2559 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
2561 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
2562 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
2563 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
2564 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
2565 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
2567 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
2569 e20a8b6f 2019-06-04 stsp return err;
2571 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2573 e20a8b6f 2019-06-04 stsp goto done;
2575 e20a8b6f 2019-06-04 stsp TAILQ_FOREACH(pe, ondisk_paths, entry) {
2576 e20a8b6f 2019-06-04 stsp err = revert_file(worktree, fileindex, pe->path,
2577 e20a8b6f 2019-06-04 stsp progress_cb, progress_arg, repo);
2581 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2582 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
2583 e20a8b6f 2019-06-04 stsp err = sync_err;
2585 fb399478 2019-07-12 stsp free(fileindex_path);
2586 a129376b 2019-03-28 stsp if (fileindex)
2587 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
2588 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2589 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
2590 a129376b 2019-03-28 stsp err = unlockerr;
2591 c4296144 2019-05-09 stsp return err;
2594 cf066bf8 2019-05-09 stsp static void
2595 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
2597 24519714 2019-05-09 stsp free(ct->path);
2598 44d03001 2019-05-09 stsp free(ct->in_repo_path);
2599 768aea60 2019-05-09 stsp free(ct->ondisk_path);
2600 e75eb4da 2019-05-10 stsp free(ct->blob_id);
2601 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
2602 b416585c 2019-05-13 stsp free(ct->base_commit_id);
2606 ed175427 2019-05-09 stsp struct collect_commitables_arg {
2607 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
2608 24519714 2019-05-09 stsp struct got_repository *repo;
2609 24519714 2019-05-09 stsp struct got_worktree *worktree;
2612 c4296144 2019-05-09 stsp static const struct got_error *
2613 036813ee 2019-05-09 stsp collect_commitables(void *arg, unsigned char status, const char *relpath,
2614 016a88dd 2019-05-13 stsp struct got_object_id *blob_id, struct got_object_id *commit_id)
2616 ed175427 2019-05-09 stsp struct collect_commitables_arg *a = arg;
2617 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
2618 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
2619 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
2620 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
2621 768aea60 2019-05-09 stsp struct stat sb;
2623 c4296144 2019-05-09 stsp if (status == GOT_STATUS_CONFLICT)
2624 c4296144 2019-05-09 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
2626 c4296144 2019-05-09 stsp if (status != GOT_STATUS_MODIFY && status != GOT_STATUS_ADD &&
2627 c4296144 2019-05-09 stsp status != GOT_STATUS_DELETE)
2628 c4296144 2019-05-09 stsp return NULL;
2630 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
2631 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2632 036813ee 2019-05-09 stsp goto done;
2634 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
2635 036813ee 2019-05-09 stsp parent_path = strdup("");
2636 69960a46 2019-05-09 stsp if (parent_path == NULL)
2637 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
2639 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
2641 69960a46 2019-05-09 stsp return err;
2644 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
2645 cf066bf8 2019-05-09 stsp if (ct == NULL) {
2646 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
2647 c4296144 2019-05-09 stsp goto done;
2650 768aea60 2019-05-09 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
2651 768aea60 2019-05-09 stsp relpath) == -1) {
2652 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2653 768aea60 2019-05-09 stsp goto done;
2655 768aea60 2019-05-09 stsp if (status == GOT_STATUS_DELETE) {
2656 768aea60 2019-05-09 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2658 768aea60 2019-05-09 stsp if (lstat(ct->ondisk_path, &sb) != 0) {
2659 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
2660 768aea60 2019-05-09 stsp goto done;
2662 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
2665 44d03001 2019-05-09 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
2666 44d03001 2019-05-09 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
2667 44d03001 2019-05-09 stsp relpath) == -1) {
2668 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2669 44d03001 2019-05-09 stsp goto done;
2672 cf066bf8 2019-05-09 stsp ct->status = status;
2673 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
2674 036813ee 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD) {
2675 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
2676 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
2677 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2678 b416585c 2019-05-13 stsp goto done;
2680 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
2681 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
2682 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2683 036813ee 2019-05-09 stsp goto done;
2686 24519714 2019-05-09 stsp ct->path = strdup(path);
2687 24519714 2019-05-09 stsp if (ct->path == NULL) {
2688 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
2689 24519714 2019-05-09 stsp goto done;
2691 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
2693 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
2694 ed175427 2019-05-09 stsp free_commitable(ct);
2695 24519714 2019-05-09 stsp free(parent_path);
2696 036813ee 2019-05-09 stsp free(path);
2697 a129376b 2019-03-28 stsp return err;
2700 036813ee 2019-05-09 stsp static const struct got_error *write_tree(struct got_object_id **,
2701 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
2702 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
2703 036813ee 2019-05-09 stsp struct got_repository *);
2705 ed175427 2019-05-09 stsp static const struct got_error *
2706 036813ee 2019-05-09 stsp write_subtree(struct got_object_id **new_subtree_id,
2707 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
2708 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
2709 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
2710 afa376bf 2019-05-09 stsp struct got_repository *repo)
2712 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
2713 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
2714 036813ee 2019-05-09 stsp char *subpath;
2716 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
2717 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
2718 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2720 036813ee 2019-05-09 stsp err = got_object_open_as_tree(&subtree, repo, te->id);
2722 ed175427 2019-05-09 stsp return err;
2724 036813ee 2019-05-09 stsp err = write_tree(new_subtree_id, subtree, subpath, commitable_paths,
2725 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
2726 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
2727 036813ee 2019-05-09 stsp free(subpath);
2728 036813ee 2019-05-09 stsp return err;
2731 036813ee 2019-05-09 stsp static const struct got_error *
2732 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
2734 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2735 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
2737 036813ee 2019-05-09 stsp *match = 0;
2739 036813ee 2019-05-09 stsp if (strchr(ct->path, '/') == NULL) {
2740 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
2741 0f63689d 2019-05-10 stsp return NULL;
2744 0f63689d 2019-05-10 stsp err = got_path_dirname(&ct_parent_path, ct->path);
2746 0f63689d 2019-05-10 stsp return err;
2747 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
2748 036813ee 2019-05-09 stsp free(ct_parent_path);
2749 036813ee 2019-05-09 stsp return err;
2752 768aea60 2019-05-09 stsp static mode_t
2753 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
2755 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
2758 036813ee 2019-05-09 stsp static const struct got_error *
2759 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
2760 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
2762 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2764 036813ee 2019-05-09 stsp *new_te = NULL;
2766 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
2768 036813ee 2019-05-09 stsp goto done;
2770 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
2772 036813ee 2019-05-09 stsp free((*new_te)->id);
2773 e75eb4da 2019-05-10 stsp (*new_te)->id = got_object_id_dup(ct->blob_id);
2774 036813ee 2019-05-09 stsp if ((*new_te)->id == NULL) {
2775 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2776 036813ee 2019-05-09 stsp goto done;
2779 036813ee 2019-05-09 stsp if (err && *new_te) {
2780 036813ee 2019-05-09 stsp got_object_tree_entry_close(*new_te);
2781 036813ee 2019-05-09 stsp *new_te = NULL;
2783 036813ee 2019-05-09 stsp return err;
2786 036813ee 2019-05-09 stsp static const struct got_error *
2787 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
2788 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
2790 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2791 036813ee 2019-05-09 stsp char *ct_name;
2793 036813ee 2019-05-09 stsp *new_te = NULL;
2795 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
2796 036813ee 2019-05-09 stsp if (*new_te == NULL)
2797 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
2799 036813ee 2019-05-09 stsp ct_name = basename(ct->path);
2800 036813ee 2019-05-09 stsp if (ct_name == NULL) {
2801 638f9024 2019-05-13 stsp err = got_error_from_errno2("basename", ct->path);
2802 036813ee 2019-05-09 stsp goto done;
2804 036813ee 2019-05-09 stsp (*new_te)->name = strdup(ct_name);
2805 036813ee 2019-05-09 stsp if ((*new_te)->name == NULL) {
2806 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
2807 036813ee 2019-05-09 stsp goto done;
2810 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
2812 e75eb4da 2019-05-10 stsp (*new_te)->id = got_object_id_dup(ct->blob_id);
2813 036813ee 2019-05-09 stsp if ((*new_te)->id == NULL) {
2814 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2815 036813ee 2019-05-09 stsp goto done;
2818 036813ee 2019-05-09 stsp if (err && *new_te) {
2819 036813ee 2019-05-09 stsp got_object_tree_entry_close(*new_te);
2820 036813ee 2019-05-09 stsp *new_te = NULL;
2822 036813ee 2019-05-09 stsp return err;
2825 036813ee 2019-05-09 stsp static const struct got_error *
2826 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
2827 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
2829 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2830 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
2832 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
2834 036813ee 2019-05-09 stsp return err;
2835 036813ee 2019-05-09 stsp if (new_pe == NULL)
2836 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
2837 036813ee 2019-05-09 stsp return NULL;
2840 afa376bf 2019-05-09 stsp static const struct got_error *
2841 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
2842 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
2844 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
2845 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
2846 afa376bf 2019-05-09 stsp ct_path++;
2847 016a88dd 2019-05-13 stsp return (*status_cb)(status_arg, ct->status, ct_path, ct->blob_id, NULL);
2850 036813ee 2019-05-09 stsp static const struct got_error *
2851 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
2852 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
2854 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
2855 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
2856 44d03001 2019-05-09 stsp char *te_path;
2858 44d03001 2019-05-09 stsp *modified = 0;
2860 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
2861 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
2862 44d03001 2019-05-09 stsp te->name) == -1)
2863 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2865 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
2866 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
2867 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
2868 44d03001 2019-05-09 stsp strlen(te_path));
2869 44d03001 2019-05-09 stsp if (*modified)
2873 44d03001 2019-05-09 stsp free(te_path);
2874 44d03001 2019-05-09 stsp return err;
2877 44d03001 2019-05-09 stsp static const struct got_error *
2878 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
2879 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
2880 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
2882 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2883 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
2885 036813ee 2019-05-09 stsp *ctp = NULL;
2887 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
2888 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
2889 036813ee 2019-05-09 stsp char *ct_name = NULL;
2890 036813ee 2019-05-09 stsp int path_matches;
2892 036813ee 2019-05-09 stsp if (ct->status != GOT_STATUS_MODIFY &&
2893 036813ee 2019-05-09 stsp ct->status != GOT_STATUS_DELETE)
2896 c4e12a88 2019-05-13 stsp if (got_object_id_cmp(ct->base_blob_id, te->id) != 0)
2899 036813ee 2019-05-09 stsp err = match_ct_parent_path(&path_matches, ct, base_tree_path);
2901 036813ee 2019-05-09 stsp return err;
2902 036813ee 2019-05-09 stsp if (!path_matches)
2905 036813ee 2019-05-09 stsp ct_name = basename(pe->path);
2906 036813ee 2019-05-09 stsp if (ct_name == NULL)
2907 638f9024 2019-05-13 stsp return got_error_from_errno2("basename", pe->path);
2909 036813ee 2019-05-09 stsp if (strcmp(te->name, ct_name) != 0)
2912 036813ee 2019-05-09 stsp *ctp = ct;
2916 2b496619 2019-07-10 stsp return err;
2919 2b496619 2019-07-10 stsp static const struct got_error *
2920 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
2921 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
2922 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
2923 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
2924 2b496619 2019-07-10 stsp struct got_repository *repo)
2926 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
2927 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
2928 2b496619 2019-07-10 stsp char *subtree_path;
2930 2b496619 2019-07-10 stsp *new_tep = NULL;
2932 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
2933 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
2934 2b496619 2019-07-10 stsp child_path) == -1)
2935 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
2937 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
2938 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
2939 2b496619 2019-07-10 stsp new_te->name = strdup(child_path);
2940 2b496619 2019-07-10 stsp if (new_te->name == NULL) {
2941 2b496619 2019-07-10 stsp err = got_error_from_errno("strdup");
2942 2b496619 2019-07-10 stsp got_object_tree_entry_close(new_te);
2943 2b496619 2019-07-10 stsp goto done;
2945 2b496619 2019-07-10 stsp err = write_tree(&new_te->id, NULL, subtree_path,
2946 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
2947 2b496619 2019-07-10 stsp if (err) {
2948 2b496619 2019-07-10 stsp got_object_tree_entry_close(new_te);
2949 2b496619 2019-07-10 stsp goto done;
2952 2b496619 2019-07-10 stsp free(subtree_path);
2953 2b496619 2019-07-10 stsp if (err == NULL)
2954 2b496619 2019-07-10 stsp *new_tep = new_te;
2955 036813ee 2019-05-09 stsp return err;
2958 036813ee 2019-05-09 stsp static const struct got_error *
2959 036813ee 2019-05-09 stsp write_tree(struct got_object_id **new_tree_id,
2960 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
2961 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
2962 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
2963 036813ee 2019-05-09 stsp struct got_repository *repo)
2965 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2966 036813ee 2019-05-09 stsp const struct got_tree_entries *base_entries = NULL;
2967 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
2968 036813ee 2019-05-09 stsp struct got_tree_entries new_tree_entries;
2969 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
2970 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
2972 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
2973 036813ee 2019-05-09 stsp new_tree_entries.nentries = 0;
2974 036813ee 2019-05-09 stsp SIMPLEQ_INIT(&new_tree_entries.head);
2976 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
2977 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
2978 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
2979 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
2981 a3df2849 2019-05-20 stsp if (ct->status != GOT_STATUS_ADD ||
2982 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
2985 036813ee 2019-05-09 stsp if (!got_path_is_child(pe->path, path_base_tree,
2986 2f51b5b3 2019-05-09 stsp strlen(path_base_tree)))
2989 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
2990 036813ee 2019-05-09 stsp pe->path);
2992 036813ee 2019-05-09 stsp goto done;
2994 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
2995 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
2996 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
2998 036813ee 2019-05-09 stsp goto done;
2999 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
3001 afa376bf 2019-05-09 stsp goto done;
3002 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
3003 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
3005 2f51b5b3 2019-05-09 stsp goto done;
3007 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
3008 2b496619 2019-07-10 stsp if (base_tree == NULL ||
3009 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
3010 2b496619 2019-07-10 stsp == NULL) {
3011 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
3012 2b496619 2019-07-10 stsp child_path, path_base_tree,
3013 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
3016 2b496619 2019-07-10 stsp goto done;
3017 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
3019 2b496619 2019-07-10 stsp goto done;
3024 2f51b5b3 2019-05-09 stsp if (base_tree) {
3025 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
3026 2f51b5b3 2019-05-09 stsp base_entries = got_object_tree_get_entries(base_tree);
3027 2f51b5b3 2019-05-09 stsp SIMPLEQ_FOREACH(te, &base_entries->head, entry) {
3028 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
3030 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
3031 44d03001 2019-05-09 stsp int modified;
3032 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
3034 036813ee 2019-05-09 stsp goto done;
3035 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
3036 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
3038 2f51b5b3 2019-05-09 stsp goto done;
3039 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
3040 44d03001 2019-05-09 stsp if (modified) {
3041 44d03001 2019-05-09 stsp free(new_te->id);
3042 44d03001 2019-05-09 stsp err = write_subtree(&new_te->id, te,
3043 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
3044 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
3046 44d03001 2019-05-09 stsp goto done;
3048 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
3050 036813ee 2019-05-09 stsp goto done;
3054 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
3055 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
3057 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
3058 2f51b5b3 2019-05-09 stsp if (ct->status == GOT_STATUS_MODIFY) {
3059 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
3060 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
3062 2f51b5b3 2019-05-09 stsp goto done;
3063 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
3065 2f51b5b3 2019-05-09 stsp goto done;
3067 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
3068 b416585c 2019-05-13 stsp status_arg);
3070 afa376bf 2019-05-09 stsp goto done;
3072 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
3073 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
3075 2f51b5b3 2019-05-09 stsp goto done;
3076 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
3078 2f51b5b3 2019-05-09 stsp goto done;
3083 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
3084 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, &paths, entry) {
3085 0b5cc0d6 2019-05-09 stsp struct got_tree_entry *te = pe->data;
3086 0b5cc0d6 2019-05-09 stsp new_tree_entries.nentries++;
3087 0b5cc0d6 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&new_tree_entries.head, te, entry);
3089 036813ee 2019-05-09 stsp err = got_object_tree_create(new_tree_id, &new_tree_entries, repo);
3091 ca2503ea 2019-05-09 stsp got_object_tree_entries_close(&new_tree_entries);
3092 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
3093 ed175427 2019-05-09 stsp return err;
3096 ebf99748 2019-05-09 stsp static const struct got_error *
3097 ebf99748 2019-05-09 stsp update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
3098 8ec7bf54 2019-07-12 stsp struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex,
3099 8ec7bf54 2019-07-12 stsp struct got_worktree *worktree)
3101 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
3102 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
3104 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3105 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
3106 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3108 ebf99748 2019-05-09 stsp ie = got_fileindex_entry_get(fileindex, pe->path);
3110 ebf99748 2019-05-09 stsp if (ct->status == GOT_STATUS_DELETE) {
3111 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
3112 ebf99748 2019-05-09 stsp got_fileindex_entry_free(ie);
3114 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
3115 e75eb4da 2019-05-10 stsp ct->ondisk_path, ct->blob_id->sha1,
3116 ebf99748 2019-05-09 stsp new_base_commit_id->sha1, 1);
3118 ebf99748 2019-05-09 stsp err = got_fileindex_entry_alloc(&ie,
3119 e75eb4da 2019-05-10 stsp ct->ondisk_path, pe->path, ct->blob_id->sha1,
3120 ebf99748 2019-05-09 stsp new_base_commit_id->sha1);
3123 ebf99748 2019-05-09 stsp err = got_fileindex_entry_add(fileindex, ie);
3128 d56d26ce 2019-05-10 stsp return err;
3131 d56d26ce 2019-05-10 stsp static const struct got_error *
3132 33ad4cbe 2019-05-12 jcs check_ct_out_of_date(struct got_commitable *ct, struct got_repository *repo,
3133 d56d26ce 2019-05-10 stsp struct got_object_id *head_commit_id)
3135 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
3136 1a36436d 2019-06-10 stsp struct got_object_id *id_in_head = NULL, *id = NULL;
3137 1a36436d 2019-06-10 stsp struct got_commit_object *commit = NULL;
3138 1a36436d 2019-06-10 stsp char *path = NULL;
3139 1a36436d 2019-06-10 stsp const char *ct_path = ct->in_repo_path;
3141 1a36436d 2019-06-10 stsp while (ct_path[0] == '/')
3142 1a36436d 2019-06-10 stsp ct_path++;
3145 1a36436d 2019-06-10 stsp * Ensure that no modifications were made to files *and their parents*
3146 1a36436d 2019-06-10 stsp * in commits between the file's base commit and the branch head.
3148 1a36436d 2019-06-10 stsp * Checking the parents is important for detecting conflicting tree
3149 1a36436d 2019-06-10 stsp * configurations (files or parent folders might have been moved,
3150 1a36436d 2019-06-10 stsp * deleted, added again, etc.). Such changes need to be merged with
3151 1a36436d 2019-06-10 stsp * local changes before a commit can occur.
3153 1a36436d 2019-06-10 stsp * The implication is that the file's (parent) entry in the root
3154 1a36436d 2019-06-10 stsp * directory must have the same ID in all relevant commits.
3156 b416585c 2019-05-13 stsp if (ct->status != GOT_STATUS_ADD) {
3157 1a36436d 2019-06-10 stsp struct got_object_qid *pid;
3158 1a36436d 2019-06-10 stsp char *slash;
3159 1a36436d 2019-06-10 stsp struct got_object_id *root_entry_id = NULL;
3161 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
3162 1a36436d 2019-06-10 stsp if (got_object_id_cmp(ct->base_commit_id, head_commit_id) == 0)
3163 1a36436d 2019-06-10 stsp return NULL;
3165 1a36436d 2019-06-10 stsp /* Compute the path to the root directory's entry. */
3166 1a36436d 2019-06-10 stsp path = strdup(ct_path);
3167 1a36436d 2019-06-10 stsp if (path == NULL) {
3168 1a36436d 2019-06-10 stsp err = got_error_from_errno("strdup");
3169 1a36436d 2019-06-10 stsp goto done;
3171 1a36436d 2019-06-10 stsp slash = strchr(path, '/');
3172 1a36436d 2019-06-10 stsp if (slash)
3173 1a36436d 2019-06-10 stsp *slash = '\0';
3175 1a36436d 2019-06-10 stsp err = got_object_open_as_commit(&commit, repo, head_commit_id);
3177 1a36436d 2019-06-10 stsp goto done;
3179 1a36436d 2019-06-10 stsp err = got_object_id_by_path(&root_entry_id, repo,
3180 1a36436d 2019-06-10 stsp head_commit_id, path);
3182 1a36436d 2019-06-10 stsp goto done;
3184 1a36436d 2019-06-10 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3185 1a36436d 2019-06-10 stsp while (pid) {
3186 1a36436d 2019-06-10 stsp struct got_commit_object *pcommit;
3188 1a36436d 2019-06-10 stsp err = got_object_id_by_path(&id, repo, pid->id, path);
3189 1a36436d 2019-06-10 stsp if (err) {
3190 1a36436d 2019-06-10 stsp if (err->code != GOT_ERR_NO_TREE_ENTRY)
3191 1a36436d 2019-06-10 stsp goto done;
3192 1a36436d 2019-06-10 stsp err = NULL;
3196 1a36436d 2019-06-10 stsp err = got_object_id_by_path(&id, repo, pid->id, path);
3198 1a36436d 2019-06-10 stsp goto done;
3200 1a36436d 2019-06-10 stsp if (got_object_id_cmp(id, root_entry_id) != 0) {
3201 1a36436d 2019-06-10 stsp err = got_error(GOT_ERR_COMMIT_OUT_OF_DATE);
3205 1a36436d 2019-06-10 stsp if (got_object_id_cmp(pid->id, ct->base_commit_id) == 0)
3206 1a36436d 2019-06-10 stsp break; /* all relevant commits scanned */
3208 1a36436d 2019-06-10 stsp err = got_object_open_as_commit(&pcommit, repo,
3211 1a36436d 2019-06-10 stsp goto done;
3213 1a36436d 2019-06-10 stsp got_object_commit_close(commit);
3214 1a36436d 2019-06-10 stsp commit = pcommit;
3215 1a36436d 2019-06-10 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(
3219 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
3220 1a36436d 2019-06-10 stsp err = got_object_id_by_path(&id_in_head, repo, head_commit_id,
3222 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3223 1a36436d 2019-06-10 stsp goto done;
3224 1a36436d 2019-06-10 stsp err = id_in_head ? got_error(GOT_ERR_COMMIT_OUT_OF_DATE) : NULL;
3227 1a36436d 2019-06-10 stsp if (commit)
3228 1a36436d 2019-06-10 stsp got_object_commit_close(commit);
3229 d56d26ce 2019-05-10 stsp free(id_in_head);
3231 1a36436d 2019-06-10 stsp free(path);
3232 1a36436d 2019-06-10 stsp return err;
3235 c4296144 2019-05-09 stsp const struct got_error *
3236 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
3237 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
3238 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id, struct got_worktree *worktree,
3239 39cd0ff6 2019-07-12 stsp const char *ondisk_path, const char *author, const char *committer,
3240 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
3241 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3242 afa376bf 2019-05-09 stsp struct got_repository *repo)
3244 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
3245 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
3246 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
3247 36a38700 2019-05-10 stsp struct got_reference *head_ref = NULL;
3248 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
3249 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
3250 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
3251 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
3252 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
3253 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
3254 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
3255 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
3257 c4296144 2019-05-09 stsp *new_commit_id = NULL;
3259 de18fc63 2019-05-09 stsp SIMPLEQ_INIT(&parent_ids);
3261 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
3263 588edf97 2019-05-10 stsp goto done;
3265 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3266 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3267 d56d26ce 2019-05-10 stsp err = check_ct_out_of_date(ct, repo, head_commit_id);
3269 819f385b 2019-05-10 stsp goto done;
3272 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
3274 588edf97 2019-05-10 stsp goto done;
3276 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
3277 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
3282 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
3283 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
3287 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
3288 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3289 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3290 cf066bf8 2019-05-09 stsp char *ondisk_path;
3292 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
3293 cf066bf8 2019-05-09 stsp ct->status != GOT_STATUS_MODIFY)
3296 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
3297 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
3298 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3299 cf066bf8 2019-05-09 stsp goto done;
3301 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
3302 a7055788 2019-05-09 stsp free(ondisk_path);
3304 cf066bf8 2019-05-09 stsp goto done;
3307 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
3308 39cd0ff6 2019-07-12 stsp err = write_tree(&new_tree_id, head_tree, "/", commitable_paths,
3309 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
3311 036813ee 2019-05-09 stsp goto done;
3313 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
3315 de18fc63 2019-05-09 stsp goto done;
3316 de18fc63 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
3317 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
3318 de18fc63 2019-05-09 stsp 1, author, time(NULL), committer, time(NULL), logmsg, repo);
3319 de18fc63 2019-05-09 stsp got_object_qid_free(pid);
3320 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
3321 33ad4cbe 2019-05-12 jcs free(logmsg);
3323 9d40349a 2019-05-09 stsp goto done;
3325 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
3326 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
3327 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
3328 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
3329 09f5bd90 2019-05-09 stsp goto done;
3331 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
3332 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
3334 09f5bd90 2019-05-09 stsp goto done;
3335 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
3337 ebf99748 2019-05-09 stsp goto done;
3338 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
3339 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
3340 09f5bd90 2019-05-09 stsp goto done;
3342 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
3343 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
3345 f2c16586 2019-05-09 stsp goto done;
3346 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
3348 f2c16586 2019-05-09 stsp goto done;
3350 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
3352 09f5bd90 2019-05-09 stsp goto done;
3354 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
3356 ebf99748 2019-05-09 stsp goto done;
3358 588edf97 2019-05-10 stsp if (head_tree)
3359 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
3360 588edf97 2019-05-10 stsp if (head_commit)
3361 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
3362 09f5bd90 2019-05-09 stsp free(head_commit_id2);
3363 36a38700 2019-05-10 stsp if (head_ref)
3364 36a38700 2019-05-10 stsp got_ref_close(head_ref);
3365 2f17228e 2019-05-12 stsp if (head_ref2) {
3366 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
3367 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
3368 2f17228e 2019-05-12 stsp err = unlockerr;
3369 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
3371 39cd0ff6 2019-07-12 stsp return err;
3374 39cd0ff6 2019-07-12 stsp const struct got_error *
3375 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
3376 39cd0ff6 2019-07-12 stsp struct got_worktree *worktree, const char *ondisk_path,
3377 39cd0ff6 2019-07-12 stsp const char *author, const char *committer,
3378 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
3379 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
3380 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
3382 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
3383 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
3384 39cd0ff6 2019-07-12 stsp char *fileindex_path = NULL, *relpath = NULL;
3385 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
3386 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
3387 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
3388 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
3389 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
3391 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
3393 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
3395 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
3397 39cd0ff6 2019-07-12 stsp goto done;
3399 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
3401 39cd0ff6 2019-07-12 stsp goto done;
3403 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
3405 39cd0ff6 2019-07-12 stsp goto done;
3407 39cd0ff6 2019-07-12 stsp if (ondisk_path) {
3408 39cd0ff6 2019-07-12 stsp err = got_path_skip_common_ancestor(&relpath,
3409 39cd0ff6 2019-07-12 stsp worktree->root_path, ondisk_path);
3411 39cd0ff6 2019-07-12 stsp return err;
3414 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3416 39cd0ff6 2019-07-12 stsp goto done;
3418 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
3419 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
3420 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
3421 39cd0ff6 2019-07-12 stsp err = worktree_status(worktree, relpath ? relpath : "",
3422 39cd0ff6 2019-07-12 stsp fileindex, repo, collect_commitables, &cc_arg, NULL, NULL);
3424 39cd0ff6 2019-07-12 stsp goto done;
3426 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
3427 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
3428 39cd0ff6 2019-07-12 stsp goto done;
3431 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
3432 39cd0ff6 2019-07-12 stsp head_commit_id, worktree, ondisk_path, author, committer,
3433 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
3435 39cd0ff6 2019-07-12 stsp goto done;
3437 39cd0ff6 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths,
3438 39cd0ff6 2019-07-12 stsp *new_commit_id, fileindex, worktree);
3439 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3440 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
3441 39cd0ff6 2019-07-12 stsp err = sync_err;
3443 39cd0ff6 2019-07-12 stsp if (fileindex)
3444 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
3445 39cd0ff6 2019-07-12 stsp free(fileindex_path);
3446 39cd0ff6 2019-07-12 stsp free(relpath);
3447 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3448 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
3449 39cd0ff6 2019-07-12 stsp err = unlockerr;
3450 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
3451 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
3452 39cd0ff6 2019-07-12 stsp free_commitable(ct);
3454 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
3455 c4296144 2019-05-09 stsp return err;
3458 8656d6c4 2019-05-20 stsp const char *
3459 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
3461 8656d6c4 2019-05-20 stsp return ct->path;
3464 8656d6c4 2019-05-20 stsp unsigned int
3465 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
3467 8656d6c4 2019-05-20 stsp return ct->status;
3470 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
3471 818c7501 2019-07-11 stsp struct got_worktree *worktree;
3472 818c7501 2019-07-11 stsp struct got_repository *repo;
3473 818c7501 2019-07-11 stsp int rebase_in_progress;
3476 818c7501 2019-07-11 stsp static const struct got_error *
3477 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
3479 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
3480 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
3481 818c7501 2019-07-11 stsp unsigned char status;
3482 818c7501 2019-07-11 stsp struct stat sb;
3483 818c7501 2019-07-11 stsp char *ondisk_path;
3485 818c7501 2019-07-11 stsp if (!a->rebase_in_progress) {
3486 818c7501 2019-07-11 stsp /* Reject rebase of a work tree with mixed base commits. */
3487 818c7501 2019-07-11 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
3488 818c7501 2019-07-11 stsp SHA1_DIGEST_LENGTH))
3489 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MIXED_COMMITS);
3492 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3494 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
3496 818c7501 2019-07-11 stsp /* Reject rebase of a work tree with modified or conflicted files. */
3497 818c7501 2019-07-11 stsp err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
3498 818c7501 2019-07-11 stsp free(ondisk_path);
3500 818c7501 2019-07-11 stsp return err;
3502 818c7501 2019-07-11 stsp if (a->rebase_in_progress) {
3503 818c7501 2019-07-11 stsp if (status == GOT_STATUS_CONFLICT)
3504 818c7501 2019-07-11 stsp return got_error(GOT_ERR_CONFLICTS);
3505 818c7501 2019-07-11 stsp } else if (status != GOT_STATUS_NO_CHANGE)
3506 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
3508 818c7501 2019-07-11 stsp return NULL;
3511 818c7501 2019-07-11 stsp const struct got_error *
3512 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
3513 818c7501 2019-07-11 stsp struct got_reference **tmp_branch, struct got_worktree *worktree,
3514 818c7501 2019-07-11 stsp struct got_reference *branch, struct got_repository *repo)
3516 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
3517 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
3518 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
3519 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
3520 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
3521 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
3522 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
3524 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
3525 818c7501 2019-07-11 stsp *tmp_branch = NULL;
3527 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
3529 818c7501 2019-07-11 stsp return err;
3531 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3533 818c7501 2019-07-11 stsp goto done;
3535 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
3536 818c7501 2019-07-11 stsp ok_arg.repo = repo;
3537 818c7501 2019-07-11 stsp ok_arg.rebase_in_progress = 0;
3538 818c7501 2019-07-11 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_rebase_ok,
3541 818c7501 2019-07-11 stsp goto done;
3543 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3545 818c7501 2019-07-11 stsp goto done;
3547 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
3549 818c7501 2019-07-11 stsp goto done;
3551 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
3553 818c7501 2019-07-11 stsp goto done;
3555 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
3558 818c7501 2019-07-11 stsp goto done;
3560 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
3561 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
3563 818c7501 2019-07-11 stsp goto done;
3564 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
3566 818c7501 2019-07-11 stsp goto done;
3568 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
3570 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
3572 818c7501 2019-07-11 stsp goto done;
3574 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
3576 818c7501 2019-07-11 stsp goto done;
3578 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
3579 818c7501 2019-07-11 stsp worktree->base_commit_id);
3581 818c7501 2019-07-11 stsp goto done;
3582 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
3584 818c7501 2019-07-11 stsp goto done;
3586 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
3588 818c7501 2019-07-11 stsp goto done;
3590 818c7501 2019-07-11 stsp free(fileindex_path);
3591 818c7501 2019-07-11 stsp if (fileindex)
3592 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
3593 818c7501 2019-07-11 stsp free(tmp_branch_name);
3594 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
3595 818c7501 2019-07-11 stsp free(branch_ref_name);
3596 818c7501 2019-07-11 stsp if (branch_ref)
3597 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
3598 818c7501 2019-07-11 stsp if (wt_branch)
3599 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
3600 818c7501 2019-07-11 stsp if (err) {
3601 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
3602 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
3603 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
3605 818c7501 2019-07-11 stsp if (*tmp_branch) {
3606 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
3607 818c7501 2019-07-11 stsp *tmp_branch = NULL;
3609 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
3611 818c7501 2019-07-11 stsp return err;
3614 818c7501 2019-07-11 stsp const struct got_error *
3615 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
3616 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
3617 818c7501 2019-07-11 stsp struct got_reference **branch, struct got_worktree *worktree,
3618 818c7501 2019-07-11 stsp struct got_repository *repo)
3620 818c7501 2019-07-11 stsp const struct got_error *err;
3621 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
3622 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
3623 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
3625 818c7501 2019-07-11 stsp *commit_id = NULL;
3627 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3629 818c7501 2019-07-11 stsp return err;
3631 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
3633 818c7501 2019-07-11 stsp goto done;
3635 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
3637 818c7501 2019-07-11 stsp goto done;
3639 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
3641 818c7501 2019-07-11 stsp goto done;
3643 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
3645 818c7501 2019-07-11 stsp goto done;
3647 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
3648 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
3650 818c7501 2019-07-11 stsp goto done;
3652 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
3654 818c7501 2019-07-11 stsp goto done;
3656 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
3658 818c7501 2019-07-11 stsp goto done;
3660 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
3661 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
3663 818c7501 2019-07-11 stsp goto done;
3665 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
3667 818c7501 2019-07-11 stsp goto done;
3669 818c7501 2019-07-11 stsp free(commit_ref_name);
3670 818c7501 2019-07-11 stsp free(branch_ref_name);
3671 818c7501 2019-07-11 stsp if (commit_ref)
3672 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
3673 818c7501 2019-07-11 stsp if (branch_ref)
3674 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
3675 818c7501 2019-07-11 stsp if (err) {
3676 818c7501 2019-07-11 stsp free(*commit_id);
3677 818c7501 2019-07-11 stsp *commit_id = NULL;
3678 818c7501 2019-07-11 stsp if (*tmp_branch) {
3679 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
3680 818c7501 2019-07-11 stsp *tmp_branch = NULL;
3682 818c7501 2019-07-11 stsp if (*new_base_branch) {
3683 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
3684 818c7501 2019-07-11 stsp *new_base_branch = NULL;
3686 818c7501 2019-07-11 stsp if (*branch) {
3687 818c7501 2019-07-11 stsp got_ref_close(*branch);
3688 818c7501 2019-07-11 stsp *branch = NULL;
3691 818c7501 2019-07-11 stsp return err;
3694 818c7501 2019-07-11 stsp const struct got_error *
3695 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
3697 818c7501 2019-07-11 stsp const struct got_error *err;
3698 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
3700 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3702 818c7501 2019-07-11 stsp return err;
3704 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
3705 818c7501 2019-07-11 stsp free(tmp_branch_name);
3706 818c7501 2019-07-11 stsp return NULL;
3709 818c7501 2019-07-11 stsp static const struct got_error *
3710 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
3711 818c7501 2019-07-11 stsp char **logmsg, void *arg)
3713 818c7501 2019-07-11 stsp struct got_commit_object *commit = arg;
3715 818c7501 2019-07-11 stsp *logmsg = strdup(got_object_commit_get_logmsg(commit));
3716 818c7501 2019-07-11 stsp if (*logmsg == NULL)
3717 818c7501 2019-07-11 stsp return got_error_from_errno("strdup");
3719 818c7501 2019-07-11 stsp return NULL;
3722 818c7501 2019-07-11 stsp static const struct got_error *
3723 818c7501 2019-07-11 stsp rebase_status(void *arg, unsigned char status, const char *path,
3724 818c7501 2019-07-11 stsp struct got_object_id *blob_id, struct got_object_id *commit_id)
3726 818c7501 2019-07-11 stsp return NULL;
3729 818c7501 2019-07-11 stsp const struct got_error *
3730 818c7501 2019-07-11 stsp got_worktree_rebase_merge_files(struct got_worktree *worktree,
3731 818c7501 2019-07-11 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
3732 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3733 818c7501 2019-07-11 stsp void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
3735 818c7501 2019-07-11 stsp const struct got_error *err;
3736 818c7501 2019-07-11 stsp struct got_fileindex *fileindex;
3737 818c7501 2019-07-11 stsp char *fileindex_path, *commit_ref_name = NULL;
3738 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
3740 818c7501 2019-07-11 stsp /* Work tree is locked/unlocked during rebase prepartion/teardown. */
3742 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3744 818c7501 2019-07-11 stsp return err;
3746 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
3748 818c7501 2019-07-11 stsp goto done;
3749 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
3750 818c7501 2019-07-11 stsp if (err) {
3751 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
3752 818c7501 2019-07-11 stsp goto done;
3753 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
3755 818c7501 2019-07-11 stsp goto done;
3756 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
3758 818c7501 2019-07-11 stsp goto done;
3760 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
3763 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
3765 818c7501 2019-07-11 stsp goto done;
3766 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
3767 818c7501 2019-07-11 stsp free(stored_id);
3768 818c7501 2019-07-11 stsp if (cmp != 0) {
3769 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
3770 818c7501 2019-07-11 stsp goto done;
3774 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
3775 818c7501 2019-07-11 stsp parent_commit_id, commit_id, repo, progress_cb, progress_arg,
3776 818c7501 2019-07-11 stsp cancel_cb, cancel_arg);
3778 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
3779 818c7501 2019-07-11 stsp free(fileindex_path);
3780 818c7501 2019-07-11 stsp if (commit_ref)
3781 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
3782 edd02c5e 2019-07-11 stsp return err;
3785 edd02c5e 2019-07-11 stsp static const struct got_error *
3786 edd02c5e 2019-07-11 stsp bump_all_base_commit_ids(struct got_worktree *worktree,
3787 edd02c5e 2019-07-11 stsp struct got_object_id *base_commit_id)
3789 edd02c5e 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
3790 edd02c5e 2019-07-11 stsp struct got_fileindex *fileindex;
3791 edd02c5e 2019-07-11 stsp char *fileindex_path;
3792 edd02c5e 2019-07-11 stsp struct bump_base_commit_id_arg bbc_arg;
3794 edd02c5e 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3796 edd02c5e 2019-07-11 stsp return err;
3798 edd02c5e 2019-07-11 stsp bbc_arg.base_commit_id = base_commit_id;
3799 edd02c5e 2019-07-11 stsp bbc_arg.entry_name = NULL;
3800 edd02c5e 2019-07-11 stsp bbc_arg.path = "";
3801 edd02c5e 2019-07-11 stsp bbc_arg.path_len = 0;
3802 edd02c5e 2019-07-11 stsp bbc_arg.progress_cb = NULL;
3803 edd02c5e 2019-07-11 stsp bbc_arg.progress_arg = NULL;
3804 edd02c5e 2019-07-11 stsp err = got_fileindex_for_each_entry_safe(fileindex,
3805 edd02c5e 2019-07-11 stsp bump_base_commit_id, &bbc_arg);
3807 edd02c5e 2019-07-11 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3808 edd02c5e 2019-07-11 stsp if (sync_err && err == NULL)
3809 edd02c5e 2019-07-11 stsp err = sync_err;
3811 edd02c5e 2019-07-11 stsp got_fileindex_free(fileindex);
3812 edd02c5e 2019-07-11 stsp free(fileindex_path);
3813 818c7501 2019-07-11 stsp return err;
3816 818c7501 2019-07-11 stsp const struct got_error *
3817 818c7501 2019-07-11 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
3818 818c7501 2019-07-11 stsp struct got_worktree *worktree, struct got_reference *tmp_branch,
3819 818c7501 2019-07-11 stsp struct got_commit_object *orig_commit,
3820 818c7501 2019-07-11 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
3822 818c7501 2019-07-11 stsp const struct got_error *err;
3823 818c7501 2019-07-11 stsp char *commit_ref_name = NULL;
3824 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
3825 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
3827 818c7501 2019-07-11 stsp /* Work tree is locked/unlocked during rebase prepartion/teardown. */
3829 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
3831 818c7501 2019-07-11 stsp goto done;
3832 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
3834 818c7501 2019-07-11 stsp goto done;
3835 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
3837 818c7501 2019-07-11 stsp goto done;
3838 818c7501 2019-07-11 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
3839 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
3840 818c7501 2019-07-11 stsp goto done;
3843 818c7501 2019-07-11 stsp err = got_worktree_commit(new_commit_id, worktree, NULL,
3844 818c7501 2019-07-11 stsp got_object_commit_get_author(orig_commit),
3845 818c7501 2019-07-11 stsp got_object_commit_get_committer(orig_commit),
3846 818c7501 2019-07-11 stsp collect_rebase_commit_msg, orig_commit,
3847 818c7501 2019-07-11 stsp rebase_status, NULL, repo);
3848 ff0d2220 2019-07-11 stsp if (err) {
3849 ff0d2220 2019-07-11 stsp if (err->code == GOT_ERR_COMMIT_NO_CHANGES) {
3850 ff0d2220 2019-07-11 stsp /* No-op change; commit will be elided. */
3851 ff0d2220 2019-07-11 stsp err = got_ref_delete(commit_ref, repo);
3853 ff0d2220 2019-07-11 stsp goto done;
3854 ff0d2220 2019-07-11 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
3856 818c7501 2019-07-11 stsp goto done;
3859 edd02c5e 2019-07-11 stsp /* Prevent out-of-date errors during rebase of subsequent commits. */
3860 edd02c5e 2019-07-11 stsp err = bump_all_base_commit_ids(worktree, *new_commit_id);
3862 edd02c5e 2019-07-11 stsp goto done;
3864 818c7501 2019-07-11 stsp err = got_ref_delete(commit_ref, repo);
3866 818c7501 2019-07-11 stsp goto done;
3868 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
3870 818c7501 2019-07-11 stsp free(commit_ref_name);
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 if (err) {
3874 818c7501 2019-07-11 stsp free(*new_commit_id);
3875 818c7501 2019-07-11 stsp *new_commit_id = NULL;
3877 818c7501 2019-07-11 stsp return err;
3880 818c7501 2019-07-11 stsp const struct got_error *
3881 818c7501 2019-07-11 stsp got_worktree_rebase_postpone(struct got_worktree *worktree)
3883 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
3886 69844fba 2019-07-11 stsp static const struct got_error *
3887 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
3889 69844fba 2019-07-11 stsp const struct got_error *err;
3890 69844fba 2019-07-11 stsp struct got_reference *ref;
3892 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
3893 69844fba 2019-07-11 stsp if (err) {
3894 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
3895 69844fba 2019-07-11 stsp return NULL;
3896 69844fba 2019-07-11 stsp return err;
3899 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
3900 69844fba 2019-07-11 stsp got_ref_close(ref);
3901 69844fba 2019-07-11 stsp return err;
3904 69844fba 2019-07-11 stsp static const struct got_error *
3905 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
3907 69844fba 2019-07-11 stsp const struct got_error *err;
3908 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
3909 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
3911 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3913 69844fba 2019-07-11 stsp goto done;
3914 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
3916 69844fba 2019-07-11 stsp goto done;
3918 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
3920 69844fba 2019-07-11 stsp goto done;
3921 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
3923 69844fba 2019-07-11 stsp goto done;
3925 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
3927 69844fba 2019-07-11 stsp goto done;
3928 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
3930 69844fba 2019-07-11 stsp goto done;
3932 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
3934 69844fba 2019-07-11 stsp goto done;
3935 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
3937 69844fba 2019-07-11 stsp goto done;
3940 69844fba 2019-07-11 stsp free(tmp_branch_name);
3941 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
3942 69844fba 2019-07-11 stsp free(branch_ref_name);
3943 69844fba 2019-07-11 stsp free(commit_ref_name);
3944 69844fba 2019-07-11 stsp return err;
3947 818c7501 2019-07-11 stsp const struct got_error *
3948 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
3949 818c7501 2019-07-11 stsp struct got_reference *new_base_branch, struct got_reference *tmp_branch,
3950 818c7501 2019-07-11 stsp struct got_reference *rebased_branch,
3951 818c7501 2019-07-11 stsp struct got_repository *repo)
3953 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
3954 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
3956 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
3958 818c7501 2019-07-11 stsp return err;
3960 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
3962 818c7501 2019-07-11 stsp goto done;
3964 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
3966 818c7501 2019-07-11 stsp goto done;
3968 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
3970 818c7501 2019-07-11 stsp goto done;
3972 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
3974 818c7501 2019-07-11 stsp free(new_head_commit_id);
3975 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3976 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
3977 818c7501 2019-07-11 stsp err = unlockerr;
3978 818c7501 2019-07-11 stsp return err;
3981 818c7501 2019-07-11 stsp struct collect_revertible_paths_arg {
3982 818c7501 2019-07-11 stsp struct got_pathlist_head *revertible_paths;
3983 818c7501 2019-07-11 stsp struct got_worktree *worktree;
3986 818c7501 2019-07-11 stsp static const struct got_error *
3987 818c7501 2019-07-11 stsp collect_revertible_paths(void *arg, unsigned char status, const char *relpath,
3988 818c7501 2019-07-11 stsp struct got_object_id *blob_id, struct got_object_id *commit_id)
3990 818c7501 2019-07-11 stsp struct collect_revertible_paths_arg *a = arg;
3991 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
3992 818c7501 2019-07-11 stsp struct got_pathlist_entry *new = NULL;
3993 818c7501 2019-07-11 stsp char *path = NULL;
3995 818c7501 2019-07-11 stsp if (status != GOT_STATUS_ADD &&
3996 818c7501 2019-07-11 stsp status != GOT_STATUS_DELETE &&
3997 818c7501 2019-07-11 stsp status != GOT_STATUS_MODIFY &&
3998 818c7501 2019-07-11 stsp status != GOT_STATUS_CONFLICT &&
3999 818c7501 2019-07-11 stsp status != GOT_STATUS_MISSING)
4000 818c7501 2019-07-11 stsp return NULL;
4002 818c7501 2019-07-11 stsp if (asprintf(&path, "%s/%s", a->worktree->root_path, relpath) == -1)
4003 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
4005 818c7501 2019-07-11 stsp err = got_pathlist_insert(&new, a->revertible_paths, path, NULL);
4006 818c7501 2019-07-11 stsp if (err || new == NULL)
4007 818c7501 2019-07-11 stsp free(path);
4008 818c7501 2019-07-11 stsp return err;
4011 818c7501 2019-07-11 stsp const struct got_error *
4012 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
4013 818c7501 2019-07-11 stsp struct got_repository *repo, struct got_reference *new_base_branch,
4014 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
4016 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
4017 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
4018 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
4019 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
4020 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
4021 818c7501 2019-07-11 stsp struct got_pathlist_head revertible_paths;
4022 818c7501 2019-07-11 stsp struct got_pathlist_entry *pe;
4023 818c7501 2019-07-11 stsp struct collect_revertible_paths_arg crp_arg;
4024 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
4026 818c7501 2019-07-11 stsp TAILQ_INIT(&revertible_paths);
4028 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
4030 818c7501 2019-07-11 stsp return err;
4032 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
4033 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
4035 818c7501 2019-07-11 stsp goto done;
4037 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
4039 818c7501 2019-07-11 stsp goto done;
4042 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
4043 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
4044 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
4046 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
4048 818c7501 2019-07-11 stsp goto done;
4050 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
4052 818c7501 2019-07-11 stsp goto done;
4054 ca355955 2019-07-12 stsp err = got_object_id_by_path(&tree_id, repo,
4055 ca355955 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
4057 ca355955 2019-07-12 stsp goto done;
4059 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
4061 ca355955 2019-07-12 stsp goto done;
4063 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4065 818c7501 2019-07-11 stsp goto done;
4067 347d1d3e 2019-07-12 stsp crp_arg.revertible_paths = &revertible_paths;
4068 347d1d3e 2019-07-12 stsp crp_arg.worktree = worktree;
4069 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
4070 347d1d3e 2019-07-12 stsp collect_revertible_paths, &crp_arg, NULL, NULL);
4072 55bd499d 2019-07-12 stsp goto done;
4074 818c7501 2019-07-11 stsp TAILQ_FOREACH(pe, &revertible_paths, entry) {
4075 818c7501 2019-07-11 stsp err = revert_file(worktree, fileindex, pe->path,
4076 818c7501 2019-07-11 stsp progress_cb, progress_arg, repo);
4078 ca355955 2019-07-12 stsp goto sync;
4081 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
4082 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
4084 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4085 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
4086 ca355955 2019-07-12 stsp err = sync_err;
4088 818c7501 2019-07-11 stsp got_ref_close(resolved);
4089 a3a2faf2 2019-07-12 stsp free(tree_id);
4090 818c7501 2019-07-11 stsp free(commit_id);
4091 5ade8233 2019-07-12 stsp if (fileindex)
4092 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
4093 818c7501 2019-07-11 stsp free(fileindex_path);
4094 818c7501 2019-07-11 stsp TAILQ_FOREACH(pe, &revertible_paths, entry)
4095 818c7501 2019-07-11 stsp free((char *)pe->path);
4096 818c7501 2019-07-11 stsp got_pathlist_free(&revertible_paths);
4098 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4099 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
4100 818c7501 2019-07-11 stsp err = unlockerr;
4101 818c7501 2019-07-11 stsp return err;
