2 5d56da81 2019-01-13 stsp * Copyright (c) 2018, 2019 Stefan Sperling <stsp@openbsd.org>
4 86c3caaf 2018-03-09 stsp * Permission to use, copy, modify, and distribute this software for any
5 86c3caaf 2018-03-09 stsp * purpose with or without fee is hereby granted, provided that the above
6 86c3caaf 2018-03-09 stsp * copyright notice and this permission notice appear in all copies.
8 86c3caaf 2018-03-09 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 86c3caaf 2018-03-09 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 86c3caaf 2018-03-09 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 86c3caaf 2018-03-09 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 86c3caaf 2018-03-09 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 86c3caaf 2018-03-09 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 86c3caaf 2018-03-09 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 86c3caaf 2018-03-09 stsp #include <sys/stat.h>
18 6d9d28c3 2018-03-11 stsp #include <sys/limits.h>
19 9d31a1d8 2018-03-11 stsp #include <sys/queue.h>
20 133d2798 2019-01-08 stsp #include <sys/tree.h>
22 d1f6d47b 2019-02-04 stsp #include <dirent.h>
23 f5c49f82 2019-01-06 stsp #include <stddef.h>
24 86c3caaf 2018-03-09 stsp #include <string.h>
25 86c3caaf 2018-03-09 stsp #include <stdio.h>
26 86c3caaf 2018-03-09 stsp #include <stdlib.h>
27 86c3caaf 2018-03-09 stsp #include <fcntl.h>
28 86c3caaf 2018-03-09 stsp #include <errno.h>
29 86c3caaf 2018-03-09 stsp #include <unistd.h>
30 9d31a1d8 2018-03-11 stsp #include <sha1.h>
31 9d31a1d8 2018-03-11 stsp #include <zlib.h>
32 9d31a1d8 2018-03-11 stsp #include <fnmatch.h>
33 512f0d0e 2019-01-02 stsp #include <libgen.h>
34 ec22038e 2019-03-10 stsp #include <uuid.h>
35 7154f6ce 2019-03-27 stsp #include <util.h>
37 86c3caaf 2018-03-09 stsp #include "got_error.h"
38 86c3caaf 2018-03-09 stsp #include "got_repository.h"
39 5261c201 2018-04-01 stsp #include "got_reference.h"
40 9d31a1d8 2018-03-11 stsp #include "got_object.h"
41 1dd54920 2019-05-11 stsp #include "got_path.h"
42 86c3caaf 2018-03-09 stsp #include "got_worktree.h"
43 511a516b 2018-05-19 stsp #include "got_opentemp.h"
44 234035bc 2019-06-01 stsp #include "got_diff.h"
46 718b3ab0 2018-03-17 stsp #include "got_lib_worktree.h"
47 718b3ab0 2018-03-17 stsp #include "got_lib_sha1.h"
48 718b3ab0 2018-03-17 stsp #include "got_lib_fileindex.h"
49 63581804 2018-07-09 stsp #include "got_lib_inflate.h"
50 718b3ab0 2018-03-17 stsp #include "got_lib_delta.h"
51 718b3ab0 2018-03-17 stsp #include "got_lib_object.h"
52 ed175427 2019-05-09 stsp #include "got_lib_object_parse.h"
53 cf066bf8 2019-05-09 stsp #include "got_lib_object_create.h"
54 24519714 2019-05-09 stsp #include "got_lib_object_idset.h"
55 6353ad76 2019-02-08 stsp #include "got_lib_diff.h"
58 9d31a1d8 2018-03-11 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
61 99724ed4 2018-03-10 stsp static const struct got_error *
62 7ac97322 2018-03-11 stsp create_meta_file(const char *path_got, const char *name, const char *content)
64 99724ed4 2018-03-10 stsp const struct got_error *err = NULL;
67 2c7829a4 2019-06-17 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1)
68 2c7829a4 2019-06-17 stsp return got_error_from_errno("asprintf");
70 2c7829a4 2019-06-17 stsp err = got_path_create_file(path, content);
75 507dc3bb 2018-12-29 stsp static const struct got_error *
76 507dc3bb 2018-12-29 stsp update_meta_file(const char *path_got, const char *name, const char *content)
78 507dc3bb 2018-12-29 stsp const struct got_error *err = NULL;
79 507dc3bb 2018-12-29 stsp FILE *tmpfile = NULL;
80 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
81 507dc3bb 2018-12-29 stsp char *path = NULL;
83 507dc3bb 2018-12-29 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
84 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
85 507dc3bb 2018-12-29 stsp path = NULL;
89 507dc3bb 2018-12-29 stsp err = got_opentemp_named(&tmppath, &tmpfile, path);
93 507dc3bb 2018-12-29 stsp if (content) {
94 507dc3bb 2018-12-29 stsp int len = fprintf(tmpfile, "%s\n", content);
95 507dc3bb 2018-12-29 stsp if (len != strlen(content) + 1) {
96 638f9024 2019-05-13 stsp err = got_error_from_errno2("fprintf", tmppath);
101 507dc3bb 2018-12-29 stsp if (rename(tmppath, path) != 0) {
102 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath, path);
103 2a57020b 2019-02-20 stsp unlink(tmppath);
108 fb43ecf1 2019-02-11 stsp if (fclose(tmpfile) != 0 && err == NULL)
109 638f9024 2019-05-13 stsp err = got_error_from_errno2("fclose", tmppath);
110 230a42bd 2019-05-11 jcs free(tmppath);
111 99724ed4 2018-03-10 stsp return err;
114 09fe317a 2018-03-11 stsp static const struct got_error *
115 7ac97322 2018-03-11 stsp read_meta_file(char **content, const char *path_got, const char *name)
117 09fe317a 2018-03-11 stsp const struct got_error *err = NULL;
118 09fe317a 2018-03-11 stsp char *path;
119 09fe317a 2018-03-11 stsp int fd = -1;
121 09fe317a 2018-03-11 stsp struct stat sb;
123 09fe317a 2018-03-11 stsp *content = NULL;
125 7ac97322 2018-03-11 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
126 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
127 09fe317a 2018-03-11 stsp path = NULL;
131 ef99fdb1 2018-03-11 stsp fd = open(path, O_RDONLY | O_NOFOLLOW);
132 09fe317a 2018-03-11 stsp if (fd == -1) {
133 f02eaa22 2019-03-11 stsp if (errno == ENOENT)
134 f02eaa22 2019-03-11 stsp err = got_error(GOT_ERR_WORKTREE_META);
136 638f9024 2019-05-13 stsp err = got_error_from_errno2("open", path);
139 ef99fdb1 2018-03-11 stsp if (flock(fd, LOCK_SH | LOCK_NB) == -1) {
140 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
141 638f9024 2019-05-13 stsp : got_error_from_errno2("flock", path));
145 d10c9b58 2019-02-19 stsp if (lstat(path, &sb) != 0) {
146 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", path);
149 09fe317a 2018-03-11 stsp *content = calloc(1, sb.st_size);
150 09fe317a 2018-03-11 stsp if (*content == NULL) {
151 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
155 09fe317a 2018-03-11 stsp n = read(fd, *content, sb.st_size);
156 09fe317a 2018-03-11 stsp if (n != sb.st_size) {
157 638f9024 2019-05-13 stsp err = (n == -1 ? got_error_from_errno2("read", path) :
158 0605801d 2018-03-11 stsp got_error(GOT_ERR_WORKTREE_META));
161 09fe317a 2018-03-11 stsp if ((*content)[sb.st_size - 1] != '\n') {
162 09fe317a 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_META);
165 09fe317a 2018-03-11 stsp (*content)[sb.st_size - 1] = '\0';
168 09fe317a 2018-03-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
169 638f9024 2019-05-13 stsp err = got_error_from_errno2("close", path_got);
170 09fe317a 2018-03-11 stsp free(path);
172 09fe317a 2018-03-11 stsp free(*content);
173 09fe317a 2018-03-11 stsp *content = NULL;
175 09fe317a 2018-03-11 stsp return err;
178 024e9686 2019-05-14 stsp static const struct got_error *
179 024e9686 2019-05-14 stsp write_head_ref(const char *path_got, struct got_reference *head_ref)
181 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
182 024e9686 2019-05-14 stsp char *refstr = NULL;
184 024e9686 2019-05-14 stsp if (got_ref_is_symbolic(head_ref)) {
185 024e9686 2019-05-14 stsp refstr = got_ref_to_str(head_ref);
186 024e9686 2019-05-14 stsp if (refstr == NULL)
187 024e9686 2019-05-14 stsp return got_error_from_errno("got_ref_to_str");
189 024e9686 2019-05-14 stsp refstr = strdup(got_ref_get_name(head_ref));
190 024e9686 2019-05-14 stsp if (refstr == NULL)
191 024e9686 2019-05-14 stsp return got_error_from_errno("strdup");
193 024e9686 2019-05-14 stsp err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
194 024e9686 2019-05-14 stsp free(refstr);
195 024e9686 2019-05-14 stsp return err;
198 86c3caaf 2018-03-09 stsp const struct got_error *
199 86c3caaf 2018-03-09 stsp got_worktree_init(const char *path, struct got_reference *head_ref,
200 577ec78f 2018-03-11 stsp const char *prefix, struct got_repository *repo)
202 86c3caaf 2018-03-09 stsp const struct got_error *err = NULL;
203 65596e15 2018-12-24 stsp struct got_object_id *commit_id = NULL;
204 ec22038e 2019-03-10 stsp uuid_t uuid;
205 ec22038e 2019-03-10 stsp uint32_t uuid_status;
206 65596e15 2018-12-24 stsp int obj_type;
207 7ac97322 2018-03-11 stsp char *path_got = NULL;
208 1451e70d 2018-03-10 stsp char *formatstr = NULL;
209 0bb8a95e 2018-03-12 stsp char *absprefix = NULL;
210 65596e15 2018-12-24 stsp char *basestr = NULL;
211 ec22038e 2019-03-10 stsp char *uuidstr = NULL;
213 0c48fee2 2019-03-11 stsp if (strcmp(path, got_repo_get_path(repo)) == 0) {
214 0c48fee2 2019-03-11 stsp err = got_error(GOT_ERR_WORKTREE_REPO);
218 65596e15 2018-12-24 stsp err = got_ref_resolve(&commit_id, repo, head_ref);
220 65596e15 2018-12-24 stsp return err;
221 65596e15 2018-12-24 stsp err = got_object_get_type(&obj_type, repo, commit_id);
223 65596e15 2018-12-24 stsp return err;
224 65596e15 2018-12-24 stsp if (obj_type != GOT_OBJ_TYPE_COMMIT)
225 65596e15 2018-12-24 stsp return got_error(GOT_ERR_OBJ_TYPE);
227 0bb8a95e 2018-03-12 stsp if (!got_path_is_absolute(prefix)) {
228 0bb8a95e 2018-03-12 stsp if (asprintf(&absprefix, "/%s", prefix) == -1)
229 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
232 86c3caaf 2018-03-09 stsp /* Create top-level directory (may already exist). */
233 2cb4bacb 2018-03-11 stsp if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
234 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path);
238 86c3caaf 2018-03-09 stsp /* Create .got directory (may already exist). */
239 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
240 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
243 7ac97322 2018-03-11 stsp if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
244 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path_got);
248 056e7441 2018-03-11 stsp /* Create an empty lock file. */
249 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
253 86c3caaf 2018-03-09 stsp /* Create an empty file index. */
254 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
258 08d425ea 2018-12-24 stsp /* Write the HEAD reference. */
259 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
263 65596e15 2018-12-24 stsp /* Record our base commit. */
264 65596e15 2018-12-24 stsp err = got_object_id_str(&basestr, commit_id);
267 0f92850e 2018-12-25 stsp err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
271 1451e70d 2018-03-10 stsp /* Store path to repository. */
272 7839bc15 2019-01-06 stsp err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
273 7839bc15 2019-01-06 stsp got_repo_get_path(repo));
277 577ec78f 2018-03-11 stsp /* Store in-repository path prefix. */
278 0bb8a95e 2018-03-12 stsp err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
279 0bb8a95e 2018-03-12 stsp absprefix ? absprefix : prefix);
283 ec22038e 2019-03-10 stsp /* Generate UUID. */
284 ec22038e 2019-03-10 stsp uuid_create(&uuid, &uuid_status);
285 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
286 ec22038e 2019-03-10 stsp err = got_error_uuid(uuid_status);
289 ec22038e 2019-03-10 stsp uuid_to_string(&uuid, &uuidstr, &uuid_status);
290 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
291 ec22038e 2019-03-10 stsp err = got_error_uuid(uuid_status);
294 ec22038e 2019-03-10 stsp err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
298 9dce68ed 2018-03-10 stsp /* Stamp work tree with format file. */
299 1451e70d 2018-03-10 stsp if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
300 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
303 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
308 65596e15 2018-12-24 stsp free(commit_id);
309 7ac97322 2018-03-11 stsp free(path_got);
310 1451e70d 2018-03-10 stsp free(formatstr);
311 0bb8a95e 2018-03-12 stsp free(absprefix);
312 65596e15 2018-12-24 stsp free(basestr);
313 ec22038e 2019-03-10 stsp free(uuidstr);
314 86c3caaf 2018-03-09 stsp return err;
317 247140b2 2019-02-05 stsp static const struct got_error *
318 247140b2 2019-02-05 stsp open_worktree(struct got_worktree **worktree, const char *path)
320 6d9d28c3 2018-03-11 stsp const struct got_error *err = NULL;
321 7ac97322 2018-03-11 stsp char *path_got;
322 6d9d28c3 2018-03-11 stsp char *formatstr = NULL;
323 c442a90d 2019-03-10 stsp char *uuidstr = NULL;
324 056e7441 2018-03-11 stsp char *path_lock = NULL;
325 eaccb85f 2018-12-25 stsp char *base_commit_id_str = NULL;
326 6d9d28c3 2018-03-11 stsp int version, fd = -1;
327 6d9d28c3 2018-03-11 stsp const char *errstr;
328 eaccb85f 2018-12-25 stsp struct got_repository *repo = NULL;
329 c442a90d 2019-03-10 stsp uint32_t uuid_status;
331 6d9d28c3 2018-03-11 stsp *worktree = NULL;
333 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
334 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
335 7ac97322 2018-03-11 stsp path_got = NULL;
339 7ac97322 2018-03-11 stsp if (asprintf(&path_lock, "%s/%s", path_got, GOT_WORKTREE_LOCK) == -1) {
340 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
341 056e7441 2018-03-11 stsp path_lock = NULL;
345 056e7441 2018-03-11 stsp fd = open(path_lock, O_RDWR | O_EXLOCK | O_NONBLOCK);
346 6d9d28c3 2018-03-11 stsp if (fd == -1) {
347 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
348 638f9024 2019-05-13 stsp : got_error_from_errno2("open", path_lock));
352 7ac97322 2018-03-11 stsp err = read_meta_file(&formatstr, path_got, GOT_WORKTREE_FORMAT);
356 6d9d28c3 2018-03-11 stsp version = strtonum(formatstr, 1, INT_MAX, &errstr);
357 6d9d28c3 2018-03-11 stsp if (errstr) {
358 6d9d28c3 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_META);
361 6d9d28c3 2018-03-11 stsp if (version != GOT_WORKTREE_FORMAT_VERSION) {
362 6d9d28c3 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_VERS);
366 6d9d28c3 2018-03-11 stsp *worktree = calloc(1, sizeof(**worktree));
367 6d9d28c3 2018-03-11 stsp if (*worktree == NULL) {
368 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
371 056e7441 2018-03-11 stsp (*worktree)->lockfd = -1;
373 0647c563 2019-03-11 stsp (*worktree)->root_path = strdup(path);
374 c88eb298 2018-03-11 stsp if ((*worktree)->root_path == NULL) {
375 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
378 cde76477 2018-03-11 stsp err = read_meta_file(&(*worktree)->repo_path, path_got,
379 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_REPOSITORY);
383 7ac97322 2018-03-11 stsp err = read_meta_file(&(*worktree)->path_prefix, path_got,
384 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_PATH_PREFIX);
388 eaccb85f 2018-12-25 stsp err = read_meta_file(&base_commit_id_str, path_got,
389 0f92850e 2018-12-25 stsp GOT_WORKTREE_BASE_COMMIT);
393 c442a90d 2019-03-10 stsp err = read_meta_file(&uuidstr, path_got, GOT_WORKTREE_UUID);
396 c442a90d 2019-03-10 stsp uuid_from_string(uuidstr, &(*worktree)->uuid, &uuid_status);
397 c442a90d 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
398 c442a90d 2019-03-10 stsp err = got_error_uuid(uuid_status);
402 eaccb85f 2018-12-25 stsp err = got_repo_open(&repo, (*worktree)->repo_path);
406 eaccb85f 2018-12-25 stsp err = got_object_resolve_id_str(&(*worktree)->base_commit_id, repo,
407 eaccb85f 2018-12-25 stsp base_commit_id_str);
411 36a38700 2019-05-10 stsp err = read_meta_file(&(*worktree)->head_ref_name, path_got,
412 36a38700 2019-05-10 stsp GOT_WORKTREE_HEAD_REF);
415 eaccb85f 2018-12-25 stsp got_repo_close(repo);
416 7ac97322 2018-03-11 stsp free(path_got);
417 056e7441 2018-03-11 stsp free(path_lock);
418 eaccb85f 2018-12-25 stsp free(base_commit_id_str);
419 c442a90d 2019-03-10 stsp free(uuidstr);
420 bd165944 2019-03-10 stsp free(formatstr);
422 6d9d28c3 2018-03-11 stsp if (fd != -1)
424 6d9d28c3 2018-03-11 stsp if (*worktree != NULL)
425 6d9d28c3 2018-03-11 stsp got_worktree_close(*worktree);
426 6d9d28c3 2018-03-11 stsp *worktree = NULL;
428 056e7441 2018-03-11 stsp (*worktree)->lockfd = fd;
430 6d9d28c3 2018-03-11 stsp return err;
433 247140b2 2019-02-05 stsp const struct got_error *
434 247140b2 2019-02-05 stsp got_worktree_open(struct got_worktree **worktree, const char *path)
436 247140b2 2019-02-05 stsp const struct got_error *err = NULL;
439 247140b2 2019-02-05 stsp err = open_worktree(worktree, path);
440 f02eaa22 2019-03-11 stsp if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT))
441 247140b2 2019-02-05 stsp return err;
442 247140b2 2019-02-05 stsp if (*worktree)
443 247140b2 2019-02-05 stsp return NULL;
444 247140b2 2019-02-05 stsp path = dirname(path);
445 d1542a27 2019-02-05 stsp if (path == NULL)
446 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
447 d1542a27 2019-02-05 stsp } while (!((path[0] == '.' || path[0] == '/') && path[1] == '\0'));
449 247140b2 2019-02-05 stsp return got_error(GOT_ERR_NOT_WORKTREE);
452 3a6ce05a 2019-02-11 stsp const struct got_error *
453 86c3caaf 2018-03-09 stsp got_worktree_close(struct got_worktree *worktree)
455 3a6ce05a 2019-02-11 stsp const struct got_error *err = NULL;
456 c88eb298 2018-03-11 stsp free(worktree->root_path);
457 cde76477 2018-03-11 stsp free(worktree->repo_path);
458 6d9d28c3 2018-03-11 stsp free(worktree->path_prefix);
459 eaccb85f 2018-12-25 stsp free(worktree->base_commit_id);
460 36a38700 2019-05-10 stsp free(worktree->head_ref_name);
461 056e7441 2018-03-11 stsp if (worktree->lockfd != -1)
462 3a6ce05a 2019-02-11 stsp if (close(worktree->lockfd) != 0)
463 638f9024 2019-05-13 stsp err = got_error_from_errno2("close",
464 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree));
465 6d9d28c3 2018-03-11 stsp free(worktree);
466 3a6ce05a 2019-02-11 stsp return err;
469 2fbdb5ae 2018-12-29 stsp const char *
470 c7f4312f 2019-02-05 stsp got_worktree_get_root_path(struct got_worktree *worktree)
472 c7f4312f 2019-02-05 stsp return worktree->root_path;
475 c7f4312f 2019-02-05 stsp const char *
476 86c3caaf 2018-03-09 stsp got_worktree_get_repo_path(struct got_worktree *worktree)
478 2fbdb5ae 2018-12-29 stsp return worktree->repo_path;
481 49520a32 2018-12-29 stsp const char *
482 49520a32 2018-12-29 stsp got_worktree_get_path_prefix(struct got_worktree *worktree)
484 f609be2e 2018-12-29 stsp return worktree->path_prefix;
487 e5dc7198 2018-12-29 stsp const struct got_error *
488 e5dc7198 2018-12-29 stsp got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
489 e5dc7198 2018-12-29 stsp const char *path_prefix)
491 e5dc7198 2018-12-29 stsp char *absprefix = NULL;
493 e5dc7198 2018-12-29 stsp if (!got_path_is_absolute(path_prefix)) {
494 e5dc7198 2018-12-29 stsp if (asprintf(&absprefix, "/%s", path_prefix) == -1)
495 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
497 e5dc7198 2018-12-29 stsp *match = (strcmp(absprefix ? absprefix : path_prefix,
498 e5dc7198 2018-12-29 stsp worktree->path_prefix) == 0);
499 e5dc7198 2018-12-29 stsp free(absprefix);
500 e5dc7198 2018-12-29 stsp return NULL;
503 bc70eb79 2019-05-09 stsp const char *
504 35be1456 2018-03-11 stsp got_worktree_get_head_ref_name(struct got_worktree *worktree)
506 36a38700 2019-05-10 stsp return worktree->head_ref_name;
509 024e9686 2019-05-14 stsp const struct got_error *
510 024e9686 2019-05-14 stsp got_worktree_set_head_ref(struct got_worktree *worktree,
511 024e9686 2019-05-14 stsp struct got_reference *head_ref)
513 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
514 024e9686 2019-05-14 stsp char *path_got = NULL, *head_ref_name = NULL;
516 024e9686 2019-05-14 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
517 024e9686 2019-05-14 stsp GOT_WORKTREE_GOT_DIR) == -1) {
518 024e9686 2019-05-14 stsp err = got_error_from_errno("asprintf");
519 024e9686 2019-05-14 stsp path_got = NULL;
523 024e9686 2019-05-14 stsp head_ref_name = strdup(got_ref_get_name(head_ref));
524 024e9686 2019-05-14 stsp if (head_ref_name == NULL) {
525 024e9686 2019-05-14 stsp err = got_error_from_errno("strdup");
529 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
533 024e9686 2019-05-14 stsp free(worktree->head_ref_name);
534 024e9686 2019-05-14 stsp worktree->head_ref_name = head_ref_name;
536 024e9686 2019-05-14 stsp free(path_got);
538 024e9686 2019-05-14 stsp free(head_ref_name);
539 024e9686 2019-05-14 stsp return err;
542 b72f483a 2019-02-05 stsp struct got_object_id *
543 507dc3bb 2018-12-29 stsp got_worktree_get_base_commit_id(struct got_worktree *worktree)
545 507dc3bb 2018-12-29 stsp return worktree->base_commit_id;
548 507dc3bb 2018-12-29 stsp const struct got_error *
549 507dc3bb 2018-12-29 stsp got_worktree_set_base_commit_id(struct got_worktree *worktree,
550 507dc3bb 2018-12-29 stsp struct got_repository *repo, struct got_object_id *commit_id)
552 507dc3bb 2018-12-29 stsp const struct got_error *err;
553 507dc3bb 2018-12-29 stsp struct got_object *obj = NULL;
554 507dc3bb 2018-12-29 stsp char *id_str = NULL;
555 507dc3bb 2018-12-29 stsp char *path_got = NULL;
557 507dc3bb 2018-12-29 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
558 507dc3bb 2018-12-29 stsp GOT_WORKTREE_GOT_DIR) == -1) {
559 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
560 507dc3bb 2018-12-29 stsp path_got = NULL;
564 507dc3bb 2018-12-29 stsp err = got_object_open(&obj, repo, commit_id);
566 507dc3bb 2018-12-29 stsp return err;
568 507dc3bb 2018-12-29 stsp if (obj->type != GOT_OBJ_TYPE_COMMIT) {
569 507dc3bb 2018-12-29 stsp err = got_error(GOT_ERR_OBJ_TYPE);
573 507dc3bb 2018-12-29 stsp /* Record our base commit. */
574 507dc3bb 2018-12-29 stsp err = got_object_id_str(&id_str, commit_id);
577 507dc3bb 2018-12-29 stsp err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
581 507dc3bb 2018-12-29 stsp free(worktree->base_commit_id);
582 507dc3bb 2018-12-29 stsp worktree->base_commit_id = got_object_id_dup(commit_id);
583 507dc3bb 2018-12-29 stsp if (worktree->base_commit_id == NULL) {
584 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
589 507dc3bb 2018-12-29 stsp got_object_close(obj);
590 507dc3bb 2018-12-29 stsp free(id_str);
591 507dc3bb 2018-12-29 stsp free(path_got);
592 507dc3bb 2018-12-29 stsp return err;
595 9d31a1d8 2018-03-11 stsp static const struct got_error *
596 9d31a1d8 2018-03-11 stsp lock_worktree(struct got_worktree *worktree, int operation)
598 9d31a1d8 2018-03-11 stsp if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
599 9d31a1d8 2018-03-11 stsp return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
600 638f9024 2019-05-13 stsp : got_error_from_errno2("flock",
601 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree)));
602 86c3caaf 2018-03-09 stsp return NULL;
605 21908da4 2019-01-13 stsp static const struct got_error *
606 4a1ddfc2 2019-01-12 stsp add_dir_on_disk(struct got_worktree *worktree, const char *path)
608 4a1ddfc2 2019-01-12 stsp const struct got_error *err = NULL;
609 4a1ddfc2 2019-01-12 stsp char *abspath;
611 4a1ddfc2 2019-01-12 stsp if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
612 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
614 0cd1c46a 2019-03-11 stsp err = got_path_mkdir(abspath);
615 ddcd8544 2019-03-11 stsp if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
616 ddcd8544 2019-03-11 stsp struct stat sb;
617 ddcd8544 2019-03-11 stsp err = NULL;
618 ddcd8544 2019-03-11 stsp if (lstat(abspath, &sb) == -1) {
619 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
620 ddcd8544 2019-03-11 stsp } else if (!S_ISDIR(sb.st_mode)) {
621 ddcd8544 2019-03-11 stsp /* TODO directory is obstructed; do something */
622 ddcd8544 2019-03-11 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
625 4a1ddfc2 2019-01-12 stsp free(abspath);
626 68c76935 2019-02-19 stsp return err;
629 68c76935 2019-02-19 stsp static const struct got_error *
630 68c76935 2019-02-19 stsp check_file_contents_equal(int *same, FILE *f1, FILE *f2)
632 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
633 68c76935 2019-02-19 stsp uint8_t fbuf1[8192];
634 68c76935 2019-02-19 stsp uint8_t fbuf2[8192];
635 68c76935 2019-02-19 stsp size_t flen1 = 0, flen2 = 0;
640 68c76935 2019-02-19 stsp flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
641 68c76935 2019-02-19 stsp if (flen1 == 0 && ferror(f1)) {
642 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
645 68c76935 2019-02-19 stsp flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
646 68c76935 2019-02-19 stsp if (flen2 == 0 && ferror(f2)) {
647 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
650 68c76935 2019-02-19 stsp if (flen1 == 0) {
651 68c76935 2019-02-19 stsp if (flen2 != 0)
654 68c76935 2019-02-19 stsp } else if (flen2 == 0) {
655 68c76935 2019-02-19 stsp if (flen1 != 0)
658 68c76935 2019-02-19 stsp } else if (flen1 == flen2) {
659 68c76935 2019-02-19 stsp if (memcmp(fbuf1, fbuf2, flen2) != 0) {
669 68c76935 2019-02-19 stsp return err;
672 68c76935 2019-02-19 stsp static const struct got_error *
673 68c76935 2019-02-19 stsp check_files_equal(int *same, const char *f1_path, const char *f2_path)
675 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
676 68c76935 2019-02-19 stsp struct stat sb;
677 68c76935 2019-02-19 stsp size_t size1, size2;
678 68c76935 2019-02-19 stsp FILE *f1 = NULL, *f2 = NULL;
682 68c76935 2019-02-19 stsp if (lstat(f1_path, &sb) != 0) {
683 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", f1_path);
686 68c76935 2019-02-19 stsp size1 = sb.st_size;
688 68c76935 2019-02-19 stsp if (lstat(f2_path, &sb) != 0) {
689 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", f2_path);
692 68c76935 2019-02-19 stsp size2 = sb.st_size;
694 68c76935 2019-02-19 stsp if (size1 != size2) {
696 68c76935 2019-02-19 stsp return NULL;
699 68c76935 2019-02-19 stsp f1 = fopen(f1_path, "r");
700 68c76935 2019-02-19 stsp if (f1 == NULL)
701 638f9024 2019-05-13 stsp return got_error_from_errno2("open", f1_path);
703 68c76935 2019-02-19 stsp f2 = fopen(f2_path, "r");
704 68c76935 2019-02-19 stsp if (f2 == NULL) {
705 638f9024 2019-05-13 stsp err = got_error_from_errno2("open", f2_path);
709 68c76935 2019-02-19 stsp err = check_file_contents_equal(same, f1, f2);
711 68c76935 2019-02-19 stsp if (f1 && fclose(f1) != 0 && err == NULL)
712 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
713 68c76935 2019-02-19 stsp if (f2 && fclose(f2) != 0 && err == NULL)
714 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
716 6353ad76 2019-02-08 stsp return err;
720 46b6ee73 2019-06-04 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
721 46b6ee73 2019-06-04 stsp * blob_deriv acts as the first derived version, and the file on disk
722 234035bc 2019-06-01 stsp * acts as the second derived version.
724 6353ad76 2019-02-08 stsp static const struct got_error *
725 234035bc 2019-06-01 stsp merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
726 46b6ee73 2019-06-04 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
727 46b6ee73 2019-06-04 stsp const char *path, uint16_t st_mode, struct got_blob_object *blob_deriv,
728 818c7501 2019-07-11 stsp struct got_object_id *deriv_base_commit_id,
729 234035bc 2019-06-01 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
730 234035bc 2019-06-01 stsp void *progress_arg)
732 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
733 6353ad76 2019-02-08 stsp int merged_fd = -1;
734 46b6ee73 2019-06-04 stsp FILE *f_deriv = NULL, *f_orig = NULL;
735 46b6ee73 2019-06-04 stsp char *blob_deriv_path = NULL, *blob_orig_path = NULL;
736 af54ae4a 2019-02-19 stsp char *merged_path = NULL, *base_path = NULL;
737 6353ad76 2019-02-08 stsp char *id_str = NULL;
738 818c7501 2019-07-11 stsp char *label_deriv = NULL;
739 234035bc 2019-06-01 stsp int overlapcnt = 0;
740 af54ae4a 2019-02-19 stsp char *parent;
742 234035bc 2019-06-01 stsp *local_changes_subsumed = 0;
744 af54ae4a 2019-02-19 stsp parent = dirname(ondisk_path);
745 af54ae4a 2019-02-19 stsp if (parent == NULL)
746 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", ondisk_path);
748 af54ae4a 2019-02-19 stsp if (asprintf(&base_path, "%s/got-merged", parent) == -1)
749 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
751 af54ae4a 2019-02-19 stsp err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
755 af54ae4a 2019-02-19 stsp free(base_path);
756 46b6ee73 2019-06-04 stsp if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
757 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
758 af54ae4a 2019-02-19 stsp base_path = NULL;
762 46b6ee73 2019-06-04 stsp err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
765 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
766 6c4c42e0 2019-06-24 stsp blob_deriv);
770 af54ae4a 2019-02-19 stsp free(base_path);
771 46b6ee73 2019-06-04 stsp if (asprintf(&base_path, "%s/got-merge-blob-orig", parent) == -1) {
772 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
773 af54ae4a 2019-02-19 stsp base_path = NULL;
777 46b6ee73 2019-06-04 stsp err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
780 46b6ee73 2019-06-04 stsp if (blob_orig) {
781 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
782 46b6ee73 2019-06-04 stsp blob_orig);
787 1430b4e0 2019-03-27 stsp * If the file has no blob, this is an "add vs add" conflict,
788 1430b4e0 2019-03-27 stsp * and we simply use an empty ancestor file to make both files
789 1430b4e0 2019-03-27 stsp * appear in the merged result in their entirety.
793 818c7501 2019-07-11 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
796 818c7501 2019-07-11 stsp if (asprintf(&label_deriv, "commit %s", id_str) == -1) {
797 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
801 46b6ee73 2019-06-04 stsp err = got_merge_diff3(&overlapcnt, merged_fd, blob_deriv_path,
802 818c7501 2019-07-11 stsp blob_orig_path, ondisk_path, label_deriv, path);
806 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
807 6353ad76 2019-02-08 stsp overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
811 816dc654 2019-02-16 stsp if (fsync(merged_fd) != 0) {
812 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
816 68c76935 2019-02-19 stsp /* Check if a clean merge has subsumed all local changes. */
817 68c76935 2019-02-19 stsp if (overlapcnt == 0) {
818 46b6ee73 2019-06-04 stsp err = check_files_equal(local_changes_subsumed, blob_deriv_path,
819 68c76935 2019-02-19 stsp merged_path);
824 70a0c8ec 2019-02-20 stsp if (chmod(merged_path, st_mode) != 0) {
825 638f9024 2019-05-13 stsp err = got_error_from_errno2("chmod", merged_path);
829 6353ad76 2019-02-08 stsp if (rename(merged_path, ondisk_path) != 0) {
830 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", merged_path,
831 230a42bd 2019-05-11 jcs ondisk_path);
832 2a57020b 2019-02-20 stsp unlink(merged_path);
837 3a6ce05a 2019-02-11 stsp if (merged_fd != -1 && close(merged_fd) != 0 && err == NULL)
838 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
839 46b6ee73 2019-06-04 stsp if (f_deriv && fclose(f_deriv) != 0 && err == NULL)
840 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
841 46b6ee73 2019-06-04 stsp if (f_orig && fclose(f_orig) != 0 && err == NULL)
842 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
843 6353ad76 2019-02-08 stsp free(merged_path);
844 af54ae4a 2019-02-19 stsp free(base_path);
845 46b6ee73 2019-06-04 stsp if (blob_deriv_path) {
846 46b6ee73 2019-06-04 stsp unlink(blob_deriv_path);
847 46b6ee73 2019-06-04 stsp free(blob_deriv_path);
849 46b6ee73 2019-06-04 stsp if (blob_orig_path) {
850 46b6ee73 2019-06-04 stsp unlink(blob_orig_path);
851 46b6ee73 2019-06-04 stsp free(blob_orig_path);
853 6353ad76 2019-02-08 stsp free(id_str);
854 818c7501 2019-07-11 stsp free(label_deriv);
855 4a1ddfc2 2019-01-12 stsp return err;
858 4a1ddfc2 2019-01-12 stsp static const struct got_error *
859 13d9040b 2019-03-27 stsp update_blob_fileindex_entry(struct got_worktree *worktree,
860 13d9040b 2019-03-27 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
861 13d9040b 2019-03-27 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
862 13d9040b 2019-03-27 stsp int update_timestamps)
864 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
866 13d9040b 2019-03-27 stsp if (ie == NULL)
867 13d9040b 2019-03-27 stsp ie = got_fileindex_entry_get(fileindex, path);
869 13d9040b 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path,
870 13d9040b 2019-03-27 stsp blob->id.sha1, worktree->base_commit_id->sha1,
871 13d9040b 2019-03-27 stsp update_timestamps);
873 13d9040b 2019-03-27 stsp struct got_fileindex_entry *new_ie;
874 13d9040b 2019-03-27 stsp err = got_fileindex_entry_alloc(&new_ie, ondisk_path,
875 13d9040b 2019-03-27 stsp path, blob->id.sha1, worktree->base_commit_id->sha1);
877 13d9040b 2019-03-27 stsp err = got_fileindex_entry_add(fileindex, new_ie);
879 13d9040b 2019-03-27 stsp return err;
882 13d9040b 2019-03-27 stsp static const struct got_error *
883 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
884 13d9040b 2019-03-27 stsp const char *path, uint16_t te_mode, uint16_t st_mode,
885 13d9040b 2019-03-27 stsp struct got_blob_object *blob, int restoring_missing_file,
886 a129376b 2019-03-28 stsp int reverting_versioned_file, struct got_repository *repo,
887 a129376b 2019-03-28 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
889 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
890 507dc3bb 2018-12-29 stsp int fd = -1;
891 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
892 507dc3bb 2018-12-29 stsp int update = 0;
893 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
895 c34b20a2 2018-03-12 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
896 9d31a1d8 2018-03-11 stsp GOT_DEFAULT_FILE_MODE);
897 9d31a1d8 2018-03-11 stsp if (fd == -1) {
898 21908da4 2019-01-13 stsp if (errno == ENOENT) {
899 21908da4 2019-01-13 stsp char *parent = dirname(path);
900 21908da4 2019-01-13 stsp if (parent == NULL)
901 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
902 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
904 21908da4 2019-01-13 stsp return err;
905 21908da4 2019-01-13 stsp fd = open(ondisk_path,
906 21908da4 2019-01-13 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
907 21908da4 2019-01-13 stsp GOT_DEFAULT_FILE_MODE);
908 21908da4 2019-01-13 stsp if (fd == -1)
909 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
910 230a42bd 2019-05-11 jcs ondisk_path);
911 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
912 b8f41171 2019-02-10 stsp if (!S_ISREG(st_mode)) {
913 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
914 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
917 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
918 507dc3bb 2018-12-29 stsp ondisk_path);
921 507dc3bb 2018-12-29 stsp update = 1;
924 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
927 a378724f 2019-02-10 stsp if (restoring_missing_file)
928 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING, path);
929 a129376b 2019-03-28 stsp else if (reverting_versioned_file)
930 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT, path);
932 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
933 a378724f 2019-02-10 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
937 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
939 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
940 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
943 9d31a1d8 2018-03-11 stsp if (len > 0) {
944 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
945 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
946 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
947 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
949 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
950 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
953 61d6eaa3 2018-12-24 stsp hdrlen = 0;
955 9d31a1d8 2018-03-11 stsp } while (len != 0);
957 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
958 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
962 507dc3bb 2018-12-29 stsp if (update) {
963 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
964 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
965 230a42bd 2019-05-11 jcs ondisk_path);
966 2a57020b 2019-02-20 stsp unlink(tmppath);
971 b8f41171 2019-02-10 stsp if (te_mode & S_IXUSR) {
972 b8f41171 2019-02-10 stsp if (chmod(ondisk_path, st_mode | S_IXUSR) == -1) {
973 638f9024 2019-05-13 stsp err = got_error_from_errno2("chmod", ondisk_path);
977 b8f41171 2019-02-10 stsp if (chmod(ondisk_path, st_mode & ~S_IXUSR) == -1) {
978 638f9024 2019-05-13 stsp err = got_error_from_errno2("chmod", ondisk_path);
984 3a6ce05a 2019-02-11 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
985 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
986 507dc3bb 2018-12-29 stsp free(tmppath);
987 6353ad76 2019-02-08 stsp return err;
990 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
991 6353ad76 2019-02-08 stsp static const struct got_error *
992 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
994 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
995 7154f6ce 2019-03-27 stsp const char *markers[3] = {
996 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
997 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
998 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
1000 7154f6ce 2019-03-27 stsp int i = 0;
1001 7154f6ce 2019-03-27 stsp char *line;
1002 7154f6ce 2019-03-27 stsp size_t len;
1003 7154f6ce 2019-03-27 stsp const char delim[3] = {'\0', '\0', '\0'};
1005 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1006 7154f6ce 2019-03-27 stsp line = fparseln(f, &len, NULL, delim, 0);
1007 7154f6ce 2019-03-27 stsp if (line == NULL) {
1008 7154f6ce 2019-03-27 stsp if (feof(f))
1010 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
1014 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1015 19332e6d 2019-05-13 stsp if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1017 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
1023 7154f6ce 2019-03-27 stsp return err;
1026 e2b1e152 2019-07-13 stsp static int
1027 e2b1e152 2019-07-13 stsp stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1029 e2b1e152 2019-07-13 stsp return !(ie->ctime_sec == sb->st_ctime &&
1030 e2b1e152 2019-07-13 stsp ie->ctime_nsec == sb->st_ctimensec &&
1031 e2b1e152 2019-07-13 stsp ie->mtime_sec == sb->st_mtime &&
1032 e2b1e152 2019-07-13 stsp ie->mtime_nsec == sb->st_mtimensec &&
1033 e2b1e152 2019-07-13 stsp ie->size == (sb->st_size & 0xffffffff));
1036 7154f6ce 2019-03-27 stsp static const struct got_error *
1037 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1038 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1039 b8f41171 2019-02-10 stsp struct got_repository *repo)
1041 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1042 6353ad76 2019-02-08 stsp struct got_object_id id;
1043 6353ad76 2019-02-08 stsp size_t hdrlen;
1044 6353ad76 2019-02-08 stsp FILE *f = NULL;
1045 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1046 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1047 6353ad76 2019-02-08 stsp size_t flen, blen;
1049 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1051 b8f41171 2019-02-10 stsp if (lstat(abspath, sb) == -1) {
1052 a378724f 2019-02-10 stsp if (errno == ENOENT) {
1054 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1055 2ec1f75b 2019-03-26 stsp *status = GOT_STATUS_MISSING;
1057 2ec1f75b 2019-03-26 stsp *status = GOT_STATUS_DELETE;
1058 b8f41171 2019-02-10 stsp sb->st_mode =
1059 b8f41171 2019-02-10 stsp ((ie->mode >> GOT_FILEIDX_MODE_PERMS_SHIFT)
1060 b8f41171 2019-02-10 stsp & (S_IRWXU | S_IRWXG | S_IRWXO));
1062 b8f41171 2019-02-10 stsp sb->st_mode = GOT_DEFAULT_FILE_MODE;
1063 a378724f 2019-02-10 stsp return NULL;
1065 638f9024 2019-05-13 stsp return got_error_from_errno2("lstat", abspath);
1068 b8f41171 2019-02-10 stsp if (!S_ISREG(sb->st_mode)) {
1069 6353ad76 2019-02-08 stsp *status = GOT_STATUS_OBSTRUCTED;
1070 6353ad76 2019-02-08 stsp return NULL;
1073 b8f41171 2019-02-10 stsp if (ie == NULL)
1074 d00136be 2019-03-26 stsp return NULL;
1076 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1077 2ec1f75b 2019-03-26 stsp *status = GOT_STATUS_DELETE;
1078 2ec1f75b 2019-03-26 stsp return NULL;
1079 2ec1f75b 2019-03-26 stsp } else if (!got_fileindex_entry_has_blob(ie)) {
1080 d00136be 2019-03-26 stsp *status = GOT_STATUS_ADD;
1081 b8f41171 2019-02-10 stsp return NULL;
1084 e2b1e152 2019-07-13 stsp if (!stat_info_differs(ie, sb))
1085 6353ad76 2019-02-08 stsp return NULL;
1087 6353ad76 2019-02-08 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1088 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1090 6353ad76 2019-02-08 stsp return err;
1092 6353ad76 2019-02-08 stsp f = fopen(abspath, "r");
1093 6353ad76 2019-02-08 stsp if (f == NULL) {
1094 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", abspath);
1095 6353ad76 2019-02-08 stsp goto done;
1097 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1099 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1100 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1102 7154f6ce 2019-03-27 stsp goto done;
1103 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1104 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1105 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1106 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1107 7154f6ce 2019-03-27 stsp goto done;
1109 6353ad76 2019-02-08 stsp if (blen == 0) {
1110 6353ad76 2019-02-08 stsp if (flen != 0)
1111 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1113 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1114 6353ad76 2019-02-08 stsp if (blen != 0)
1115 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1117 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1118 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1119 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1120 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1124 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1127 6353ad76 2019-02-08 stsp hdrlen = 0;
1130 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1131 7154f6ce 2019-03-27 stsp rewind(f);
1132 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1136 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1138 6353ad76 2019-02-08 stsp fclose(f);
1139 9d31a1d8 2018-03-11 stsp return err;
1143 e2b1e152 2019-07-13 stsp * Update timestamps in the file index if a file is unmodified and
1144 e2b1e152 2019-07-13 stsp * we had to run a full content comparison to find out.
1146 e2b1e152 2019-07-13 stsp static const struct got_error *
1147 e2b1e152 2019-07-13 stsp sync_timestamps(char *ondisk_path, unsigned char status,
1148 e2b1e152 2019-07-13 stsp struct got_fileindex_entry *ie, struct stat *sb)
1150 e2b1e152 2019-07-13 stsp if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1151 e2b1e152 2019-07-13 stsp return got_fileindex_entry_update(ie, ondisk_path,
1152 e2b1e152 2019-07-13 stsp ie->blob_sha1, ie->commit_sha1, 1);
1154 e2b1e152 2019-07-13 stsp return NULL;
1157 9d31a1d8 2018-03-11 stsp static const struct got_error *
1158 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1159 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1160 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1161 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1162 0584f854 2019-04-06 stsp void *progress_arg)
1164 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1165 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1166 6353ad76 2019-02-08 stsp char *ondisk_path;
1167 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1168 b8f41171 2019-02-10 stsp struct stat sb;
1170 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1171 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1173 b8f41171 2019-02-10 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1175 b8f41171 2019-02-10 stsp goto done;
1177 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1178 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1179 b8f41171 2019-02-10 stsp goto done;
1182 b8f41171 2019-02-10 stsp if (ie && status != GOT_STATUS_MISSING) {
1183 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1184 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1185 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1186 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1188 e2b1e152 2019-07-13 stsp goto done;
1189 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1191 6353ad76 2019-02-08 stsp goto done;
1193 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1194 1430b4e0 2019-03-27 stsp memcmp(ie->blob_sha1, te->id->sha1,
1195 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1196 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1197 b8f41171 2019-02-10 stsp goto done;
1201 8da9e5f4 2019-01-12 stsp err = got_object_open_as_blob(&blob, repo, te->id, 8192);
1203 6353ad76 2019-02-08 stsp goto done;
1205 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1206 234035bc 2019-06-01 stsp int update_timestamps;
1207 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1208 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1209 234035bc 2019-06-01 stsp struct got_object_id id2;
1210 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1211 234035bc 2019-06-01 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1213 234035bc 2019-06-01 stsp goto done;
1215 234035bc 2019-06-01 stsp err = merge_blob(&update_timestamps, worktree, blob2,
1216 818c7501 2019-07-11 stsp ondisk_path, path, sb.st_mode, blob,
1217 818c7501 2019-07-11 stsp worktree->base_commit_id, repo,
1218 234035bc 2019-06-01 stsp progress_cb, progress_arg);
1219 234035bc 2019-06-01 stsp if (blob2)
1220 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
1222 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
1223 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
1224 234035bc 2019-06-01 stsp * unmodified files again.
1226 234035bc 2019-06-01 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1227 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
1228 234035bc 2019-06-01 stsp update_timestamps);
1229 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
1230 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1232 1ee397ad 2019-07-12 stsp goto done;
1233 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1234 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 0);
1236 13d9040b 2019-03-27 stsp goto done;
1238 13d9040b 2019-03-27 stsp err = install_blob(worktree, ondisk_path, path, te->mode,
1239 a129376b 2019-03-28 stsp sb.st_mode, blob, status == GOT_STATUS_MISSING, 0,
1240 a129376b 2019-03-28 stsp repo, progress_cb, progress_arg);
1242 13d9040b 2019-03-27 stsp goto done;
1243 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1244 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 1);
1246 13d9040b 2019-03-27 stsp goto done;
1248 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
1250 6353ad76 2019-02-08 stsp free(ondisk_path);
1251 8da9e5f4 2019-01-12 stsp return err;
1254 90285c3b 2019-01-08 stsp static const struct got_error *
1255 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
1257 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
1258 90285c3b 2019-01-08 stsp char *ondisk_path = NULL;
1260 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
1261 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1263 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
1264 c97665ae 2019-01-13 stsp if (errno != ENOENT)
1265 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
1267 90285c3b 2019-01-08 stsp char *parent = dirname(ondisk_path);
1268 7a9df742 2019-01-08 stsp while (parent && strcmp(parent, root_path) != 0) {
1269 26c4ac4d 2019-01-08 stsp if (rmdir(parent) == -1) {
1270 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
1271 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
1275 90285c3b 2019-01-08 stsp parent = dirname(parent);
1278 90285c3b 2019-01-08 stsp free(ondisk_path);
1279 90285c3b 2019-01-08 stsp return err;
1282 708d8e67 2019-03-27 stsp static const struct got_error *
1283 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
1284 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
1285 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1287 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
1288 708d8e67 2019-03-27 stsp unsigned char status;
1289 708d8e67 2019-03-27 stsp struct stat sb;
1290 708d8e67 2019-03-27 stsp char *ondisk_path;
1292 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
1294 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1296 708d8e67 2019-03-27 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1298 708d8e67 2019-03-27 stsp return err;
1300 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
1301 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
1302 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
1304 1ee397ad 2019-07-12 stsp return err;
1306 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
1307 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
1309 fc6346c4 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
1312 708d8e67 2019-03-27 stsp return err;
1314 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
1316 1ee397ad 2019-07-12 stsp return err;
1317 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
1318 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
1320 fc6346c4 2019-03-27 stsp return err;
1322 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
1325 fc6346c4 2019-03-27 stsp return err;
1328 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
1329 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
1330 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
1331 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
1332 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
1333 8da9e5f4 2019-01-12 stsp void *progress_arg;
1334 8da9e5f4 2019-01-12 stsp got_worktree_cancel_cb cancel_cb;
1335 8da9e5f4 2019-01-12 stsp void *cancel_arg;
1338 512f0d0e 2019-01-02 stsp static const struct got_error *
1339 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
1340 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
1342 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1344 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1345 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1347 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
1348 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
1351 8da9e5f4 2019-01-12 stsp static const struct got_error *
1352 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1354 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1356 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1357 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1359 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
1360 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1363 9d31a1d8 2018-03-11 stsp static const struct got_error *
1364 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
1366 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1367 8da9e5f4 2019-01-12 stsp const struct got_error *err;
1368 8da9e5f4 2019-01-12 stsp char *path;
1370 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1371 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1373 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
1374 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
1376 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1378 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
1379 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
1381 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
1382 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1384 8da9e5f4 2019-01-12 stsp free(path);
1385 0cd1c46a 2019-03-11 stsp return err;
1388 818c7501 2019-07-11 stsp static const struct got_error *
1389 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
1391 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
1392 0647c563 2019-03-11 stsp char *uuidstr = NULL;
1393 0cd1c46a 2019-03-11 stsp uint32_t uuid_status;
1395 517bab73 2019-03-11 stsp *refname = NULL;
1397 0cd1c46a 2019-03-11 stsp uuid_to_string(&worktree->uuid, &uuidstr, &uuid_status);
1398 0cd1c46a 2019-03-11 stsp if (uuid_status != uuid_s_ok)
1399 0cd1c46a 2019-03-11 stsp return got_error_uuid(uuid_status);
1401 818c7501 2019-07-11 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr)
1403 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1404 0647c563 2019-03-11 stsp *refname = NULL;
1406 517bab73 2019-03-11 stsp free(uuidstr);
1407 517bab73 2019-03-11 stsp return err;
1410 818c7501 2019-07-11 stsp const struct got_error *
1411 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
1413 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
1416 818c7501 2019-07-11 stsp static const struct got_error *
1417 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
1419 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1420 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
1423 818c7501 2019-07-11 stsp static const struct got_error *
1424 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
1426 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
1429 818c7501 2019-07-11 stsp static const struct got_error *
1430 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
1432 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1433 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
1436 818c7501 2019-07-11 stsp static const struct got_error *
1437 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
1439 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1440 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
1443 0ebf8283 2019-07-24 stsp static const struct got_error *
1444 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
1446 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1447 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
1450 0ebf8283 2019-07-24 stsp static const struct got_error *
1451 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
1453 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1454 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
1457 0ebf8283 2019-07-24 stsp static const struct got_error *
1458 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
1460 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1461 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
1464 0ebf8283 2019-07-24 stsp static const struct got_error *
1465 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
1467 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1468 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
1471 0ebf8283 2019-07-24 stsp const struct got_error *
1472 0ebf8283 2019-07-24 stsp got_worktree_get_histedit_list_path(char **path, struct got_worktree *worktree)
1474 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
1475 0ebf8283 2019-07-24 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_LIST) == -1) {
1476 0ebf8283 2019-07-24 stsp *path = NULL;
1477 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
1479 0ebf8283 2019-07-24 stsp return NULL;
1483 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
1484 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
1486 517bab73 2019-03-11 stsp static const struct got_error *
1487 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
1489 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
1490 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
1491 517bab73 2019-03-11 stsp char *refname;
1493 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
1495 517bab73 2019-03-11 stsp return err;
1497 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
1499 0cd1c46a 2019-03-11 stsp goto done;
1501 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
1503 0cd1c46a 2019-03-11 stsp free(refname);
1505 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
1506 3e3a69f1 2019-07-25 stsp return err;
1509 3e3a69f1 2019-07-25 stsp static const struct got_error *
1510 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
1512 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
1514 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
1515 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1516 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
1517 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
1519 9d31a1d8 2018-03-11 stsp return err;
1523 ebf99748 2019-05-09 stsp static const struct got_error *
1524 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
1525 ebf99748 2019-05-09 stsp struct got_worktree *worktree)
1527 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
1528 ebf99748 2019-05-09 stsp FILE *index = NULL;
1530 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1531 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
1532 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
1533 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
1535 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
1537 ebf99748 2019-05-09 stsp goto done;
1539 ebf99748 2019-05-09 stsp index = fopen(*fileindex_path, "rb");
1540 ebf99748 2019-05-09 stsp if (index == NULL) {
1541 ebf99748 2019-05-09 stsp if (errno != ENOENT)
1542 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
1544 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
1545 ebf99748 2019-05-09 stsp if (fclose(index) != 0 && err == NULL)
1546 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
1549 ebf99748 2019-05-09 stsp if (err) {
1550 ebf99748 2019-05-09 stsp free(*fileindex_path);
1551 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1552 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
1553 ebf99748 2019-05-09 stsp *fileindex = NULL;
1555 ebf99748 2019-05-09 stsp return err;
1558 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
1559 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
1560 c932eeeb 2019-05-22 stsp const char *path;
1561 c932eeeb 2019-05-22 stsp size_t path_len;
1562 c932eeeb 2019-05-22 stsp const char *entry_name;
1563 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
1564 a484d721 2019-06-10 stsp void *progress_arg;
1567 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
1568 c932eeeb 2019-05-22 stsp static const struct got_error *
1569 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
1571 1ee397ad 2019-07-12 stsp const struct got_error *err;
1572 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
1574 c932eeeb 2019-05-22 stsp if (a->entry_name) {
1575 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
1576 c932eeeb 2019-05-22 stsp return NULL;
1577 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
1578 102ff934 2019-06-11 stsp return NULL;
1580 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
1581 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
1582 c932eeeb 2019-05-22 stsp return NULL;
1584 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
1585 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
1586 edd02c5e 2019-07-11 stsp ie->path);
1588 1ee397ad 2019-07-12 stsp return err;
1590 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
1591 c932eeeb 2019-05-22 stsp return NULL;
1594 9c6338c4 2019-06-02 stsp static const struct got_error *
1595 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
1597 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
1598 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
1599 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
1601 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
1602 9c6338c4 2019-06-02 stsp fileindex_path);
1604 9c6338c4 2019-06-02 stsp goto done;
1606 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
1608 9c6338c4 2019-06-02 stsp goto done;
1610 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
1611 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
1612 9c6338c4 2019-06-02 stsp fileindex_path);
1613 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
1616 9c6338c4 2019-06-02 stsp if (new_index)
1617 9c6338c4 2019-06-02 stsp fclose(new_index);
1618 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
1619 9c6338c4 2019-06-02 stsp return err;
1622 6ced4176 2019-07-12 stsp static const struct got_error *
1623 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
1624 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
1625 6ced4176 2019-07-12 stsp struct got_worktree *worktree, struct got_repository *repo)
1627 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
1628 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
1629 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
1630 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
1632 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
1633 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
1634 6ced4176 2019-07-12 stsp *tree_id = NULL;
1636 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
1637 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
1638 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
1639 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
1640 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1641 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1642 6ced4176 2019-07-12 stsp goto done;
1644 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
1645 6ced4176 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
1647 6ced4176 2019-07-12 stsp goto done;
1648 6ced4176 2019-07-12 stsp return NULL;
1651 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
1653 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
1654 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
1655 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
1656 6ced4176 2019-07-12 stsp goto done;
1659 6ced4176 2019-07-12 stsp err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
1660 6ced4176 2019-07-12 stsp in_repo_path);
1662 6ced4176 2019-07-12 stsp goto done;
1664 6ced4176 2019-07-12 stsp free(in_repo_path);
1665 6ced4176 2019-07-12 stsp in_repo_path = NULL;
1667 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
1669 6ced4176 2019-07-12 stsp goto done;
1671 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
1672 6ced4176 2019-07-12 stsp /* Check out a single file. */
1673 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
1674 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
1675 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
1676 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
1677 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1678 6ced4176 2019-07-12 stsp goto done;
1680 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
1681 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1682 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1683 6ced4176 2019-07-12 stsp goto done;
1686 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
1687 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
1689 6ced4176 2019-07-12 stsp return err;
1690 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
1691 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
1692 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
1693 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
1694 6ced4176 2019-07-12 stsp goto done;
1697 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
1698 6ced4176 2019-07-12 stsp worktree->base_commit_id, in_repo_path);
1700 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
1701 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
1702 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
1703 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
1704 6ced4176 2019-07-12 stsp goto done;
1706 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
1707 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1708 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1709 6ced4176 2019-07-12 stsp goto done;
1714 6ced4176 2019-07-12 stsp free(in_repo_path);
1715 6ced4176 2019-07-12 stsp if (err) {
1716 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
1717 6ced4176 2019-07-12 stsp free(*tree_relpath);
1718 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
1719 6ced4176 2019-07-12 stsp free(*tree_id);
1720 6ced4176 2019-07-12 stsp *tree_id = NULL;
1722 07ed472d 2019-07-12 stsp return err;
1725 07ed472d 2019-07-12 stsp static const struct got_error *
1726 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
1727 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
1728 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1729 07ed472d 2019-07-12 stsp void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1731 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
1732 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
1733 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
1734 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
1735 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
1737 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
1739 07ed472d 2019-07-12 stsp goto done;
1741 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
1742 07ed472d 2019-07-12 stsp worktree->base_commit_id);
1744 07ed472d 2019-07-12 stsp goto done;
1746 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1748 07ed472d 2019-07-12 stsp goto done;
1750 07ed472d 2019-07-12 stsp if (entry_name &&
1751 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
1752 07ed472d 2019-07-12 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
1753 07ed472d 2019-07-12 stsp goto done;
1756 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
1757 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
1758 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
1759 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
1760 07ed472d 2019-07-12 stsp arg.worktree = worktree;
1761 07ed472d 2019-07-12 stsp arg.repo = repo;
1762 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
1763 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
1764 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
1765 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
1766 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
1767 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
1770 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
1771 07ed472d 2019-07-12 stsp if (commit)
1772 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
1773 6ced4176 2019-07-12 stsp return err;
1776 9d31a1d8 2018-03-11 stsp const struct got_error *
1777 c4cdcb68 2019-04-03 stsp got_worktree_checkout_files(struct got_worktree *worktree, const char *path,
1778 93a30277 2018-12-24 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1779 93a30277 2018-12-24 stsp void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1781 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
1782 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
1783 8da9e5f4 2019-01-12 stsp struct got_object_id *tree_id = NULL;
1784 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
1785 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
1786 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
1787 c4cdcb68 2019-04-03 stsp char *relpath = NULL, *entry_name = NULL;
1788 6ced4176 2019-07-12 stsp int entry_type;
1790 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
1792 9d31a1d8 2018-03-11 stsp return err;
1794 6ced4176 2019-07-12 stsp err = find_tree_entry_for_checkout(&entry_type, &relpath, &tree_id,
1795 6ced4176 2019-07-12 stsp path, worktree, repo);
1797 6ced4176 2019-07-12 stsp goto done;
1799 6ced4176 2019-07-12 stsp if (entry_type == GOT_OBJ_TYPE_BLOB) {
1800 6ced4176 2019-07-12 stsp entry_name = basename(path);
1801 6ced4176 2019-07-12 stsp if (entry_name == NULL) {
1802 6ced4176 2019-07-12 stsp err = got_error_from_errno2("basename", path);
1803 6ced4176 2019-07-12 stsp goto done;
1808 51514078 2018-12-25 stsp * Read the file index.
1809 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
1810 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
1812 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
1814 c4cdcb68 2019-04-03 stsp goto done;
1816 07ed472d 2019-07-12 stsp err = checkout_files(worktree, fileindex, relpath, tree_id, entry_name,
1817 07ed472d 2019-07-12 stsp repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
1818 711d9cd9 2019-07-12 stsp if (err == NULL) {
1819 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
1820 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
1821 711d9cd9 2019-07-12 stsp bbc_arg.entry_name = entry_name;
1822 711d9cd9 2019-07-12 stsp bbc_arg.path = path;
1823 711d9cd9 2019-07-12 stsp bbc_arg.path_len = strlen(path);
1824 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
1825 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
1826 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
1827 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
1829 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
1830 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
1831 af12c6b9 2019-06-04 stsp err = sync_err;
1833 9c6338c4 2019-06-02 stsp free(fileindex_path);
1834 c4cdcb68 2019-04-03 stsp free(relpath);
1836 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
1837 9d31a1d8 2018-03-11 stsp if (commit)
1838 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
1839 5ade8233 2019-07-12 stsp if (fileindex)
1840 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
1841 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
1842 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
1843 9d31a1d8 2018-03-11 stsp err = unlockerr;
1844 f8d1f275 2019-02-04 stsp return err;
1847 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
1848 234035bc 2019-06-01 stsp struct got_worktree *worktree;
1849 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
1850 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
1851 234035bc 2019-06-01 stsp void *progress_arg;
1852 234035bc 2019-06-01 stsp got_worktree_cancel_cb cancel_cb;
1853 234035bc 2019-06-01 stsp void *cancel_arg;
1854 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
1857 234035bc 2019-06-01 stsp static const struct got_error *
1858 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
1859 234035bc 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
1860 234035bc 2019-06-01 stsp struct got_object_id *id2, const char *path1, const char *path2,
1861 234035bc 2019-06-01 stsp struct got_repository *repo)
1863 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
1864 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
1865 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
1866 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
1867 234035bc 2019-06-01 stsp struct stat sb;
1868 234035bc 2019-06-01 stsp unsigned char status;
1869 234035bc 2019-06-01 stsp int local_changes_subsumed;
1871 234035bc 2019-06-01 stsp if (blob1 && blob2) {
1872 234035bc 2019-06-01 stsp ie = got_fileindex_entry_get(a->fileindex, path2);
1873 1ee397ad 2019-07-12 stsp if (ie == NULL)
1874 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
1875 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
1877 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1878 234035bc 2019-06-01 stsp path2) == -1)
1879 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
1881 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1883 234035bc 2019-06-01 stsp goto done;
1885 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
1886 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
1887 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
1888 234035bc 2019-06-01 stsp goto done;
1890 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
1891 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
1892 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
1893 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
1894 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
1895 234035bc 2019-06-01 stsp goto done;
1898 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree, blob1,
1899 818c7501 2019-07-11 stsp ondisk_path, path2, sb.st_mode, blob2, a->commit_id2, repo,
1900 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
1901 234035bc 2019-06-01 stsp } else if (blob1) {
1902 234035bc 2019-06-01 stsp ie = got_fileindex_entry_get(a->fileindex, path1);
1903 1ee397ad 2019-07-12 stsp if (ie == NULL)
1904 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
1905 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
1907 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1908 2b92fad7 2019-06-02 stsp path1) == -1)
1909 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
1911 2b92fad7 2019-06-02 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1913 2b92fad7 2019-06-02 stsp goto done;
1915 2b92fad7 2019-06-02 stsp switch (status) {
1916 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
1917 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
1918 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
1920 1ee397ad 2019-07-12 stsp goto done;
1921 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
1923 2b92fad7 2019-06-02 stsp goto done;
1925 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
1927 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
1928 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
1929 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
1930 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
1932 1ee397ad 2019-07-12 stsp goto done;
1934 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
1936 2b92fad7 2019-06-02 stsp case GOT_STATUS_ADD:
1937 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
1938 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
1939 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
1940 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
1942 1ee397ad 2019-07-12 stsp goto done;
1944 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
1945 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
1947 1ee397ad 2019-07-12 stsp goto done;
1952 234035bc 2019-06-01 stsp } else if (blob2) {
1953 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1954 234035bc 2019-06-01 stsp path2) == -1)
1955 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
1956 234035bc 2019-06-01 stsp ie = got_fileindex_entry_get(a->fileindex, path2);
1958 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
1961 234035bc 2019-06-01 stsp goto done;
1962 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
1963 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
1964 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
1965 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
1966 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
1967 1ee397ad 2019-07-12 stsp status, path2);
1968 234035bc 2019-06-01 stsp goto done;
1970 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
1971 818c7501 2019-07-11 stsp NULL, ondisk_path, path2, sb.st_mode, blob2,
1972 818c7501 2019-07-11 stsp a->commit_id2, repo,
1973 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
1974 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
1975 234035bc 2019-06-01 stsp err = update_blob_fileindex_entry(a->worktree,
1976 234035bc 2019-06-01 stsp a->fileindex, ie, ondisk_path, ie->path,
1977 234035bc 2019-06-01 stsp blob2, 0);
1979 234035bc 2019-06-01 stsp goto done;
1982 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
1983 234035bc 2019-06-01 stsp err = install_blob(a->worktree, ondisk_path, path2,
1984 234035bc 2019-06-01 stsp /* XXX get this from parent tree! */
1985 234035bc 2019-06-01 stsp GOT_DEFAULT_FILE_MODE,
1986 234035bc 2019-06-01 stsp sb.st_mode, blob2, 0, 0, repo,
1987 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
1989 234035bc 2019-06-01 stsp goto done;
1990 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_alloc(&ie,
1991 2b92fad7 2019-06-02 stsp ondisk_path, path2, NULL, NULL);
1993 234035bc 2019-06-01 stsp goto done;
1994 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
1995 2b92fad7 2019-06-02 stsp if (err) {
1996 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
1997 2b92fad7 2019-06-02 stsp goto done;
2002 234035bc 2019-06-01 stsp free(ondisk_path);
2003 234035bc 2019-06-01 stsp return err;
2006 234035bc 2019-06-01 stsp struct check_merge_ok_arg {
2007 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2008 234035bc 2019-06-01 stsp struct got_repository *repo;
2011 234035bc 2019-06-01 stsp static const struct got_error *
2012 234035bc 2019-06-01 stsp check_merge_ok(void *arg, struct got_fileindex_entry *ie)
2014 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
2015 234035bc 2019-06-01 stsp struct check_merge_ok_arg *a = arg;
2016 234035bc 2019-06-01 stsp unsigned char status;
2017 234035bc 2019-06-01 stsp struct stat sb;
2018 234035bc 2019-06-01 stsp char *ondisk_path;
2020 234035bc 2019-06-01 stsp /* Reject merges into a work tree with mixed base commits. */
2021 234035bc 2019-06-01 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
2022 234035bc 2019-06-01 stsp SHA1_DIGEST_LENGTH))
2023 234035bc 2019-06-01 stsp return got_error(GOT_ERR_MIXED_COMMITS);
2025 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
2027 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2029 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
2030 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
2032 234035bc 2019-06-01 stsp return err;
2033 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
2034 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
2036 234035bc 2019-06-01 stsp return NULL;
2039 818c7501 2019-07-11 stsp static const struct got_error *
2040 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2041 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
2042 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
2043 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2044 818c7501 2019-07-11 stsp got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2046 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
2047 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
2048 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2049 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
2051 03415a1a 2019-06-02 stsp if (commit_id1) {
2052 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
2053 03415a1a 2019-06-02 stsp worktree->path_prefix);
2055 03415a1a 2019-06-02 stsp goto done;
2057 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
2059 03415a1a 2019-06-02 stsp goto done;
2062 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
2063 234035bc 2019-06-01 stsp worktree->path_prefix);
2065 234035bc 2019-06-01 stsp goto done;
2067 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
2069 234035bc 2019-06-01 stsp goto done;
2071 234035bc 2019-06-01 stsp arg.worktree = worktree;
2072 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
2073 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
2074 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
2075 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
2076 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
2077 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
2078 234035bc 2019-06-01 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg);
2079 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2080 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2081 af12c6b9 2019-06-04 stsp err = sync_err;
2083 234035bc 2019-06-01 stsp if (tree1)
2084 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
2085 234035bc 2019-06-01 stsp if (tree2)
2086 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
2087 818c7501 2019-07-11 stsp return err;
2090 818c7501 2019-07-11 stsp const struct got_error *
2091 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
2092 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
2093 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2094 818c7501 2019-07-11 stsp void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2096 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
2097 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
2098 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
2099 818c7501 2019-07-11 stsp struct check_merge_ok_arg mok_arg;
2101 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
2103 818c7501 2019-07-11 stsp return err;
2105 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2107 818c7501 2019-07-11 stsp goto done;
2109 818c7501 2019-07-11 stsp mok_arg.worktree = worktree;
2110 818c7501 2019-07-11 stsp mok_arg.repo = repo;
2111 818c7501 2019-07-11 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
2112 818c7501 2019-07-11 stsp &mok_arg);
2114 818c7501 2019-07-11 stsp goto done;
2116 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
2117 818c7501 2019-07-11 stsp commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
2119 818c7501 2019-07-11 stsp if (fileindex)
2120 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
2121 818c7501 2019-07-11 stsp free(fileindex_path);
2122 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2123 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
2124 234035bc 2019-06-01 stsp err = unlockerr;
2125 234035bc 2019-06-01 stsp return err;
2128 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
2129 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
2130 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
2131 927df6b7 2019-02-10 stsp const char *status_path;
2132 927df6b7 2019-02-10 stsp size_t status_path_len;
2133 f8d1f275 2019-02-04 stsp struct got_repository *repo;
2134 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
2135 f8d1f275 2019-02-04 stsp void *status_arg;
2136 f8d1f275 2019-02-04 stsp got_worktree_cancel_cb cancel_cb;
2137 f8d1f275 2019-02-04 stsp void *cancel_arg;
2140 f8d1f275 2019-02-04 stsp static const struct got_error *
2141 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
2142 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
2143 927df6b7 2019-02-10 stsp struct got_repository *repo)
2145 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
2146 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
2147 927df6b7 2019-02-10 stsp struct stat sb;
2148 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
2150 927df6b7 2019-02-10 stsp err = get_file_status(&status, &sb, ie, abspath, repo);
2151 927df6b7 2019-02-10 stsp if (err == NULL && status != GOT_STATUS_NO_CHANGE) {
2152 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2153 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2154 016a88dd 2019-05-13 stsp err = (*status_cb)(status_arg, status, ie->path, &blob_id,
2155 016a88dd 2019-05-13 stsp &commit_id);
2157 927df6b7 2019-02-10 stsp return err;
2160 927df6b7 2019-02-10 stsp static const struct got_error *
2161 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
2162 f8d1f275 2019-02-04 stsp struct dirent *de, const char *parent_path)
2164 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2165 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2166 f8d1f275 2019-02-04 stsp char *abspath;
2168 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2169 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2171 927df6b7 2019-02-10 stsp if (got_path_cmp(parent_path, a->status_path) != 0 &&
2172 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
2173 927df6b7 2019-02-10 stsp return NULL;
2175 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2176 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
2177 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
2178 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2180 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
2181 f8d1f275 2019-02-04 stsp de->d_name) == -1)
2182 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2185 927df6b7 2019-02-10 stsp err = report_file_status(ie, abspath, a->status_cb, a->status_arg,
2187 f8d1f275 2019-02-04 stsp free(abspath);
2188 9d31a1d8 2018-03-11 stsp return err;
2191 f8d1f275 2019-02-04 stsp static const struct got_error *
2192 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2194 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2195 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
2196 2ec1f75b 2019-03-26 stsp unsigned char status;
2198 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2199 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2201 927df6b7 2019-02-10 stsp if (!got_path_is_child(parent_path, a->status_path, a->status_path_len))
2202 927df6b7 2019-02-10 stsp return NULL;
2204 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2205 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2206 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
2207 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
2209 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
2210 016a88dd 2019-05-13 stsp return (*a->status_cb)(a->status_arg, status, ie->path, &blob_id,
2211 016a88dd 2019-05-13 stsp &commit_id);
2214 f8d1f275 2019-02-04 stsp static const struct got_error *
2215 f8d1f275 2019-02-04 stsp status_new(void *arg, struct dirent *de, const char *parent_path)
2217 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
2218 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2219 f8d1f275 2019-02-04 stsp char *path = NULL;
2221 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2222 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2224 f8d1f275 2019-02-04 stsp if (de->d_type == DT_DIR)
2225 2c201a36 2019-02-10 stsp return NULL;
2227 2c201a36 2019-02-10 stsp /* XXX ignore symlinks for now */
2228 2c201a36 2019-02-10 stsp if (de->d_type == DT_LNK)
2229 f8d1f275 2019-02-04 stsp return NULL;
2231 927df6b7 2019-02-10 stsp if (!got_path_is_child(parent_path, a->status_path, a->status_path_len))
2232 927df6b7 2019-02-10 stsp return NULL;
2234 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2235 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
2236 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2238 f8d1f275 2019-02-04 stsp path = de->d_name;
2241 b72f483a 2019-02-05 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED, path,
2242 016a88dd 2019-05-13 stsp NULL, NULL);
2243 f8d1f275 2019-02-04 stsp if (parent_path[0])
2244 f8d1f275 2019-02-04 stsp free(path);
2245 b72f483a 2019-02-05 stsp return err;
2248 347d1d3e 2019-07-12 stsp static const struct got_error *
2249 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
2250 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
2251 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
2252 347d1d3e 2019-07-12 stsp got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2254 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2255 f8d1f275 2019-02-04 stsp DIR *workdir = NULL;
2256 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
2257 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
2258 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
2260 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
2261 927df6b7 2019-02-10 stsp worktree->root_path, path[0] ? "/" : "", path) == -1) {
2262 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2263 c513d110 2019-02-05 stsp goto done;
2265 927df6b7 2019-02-10 stsp workdir = opendir(ondisk_path);
2266 927df6b7 2019-02-10 stsp if (workdir == NULL) {
2267 2ec1f75b 2019-03-26 stsp if (errno == ENOTDIR || errno == ENOENT) {
2268 927df6b7 2019-02-10 stsp struct got_fileindex_entry *ie;
2269 927df6b7 2019-02-10 stsp ie = got_fileindex_entry_get(fileindex, path);
2270 927df6b7 2019-02-10 stsp if (ie == NULL) {
2271 927df6b7 2019-02-10 stsp err = got_error(GOT_ERR_BAD_PATH);
2272 927df6b7 2019-02-10 stsp goto done;
2274 927df6b7 2019-02-10 stsp err = report_file_status(ie, ondisk_path,
2275 927df6b7 2019-02-10 stsp status_cb, status_arg, repo);
2276 927df6b7 2019-02-10 stsp goto done;
2278 638f9024 2019-05-13 stsp err = got_error_from_errno2("opendir", ondisk_path);
2279 927df6b7 2019-02-10 stsp goto done;
2282 d43a8a88 2019-02-05 stsp fdiff_cb.diff_old_new = status_old_new;
2283 d43a8a88 2019-02-05 stsp fdiff_cb.diff_old = status_old;
2284 d43a8a88 2019-02-05 stsp fdiff_cb.diff_new = status_new;
2285 f8d1f275 2019-02-04 stsp arg.fileindex = fileindex;
2286 f8d1f275 2019-02-04 stsp arg.worktree = worktree;
2287 927df6b7 2019-02-10 stsp arg.status_path = path;
2288 927df6b7 2019-02-10 stsp arg.status_path_len = strlen(path);
2289 f8d1f275 2019-02-04 stsp arg.repo = repo;
2290 f8d1f275 2019-02-04 stsp arg.status_cb = status_cb;
2291 f8d1f275 2019-02-04 stsp arg.status_arg = status_arg;
2292 f8d1f275 2019-02-04 stsp arg.cancel_cb = cancel_cb;
2293 f8d1f275 2019-02-04 stsp arg.cancel_arg = cancel_arg;
2294 c7f4312f 2019-02-05 stsp err = got_fileindex_diff_dir(fileindex, workdir, worktree->root_path,
2295 927df6b7 2019-02-10 stsp path, repo, &fdiff_cb, &arg);
2297 f8d1f275 2019-02-04 stsp if (workdir)
2298 f8d1f275 2019-02-04 stsp closedir(workdir);
2299 927df6b7 2019-02-10 stsp free(ondisk_path);
2300 347d1d3e 2019-07-12 stsp return err;
2303 347d1d3e 2019-07-12 stsp const struct got_error *
2304 347d1d3e 2019-07-12 stsp got_worktree_status(struct got_worktree *worktree, const char *path,
2305 347d1d3e 2019-07-12 stsp struct got_repository *repo, got_worktree_status_cb status_cb,
2306 347d1d3e 2019-07-12 stsp void *status_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2308 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
2309 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
2310 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
2312 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2314 347d1d3e 2019-07-12 stsp return err;
2316 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, path, fileindex, repo,
2317 347d1d3e 2019-07-12 stsp status_cb, status_arg, cancel_cb, cancel_arg);
2318 f8d1f275 2019-02-04 stsp free(fileindex_path);
2319 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
2320 f8d1f275 2019-02-04 stsp return err;
2323 6c7ab921 2019-03-18 stsp const struct got_error *
2324 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
2325 6c7ab921 2019-03-18 stsp const char *arg)
2327 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
2328 d0710d08 2019-07-22 stsp char *resolved, *cwd = NULL, *path = NULL;
2329 6c7ab921 2019-03-18 stsp size_t len;
2331 6c7ab921 2019-03-18 stsp *wt_path = NULL;
2333 6c7ab921 2019-03-18 stsp resolved = realpath(arg, NULL);
2334 d0710d08 2019-07-22 stsp if (resolved == NULL) {
2335 d0710d08 2019-07-22 stsp if (errno != ENOENT)
2336 d0710d08 2019-07-22 stsp return got_error_from_errno2("realpath", arg);
2337 d0710d08 2019-07-22 stsp cwd = getcwd(NULL, 0);
2338 d0710d08 2019-07-22 stsp if (cwd == NULL)
2339 d0710d08 2019-07-22 stsp return got_error_from_errno("getcwd");
2340 d0710d08 2019-07-22 stsp if (asprintf(&resolved, "%s/%s", cwd, arg) == -1) {
2341 d0710d08 2019-07-22 stsp err = got_error_from_errno("asprintf");
2342 d0710d08 2019-07-22 stsp goto done;
2346 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
2347 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
2348 6c7ab921 2019-03-18 stsp err = got_error(GOT_ERR_BAD_PATH);
2349 6c7ab921 2019-03-18 stsp goto done;
2352 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
2353 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
2354 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
2356 f6d88e1a 2019-05-29 stsp goto done;
2358 f6d88e1a 2019-05-29 stsp path = strdup("");
2359 f6d88e1a 2019-05-29 stsp if (path == NULL) {
2360 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
2361 f6d88e1a 2019-05-29 stsp goto done;
2365 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
2366 6c7ab921 2019-03-18 stsp len = strlen(path);
2367 6c7ab921 2019-03-18 stsp while (path[len - 1] == '/') {
2368 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
2372 6c7ab921 2019-03-18 stsp free(resolved);
2373 d0710d08 2019-07-22 stsp free(cwd);
2374 6c7ab921 2019-03-18 stsp if (err == NULL)
2375 6c7ab921 2019-03-18 stsp *wt_path = path;
2377 6c7ab921 2019-03-18 stsp free(path);
2378 d00136be 2019-03-26 stsp return err;
2381 07f5b47a 2019-06-02 stsp static const struct got_error *
2382 07f5b47a 2019-06-02 stsp schedule_addition(const char *ondisk_path, struct got_fileindex *fileindex,
2383 07f5b47a 2019-06-02 stsp const char *relpath, got_worktree_status_cb status_cb, void *status_arg,
2384 07f5b47a 2019-06-02 stsp struct got_repository *repo)
2386 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
2387 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
2389 07f5b47a 2019-06-02 stsp /* Re-adding an existing entry is a no-op. */
2390 07f5b47a 2019-06-02 stsp if (got_fileindex_entry_get(fileindex, relpath) != NULL)
2391 07f5b47a 2019-06-02 stsp return NULL;
2393 07f5b47a 2019-06-02 stsp err = got_fileindex_entry_alloc(&ie, ondisk_path, relpath, NULL, NULL);
2395 07f5b47a 2019-06-02 stsp return err;
2397 07f5b47a 2019-06-02 stsp err = got_fileindex_entry_add(fileindex, ie);
2398 07f5b47a 2019-06-02 stsp if (err) {
2399 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
2400 07f5b47a 2019-06-02 stsp return err;
2403 07f5b47a 2019-06-02 stsp return report_file_status(ie, relpath, status_cb, status_arg, repo);
2406 d00136be 2019-03-26 stsp const struct got_error *
2407 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
2408 1dd54920 2019-05-11 stsp struct got_pathlist_head *ondisk_paths,
2409 1dd54920 2019-05-11 stsp got_worktree_status_cb status_cb, void *status_arg,
2410 031a5338 2019-03-26 stsp struct got_repository *repo)
2412 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
2413 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2414 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2415 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
2417 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
2419 d00136be 2019-03-26 stsp return err;
2421 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2423 d00136be 2019-03-26 stsp goto done;
2425 1dd54920 2019-05-11 stsp TAILQ_FOREACH(pe, ondisk_paths, entry) {
2426 1dd54920 2019-05-11 stsp char *relpath;
2427 1dd54920 2019-05-11 stsp err = got_path_skip_common_ancestor(&relpath,
2428 1dd54920 2019-05-11 stsp got_worktree_get_root_path(worktree), pe->path);
2431 07f5b47a 2019-06-02 stsp err = schedule_addition(pe->path, fileindex, relpath,
2432 07f5b47a 2019-06-02 stsp status_cb, status_arg, repo);
2433 1dd54920 2019-05-11 stsp free(relpath);
2437 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2438 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2439 af12c6b9 2019-06-04 stsp err = sync_err;
2441 fb399478 2019-07-12 stsp free(fileindex_path);
2442 d00136be 2019-03-26 stsp if (fileindex)
2443 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
2444 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2445 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
2446 d00136be 2019-03-26 stsp err = unlockerr;
2447 6c7ab921 2019-03-18 stsp return err;
2450 17ed4618 2019-06-02 stsp static const struct got_error *
2451 17ed4618 2019-06-02 stsp schedule_for_deletion(const char *ondisk_path, struct got_fileindex *fileindex,
2452 17ed4618 2019-06-02 stsp const char *relpath, int delete_local_mods,
2453 17ed4618 2019-06-02 stsp got_worktree_status_cb status_cb, void *status_arg,
2454 17ed4618 2019-06-02 stsp struct got_repository *repo)
2456 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
2457 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
2458 17ed4618 2019-06-02 stsp unsigned char status;
2459 17ed4618 2019-06-02 stsp struct stat sb;
2461 17ed4618 2019-06-02 stsp ie = got_fileindex_entry_get(fileindex, relpath);
2462 17ed4618 2019-06-02 stsp if (ie == NULL)
2463 17ed4618 2019-06-02 stsp return got_error(GOT_ERR_BAD_PATH);
2465 17ed4618 2019-06-02 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2467 17ed4618 2019-06-02 stsp return err;
2469 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
2470 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
2471 17ed4618 2019-06-02 stsp return got_error_set_errno(ENOENT, ondisk_path);
2472 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_MODIFY)
2473 17ed4618 2019-06-02 stsp return got_error(GOT_ERR_FILE_STATUS);
2474 17ed4618 2019-06-02 stsp if (!delete_local_mods)
2475 17ed4618 2019-06-02 stsp return got_error(GOT_ERR_FILE_MODIFIED);
2478 17ed4618 2019-06-02 stsp if (unlink(ondisk_path) != 0)
2479 17ed4618 2019-06-02 stsp return got_error_from_errno2("unlink", ondisk_path);
2481 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2482 17ed4618 2019-06-02 stsp return report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
2485 2ec1f75b 2019-03-26 stsp const struct got_error *
2486 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
2487 17ed4618 2019-06-02 stsp struct got_pathlist_head *ondisk_paths, int delete_local_mods,
2488 2ec1f75b 2019-03-26 stsp got_worktree_status_cb status_cb, void *status_arg,
2489 2ec1f75b 2019-03-26 stsp struct got_repository *repo)
2491 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
2492 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
2493 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2494 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
2496 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
2498 2ec1f75b 2019-03-26 stsp return err;
2500 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2502 2ec1f75b 2019-03-26 stsp goto done;
2504 17ed4618 2019-06-02 stsp TAILQ_FOREACH(pe, ondisk_paths, entry) {
2505 17ed4618 2019-06-02 stsp char *relpath;
2506 17ed4618 2019-06-02 stsp err = got_path_skip_common_ancestor(&relpath,
2507 17ed4618 2019-06-02 stsp got_worktree_get_root_path(worktree), pe->path);
2510 17ed4618 2019-06-02 stsp err = schedule_for_deletion(pe->path, fileindex, relpath,
2511 17ed4618 2019-06-02 stsp delete_local_mods, status_cb, status_arg, repo);
2512 17ed4618 2019-06-02 stsp free(relpath);
2516 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2517 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2518 af12c6b9 2019-06-04 stsp err = sync_err;
2520 fb399478 2019-07-12 stsp free(fileindex_path);
2521 2ec1f75b 2019-03-26 stsp if (fileindex)
2522 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
2523 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2524 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
2525 2ec1f75b 2019-03-26 stsp err = unlockerr;
2526 2ec1f75b 2019-03-26 stsp return err;
2529 e20a8b6f 2019-06-04 stsp static const struct got_error *
2530 e20a8b6f 2019-06-04 stsp revert_file(struct got_worktree *worktree, struct got_fileindex *fileindex,
2531 a129376b 2019-03-28 stsp const char *ondisk_path,
2532 a129376b 2019-03-28 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2533 a129376b 2019-03-28 stsp struct got_repository *repo)
2535 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
2536 e20a8b6f 2019-06-04 stsp char *relpath = NULL, *parent_path = NULL;
2537 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
2538 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
2539 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
2540 a129376b 2019-03-28 stsp const struct got_tree_entry *te;
2541 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
2542 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
2543 a129376b 2019-03-28 stsp unsigned char status;
2544 a129376b 2019-03-28 stsp struct stat sb;
2546 a129376b 2019-03-28 stsp err = got_path_skip_common_ancestor(&relpath,
2547 a129376b 2019-03-28 stsp got_worktree_get_root_path(worktree), ondisk_path);
2549 a129376b 2019-03-28 stsp goto done;
2551 a129376b 2019-03-28 stsp ie = got_fileindex_entry_get(fileindex, relpath);
2552 a129376b 2019-03-28 stsp if (ie == NULL) {
2553 a129376b 2019-03-28 stsp err = got_error(GOT_ERR_BAD_PATH);
2554 a129376b 2019-03-28 stsp goto done;
2557 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
2558 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
2559 a129376b 2019-03-28 stsp if (err) {
2560 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
2561 a129376b 2019-03-28 stsp goto done;
2562 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
2563 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
2564 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
2565 e20a8b6f 2019-06-04 stsp goto done;
2568 a129376b 2019-03-28 stsp if (got_path_is_root_dir(worktree->path_prefix)) {
2569 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
2570 a129376b 2019-03-28 stsp if (tree_path == NULL) {
2571 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
2572 a129376b 2019-03-28 stsp goto done;
2575 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
2576 a129376b 2019-03-28 stsp tree_path = strdup(worktree->path_prefix);
2577 a129376b 2019-03-28 stsp if (tree_path == NULL) {
2578 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
2579 a129376b 2019-03-28 stsp goto done;
2582 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
2583 a129376b 2019-03-28 stsp worktree->path_prefix, parent_path) == -1) {
2584 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2585 a129376b 2019-03-28 stsp goto done;
2590 a129376b 2019-03-28 stsp err = got_object_id_by_path(&tree_id, repo, worktree->base_commit_id,
2591 a129376b 2019-03-28 stsp tree_path);
2593 a129376b 2019-03-28 stsp goto done;
2595 a129376b 2019-03-28 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
2597 a129376b 2019-03-28 stsp goto done;
2599 a129376b 2019-03-28 stsp te_name = basename(ie->path);
2600 a129376b 2019-03-28 stsp if (te_name == NULL) {
2601 638f9024 2019-05-13 stsp err = got_error_from_errno2("basename", ie->path);
2602 a129376b 2019-03-28 stsp goto done;
2605 a129376b 2019-03-28 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2607 a129376b 2019-03-28 stsp goto done;
2609 a129376b 2019-03-28 stsp te = got_object_tree_find_entry(tree, te_name);
2610 a129376b 2019-03-28 stsp if (te == NULL && status != GOT_STATUS_ADD) {
2611 a129376b 2019-03-28 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
2612 a129376b 2019-03-28 stsp goto done;
2615 a129376b 2019-03-28 stsp switch (status) {
2616 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
2617 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT, ie->path);
2619 1ee397ad 2019-07-12 stsp goto done;
2620 a129376b 2019-03-28 stsp got_fileindex_entry_remove(fileindex, ie);
2622 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
2623 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
2624 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
2625 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
2626 e20a8b6f 2019-06-04 stsp struct got_object_id id;
2627 a129376b 2019-03-28 stsp memcpy(id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2628 a129376b 2019-03-28 stsp err = got_object_open_as_blob(&blob, repo, &id, 8192);
2630 a129376b 2019-03-28 stsp goto done;
2631 a129376b 2019-03-28 stsp err = install_blob(worktree, ondisk_path, ie->path,
2632 a129376b 2019-03-28 stsp te->mode, sb.st_mode, blob, 0, 1, repo, progress_cb,
2633 a129376b 2019-03-28 stsp progress_arg);
2635 a129376b 2019-03-28 stsp goto done;
2636 a129376b 2019-03-28 stsp if (status == GOT_STATUS_DELETE) {
2637 a129376b 2019-03-28 stsp err = update_blob_fileindex_entry(worktree,
2638 a129376b 2019-03-28 stsp fileindex, ie, ondisk_path, ie->path, blob, 1);
2640 a129376b 2019-03-28 stsp goto done;
2645 a129376b 2019-03-28 stsp goto done;
2648 a129376b 2019-03-28 stsp free(relpath);
2649 e20a8b6f 2019-06-04 stsp free(parent_path);
2650 a129376b 2019-03-28 stsp free(tree_path);
2652 a129376b 2019-03-28 stsp got_object_blob_close(blob);
2654 a129376b 2019-03-28 stsp got_object_tree_close(tree);
2655 a129376b 2019-03-28 stsp free(tree_id);
2656 e20a8b6f 2019-06-04 stsp return err;
2659 e20a8b6f 2019-06-04 stsp const struct got_error *
2660 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
2661 e20a8b6f 2019-06-04 stsp struct got_pathlist_head *ondisk_paths,
2662 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2663 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
2665 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
2666 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
2667 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
2668 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
2669 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
2671 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
2673 e20a8b6f 2019-06-04 stsp return err;
2675 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2677 e20a8b6f 2019-06-04 stsp goto done;
2679 e20a8b6f 2019-06-04 stsp TAILQ_FOREACH(pe, ondisk_paths, entry) {
2680 e20a8b6f 2019-06-04 stsp err = revert_file(worktree, fileindex, pe->path,
2681 e20a8b6f 2019-06-04 stsp progress_cb, progress_arg, repo);
2685 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2686 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
2687 e20a8b6f 2019-06-04 stsp err = sync_err;
2689 fb399478 2019-07-12 stsp free(fileindex_path);
2690 a129376b 2019-03-28 stsp if (fileindex)
2691 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
2692 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2693 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
2694 a129376b 2019-03-28 stsp err = unlockerr;
2695 c4296144 2019-05-09 stsp return err;
2698 cf066bf8 2019-05-09 stsp static void
2699 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
2701 24519714 2019-05-09 stsp free(ct->path);
2702 44d03001 2019-05-09 stsp free(ct->in_repo_path);
2703 768aea60 2019-05-09 stsp free(ct->ondisk_path);
2704 e75eb4da 2019-05-10 stsp free(ct->blob_id);
2705 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
2706 b416585c 2019-05-13 stsp free(ct->base_commit_id);
2710 ed175427 2019-05-09 stsp struct collect_commitables_arg {
2711 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
2712 24519714 2019-05-09 stsp struct got_repository *repo;
2713 24519714 2019-05-09 stsp struct got_worktree *worktree;
2716 c4296144 2019-05-09 stsp static const struct got_error *
2717 036813ee 2019-05-09 stsp collect_commitables(void *arg, unsigned char status, const char *relpath,
2718 016a88dd 2019-05-13 stsp struct got_object_id *blob_id, struct got_object_id *commit_id)
2720 ed175427 2019-05-09 stsp struct collect_commitables_arg *a = arg;
2721 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
2722 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
2723 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
2724 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
2725 768aea60 2019-05-09 stsp struct stat sb;
2727 c4296144 2019-05-09 stsp if (status == GOT_STATUS_CONFLICT)
2728 c4296144 2019-05-09 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
2730 c4296144 2019-05-09 stsp if (status != GOT_STATUS_MODIFY && status != GOT_STATUS_ADD &&
2731 c4296144 2019-05-09 stsp status != GOT_STATUS_DELETE)
2732 c4296144 2019-05-09 stsp return NULL;
2734 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
2735 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2736 036813ee 2019-05-09 stsp goto done;
2738 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
2739 036813ee 2019-05-09 stsp parent_path = strdup("");
2740 69960a46 2019-05-09 stsp if (parent_path == NULL)
2741 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
2743 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
2745 69960a46 2019-05-09 stsp return err;
2748 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
2749 cf066bf8 2019-05-09 stsp if (ct == NULL) {
2750 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
2751 c4296144 2019-05-09 stsp goto done;
2754 768aea60 2019-05-09 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
2755 768aea60 2019-05-09 stsp relpath) == -1) {
2756 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2757 768aea60 2019-05-09 stsp goto done;
2759 768aea60 2019-05-09 stsp if (status == GOT_STATUS_DELETE) {
2760 768aea60 2019-05-09 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2762 768aea60 2019-05-09 stsp if (lstat(ct->ondisk_path, &sb) != 0) {
2763 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
2764 768aea60 2019-05-09 stsp goto done;
2766 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
2769 44d03001 2019-05-09 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
2770 44d03001 2019-05-09 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
2771 44d03001 2019-05-09 stsp relpath) == -1) {
2772 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2773 44d03001 2019-05-09 stsp goto done;
2776 cf066bf8 2019-05-09 stsp ct->status = status;
2777 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
2778 036813ee 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD) {
2779 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
2780 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
2781 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2782 b416585c 2019-05-13 stsp goto done;
2784 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
2785 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
2786 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2787 036813ee 2019-05-09 stsp goto done;
2790 24519714 2019-05-09 stsp ct->path = strdup(path);
2791 24519714 2019-05-09 stsp if (ct->path == NULL) {
2792 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
2793 24519714 2019-05-09 stsp goto done;
2795 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
2797 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
2798 ed175427 2019-05-09 stsp free_commitable(ct);
2799 24519714 2019-05-09 stsp free(parent_path);
2800 036813ee 2019-05-09 stsp free(path);
2801 a129376b 2019-03-28 stsp return err;
2804 036813ee 2019-05-09 stsp static const struct got_error *write_tree(struct got_object_id **,
2805 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
2806 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
2807 036813ee 2019-05-09 stsp struct got_repository *);
2809 ed175427 2019-05-09 stsp static const struct got_error *
2810 036813ee 2019-05-09 stsp write_subtree(struct got_object_id **new_subtree_id,
2811 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
2812 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
2813 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
2814 afa376bf 2019-05-09 stsp struct got_repository *repo)
2816 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
2817 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
2818 036813ee 2019-05-09 stsp char *subpath;
2820 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
2821 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
2822 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2824 036813ee 2019-05-09 stsp err = got_object_open_as_tree(&subtree, repo, te->id);
2826 ed175427 2019-05-09 stsp return err;
2828 036813ee 2019-05-09 stsp err = write_tree(new_subtree_id, subtree, subpath, commitable_paths,
2829 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
2830 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
2831 036813ee 2019-05-09 stsp free(subpath);
2832 036813ee 2019-05-09 stsp return err;
2835 036813ee 2019-05-09 stsp static const struct got_error *
2836 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
2838 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2839 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
2841 036813ee 2019-05-09 stsp *match = 0;
2843 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
2844 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
2845 0f63689d 2019-05-10 stsp return NULL;
2848 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
2850 0f63689d 2019-05-10 stsp return err;
2851 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
2852 036813ee 2019-05-09 stsp free(ct_parent_path);
2853 036813ee 2019-05-09 stsp return err;
2856 768aea60 2019-05-09 stsp static mode_t
2857 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
2859 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
2862 036813ee 2019-05-09 stsp static const struct got_error *
2863 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
2864 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
2866 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2868 036813ee 2019-05-09 stsp *new_te = NULL;
2870 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
2872 036813ee 2019-05-09 stsp goto done;
2874 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
2876 036813ee 2019-05-09 stsp free((*new_te)->id);
2877 e75eb4da 2019-05-10 stsp (*new_te)->id = got_object_id_dup(ct->blob_id);
2878 036813ee 2019-05-09 stsp if ((*new_te)->id == NULL) {
2879 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2880 036813ee 2019-05-09 stsp goto done;
2883 036813ee 2019-05-09 stsp if (err && *new_te) {
2884 036813ee 2019-05-09 stsp got_object_tree_entry_close(*new_te);
2885 036813ee 2019-05-09 stsp *new_te = NULL;
2887 036813ee 2019-05-09 stsp return err;
2890 036813ee 2019-05-09 stsp static const struct got_error *
2891 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
2892 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
2894 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2895 036813ee 2019-05-09 stsp char *ct_name;
2897 036813ee 2019-05-09 stsp *new_te = NULL;
2899 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
2900 036813ee 2019-05-09 stsp if (*new_te == NULL)
2901 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
2903 036813ee 2019-05-09 stsp ct_name = basename(ct->path);
2904 036813ee 2019-05-09 stsp if (ct_name == NULL) {
2905 638f9024 2019-05-13 stsp err = got_error_from_errno2("basename", ct->path);
2906 036813ee 2019-05-09 stsp goto done;
2908 036813ee 2019-05-09 stsp (*new_te)->name = strdup(ct_name);
2909 036813ee 2019-05-09 stsp if ((*new_te)->name == NULL) {
2910 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
2911 036813ee 2019-05-09 stsp goto done;
2914 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
2916 e75eb4da 2019-05-10 stsp (*new_te)->id = got_object_id_dup(ct->blob_id);
2917 036813ee 2019-05-09 stsp if ((*new_te)->id == NULL) {
2918 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2919 036813ee 2019-05-09 stsp goto done;
2922 036813ee 2019-05-09 stsp if (err && *new_te) {
2923 036813ee 2019-05-09 stsp got_object_tree_entry_close(*new_te);
2924 036813ee 2019-05-09 stsp *new_te = NULL;
2926 036813ee 2019-05-09 stsp return err;
2929 036813ee 2019-05-09 stsp static const struct got_error *
2930 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
2931 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
2933 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2934 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
2936 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
2938 036813ee 2019-05-09 stsp return err;
2939 036813ee 2019-05-09 stsp if (new_pe == NULL)
2940 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
2941 036813ee 2019-05-09 stsp return NULL;
2944 afa376bf 2019-05-09 stsp static const struct got_error *
2945 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
2946 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
2948 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
2949 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
2950 afa376bf 2019-05-09 stsp ct_path++;
2951 016a88dd 2019-05-13 stsp return (*status_cb)(status_arg, ct->status, ct_path, ct->blob_id, NULL);
2954 036813ee 2019-05-09 stsp static const struct got_error *
2955 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
2956 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
2958 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
2959 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
2960 44d03001 2019-05-09 stsp char *te_path;
2962 44d03001 2019-05-09 stsp *modified = 0;
2964 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
2965 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
2966 44d03001 2019-05-09 stsp te->name) == -1)
2967 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2969 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
2970 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
2971 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
2972 44d03001 2019-05-09 stsp strlen(te_path));
2973 44d03001 2019-05-09 stsp if (*modified)
2977 44d03001 2019-05-09 stsp free(te_path);
2978 44d03001 2019-05-09 stsp return err;
2981 44d03001 2019-05-09 stsp static const struct got_error *
2982 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
2983 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
2984 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
2986 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
2987 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
2989 036813ee 2019-05-09 stsp *ctp = NULL;
2991 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
2992 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
2993 036813ee 2019-05-09 stsp char *ct_name = NULL;
2994 036813ee 2019-05-09 stsp int path_matches;
2996 036813ee 2019-05-09 stsp if (ct->status != GOT_STATUS_MODIFY &&
2997 036813ee 2019-05-09 stsp ct->status != GOT_STATUS_DELETE)
3000 c4e12a88 2019-05-13 stsp if (got_object_id_cmp(ct->base_blob_id, te->id) != 0)
3003 036813ee 2019-05-09 stsp err = match_ct_parent_path(&path_matches, ct, base_tree_path);
3005 036813ee 2019-05-09 stsp return err;
3006 036813ee 2019-05-09 stsp if (!path_matches)
3009 036813ee 2019-05-09 stsp ct_name = basename(pe->path);
3010 036813ee 2019-05-09 stsp if (ct_name == NULL)
3011 638f9024 2019-05-13 stsp return got_error_from_errno2("basename", pe->path);
3013 036813ee 2019-05-09 stsp if (strcmp(te->name, ct_name) != 0)
3016 036813ee 2019-05-09 stsp *ctp = ct;
3020 2b496619 2019-07-10 stsp return err;
3023 2b496619 2019-07-10 stsp static const struct got_error *
3024 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
3025 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
3026 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
3027 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3028 2b496619 2019-07-10 stsp struct got_repository *repo)
3030 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
3031 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
3032 2b496619 2019-07-10 stsp char *subtree_path;
3034 2b496619 2019-07-10 stsp *new_tep = NULL;
3036 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
3037 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
3038 2b496619 2019-07-10 stsp child_path) == -1)
3039 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
3041 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
3042 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
3043 2b496619 2019-07-10 stsp new_te->name = strdup(child_path);
3044 2b496619 2019-07-10 stsp if (new_te->name == NULL) {
3045 2b496619 2019-07-10 stsp err = got_error_from_errno("strdup");
3046 2b496619 2019-07-10 stsp got_object_tree_entry_close(new_te);
3047 2b496619 2019-07-10 stsp goto done;
3049 2b496619 2019-07-10 stsp err = write_tree(&new_te->id, NULL, subtree_path,
3050 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
3051 2b496619 2019-07-10 stsp if (err) {
3052 2b496619 2019-07-10 stsp got_object_tree_entry_close(new_te);
3053 2b496619 2019-07-10 stsp goto done;
3056 2b496619 2019-07-10 stsp free(subtree_path);
3057 2b496619 2019-07-10 stsp if (err == NULL)
3058 2b496619 2019-07-10 stsp *new_tep = new_te;
3059 036813ee 2019-05-09 stsp return err;
3062 036813ee 2019-05-09 stsp static const struct got_error *
3063 036813ee 2019-05-09 stsp write_tree(struct got_object_id **new_tree_id,
3064 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
3065 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
3066 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3067 036813ee 2019-05-09 stsp struct got_repository *repo)
3069 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3070 036813ee 2019-05-09 stsp const struct got_tree_entries *base_entries = NULL;
3071 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
3072 036813ee 2019-05-09 stsp struct got_tree_entries new_tree_entries;
3073 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
3074 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
3076 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
3077 036813ee 2019-05-09 stsp new_tree_entries.nentries = 0;
3078 036813ee 2019-05-09 stsp SIMPLEQ_INIT(&new_tree_entries.head);
3080 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
3081 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3082 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3083 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
3085 a3df2849 2019-05-20 stsp if (ct->status != GOT_STATUS_ADD ||
3086 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
3089 036813ee 2019-05-09 stsp if (!got_path_is_child(pe->path, path_base_tree,
3090 2f51b5b3 2019-05-09 stsp strlen(path_base_tree)))
3093 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
3094 036813ee 2019-05-09 stsp pe->path);
3096 036813ee 2019-05-09 stsp goto done;
3098 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
3099 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
3100 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
3102 036813ee 2019-05-09 stsp goto done;
3103 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
3105 afa376bf 2019-05-09 stsp goto done;
3106 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
3107 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
3109 2f51b5b3 2019-05-09 stsp goto done;
3111 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
3112 2b496619 2019-07-10 stsp if (base_tree == NULL ||
3113 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
3114 2b496619 2019-07-10 stsp == NULL) {
3115 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
3116 2b496619 2019-07-10 stsp child_path, path_base_tree,
3117 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
3120 2b496619 2019-07-10 stsp goto done;
3121 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
3123 2b496619 2019-07-10 stsp goto done;
3128 2f51b5b3 2019-05-09 stsp if (base_tree) {
3129 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
3130 2f51b5b3 2019-05-09 stsp base_entries = got_object_tree_get_entries(base_tree);
3131 2f51b5b3 2019-05-09 stsp SIMPLEQ_FOREACH(te, &base_entries->head, entry) {
3132 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
3134 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
3135 44d03001 2019-05-09 stsp int modified;
3136 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
3138 036813ee 2019-05-09 stsp goto done;
3139 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
3140 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
3142 2f51b5b3 2019-05-09 stsp goto done;
3143 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
3144 44d03001 2019-05-09 stsp if (modified) {
3145 44d03001 2019-05-09 stsp free(new_te->id);
3146 44d03001 2019-05-09 stsp err = write_subtree(&new_te->id, te,
3147 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
3148 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
3150 44d03001 2019-05-09 stsp goto done;
3152 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
3154 036813ee 2019-05-09 stsp goto done;
3158 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
3159 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
3161 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
3162 2f51b5b3 2019-05-09 stsp if (ct->status == GOT_STATUS_MODIFY) {
3163 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
3164 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
3166 2f51b5b3 2019-05-09 stsp goto done;
3167 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
3169 2f51b5b3 2019-05-09 stsp goto done;
3171 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
3172 b416585c 2019-05-13 stsp status_arg);
3174 afa376bf 2019-05-09 stsp goto done;
3176 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
3177 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
3179 2f51b5b3 2019-05-09 stsp goto done;
3180 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
3182 2f51b5b3 2019-05-09 stsp goto done;
3187 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
3188 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, &paths, entry) {
3189 0b5cc0d6 2019-05-09 stsp struct got_tree_entry *te = pe->data;
3190 0b5cc0d6 2019-05-09 stsp new_tree_entries.nentries++;
3191 0b5cc0d6 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&new_tree_entries.head, te, entry);
3193 036813ee 2019-05-09 stsp err = got_object_tree_create(new_tree_id, &new_tree_entries, repo);
3195 ca2503ea 2019-05-09 stsp got_object_tree_entries_close(&new_tree_entries);
3196 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
3197 ed175427 2019-05-09 stsp return err;
3200 ebf99748 2019-05-09 stsp static const struct got_error *
3201 ebf99748 2019-05-09 stsp update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
3202 93ec1b5f 2019-07-12 stsp struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex)
3204 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
3205 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
3207 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3208 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
3209 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3211 ebf99748 2019-05-09 stsp ie = got_fileindex_entry_get(fileindex, pe->path);
3213 ebf99748 2019-05-09 stsp if (ct->status == GOT_STATUS_DELETE) {
3214 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
3215 ebf99748 2019-05-09 stsp got_fileindex_entry_free(ie);
3217 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
3218 e75eb4da 2019-05-10 stsp ct->ondisk_path, ct->blob_id->sha1,
3219 ebf99748 2019-05-09 stsp new_base_commit_id->sha1, 1);
3221 ebf99748 2019-05-09 stsp err = got_fileindex_entry_alloc(&ie,
3222 e75eb4da 2019-05-10 stsp ct->ondisk_path, pe->path, ct->blob_id->sha1,
3223 ebf99748 2019-05-09 stsp new_base_commit_id->sha1);
3226 ebf99748 2019-05-09 stsp err = got_fileindex_entry_add(fileindex, ie);
3231 d56d26ce 2019-05-10 stsp return err;
3234 d56d26ce 2019-05-10 stsp static const struct got_error *
3235 33ad4cbe 2019-05-12 jcs check_ct_out_of_date(struct got_commitable *ct, struct got_repository *repo,
3236 d56d26ce 2019-05-10 stsp struct got_object_id *head_commit_id)
3238 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
3239 1a36436d 2019-06-10 stsp struct got_object_id *id_in_head = NULL, *id = NULL;
3240 1a36436d 2019-06-10 stsp struct got_commit_object *commit = NULL;
3241 1a36436d 2019-06-10 stsp char *path = NULL;
3242 1a36436d 2019-06-10 stsp const char *ct_path = ct->in_repo_path;
3244 1a36436d 2019-06-10 stsp while (ct_path[0] == '/')
3245 1a36436d 2019-06-10 stsp ct_path++;
3248 1a36436d 2019-06-10 stsp * Ensure that no modifications were made to files *and their parents*
3249 1a36436d 2019-06-10 stsp * in commits between the file's base commit and the branch head.
3251 1a36436d 2019-06-10 stsp * Checking the parents is important for detecting conflicting tree
3252 1a36436d 2019-06-10 stsp * configurations (files or parent folders might have been moved,
3253 1a36436d 2019-06-10 stsp * deleted, added again, etc.). Such changes need to be merged with
3254 1a36436d 2019-06-10 stsp * local changes before a commit can occur.
3256 1a36436d 2019-06-10 stsp * The implication is that the file's (parent) entry in the root
3257 1a36436d 2019-06-10 stsp * directory must have the same ID in all relevant commits.
3259 b416585c 2019-05-13 stsp if (ct->status != GOT_STATUS_ADD) {
3260 1a36436d 2019-06-10 stsp struct got_object_qid *pid;
3261 1a36436d 2019-06-10 stsp char *slash;
3262 1a36436d 2019-06-10 stsp struct got_object_id *root_entry_id = NULL;
3264 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
3265 1a36436d 2019-06-10 stsp if (got_object_id_cmp(ct->base_commit_id, head_commit_id) == 0)
3266 1a36436d 2019-06-10 stsp return NULL;
3268 1a36436d 2019-06-10 stsp /* Compute the path to the root directory's entry. */
3269 1a36436d 2019-06-10 stsp path = strdup(ct_path);
3270 1a36436d 2019-06-10 stsp if (path == NULL) {
3271 1a36436d 2019-06-10 stsp err = got_error_from_errno("strdup");
3272 1a36436d 2019-06-10 stsp goto done;
3274 1a36436d 2019-06-10 stsp slash = strchr(path, '/');
3275 1a36436d 2019-06-10 stsp if (slash)
3276 1a36436d 2019-06-10 stsp *slash = '\0';
3278 1a36436d 2019-06-10 stsp err = got_object_open_as_commit(&commit, repo, head_commit_id);
3280 1a36436d 2019-06-10 stsp goto done;
3282 1a36436d 2019-06-10 stsp err = got_object_id_by_path(&root_entry_id, repo,
3283 1a36436d 2019-06-10 stsp head_commit_id, path);
3285 1a36436d 2019-06-10 stsp goto done;
3287 1a36436d 2019-06-10 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3288 1a36436d 2019-06-10 stsp while (pid) {
3289 1a36436d 2019-06-10 stsp struct got_commit_object *pcommit;
3291 1a36436d 2019-06-10 stsp err = got_object_id_by_path(&id, repo, pid->id, path);
3292 1a36436d 2019-06-10 stsp if (err) {
3293 1a36436d 2019-06-10 stsp if (err->code != GOT_ERR_NO_TREE_ENTRY)
3294 1a36436d 2019-06-10 stsp goto done;
3295 1a36436d 2019-06-10 stsp err = NULL;
3299 1a36436d 2019-06-10 stsp err = got_object_id_by_path(&id, repo, pid->id, path);
3301 1a36436d 2019-06-10 stsp goto done;
3303 1a36436d 2019-06-10 stsp if (got_object_id_cmp(id, root_entry_id) != 0) {
3304 1a36436d 2019-06-10 stsp err = got_error(GOT_ERR_COMMIT_OUT_OF_DATE);
3308 1a36436d 2019-06-10 stsp if (got_object_id_cmp(pid->id, ct->base_commit_id) == 0)
3309 1a36436d 2019-06-10 stsp break; /* all relevant commits scanned */
3311 1a36436d 2019-06-10 stsp err = got_object_open_as_commit(&pcommit, repo,
3314 1a36436d 2019-06-10 stsp goto done;
3316 1a36436d 2019-06-10 stsp got_object_commit_close(commit);
3317 1a36436d 2019-06-10 stsp commit = pcommit;
3318 1a36436d 2019-06-10 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(
3322 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
3323 1a36436d 2019-06-10 stsp err = got_object_id_by_path(&id_in_head, repo, head_commit_id,
3325 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3326 1a36436d 2019-06-10 stsp goto done;
3327 1a36436d 2019-06-10 stsp err = id_in_head ? got_error(GOT_ERR_COMMIT_OUT_OF_DATE) : NULL;
3330 1a36436d 2019-06-10 stsp if (commit)
3331 1a36436d 2019-06-10 stsp got_object_commit_close(commit);
3332 d56d26ce 2019-05-10 stsp free(id_in_head);
3334 1a36436d 2019-06-10 stsp free(path);
3335 1a36436d 2019-06-10 stsp return err;
3338 c4296144 2019-05-09 stsp const struct got_error *
3339 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
3340 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
3341 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id, struct got_worktree *worktree,
3342 39cd0ff6 2019-07-12 stsp const char *ondisk_path, const char *author, const char *committer,
3343 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
3344 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3345 afa376bf 2019-05-09 stsp struct got_repository *repo)
3347 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
3348 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
3349 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
3350 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
3351 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
3352 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
3353 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
3354 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
3355 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
3356 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
3357 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
3359 c4296144 2019-05-09 stsp *new_commit_id = NULL;
3361 de18fc63 2019-05-09 stsp SIMPLEQ_INIT(&parent_ids);
3363 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
3365 588edf97 2019-05-10 stsp goto done;
3367 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
3369 588edf97 2019-05-10 stsp goto done;
3371 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
3372 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
3377 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
3378 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
3382 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
3383 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3384 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3385 cf066bf8 2019-05-09 stsp char *ondisk_path;
3387 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
3388 cf066bf8 2019-05-09 stsp ct->status != GOT_STATUS_MODIFY)
3391 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
3392 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
3393 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3394 cf066bf8 2019-05-09 stsp goto done;
3396 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
3397 a7055788 2019-05-09 stsp free(ondisk_path);
3399 cf066bf8 2019-05-09 stsp goto done;
3402 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
3403 39cd0ff6 2019-07-12 stsp err = write_tree(&new_tree_id, head_tree, "/", commitable_paths,
3404 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
3406 036813ee 2019-05-09 stsp goto done;
3408 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
3410 de18fc63 2019-05-09 stsp goto done;
3411 de18fc63 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
3412 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
3413 de18fc63 2019-05-09 stsp 1, author, time(NULL), committer, time(NULL), logmsg, repo);
3414 de18fc63 2019-05-09 stsp got_object_qid_free(pid);
3415 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
3416 33ad4cbe 2019-05-12 jcs free(logmsg);
3418 9d40349a 2019-05-09 stsp goto done;
3420 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
3421 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
3422 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
3423 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
3424 09f5bd90 2019-05-09 stsp goto done;
3426 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
3427 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
3429 09f5bd90 2019-05-09 stsp goto done;
3430 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
3432 ebf99748 2019-05-09 stsp goto done;
3433 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
3434 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
3435 09f5bd90 2019-05-09 stsp goto done;
3437 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
3438 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
3440 f2c16586 2019-05-09 stsp goto done;
3441 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
3443 f2c16586 2019-05-09 stsp goto done;
3445 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
3447 09f5bd90 2019-05-09 stsp goto done;
3449 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
3451 ebf99748 2019-05-09 stsp goto done;
3453 588edf97 2019-05-10 stsp if (head_tree)
3454 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
3455 588edf97 2019-05-10 stsp if (head_commit)
3456 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
3457 09f5bd90 2019-05-09 stsp free(head_commit_id2);
3458 2f17228e 2019-05-12 stsp if (head_ref2) {
3459 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
3460 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
3461 2f17228e 2019-05-12 stsp err = unlockerr;
3462 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
3464 39cd0ff6 2019-07-12 stsp return err;
3467 39cd0ff6 2019-07-12 stsp const struct got_error *
3468 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
3469 39cd0ff6 2019-07-12 stsp struct got_worktree *worktree, const char *ondisk_path,
3470 39cd0ff6 2019-07-12 stsp const char *author, const char *committer,
3471 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
3472 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
3473 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
3475 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
3476 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
3477 39cd0ff6 2019-07-12 stsp char *fileindex_path = NULL, *relpath = NULL;
3478 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
3479 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
3480 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
3481 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
3482 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
3484 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
3486 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
3488 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
3490 39cd0ff6 2019-07-12 stsp goto done;
3492 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
3494 39cd0ff6 2019-07-12 stsp goto done;
3496 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
3498 39cd0ff6 2019-07-12 stsp goto done;
3500 39cd0ff6 2019-07-12 stsp if (ondisk_path) {
3501 39cd0ff6 2019-07-12 stsp err = got_path_skip_common_ancestor(&relpath,
3502 39cd0ff6 2019-07-12 stsp worktree->root_path, ondisk_path);
3504 39cd0ff6 2019-07-12 stsp return err;
3507 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3509 39cd0ff6 2019-07-12 stsp goto done;
3511 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
3512 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
3513 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
3514 39cd0ff6 2019-07-12 stsp err = worktree_status(worktree, relpath ? relpath : "",
3515 39cd0ff6 2019-07-12 stsp fileindex, repo, collect_commitables, &cc_arg, NULL, NULL);
3517 39cd0ff6 2019-07-12 stsp goto done;
3519 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
3520 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
3521 39cd0ff6 2019-07-12 stsp goto done;
3524 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
3525 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
3526 b50cabdf 2019-07-12 stsp err = check_ct_out_of_date(ct, repo, head_commit_id);
3528 b50cabdf 2019-07-12 stsp goto done;
3531 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
3532 39cd0ff6 2019-07-12 stsp head_commit_id, worktree, ondisk_path, author, committer,
3533 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
3535 39cd0ff6 2019-07-12 stsp goto done;
3537 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
3538 93ec1b5f 2019-07-12 stsp fileindex);
3539 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3540 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
3541 39cd0ff6 2019-07-12 stsp err = sync_err;
3543 39cd0ff6 2019-07-12 stsp if (fileindex)
3544 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
3545 39cd0ff6 2019-07-12 stsp free(fileindex_path);
3546 39cd0ff6 2019-07-12 stsp free(relpath);
3547 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3548 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
3549 39cd0ff6 2019-07-12 stsp err = unlockerr;
3550 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
3551 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
3552 39cd0ff6 2019-07-12 stsp free_commitable(ct);
3554 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
3555 c4296144 2019-05-09 stsp return err;
3558 8656d6c4 2019-05-20 stsp const char *
3559 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
3561 8656d6c4 2019-05-20 stsp return ct->path;
3564 8656d6c4 2019-05-20 stsp unsigned int
3565 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
3567 8656d6c4 2019-05-20 stsp return ct->status;
3570 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
3571 818c7501 2019-07-11 stsp struct got_worktree *worktree;
3572 818c7501 2019-07-11 stsp struct got_repository *repo;
3573 818c7501 2019-07-11 stsp int rebase_in_progress;
3576 818c7501 2019-07-11 stsp static const struct got_error *
3577 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
3579 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
3580 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
3581 818c7501 2019-07-11 stsp unsigned char status;
3582 818c7501 2019-07-11 stsp struct stat sb;
3583 818c7501 2019-07-11 stsp char *ondisk_path;
3585 818c7501 2019-07-11 stsp if (!a->rebase_in_progress) {
3586 818c7501 2019-07-11 stsp /* Reject rebase of a work tree with mixed base commits. */
3587 818c7501 2019-07-11 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
3588 818c7501 2019-07-11 stsp SHA1_DIGEST_LENGTH))
3589 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MIXED_COMMITS);
3592 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3594 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
3596 818c7501 2019-07-11 stsp /* Reject rebase of a work tree with modified or conflicted files. */
3597 818c7501 2019-07-11 stsp err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
3598 818c7501 2019-07-11 stsp free(ondisk_path);
3600 818c7501 2019-07-11 stsp return err;
3602 818c7501 2019-07-11 stsp if (a->rebase_in_progress) {
3603 818c7501 2019-07-11 stsp if (status == GOT_STATUS_CONFLICT)
3604 818c7501 2019-07-11 stsp return got_error(GOT_ERR_CONFLICTS);
3605 818c7501 2019-07-11 stsp } else if (status != GOT_STATUS_NO_CHANGE)
3606 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
3608 818c7501 2019-07-11 stsp return NULL;
3611 818c7501 2019-07-11 stsp const struct got_error *
3612 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
3613 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
3614 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
3615 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
3617 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
3618 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
3619 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
3620 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
3621 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
3622 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
3624 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
3625 818c7501 2019-07-11 stsp *tmp_branch = NULL;
3626 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
3628 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
3630 818c7501 2019-07-11 stsp return err;
3632 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
3634 818c7501 2019-07-11 stsp goto done;
3636 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
3637 818c7501 2019-07-11 stsp ok_arg.repo = repo;
3638 818c7501 2019-07-11 stsp ok_arg.rebase_in_progress = 0;
3639 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
3642 818c7501 2019-07-11 stsp goto done;
3644 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3646 818c7501 2019-07-11 stsp goto done;
3648 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
3650 818c7501 2019-07-11 stsp goto done;
3652 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
3654 818c7501 2019-07-11 stsp goto done;
3656 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
3659 818c7501 2019-07-11 stsp goto done;
3661 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
3662 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
3664 818c7501 2019-07-11 stsp goto done;
3665 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
3667 818c7501 2019-07-11 stsp goto done;
3669 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
3671 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
3673 818c7501 2019-07-11 stsp goto done;
3675 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
3677 818c7501 2019-07-11 stsp goto done;
3679 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
3680 818c7501 2019-07-11 stsp worktree->base_commit_id);
3682 818c7501 2019-07-11 stsp goto done;
3683 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
3685 818c7501 2019-07-11 stsp goto done;
3687 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
3689 818c7501 2019-07-11 stsp goto done;
3691 818c7501 2019-07-11 stsp free(fileindex_path);
3692 818c7501 2019-07-11 stsp free(tmp_branch_name);
3693 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
3694 818c7501 2019-07-11 stsp free(branch_ref_name);
3695 818c7501 2019-07-11 stsp if (branch_ref)
3696 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
3697 818c7501 2019-07-11 stsp if (wt_branch)
3698 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
3699 818c7501 2019-07-11 stsp if (err) {
3700 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
3701 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
3702 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
3704 818c7501 2019-07-11 stsp if (*tmp_branch) {
3705 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
3706 818c7501 2019-07-11 stsp *tmp_branch = NULL;
3708 3e3a69f1 2019-07-25 stsp if (*fileindex) {
3709 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
3710 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
3712 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
3714 818c7501 2019-07-11 stsp return err;
3717 818c7501 2019-07-11 stsp const struct got_error *
3718 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
3719 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
3720 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
3721 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
3723 818c7501 2019-07-11 stsp const struct got_error *err;
3724 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
3725 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
3726 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
3727 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
3729 818c7501 2019-07-11 stsp *commit_id = NULL;
3730 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
3731 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
3732 3e3a69f1 2019-07-25 stsp *branch = NULL;
3733 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
3735 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
3737 3e3a69f1 2019-07-25 stsp return err;
3739 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
3741 3e3a69f1 2019-07-25 stsp goto done;
3743 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3745 818c7501 2019-07-11 stsp return err;
3747 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
3749 818c7501 2019-07-11 stsp goto done;
3751 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
3753 818c7501 2019-07-11 stsp goto done;
3755 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
3757 818c7501 2019-07-11 stsp goto done;
3759 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
3761 818c7501 2019-07-11 stsp goto done;
3763 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
3764 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
3766 818c7501 2019-07-11 stsp goto done;
3768 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
3770 818c7501 2019-07-11 stsp goto done;
3772 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
3774 818c7501 2019-07-11 stsp goto done;
3776 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
3777 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
3779 818c7501 2019-07-11 stsp goto done;
3781 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
3783 818c7501 2019-07-11 stsp goto done;
3785 818c7501 2019-07-11 stsp free(commit_ref_name);
3786 818c7501 2019-07-11 stsp free(branch_ref_name);
3787 3e3a69f1 2019-07-25 stsp free(fileindex_path);
3788 818c7501 2019-07-11 stsp if (commit_ref)
3789 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
3790 818c7501 2019-07-11 stsp if (branch_ref)
3791 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
3792 818c7501 2019-07-11 stsp if (err) {
3793 818c7501 2019-07-11 stsp free(*commit_id);
3794 818c7501 2019-07-11 stsp *commit_id = NULL;
3795 818c7501 2019-07-11 stsp if (*tmp_branch) {
3796 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
3797 818c7501 2019-07-11 stsp *tmp_branch = NULL;
3799 818c7501 2019-07-11 stsp if (*new_base_branch) {
3800 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
3801 818c7501 2019-07-11 stsp *new_base_branch = NULL;
3803 818c7501 2019-07-11 stsp if (*branch) {
3804 818c7501 2019-07-11 stsp got_ref_close(*branch);
3805 818c7501 2019-07-11 stsp *branch = NULL;
3807 3e3a69f1 2019-07-25 stsp if (*fileindex) {
3808 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
3809 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
3811 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
3813 818c7501 2019-07-11 stsp return err;
3816 818c7501 2019-07-11 stsp const struct got_error *
3817 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
3819 818c7501 2019-07-11 stsp const struct got_error *err;
3820 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
3822 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
3824 818c7501 2019-07-11 stsp return err;
3826 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
3827 818c7501 2019-07-11 stsp free(tmp_branch_name);
3828 818c7501 2019-07-11 stsp return NULL;
3831 818c7501 2019-07-11 stsp static const struct got_error *
3832 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
3833 818c7501 2019-07-11 stsp char **logmsg, void *arg)
3835 0ebf8283 2019-07-24 stsp *logmsg = arg;
3836 818c7501 2019-07-11 stsp return NULL;
3839 818c7501 2019-07-11 stsp static const struct got_error *
3840 818c7501 2019-07-11 stsp rebase_status(void *arg, unsigned char status, const char *path,
3841 818c7501 2019-07-11 stsp struct got_object_id *blob_id, struct got_object_id *commit_id)
3843 818c7501 2019-07-11 stsp return NULL;
3846 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
3847 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
3848 01757395 2019-07-12 stsp void *progress_arg;
3849 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
3852 01757395 2019-07-12 stsp static const struct got_error *
3853 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
3855 01757395 2019-07-12 stsp const struct got_error *err;
3856 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
3858 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
3860 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
3862 01757395 2019-07-12 stsp return err;
3864 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
3865 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
3866 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
3867 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
3868 01757395 2019-07-12 stsp return NULL;
3870 01757395 2019-07-12 stsp p = strdup(path);
3871 01757395 2019-07-12 stsp if (p == NULL)
3872 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
3874 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
3875 01757395 2019-07-12 stsp if (err || new == NULL)
3877 01757395 2019-07-12 stsp return err;
3881 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
3883 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
3885 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
3886 01757395 2019-07-12 stsp free((char *)pe->path);
3888 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
3891 0ebf8283 2019-07-24 stsp static const struct got_error *
3892 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
3893 0ebf8283 2019-07-24 stsp struct got_repository *repo)
3895 818c7501 2019-07-11 stsp const struct got_error *err;
3896 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
3898 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
3899 818c7501 2019-07-11 stsp if (err) {
3900 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
3901 818c7501 2019-07-11 stsp goto done;
3902 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
3904 818c7501 2019-07-11 stsp goto done;
3905 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
3907 818c7501 2019-07-11 stsp goto done;
3909 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
3912 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
3914 818c7501 2019-07-11 stsp goto done;
3915 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
3916 818c7501 2019-07-11 stsp free(stored_id);
3917 818c7501 2019-07-11 stsp if (cmp != 0) {
3918 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
3919 818c7501 2019-07-11 stsp goto done;
3923 0ebf8283 2019-07-24 stsp if (commit_ref)
3924 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
3925 0ebf8283 2019-07-24 stsp return err;
3928 0ebf8283 2019-07-24 stsp static const struct got_error *
3929 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
3930 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
3931 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
3932 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
3933 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3934 3e3a69f1 2019-07-25 stsp got_worktree_cancel_cb cancel_cb, void *cancel_arg)
3936 0ebf8283 2019-07-24 stsp const struct got_error *err;
3937 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
3938 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
3939 3e3a69f1 2019-07-25 stsp char *fileindex_path;
3941 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
3943 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
3945 0ebf8283 2019-07-24 stsp return err;
3947 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
3948 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
3949 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
3950 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
3951 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
3952 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
3953 818c7501 2019-07-11 stsp if (commit_ref)
3954 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
3955 818c7501 2019-07-11 stsp return err;
3958 818c7501 2019-07-11 stsp const struct got_error *
3959 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
3960 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
3961 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
3962 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
3963 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3964 0ebf8283 2019-07-24 stsp got_worktree_cancel_cb cancel_cb, void *cancel_arg)
3966 0ebf8283 2019-07-24 stsp const struct got_error *err;
3967 0ebf8283 2019-07-24 stsp char *commit_ref_name;
3969 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
3971 0ebf8283 2019-07-24 stsp return err;
3973 0ebf8283 2019-07-24 stsp err = store_commit_id(commit_ref_name, commit_id, repo);
3975 0ebf8283 2019-07-24 stsp goto done;
3977 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
3978 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
3979 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
3981 0ebf8283 2019-07-24 stsp free(commit_ref_name);
3982 0ebf8283 2019-07-24 stsp return err;
3985 0ebf8283 2019-07-24 stsp const struct got_error *
3986 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
3987 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
3988 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
3989 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
3990 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3991 0ebf8283 2019-07-24 stsp got_worktree_cancel_cb cancel_cb, void *cancel_arg)
3993 0ebf8283 2019-07-24 stsp const struct got_error *err;
3994 0ebf8283 2019-07-24 stsp char *commit_ref_name;
3996 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
3998 0ebf8283 2019-07-24 stsp return err;
4000 0ebf8283 2019-07-24 stsp err = store_commit_id(commit_ref_name, commit_id, repo);
4002 0ebf8283 2019-07-24 stsp goto done;
4004 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
4005 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
4006 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
4008 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4009 0ebf8283 2019-07-24 stsp return err;
4012 0ebf8283 2019-07-24 stsp static const struct got_error *
4013 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
4014 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
4015 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
4016 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
4017 3e3a69f1 2019-07-25 stsp const char *new_logmsg, struct got_repository *repo)
4019 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
4020 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
4021 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
4022 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
4023 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
4024 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
4025 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
4027 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
4028 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
4030 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
4032 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
4034 3e3a69f1 2019-07-25 stsp return err;
4036 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
4037 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
4038 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
4040 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
4041 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
4042 01757395 2019-07-12 stsp * TODO: Ideally, merged_paths would contain a list of commitables
4043 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
4045 01757395 2019-07-12 stsp if (merged_paths) {
4046 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
4047 8f8646e5 2019-07-25 stsp if (TAILQ_EMPTY(merged_paths)) {
4048 8f8646e5 2019-07-25 stsp err = got_error(GOT_ERR_NO_MERGED_PATHS);
4049 8f8646e5 2019-07-25 stsp goto done;
4051 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
4052 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
4053 01757395 2019-07-12 stsp repo, collect_commitables, &cc_arg, NULL, NULL);
4055 01757395 2019-07-12 stsp goto done;
4058 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
4059 01757395 2019-07-12 stsp collect_commitables, &cc_arg, NULL, NULL);
4061 01757395 2019-07-12 stsp goto done;
4064 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
4065 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
4066 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
4068 a0e95631 2019-07-12 stsp goto done;
4069 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
4070 a0e95631 2019-07-12 stsp goto done;
4073 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
4075 edd02c5e 2019-07-11 stsp goto done;
4077 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
4079 818c7501 2019-07-11 stsp goto done;
4081 0ebf8283 2019-07-24 stsp if (new_logmsg)
4082 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
4084 0ebf8283 2019-07-24 stsp logmsg = strdup(got_object_commit_get_logmsg(orig_commit));
4085 0ebf8283 2019-07-24 stsp if (logmsg == NULL)
4086 0ebf8283 2019-07-24 stsp return got_error_from_errno("strdup");
4088 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
4089 a0e95631 2019-07-12 stsp worktree, NULL, got_object_commit_get_author(orig_commit),
4090 a0e95631 2019-07-12 stsp got_object_commit_get_committer(orig_commit),
4091 0ebf8283 2019-07-24 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
4093 a0e95631 2019-07-12 stsp goto done;
4095 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
4097 a0e95631 2019-07-12 stsp goto done;
4099 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
4101 a0e95631 2019-07-12 stsp goto done;
4103 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
4104 93ec1b5f 2019-07-12 stsp fileindex);
4105 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4106 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
4107 a0e95631 2019-07-12 stsp err = sync_err;
4109 a0e95631 2019-07-12 stsp free(fileindex_path);
4110 a0e95631 2019-07-12 stsp free(head_commit_id);
4111 a0e95631 2019-07-12 stsp if (head_ref)
4112 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
4113 818c7501 2019-07-11 stsp if (err) {
4114 818c7501 2019-07-11 stsp free(*new_commit_id);
4115 818c7501 2019-07-11 stsp *new_commit_id = NULL;
4117 818c7501 2019-07-11 stsp return err;
4120 818c7501 2019-07-11 stsp const struct got_error *
4121 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
4122 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
4123 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4124 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
4125 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
4127 0ebf8283 2019-07-24 stsp const struct got_error *err;
4128 0ebf8283 2019-07-24 stsp char *commit_ref_name;
4129 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
4130 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
4132 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4134 0ebf8283 2019-07-24 stsp return err;
4136 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4138 0ebf8283 2019-07-24 stsp goto done;
4139 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
4141 0ebf8283 2019-07-24 stsp goto done;
4142 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
4143 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
4144 0ebf8283 2019-07-24 stsp goto done;
4147 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
4148 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
4150 0ebf8283 2019-07-24 stsp if (commit_ref)
4151 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
4152 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4153 0ebf8283 2019-07-24 stsp free(commit_id);
4154 0ebf8283 2019-07-24 stsp return err;
4157 0ebf8283 2019-07-24 stsp const struct got_error *
4158 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
4159 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
4160 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4161 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
4162 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
4163 0ebf8283 2019-07-24 stsp struct got_repository *repo)
4165 0ebf8283 2019-07-24 stsp const struct got_error *err;
4166 0ebf8283 2019-07-24 stsp char *commit_ref_name;
4167 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
4168 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
4170 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4172 0ebf8283 2019-07-24 stsp return err;
4174 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4176 0ebf8283 2019-07-24 stsp goto done;
4177 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
4179 0ebf8283 2019-07-24 stsp goto done;
4180 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
4181 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_COMMITID);
4182 0ebf8283 2019-07-24 stsp goto done;
4185 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
4186 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
4188 0ebf8283 2019-07-24 stsp if (commit_ref)
4189 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
4190 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4191 0ebf8283 2019-07-24 stsp free(commit_id);
4192 0ebf8283 2019-07-24 stsp return err;
4195 0ebf8283 2019-07-24 stsp const struct got_error *
4196 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
4197 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
4199 3e3a69f1 2019-07-25 stsp if (fileindex)
4200 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
4201 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
4204 69844fba 2019-07-11 stsp static const struct got_error *
4205 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
4207 69844fba 2019-07-11 stsp const struct got_error *err;
4208 69844fba 2019-07-11 stsp struct got_reference *ref;
4210 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
4211 69844fba 2019-07-11 stsp if (err) {
4212 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
4213 69844fba 2019-07-11 stsp return NULL;
4214 69844fba 2019-07-11 stsp return err;
4217 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
4218 69844fba 2019-07-11 stsp got_ref_close(ref);
4219 69844fba 2019-07-11 stsp return err;
4222 69844fba 2019-07-11 stsp static const struct got_error *
4223 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
4225 69844fba 2019-07-11 stsp const struct got_error *err;
4226 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
4227 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
4229 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4231 69844fba 2019-07-11 stsp goto done;
4232 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
4234 69844fba 2019-07-11 stsp goto done;
4236 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4238 69844fba 2019-07-11 stsp goto done;
4239 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
4241 69844fba 2019-07-11 stsp goto done;
4243 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4245 69844fba 2019-07-11 stsp goto done;
4246 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
4248 69844fba 2019-07-11 stsp goto done;
4250 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4252 69844fba 2019-07-11 stsp goto done;
4253 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
4255 69844fba 2019-07-11 stsp goto done;
4258 69844fba 2019-07-11 stsp free(tmp_branch_name);
4259 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
4260 69844fba 2019-07-11 stsp free(branch_ref_name);
4261 69844fba 2019-07-11 stsp free(commit_ref_name);
4262 69844fba 2019-07-11 stsp return err;
4265 818c7501 2019-07-11 stsp const struct got_error *
4266 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
4267 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
4268 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
4269 818c7501 2019-07-11 stsp struct got_repository *repo)
4271 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
4272 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
4274 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
4276 818c7501 2019-07-11 stsp return err;
4278 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
4280 818c7501 2019-07-11 stsp goto done;
4282 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
4284 818c7501 2019-07-11 stsp goto done;
4286 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
4288 818c7501 2019-07-11 stsp goto done;
4290 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
4292 3e3a69f1 2019-07-25 stsp if (fileindex)
4293 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
4294 818c7501 2019-07-11 stsp free(new_head_commit_id);
4295 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4296 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
4297 818c7501 2019-07-11 stsp err = unlockerr;
4298 818c7501 2019-07-11 stsp return err;
4301 818c7501 2019-07-11 stsp struct collect_revertible_paths_arg {
4302 818c7501 2019-07-11 stsp struct got_pathlist_head *revertible_paths;
4303 818c7501 2019-07-11 stsp struct got_worktree *worktree;
4306 818c7501 2019-07-11 stsp static const struct got_error *
4307 818c7501 2019-07-11 stsp collect_revertible_paths(void *arg, unsigned char status, const char *relpath,
4308 818c7501 2019-07-11 stsp struct got_object_id *blob_id, struct got_object_id *commit_id)
4310 818c7501 2019-07-11 stsp struct collect_revertible_paths_arg *a = arg;
4311 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
4312 818c7501 2019-07-11 stsp struct got_pathlist_entry *new = NULL;
4313 818c7501 2019-07-11 stsp char *path = NULL;
4315 818c7501 2019-07-11 stsp if (status != GOT_STATUS_ADD &&
4316 818c7501 2019-07-11 stsp status != GOT_STATUS_DELETE &&
4317 818c7501 2019-07-11 stsp status != GOT_STATUS_MODIFY &&
4318 818c7501 2019-07-11 stsp status != GOT_STATUS_CONFLICT &&
4319 818c7501 2019-07-11 stsp status != GOT_STATUS_MISSING)
4320 818c7501 2019-07-11 stsp return NULL;
4322 818c7501 2019-07-11 stsp if (asprintf(&path, "%s/%s", a->worktree->root_path, relpath) == -1)
4323 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
4325 818c7501 2019-07-11 stsp err = got_pathlist_insert(&new, a->revertible_paths, path, NULL);
4326 818c7501 2019-07-11 stsp if (err || new == NULL)
4327 818c7501 2019-07-11 stsp free(path);
4328 818c7501 2019-07-11 stsp return err;
4331 818c7501 2019-07-11 stsp const struct got_error *
4332 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
4333 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
4334 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
4335 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
4337 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
4338 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
4339 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
4340 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
4341 818c7501 2019-07-11 stsp struct got_pathlist_head revertible_paths;
4342 818c7501 2019-07-11 stsp struct got_pathlist_entry *pe;
4343 818c7501 2019-07-11 stsp struct collect_revertible_paths_arg crp_arg;
4344 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
4346 818c7501 2019-07-11 stsp TAILQ_INIT(&revertible_paths);
4348 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
4350 818c7501 2019-07-11 stsp return err;
4352 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
4353 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
4355 818c7501 2019-07-11 stsp goto done;
4357 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
4359 818c7501 2019-07-11 stsp goto done;
4362 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
4363 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
4364 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
4366 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
4368 818c7501 2019-07-11 stsp goto done;
4370 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
4372 818c7501 2019-07-11 stsp goto done;
4374 ca355955 2019-07-12 stsp err = got_object_id_by_path(&tree_id, repo,
4375 ca355955 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
4377 ca355955 2019-07-12 stsp goto done;
4379 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
4381 ca355955 2019-07-12 stsp goto done;
4383 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
4385 818c7501 2019-07-11 stsp goto done;
4387 347d1d3e 2019-07-12 stsp crp_arg.revertible_paths = &revertible_paths;
4388 347d1d3e 2019-07-12 stsp crp_arg.worktree = worktree;
4389 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
4390 347d1d3e 2019-07-12 stsp collect_revertible_paths, &crp_arg, NULL, NULL);
4392 55bd499d 2019-07-12 stsp goto done;
4394 818c7501 2019-07-11 stsp TAILQ_FOREACH(pe, &revertible_paths, entry) {
4395 818c7501 2019-07-11 stsp err = revert_file(worktree, fileindex, pe->path,
4396 818c7501 2019-07-11 stsp progress_cb, progress_arg, repo);
4398 ca355955 2019-07-12 stsp goto sync;
4401 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
4402 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
4404 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4405 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
4406 ca355955 2019-07-12 stsp err = sync_err;
4408 818c7501 2019-07-11 stsp got_ref_close(resolved);
4409 a3a2faf2 2019-07-12 stsp free(tree_id);
4410 818c7501 2019-07-11 stsp free(commit_id);
4411 0ebf8283 2019-07-24 stsp if (fileindex)
4412 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
4413 0ebf8283 2019-07-24 stsp free(fileindex_path);
4414 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(pe, &revertible_paths, entry)
4415 0ebf8283 2019-07-24 stsp free((char *)pe->path);
4416 0ebf8283 2019-07-24 stsp got_pathlist_free(&revertible_paths);
4418 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4419 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
4420 0ebf8283 2019-07-24 stsp err = unlockerr;
4421 0ebf8283 2019-07-24 stsp return err;
4424 0ebf8283 2019-07-24 stsp const struct got_error *
4425 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
4426 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
4427 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
4428 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
4430 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
4431 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
4432 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
4433 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
4434 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
4435 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
4436 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
4437 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
4439 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
4440 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
4441 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
4442 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4444 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
4446 0ebf8283 2019-07-24 stsp return err;
4448 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
4450 0ebf8283 2019-07-24 stsp goto done;
4452 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
4453 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
4454 0ebf8283 2019-07-24 stsp ok_arg.rebase_in_progress = 0;
4455 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
4458 0ebf8283 2019-07-24 stsp goto done;
4460 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
4462 0ebf8283 2019-07-24 stsp goto done;
4464 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
4466 0ebf8283 2019-07-24 stsp goto done;
4468 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
4469 0ebf8283 2019-07-24 stsp worktree);
4471 0ebf8283 2019-07-24 stsp goto done;
4473 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
4476 0ebf8283 2019-07-24 stsp goto done;
4478 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
4480 0ebf8283 2019-07-24 stsp goto done;
4482 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
4484 0ebf8283 2019-07-24 stsp goto done;
4486 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
4487 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
4489 0ebf8283 2019-07-24 stsp goto done;
4490 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
4492 0ebf8283 2019-07-24 stsp goto done;
4493 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
4494 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
4495 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
4496 0ebf8283 2019-07-24 stsp goto done;
4499 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
4500 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
4502 0ebf8283 2019-07-24 stsp goto done;
4503 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
4505 0ebf8283 2019-07-24 stsp goto done;
4507 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
4509 0ebf8283 2019-07-24 stsp goto done;
4511 0ebf8283 2019-07-24 stsp free(fileindex_path);
4512 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
4513 0ebf8283 2019-07-24 stsp free(branch_ref_name);
4514 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
4515 0ebf8283 2019-07-24 stsp if (wt_branch)
4516 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
4517 0ebf8283 2019-07-24 stsp if (err) {
4518 0ebf8283 2019-07-24 stsp if (*branch_ref) {
4519 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
4520 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
4522 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
4523 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
4524 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
4526 0ebf8283 2019-07-24 stsp free(*base_commit_id);
4527 3e3a69f1 2019-07-25 stsp if (*fileindex) {
4528 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
4529 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4531 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
4533 0ebf8283 2019-07-24 stsp return err;
4536 0ebf8283 2019-07-24 stsp const struct got_error *
4537 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
4538 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
4540 3e3a69f1 2019-07-25 stsp if (fileindex)
4541 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
4542 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
4545 0ebf8283 2019-07-24 stsp const struct got_error *
4546 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
4547 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
4549 0ebf8283 2019-07-24 stsp const struct got_error *err;
4550 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
4552 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
4554 0ebf8283 2019-07-24 stsp return err;
4556 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
4557 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
4558 0ebf8283 2019-07-24 stsp return NULL;
4561 0ebf8283 2019-07-24 stsp const struct got_error *
4562 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
4563 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
4564 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
4565 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
4567 0ebf8283 2019-07-24 stsp const struct got_error *err;
4568 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
4569 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
4570 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
4571 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
4572 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
4574 0ebf8283 2019-07-24 stsp *commit_id = NULL;
4575 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
4576 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
4577 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4579 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
4581 3e3a69f1 2019-07-25 stsp return err;
4583 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
4585 3e3a69f1 2019-07-25 stsp goto done;
4587 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
4589 0ebf8283 2019-07-24 stsp return err;
4591 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
4593 0ebf8283 2019-07-24 stsp goto done;
4595 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4597 0ebf8283 2019-07-24 stsp goto done;
4599 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
4600 0ebf8283 2019-07-24 stsp worktree);
4602 0ebf8283 2019-07-24 stsp goto done;
4604 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
4606 0ebf8283 2019-07-24 stsp goto done;
4608 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4610 0ebf8283 2019-07-24 stsp goto done;
4611 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
4613 0ebf8283 2019-07-24 stsp goto done;
4615 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
4617 0ebf8283 2019-07-24 stsp goto done;
4618 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
4620 0ebf8283 2019-07-24 stsp goto done;
4622 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
4624 0ebf8283 2019-07-24 stsp goto done;
4626 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4627 0ebf8283 2019-07-24 stsp free(branch_ref_name);
4628 3e3a69f1 2019-07-25 stsp free(fileindex_path);
4629 0ebf8283 2019-07-24 stsp if (commit_ref)
4630 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
4631 0ebf8283 2019-07-24 stsp if (base_commit_ref)
4632 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
4633 0ebf8283 2019-07-24 stsp if (err) {
4634 0ebf8283 2019-07-24 stsp free(*commit_id);
4635 0ebf8283 2019-07-24 stsp *commit_id = NULL;
4636 0ebf8283 2019-07-24 stsp free(*base_commit_id);
4637 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
4638 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
4639 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
4640 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
4642 3e3a69f1 2019-07-25 stsp if (*fileindex) {
4643 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
4644 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4646 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
4648 0ebf8283 2019-07-24 stsp return err;
4651 0ebf8283 2019-07-24 stsp static const struct got_error *
4652 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
4654 0ebf8283 2019-07-24 stsp const struct got_error *err;
4655 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
4656 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
4658 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
4660 0ebf8283 2019-07-24 stsp goto done;
4661 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
4663 0ebf8283 2019-07-24 stsp goto done;
4665 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
4666 0ebf8283 2019-07-24 stsp worktree);
4668 0ebf8283 2019-07-24 stsp goto done;
4669 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
4671 0ebf8283 2019-07-24 stsp goto done;
4673 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
4675 0ebf8283 2019-07-24 stsp goto done;
4676 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
4678 0ebf8283 2019-07-24 stsp goto done;
4680 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4682 0ebf8283 2019-07-24 stsp goto done;
4683 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
4685 0ebf8283 2019-07-24 stsp goto done;
4687 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
4688 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
4689 0ebf8283 2019-07-24 stsp free(branch_ref_name);
4690 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4691 0ebf8283 2019-07-24 stsp return err;
4694 0ebf8283 2019-07-24 stsp const struct got_error *
4695 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
4696 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
4697 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
4698 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
4700 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
4701 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
4702 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
4703 0ebf8283 2019-07-24 stsp struct got_pathlist_head revertible_paths;
4704 0ebf8283 2019-07-24 stsp struct got_pathlist_entry *pe;
4705 0ebf8283 2019-07-24 stsp struct collect_revertible_paths_arg crp_arg;
4706 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
4708 0ebf8283 2019-07-24 stsp TAILQ_INIT(&revertible_paths);
4710 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
4712 0ebf8283 2019-07-24 stsp return err;
4714 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
4715 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
4717 0ebf8283 2019-07-24 stsp goto done;
4719 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
4721 0ebf8283 2019-07-24 stsp goto done;
4723 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
4725 0ebf8283 2019-07-24 stsp goto done;
4727 0ebf8283 2019-07-24 stsp err = got_object_id_by_path(&tree_id, repo, base_commit_id,
4728 0ebf8283 2019-07-24 stsp worktree->path_prefix);
4730 0ebf8283 2019-07-24 stsp goto done;
4732 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
4734 0ebf8283 2019-07-24 stsp goto done;
4736 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
4738 0ebf8283 2019-07-24 stsp goto done;
4740 0ebf8283 2019-07-24 stsp crp_arg.revertible_paths = &revertible_paths;
4741 0ebf8283 2019-07-24 stsp crp_arg.worktree = worktree;
4742 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
4743 0ebf8283 2019-07-24 stsp collect_revertible_paths, &crp_arg, NULL, NULL);
4745 0ebf8283 2019-07-24 stsp goto done;
4747 0ebf8283 2019-07-24 stsp TAILQ_FOREACH(pe, &revertible_paths, entry) {
4748 0ebf8283 2019-07-24 stsp err = revert_file(worktree, fileindex, pe->path,
4749 0ebf8283 2019-07-24 stsp progress_cb, progress_arg, repo);
4751 0ebf8283 2019-07-24 stsp goto sync;
4754 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
4755 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
4757 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4758 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
4759 0ebf8283 2019-07-24 stsp err = sync_err;
4761 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
4762 0ebf8283 2019-07-24 stsp free(tree_id);
4763 818c7501 2019-07-11 stsp free(fileindex_path);
4764 818c7501 2019-07-11 stsp TAILQ_FOREACH(pe, &revertible_paths, entry)
4765 818c7501 2019-07-11 stsp free((char *)pe->path);
4766 818c7501 2019-07-11 stsp got_pathlist_free(&revertible_paths);
4768 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4769 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
4770 818c7501 2019-07-11 stsp err = unlockerr;
4771 818c7501 2019-07-11 stsp return err;
4774 0ebf8283 2019-07-24 stsp const struct got_error *
4775 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
4776 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4777 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
4779 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr;
4780 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
4781 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
4783 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
4785 0ebf8283 2019-07-24 stsp return err;
4787 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
4788 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
4790 0ebf8283 2019-07-24 stsp goto done;
4792 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
4794 0ebf8283 2019-07-24 stsp goto done;
4796 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
4798 0ebf8283 2019-07-24 stsp goto done;
4800 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
4802 0ebf8283 2019-07-24 stsp goto done;
4804 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
4806 3e3a69f1 2019-07-25 stsp if (fileindex)
4807 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
4808 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
4809 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4810 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
4811 0ebf8283 2019-07-24 stsp err = unlockerr;
4812 0ebf8283 2019-07-24 stsp return err;
4815 0ebf8283 2019-07-24 stsp const struct got_error *
4816 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
4817 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
4819 0ebf8283 2019-07-24 stsp const struct got_error *err;
4820 0ebf8283 2019-07-24 stsp char *commit_ref_name;
4822 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4824 0ebf8283 2019-07-24 stsp return err;
4826 0ebf8283 2019-07-24 stsp err = store_commit_id(commit_ref_name, commit_id, repo);
4828 0ebf8283 2019-07-24 stsp goto done;
4830 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
4832 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4833 0ebf8283 2019-07-24 stsp return err;
