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 a2e6d162 2019-07-27 stsp err = got_error_path(path, 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 e4b9a50c 2019-07-27 stsp if (fstat(fd, &sb) != 0) {
146 e4b9a50c 2019-07-27 stsp err = got_error_from_errno2("fstat", 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 a2e6d162 2019-07-27 stsp got_error_path(path, GOT_ERR_WORKTREE_META));
161 09fe317a 2018-03-11 stsp if ((*content)[sb.st_size - 1] != '\n') {
162 a2e6d162 2019-07-27 stsp err = got_error_path(path, 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 a2e6d162 2019-07-27 stsp err = got_error_msg(GOT_ERR_WORKTREE_META,
359 a2e6d162 2019-07-27 stsp "could not parse work tree format version number");
362 6d9d28c3 2018-03-11 stsp if (version != GOT_WORKTREE_FORMAT_VERSION) {
363 6d9d28c3 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_VERS);
367 6d9d28c3 2018-03-11 stsp *worktree = calloc(1, sizeof(**worktree));
368 6d9d28c3 2018-03-11 stsp if (*worktree == NULL) {
369 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
372 056e7441 2018-03-11 stsp (*worktree)->lockfd = -1;
374 0647c563 2019-03-11 stsp (*worktree)->root_path = strdup(path);
375 c88eb298 2018-03-11 stsp if ((*worktree)->root_path == NULL) {
376 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
379 cde76477 2018-03-11 stsp err = read_meta_file(&(*worktree)->repo_path, path_got,
380 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_REPOSITORY);
384 7ac97322 2018-03-11 stsp err = read_meta_file(&(*worktree)->path_prefix, path_got,
385 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_PATH_PREFIX);
389 eaccb85f 2018-12-25 stsp err = read_meta_file(&base_commit_id_str, path_got,
390 0f92850e 2018-12-25 stsp GOT_WORKTREE_BASE_COMMIT);
394 c442a90d 2019-03-10 stsp err = read_meta_file(&uuidstr, path_got, GOT_WORKTREE_UUID);
397 c442a90d 2019-03-10 stsp uuid_from_string(uuidstr, &(*worktree)->uuid, &uuid_status);
398 c442a90d 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
399 c442a90d 2019-03-10 stsp err = got_error_uuid(uuid_status);
403 eaccb85f 2018-12-25 stsp err = got_repo_open(&repo, (*worktree)->repo_path);
407 eaccb85f 2018-12-25 stsp err = got_object_resolve_id_str(&(*worktree)->base_commit_id, repo,
408 eaccb85f 2018-12-25 stsp base_commit_id_str);
412 36a38700 2019-05-10 stsp err = read_meta_file(&(*worktree)->head_ref_name, path_got,
413 36a38700 2019-05-10 stsp GOT_WORKTREE_HEAD_REF);
416 eaccb85f 2018-12-25 stsp got_repo_close(repo);
417 7ac97322 2018-03-11 stsp free(path_got);
418 056e7441 2018-03-11 stsp free(path_lock);
419 eaccb85f 2018-12-25 stsp free(base_commit_id_str);
420 c442a90d 2019-03-10 stsp free(uuidstr);
421 bd165944 2019-03-10 stsp free(formatstr);
423 6d9d28c3 2018-03-11 stsp if (fd != -1)
425 6d9d28c3 2018-03-11 stsp if (*worktree != NULL)
426 6d9d28c3 2018-03-11 stsp got_worktree_close(*worktree);
427 6d9d28c3 2018-03-11 stsp *worktree = NULL;
429 056e7441 2018-03-11 stsp (*worktree)->lockfd = fd;
431 6d9d28c3 2018-03-11 stsp return err;
434 247140b2 2019-02-05 stsp const struct got_error *
435 247140b2 2019-02-05 stsp got_worktree_open(struct got_worktree **worktree, const char *path)
437 247140b2 2019-02-05 stsp const struct got_error *err = NULL;
440 247140b2 2019-02-05 stsp err = open_worktree(worktree, path);
441 f02eaa22 2019-03-11 stsp if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT))
442 247140b2 2019-02-05 stsp return err;
443 247140b2 2019-02-05 stsp if (*worktree)
444 247140b2 2019-02-05 stsp return NULL;
445 247140b2 2019-02-05 stsp path = dirname(path);
446 d1542a27 2019-02-05 stsp if (path == NULL)
447 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
448 d1542a27 2019-02-05 stsp } while (!((path[0] == '.' || path[0] == '/') && path[1] == '\0'));
450 247140b2 2019-02-05 stsp return got_error(GOT_ERR_NOT_WORKTREE);
453 3a6ce05a 2019-02-11 stsp const struct got_error *
454 86c3caaf 2018-03-09 stsp got_worktree_close(struct got_worktree *worktree)
456 3a6ce05a 2019-02-11 stsp const struct got_error *err = NULL;
457 c88eb298 2018-03-11 stsp free(worktree->root_path);
458 cde76477 2018-03-11 stsp free(worktree->repo_path);
459 6d9d28c3 2018-03-11 stsp free(worktree->path_prefix);
460 eaccb85f 2018-12-25 stsp free(worktree->base_commit_id);
461 36a38700 2019-05-10 stsp free(worktree->head_ref_name);
462 056e7441 2018-03-11 stsp if (worktree->lockfd != -1)
463 3a6ce05a 2019-02-11 stsp if (close(worktree->lockfd) != 0)
464 638f9024 2019-05-13 stsp err = got_error_from_errno2("close",
465 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree));
466 6d9d28c3 2018-03-11 stsp free(worktree);
467 3a6ce05a 2019-02-11 stsp return err;
470 2fbdb5ae 2018-12-29 stsp const char *
471 c7f4312f 2019-02-05 stsp got_worktree_get_root_path(struct got_worktree *worktree)
473 c7f4312f 2019-02-05 stsp return worktree->root_path;
476 c7f4312f 2019-02-05 stsp const char *
477 86c3caaf 2018-03-09 stsp got_worktree_get_repo_path(struct got_worktree *worktree)
479 2fbdb5ae 2018-12-29 stsp return worktree->repo_path;
482 49520a32 2018-12-29 stsp const char *
483 49520a32 2018-12-29 stsp got_worktree_get_path_prefix(struct got_worktree *worktree)
485 f609be2e 2018-12-29 stsp return worktree->path_prefix;
488 e5dc7198 2018-12-29 stsp const struct got_error *
489 e5dc7198 2018-12-29 stsp got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
490 e5dc7198 2018-12-29 stsp const char *path_prefix)
492 e5dc7198 2018-12-29 stsp char *absprefix = NULL;
494 e5dc7198 2018-12-29 stsp if (!got_path_is_absolute(path_prefix)) {
495 e5dc7198 2018-12-29 stsp if (asprintf(&absprefix, "/%s", path_prefix) == -1)
496 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
498 e5dc7198 2018-12-29 stsp *match = (strcmp(absprefix ? absprefix : path_prefix,
499 e5dc7198 2018-12-29 stsp worktree->path_prefix) == 0);
500 e5dc7198 2018-12-29 stsp free(absprefix);
501 e5dc7198 2018-12-29 stsp return NULL;
504 bc70eb79 2019-05-09 stsp const char *
505 35be1456 2018-03-11 stsp got_worktree_get_head_ref_name(struct got_worktree *worktree)
507 36a38700 2019-05-10 stsp return worktree->head_ref_name;
510 024e9686 2019-05-14 stsp const struct got_error *
511 024e9686 2019-05-14 stsp got_worktree_set_head_ref(struct got_worktree *worktree,
512 024e9686 2019-05-14 stsp struct got_reference *head_ref)
514 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
515 024e9686 2019-05-14 stsp char *path_got = NULL, *head_ref_name = NULL;
517 024e9686 2019-05-14 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
518 024e9686 2019-05-14 stsp GOT_WORKTREE_GOT_DIR) == -1) {
519 024e9686 2019-05-14 stsp err = got_error_from_errno("asprintf");
520 024e9686 2019-05-14 stsp path_got = NULL;
524 024e9686 2019-05-14 stsp head_ref_name = strdup(got_ref_get_name(head_ref));
525 024e9686 2019-05-14 stsp if (head_ref_name == NULL) {
526 024e9686 2019-05-14 stsp err = got_error_from_errno("strdup");
530 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
534 024e9686 2019-05-14 stsp free(worktree->head_ref_name);
535 024e9686 2019-05-14 stsp worktree->head_ref_name = head_ref_name;
537 024e9686 2019-05-14 stsp free(path_got);
539 024e9686 2019-05-14 stsp free(head_ref_name);
540 024e9686 2019-05-14 stsp return err;
543 b72f483a 2019-02-05 stsp struct got_object_id *
544 507dc3bb 2018-12-29 stsp got_worktree_get_base_commit_id(struct got_worktree *worktree)
546 507dc3bb 2018-12-29 stsp return worktree->base_commit_id;
549 507dc3bb 2018-12-29 stsp const struct got_error *
550 507dc3bb 2018-12-29 stsp got_worktree_set_base_commit_id(struct got_worktree *worktree,
551 507dc3bb 2018-12-29 stsp struct got_repository *repo, struct got_object_id *commit_id)
553 507dc3bb 2018-12-29 stsp const struct got_error *err;
554 507dc3bb 2018-12-29 stsp struct got_object *obj = NULL;
555 507dc3bb 2018-12-29 stsp char *id_str = NULL;
556 507dc3bb 2018-12-29 stsp char *path_got = NULL;
558 507dc3bb 2018-12-29 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
559 507dc3bb 2018-12-29 stsp GOT_WORKTREE_GOT_DIR) == -1) {
560 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
561 507dc3bb 2018-12-29 stsp path_got = NULL;
565 507dc3bb 2018-12-29 stsp err = got_object_open(&obj, repo, commit_id);
567 507dc3bb 2018-12-29 stsp return err;
569 507dc3bb 2018-12-29 stsp if (obj->type != GOT_OBJ_TYPE_COMMIT) {
570 507dc3bb 2018-12-29 stsp err = got_error(GOT_ERR_OBJ_TYPE);
574 507dc3bb 2018-12-29 stsp /* Record our base commit. */
575 507dc3bb 2018-12-29 stsp err = got_object_id_str(&id_str, commit_id);
578 507dc3bb 2018-12-29 stsp err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
582 507dc3bb 2018-12-29 stsp free(worktree->base_commit_id);
583 507dc3bb 2018-12-29 stsp worktree->base_commit_id = got_object_id_dup(commit_id);
584 507dc3bb 2018-12-29 stsp if (worktree->base_commit_id == NULL) {
585 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
590 507dc3bb 2018-12-29 stsp got_object_close(obj);
591 507dc3bb 2018-12-29 stsp free(id_str);
592 507dc3bb 2018-12-29 stsp free(path_got);
593 507dc3bb 2018-12-29 stsp return err;
596 9d31a1d8 2018-03-11 stsp static const struct got_error *
597 9d31a1d8 2018-03-11 stsp lock_worktree(struct got_worktree *worktree, int operation)
599 9d31a1d8 2018-03-11 stsp if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
600 9d31a1d8 2018-03-11 stsp return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
601 638f9024 2019-05-13 stsp : got_error_from_errno2("flock",
602 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree)));
603 86c3caaf 2018-03-09 stsp return NULL;
606 21908da4 2019-01-13 stsp static const struct got_error *
607 4a1ddfc2 2019-01-12 stsp add_dir_on_disk(struct got_worktree *worktree, const char *path)
609 4a1ddfc2 2019-01-12 stsp const struct got_error *err = NULL;
610 4a1ddfc2 2019-01-12 stsp char *abspath;
612 4a1ddfc2 2019-01-12 stsp if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
613 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
615 0cd1c46a 2019-03-11 stsp err = got_path_mkdir(abspath);
616 ddcd8544 2019-03-11 stsp if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
617 ddcd8544 2019-03-11 stsp struct stat sb;
618 ddcd8544 2019-03-11 stsp err = NULL;
619 ddcd8544 2019-03-11 stsp if (lstat(abspath, &sb) == -1) {
620 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
621 ddcd8544 2019-03-11 stsp } else if (!S_ISDIR(sb.st_mode)) {
622 ddcd8544 2019-03-11 stsp /* TODO directory is obstructed; do something */
623 ddcd8544 2019-03-11 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
626 4a1ddfc2 2019-01-12 stsp free(abspath);
627 68c76935 2019-02-19 stsp return err;
630 68c76935 2019-02-19 stsp static const struct got_error *
631 68c76935 2019-02-19 stsp check_file_contents_equal(int *same, FILE *f1, FILE *f2)
633 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
634 68c76935 2019-02-19 stsp uint8_t fbuf1[8192];
635 68c76935 2019-02-19 stsp uint8_t fbuf2[8192];
636 68c76935 2019-02-19 stsp size_t flen1 = 0, flen2 = 0;
641 68c76935 2019-02-19 stsp flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
642 68c76935 2019-02-19 stsp if (flen1 == 0 && ferror(f1)) {
643 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
646 68c76935 2019-02-19 stsp flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
647 68c76935 2019-02-19 stsp if (flen2 == 0 && ferror(f2)) {
648 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
651 68c76935 2019-02-19 stsp if (flen1 == 0) {
652 68c76935 2019-02-19 stsp if (flen2 != 0)
655 68c76935 2019-02-19 stsp } else if (flen2 == 0) {
656 68c76935 2019-02-19 stsp if (flen1 != 0)
659 68c76935 2019-02-19 stsp } else if (flen1 == flen2) {
660 68c76935 2019-02-19 stsp if (memcmp(fbuf1, fbuf2, flen2) != 0) {
670 68c76935 2019-02-19 stsp return err;
673 68c76935 2019-02-19 stsp static const struct got_error *
674 68c76935 2019-02-19 stsp check_files_equal(int *same, const char *f1_path, const char *f2_path)
676 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
677 68c76935 2019-02-19 stsp struct stat sb;
678 68c76935 2019-02-19 stsp size_t size1, size2;
679 68c76935 2019-02-19 stsp FILE *f1 = NULL, *f2 = NULL;
683 68c76935 2019-02-19 stsp if (lstat(f1_path, &sb) != 0) {
684 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", f1_path);
687 68c76935 2019-02-19 stsp size1 = sb.st_size;
689 68c76935 2019-02-19 stsp if (lstat(f2_path, &sb) != 0) {
690 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", f2_path);
693 68c76935 2019-02-19 stsp size2 = sb.st_size;
695 68c76935 2019-02-19 stsp if (size1 != size2) {
697 68c76935 2019-02-19 stsp return NULL;
700 68c76935 2019-02-19 stsp f1 = fopen(f1_path, "r");
701 68c76935 2019-02-19 stsp if (f1 == NULL)
702 638f9024 2019-05-13 stsp return got_error_from_errno2("open", f1_path);
704 68c76935 2019-02-19 stsp f2 = fopen(f2_path, "r");
705 68c76935 2019-02-19 stsp if (f2 == NULL) {
706 638f9024 2019-05-13 stsp err = got_error_from_errno2("open", f2_path);
710 68c76935 2019-02-19 stsp err = check_file_contents_equal(same, f1, f2);
712 68c76935 2019-02-19 stsp if (f1 && fclose(f1) != 0 && err == NULL)
713 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
714 68c76935 2019-02-19 stsp if (f2 && fclose(f2) != 0 && err == NULL)
715 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
717 6353ad76 2019-02-08 stsp return err;
721 46b6ee73 2019-06-04 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
722 46b6ee73 2019-06-04 stsp * blob_deriv acts as the first derived version, and the file on disk
723 234035bc 2019-06-01 stsp * acts as the second derived version.
725 6353ad76 2019-02-08 stsp static const struct got_error *
726 234035bc 2019-06-01 stsp merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
727 46b6ee73 2019-06-04 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
728 46b6ee73 2019-06-04 stsp const char *path, uint16_t st_mode, struct got_blob_object *blob_deriv,
729 818c7501 2019-07-11 stsp struct got_object_id *deriv_base_commit_id,
730 234035bc 2019-06-01 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
731 234035bc 2019-06-01 stsp void *progress_arg)
733 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
734 6353ad76 2019-02-08 stsp int merged_fd = -1;
735 46b6ee73 2019-06-04 stsp FILE *f_deriv = NULL, *f_orig = NULL;
736 46b6ee73 2019-06-04 stsp char *blob_deriv_path = NULL, *blob_orig_path = NULL;
737 af54ae4a 2019-02-19 stsp char *merged_path = NULL, *base_path = NULL;
738 6353ad76 2019-02-08 stsp char *id_str = NULL;
739 818c7501 2019-07-11 stsp char *label_deriv = NULL;
740 234035bc 2019-06-01 stsp int overlapcnt = 0;
741 af54ae4a 2019-02-19 stsp char *parent;
743 234035bc 2019-06-01 stsp *local_changes_subsumed = 0;
745 af54ae4a 2019-02-19 stsp parent = dirname(ondisk_path);
746 af54ae4a 2019-02-19 stsp if (parent == NULL)
747 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", ondisk_path);
749 af54ae4a 2019-02-19 stsp if (asprintf(&base_path, "%s/got-merged", parent) == -1)
750 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
752 af54ae4a 2019-02-19 stsp err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
756 af54ae4a 2019-02-19 stsp free(base_path);
757 46b6ee73 2019-06-04 stsp if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
758 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
759 af54ae4a 2019-02-19 stsp base_path = NULL;
763 46b6ee73 2019-06-04 stsp err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
766 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
767 6c4c42e0 2019-06-24 stsp blob_deriv);
771 af54ae4a 2019-02-19 stsp free(base_path);
772 46b6ee73 2019-06-04 stsp if (asprintf(&base_path, "%s/got-merge-blob-orig", parent) == -1) {
773 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
774 af54ae4a 2019-02-19 stsp base_path = NULL;
778 46b6ee73 2019-06-04 stsp err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
781 46b6ee73 2019-06-04 stsp if (blob_orig) {
782 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
783 46b6ee73 2019-06-04 stsp blob_orig);
788 1430b4e0 2019-03-27 stsp * If the file has no blob, this is an "add vs add" conflict,
789 1430b4e0 2019-03-27 stsp * and we simply use an empty ancestor file to make both files
790 1430b4e0 2019-03-27 stsp * appear in the merged result in their entirety.
794 818c7501 2019-07-11 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
797 818c7501 2019-07-11 stsp if (asprintf(&label_deriv, "commit %s", id_str) == -1) {
798 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
802 46b6ee73 2019-06-04 stsp err = got_merge_diff3(&overlapcnt, merged_fd, blob_deriv_path,
803 818c7501 2019-07-11 stsp blob_orig_path, ondisk_path, label_deriv, path);
807 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
808 6353ad76 2019-02-08 stsp overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
812 816dc654 2019-02-16 stsp if (fsync(merged_fd) != 0) {
813 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
817 68c76935 2019-02-19 stsp /* Check if a clean merge has subsumed all local changes. */
818 68c76935 2019-02-19 stsp if (overlapcnt == 0) {
819 46b6ee73 2019-06-04 stsp err = check_files_equal(local_changes_subsumed, blob_deriv_path,
820 68c76935 2019-02-19 stsp merged_path);
825 70a0c8ec 2019-02-20 stsp if (chmod(merged_path, st_mode) != 0) {
826 638f9024 2019-05-13 stsp err = got_error_from_errno2("chmod", merged_path);
830 6353ad76 2019-02-08 stsp if (rename(merged_path, ondisk_path) != 0) {
831 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", merged_path,
832 230a42bd 2019-05-11 jcs ondisk_path);
833 2a57020b 2019-02-20 stsp unlink(merged_path);
838 3a6ce05a 2019-02-11 stsp if (merged_fd != -1 && close(merged_fd) != 0 && err == NULL)
839 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
840 46b6ee73 2019-06-04 stsp if (f_deriv && fclose(f_deriv) != 0 && err == NULL)
841 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
842 46b6ee73 2019-06-04 stsp if (f_orig && fclose(f_orig) != 0 && err == NULL)
843 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
844 6353ad76 2019-02-08 stsp free(merged_path);
845 af54ae4a 2019-02-19 stsp free(base_path);
846 46b6ee73 2019-06-04 stsp if (blob_deriv_path) {
847 46b6ee73 2019-06-04 stsp unlink(blob_deriv_path);
848 46b6ee73 2019-06-04 stsp free(blob_deriv_path);
850 46b6ee73 2019-06-04 stsp if (blob_orig_path) {
851 46b6ee73 2019-06-04 stsp unlink(blob_orig_path);
852 46b6ee73 2019-06-04 stsp free(blob_orig_path);
854 6353ad76 2019-02-08 stsp free(id_str);
855 818c7501 2019-07-11 stsp free(label_deriv);
856 4a1ddfc2 2019-01-12 stsp return err;
859 4a1ddfc2 2019-01-12 stsp static const struct got_error *
860 13d9040b 2019-03-27 stsp update_blob_fileindex_entry(struct got_worktree *worktree,
861 13d9040b 2019-03-27 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
862 13d9040b 2019-03-27 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
863 13d9040b 2019-03-27 stsp int update_timestamps)
865 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
867 13d9040b 2019-03-27 stsp if (ie == NULL)
868 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
870 13d9040b 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path,
871 13d9040b 2019-03-27 stsp blob->id.sha1, worktree->base_commit_id->sha1,
872 13d9040b 2019-03-27 stsp update_timestamps);
874 13d9040b 2019-03-27 stsp struct got_fileindex_entry *new_ie;
875 13d9040b 2019-03-27 stsp err = got_fileindex_entry_alloc(&new_ie, ondisk_path,
876 13d9040b 2019-03-27 stsp path, blob->id.sha1, worktree->base_commit_id->sha1);
878 13d9040b 2019-03-27 stsp err = got_fileindex_entry_add(fileindex, new_ie);
880 13d9040b 2019-03-27 stsp return err;
883 13d9040b 2019-03-27 stsp static const struct got_error *
884 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
885 13d9040b 2019-03-27 stsp const char *path, uint16_t te_mode, uint16_t st_mode,
886 13d9040b 2019-03-27 stsp struct got_blob_object *blob, int restoring_missing_file,
887 a129376b 2019-03-28 stsp int reverting_versioned_file, struct got_repository *repo,
888 a129376b 2019-03-28 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
890 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
891 507dc3bb 2018-12-29 stsp int fd = -1;
892 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
893 507dc3bb 2018-12-29 stsp int update = 0;
894 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
896 c34b20a2 2018-03-12 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
897 9d31a1d8 2018-03-11 stsp GOT_DEFAULT_FILE_MODE);
898 9d31a1d8 2018-03-11 stsp if (fd == -1) {
899 21908da4 2019-01-13 stsp if (errno == ENOENT) {
900 21908da4 2019-01-13 stsp char *parent = dirname(path);
901 21908da4 2019-01-13 stsp if (parent == NULL)
902 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
903 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
905 21908da4 2019-01-13 stsp return err;
906 21908da4 2019-01-13 stsp fd = open(ondisk_path,
907 21908da4 2019-01-13 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
908 21908da4 2019-01-13 stsp GOT_DEFAULT_FILE_MODE);
909 21908da4 2019-01-13 stsp if (fd == -1)
910 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
911 230a42bd 2019-05-11 jcs ondisk_path);
912 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
913 b8f41171 2019-02-10 stsp if (!S_ISREG(st_mode)) {
914 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
915 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
918 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
919 507dc3bb 2018-12-29 stsp ondisk_path);
922 507dc3bb 2018-12-29 stsp update = 1;
925 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
928 a378724f 2019-02-10 stsp if (restoring_missing_file)
929 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING, path);
930 a129376b 2019-03-28 stsp else if (reverting_versioned_file)
931 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT, path);
933 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
934 a378724f 2019-02-10 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
938 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
940 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
941 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
944 9d31a1d8 2018-03-11 stsp if (len > 0) {
945 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
946 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
947 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
948 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
950 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
951 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
954 61d6eaa3 2018-12-24 stsp hdrlen = 0;
956 9d31a1d8 2018-03-11 stsp } while (len != 0);
958 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
959 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
963 507dc3bb 2018-12-29 stsp if (update) {
964 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
965 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
966 230a42bd 2019-05-11 jcs ondisk_path);
967 2a57020b 2019-02-20 stsp unlink(tmppath);
972 b8f41171 2019-02-10 stsp if (te_mode & S_IXUSR) {
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);
978 b8f41171 2019-02-10 stsp if (chmod(ondisk_path, st_mode & ~S_IXUSR) == -1) {
979 638f9024 2019-05-13 stsp err = got_error_from_errno2("chmod", ondisk_path);
985 3a6ce05a 2019-02-11 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
986 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
987 507dc3bb 2018-12-29 stsp free(tmppath);
988 6353ad76 2019-02-08 stsp return err;
991 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
992 6353ad76 2019-02-08 stsp static const struct got_error *
993 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
995 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
996 7154f6ce 2019-03-27 stsp const char *markers[3] = {
997 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
998 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
999 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
1001 7154f6ce 2019-03-27 stsp int i = 0;
1002 7154f6ce 2019-03-27 stsp char *line;
1003 7154f6ce 2019-03-27 stsp size_t len;
1004 7154f6ce 2019-03-27 stsp const char delim[3] = {'\0', '\0', '\0'};
1006 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1007 7154f6ce 2019-03-27 stsp line = fparseln(f, &len, NULL, delim, 0);
1008 7154f6ce 2019-03-27 stsp if (line == NULL) {
1009 7154f6ce 2019-03-27 stsp if (feof(f))
1011 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
1015 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1016 19332e6d 2019-05-13 stsp if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1018 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
1024 7154f6ce 2019-03-27 stsp return err;
1027 e2b1e152 2019-07-13 stsp static int
1028 e2b1e152 2019-07-13 stsp stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1030 e2b1e152 2019-07-13 stsp return !(ie->ctime_sec == sb->st_ctime &&
1031 e2b1e152 2019-07-13 stsp ie->ctime_nsec == sb->st_ctimensec &&
1032 e2b1e152 2019-07-13 stsp ie->mtime_sec == sb->st_mtime &&
1033 e2b1e152 2019-07-13 stsp ie->mtime_nsec == sb->st_mtimensec &&
1034 e2b1e152 2019-07-13 stsp ie->size == (sb->st_size & 0xffffffff));
1037 c363b2c1 2019-08-03 stsp static unsigned char
1038 c363b2c1 2019-08-03 stsp get_staged_status(struct got_fileindex_entry *ie)
1040 c363b2c1 2019-08-03 stsp switch (got_fileindex_entry_stage_get(ie)) {
1041 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_ADD:
1042 c363b2c1 2019-08-03 stsp return GOT_STATUS_ADD;
1043 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_DELETE:
1044 c363b2c1 2019-08-03 stsp return GOT_STATUS_DELETE;
1045 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_MODIFY:
1046 c363b2c1 2019-08-03 stsp return GOT_STATUS_MODIFY;
1048 c363b2c1 2019-08-03 stsp return GOT_STATUS_NO_CHANGE;
1052 7154f6ce 2019-03-27 stsp static const struct got_error *
1053 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1054 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1055 b8f41171 2019-02-10 stsp struct got_repository *repo)
1057 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1058 6353ad76 2019-02-08 stsp struct got_object_id id;
1059 6353ad76 2019-02-08 stsp size_t hdrlen;
1060 6353ad76 2019-02-08 stsp FILE *f = NULL;
1061 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1062 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1063 6353ad76 2019-02-08 stsp size_t flen, blen;
1064 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
1066 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1068 339c298e 2019-07-27 stsp if (lstat(abspath, sb) == -1) {
1069 a378724f 2019-02-10 stsp if (errno == ENOENT) {
1070 abb4604f 2019-07-27 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1071 abb4604f 2019-07-27 stsp *status = GOT_STATUS_MISSING;
1073 abb4604f 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1074 a378724f 2019-02-10 stsp return NULL;
1076 339c298e 2019-07-27 stsp return got_error_from_errno2("lstat", abspath);
1079 339c298e 2019-07-27 stsp if (!S_ISREG(sb->st_mode)) {
1080 339c298e 2019-07-27 stsp *status = GOT_STATUS_OBSTRUCTED;
1081 339c298e 2019-07-27 stsp return NULL;
1084 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1085 339c298e 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1086 339c298e 2019-07-27 stsp return NULL;
1087 244725f2 2019-08-03 stsp } else if (!got_fileindex_entry_has_blob(ie) &&
1088 244725f2 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
1089 339c298e 2019-07-27 stsp *status = GOT_STATUS_ADD;
1090 339c298e 2019-07-27 stsp return NULL;
1093 e2b1e152 2019-07-13 stsp if (!stat_info_differs(ie, sb))
1094 339c298e 2019-07-27 stsp return NULL;
1096 c363b2c1 2019-08-03 stsp if (staged_status == GOT_STATUS_MODIFY ||
1097 c363b2c1 2019-08-03 stsp staged_status == GOT_STATUS_ADD)
1098 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1100 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1102 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1104 339c298e 2019-07-27 stsp return err;
1106 339c298e 2019-07-27 stsp f = fopen(abspath, "r");
1107 6353ad76 2019-02-08 stsp if (f == NULL) {
1108 339c298e 2019-07-27 stsp err = got_error_from_errno2("fopen", abspath);
1109 6353ad76 2019-02-08 stsp goto done;
1111 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1113 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1114 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1116 7154f6ce 2019-03-27 stsp goto done;
1117 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1118 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1119 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1120 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1121 7154f6ce 2019-03-27 stsp goto done;
1123 6353ad76 2019-02-08 stsp if (blen == 0) {
1124 6353ad76 2019-02-08 stsp if (flen != 0)
1125 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1127 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1128 6353ad76 2019-02-08 stsp if (blen != 0)
1129 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1131 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1132 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1133 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1134 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1138 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1141 6353ad76 2019-02-08 stsp hdrlen = 0;
1144 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1145 7154f6ce 2019-03-27 stsp rewind(f);
1146 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1150 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1152 6353ad76 2019-02-08 stsp fclose(f);
1153 9d31a1d8 2018-03-11 stsp return err;
1157 e2b1e152 2019-07-13 stsp * Update timestamps in the file index if a file is unmodified and
1158 e2b1e152 2019-07-13 stsp * we had to run a full content comparison to find out.
1160 e2b1e152 2019-07-13 stsp static const struct got_error *
1161 e2b1e152 2019-07-13 stsp sync_timestamps(char *ondisk_path, unsigned char status,
1162 e2b1e152 2019-07-13 stsp struct got_fileindex_entry *ie, struct stat *sb)
1164 e2b1e152 2019-07-13 stsp if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1165 e2b1e152 2019-07-13 stsp return got_fileindex_entry_update(ie, ondisk_path,
1166 e2b1e152 2019-07-13 stsp ie->blob_sha1, ie->commit_sha1, 1);
1168 e2b1e152 2019-07-13 stsp return NULL;
1171 9d31a1d8 2018-03-11 stsp static const struct got_error *
1172 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1173 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1174 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1175 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1176 0584f854 2019-04-06 stsp void *progress_arg)
1178 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1179 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1180 6353ad76 2019-02-08 stsp char *ondisk_path;
1181 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1182 b8f41171 2019-02-10 stsp struct stat sb;
1184 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1185 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1188 abb4604f 2019-07-27 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1190 abb4604f 2019-07-27 stsp goto done;
1191 abb4604f 2019-07-27 stsp if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1192 abb4604f 2019-07-27 stsp sb.st_mode = got_fileindex_perms_to_st(ie);
1194 abb4604f 2019-07-27 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
1196 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1197 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1198 b8f41171 2019-02-10 stsp goto done;
1201 b8f41171 2019-02-10 stsp if (ie && status != GOT_STATUS_MISSING) {
1202 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1203 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1204 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1205 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1207 e2b1e152 2019-07-13 stsp goto done;
1208 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1210 6353ad76 2019-02-08 stsp goto done;
1212 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1213 1430b4e0 2019-03-27 stsp memcmp(ie->blob_sha1, te->id->sha1,
1214 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1215 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1216 b8f41171 2019-02-10 stsp goto done;
1220 8da9e5f4 2019-01-12 stsp err = got_object_open_as_blob(&blob, repo, te->id, 8192);
1222 6353ad76 2019-02-08 stsp goto done;
1224 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1225 234035bc 2019-06-01 stsp int update_timestamps;
1226 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1227 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1228 234035bc 2019-06-01 stsp struct got_object_id id2;
1229 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1230 234035bc 2019-06-01 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1232 234035bc 2019-06-01 stsp goto done;
1234 234035bc 2019-06-01 stsp err = merge_blob(&update_timestamps, worktree, blob2,
1235 818c7501 2019-07-11 stsp ondisk_path, path, sb.st_mode, blob,
1236 818c7501 2019-07-11 stsp worktree->base_commit_id, repo,
1237 234035bc 2019-06-01 stsp progress_cb, progress_arg);
1238 234035bc 2019-06-01 stsp if (blob2)
1239 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
1241 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
1242 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
1243 234035bc 2019-06-01 stsp * unmodified files again.
1245 234035bc 2019-06-01 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1246 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
1247 234035bc 2019-06-01 stsp update_timestamps);
1248 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
1249 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1251 1ee397ad 2019-07-12 stsp goto done;
1252 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1253 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 0);
1255 13d9040b 2019-03-27 stsp goto done;
1257 13d9040b 2019-03-27 stsp err = install_blob(worktree, ondisk_path, path, te->mode,
1258 a129376b 2019-03-28 stsp sb.st_mode, blob, status == GOT_STATUS_MISSING, 0,
1259 a129376b 2019-03-28 stsp repo, progress_cb, progress_arg);
1261 13d9040b 2019-03-27 stsp goto done;
1262 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1263 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 1);
1265 13d9040b 2019-03-27 stsp goto done;
1267 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
1269 6353ad76 2019-02-08 stsp free(ondisk_path);
1270 8da9e5f4 2019-01-12 stsp return err;
1273 90285c3b 2019-01-08 stsp static const struct got_error *
1274 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
1276 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
1277 90285c3b 2019-01-08 stsp char *ondisk_path = NULL;
1279 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
1280 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1282 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
1283 c97665ae 2019-01-13 stsp if (errno != ENOENT)
1284 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
1286 90285c3b 2019-01-08 stsp char *parent = dirname(ondisk_path);
1287 7a9df742 2019-01-08 stsp while (parent && strcmp(parent, root_path) != 0) {
1288 26c4ac4d 2019-01-08 stsp if (rmdir(parent) == -1) {
1289 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
1290 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
1294 90285c3b 2019-01-08 stsp parent = dirname(parent);
1297 90285c3b 2019-01-08 stsp free(ondisk_path);
1298 90285c3b 2019-01-08 stsp return err;
1301 708d8e67 2019-03-27 stsp static const struct got_error *
1302 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
1303 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
1304 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1306 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
1307 708d8e67 2019-03-27 stsp unsigned char status;
1308 708d8e67 2019-03-27 stsp struct stat sb;
1309 708d8e67 2019-03-27 stsp char *ondisk_path;
1311 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
1313 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1315 708d8e67 2019-03-27 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1317 708d8e67 2019-03-27 stsp return err;
1319 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
1320 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
1321 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
1323 1ee397ad 2019-07-12 stsp return err;
1325 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
1326 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
1328 fc6346c4 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
1331 708d8e67 2019-03-27 stsp return err;
1333 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
1335 1ee397ad 2019-07-12 stsp return err;
1336 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
1337 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
1339 fc6346c4 2019-03-27 stsp return err;
1341 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
1344 fc6346c4 2019-03-27 stsp return err;
1347 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
1348 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
1349 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
1350 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
1351 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
1352 8da9e5f4 2019-01-12 stsp void *progress_arg;
1353 8da9e5f4 2019-01-12 stsp got_worktree_cancel_cb cancel_cb;
1354 8da9e5f4 2019-01-12 stsp void *cancel_arg;
1357 512f0d0e 2019-01-02 stsp static const struct got_error *
1358 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
1359 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
1361 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1363 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1364 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1366 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
1367 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
1370 8da9e5f4 2019-01-12 stsp static const struct got_error *
1371 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1373 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1375 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1376 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1378 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
1379 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1382 9d31a1d8 2018-03-11 stsp static const struct got_error *
1383 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
1385 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1386 8da9e5f4 2019-01-12 stsp const struct got_error *err;
1387 8da9e5f4 2019-01-12 stsp char *path;
1389 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1390 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1392 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
1393 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
1395 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1397 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
1398 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
1400 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
1401 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1403 8da9e5f4 2019-01-12 stsp free(path);
1404 0cd1c46a 2019-03-11 stsp return err;
1407 818c7501 2019-07-11 stsp static const struct got_error *
1408 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
1410 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
1411 0647c563 2019-03-11 stsp char *uuidstr = NULL;
1412 0cd1c46a 2019-03-11 stsp uint32_t uuid_status;
1414 517bab73 2019-03-11 stsp *refname = NULL;
1416 0cd1c46a 2019-03-11 stsp uuid_to_string(&worktree->uuid, &uuidstr, &uuid_status);
1417 0cd1c46a 2019-03-11 stsp if (uuid_status != uuid_s_ok)
1418 0cd1c46a 2019-03-11 stsp return got_error_uuid(uuid_status);
1420 818c7501 2019-07-11 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr)
1422 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1423 0647c563 2019-03-11 stsp *refname = NULL;
1425 517bab73 2019-03-11 stsp free(uuidstr);
1426 517bab73 2019-03-11 stsp return err;
1429 818c7501 2019-07-11 stsp const struct got_error *
1430 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
1432 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
1435 818c7501 2019-07-11 stsp static const struct got_error *
1436 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
1438 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1439 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
1442 818c7501 2019-07-11 stsp static const struct got_error *
1443 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
1445 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
1448 818c7501 2019-07-11 stsp static const struct got_error *
1449 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
1451 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1452 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
1455 818c7501 2019-07-11 stsp static const struct got_error *
1456 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
1458 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1459 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
1462 0ebf8283 2019-07-24 stsp static const struct got_error *
1463 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
1465 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1466 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
1469 0ebf8283 2019-07-24 stsp static const struct got_error *
1470 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
1472 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1473 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
1476 0ebf8283 2019-07-24 stsp static const struct got_error *
1477 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
1479 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1480 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
1483 0ebf8283 2019-07-24 stsp static const struct got_error *
1484 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
1486 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1487 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
1490 0ebf8283 2019-07-24 stsp const struct got_error *
1491 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
1492 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
1494 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
1495 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
1496 0ebf8283 2019-07-24 stsp *path = NULL;
1497 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
1499 0ebf8283 2019-07-24 stsp return NULL;
1503 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
1504 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
1506 517bab73 2019-03-11 stsp static const struct got_error *
1507 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
1509 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
1510 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
1511 517bab73 2019-03-11 stsp char *refname;
1513 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
1515 517bab73 2019-03-11 stsp return err;
1517 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
1519 0cd1c46a 2019-03-11 stsp goto done;
1521 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
1523 0cd1c46a 2019-03-11 stsp free(refname);
1525 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
1526 3e3a69f1 2019-07-25 stsp return err;
1529 3e3a69f1 2019-07-25 stsp static const struct got_error *
1530 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
1532 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
1534 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
1535 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1536 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
1537 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
1539 9d31a1d8 2018-03-11 stsp return err;
1543 ebf99748 2019-05-09 stsp static const struct got_error *
1544 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
1545 ebf99748 2019-05-09 stsp struct got_worktree *worktree)
1547 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
1548 ebf99748 2019-05-09 stsp FILE *index = NULL;
1550 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1551 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
1552 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
1553 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
1555 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
1557 ebf99748 2019-05-09 stsp goto done;
1559 ebf99748 2019-05-09 stsp index = fopen(*fileindex_path, "rb");
1560 ebf99748 2019-05-09 stsp if (index == NULL) {
1561 ebf99748 2019-05-09 stsp if (errno != ENOENT)
1562 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
1564 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
1565 ebf99748 2019-05-09 stsp if (fclose(index) != 0 && err == NULL)
1566 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
1569 ebf99748 2019-05-09 stsp if (err) {
1570 ebf99748 2019-05-09 stsp free(*fileindex_path);
1571 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1572 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
1573 ebf99748 2019-05-09 stsp *fileindex = NULL;
1575 ebf99748 2019-05-09 stsp return err;
1578 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
1579 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
1580 c932eeeb 2019-05-22 stsp const char *path;
1581 c932eeeb 2019-05-22 stsp size_t path_len;
1582 c932eeeb 2019-05-22 stsp const char *entry_name;
1583 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
1584 a484d721 2019-06-10 stsp void *progress_arg;
1587 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
1588 c932eeeb 2019-05-22 stsp static const struct got_error *
1589 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
1591 1ee397ad 2019-07-12 stsp const struct got_error *err;
1592 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
1594 c932eeeb 2019-05-22 stsp if (a->entry_name) {
1595 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
1596 c932eeeb 2019-05-22 stsp return NULL;
1597 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
1598 102ff934 2019-06-11 stsp return NULL;
1600 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
1601 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
1602 c932eeeb 2019-05-22 stsp return NULL;
1604 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
1605 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
1606 edd02c5e 2019-07-11 stsp ie->path);
1608 1ee397ad 2019-07-12 stsp return err;
1610 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
1611 c932eeeb 2019-05-22 stsp return NULL;
1614 9c6338c4 2019-06-02 stsp static const struct got_error *
1615 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
1617 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
1618 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
1619 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
1621 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
1622 9c6338c4 2019-06-02 stsp fileindex_path);
1624 9c6338c4 2019-06-02 stsp goto done;
1626 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
1628 9c6338c4 2019-06-02 stsp goto done;
1630 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
1631 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
1632 9c6338c4 2019-06-02 stsp fileindex_path);
1633 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
1636 9c6338c4 2019-06-02 stsp if (new_index)
1637 9c6338c4 2019-06-02 stsp fclose(new_index);
1638 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
1639 9c6338c4 2019-06-02 stsp return err;
1642 6ced4176 2019-07-12 stsp static const struct got_error *
1643 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
1644 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
1645 6ced4176 2019-07-12 stsp struct got_worktree *worktree, struct got_repository *repo)
1647 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
1648 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
1649 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
1650 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
1652 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
1653 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
1654 6ced4176 2019-07-12 stsp *tree_id = NULL;
1656 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
1657 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
1658 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
1659 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
1660 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1661 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1662 6ced4176 2019-07-12 stsp goto done;
1664 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
1665 6ced4176 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
1667 6ced4176 2019-07-12 stsp goto done;
1668 6ced4176 2019-07-12 stsp return NULL;
1671 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
1673 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
1674 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
1675 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
1676 6ced4176 2019-07-12 stsp goto done;
1679 6ced4176 2019-07-12 stsp err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
1680 6ced4176 2019-07-12 stsp in_repo_path);
1682 6ced4176 2019-07-12 stsp goto done;
1684 6ced4176 2019-07-12 stsp free(in_repo_path);
1685 6ced4176 2019-07-12 stsp in_repo_path = NULL;
1687 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
1689 6ced4176 2019-07-12 stsp goto done;
1691 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
1692 6ced4176 2019-07-12 stsp /* Check out a single file. */
1693 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
1694 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
1695 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
1696 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
1697 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1698 6ced4176 2019-07-12 stsp goto done;
1700 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
1701 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1702 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1703 6ced4176 2019-07-12 stsp goto done;
1706 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
1707 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
1709 6ced4176 2019-07-12 stsp return err;
1710 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
1711 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
1712 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
1713 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
1714 6ced4176 2019-07-12 stsp goto done;
1717 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
1718 6ced4176 2019-07-12 stsp worktree->base_commit_id, in_repo_path);
1720 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
1721 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
1722 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
1723 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
1724 6ced4176 2019-07-12 stsp goto done;
1726 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
1727 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1728 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1729 6ced4176 2019-07-12 stsp goto done;
1734 6ced4176 2019-07-12 stsp free(in_repo_path);
1735 6ced4176 2019-07-12 stsp if (err) {
1736 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
1737 6ced4176 2019-07-12 stsp free(*tree_relpath);
1738 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
1739 6ced4176 2019-07-12 stsp free(*tree_id);
1740 6ced4176 2019-07-12 stsp *tree_id = NULL;
1742 07ed472d 2019-07-12 stsp return err;
1745 07ed472d 2019-07-12 stsp static const struct got_error *
1746 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
1747 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
1748 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1749 07ed472d 2019-07-12 stsp void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1751 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
1752 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
1753 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
1754 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
1755 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
1757 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
1759 07ed472d 2019-07-12 stsp goto done;
1761 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
1762 07ed472d 2019-07-12 stsp worktree->base_commit_id);
1764 07ed472d 2019-07-12 stsp goto done;
1766 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1768 07ed472d 2019-07-12 stsp goto done;
1770 07ed472d 2019-07-12 stsp if (entry_name &&
1771 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
1772 07ed472d 2019-07-12 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
1773 07ed472d 2019-07-12 stsp goto done;
1776 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
1777 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
1778 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
1779 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
1780 07ed472d 2019-07-12 stsp arg.worktree = worktree;
1781 07ed472d 2019-07-12 stsp arg.repo = repo;
1782 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
1783 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
1784 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
1785 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
1786 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
1787 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
1790 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
1791 07ed472d 2019-07-12 stsp if (commit)
1792 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
1793 6ced4176 2019-07-12 stsp return err;
1796 9d31a1d8 2018-03-11 stsp const struct got_error *
1797 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
1798 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
1799 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
1800 f2ea84fa 2019-07-27 stsp got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1802 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
1803 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
1804 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
1805 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
1806 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
1807 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
1808 f2ea84fa 2019-07-27 stsp struct tree_path_data {
1809 f2ea84fa 2019-07-27 stsp SIMPLEQ_ENTRY(tree_path_data) entry;
1810 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
1811 f2ea84fa 2019-07-27 stsp int entry_type;
1812 f2ea84fa 2019-07-27 stsp char *relpath;
1813 f2ea84fa 2019-07-27 stsp char *entry_name;
1814 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
1815 f2ea84fa 2019-07-27 stsp SIMPLEQ_HEAD(tree_paths, tree_path_data) tree_paths;
1817 f2ea84fa 2019-07-27 stsp SIMPLEQ_INIT(&tree_paths);
1819 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
1821 9d31a1d8 2018-03-11 stsp return err;
1823 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
1824 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
1825 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
1826 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
1827 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
1828 f2ea84fa 2019-07-27 stsp goto done;
1831 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
1832 f2ea84fa 2019-07-27 stsp &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
1833 f2ea84fa 2019-07-27 stsp if (err) {
1834 f2ea84fa 2019-07-27 stsp free(tpd);
1835 6ced4176 2019-07-12 stsp goto done;
1838 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
1839 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
1840 f2ea84fa 2019-07-27 stsp if (err) {
1841 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
1842 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
1843 f2ea84fa 2019-07-27 stsp free(tpd);
1844 f2ea84fa 2019-07-27 stsp goto done;
1847 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
1849 f2ea84fa 2019-07-27 stsp SIMPLEQ_INSERT_TAIL(&tree_paths, tpd, entry);
1853 51514078 2018-12-25 stsp * Read the file index.
1854 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
1855 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
1857 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
1859 c4cdcb68 2019-04-03 stsp goto done;
1861 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
1862 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
1863 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
1865 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
1866 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
1867 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
1871 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
1872 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
1873 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
1874 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
1875 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
1876 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
1877 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
1878 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
1882 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_NEXT(tpd, entry);
1884 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
1885 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
1886 af12c6b9 2019-06-04 stsp err = sync_err;
1888 9c6338c4 2019-06-02 stsp free(fileindex_path);
1890 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
1891 9d31a1d8 2018-03-11 stsp if (commit)
1892 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
1893 5ade8233 2019-07-12 stsp if (fileindex)
1894 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
1895 f2ea84fa 2019-07-27 stsp while (!SIMPLEQ_EMPTY(&tree_paths)) {
1896 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
1897 f2ea84fa 2019-07-27 stsp SIMPLEQ_REMOVE_HEAD(&tree_paths, entry);
1898 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
1899 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
1900 f2ea84fa 2019-07-27 stsp free(tpd);
1902 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
1903 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
1904 9d31a1d8 2018-03-11 stsp err = unlockerr;
1905 f8d1f275 2019-02-04 stsp return err;
1908 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
1909 234035bc 2019-06-01 stsp struct got_worktree *worktree;
1910 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
1911 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
1912 234035bc 2019-06-01 stsp void *progress_arg;
1913 234035bc 2019-06-01 stsp got_worktree_cancel_cb cancel_cb;
1914 234035bc 2019-06-01 stsp void *cancel_arg;
1915 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
1918 234035bc 2019-06-01 stsp static const struct got_error *
1919 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
1920 234035bc 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
1921 234035bc 2019-06-01 stsp struct got_object_id *id2, const char *path1, const char *path2,
1922 234035bc 2019-06-01 stsp struct got_repository *repo)
1924 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
1925 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
1926 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
1927 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
1928 234035bc 2019-06-01 stsp struct stat sb;
1929 234035bc 2019-06-01 stsp unsigned char status;
1930 234035bc 2019-06-01 stsp int local_changes_subsumed;
1932 234035bc 2019-06-01 stsp if (blob1 && blob2) {
1933 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
1934 d6c87207 2019-08-02 stsp strlen(path2));
1935 1ee397ad 2019-07-12 stsp if (ie == NULL)
1936 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
1937 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
1939 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1940 234035bc 2019-06-01 stsp path2) == -1)
1941 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
1943 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1945 234035bc 2019-06-01 stsp goto done;
1947 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
1948 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
1949 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
1950 234035bc 2019-06-01 stsp goto done;
1952 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
1953 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
1954 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
1955 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
1956 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
1957 234035bc 2019-06-01 stsp goto done;
1960 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree, blob1,
1961 818c7501 2019-07-11 stsp ondisk_path, path2, sb.st_mode, blob2, a->commit_id2, repo,
1962 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
1963 234035bc 2019-06-01 stsp } else if (blob1) {
1964 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
1965 d6c87207 2019-08-02 stsp strlen(path1));
1966 1ee397ad 2019-07-12 stsp if (ie == NULL)
1967 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
1968 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
1970 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1971 2b92fad7 2019-06-02 stsp path1) == -1)
1972 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
1974 2b92fad7 2019-06-02 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1976 2b92fad7 2019-06-02 stsp goto done;
1978 2b92fad7 2019-06-02 stsp switch (status) {
1979 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
1980 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
1981 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
1983 1ee397ad 2019-07-12 stsp goto done;
1984 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
1986 2b92fad7 2019-06-02 stsp goto done;
1988 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
1990 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
1991 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
1992 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
1993 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
1995 1ee397ad 2019-07-12 stsp goto done;
1997 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
1999 2b92fad7 2019-06-02 stsp case GOT_STATUS_ADD:
2000 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
2001 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
2002 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2003 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
2005 1ee397ad 2019-07-12 stsp goto done;
2007 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
2008 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
2010 1ee397ad 2019-07-12 stsp goto done;
2015 234035bc 2019-06-01 stsp } else if (blob2) {
2016 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2017 234035bc 2019-06-01 stsp path2) == -1)
2018 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2019 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2020 d6c87207 2019-08-02 stsp strlen(path2));
2022 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
2025 234035bc 2019-06-01 stsp goto done;
2026 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2027 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2028 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2029 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2030 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2031 1ee397ad 2019-07-12 stsp status, path2);
2032 234035bc 2019-06-01 stsp goto done;
2034 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
2035 818c7501 2019-07-11 stsp NULL, ondisk_path, path2, sb.st_mode, blob2,
2036 818c7501 2019-07-11 stsp a->commit_id2, repo,
2037 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
2038 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2039 234035bc 2019-06-01 stsp err = update_blob_fileindex_entry(a->worktree,
2040 234035bc 2019-06-01 stsp a->fileindex, ie, ondisk_path, ie->path,
2041 234035bc 2019-06-01 stsp blob2, 0);
2043 234035bc 2019-06-01 stsp goto done;
2046 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2047 234035bc 2019-06-01 stsp err = install_blob(a->worktree, ondisk_path, path2,
2048 234035bc 2019-06-01 stsp /* XXX get this from parent tree! */
2049 234035bc 2019-06-01 stsp GOT_DEFAULT_FILE_MODE,
2050 234035bc 2019-06-01 stsp sb.st_mode, blob2, 0, 0, repo,
2051 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
2053 234035bc 2019-06-01 stsp goto done;
2054 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_alloc(&ie,
2055 2b92fad7 2019-06-02 stsp ondisk_path, path2, NULL, NULL);
2057 234035bc 2019-06-01 stsp goto done;
2058 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
2059 2b92fad7 2019-06-02 stsp if (err) {
2060 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
2061 2b92fad7 2019-06-02 stsp goto done;
2066 234035bc 2019-06-01 stsp free(ondisk_path);
2067 234035bc 2019-06-01 stsp return err;
2070 234035bc 2019-06-01 stsp struct check_merge_ok_arg {
2071 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2072 234035bc 2019-06-01 stsp struct got_repository *repo;
2075 234035bc 2019-06-01 stsp static const struct got_error *
2076 234035bc 2019-06-01 stsp check_merge_ok(void *arg, struct got_fileindex_entry *ie)
2078 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
2079 234035bc 2019-06-01 stsp struct check_merge_ok_arg *a = arg;
2080 234035bc 2019-06-01 stsp unsigned char status;
2081 234035bc 2019-06-01 stsp struct stat sb;
2082 234035bc 2019-06-01 stsp char *ondisk_path;
2084 234035bc 2019-06-01 stsp /* Reject merges into a work tree with mixed base commits. */
2085 234035bc 2019-06-01 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
2086 234035bc 2019-06-01 stsp SHA1_DIGEST_LENGTH))
2087 234035bc 2019-06-01 stsp return got_error(GOT_ERR_MIXED_COMMITS);
2089 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
2091 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2093 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
2094 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
2096 234035bc 2019-06-01 stsp return err;
2097 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
2098 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
2100 234035bc 2019-06-01 stsp return NULL;
2103 818c7501 2019-07-11 stsp static const struct got_error *
2104 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2105 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
2106 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
2107 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2108 818c7501 2019-07-11 stsp got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2110 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
2111 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
2112 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2113 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
2115 03415a1a 2019-06-02 stsp if (commit_id1) {
2116 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
2117 03415a1a 2019-06-02 stsp worktree->path_prefix);
2119 03415a1a 2019-06-02 stsp goto done;
2121 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
2123 03415a1a 2019-06-02 stsp goto done;
2126 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
2127 234035bc 2019-06-01 stsp worktree->path_prefix);
2129 234035bc 2019-06-01 stsp goto done;
2131 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
2133 234035bc 2019-06-01 stsp goto done;
2135 234035bc 2019-06-01 stsp arg.worktree = worktree;
2136 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
2137 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
2138 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
2139 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
2140 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
2141 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
2142 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
2143 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2144 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2145 af12c6b9 2019-06-04 stsp err = sync_err;
2147 234035bc 2019-06-01 stsp if (tree1)
2148 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
2149 234035bc 2019-06-01 stsp if (tree2)
2150 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
2151 818c7501 2019-07-11 stsp return err;
2154 818c7501 2019-07-11 stsp const struct got_error *
2155 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
2156 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
2157 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2158 818c7501 2019-07-11 stsp void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2160 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
2161 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
2162 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
2163 818c7501 2019-07-11 stsp struct check_merge_ok_arg mok_arg;
2165 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
2167 818c7501 2019-07-11 stsp return err;
2169 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2171 818c7501 2019-07-11 stsp goto done;
2173 818c7501 2019-07-11 stsp mok_arg.worktree = worktree;
2174 818c7501 2019-07-11 stsp mok_arg.repo = repo;
2175 818c7501 2019-07-11 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
2176 818c7501 2019-07-11 stsp &mok_arg);
2178 818c7501 2019-07-11 stsp goto done;
2180 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
2181 818c7501 2019-07-11 stsp commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
2183 818c7501 2019-07-11 stsp if (fileindex)
2184 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
2185 818c7501 2019-07-11 stsp free(fileindex_path);
2186 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2187 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
2188 234035bc 2019-06-01 stsp err = unlockerr;
2189 234035bc 2019-06-01 stsp return err;
2192 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
2193 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
2194 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
2195 927df6b7 2019-02-10 stsp const char *status_path;
2196 927df6b7 2019-02-10 stsp size_t status_path_len;
2197 f8d1f275 2019-02-04 stsp struct got_repository *repo;
2198 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
2199 f8d1f275 2019-02-04 stsp void *status_arg;
2200 f8d1f275 2019-02-04 stsp got_worktree_cancel_cb cancel_cb;
2201 f8d1f275 2019-02-04 stsp void *cancel_arg;
2204 f8d1f275 2019-02-04 stsp static const struct got_error *
2205 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
2206 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
2207 927df6b7 2019-02-10 stsp struct got_repository *repo)
2209 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
2210 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
2211 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
2212 927df6b7 2019-02-10 stsp struct stat sb;
2213 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
2215 927df6b7 2019-02-10 stsp err = get_file_status(&status, &sb, ie, abspath, repo);
2216 c363b2c1 2019-08-03 stsp if (err == NULL && (status != GOT_STATUS_NO_CHANGE ||
2217 c363b2c1 2019-08-03 stsp staged_status != GOT_STATUS_NO_CHANGE)) {
2218 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2219 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2220 537ac44b 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
2221 537ac44b 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
2222 537ac44b 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
2223 537ac44b 2019-08-03 stsp SHA1_DIGEST_LENGTH);
2224 537ac44b 2019-08-03 stsp err = (*status_cb)(status_arg, status, staged_status,
2225 537ac44b 2019-08-03 stsp ie->path, &blob_id, &staged_blob_id, &commit_id);
2227 537ac44b 2019-08-03 stsp err = (*status_cb)(status_arg, status, staged_status,
2228 537ac44b 2019-08-03 stsp ie->path, &blob_id, NULL, &commit_id);
2230 927df6b7 2019-02-10 stsp return err;
2233 927df6b7 2019-02-10 stsp static const struct got_error *
2234 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
2235 f8d1f275 2019-02-04 stsp struct dirent *de, const char *parent_path)
2237 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2238 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2239 f8d1f275 2019-02-04 stsp char *abspath;
2241 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2242 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2244 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
2245 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
2246 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
2247 927df6b7 2019-02-10 stsp return NULL;
2249 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2250 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
2251 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
2252 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2254 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
2255 f8d1f275 2019-02-04 stsp de->d_name) == -1)
2256 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2259 927df6b7 2019-02-10 stsp err = report_file_status(ie, abspath, a->status_cb, a->status_arg,
2261 f8d1f275 2019-02-04 stsp free(abspath);
2262 9d31a1d8 2018-03-11 stsp return err;
2265 f8d1f275 2019-02-04 stsp static const struct got_error *
2266 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2268 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2269 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
2270 2ec1f75b 2019-03-26 stsp unsigned char status;
2272 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2273 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2275 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
2276 927df6b7 2019-02-10 stsp return NULL;
2278 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2279 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2280 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
2281 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
2283 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
2284 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
2285 537ac44b 2019-08-03 stsp ie->path, &blob_id, NULL, &commit_id);
2288 f8d1f275 2019-02-04 stsp static const struct got_error *
2289 f8d1f275 2019-02-04 stsp status_new(void *arg, struct dirent *de, const char *parent_path)
2291 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
2292 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2293 f8d1f275 2019-02-04 stsp char *path = NULL;
2295 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2296 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2298 f8d1f275 2019-02-04 stsp if (de->d_type == DT_DIR)
2299 2c201a36 2019-02-10 stsp return NULL;
2301 2c201a36 2019-02-10 stsp /* XXX ignore symlinks for now */
2302 2c201a36 2019-02-10 stsp if (de->d_type == DT_LNK)
2303 927df6b7 2019-02-10 stsp return NULL;
2305 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2306 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
2307 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2309 f8d1f275 2019-02-04 stsp path = de->d_name;
2312 c577a9ce 2019-07-27 stsp if (got_path_is_child(path, a->status_path, a->status_path_len))
2313 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
2314 537ac44b 2019-08-03 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL);
2315 f8d1f275 2019-02-04 stsp if (parent_path[0])
2316 f8d1f275 2019-02-04 stsp free(path);
2317 b72f483a 2019-02-05 stsp return err;
2320 347d1d3e 2019-07-12 stsp static const struct got_error *
2321 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
2322 abb4604f 2019-07-27 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
2323 abb4604f 2019-07-27 stsp void *status_arg, struct got_repository *repo)
2325 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
2326 abb4604f 2019-07-27 stsp struct stat sb;
2328 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
2330 abb4604f 2019-07-27 stsp return report_file_status(ie, ondisk_path, status_cb,
2331 abb4604f 2019-07-27 stsp status_arg, repo);
2333 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
2334 abb4604f 2019-07-27 stsp if (errno != ENOENT)
2335 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
2336 abb4604f 2019-07-27 stsp return NULL;
2339 abb4604f 2019-07-27 stsp if (S_ISREG(sb.st_mode))
2340 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
2341 537ac44b 2019-08-03 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL);
2343 abb4604f 2019-07-27 stsp return NULL;
2346 abb4604f 2019-07-27 stsp static const struct got_error *
2347 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
2348 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
2349 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
2350 347d1d3e 2019-07-12 stsp got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2352 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2353 f8d1f275 2019-02-04 stsp DIR *workdir = NULL;
2354 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
2355 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
2356 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
2358 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
2359 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
2360 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
2362 927df6b7 2019-02-10 stsp workdir = opendir(ondisk_path);
2363 927df6b7 2019-02-10 stsp if (workdir == NULL) {
2364 abb4604f 2019-07-27 stsp if (errno != ENOTDIR && errno != ENOENT)
2365 638f9024 2019-05-13 stsp err = got_error_from_errno2("opendir", ondisk_path);
2367 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
2368 abb4604f 2019-07-27 stsp fileindex, status_cb, status_arg, repo);
2370 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
2371 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
2372 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
2373 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
2374 abb4604f 2019-07-27 stsp arg.worktree = worktree;
2375 abb4604f 2019-07-27 stsp arg.status_path = path;
2376 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
2377 abb4604f 2019-07-27 stsp arg.repo = repo;
2378 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
2379 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
2380 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
2381 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
2382 abb4604f 2019-07-27 stsp err = got_fileindex_diff_dir(fileindex, workdir,
2383 abb4604f 2019-07-27 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
2386 f8d1f275 2019-02-04 stsp if (workdir)
2387 f8d1f275 2019-02-04 stsp closedir(workdir);
2388 927df6b7 2019-02-10 stsp free(ondisk_path);
2389 347d1d3e 2019-07-12 stsp return err;
2392 347d1d3e 2019-07-12 stsp const struct got_error *
2393 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
2394 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2395 72ea6654 2019-07-27 stsp got_worktree_status_cb status_cb, void *status_arg,
2396 72ea6654 2019-07-27 stsp got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2398 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
2399 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
2400 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
2401 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
2403 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2405 347d1d3e 2019-07-12 stsp return err;
2407 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2408 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
2409 72ea6654 2019-07-27 stsp status_cb, status_arg, cancel_cb, cancel_arg);
2413 f8d1f275 2019-02-04 stsp free(fileindex_path);
2414 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
2415 f8d1f275 2019-02-04 stsp return err;
2418 6c7ab921 2019-03-18 stsp const struct got_error *
2419 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
2420 6c7ab921 2019-03-18 stsp const char *arg)
2422 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
2423 d0710d08 2019-07-22 stsp char *resolved, *cwd = NULL, *path = NULL;
2424 6c7ab921 2019-03-18 stsp size_t len;
2426 6c7ab921 2019-03-18 stsp *wt_path = NULL;
2428 6c7ab921 2019-03-18 stsp resolved = realpath(arg, NULL);
2429 d0710d08 2019-07-22 stsp if (resolved == NULL) {
2430 d0710d08 2019-07-22 stsp if (errno != ENOENT)
2431 d0710d08 2019-07-22 stsp return got_error_from_errno2("realpath", arg);
2432 d0710d08 2019-07-22 stsp cwd = getcwd(NULL, 0);
2433 d0710d08 2019-07-22 stsp if (cwd == NULL)
2434 d0710d08 2019-07-22 stsp return got_error_from_errno("getcwd");
2435 d0710d08 2019-07-22 stsp if (asprintf(&resolved, "%s/%s", cwd, arg) == -1) {
2436 d0710d08 2019-07-22 stsp err = got_error_from_errno("asprintf");
2437 d0710d08 2019-07-22 stsp goto done;
2441 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
2442 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
2443 6c7ab921 2019-03-18 stsp err = got_error(GOT_ERR_BAD_PATH);
2444 6c7ab921 2019-03-18 stsp goto done;
2447 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
2448 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
2449 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
2451 f6d88e1a 2019-05-29 stsp goto done;
2453 f6d88e1a 2019-05-29 stsp path = strdup("");
2454 f6d88e1a 2019-05-29 stsp if (path == NULL) {
2455 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
2456 f6d88e1a 2019-05-29 stsp goto done;
2460 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
2461 6c7ab921 2019-03-18 stsp len = strlen(path);
2462 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
2463 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
2467 6c7ab921 2019-03-18 stsp free(resolved);
2468 d0710d08 2019-07-22 stsp free(cwd);
2469 6c7ab921 2019-03-18 stsp if (err == NULL)
2470 6c7ab921 2019-03-18 stsp *wt_path = path;
2472 6c7ab921 2019-03-18 stsp free(path);
2473 d00136be 2019-03-26 stsp return err;
2476 07f5b47a 2019-06-02 stsp static const struct got_error *
2477 07f5b47a 2019-06-02 stsp schedule_addition(const char *ondisk_path, struct got_fileindex *fileindex,
2478 07f5b47a 2019-06-02 stsp const char *relpath, got_worktree_status_cb status_cb, void *status_arg,
2479 07f5b47a 2019-06-02 stsp struct got_repository *repo)
2481 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
2482 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
2484 07f5b47a 2019-06-02 stsp /* Re-adding an existing entry is a no-op. */
2485 d6c87207 2019-08-02 stsp if (got_fileindex_entry_get(fileindex, relpath, strlen(relpath)))
2486 07f5b47a 2019-06-02 stsp return NULL;
2488 07f5b47a 2019-06-02 stsp err = got_fileindex_entry_alloc(&ie, ondisk_path, relpath, NULL, NULL);
2490 07f5b47a 2019-06-02 stsp return err;
2492 07f5b47a 2019-06-02 stsp err = got_fileindex_entry_add(fileindex, ie);
2493 07f5b47a 2019-06-02 stsp if (err) {
2494 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
2495 07f5b47a 2019-06-02 stsp return err;
2498 c02b99b6 2019-07-27 stsp return report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
2501 d00136be 2019-03-26 stsp const struct got_error *
2502 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
2503 1dd54920 2019-05-11 stsp struct got_pathlist_head *ondisk_paths,
2504 1dd54920 2019-05-11 stsp got_worktree_status_cb status_cb, void *status_arg,
2505 031a5338 2019-03-26 stsp struct got_repository *repo)
2507 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
2508 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2509 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2510 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
2512 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
2514 d00136be 2019-03-26 stsp return err;
2516 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2518 d00136be 2019-03-26 stsp goto done;
2520 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, ondisk_paths, entry) {
2521 1dd54920 2019-05-11 stsp char *relpath;
2522 1dd54920 2019-05-11 stsp err = got_path_skip_common_ancestor(&relpath,
2523 1dd54920 2019-05-11 stsp got_worktree_get_root_path(worktree), pe->path);
2526 07f5b47a 2019-06-02 stsp err = schedule_addition(pe->path, fileindex, relpath,
2527 07f5b47a 2019-06-02 stsp status_cb, status_arg, repo);
2528 1dd54920 2019-05-11 stsp free(relpath);
2532 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2533 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2534 af12c6b9 2019-06-04 stsp err = sync_err;
2536 fb399478 2019-07-12 stsp free(fileindex_path);
2537 d00136be 2019-03-26 stsp if (fileindex)
2538 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
2539 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2540 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
2541 d00136be 2019-03-26 stsp err = unlockerr;
2542 6c7ab921 2019-03-18 stsp return err;
2545 17ed4618 2019-06-02 stsp static const struct got_error *
2546 17ed4618 2019-06-02 stsp schedule_for_deletion(const char *ondisk_path, struct got_fileindex *fileindex,
2547 17ed4618 2019-06-02 stsp const char *relpath, int delete_local_mods,
2548 17ed4618 2019-06-02 stsp got_worktree_status_cb status_cb, void *status_arg,
2549 17ed4618 2019-06-02 stsp struct got_repository *repo)
2551 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
2552 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
2553 17ed4618 2019-06-02 stsp unsigned char status;
2554 17ed4618 2019-06-02 stsp struct stat sb;
2556 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, relpath, strlen(relpath));
2557 17ed4618 2019-06-02 stsp if (ie == NULL)
2558 17ed4618 2019-06-02 stsp return got_error(GOT_ERR_BAD_PATH);
2560 17ed4618 2019-06-02 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2562 17ed4618 2019-06-02 stsp return err;
2564 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
2565 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
2566 de426ea6 2019-08-03 stsp return NULL;
2567 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_MODIFY)
2568 17ed4618 2019-06-02 stsp return got_error(GOT_ERR_FILE_STATUS);
2569 17ed4618 2019-06-02 stsp if (!delete_local_mods)
2570 17ed4618 2019-06-02 stsp return got_error(GOT_ERR_FILE_MODIFIED);
2573 17ed4618 2019-06-02 stsp if (unlink(ondisk_path) != 0)
2574 17ed4618 2019-06-02 stsp return got_error_from_errno2("unlink", ondisk_path);
2576 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2577 17ed4618 2019-06-02 stsp return report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
2580 2ec1f75b 2019-03-26 stsp const struct got_error *
2581 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
2582 17ed4618 2019-06-02 stsp struct got_pathlist_head *ondisk_paths, int delete_local_mods,
2583 2ec1f75b 2019-03-26 stsp got_worktree_status_cb status_cb, void *status_arg,
2584 2ec1f75b 2019-03-26 stsp struct got_repository *repo)
2586 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
2587 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
2588 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2589 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
2591 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
2593 2ec1f75b 2019-03-26 stsp return err;
2595 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2597 2ec1f75b 2019-03-26 stsp goto done;
2599 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, ondisk_paths, entry) {
2600 17ed4618 2019-06-02 stsp char *relpath;
2601 17ed4618 2019-06-02 stsp err = got_path_skip_common_ancestor(&relpath,
2602 17ed4618 2019-06-02 stsp got_worktree_get_root_path(worktree), pe->path);
2605 17ed4618 2019-06-02 stsp err = schedule_for_deletion(pe->path, fileindex, relpath,
2606 17ed4618 2019-06-02 stsp delete_local_mods, status_cb, status_arg, repo);
2607 17ed4618 2019-06-02 stsp free(relpath);
2611 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2612 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2613 af12c6b9 2019-06-04 stsp err = sync_err;
2615 fb399478 2019-07-12 stsp free(fileindex_path);
2616 2ec1f75b 2019-03-26 stsp if (fileindex)
2617 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
2618 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2619 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
2620 2ec1f75b 2019-03-26 stsp err = unlockerr;
2621 2ec1f75b 2019-03-26 stsp return err;
2624 e20a8b6f 2019-06-04 stsp static const struct got_error *
2625 e20a8b6f 2019-06-04 stsp revert_file(struct got_worktree *worktree, struct got_fileindex *fileindex,
2626 a129376b 2019-03-28 stsp const char *ondisk_path,
2627 a129376b 2019-03-28 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2628 a129376b 2019-03-28 stsp struct got_repository *repo)
2630 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
2631 e20a8b6f 2019-06-04 stsp char *relpath = NULL, *parent_path = NULL;
2632 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
2633 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
2634 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
2635 a129376b 2019-03-28 stsp const struct got_tree_entry *te;
2636 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
2637 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
2638 a129376b 2019-03-28 stsp unsigned char status;
2639 a129376b 2019-03-28 stsp struct stat sb;
2641 a129376b 2019-03-28 stsp err = got_path_skip_common_ancestor(&relpath,
2642 a129376b 2019-03-28 stsp got_worktree_get_root_path(worktree), ondisk_path);
2644 a129376b 2019-03-28 stsp goto done;
2646 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, relpath, strlen(relpath));
2647 a129376b 2019-03-28 stsp if (ie == NULL) {
2648 a129376b 2019-03-28 stsp err = got_error(GOT_ERR_BAD_PATH);
2649 a129376b 2019-03-28 stsp goto done;
2652 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
2653 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
2654 a129376b 2019-03-28 stsp if (err) {
2655 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
2656 a129376b 2019-03-28 stsp goto done;
2657 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
2658 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
2659 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
2660 e20a8b6f 2019-06-04 stsp goto done;
2663 a129376b 2019-03-28 stsp if (got_path_is_root_dir(worktree->path_prefix)) {
2664 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
2665 a129376b 2019-03-28 stsp if (tree_path == NULL) {
2666 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
2667 a129376b 2019-03-28 stsp goto done;
2670 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
2671 a129376b 2019-03-28 stsp tree_path = strdup(worktree->path_prefix);
2672 a129376b 2019-03-28 stsp if (tree_path == NULL) {
2673 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
2674 a129376b 2019-03-28 stsp goto done;
2677 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
2678 a129376b 2019-03-28 stsp worktree->path_prefix, parent_path) == -1) {
2679 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2680 a129376b 2019-03-28 stsp goto done;
2685 a129376b 2019-03-28 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2687 a129376b 2019-03-28 stsp goto done;
2688 7fa0d182 2019-08-03 stsp if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
2689 7fa0d182 2019-08-03 stsp sb.st_mode = got_fileindex_perms_to_st(ie);
2691 a9fa2909 2019-07-27 stsp err = got_object_id_by_path(&tree_id, repo, worktree->base_commit_id,
2692 a9fa2909 2019-07-27 stsp tree_path);
2693 a9fa2909 2019-07-27 stsp if (err) {
2694 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
2695 a9fa2909 2019-07-27 stsp status == GOT_STATUS_ADD))
2696 a9fa2909 2019-07-27 stsp goto done;
2698 a9fa2909 2019-07-27 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2700 a9fa2909 2019-07-27 stsp goto done;
2702 a9fa2909 2019-07-27 stsp te_name = basename(ie->path);
2703 a9fa2909 2019-07-27 stsp if (te_name == NULL) {
2704 a9fa2909 2019-07-27 stsp err = got_error_from_errno2("basename", ie->path);
2705 a9fa2909 2019-07-27 stsp goto done;
2708 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
2709 a9fa2909 2019-07-27 stsp if (te == NULL && status != GOT_STATUS_ADD) {
2710 a9fa2909 2019-07-27 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
2711 a9fa2909 2019-07-27 stsp goto done;
2715 a129376b 2019-03-28 stsp switch (status) {
2716 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
2717 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT, ie->path);
2719 1ee397ad 2019-07-12 stsp goto done;
2720 a129376b 2019-03-28 stsp got_fileindex_entry_remove(fileindex, ie);
2722 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
2723 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
2724 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
2725 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
2726 e20a8b6f 2019-06-04 stsp struct got_object_id id;
2727 a129376b 2019-03-28 stsp memcpy(id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2728 a129376b 2019-03-28 stsp err = got_object_open_as_blob(&blob, repo, &id, 8192);
2730 a129376b 2019-03-28 stsp goto done;
2731 a129376b 2019-03-28 stsp err = install_blob(worktree, ondisk_path, ie->path,
2732 a129376b 2019-03-28 stsp te->mode, sb.st_mode, blob, 0, 1, repo, progress_cb,
2733 a129376b 2019-03-28 stsp progress_arg);
2735 a129376b 2019-03-28 stsp goto done;
2736 a129376b 2019-03-28 stsp if (status == GOT_STATUS_DELETE) {
2737 a129376b 2019-03-28 stsp err = update_blob_fileindex_entry(worktree,
2738 a129376b 2019-03-28 stsp fileindex, ie, ondisk_path, ie->path, blob, 1);
2740 a129376b 2019-03-28 stsp goto done;
2745 a129376b 2019-03-28 stsp goto done;
2748 a129376b 2019-03-28 stsp free(relpath);
2749 e20a8b6f 2019-06-04 stsp free(parent_path);
2750 a129376b 2019-03-28 stsp free(tree_path);
2752 a129376b 2019-03-28 stsp got_object_blob_close(blob);
2754 a129376b 2019-03-28 stsp got_object_tree_close(tree);
2755 a129376b 2019-03-28 stsp free(tree_id);
2756 e20a8b6f 2019-06-04 stsp return err;
2759 e20a8b6f 2019-06-04 stsp const struct got_error *
2760 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
2761 e20a8b6f 2019-06-04 stsp struct got_pathlist_head *ondisk_paths,
2762 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2763 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
2765 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
2766 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
2767 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
2768 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
2769 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
2771 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
2773 e20a8b6f 2019-06-04 stsp return err;
2775 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2777 e20a8b6f 2019-06-04 stsp goto done;
2779 e20a8b6f 2019-06-04 stsp TAILQ_FOREACH(pe, ondisk_paths, entry) {
2780 e20a8b6f 2019-06-04 stsp err = revert_file(worktree, fileindex, pe->path,
2781 e20a8b6f 2019-06-04 stsp progress_cb, progress_arg, repo);
2785 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2786 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
2787 e20a8b6f 2019-06-04 stsp err = sync_err;
2789 fb399478 2019-07-12 stsp free(fileindex_path);
2790 a129376b 2019-03-28 stsp if (fileindex)
2791 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
2792 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2793 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
2794 a129376b 2019-03-28 stsp err = unlockerr;
2795 c4296144 2019-05-09 stsp return err;
2798 cf066bf8 2019-05-09 stsp static void
2799 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
2801 24519714 2019-05-09 stsp free(ct->path);
2802 44d03001 2019-05-09 stsp free(ct->in_repo_path);
2803 768aea60 2019-05-09 stsp free(ct->ondisk_path);
2804 e75eb4da 2019-05-10 stsp free(ct->blob_id);
2805 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
2806 b416585c 2019-05-13 stsp free(ct->base_commit_id);
2810 ed175427 2019-05-09 stsp struct collect_commitables_arg {
2811 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
2812 24519714 2019-05-09 stsp struct got_repository *repo;
2813 24519714 2019-05-09 stsp struct got_worktree *worktree;
2816 c4296144 2019-05-09 stsp static const struct got_error *
2817 88d0e355 2019-08-03 stsp collect_commitables(void *arg, unsigned char status,
2818 88d0e355 2019-08-03 stsp unsigned char staged_status, const char *relpath,
2819 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
2820 537ac44b 2019-08-03 stsp struct got_object_id *commit_id)
2822 ed175427 2019-05-09 stsp struct collect_commitables_arg *a = arg;
2823 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
2824 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
2825 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
2826 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
2827 768aea60 2019-05-09 stsp struct stat sb;
2829 c4296144 2019-05-09 stsp if (status == GOT_STATUS_CONFLICT)
2830 c4296144 2019-05-09 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
2832 c4296144 2019-05-09 stsp if (status != GOT_STATUS_MODIFY && status != GOT_STATUS_ADD &&
2833 c4296144 2019-05-09 stsp status != GOT_STATUS_DELETE)
2834 c4296144 2019-05-09 stsp return NULL;
2836 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
2837 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2838 036813ee 2019-05-09 stsp goto done;
2840 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
2841 036813ee 2019-05-09 stsp parent_path = strdup("");
2842 69960a46 2019-05-09 stsp if (parent_path == NULL)
2843 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
2845 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
2847 69960a46 2019-05-09 stsp return err;
2850 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
2851 cf066bf8 2019-05-09 stsp if (ct == NULL) {
2852 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
2853 c4296144 2019-05-09 stsp goto done;
2856 768aea60 2019-05-09 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
2857 768aea60 2019-05-09 stsp relpath) == -1) {
2858 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2859 768aea60 2019-05-09 stsp goto done;
2861 768aea60 2019-05-09 stsp if (status == GOT_STATUS_DELETE) {
2862 768aea60 2019-05-09 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2864 768aea60 2019-05-09 stsp if (lstat(ct->ondisk_path, &sb) != 0) {
2865 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
2866 768aea60 2019-05-09 stsp goto done;
2868 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
2871 44d03001 2019-05-09 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
2872 44d03001 2019-05-09 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
2873 44d03001 2019-05-09 stsp relpath) == -1) {
2874 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2875 44d03001 2019-05-09 stsp goto done;
2878 cf066bf8 2019-05-09 stsp ct->status = status;
2879 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
2880 036813ee 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD) {
2881 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
2882 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
2883 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2884 b416585c 2019-05-13 stsp goto done;
2886 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
2887 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
2888 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2889 036813ee 2019-05-09 stsp goto done;
2892 24519714 2019-05-09 stsp ct->path = strdup(path);
2893 24519714 2019-05-09 stsp if (ct->path == NULL) {
2894 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
2895 24519714 2019-05-09 stsp goto done;
2897 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
2899 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
2900 ed175427 2019-05-09 stsp free_commitable(ct);
2901 24519714 2019-05-09 stsp free(parent_path);
2902 036813ee 2019-05-09 stsp free(path);
2903 a129376b 2019-03-28 stsp return err;
2906 036813ee 2019-05-09 stsp static const struct got_error *write_tree(struct got_object_id **,
2907 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
2908 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
2909 036813ee 2019-05-09 stsp struct got_repository *);
2911 ed175427 2019-05-09 stsp static const struct got_error *
2912 036813ee 2019-05-09 stsp write_subtree(struct got_object_id **new_subtree_id,
2913 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
2914 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
2915 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
2916 afa376bf 2019-05-09 stsp struct got_repository *repo)
2918 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
2919 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
2920 036813ee 2019-05-09 stsp char *subpath;
2922 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
2923 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
2924 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2926 036813ee 2019-05-09 stsp err = got_object_open_as_tree(&subtree, repo, te->id);
2928 ed175427 2019-05-09 stsp return err;
2930 036813ee 2019-05-09 stsp err = write_tree(new_subtree_id, subtree, subpath, commitable_paths,
2931 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
2932 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
2933 036813ee 2019-05-09 stsp free(subpath);
2934 036813ee 2019-05-09 stsp return err;
2937 036813ee 2019-05-09 stsp static const struct got_error *
2938 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
2940 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2941 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
2943 036813ee 2019-05-09 stsp *match = 0;
2945 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
2946 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
2947 0f63689d 2019-05-10 stsp return NULL;
2950 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
2952 0f63689d 2019-05-10 stsp return err;
2953 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
2954 036813ee 2019-05-09 stsp free(ct_parent_path);
2955 036813ee 2019-05-09 stsp return err;
2958 768aea60 2019-05-09 stsp static mode_t
2959 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
2961 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
2964 036813ee 2019-05-09 stsp static const struct got_error *
2965 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
2966 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
2968 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2970 036813ee 2019-05-09 stsp *new_te = NULL;
2972 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
2974 036813ee 2019-05-09 stsp goto done;
2976 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
2978 036813ee 2019-05-09 stsp free((*new_te)->id);
2979 e75eb4da 2019-05-10 stsp (*new_te)->id = got_object_id_dup(ct->blob_id);
2980 036813ee 2019-05-09 stsp if ((*new_te)->id == NULL) {
2981 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2982 036813ee 2019-05-09 stsp goto done;
2985 036813ee 2019-05-09 stsp if (err && *new_te) {
2986 036813ee 2019-05-09 stsp got_object_tree_entry_close(*new_te);
2987 036813ee 2019-05-09 stsp *new_te = NULL;
2989 036813ee 2019-05-09 stsp return err;
2992 036813ee 2019-05-09 stsp static const struct got_error *
2993 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
2994 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
2996 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2997 036813ee 2019-05-09 stsp char *ct_name;
2999 036813ee 2019-05-09 stsp *new_te = NULL;
3001 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
3002 036813ee 2019-05-09 stsp if (*new_te == NULL)
3003 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
3005 036813ee 2019-05-09 stsp ct_name = basename(ct->path);
3006 036813ee 2019-05-09 stsp if (ct_name == NULL) {
3007 638f9024 2019-05-13 stsp err = got_error_from_errno2("basename", ct->path);
3008 036813ee 2019-05-09 stsp goto done;
3010 036813ee 2019-05-09 stsp (*new_te)->name = strdup(ct_name);
3011 036813ee 2019-05-09 stsp if ((*new_te)->name == NULL) {
3012 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3013 036813ee 2019-05-09 stsp goto done;
3016 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
3018 e75eb4da 2019-05-10 stsp (*new_te)->id = got_object_id_dup(ct->blob_id);
3019 036813ee 2019-05-09 stsp if ((*new_te)->id == NULL) {
3020 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3021 036813ee 2019-05-09 stsp goto done;
3024 036813ee 2019-05-09 stsp if (err && *new_te) {
3025 036813ee 2019-05-09 stsp got_object_tree_entry_close(*new_te);
3026 036813ee 2019-05-09 stsp *new_te = NULL;
3028 036813ee 2019-05-09 stsp return err;
3031 036813ee 2019-05-09 stsp static const struct got_error *
3032 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
3033 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
3035 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3036 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
3038 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
3040 036813ee 2019-05-09 stsp return err;
3041 036813ee 2019-05-09 stsp if (new_pe == NULL)
3042 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
3043 036813ee 2019-05-09 stsp return NULL;
3046 afa376bf 2019-05-09 stsp static const struct got_error *
3047 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
3048 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
3050 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
3051 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
3052 afa376bf 2019-05-09 stsp ct_path++;
3053 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, ct->status, GOT_STATUS_NO_CHANGE,
3054 537ac44b 2019-08-03 stsp ct_path, ct->blob_id, NULL, NULL);
3057 036813ee 2019-05-09 stsp static const struct got_error *
3058 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
3059 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
3061 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
3062 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
3063 44d03001 2019-05-09 stsp char *te_path;
3065 44d03001 2019-05-09 stsp *modified = 0;
3067 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
3068 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
3069 44d03001 2019-05-09 stsp te->name) == -1)
3070 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3072 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3073 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3074 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
3075 44d03001 2019-05-09 stsp strlen(te_path));
3076 44d03001 2019-05-09 stsp if (*modified)
3080 44d03001 2019-05-09 stsp free(te_path);
3081 44d03001 2019-05-09 stsp return err;
3084 44d03001 2019-05-09 stsp static const struct got_error *
3085 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
3086 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
3087 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
3089 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3090 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
3092 036813ee 2019-05-09 stsp *ctp = NULL;
3094 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3095 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3096 036813ee 2019-05-09 stsp char *ct_name = NULL;
3097 036813ee 2019-05-09 stsp int path_matches;
3099 036813ee 2019-05-09 stsp if (ct->status != GOT_STATUS_MODIFY &&
3100 036813ee 2019-05-09 stsp ct->status != GOT_STATUS_DELETE)
3103 c4e12a88 2019-05-13 stsp if (got_object_id_cmp(ct->base_blob_id, te->id) != 0)
3106 036813ee 2019-05-09 stsp err = match_ct_parent_path(&path_matches, ct, base_tree_path);
3108 036813ee 2019-05-09 stsp return err;
3109 036813ee 2019-05-09 stsp if (!path_matches)
3112 036813ee 2019-05-09 stsp ct_name = basename(pe->path);
3113 036813ee 2019-05-09 stsp if (ct_name == NULL)
3114 638f9024 2019-05-13 stsp return got_error_from_errno2("basename", pe->path);
3116 036813ee 2019-05-09 stsp if (strcmp(te->name, ct_name) != 0)
3119 036813ee 2019-05-09 stsp *ctp = ct;
3123 2b496619 2019-07-10 stsp return err;
3126 2b496619 2019-07-10 stsp static const struct got_error *
3127 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
3128 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
3129 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
3130 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3131 2b496619 2019-07-10 stsp struct got_repository *repo)
3133 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
3134 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
3135 2b496619 2019-07-10 stsp char *subtree_path;
3137 2b496619 2019-07-10 stsp *new_tep = NULL;
3139 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
3140 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
3141 2b496619 2019-07-10 stsp child_path) == -1)
3142 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
3144 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
3145 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
3146 2b496619 2019-07-10 stsp new_te->name = strdup(child_path);
3147 2b496619 2019-07-10 stsp if (new_te->name == NULL) {
3148 2b496619 2019-07-10 stsp err = got_error_from_errno("strdup");
3149 2b496619 2019-07-10 stsp got_object_tree_entry_close(new_te);
3150 2b496619 2019-07-10 stsp goto done;
3152 2b496619 2019-07-10 stsp err = write_tree(&new_te->id, NULL, subtree_path,
3153 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
3154 2b496619 2019-07-10 stsp if (err) {
3155 2b496619 2019-07-10 stsp got_object_tree_entry_close(new_te);
3156 2b496619 2019-07-10 stsp goto done;
3159 2b496619 2019-07-10 stsp free(subtree_path);
3160 2b496619 2019-07-10 stsp if (err == NULL)
3161 2b496619 2019-07-10 stsp *new_tep = new_te;
3162 036813ee 2019-05-09 stsp return err;
3165 036813ee 2019-05-09 stsp static const struct got_error *
3166 036813ee 2019-05-09 stsp write_tree(struct got_object_id **new_tree_id,
3167 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
3168 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
3169 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3170 036813ee 2019-05-09 stsp struct got_repository *repo)
3172 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3173 036813ee 2019-05-09 stsp const struct got_tree_entries *base_entries = NULL;
3174 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
3175 036813ee 2019-05-09 stsp struct got_tree_entries new_tree_entries;
3176 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
3177 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
3179 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
3180 036813ee 2019-05-09 stsp new_tree_entries.nentries = 0;
3181 036813ee 2019-05-09 stsp SIMPLEQ_INIT(&new_tree_entries.head);
3183 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
3184 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3185 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3186 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
3188 a3df2849 2019-05-20 stsp if (ct->status != GOT_STATUS_ADD ||
3189 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
3192 036813ee 2019-05-09 stsp if (!got_path_is_child(pe->path, path_base_tree,
3193 2f51b5b3 2019-05-09 stsp strlen(path_base_tree)))
3196 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
3197 036813ee 2019-05-09 stsp pe->path);
3199 036813ee 2019-05-09 stsp goto done;
3201 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
3202 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
3203 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
3205 036813ee 2019-05-09 stsp goto done;
3206 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
3208 afa376bf 2019-05-09 stsp goto done;
3209 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
3210 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
3212 2f51b5b3 2019-05-09 stsp goto done;
3214 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
3215 2b496619 2019-07-10 stsp if (base_tree == NULL ||
3216 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
3217 2b496619 2019-07-10 stsp == NULL) {
3218 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
3219 2b496619 2019-07-10 stsp child_path, path_base_tree,
3220 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
3223 2b496619 2019-07-10 stsp goto done;
3224 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
3226 2b496619 2019-07-10 stsp goto done;
3231 2f51b5b3 2019-05-09 stsp if (base_tree) {
3232 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
3233 2f51b5b3 2019-05-09 stsp base_entries = got_object_tree_get_entries(base_tree);
3234 2f51b5b3 2019-05-09 stsp SIMPLEQ_FOREACH(te, &base_entries->head, entry) {
3235 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
3237 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
3238 44d03001 2019-05-09 stsp int modified;
3239 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
3241 036813ee 2019-05-09 stsp goto done;
3242 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
3243 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
3245 2f51b5b3 2019-05-09 stsp goto done;
3246 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
3247 44d03001 2019-05-09 stsp if (modified) {
3248 44d03001 2019-05-09 stsp free(new_te->id);
3249 44d03001 2019-05-09 stsp err = write_subtree(&new_te->id, te,
3250 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
3251 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
3253 44d03001 2019-05-09 stsp goto done;
3255 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
3257 036813ee 2019-05-09 stsp goto done;
3261 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
3262 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
3264 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
3265 2f51b5b3 2019-05-09 stsp if (ct->status == GOT_STATUS_MODIFY) {
3266 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
3267 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
3269 2f51b5b3 2019-05-09 stsp goto done;
3270 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
3272 2f51b5b3 2019-05-09 stsp goto done;
3274 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
3275 b416585c 2019-05-13 stsp status_arg);
3277 afa376bf 2019-05-09 stsp goto done;
3279 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
3280 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
3282 2f51b5b3 2019-05-09 stsp goto done;
3283 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
3285 2f51b5b3 2019-05-09 stsp goto done;
3290 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
3291 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, &paths, entry) {
3292 0b5cc0d6 2019-05-09 stsp struct got_tree_entry *te = pe->data;
3293 0b5cc0d6 2019-05-09 stsp new_tree_entries.nentries++;
3294 0b5cc0d6 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&new_tree_entries.head, te, entry);
3296 036813ee 2019-05-09 stsp err = got_object_tree_create(new_tree_id, &new_tree_entries, repo);
3298 ca2503ea 2019-05-09 stsp got_object_tree_entries_close(&new_tree_entries);
3299 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
3300 ed175427 2019-05-09 stsp return err;
3303 ebf99748 2019-05-09 stsp static const struct got_error *
3304 ebf99748 2019-05-09 stsp update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
3305 93ec1b5f 2019-07-12 stsp struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex)
3307 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
3308 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
3310 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3311 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
3312 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3314 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
3316 ebf99748 2019-05-09 stsp if (ct->status == GOT_STATUS_DELETE) {
3317 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
3318 ebf99748 2019-05-09 stsp got_fileindex_entry_free(ie);
3320 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
3321 e75eb4da 2019-05-10 stsp ct->ondisk_path, ct->blob_id->sha1,
3322 ebf99748 2019-05-09 stsp new_base_commit_id->sha1, 1);
3324 ebf99748 2019-05-09 stsp err = got_fileindex_entry_alloc(&ie,
3325 e75eb4da 2019-05-10 stsp ct->ondisk_path, pe->path, ct->blob_id->sha1,
3326 ebf99748 2019-05-09 stsp new_base_commit_id->sha1);
3329 ebf99748 2019-05-09 stsp err = got_fileindex_entry_add(fileindex, ie);
3334 d56d26ce 2019-05-10 stsp return err;
3337 d56d26ce 2019-05-10 stsp static const struct got_error *
3338 33ad4cbe 2019-05-12 jcs check_ct_out_of_date(struct got_commitable *ct, struct got_repository *repo,
3339 d56d26ce 2019-05-10 stsp struct got_object_id *head_commit_id)
3341 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
3342 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
3343 1a36436d 2019-06-10 stsp struct got_commit_object *commit = NULL;
3344 1a36436d 2019-06-10 stsp const char *ct_path = ct->in_repo_path;
3346 1a36436d 2019-06-10 stsp while (ct_path[0] == '/')
3347 1a36436d 2019-06-10 stsp ct_path++;
3349 b416585c 2019-05-13 stsp if (ct->status != GOT_STATUS_ADD) {
3350 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
3351 1a36436d 2019-06-10 stsp if (got_object_id_cmp(ct->base_commit_id, head_commit_id) == 0)
3352 1a36436d 2019-06-10 stsp return NULL;
3354 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
3355 9bead371 2019-07-28 stsp * on matches file content in the branch head.
3357 9bead371 2019-07-28 stsp err = got_object_id_by_path(&id, repo, head_commit_id, ct_path);
3358 9bead371 2019-07-28 stsp if (err) {
3359 9bead371 2019-07-28 stsp if (err->code != GOT_ERR_NO_TREE_ENTRY)
3360 9bead371 2019-07-28 stsp goto done;
3361 9bead371 2019-07-28 stsp err = got_error(GOT_ERR_COMMIT_OUT_OF_DATE);
3362 1a36436d 2019-06-10 stsp goto done;
3363 9bead371 2019-07-28 stsp } else if (got_object_id_cmp(id, ct->base_blob_id) != 0)
3364 9bead371 2019-07-28 stsp err = got_error(GOT_ERR_COMMIT_OUT_OF_DATE);
3366 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
3367 9bead371 2019-07-28 stsp err = got_object_id_by_path(&id, repo, head_commit_id, ct_path);
3368 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3369 1a36436d 2019-06-10 stsp goto done;
3370 9bead371 2019-07-28 stsp err = id ? got_error(GOT_ERR_COMMIT_OUT_OF_DATE) : NULL;
3373 1a36436d 2019-06-10 stsp if (commit)
3374 1a36436d 2019-06-10 stsp got_object_commit_close(commit);
3376 1a36436d 2019-06-10 stsp return err;
3379 c4296144 2019-05-09 stsp const struct got_error *
3380 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
3381 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
3382 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id, struct got_worktree *worktree,
3383 5c1e53bc 2019-07-28 stsp const char *author, const char *committer,
3384 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
3385 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3386 afa376bf 2019-05-09 stsp struct got_repository *repo)
3388 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
3389 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
3390 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
3391 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
3392 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
3393 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
3394 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
3395 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
3396 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
3397 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
3398 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
3400 c4296144 2019-05-09 stsp *new_commit_id = NULL;
3402 de18fc63 2019-05-09 stsp SIMPLEQ_INIT(&parent_ids);
3404 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
3406 588edf97 2019-05-10 stsp goto done;
3408 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
3410 588edf97 2019-05-10 stsp goto done;
3412 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
3413 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
3418 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
3419 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
3423 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
3424 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3425 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3426 cf066bf8 2019-05-09 stsp char *ondisk_path;
3428 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
3429 cf066bf8 2019-05-09 stsp ct->status != GOT_STATUS_MODIFY)
3432 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
3433 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
3434 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3435 cf066bf8 2019-05-09 stsp goto done;
3437 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
3438 a7055788 2019-05-09 stsp free(ondisk_path);
3440 cf066bf8 2019-05-09 stsp goto done;
3443 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
3444 39cd0ff6 2019-07-12 stsp err = write_tree(&new_tree_id, head_tree, "/", commitable_paths,
3445 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
3447 036813ee 2019-05-09 stsp goto done;
3449 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
3451 de18fc63 2019-05-09 stsp goto done;
3452 de18fc63 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
3453 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
3454 de18fc63 2019-05-09 stsp 1, author, time(NULL), committer, time(NULL), logmsg, repo);
3455 de18fc63 2019-05-09 stsp got_object_qid_free(pid);
3456 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
3457 33ad4cbe 2019-05-12 jcs free(logmsg);
3459 9d40349a 2019-05-09 stsp goto done;
3461 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
3462 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
3463 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
3464 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
3465 09f5bd90 2019-05-09 stsp goto done;
3467 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
3468 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
3470 09f5bd90 2019-05-09 stsp goto done;
3471 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
3473 ebf99748 2019-05-09 stsp goto done;
3474 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
3475 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
3476 09f5bd90 2019-05-09 stsp goto done;
3478 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
3479 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
3481 f2c16586 2019-05-09 stsp goto done;
3482 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
3484 f2c16586 2019-05-09 stsp goto done;
3486 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
3488 09f5bd90 2019-05-09 stsp goto done;
3490 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
3492 ebf99748 2019-05-09 stsp goto done;
3494 588edf97 2019-05-10 stsp if (head_tree)
3495 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
3496 588edf97 2019-05-10 stsp if (head_commit)
3497 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
3498 09f5bd90 2019-05-09 stsp free(head_commit_id2);
3499 2f17228e 2019-05-12 stsp if (head_ref2) {
3500 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
3501 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
3502 2f17228e 2019-05-12 stsp err = unlockerr;
3503 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
3505 39cd0ff6 2019-07-12 stsp return err;
3508 5c1e53bc 2019-07-28 stsp static const struct got_error *
3509 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
3510 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
3512 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
3513 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
3515 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
3516 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
3517 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
3519 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
3520 5c1e53bc 2019-07-28 stsp ct_path++;
3522 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
3523 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
3527 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
3528 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
3530 5c1e53bc 2019-07-28 stsp return NULL;
3533 39cd0ff6 2019-07-12 stsp const struct got_error *
3534 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
3535 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
3536 39cd0ff6 2019-07-12 stsp const char *author, const char *committer,
3537 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
3538 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
3539 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
3541 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
3542 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
3543 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
3544 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
3545 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
3546 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
3547 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
3548 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
3550 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
3552 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
3554 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
3556 39cd0ff6 2019-07-12 stsp goto done;
3558 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
3560 39cd0ff6 2019-07-12 stsp goto done;
3562 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
3564 39cd0ff6 2019-07-12 stsp goto done;
3566 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3568 39cd0ff6 2019-07-12 stsp goto done;
3570 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
3571 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
3572 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
3573 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
3574 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3575 5c1e53bc 2019-07-28 stsp collect_commitables, &cc_arg, NULL, NULL);
3577 5c1e53bc 2019-07-28 stsp goto done;
3580 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
3581 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
3582 39cd0ff6 2019-07-12 stsp goto done;
3585 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
3586 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
3588 5c1e53bc 2019-07-28 stsp goto done;
3591 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
3592 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
3593 b50cabdf 2019-07-12 stsp err = check_ct_out_of_date(ct, repo, head_commit_id);
3595 b50cabdf 2019-07-12 stsp goto done;
3598 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
3599 5c1e53bc 2019-07-28 stsp head_commit_id, worktree, author, committer,
3600 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
3602 39cd0ff6 2019-07-12 stsp goto done;
3604 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
3605 93ec1b5f 2019-07-12 stsp fileindex);
3606 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3607 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
3608 39cd0ff6 2019-07-12 stsp err = sync_err;
3610 39cd0ff6 2019-07-12 stsp if (fileindex)
3611 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
3612 39cd0ff6 2019-07-12 stsp free(fileindex_path);
3613 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3614 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
3615 39cd0ff6 2019-07-12 stsp err = unlockerr;
3616 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
3617 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
3618 39cd0ff6 2019-07-12 stsp free_commitable(ct);
3620 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
3621 c4296144 2019-05-09 stsp return err;
3624 8656d6c4 2019-05-20 stsp const char *
3625 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
3627 8656d6c4 2019-05-20 stsp return ct->path;
3630 8656d6c4 2019-05-20 stsp unsigned int
3631 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
3633 8656d6c4 2019-05-20 stsp return ct->status;
3636 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
3637 818c7501 2019-07-11 stsp struct got_worktree *worktree;
3638 818c7501 2019-07-11 stsp struct got_repository *repo;
3641 818c7501 2019-07-11 stsp static const struct got_error *
3642 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
3644 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
3645 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
3646 818c7501 2019-07-11 stsp unsigned char status;
3647 818c7501 2019-07-11 stsp struct stat sb;
3648 818c7501 2019-07-11 stsp char *ondisk_path;
3650 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
3651 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
3652 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
3653 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
3655 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3657 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
3659 818c7501 2019-07-11 stsp /* Reject rebase of a work tree with modified or conflicted files. */
3660 818c7501 2019-07-11 stsp err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
3661 818c7501 2019-07-11 stsp free(ondisk_path);
3663 818c7501 2019-07-11 stsp return err;
3665 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
3666 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
3668 818c7501 2019-07-11 stsp return NULL;
3671 818c7501 2019-07-11 stsp const struct got_error *
3672 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
3673 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
3674 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
3675 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
3677 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
3678 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
3679 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
3680 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
3681 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
3682 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
3684 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
3685 818c7501 2019-07-11 stsp *tmp_branch = NULL;
3686 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
3688 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
3690 818c7501 2019-07-11 stsp return err;
3692 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
3694 818c7501 2019-07-11 stsp goto done;
3696 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
3697 818c7501 2019-07-11 stsp ok_arg.repo = repo;
3698 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
3701 818c7501 2019-07-11 stsp goto done;
3703 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3705 818c7501 2019-07-11 stsp goto done;
3707 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
3709 818c7501 2019-07-11 stsp goto done;
3711 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
3713 818c7501 2019-07-11 stsp goto done;
3715 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
3718 818c7501 2019-07-11 stsp goto done;
3720 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
3721 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
3723 818c7501 2019-07-11 stsp goto done;
3724 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
3726 818c7501 2019-07-11 stsp goto done;
3728 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
3730 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
3732 818c7501 2019-07-11 stsp goto done;
3734 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
3736 818c7501 2019-07-11 stsp goto done;
3738 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
3739 818c7501 2019-07-11 stsp worktree->base_commit_id);
3741 818c7501 2019-07-11 stsp goto done;
3742 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
3744 818c7501 2019-07-11 stsp goto done;
3746 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
3748 818c7501 2019-07-11 stsp goto done;
3750 818c7501 2019-07-11 stsp free(fileindex_path);
3751 818c7501 2019-07-11 stsp free(tmp_branch_name);
3752 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
3753 818c7501 2019-07-11 stsp free(branch_ref_name);
3754 818c7501 2019-07-11 stsp if (branch_ref)
3755 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
3756 818c7501 2019-07-11 stsp if (wt_branch)
3757 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
3758 818c7501 2019-07-11 stsp if (err) {
3759 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
3760 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
3761 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
3763 818c7501 2019-07-11 stsp if (*tmp_branch) {
3764 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
3765 818c7501 2019-07-11 stsp *tmp_branch = NULL;
3767 3e3a69f1 2019-07-25 stsp if (*fileindex) {
3768 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
3769 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
3771 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
3773 818c7501 2019-07-11 stsp return err;
3776 818c7501 2019-07-11 stsp const struct got_error *
3777 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
3778 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
3779 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
3780 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
3782 818c7501 2019-07-11 stsp const struct got_error *err;
3783 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
3784 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
3785 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
3786 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
3788 818c7501 2019-07-11 stsp *commit_id = NULL;
3789 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
3790 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
3791 3e3a69f1 2019-07-25 stsp *branch = NULL;
3792 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
3794 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
3796 3e3a69f1 2019-07-25 stsp return err;
3798 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
3800 3e3a69f1 2019-07-25 stsp goto done;
3802 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3804 818c7501 2019-07-11 stsp return err;
3806 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
3808 818c7501 2019-07-11 stsp goto done;
3810 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
3812 818c7501 2019-07-11 stsp goto done;
3814 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
3816 818c7501 2019-07-11 stsp goto done;
3818 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
3820 818c7501 2019-07-11 stsp goto done;
3822 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
3823 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
3825 818c7501 2019-07-11 stsp goto done;
3827 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
3829 818c7501 2019-07-11 stsp goto done;
3831 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
3833 818c7501 2019-07-11 stsp goto done;
3835 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
3836 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
3838 818c7501 2019-07-11 stsp goto done;
3840 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
3842 818c7501 2019-07-11 stsp goto done;
3844 818c7501 2019-07-11 stsp free(commit_ref_name);
3845 818c7501 2019-07-11 stsp free(branch_ref_name);
3846 3e3a69f1 2019-07-25 stsp free(fileindex_path);
3847 818c7501 2019-07-11 stsp if (commit_ref)
3848 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
3849 818c7501 2019-07-11 stsp if (branch_ref)
3850 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
3851 818c7501 2019-07-11 stsp if (err) {
3852 818c7501 2019-07-11 stsp free(*commit_id);
3853 818c7501 2019-07-11 stsp *commit_id = NULL;
3854 818c7501 2019-07-11 stsp if (*tmp_branch) {
3855 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
3856 818c7501 2019-07-11 stsp *tmp_branch = NULL;
3858 818c7501 2019-07-11 stsp if (*new_base_branch) {
3859 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
3860 818c7501 2019-07-11 stsp *new_base_branch = NULL;
3862 818c7501 2019-07-11 stsp if (*branch) {
3863 818c7501 2019-07-11 stsp got_ref_close(*branch);
3864 818c7501 2019-07-11 stsp *branch = NULL;
3866 3e3a69f1 2019-07-25 stsp if (*fileindex) {
3867 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
3868 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
3870 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
3872 818c7501 2019-07-11 stsp return err;
3875 818c7501 2019-07-11 stsp const struct got_error *
3876 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
3878 818c7501 2019-07-11 stsp const struct got_error *err;
3879 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
3881 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3883 818c7501 2019-07-11 stsp return err;
3885 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
3886 818c7501 2019-07-11 stsp free(tmp_branch_name);
3887 818c7501 2019-07-11 stsp return NULL;
3890 818c7501 2019-07-11 stsp static const struct got_error *
3891 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
3892 818c7501 2019-07-11 stsp char **logmsg, void *arg)
3894 0ebf8283 2019-07-24 stsp *logmsg = arg;
3895 818c7501 2019-07-11 stsp return NULL;
3898 818c7501 2019-07-11 stsp static const struct got_error *
3899 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
3900 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
3901 537ac44b 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
3903 818c7501 2019-07-11 stsp return NULL;
3906 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
3907 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
3908 01757395 2019-07-12 stsp void *progress_arg;
3909 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
3912 01757395 2019-07-12 stsp static const struct got_error *
3913 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
3915 01757395 2019-07-12 stsp const struct got_error *err;
3916 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
3918 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
3920 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
3922 01757395 2019-07-12 stsp return err;
3924 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
3925 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
3926 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
3927 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
3928 01757395 2019-07-12 stsp return NULL;
3930 01757395 2019-07-12 stsp p = strdup(path);
3931 01757395 2019-07-12 stsp if (p == NULL)
3932 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
3934 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
3935 01757395 2019-07-12 stsp if (err || new == NULL)
3937 01757395 2019-07-12 stsp return err;
3941 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
3943 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
3945 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
3946 01757395 2019-07-12 stsp free((char *)pe->path);
3948 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
3951 0ebf8283 2019-07-24 stsp static const struct got_error *
3952 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
3953 0ebf8283 2019-07-24 stsp struct got_repository *repo)
3955 818c7501 2019-07-11 stsp const struct got_error *err;
3956 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
3958 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
3959 818c7501 2019-07-11 stsp if (err) {
3960 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
3961 818c7501 2019-07-11 stsp goto done;
3962 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
3964 818c7501 2019-07-11 stsp goto done;
3965 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
3967 818c7501 2019-07-11 stsp goto done;
3969 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
3972 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
3974 818c7501 2019-07-11 stsp goto done;
3975 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
3976 818c7501 2019-07-11 stsp free(stored_id);
3977 818c7501 2019-07-11 stsp if (cmp != 0) {
3978 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
3979 818c7501 2019-07-11 stsp goto done;
3983 0ebf8283 2019-07-24 stsp if (commit_ref)
3984 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
3985 0ebf8283 2019-07-24 stsp return err;
3988 0ebf8283 2019-07-24 stsp static const struct got_error *
3989 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
3990 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
3991 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
3992 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
3993 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3994 3e3a69f1 2019-07-25 stsp got_worktree_cancel_cb cancel_cb, void *cancel_arg)
3996 0ebf8283 2019-07-24 stsp const struct got_error *err;
3997 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
3998 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
3999 3e3a69f1 2019-07-25 stsp char *fileindex_path;
4001 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
4003 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
4005 0ebf8283 2019-07-24 stsp return err;
4007 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
4008 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
4009 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
4010 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
4011 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
4012 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
4013 818c7501 2019-07-11 stsp if (commit_ref)
4014 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
4015 818c7501 2019-07-11 stsp return err;
4018 818c7501 2019-07-11 stsp const struct got_error *
4019 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
4020 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
4021 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
4022 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
4023 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4024 0ebf8283 2019-07-24 stsp got_worktree_cancel_cb cancel_cb, void *cancel_arg)
4026 0ebf8283 2019-07-24 stsp const struct got_error *err;
4027 0ebf8283 2019-07-24 stsp char *commit_ref_name;
4029 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4031 0ebf8283 2019-07-24 stsp return err;
4033 0ebf8283 2019-07-24 stsp err = store_commit_id(commit_ref_name, commit_id, repo);
4035 0ebf8283 2019-07-24 stsp goto done;
4037 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
4038 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
4039 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
4041 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4042 0ebf8283 2019-07-24 stsp return err;
4045 0ebf8283 2019-07-24 stsp const struct got_error *
4046 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
4047 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
4048 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
4049 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
4050 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4051 0ebf8283 2019-07-24 stsp got_worktree_cancel_cb cancel_cb, void *cancel_arg)
4053 0ebf8283 2019-07-24 stsp const struct got_error *err;
4054 0ebf8283 2019-07-24 stsp char *commit_ref_name;
4056 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4058 0ebf8283 2019-07-24 stsp return err;
4060 0ebf8283 2019-07-24 stsp err = store_commit_id(commit_ref_name, commit_id, repo);
4062 0ebf8283 2019-07-24 stsp goto done;
4064 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
4065 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
4066 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
4068 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4069 0ebf8283 2019-07-24 stsp return err;
4072 0ebf8283 2019-07-24 stsp static const struct got_error *
4073 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
4074 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
4075 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
4076 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
4077 3e3a69f1 2019-07-25 stsp const char *new_logmsg, struct got_repository *repo)
4079 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
4080 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
4081 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
4082 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
4083 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
4084 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
4085 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
4087 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
4088 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
4090 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
4092 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
4094 3e3a69f1 2019-07-25 stsp return err;
4096 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
4097 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
4098 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
4100 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
4101 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
4102 01757395 2019-07-12 stsp * TODO: Ideally, merged_paths would contain a list of commitables
4103 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
4105 01757395 2019-07-12 stsp if (merged_paths) {
4106 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
4107 8f8646e5 2019-07-25 stsp if (TAILQ_EMPTY(merged_paths)) {
4108 8f8646e5 2019-07-25 stsp err = got_error(GOT_ERR_NO_MERGED_PATHS);
4109 8f8646e5 2019-07-25 stsp goto done;
4111 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
4112 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
4113 01757395 2019-07-12 stsp repo, collect_commitables, &cc_arg, NULL, NULL);
4115 01757395 2019-07-12 stsp goto done;
4118 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
4119 01757395 2019-07-12 stsp collect_commitables, &cc_arg, NULL, NULL);
4121 01757395 2019-07-12 stsp goto done;
4124 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
4125 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
4126 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
4128 a0e95631 2019-07-12 stsp goto done;
4129 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
4130 a0e95631 2019-07-12 stsp goto done;
4133 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
4135 edd02c5e 2019-07-11 stsp goto done;
4137 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
4139 818c7501 2019-07-11 stsp goto done;
4141 0ebf8283 2019-07-24 stsp if (new_logmsg)
4142 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
4144 0ebf8283 2019-07-24 stsp logmsg = strdup(got_object_commit_get_logmsg(orig_commit));
4145 0ebf8283 2019-07-24 stsp if (logmsg == NULL)
4146 0ebf8283 2019-07-24 stsp return got_error_from_errno("strdup");
4148 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
4149 5c1e53bc 2019-07-28 stsp worktree, got_object_commit_get_author(orig_commit),
4150 a0e95631 2019-07-12 stsp got_object_commit_get_committer(orig_commit),
4151 0ebf8283 2019-07-24 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
4153 a0e95631 2019-07-12 stsp goto done;
4155 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
4157 a0e95631 2019-07-12 stsp goto done;
4159 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
4161 a0e95631 2019-07-12 stsp goto done;
4163 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
4164 93ec1b5f 2019-07-12 stsp fileindex);
4165 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4166 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
4167 a0e95631 2019-07-12 stsp err = sync_err;
4169 a0e95631 2019-07-12 stsp free(fileindex_path);
4170 a0e95631 2019-07-12 stsp free(head_commit_id);
4171 a0e95631 2019-07-12 stsp if (head_ref)
4172 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
4173 818c7501 2019-07-11 stsp if (err) {
4174 818c7501 2019-07-11 stsp free(*new_commit_id);
4175 818c7501 2019-07-11 stsp *new_commit_id = NULL;
4177 818c7501 2019-07-11 stsp return err;
4180 818c7501 2019-07-11 stsp const struct got_error *
4181 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
4182 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
4183 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4184 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
4185 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
4187 0ebf8283 2019-07-24 stsp const struct got_error *err;
4188 0ebf8283 2019-07-24 stsp char *commit_ref_name;
4189 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
4190 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
4192 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4194 0ebf8283 2019-07-24 stsp return err;
4196 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4198 0ebf8283 2019-07-24 stsp goto done;
4199 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
4201 0ebf8283 2019-07-24 stsp goto done;
4202 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
4203 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
4204 0ebf8283 2019-07-24 stsp goto done;
4207 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
4208 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
4210 0ebf8283 2019-07-24 stsp if (commit_ref)
4211 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
4212 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4213 0ebf8283 2019-07-24 stsp free(commit_id);
4214 0ebf8283 2019-07-24 stsp return err;
4217 0ebf8283 2019-07-24 stsp const struct got_error *
4218 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
4219 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
4220 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4221 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
4222 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
4223 0ebf8283 2019-07-24 stsp struct got_repository *repo)
4225 0ebf8283 2019-07-24 stsp const struct got_error *err;
4226 0ebf8283 2019-07-24 stsp char *commit_ref_name;
4227 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
4228 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
4230 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4232 0ebf8283 2019-07-24 stsp return err;
4234 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4236 0ebf8283 2019-07-24 stsp goto done;
4237 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
4239 0ebf8283 2019-07-24 stsp goto done;
4240 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
4241 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_COMMITID);
4242 0ebf8283 2019-07-24 stsp goto done;
4245 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
4246 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
4248 0ebf8283 2019-07-24 stsp if (commit_ref)
4249 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
4250 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4251 0ebf8283 2019-07-24 stsp free(commit_id);
4252 0ebf8283 2019-07-24 stsp return err;
4255 0ebf8283 2019-07-24 stsp const struct got_error *
4256 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
4257 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
4259 3e3a69f1 2019-07-25 stsp if (fileindex)
4260 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
4261 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
4264 69844fba 2019-07-11 stsp static const struct got_error *
4265 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
4267 69844fba 2019-07-11 stsp const struct got_error *err;
4268 69844fba 2019-07-11 stsp struct got_reference *ref;
4270 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
4271 69844fba 2019-07-11 stsp if (err) {
4272 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
4273 69844fba 2019-07-11 stsp return NULL;
4274 69844fba 2019-07-11 stsp return err;
4277 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
4278 69844fba 2019-07-11 stsp got_ref_close(ref);
4279 69844fba 2019-07-11 stsp return err;
4282 69844fba 2019-07-11 stsp static const struct got_error *
4283 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
4285 69844fba 2019-07-11 stsp const struct got_error *err;
4286 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
4287 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
4289 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4291 69844fba 2019-07-11 stsp goto done;
4292 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
4294 69844fba 2019-07-11 stsp goto done;
4296 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4298 69844fba 2019-07-11 stsp goto done;
4299 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
4301 69844fba 2019-07-11 stsp goto done;
4303 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4305 69844fba 2019-07-11 stsp goto done;
4306 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
4308 69844fba 2019-07-11 stsp goto done;
4310 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4312 69844fba 2019-07-11 stsp goto done;
4313 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
4315 69844fba 2019-07-11 stsp goto done;
4318 69844fba 2019-07-11 stsp free(tmp_branch_name);
4319 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
4320 69844fba 2019-07-11 stsp free(branch_ref_name);
4321 69844fba 2019-07-11 stsp free(commit_ref_name);
4322 69844fba 2019-07-11 stsp return err;
4325 818c7501 2019-07-11 stsp const struct got_error *
4326 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
4327 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
4328 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
4329 818c7501 2019-07-11 stsp struct got_repository *repo)
4331 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
4332 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
4334 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
4336 818c7501 2019-07-11 stsp return err;
4338 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
4340 818c7501 2019-07-11 stsp goto done;
4342 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
4344 818c7501 2019-07-11 stsp goto done;
4346 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
4348 818c7501 2019-07-11 stsp goto done;
4350 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
4352 3e3a69f1 2019-07-25 stsp if (fileindex)
4353 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
4354 818c7501 2019-07-11 stsp free(new_head_commit_id);
4355 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4356 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
4357 818c7501 2019-07-11 stsp err = unlockerr;
4358 818c7501 2019-07-11 stsp return err;
4361 818c7501 2019-07-11 stsp struct collect_revertible_paths_arg {
4362 818c7501 2019-07-11 stsp struct got_pathlist_head *revertible_paths;
4363 818c7501 2019-07-11 stsp struct got_worktree *worktree;
4366 818c7501 2019-07-11 stsp static const struct got_error *
4367 88d0e355 2019-08-03 stsp collect_revertible_paths(void *arg, unsigned char status,
4368 88d0e355 2019-08-03 stsp unsigned char staged_status, const char *relpath,
4369 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4370 537ac44b 2019-08-03 stsp struct got_object_id *commit_id)
4372 818c7501 2019-07-11 stsp struct collect_revertible_paths_arg *a = arg;
4373 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
4374 818c7501 2019-07-11 stsp struct got_pathlist_entry *new = NULL;
4375 818c7501 2019-07-11 stsp char *path = NULL;
4377 818c7501 2019-07-11 stsp if (status != GOT_STATUS_ADD &&
4378 818c7501 2019-07-11 stsp status != GOT_STATUS_DELETE &&
4379 818c7501 2019-07-11 stsp status != GOT_STATUS_MODIFY &&
4380 818c7501 2019-07-11 stsp status != GOT_STATUS_CONFLICT &&
4381 818c7501 2019-07-11 stsp status != GOT_STATUS_MISSING)
4382 818c7501 2019-07-11 stsp return NULL;
4384 818c7501 2019-07-11 stsp if (asprintf(&path, "%s/%s", a->worktree->root_path, relpath) == -1)
4385 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
4387 818c7501 2019-07-11 stsp err = got_pathlist_insert(&new, a->revertible_paths, path, NULL);
4388 818c7501 2019-07-11 stsp if (err || new == NULL)
4389 818c7501 2019-07-11 stsp free(path);
4390 818c7501 2019-07-11 stsp return err;
4393 818c7501 2019-07-11 stsp const struct got_error *
4394 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
4395 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
4396 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
4397 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
4399 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
4400 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
4401 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
4402 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
4403 818c7501 2019-07-11 stsp struct got_pathlist_head revertible_paths;
4404 818c7501 2019-07-11 stsp struct got_pathlist_entry *pe;
4405 818c7501 2019-07-11 stsp struct collect_revertible_paths_arg crp_arg;
4406 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
4408 818c7501 2019-07-11 stsp TAILQ_INIT(&revertible_paths);
4410 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
4412 818c7501 2019-07-11 stsp return err;
4414 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
4415 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
4417 818c7501 2019-07-11 stsp goto done;
4419 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
4421 818c7501 2019-07-11 stsp goto done;
4424 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
4425 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
4426 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
4428 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
4430 818c7501 2019-07-11 stsp goto done;
4432 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
4434 818c7501 2019-07-11 stsp goto done;
4436 ca355955 2019-07-12 stsp err = got_object_id_by_path(&tree_id, repo,
4437 ca355955 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
4439 ca355955 2019-07-12 stsp goto done;
4441 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
4443 ca355955 2019-07-12 stsp goto done;
4445 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
4447 818c7501 2019-07-11 stsp goto done;
4449 347d1d3e 2019-07-12 stsp crp_arg.revertible_paths = &revertible_paths;
4450 347d1d3e 2019-07-12 stsp crp_arg.worktree = worktree;
4451 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
4452 347d1d3e 2019-07-12 stsp collect_revertible_paths, &crp_arg, NULL, NULL);
4454 55bd499d 2019-07-12 stsp goto done;
4456 818c7501 2019-07-11 stsp TAILQ_FOREACH(pe, &revertible_paths, entry) {
4457 818c7501 2019-07-11 stsp err = revert_file(worktree, fileindex, pe->path,
4458 818c7501 2019-07-11 stsp progress_cb, progress_arg, repo);
4460 ca355955 2019-07-12 stsp goto sync;
4463 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
4464 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
4466 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4467 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
4468 ca355955 2019-07-12 stsp err = sync_err;
4470 818c7501 2019-07-11 stsp got_ref_close(resolved);
4471 a3a2faf2 2019-07-12 stsp free(tree_id);
4472 818c7501 2019-07-11 stsp free(commit_id);
4473 0ebf8283 2019-07-24 stsp if (fileindex)
4474 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
4475 0ebf8283 2019-07-24 stsp free(fileindex_path);
4476 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(pe, &revertible_paths, entry)
4477 0ebf8283 2019-07-24 stsp free((char *)pe->path);
4478 0ebf8283 2019-07-24 stsp got_pathlist_free(&revertible_paths);
4480 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4481 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
4482 0ebf8283 2019-07-24 stsp err = unlockerr;
4483 0ebf8283 2019-07-24 stsp return err;
4486 0ebf8283 2019-07-24 stsp const struct got_error *
4487 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
4488 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
4489 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
4490 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
4492 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4493 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
4494 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
4495 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
4496 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
4497 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
4498 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
4499 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
4501 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
4502 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
4503 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
4504 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4506 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
4508 0ebf8283 2019-07-24 stsp return err;
4510 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
4512 0ebf8283 2019-07-24 stsp goto done;
4514 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
4515 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
4516 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
4519 0ebf8283 2019-07-24 stsp goto done;
4521 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
4523 0ebf8283 2019-07-24 stsp goto done;
4525 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
4527 0ebf8283 2019-07-24 stsp goto done;
4529 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
4530 0ebf8283 2019-07-24 stsp worktree);
4532 0ebf8283 2019-07-24 stsp goto done;
4534 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
4537 0ebf8283 2019-07-24 stsp goto done;
4539 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
4541 0ebf8283 2019-07-24 stsp goto done;
4543 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
4545 0ebf8283 2019-07-24 stsp goto done;
4547 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
4548 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
4550 0ebf8283 2019-07-24 stsp goto done;
4551 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
4553 0ebf8283 2019-07-24 stsp goto done;
4554 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
4555 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
4556 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
4557 0ebf8283 2019-07-24 stsp goto done;
4560 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
4561 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
4563 0ebf8283 2019-07-24 stsp goto done;
4564 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
4566 0ebf8283 2019-07-24 stsp goto done;
4568 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
4570 0ebf8283 2019-07-24 stsp goto done;
4572 0ebf8283 2019-07-24 stsp free(fileindex_path);
4573 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
4574 0ebf8283 2019-07-24 stsp free(branch_ref_name);
4575 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
4576 0ebf8283 2019-07-24 stsp if (wt_branch)
4577 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
4578 0ebf8283 2019-07-24 stsp if (err) {
4579 0ebf8283 2019-07-24 stsp if (*branch_ref) {
4580 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
4581 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
4583 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
4584 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
4585 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
4587 0ebf8283 2019-07-24 stsp free(*base_commit_id);
4588 3e3a69f1 2019-07-25 stsp if (*fileindex) {
4589 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
4590 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4592 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
4594 0ebf8283 2019-07-24 stsp return err;
4597 0ebf8283 2019-07-24 stsp const struct got_error *
4598 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
4599 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
4601 3e3a69f1 2019-07-25 stsp if (fileindex)
4602 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
4603 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
4606 0ebf8283 2019-07-24 stsp const struct got_error *
4607 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
4608 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
4610 0ebf8283 2019-07-24 stsp const struct got_error *err;
4611 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
4613 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
4615 0ebf8283 2019-07-24 stsp return err;
4617 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
4618 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
4619 0ebf8283 2019-07-24 stsp return NULL;
4622 0ebf8283 2019-07-24 stsp const struct got_error *
4623 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
4624 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
4625 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
4626 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
4628 0ebf8283 2019-07-24 stsp const struct got_error *err;
4629 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
4630 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
4631 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
4632 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
4633 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
4635 0ebf8283 2019-07-24 stsp *commit_id = NULL;
4636 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
4637 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
4638 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4640 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
4642 3e3a69f1 2019-07-25 stsp return err;
4644 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
4646 3e3a69f1 2019-07-25 stsp goto done;
4648 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
4650 0ebf8283 2019-07-24 stsp return err;
4652 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
4654 0ebf8283 2019-07-24 stsp goto done;
4656 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4658 0ebf8283 2019-07-24 stsp goto done;
4660 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
4661 0ebf8283 2019-07-24 stsp worktree);
4663 0ebf8283 2019-07-24 stsp goto done;
4665 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
4667 0ebf8283 2019-07-24 stsp goto done;
4669 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4671 0ebf8283 2019-07-24 stsp goto done;
4672 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
4674 0ebf8283 2019-07-24 stsp goto done;
4676 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
4678 0ebf8283 2019-07-24 stsp goto done;
4679 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
4681 0ebf8283 2019-07-24 stsp goto done;
4683 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
4685 0ebf8283 2019-07-24 stsp goto done;
4687 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4688 0ebf8283 2019-07-24 stsp free(branch_ref_name);
4689 3e3a69f1 2019-07-25 stsp free(fileindex_path);
4690 0ebf8283 2019-07-24 stsp if (commit_ref)
4691 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
4692 0ebf8283 2019-07-24 stsp if (base_commit_ref)
4693 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
4694 0ebf8283 2019-07-24 stsp if (err) {
4695 0ebf8283 2019-07-24 stsp free(*commit_id);
4696 0ebf8283 2019-07-24 stsp *commit_id = NULL;
4697 0ebf8283 2019-07-24 stsp free(*base_commit_id);
4698 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
4699 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
4700 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
4701 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
4703 3e3a69f1 2019-07-25 stsp if (*fileindex) {
4704 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
4705 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4707 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
4709 0ebf8283 2019-07-24 stsp return err;
4712 0ebf8283 2019-07-24 stsp static const struct got_error *
4713 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
4715 0ebf8283 2019-07-24 stsp const struct got_error *err;
4716 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
4717 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
4719 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
4721 0ebf8283 2019-07-24 stsp goto done;
4722 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
4724 0ebf8283 2019-07-24 stsp goto done;
4726 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
4727 0ebf8283 2019-07-24 stsp worktree);
4729 0ebf8283 2019-07-24 stsp goto done;
4730 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
4732 0ebf8283 2019-07-24 stsp goto done;
4734 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
4736 0ebf8283 2019-07-24 stsp goto done;
4737 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
4739 0ebf8283 2019-07-24 stsp goto done;
4741 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4743 0ebf8283 2019-07-24 stsp goto done;
4744 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
4746 0ebf8283 2019-07-24 stsp goto done;
4748 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
4749 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
4750 0ebf8283 2019-07-24 stsp free(branch_ref_name);
4751 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4752 0ebf8283 2019-07-24 stsp return err;
4755 0ebf8283 2019-07-24 stsp const struct got_error *
4756 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
4757 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
4758 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
4759 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
4761 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
4762 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
4763 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
4764 0ebf8283 2019-07-24 stsp struct got_pathlist_head revertible_paths;
4765 0ebf8283 2019-07-24 stsp struct got_pathlist_entry *pe;
4766 0ebf8283 2019-07-24 stsp struct collect_revertible_paths_arg crp_arg;
4767 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
4769 0ebf8283 2019-07-24 stsp TAILQ_INIT(&revertible_paths);
4771 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
4773 0ebf8283 2019-07-24 stsp return err;
4775 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
4776 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
4778 0ebf8283 2019-07-24 stsp goto done;
4780 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
4782 0ebf8283 2019-07-24 stsp goto done;
4784 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
4786 0ebf8283 2019-07-24 stsp goto done;
4788 0ebf8283 2019-07-24 stsp err = got_object_id_by_path(&tree_id, repo, base_commit_id,
4789 0ebf8283 2019-07-24 stsp worktree->path_prefix);
4791 0ebf8283 2019-07-24 stsp goto done;
4793 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
4795 0ebf8283 2019-07-24 stsp goto done;
4797 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
4799 0ebf8283 2019-07-24 stsp goto done;
4801 0ebf8283 2019-07-24 stsp crp_arg.revertible_paths = &revertible_paths;
4802 0ebf8283 2019-07-24 stsp crp_arg.worktree = worktree;
4803 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
4804 0ebf8283 2019-07-24 stsp collect_revertible_paths, &crp_arg, NULL, NULL);
4806 0ebf8283 2019-07-24 stsp goto done;
4808 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(pe, &revertible_paths, entry) {
4809 0ebf8283 2019-07-24 stsp err = revert_file(worktree, fileindex, pe->path,
4810 0ebf8283 2019-07-24 stsp progress_cb, progress_arg, repo);
4812 0ebf8283 2019-07-24 stsp goto sync;
4815 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
4816 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
4818 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4819 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
4820 0ebf8283 2019-07-24 stsp err = sync_err;
4822 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
4823 0ebf8283 2019-07-24 stsp free(tree_id);
4824 818c7501 2019-07-11 stsp free(fileindex_path);
4825 818c7501 2019-07-11 stsp TAILQ_FOREACH(pe, &revertible_paths, entry)
4826 818c7501 2019-07-11 stsp free((char *)pe->path);
4827 818c7501 2019-07-11 stsp got_pathlist_free(&revertible_paths);
4829 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4830 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
4831 818c7501 2019-07-11 stsp err = unlockerr;
4832 818c7501 2019-07-11 stsp return err;
4835 0ebf8283 2019-07-24 stsp const struct got_error *
4836 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
4837 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4838 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
4840 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr;
4841 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
4842 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
4844 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
4846 0ebf8283 2019-07-24 stsp return err;
4848 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
4849 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
4851 0ebf8283 2019-07-24 stsp goto done;
4853 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
4855 0ebf8283 2019-07-24 stsp goto done;
4857 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
4859 0ebf8283 2019-07-24 stsp goto done;
4861 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
4863 0ebf8283 2019-07-24 stsp goto done;
4865 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
4867 3e3a69f1 2019-07-25 stsp if (fileindex)
4868 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
4869 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
4870 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4871 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
4872 0ebf8283 2019-07-24 stsp err = unlockerr;
4873 0ebf8283 2019-07-24 stsp return err;
4876 0ebf8283 2019-07-24 stsp const struct got_error *
4877 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
4878 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
4880 0ebf8283 2019-07-24 stsp const struct got_error *err;
4881 0ebf8283 2019-07-24 stsp char *commit_ref_name;
4883 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4885 0ebf8283 2019-07-24 stsp return err;
4887 0ebf8283 2019-07-24 stsp err = store_commit_id(commit_ref_name, commit_id, repo);
4889 0ebf8283 2019-07-24 stsp goto done;
4891 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
4893 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4894 0cb83759 2019-08-03 stsp return err;
4897 0cb83759 2019-08-03 stsp static const struct got_error *
4898 42005733 2019-08-03 stsp stage_path(const char *relpath, const char *ondisk_path,
4899 42005733 2019-08-03 stsp const char *path_content, struct got_worktree *worktree,
4900 42005733 2019-08-03 stsp struct got_fileindex *fileindex, struct got_repository *repo,
4901 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg)
4903 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
4904 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
4905 0cb83759 2019-08-03 stsp unsigned char status;
4906 0cb83759 2019-08-03 stsp struct stat sb;
4907 537ac44b 2019-08-03 stsp struct got_object_id blob_id, *staged_blob_id = NULL;
4908 0cb83759 2019-08-03 stsp uint32_t stage;
4910 42005733 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, relpath, strlen(relpath));
4911 0cb83759 2019-08-03 stsp if (ie == NULL) {
4912 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4913 0cb83759 2019-08-03 stsp goto done;
4916 0cb83759 2019-08-03 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
4918 0cb83759 2019-08-03 stsp goto done;
4920 0cb83759 2019-08-03 stsp switch (status) {
4921 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
4922 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
4923 537ac44b 2019-08-03 stsp err = got_object_blob_create(&staged_blob_id,
4924 fdfa9bf2 2019-08-03 stsp path_content ? path_content : ondisk_path, repo);
4926 0cb83759 2019-08-03 stsp goto done;
4927 537ac44b 2019-08-03 stsp memcpy(&blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
4928 537ac44b 2019-08-03 stsp memcpy(ie->staged_blob_sha1, staged_blob_id->sha1,
4929 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
4930 0cb83759 2019-08-03 stsp if (status == GOT_STATUS_ADD)
4931 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
4933 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
4934 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
4935 537ac44b 2019-08-03 stsp err = (*status_cb)(status_arg, GOT_STATUS_NO_CHANGE,
4936 537ac44b 2019-08-03 stsp get_staged_status(ie), relpath, &blob_id,
4937 537ac44b 2019-08-03 stsp staged_blob_id, NULL);
4939 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
4940 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
4941 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
4942 537ac44b 2019-08-03 stsp err = (*status_cb)(status_arg, GOT_STATUS_NO_CHANGE,
4943 537ac44b 2019-08-03 stsp get_staged_status(ie), relpath, NULL, NULL, NULL);
4946 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4950 537ac44b 2019-08-03 stsp free(staged_blob_id);
4951 0ebf8283 2019-07-24 stsp return err;
4954 0cb83759 2019-08-03 stsp const struct got_error *
4955 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
4956 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
4957 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
4958 1e71573e 2019-08-03 stsp struct got_repository *repo)
4960 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
4961 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
4962 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
4963 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
4965 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
4967 0cb83759 2019-08-03 stsp return err;
4969 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4971 0cb83759 2019-08-03 stsp goto done;
4973 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
4974 42005733 2019-08-03 stsp char *relpath;
4975 42005733 2019-08-03 stsp err = got_path_skip_common_ancestor(&relpath,
4976 42005733 2019-08-03 stsp got_worktree_get_root_path(worktree), pe->path);
4979 42005733 2019-08-03 stsp err = stage_path(relpath, pe->path,
4980 42005733 2019-08-03 stsp (const char *)pe->data, worktree, fileindex, repo,
4981 42005733 2019-08-03 stsp status_cb, status_arg);
4982 42005733 2019-08-03 stsp free(relpath);
4987 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4988 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
4989 0cb83759 2019-08-03 stsp err = sync_err;
4991 0cb83759 2019-08-03 stsp free(fileindex_path);
4992 0cb83759 2019-08-03 stsp if (fileindex)
4993 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
4994 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4995 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
4996 0cb83759 2019-08-03 stsp err = unlockerr;
4997 0cb83759 2019-08-03 stsp return err;
