2 5d56da81 2019-01-13 stsp * Copyright (c) 2018, 2019 Stefan Sperling <stsp@openbsd.org>
4 86c3caaf 2018-03-09 stsp * Permission to use, copy, modify, and distribute this software for any
5 86c3caaf 2018-03-09 stsp * purpose with or without fee is hereby granted, provided that the above
6 86c3caaf 2018-03-09 stsp * copyright notice and this permission notice appear in all copies.
8 86c3caaf 2018-03-09 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 86c3caaf 2018-03-09 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 86c3caaf 2018-03-09 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 86c3caaf 2018-03-09 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 86c3caaf 2018-03-09 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 86c3caaf 2018-03-09 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 86c3caaf 2018-03-09 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 86c3caaf 2018-03-09 stsp #include <sys/stat.h>
18 6d9d28c3 2018-03-11 stsp #include <sys/limits.h>
19 9d31a1d8 2018-03-11 stsp #include <sys/queue.h>
20 133d2798 2019-01-08 stsp #include <sys/tree.h>
22 d1f6d47b 2019-02-04 stsp #include <dirent.h>
23 f5c49f82 2019-01-06 stsp #include <stddef.h>
24 86c3caaf 2018-03-09 stsp #include <string.h>
25 86c3caaf 2018-03-09 stsp #include <stdio.h>
26 86c3caaf 2018-03-09 stsp #include <stdlib.h>
27 86c3caaf 2018-03-09 stsp #include <fcntl.h>
28 86c3caaf 2018-03-09 stsp #include <errno.h>
29 86c3caaf 2018-03-09 stsp #include <unistd.h>
30 9d31a1d8 2018-03-11 stsp #include <sha1.h>
31 9d31a1d8 2018-03-11 stsp #include <zlib.h>
32 9d31a1d8 2018-03-11 stsp #include <fnmatch.h>
33 512f0d0e 2019-01-02 stsp #include <libgen.h>
34 ec22038e 2019-03-10 stsp #include <uuid.h>
35 7154f6ce 2019-03-27 stsp #include <util.h>
37 86c3caaf 2018-03-09 stsp #include "got_error.h"
38 86c3caaf 2018-03-09 stsp #include "got_repository.h"
39 5261c201 2018-04-01 stsp #include "got_reference.h"
40 9d31a1d8 2018-03-11 stsp #include "got_object.h"
41 1dd54920 2019-05-11 stsp #include "got_path.h"
42 86c3caaf 2018-03-09 stsp #include "got_worktree.h"
43 511a516b 2018-05-19 stsp #include "got_opentemp.h"
44 234035bc 2019-06-01 stsp #include "got_diff.h"
46 718b3ab0 2018-03-17 stsp #include "got_lib_worktree.h"
47 718b3ab0 2018-03-17 stsp #include "got_lib_sha1.h"
48 718b3ab0 2018-03-17 stsp #include "got_lib_fileindex.h"
49 63581804 2018-07-09 stsp #include "got_lib_inflate.h"
50 718b3ab0 2018-03-17 stsp #include "got_lib_delta.h"
51 718b3ab0 2018-03-17 stsp #include "got_lib_object.h"
52 ed175427 2019-05-09 stsp #include "got_lib_object_parse.h"
53 cf066bf8 2019-05-09 stsp #include "got_lib_object_create.h"
54 24519714 2019-05-09 stsp #include "got_lib_object_idset.h"
55 6353ad76 2019-02-08 stsp #include "got_lib_diff.h"
58 9d31a1d8 2018-03-11 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
61 99724ed4 2018-03-10 stsp static const struct got_error *
62 7ac97322 2018-03-11 stsp create_meta_file(const char *path_got, const char *name, const char *content)
64 99724ed4 2018-03-10 stsp const struct got_error *err = NULL;
67 2c7829a4 2019-06-17 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1)
68 2c7829a4 2019-06-17 stsp return got_error_from_errno("asprintf");
70 2c7829a4 2019-06-17 stsp err = got_path_create_file(path, content);
75 507dc3bb 2018-12-29 stsp static const struct got_error *
76 507dc3bb 2018-12-29 stsp update_meta_file(const char *path_got, const char *name, const char *content)
78 507dc3bb 2018-12-29 stsp const struct got_error *err = NULL;
79 507dc3bb 2018-12-29 stsp FILE *tmpfile = NULL;
80 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
81 507dc3bb 2018-12-29 stsp char *path = NULL;
83 507dc3bb 2018-12-29 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
84 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
85 507dc3bb 2018-12-29 stsp path = NULL;
89 507dc3bb 2018-12-29 stsp err = got_opentemp_named(&tmppath, &tmpfile, path);
93 507dc3bb 2018-12-29 stsp if (content) {
94 507dc3bb 2018-12-29 stsp int len = fprintf(tmpfile, "%s\n", content);
95 507dc3bb 2018-12-29 stsp if (len != strlen(content) + 1) {
96 638f9024 2019-05-13 stsp err = got_error_from_errno2("fprintf", tmppath);
101 507dc3bb 2018-12-29 stsp if (rename(tmppath, path) != 0) {
102 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath, path);
103 2a57020b 2019-02-20 stsp unlink(tmppath);
108 fb43ecf1 2019-02-11 stsp if (fclose(tmpfile) != 0 && err == NULL)
109 638f9024 2019-05-13 stsp err = got_error_from_errno2("fclose", tmppath);
110 230a42bd 2019-05-11 jcs free(tmppath);
111 99724ed4 2018-03-10 stsp return err;
114 09fe317a 2018-03-11 stsp static const struct got_error *
115 7ac97322 2018-03-11 stsp read_meta_file(char **content, const char *path_got, const char *name)
117 09fe317a 2018-03-11 stsp const struct got_error *err = NULL;
118 09fe317a 2018-03-11 stsp char *path;
119 09fe317a 2018-03-11 stsp int fd = -1;
121 09fe317a 2018-03-11 stsp struct stat sb;
123 09fe317a 2018-03-11 stsp *content = NULL;
125 7ac97322 2018-03-11 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
126 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
127 09fe317a 2018-03-11 stsp path = NULL;
131 ef99fdb1 2018-03-11 stsp fd = open(path, O_RDONLY | O_NOFOLLOW);
132 09fe317a 2018-03-11 stsp if (fd == -1) {
133 f02eaa22 2019-03-11 stsp if (errno == ENOENT)
134 a2e6d162 2019-07-27 stsp err = got_error_path(path, GOT_ERR_WORKTREE_META);
136 638f9024 2019-05-13 stsp err = got_error_from_errno2("open", path);
139 ef99fdb1 2018-03-11 stsp if (flock(fd, LOCK_SH | LOCK_NB) == -1) {
140 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
141 638f9024 2019-05-13 stsp : got_error_from_errno2("flock", path));
145 e4b9a50c 2019-07-27 stsp if (fstat(fd, &sb) != 0) {
146 e4b9a50c 2019-07-27 stsp err = got_error_from_errno2("fstat", path);
149 09fe317a 2018-03-11 stsp *content = calloc(1, sb.st_size);
150 09fe317a 2018-03-11 stsp if (*content == NULL) {
151 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
155 09fe317a 2018-03-11 stsp n = read(fd, *content, sb.st_size);
156 09fe317a 2018-03-11 stsp if (n != sb.st_size) {
157 638f9024 2019-05-13 stsp err = (n == -1 ? got_error_from_errno2("read", path) :
158 a2e6d162 2019-07-27 stsp got_error_path(path, GOT_ERR_WORKTREE_META));
161 09fe317a 2018-03-11 stsp if ((*content)[sb.st_size - 1] != '\n') {
162 a2e6d162 2019-07-27 stsp err = got_error_path(path, GOT_ERR_WORKTREE_META);
165 09fe317a 2018-03-11 stsp (*content)[sb.st_size - 1] = '\0';
168 09fe317a 2018-03-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
169 638f9024 2019-05-13 stsp err = got_error_from_errno2("close", path_got);
170 09fe317a 2018-03-11 stsp free(path);
172 09fe317a 2018-03-11 stsp free(*content);
173 09fe317a 2018-03-11 stsp *content = NULL;
175 09fe317a 2018-03-11 stsp return err;
178 024e9686 2019-05-14 stsp static const struct got_error *
179 024e9686 2019-05-14 stsp write_head_ref(const char *path_got, struct got_reference *head_ref)
181 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
182 024e9686 2019-05-14 stsp char *refstr = NULL;
184 024e9686 2019-05-14 stsp if (got_ref_is_symbolic(head_ref)) {
185 024e9686 2019-05-14 stsp refstr = got_ref_to_str(head_ref);
186 024e9686 2019-05-14 stsp if (refstr == NULL)
187 024e9686 2019-05-14 stsp return got_error_from_errno("got_ref_to_str");
189 024e9686 2019-05-14 stsp refstr = strdup(got_ref_get_name(head_ref));
190 024e9686 2019-05-14 stsp if (refstr == NULL)
191 024e9686 2019-05-14 stsp return got_error_from_errno("strdup");
193 024e9686 2019-05-14 stsp err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
194 024e9686 2019-05-14 stsp free(refstr);
195 024e9686 2019-05-14 stsp return err;
198 86c3caaf 2018-03-09 stsp const struct got_error *
199 86c3caaf 2018-03-09 stsp got_worktree_init(const char *path, struct got_reference *head_ref,
200 577ec78f 2018-03-11 stsp const char *prefix, struct got_repository *repo)
202 86c3caaf 2018-03-09 stsp const struct got_error *err = NULL;
203 65596e15 2018-12-24 stsp struct got_object_id *commit_id = NULL;
204 ec22038e 2019-03-10 stsp uuid_t uuid;
205 ec22038e 2019-03-10 stsp uint32_t uuid_status;
206 65596e15 2018-12-24 stsp int obj_type;
207 7ac97322 2018-03-11 stsp char *path_got = NULL;
208 1451e70d 2018-03-10 stsp char *formatstr = NULL;
209 0bb8a95e 2018-03-12 stsp char *absprefix = NULL;
210 65596e15 2018-12-24 stsp char *basestr = NULL;
211 ec22038e 2019-03-10 stsp char *uuidstr = NULL;
213 0c48fee2 2019-03-11 stsp if (strcmp(path, got_repo_get_path(repo)) == 0) {
214 0c48fee2 2019-03-11 stsp err = got_error(GOT_ERR_WORKTREE_REPO);
218 65596e15 2018-12-24 stsp err = got_ref_resolve(&commit_id, repo, head_ref);
220 65596e15 2018-12-24 stsp return err;
221 65596e15 2018-12-24 stsp err = got_object_get_type(&obj_type, repo, commit_id);
223 65596e15 2018-12-24 stsp return err;
224 65596e15 2018-12-24 stsp if (obj_type != GOT_OBJ_TYPE_COMMIT)
225 65596e15 2018-12-24 stsp return got_error(GOT_ERR_OBJ_TYPE);
227 0bb8a95e 2018-03-12 stsp if (!got_path_is_absolute(prefix)) {
228 0bb8a95e 2018-03-12 stsp if (asprintf(&absprefix, "/%s", prefix) == -1)
229 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
232 86c3caaf 2018-03-09 stsp /* Create top-level directory (may already exist). */
233 2cb4bacb 2018-03-11 stsp if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
234 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path);
238 86c3caaf 2018-03-09 stsp /* Create .got directory (may already exist). */
239 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
240 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
243 7ac97322 2018-03-11 stsp if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
244 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path_got);
248 056e7441 2018-03-11 stsp /* Create an empty lock file. */
249 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
253 86c3caaf 2018-03-09 stsp /* Create an empty file index. */
254 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
258 08d425ea 2018-12-24 stsp /* Write the HEAD reference. */
259 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
263 65596e15 2018-12-24 stsp /* Record our base commit. */
264 65596e15 2018-12-24 stsp err = got_object_id_str(&basestr, commit_id);
267 0f92850e 2018-12-25 stsp err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
271 1451e70d 2018-03-10 stsp /* Store path to repository. */
272 7839bc15 2019-01-06 stsp err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
273 7839bc15 2019-01-06 stsp got_repo_get_path(repo));
277 577ec78f 2018-03-11 stsp /* Store in-repository path prefix. */
278 0bb8a95e 2018-03-12 stsp err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
279 0bb8a95e 2018-03-12 stsp absprefix ? absprefix : prefix);
283 ec22038e 2019-03-10 stsp /* Generate UUID. */
284 ec22038e 2019-03-10 stsp uuid_create(&uuid, &uuid_status);
285 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
286 ec22038e 2019-03-10 stsp err = got_error_uuid(uuid_status);
289 ec22038e 2019-03-10 stsp uuid_to_string(&uuid, &uuidstr, &uuid_status);
290 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
291 ec22038e 2019-03-10 stsp err = got_error_uuid(uuid_status);
294 ec22038e 2019-03-10 stsp err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
298 9dce68ed 2018-03-10 stsp /* Stamp work tree with format file. */
299 1451e70d 2018-03-10 stsp if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
300 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
303 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
308 65596e15 2018-12-24 stsp free(commit_id);
309 7ac97322 2018-03-11 stsp free(path_got);
310 1451e70d 2018-03-10 stsp free(formatstr);
311 0bb8a95e 2018-03-12 stsp free(absprefix);
312 65596e15 2018-12-24 stsp free(basestr);
313 ec22038e 2019-03-10 stsp free(uuidstr);
314 86c3caaf 2018-03-09 stsp return err;
317 247140b2 2019-02-05 stsp static const struct got_error *
318 247140b2 2019-02-05 stsp open_worktree(struct got_worktree **worktree, const char *path)
320 6d9d28c3 2018-03-11 stsp const struct got_error *err = NULL;
321 7ac97322 2018-03-11 stsp char *path_got;
322 6d9d28c3 2018-03-11 stsp char *formatstr = NULL;
323 c442a90d 2019-03-10 stsp char *uuidstr = NULL;
324 056e7441 2018-03-11 stsp char *path_lock = NULL;
325 eaccb85f 2018-12-25 stsp char *base_commit_id_str = NULL;
326 6d9d28c3 2018-03-11 stsp int version, fd = -1;
327 6d9d28c3 2018-03-11 stsp const char *errstr;
328 eaccb85f 2018-12-25 stsp struct got_repository *repo = NULL;
329 c442a90d 2019-03-10 stsp uint32_t uuid_status;
331 6d9d28c3 2018-03-11 stsp *worktree = NULL;
333 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
334 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
335 7ac97322 2018-03-11 stsp path_got = NULL;
339 7ac97322 2018-03-11 stsp if (asprintf(&path_lock, "%s/%s", path_got, GOT_WORKTREE_LOCK) == -1) {
340 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
341 056e7441 2018-03-11 stsp path_lock = NULL;
345 056e7441 2018-03-11 stsp fd = open(path_lock, O_RDWR | O_EXLOCK | O_NONBLOCK);
346 6d9d28c3 2018-03-11 stsp if (fd == -1) {
347 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
348 638f9024 2019-05-13 stsp : got_error_from_errno2("open", path_lock));
352 7ac97322 2018-03-11 stsp err = read_meta_file(&formatstr, path_got, GOT_WORKTREE_FORMAT);
356 6d9d28c3 2018-03-11 stsp version = strtonum(formatstr, 1, INT_MAX, &errstr);
357 6d9d28c3 2018-03-11 stsp if (errstr) {
358 a2e6d162 2019-07-27 stsp err = got_error_msg(GOT_ERR_WORKTREE_META,
359 a2e6d162 2019-07-27 stsp "could not parse work tree format version number");
362 6d9d28c3 2018-03-11 stsp if (version != GOT_WORKTREE_FORMAT_VERSION) {
363 6d9d28c3 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_VERS);
367 6d9d28c3 2018-03-11 stsp *worktree = calloc(1, sizeof(**worktree));
368 6d9d28c3 2018-03-11 stsp if (*worktree == NULL) {
369 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
372 056e7441 2018-03-11 stsp (*worktree)->lockfd = -1;
374 0647c563 2019-03-11 stsp (*worktree)->root_path = strdup(path);
375 c88eb298 2018-03-11 stsp if ((*worktree)->root_path == NULL) {
376 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
379 cde76477 2018-03-11 stsp err = read_meta_file(&(*worktree)->repo_path, path_got,
380 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_REPOSITORY);
384 7ac97322 2018-03-11 stsp err = read_meta_file(&(*worktree)->path_prefix, path_got,
385 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_PATH_PREFIX);
389 eaccb85f 2018-12-25 stsp err = read_meta_file(&base_commit_id_str, path_got,
390 0f92850e 2018-12-25 stsp GOT_WORKTREE_BASE_COMMIT);
394 c442a90d 2019-03-10 stsp err = read_meta_file(&uuidstr, path_got, GOT_WORKTREE_UUID);
397 c442a90d 2019-03-10 stsp uuid_from_string(uuidstr, &(*worktree)->uuid, &uuid_status);
398 c442a90d 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
399 c442a90d 2019-03-10 stsp err = got_error_uuid(uuid_status);
403 eaccb85f 2018-12-25 stsp err = got_repo_open(&repo, (*worktree)->repo_path);
407 eaccb85f 2018-12-25 stsp err = got_object_resolve_id_str(&(*worktree)->base_commit_id, repo,
408 eaccb85f 2018-12-25 stsp base_commit_id_str);
412 36a38700 2019-05-10 stsp err = read_meta_file(&(*worktree)->head_ref_name, path_got,
413 36a38700 2019-05-10 stsp GOT_WORKTREE_HEAD_REF);
416 eaccb85f 2018-12-25 stsp got_repo_close(repo);
417 7ac97322 2018-03-11 stsp free(path_got);
418 056e7441 2018-03-11 stsp free(path_lock);
419 eaccb85f 2018-12-25 stsp free(base_commit_id_str);
420 c442a90d 2019-03-10 stsp free(uuidstr);
421 bd165944 2019-03-10 stsp free(formatstr);
423 6d9d28c3 2018-03-11 stsp if (fd != -1)
425 6d9d28c3 2018-03-11 stsp if (*worktree != NULL)
426 6d9d28c3 2018-03-11 stsp got_worktree_close(*worktree);
427 6d9d28c3 2018-03-11 stsp *worktree = NULL;
429 056e7441 2018-03-11 stsp (*worktree)->lockfd = fd;
431 6d9d28c3 2018-03-11 stsp return err;
434 247140b2 2019-02-05 stsp const struct got_error *
435 247140b2 2019-02-05 stsp got_worktree_open(struct got_worktree **worktree, const char *path)
437 247140b2 2019-02-05 stsp const struct got_error *err = NULL;
440 247140b2 2019-02-05 stsp err = open_worktree(worktree, path);
441 f02eaa22 2019-03-11 stsp if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT))
442 247140b2 2019-02-05 stsp return err;
443 247140b2 2019-02-05 stsp if (*worktree)
444 247140b2 2019-02-05 stsp return NULL;
445 247140b2 2019-02-05 stsp path = dirname(path);
446 d1542a27 2019-02-05 stsp if (path == NULL)
447 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
448 d1542a27 2019-02-05 stsp } while (!((path[0] == '.' || path[0] == '/') && path[1] == '\0'));
450 247140b2 2019-02-05 stsp return got_error(GOT_ERR_NOT_WORKTREE);
453 3a6ce05a 2019-02-11 stsp const struct got_error *
454 86c3caaf 2018-03-09 stsp got_worktree_close(struct got_worktree *worktree)
456 3a6ce05a 2019-02-11 stsp const struct got_error *err = NULL;
457 c88eb298 2018-03-11 stsp free(worktree->root_path);
458 cde76477 2018-03-11 stsp free(worktree->repo_path);
459 6d9d28c3 2018-03-11 stsp free(worktree->path_prefix);
460 eaccb85f 2018-12-25 stsp free(worktree->base_commit_id);
461 36a38700 2019-05-10 stsp free(worktree->head_ref_name);
462 056e7441 2018-03-11 stsp if (worktree->lockfd != -1)
463 3a6ce05a 2019-02-11 stsp if (close(worktree->lockfd) != 0)
464 638f9024 2019-05-13 stsp err = got_error_from_errno2("close",
465 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree));
466 6d9d28c3 2018-03-11 stsp free(worktree);
467 3a6ce05a 2019-02-11 stsp return err;
470 2fbdb5ae 2018-12-29 stsp const char *
471 c7f4312f 2019-02-05 stsp got_worktree_get_root_path(struct got_worktree *worktree)
473 c7f4312f 2019-02-05 stsp return worktree->root_path;
476 c7f4312f 2019-02-05 stsp const char *
477 86c3caaf 2018-03-09 stsp got_worktree_get_repo_path(struct got_worktree *worktree)
479 2fbdb5ae 2018-12-29 stsp return worktree->repo_path;
482 49520a32 2018-12-29 stsp const char *
483 49520a32 2018-12-29 stsp got_worktree_get_path_prefix(struct got_worktree *worktree)
485 f609be2e 2018-12-29 stsp return worktree->path_prefix;
488 e5dc7198 2018-12-29 stsp const struct got_error *
489 e5dc7198 2018-12-29 stsp got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
490 e5dc7198 2018-12-29 stsp const char *path_prefix)
492 e5dc7198 2018-12-29 stsp char *absprefix = NULL;
494 e5dc7198 2018-12-29 stsp if (!got_path_is_absolute(path_prefix)) {
495 e5dc7198 2018-12-29 stsp if (asprintf(&absprefix, "/%s", path_prefix) == -1)
496 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
498 e5dc7198 2018-12-29 stsp *match = (strcmp(absprefix ? absprefix : path_prefix,
499 e5dc7198 2018-12-29 stsp worktree->path_prefix) == 0);
500 e5dc7198 2018-12-29 stsp free(absprefix);
501 e5dc7198 2018-12-29 stsp return NULL;
504 bc70eb79 2019-05-09 stsp const char *
505 35be1456 2018-03-11 stsp got_worktree_get_head_ref_name(struct got_worktree *worktree)
507 36a38700 2019-05-10 stsp return worktree->head_ref_name;
510 024e9686 2019-05-14 stsp const struct got_error *
511 024e9686 2019-05-14 stsp got_worktree_set_head_ref(struct got_worktree *worktree,
512 024e9686 2019-05-14 stsp struct got_reference *head_ref)
514 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
515 024e9686 2019-05-14 stsp char *path_got = NULL, *head_ref_name = NULL;
517 024e9686 2019-05-14 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
518 024e9686 2019-05-14 stsp GOT_WORKTREE_GOT_DIR) == -1) {
519 024e9686 2019-05-14 stsp err = got_error_from_errno("asprintf");
520 024e9686 2019-05-14 stsp path_got = NULL;
524 024e9686 2019-05-14 stsp head_ref_name = strdup(got_ref_get_name(head_ref));
525 024e9686 2019-05-14 stsp if (head_ref_name == NULL) {
526 024e9686 2019-05-14 stsp err = got_error_from_errno("strdup");
530 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
534 024e9686 2019-05-14 stsp free(worktree->head_ref_name);
535 024e9686 2019-05-14 stsp worktree->head_ref_name = head_ref_name;
537 024e9686 2019-05-14 stsp free(path_got);
539 024e9686 2019-05-14 stsp free(head_ref_name);
540 024e9686 2019-05-14 stsp return err;
543 b72f483a 2019-02-05 stsp struct got_object_id *
544 507dc3bb 2018-12-29 stsp got_worktree_get_base_commit_id(struct got_worktree *worktree)
546 507dc3bb 2018-12-29 stsp return worktree->base_commit_id;
549 507dc3bb 2018-12-29 stsp const struct got_error *
550 507dc3bb 2018-12-29 stsp got_worktree_set_base_commit_id(struct got_worktree *worktree,
551 507dc3bb 2018-12-29 stsp struct got_repository *repo, struct got_object_id *commit_id)
553 507dc3bb 2018-12-29 stsp const struct got_error *err;
554 507dc3bb 2018-12-29 stsp struct got_object *obj = NULL;
555 507dc3bb 2018-12-29 stsp char *id_str = NULL;
556 507dc3bb 2018-12-29 stsp char *path_got = NULL;
558 507dc3bb 2018-12-29 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
559 507dc3bb 2018-12-29 stsp GOT_WORKTREE_GOT_DIR) == -1) {
560 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
561 507dc3bb 2018-12-29 stsp path_got = NULL;
565 507dc3bb 2018-12-29 stsp err = got_object_open(&obj, repo, commit_id);
567 507dc3bb 2018-12-29 stsp return err;
569 507dc3bb 2018-12-29 stsp if (obj->type != GOT_OBJ_TYPE_COMMIT) {
570 507dc3bb 2018-12-29 stsp err = got_error(GOT_ERR_OBJ_TYPE);
574 507dc3bb 2018-12-29 stsp /* Record our base commit. */
575 507dc3bb 2018-12-29 stsp err = got_object_id_str(&id_str, commit_id);
578 507dc3bb 2018-12-29 stsp err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
582 507dc3bb 2018-12-29 stsp free(worktree->base_commit_id);
583 507dc3bb 2018-12-29 stsp worktree->base_commit_id = got_object_id_dup(commit_id);
584 507dc3bb 2018-12-29 stsp if (worktree->base_commit_id == NULL) {
585 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
590 507dc3bb 2018-12-29 stsp got_object_close(obj);
591 507dc3bb 2018-12-29 stsp free(id_str);
592 507dc3bb 2018-12-29 stsp free(path_got);
593 507dc3bb 2018-12-29 stsp return err;
596 9d31a1d8 2018-03-11 stsp static const struct got_error *
597 9d31a1d8 2018-03-11 stsp lock_worktree(struct got_worktree *worktree, int operation)
599 9d31a1d8 2018-03-11 stsp if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
600 9d31a1d8 2018-03-11 stsp return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
601 638f9024 2019-05-13 stsp : got_error_from_errno2("flock",
602 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree)));
603 86c3caaf 2018-03-09 stsp return NULL;
606 21908da4 2019-01-13 stsp static const struct got_error *
607 4a1ddfc2 2019-01-12 stsp add_dir_on_disk(struct got_worktree *worktree, const char *path)
609 4a1ddfc2 2019-01-12 stsp const struct got_error *err = NULL;
610 4a1ddfc2 2019-01-12 stsp char *abspath;
612 4a1ddfc2 2019-01-12 stsp if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
613 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
615 0cd1c46a 2019-03-11 stsp err = got_path_mkdir(abspath);
616 ddcd8544 2019-03-11 stsp if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
617 ddcd8544 2019-03-11 stsp struct stat sb;
618 ddcd8544 2019-03-11 stsp err = NULL;
619 ddcd8544 2019-03-11 stsp if (lstat(abspath, &sb) == -1) {
620 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
621 ddcd8544 2019-03-11 stsp } else if (!S_ISDIR(sb.st_mode)) {
622 ddcd8544 2019-03-11 stsp /* TODO directory is obstructed; do something */
623 ddcd8544 2019-03-11 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
626 4a1ddfc2 2019-01-12 stsp free(abspath);
627 68c76935 2019-02-19 stsp return err;
630 68c76935 2019-02-19 stsp static const struct got_error *
631 68c76935 2019-02-19 stsp check_file_contents_equal(int *same, FILE *f1, FILE *f2)
633 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
634 68c76935 2019-02-19 stsp uint8_t fbuf1[8192];
635 68c76935 2019-02-19 stsp uint8_t fbuf2[8192];
636 68c76935 2019-02-19 stsp size_t flen1 = 0, flen2 = 0;
641 68c76935 2019-02-19 stsp flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
642 68c76935 2019-02-19 stsp if (flen1 == 0 && ferror(f1)) {
643 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
646 68c76935 2019-02-19 stsp flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
647 68c76935 2019-02-19 stsp if (flen2 == 0 && ferror(f2)) {
648 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
651 68c76935 2019-02-19 stsp if (flen1 == 0) {
652 68c76935 2019-02-19 stsp if (flen2 != 0)
655 68c76935 2019-02-19 stsp } else if (flen2 == 0) {
656 68c76935 2019-02-19 stsp if (flen1 != 0)
659 68c76935 2019-02-19 stsp } else if (flen1 == flen2) {
660 68c76935 2019-02-19 stsp if (memcmp(fbuf1, fbuf2, flen2) != 0) {
670 68c76935 2019-02-19 stsp return err;
673 68c76935 2019-02-19 stsp static const struct got_error *
674 68c76935 2019-02-19 stsp check_files_equal(int *same, const char *f1_path, const char *f2_path)
676 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
677 68c76935 2019-02-19 stsp struct stat sb;
678 68c76935 2019-02-19 stsp size_t size1, size2;
679 68c76935 2019-02-19 stsp FILE *f1 = NULL, *f2 = NULL;
683 68c76935 2019-02-19 stsp if (lstat(f1_path, &sb) != 0) {
684 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", f1_path);
687 68c76935 2019-02-19 stsp size1 = sb.st_size;
689 68c76935 2019-02-19 stsp if (lstat(f2_path, &sb) != 0) {
690 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", f2_path);
693 68c76935 2019-02-19 stsp size2 = sb.st_size;
695 68c76935 2019-02-19 stsp if (size1 != size2) {
697 68c76935 2019-02-19 stsp return NULL;
700 68c76935 2019-02-19 stsp f1 = fopen(f1_path, "r");
701 68c76935 2019-02-19 stsp if (f1 == NULL)
702 638f9024 2019-05-13 stsp return got_error_from_errno2("open", f1_path);
704 68c76935 2019-02-19 stsp f2 = fopen(f2_path, "r");
705 68c76935 2019-02-19 stsp if (f2 == NULL) {
706 638f9024 2019-05-13 stsp err = got_error_from_errno2("open", f2_path);
710 68c76935 2019-02-19 stsp err = check_file_contents_equal(same, f1, f2);
712 68c76935 2019-02-19 stsp if (f1 && fclose(f1) != 0 && err == NULL)
713 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
714 68c76935 2019-02-19 stsp if (f2 && fclose(f2) != 0 && err == NULL)
715 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
717 6353ad76 2019-02-08 stsp return err;
721 46b6ee73 2019-06-04 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
722 14c901f1 2019-08-08 stsp * the file at deriv_path acts as the first derived version, and the
723 14c901f1 2019-08-08 stsp * file on disk acts as the second derived version.
725 6353ad76 2019-02-08 stsp static const struct got_error *
726 14c901f1 2019-08-08 stsp merge_file(int *local_changes_subsumed, struct got_worktree *worktree,
727 46b6ee73 2019-06-04 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
728 14c901f1 2019-08-08 stsp const char *path, uint16_t st_mode, const char *deriv_path,
729 14c901f1 2019-08-08 stsp const char *label_deriv, struct got_repository *repo,
730 14c901f1 2019-08-08 stsp got_worktree_checkout_cb progress_cb, 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 14c901f1 2019-08-08 stsp FILE *f_orig = NULL;
735 14c901f1 2019-08-08 stsp char *blob_orig_path = NULL;
736 af54ae4a 2019-02-19 stsp char *merged_path = NULL, *base_path = NULL;
737 234035bc 2019-06-01 stsp int overlapcnt = 0;
738 af54ae4a 2019-02-19 stsp char *parent;
740 234035bc 2019-06-01 stsp *local_changes_subsumed = 0;
742 af54ae4a 2019-02-19 stsp parent = dirname(ondisk_path);
743 af54ae4a 2019-02-19 stsp if (parent == NULL)
744 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", ondisk_path);
746 af54ae4a 2019-02-19 stsp if (asprintf(&base_path, "%s/got-merged", parent) == -1)
747 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
749 af54ae4a 2019-02-19 stsp err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
753 af54ae4a 2019-02-19 stsp free(base_path);
754 46b6ee73 2019-06-04 stsp if (asprintf(&base_path, "%s/got-merge-blob-orig", parent) == -1) {
755 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
756 af54ae4a 2019-02-19 stsp base_path = NULL;
760 46b6ee73 2019-06-04 stsp err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
763 46b6ee73 2019-06-04 stsp if (blob_orig) {
764 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
765 46b6ee73 2019-06-04 stsp blob_orig);
770 1430b4e0 2019-03-27 stsp * If the file has no blob, this is an "add vs add" conflict,
771 1430b4e0 2019-03-27 stsp * and we simply use an empty ancestor file to make both files
772 1430b4e0 2019-03-27 stsp * appear in the merged result in their entirety.
776 14c901f1 2019-08-08 stsp err = got_merge_diff3(&overlapcnt, merged_fd, deriv_path,
777 818c7501 2019-07-11 stsp blob_orig_path, ondisk_path, label_deriv, path);
781 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
782 6353ad76 2019-02-08 stsp overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
786 816dc654 2019-02-16 stsp if (fsync(merged_fd) != 0) {
787 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
791 68c76935 2019-02-19 stsp /* Check if a clean merge has subsumed all local changes. */
792 68c76935 2019-02-19 stsp if (overlapcnt == 0) {
793 14c901f1 2019-08-08 stsp err = check_files_equal(local_changes_subsumed, deriv_path,
794 68c76935 2019-02-19 stsp merged_path);
799 70a0c8ec 2019-02-20 stsp if (chmod(merged_path, st_mode) != 0) {
800 638f9024 2019-05-13 stsp err = got_error_from_errno2("chmod", merged_path);
804 6353ad76 2019-02-08 stsp if (rename(merged_path, ondisk_path) != 0) {
805 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", merged_path,
806 230a42bd 2019-05-11 jcs ondisk_path);
807 2a57020b 2019-02-20 stsp unlink(merged_path);
812 3a6ce05a 2019-02-11 stsp if (merged_fd != -1 && close(merged_fd) != 0 && err == NULL)
813 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
814 46b6ee73 2019-06-04 stsp if (f_orig && fclose(f_orig) != 0 && err == NULL)
815 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
816 6353ad76 2019-02-08 stsp free(merged_path);
817 af54ae4a 2019-02-19 stsp free(base_path);
818 46b6ee73 2019-06-04 stsp if (blob_orig_path) {
819 46b6ee73 2019-06-04 stsp unlink(blob_orig_path);
820 46b6ee73 2019-06-04 stsp free(blob_orig_path);
822 14c901f1 2019-08-08 stsp return err;
826 14c901f1 2019-08-08 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
827 14c901f1 2019-08-08 stsp * blob_deriv acts as the first derived version, and the file on disk
828 14c901f1 2019-08-08 stsp * acts as the second derived version.
830 14c901f1 2019-08-08 stsp static const struct got_error *
831 14c901f1 2019-08-08 stsp merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
832 14c901f1 2019-08-08 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
833 14c901f1 2019-08-08 stsp const char *path, uint16_t st_mode, struct got_blob_object *blob_deriv,
834 14c901f1 2019-08-08 stsp struct got_object_id *deriv_base_commit_id,
835 14c901f1 2019-08-08 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
836 14c901f1 2019-08-08 stsp void *progress_arg)
838 14c901f1 2019-08-08 stsp const struct got_error *err = NULL;
839 14c901f1 2019-08-08 stsp FILE *f_deriv = NULL;
840 14c901f1 2019-08-08 stsp char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
841 14c901f1 2019-08-08 stsp char *label_deriv = NULL, *parent;
843 14c901f1 2019-08-08 stsp *local_changes_subsumed = 0;
845 14c901f1 2019-08-08 stsp parent = dirname(ondisk_path);
846 14c901f1 2019-08-08 stsp if (parent == NULL)
847 14c901f1 2019-08-08 stsp return got_error_from_errno2("dirname", ondisk_path);
849 14c901f1 2019-08-08 stsp free(base_path);
850 14c901f1 2019-08-08 stsp if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
851 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
852 14c901f1 2019-08-08 stsp base_path = NULL;
856 14c901f1 2019-08-08 stsp err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
859 14c901f1 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
860 14c901f1 2019-08-08 stsp blob_deriv);
864 14c901f1 2019-08-08 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
867 14c901f1 2019-08-08 stsp if (asprintf(&label_deriv, "commit %s", id_str) == -1) {
868 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
872 14c901f1 2019-08-08 stsp err = merge_file(local_changes_subsumed, worktree, blob_orig,
873 14c901f1 2019-08-08 stsp ondisk_path, path, st_mode, blob_deriv_path, label_deriv,
874 14c901f1 2019-08-08 stsp repo, progress_cb, progress_arg);
876 14c901f1 2019-08-08 stsp if (f_deriv && fclose(f_deriv) != 0 && err == NULL)
877 14c901f1 2019-08-08 stsp err = got_error_from_errno("fclose");
878 14c901f1 2019-08-08 stsp free(base_path);
879 14c901f1 2019-08-08 stsp if (blob_deriv_path) {
880 14c901f1 2019-08-08 stsp unlink(blob_deriv_path);
881 14c901f1 2019-08-08 stsp free(blob_deriv_path);
883 6353ad76 2019-02-08 stsp free(id_str);
884 818c7501 2019-07-11 stsp free(label_deriv);
885 4a1ddfc2 2019-01-12 stsp return err;
888 4a1ddfc2 2019-01-12 stsp static const struct got_error *
889 13d9040b 2019-03-27 stsp update_blob_fileindex_entry(struct got_worktree *worktree,
890 13d9040b 2019-03-27 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
891 13d9040b 2019-03-27 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
892 13d9040b 2019-03-27 stsp int update_timestamps)
894 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
896 13d9040b 2019-03-27 stsp if (ie == NULL)
897 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
899 13d9040b 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path,
900 13d9040b 2019-03-27 stsp blob->id.sha1, worktree->base_commit_id->sha1,
901 13d9040b 2019-03-27 stsp update_timestamps);
903 13d9040b 2019-03-27 stsp struct got_fileindex_entry *new_ie;
904 13d9040b 2019-03-27 stsp err = got_fileindex_entry_alloc(&new_ie, ondisk_path,
905 13d9040b 2019-03-27 stsp path, blob->id.sha1, worktree->base_commit_id->sha1);
907 13d9040b 2019-03-27 stsp err = got_fileindex_entry_add(fileindex, new_ie);
909 13d9040b 2019-03-27 stsp return err;
912 13d9040b 2019-03-27 stsp static const struct got_error *
913 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
914 13d9040b 2019-03-27 stsp const char *path, uint16_t te_mode, uint16_t st_mode,
915 13d9040b 2019-03-27 stsp struct got_blob_object *blob, int restoring_missing_file,
916 a129376b 2019-03-28 stsp int reverting_versioned_file, struct got_repository *repo,
917 a129376b 2019-03-28 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
919 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
920 507dc3bb 2018-12-29 stsp int fd = -1;
921 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
922 507dc3bb 2018-12-29 stsp int update = 0;
923 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
925 c34b20a2 2018-03-12 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
926 9d31a1d8 2018-03-11 stsp GOT_DEFAULT_FILE_MODE);
927 9d31a1d8 2018-03-11 stsp if (fd == -1) {
928 21908da4 2019-01-13 stsp if (errno == ENOENT) {
929 21908da4 2019-01-13 stsp char *parent = dirname(path);
930 21908da4 2019-01-13 stsp if (parent == NULL)
931 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
932 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
934 21908da4 2019-01-13 stsp return err;
935 21908da4 2019-01-13 stsp fd = open(ondisk_path,
936 21908da4 2019-01-13 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
937 21908da4 2019-01-13 stsp GOT_DEFAULT_FILE_MODE);
938 21908da4 2019-01-13 stsp if (fd == -1)
939 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
940 230a42bd 2019-05-11 jcs ondisk_path);
941 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
942 b8f41171 2019-02-10 stsp if (!S_ISREG(st_mode)) {
943 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
944 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
947 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
948 507dc3bb 2018-12-29 stsp ondisk_path);
951 507dc3bb 2018-12-29 stsp update = 1;
954 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
957 a378724f 2019-02-10 stsp if (restoring_missing_file)
958 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING, path);
959 a129376b 2019-03-28 stsp else if (reverting_versioned_file)
960 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT, path);
962 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
963 a378724f 2019-02-10 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
967 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
969 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
970 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
973 9d31a1d8 2018-03-11 stsp if (len > 0) {
974 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
975 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
976 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
977 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
979 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
980 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
983 61d6eaa3 2018-12-24 stsp hdrlen = 0;
985 9d31a1d8 2018-03-11 stsp } while (len != 0);
987 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
988 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
992 507dc3bb 2018-12-29 stsp if (update) {
993 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
994 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
995 230a42bd 2019-05-11 jcs ondisk_path);
996 2a57020b 2019-02-20 stsp unlink(tmppath);
1001 b8f41171 2019-02-10 stsp if (te_mode & S_IXUSR) {
1002 b8f41171 2019-02-10 stsp if (chmod(ondisk_path, st_mode | S_IXUSR) == -1) {
1003 638f9024 2019-05-13 stsp err = got_error_from_errno2("chmod", ondisk_path);
1004 507dc3bb 2018-12-29 stsp goto done;
1007 b8f41171 2019-02-10 stsp if (chmod(ondisk_path, st_mode & ~S_IXUSR) == -1) {
1008 638f9024 2019-05-13 stsp err = got_error_from_errno2("chmod", ondisk_path);
1009 68ed9ba5 2019-02-10 stsp goto done;
1014 3a6ce05a 2019-02-11 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
1015 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
1016 507dc3bb 2018-12-29 stsp free(tmppath);
1017 6353ad76 2019-02-08 stsp return err;
1020 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1021 6353ad76 2019-02-08 stsp static const struct got_error *
1022 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
1024 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
1025 7154f6ce 2019-03-27 stsp const char *markers[3] = {
1026 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
1027 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
1028 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
1030 7154f6ce 2019-03-27 stsp int i = 0;
1031 7154f6ce 2019-03-27 stsp char *line;
1032 7154f6ce 2019-03-27 stsp size_t len;
1033 7154f6ce 2019-03-27 stsp const char delim[3] = {'\0', '\0', '\0'};
1035 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1036 7154f6ce 2019-03-27 stsp line = fparseln(f, &len, NULL, delim, 0);
1037 7154f6ce 2019-03-27 stsp if (line == NULL) {
1038 7154f6ce 2019-03-27 stsp if (feof(f))
1040 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
1044 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1045 19332e6d 2019-05-13 stsp if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1047 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
1053 7154f6ce 2019-03-27 stsp return err;
1056 e2b1e152 2019-07-13 stsp static int
1057 e2b1e152 2019-07-13 stsp stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1059 e2b1e152 2019-07-13 stsp return !(ie->ctime_sec == sb->st_ctime &&
1060 e2b1e152 2019-07-13 stsp ie->ctime_nsec == sb->st_ctimensec &&
1061 e2b1e152 2019-07-13 stsp ie->mtime_sec == sb->st_mtime &&
1062 e2b1e152 2019-07-13 stsp ie->mtime_nsec == sb->st_mtimensec &&
1063 e2b1e152 2019-07-13 stsp ie->size == (sb->st_size & 0xffffffff));
1066 c363b2c1 2019-08-03 stsp static unsigned char
1067 c363b2c1 2019-08-03 stsp get_staged_status(struct got_fileindex_entry *ie)
1069 c363b2c1 2019-08-03 stsp switch (got_fileindex_entry_stage_get(ie)) {
1070 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_ADD:
1071 c363b2c1 2019-08-03 stsp return GOT_STATUS_ADD;
1072 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_DELETE:
1073 c363b2c1 2019-08-03 stsp return GOT_STATUS_DELETE;
1074 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_MODIFY:
1075 c363b2c1 2019-08-03 stsp return GOT_STATUS_MODIFY;
1077 c363b2c1 2019-08-03 stsp return GOT_STATUS_NO_CHANGE;
1081 7154f6ce 2019-03-27 stsp static const struct got_error *
1082 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1083 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1084 b8f41171 2019-02-10 stsp struct got_repository *repo)
1086 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1087 6353ad76 2019-02-08 stsp struct got_object_id id;
1088 6353ad76 2019-02-08 stsp size_t hdrlen;
1089 6353ad76 2019-02-08 stsp FILE *f = NULL;
1090 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1091 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1092 6353ad76 2019-02-08 stsp size_t flen, blen;
1093 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
1095 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1097 339c298e 2019-07-27 stsp if (lstat(abspath, sb) == -1) {
1098 a378724f 2019-02-10 stsp if (errno == ENOENT) {
1099 abb4604f 2019-07-27 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1100 abb4604f 2019-07-27 stsp *status = GOT_STATUS_MISSING;
1102 abb4604f 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1103 a378724f 2019-02-10 stsp return NULL;
1105 339c298e 2019-07-27 stsp return got_error_from_errno2("lstat", abspath);
1108 339c298e 2019-07-27 stsp if (!S_ISREG(sb->st_mode)) {
1109 339c298e 2019-07-27 stsp *status = GOT_STATUS_OBSTRUCTED;
1110 339c298e 2019-07-27 stsp return NULL;
1113 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1114 339c298e 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1115 339c298e 2019-07-27 stsp return NULL;
1116 244725f2 2019-08-03 stsp } else if (!got_fileindex_entry_has_blob(ie) &&
1117 244725f2 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
1118 339c298e 2019-07-27 stsp *status = GOT_STATUS_ADD;
1119 339c298e 2019-07-27 stsp return NULL;
1122 e2b1e152 2019-07-13 stsp if (!stat_info_differs(ie, sb))
1123 339c298e 2019-07-27 stsp return NULL;
1125 c363b2c1 2019-08-03 stsp if (staged_status == GOT_STATUS_MODIFY ||
1126 c363b2c1 2019-08-03 stsp staged_status == GOT_STATUS_ADD)
1127 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1129 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1131 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1133 339c298e 2019-07-27 stsp return err;
1135 339c298e 2019-07-27 stsp f = fopen(abspath, "r");
1136 6353ad76 2019-02-08 stsp if (f == NULL) {
1137 339c298e 2019-07-27 stsp err = got_error_from_errno2("fopen", abspath);
1138 6353ad76 2019-02-08 stsp goto done;
1140 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1142 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1143 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1145 7154f6ce 2019-03-27 stsp goto done;
1146 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1147 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1148 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1149 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1150 7154f6ce 2019-03-27 stsp goto done;
1152 6353ad76 2019-02-08 stsp if (blen == 0) {
1153 6353ad76 2019-02-08 stsp if (flen != 0)
1154 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1156 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1157 6353ad76 2019-02-08 stsp if (blen != 0)
1158 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1160 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1161 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1162 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1163 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1167 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1170 6353ad76 2019-02-08 stsp hdrlen = 0;
1173 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1174 7154f6ce 2019-03-27 stsp rewind(f);
1175 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1179 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1181 6353ad76 2019-02-08 stsp fclose(f);
1182 9d31a1d8 2018-03-11 stsp return err;
1186 e2b1e152 2019-07-13 stsp * Update timestamps in the file index if a file is unmodified and
1187 e2b1e152 2019-07-13 stsp * we had to run a full content comparison to find out.
1189 e2b1e152 2019-07-13 stsp static const struct got_error *
1190 e2b1e152 2019-07-13 stsp sync_timestamps(char *ondisk_path, unsigned char status,
1191 e2b1e152 2019-07-13 stsp struct got_fileindex_entry *ie, struct stat *sb)
1193 e2b1e152 2019-07-13 stsp if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1194 e2b1e152 2019-07-13 stsp return got_fileindex_entry_update(ie, ondisk_path,
1195 e2b1e152 2019-07-13 stsp ie->blob_sha1, ie->commit_sha1, 1);
1197 e2b1e152 2019-07-13 stsp return NULL;
1200 9d31a1d8 2018-03-11 stsp static const struct got_error *
1201 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1202 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1203 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1204 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1205 0584f854 2019-04-06 stsp void *progress_arg)
1207 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1208 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1209 6353ad76 2019-02-08 stsp char *ondisk_path;
1210 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1211 b8f41171 2019-02-10 stsp struct stat sb;
1213 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1214 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1217 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1218 a76c42e6 2019-08-03 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1219 a76c42e6 2019-08-03 stsp goto done;
1221 abb4604f 2019-07-27 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1223 abb4604f 2019-07-27 stsp goto done;
1224 abb4604f 2019-07-27 stsp if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1225 abb4604f 2019-07-27 stsp sb.st_mode = got_fileindex_perms_to_st(ie);
1227 abb4604f 2019-07-27 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
1229 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1230 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1231 b8f41171 2019-02-10 stsp goto done;
1234 b8f41171 2019-02-10 stsp if (ie && status != GOT_STATUS_MISSING) {
1235 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1236 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1237 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1238 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1240 e2b1e152 2019-07-13 stsp goto done;
1241 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1243 6353ad76 2019-02-08 stsp goto done;
1245 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1246 1430b4e0 2019-03-27 stsp memcmp(ie->blob_sha1, te->id->sha1,
1247 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1248 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1249 b8f41171 2019-02-10 stsp goto done;
1253 8da9e5f4 2019-01-12 stsp err = got_object_open_as_blob(&blob, repo, te->id, 8192);
1255 6353ad76 2019-02-08 stsp goto done;
1257 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1258 234035bc 2019-06-01 stsp int update_timestamps;
1259 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1260 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1261 234035bc 2019-06-01 stsp struct got_object_id id2;
1262 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1263 234035bc 2019-06-01 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1265 234035bc 2019-06-01 stsp goto done;
1267 234035bc 2019-06-01 stsp err = merge_blob(&update_timestamps, worktree, blob2,
1268 818c7501 2019-07-11 stsp ondisk_path, path, sb.st_mode, blob,
1269 818c7501 2019-07-11 stsp worktree->base_commit_id, repo,
1270 234035bc 2019-06-01 stsp progress_cb, progress_arg);
1271 234035bc 2019-06-01 stsp if (blob2)
1272 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
1274 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
1275 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
1276 234035bc 2019-06-01 stsp * unmodified files again.
1278 234035bc 2019-06-01 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1279 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
1280 234035bc 2019-06-01 stsp update_timestamps);
1281 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
1282 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1284 1ee397ad 2019-07-12 stsp goto done;
1285 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1286 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 0);
1288 13d9040b 2019-03-27 stsp goto done;
1290 13d9040b 2019-03-27 stsp err = install_blob(worktree, ondisk_path, path, te->mode,
1291 a129376b 2019-03-28 stsp sb.st_mode, blob, status == GOT_STATUS_MISSING, 0,
1292 a129376b 2019-03-28 stsp repo, progress_cb, progress_arg);
1294 13d9040b 2019-03-27 stsp goto done;
1295 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1296 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 1);
1298 13d9040b 2019-03-27 stsp goto done;
1300 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
1302 6353ad76 2019-02-08 stsp free(ondisk_path);
1303 8da9e5f4 2019-01-12 stsp return err;
1306 90285c3b 2019-01-08 stsp static const struct got_error *
1307 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
1309 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
1310 90285c3b 2019-01-08 stsp char *ondisk_path = NULL;
1312 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
1313 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1315 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
1316 c97665ae 2019-01-13 stsp if (errno != ENOENT)
1317 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
1319 90285c3b 2019-01-08 stsp char *parent = dirname(ondisk_path);
1320 7a9df742 2019-01-08 stsp while (parent && strcmp(parent, root_path) != 0) {
1321 26c4ac4d 2019-01-08 stsp if (rmdir(parent) == -1) {
1322 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
1323 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
1327 90285c3b 2019-01-08 stsp parent = dirname(parent);
1330 90285c3b 2019-01-08 stsp free(ondisk_path);
1331 90285c3b 2019-01-08 stsp return err;
1334 708d8e67 2019-03-27 stsp static const struct got_error *
1335 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
1336 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
1337 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1339 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
1340 708d8e67 2019-03-27 stsp unsigned char status;
1341 708d8e67 2019-03-27 stsp struct stat sb;
1342 708d8e67 2019-03-27 stsp char *ondisk_path;
1344 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
1345 a76c42e6 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1347 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
1349 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1351 708d8e67 2019-03-27 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1353 708d8e67 2019-03-27 stsp return err;
1355 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
1356 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
1357 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
1359 1ee397ad 2019-07-12 stsp return err;
1361 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
1362 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
1364 fc6346c4 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
1367 708d8e67 2019-03-27 stsp return err;
1369 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
1371 1ee397ad 2019-07-12 stsp return err;
1372 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
1373 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
1375 fc6346c4 2019-03-27 stsp return err;
1377 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
1380 fc6346c4 2019-03-27 stsp return err;
1383 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
1384 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
1385 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
1386 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
1387 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
1388 8da9e5f4 2019-01-12 stsp void *progress_arg;
1389 8da9e5f4 2019-01-12 stsp got_worktree_cancel_cb cancel_cb;
1390 8da9e5f4 2019-01-12 stsp void *cancel_arg;
1393 512f0d0e 2019-01-02 stsp static const struct got_error *
1394 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
1395 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
1397 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1399 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1400 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1402 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
1403 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
1406 8da9e5f4 2019-01-12 stsp static const struct got_error *
1407 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1409 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1411 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1412 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1414 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
1415 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1418 9d31a1d8 2018-03-11 stsp static const struct got_error *
1419 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
1421 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1422 8da9e5f4 2019-01-12 stsp const struct got_error *err;
1423 8da9e5f4 2019-01-12 stsp char *path;
1425 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1426 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1428 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
1429 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
1431 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1433 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
1434 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
1436 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
1437 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1439 8da9e5f4 2019-01-12 stsp free(path);
1440 0cd1c46a 2019-03-11 stsp return err;
1443 818c7501 2019-07-11 stsp static const struct got_error *
1444 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
1446 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
1447 0647c563 2019-03-11 stsp char *uuidstr = NULL;
1448 0cd1c46a 2019-03-11 stsp uint32_t uuid_status;
1450 517bab73 2019-03-11 stsp *refname = NULL;
1452 0cd1c46a 2019-03-11 stsp uuid_to_string(&worktree->uuid, &uuidstr, &uuid_status);
1453 0cd1c46a 2019-03-11 stsp if (uuid_status != uuid_s_ok)
1454 0cd1c46a 2019-03-11 stsp return got_error_uuid(uuid_status);
1456 818c7501 2019-07-11 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr)
1458 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1459 0647c563 2019-03-11 stsp *refname = NULL;
1461 517bab73 2019-03-11 stsp free(uuidstr);
1462 517bab73 2019-03-11 stsp return err;
1465 818c7501 2019-07-11 stsp const struct got_error *
1466 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
1468 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
1471 818c7501 2019-07-11 stsp static const struct got_error *
1472 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
1474 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1475 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
1478 818c7501 2019-07-11 stsp static const struct got_error *
1479 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
1481 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
1484 818c7501 2019-07-11 stsp static const struct got_error *
1485 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
1487 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1488 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
1491 818c7501 2019-07-11 stsp static const struct got_error *
1492 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
1494 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1495 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
1498 0ebf8283 2019-07-24 stsp static const struct got_error *
1499 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
1501 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1502 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
1505 0ebf8283 2019-07-24 stsp static const struct got_error *
1506 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
1508 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1509 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
1512 0ebf8283 2019-07-24 stsp static const struct got_error *
1513 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
1515 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1516 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
1519 0ebf8283 2019-07-24 stsp static const struct got_error *
1520 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
1522 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1523 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
1526 0ebf8283 2019-07-24 stsp const struct got_error *
1527 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
1528 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
1530 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
1531 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
1532 0ebf8283 2019-07-24 stsp *path = NULL;
1533 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
1535 0ebf8283 2019-07-24 stsp return NULL;
1539 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
1540 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
1542 517bab73 2019-03-11 stsp static const struct got_error *
1543 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
1545 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
1546 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
1547 517bab73 2019-03-11 stsp char *refname;
1549 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
1551 517bab73 2019-03-11 stsp return err;
1553 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
1555 0cd1c46a 2019-03-11 stsp goto done;
1557 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
1559 0cd1c46a 2019-03-11 stsp free(refname);
1561 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
1562 3e3a69f1 2019-07-25 stsp return err;
1565 3e3a69f1 2019-07-25 stsp static const struct got_error *
1566 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
1568 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
1570 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
1571 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1572 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
1573 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
1575 9d31a1d8 2018-03-11 stsp return err;
1579 ebf99748 2019-05-09 stsp static const struct got_error *
1580 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
1581 ebf99748 2019-05-09 stsp struct got_worktree *worktree)
1583 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
1584 ebf99748 2019-05-09 stsp FILE *index = NULL;
1586 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1587 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
1588 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
1589 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
1591 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
1593 ebf99748 2019-05-09 stsp goto done;
1595 ebf99748 2019-05-09 stsp index = fopen(*fileindex_path, "rb");
1596 ebf99748 2019-05-09 stsp if (index == NULL) {
1597 ebf99748 2019-05-09 stsp if (errno != ENOENT)
1598 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
1600 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
1601 ebf99748 2019-05-09 stsp if (fclose(index) != 0 && err == NULL)
1602 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
1605 ebf99748 2019-05-09 stsp if (err) {
1606 ebf99748 2019-05-09 stsp free(*fileindex_path);
1607 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1608 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
1609 ebf99748 2019-05-09 stsp *fileindex = NULL;
1611 ebf99748 2019-05-09 stsp return err;
1614 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
1615 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
1616 c932eeeb 2019-05-22 stsp const char *path;
1617 c932eeeb 2019-05-22 stsp size_t path_len;
1618 c932eeeb 2019-05-22 stsp const char *entry_name;
1619 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
1620 a484d721 2019-06-10 stsp void *progress_arg;
1623 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
1624 c932eeeb 2019-05-22 stsp static const struct got_error *
1625 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
1627 1ee397ad 2019-07-12 stsp const struct got_error *err;
1628 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
1630 c932eeeb 2019-05-22 stsp if (a->entry_name) {
1631 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
1632 c932eeeb 2019-05-22 stsp return NULL;
1633 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
1634 102ff934 2019-06-11 stsp return NULL;
1636 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
1637 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
1638 c932eeeb 2019-05-22 stsp return NULL;
1640 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
1641 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
1642 edd02c5e 2019-07-11 stsp ie->path);
1644 1ee397ad 2019-07-12 stsp return err;
1646 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
1647 c932eeeb 2019-05-22 stsp return NULL;
1650 9c6338c4 2019-06-02 stsp static const struct got_error *
1651 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
1653 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
1654 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
1655 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
1657 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
1658 9c6338c4 2019-06-02 stsp fileindex_path);
1660 9c6338c4 2019-06-02 stsp goto done;
1662 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
1664 9c6338c4 2019-06-02 stsp goto done;
1666 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
1667 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
1668 9c6338c4 2019-06-02 stsp fileindex_path);
1669 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
1672 9c6338c4 2019-06-02 stsp if (new_index)
1673 9c6338c4 2019-06-02 stsp fclose(new_index);
1674 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
1675 9c6338c4 2019-06-02 stsp return err;
1678 6ced4176 2019-07-12 stsp static const struct got_error *
1679 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
1680 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
1681 6ced4176 2019-07-12 stsp struct got_worktree *worktree, struct got_repository *repo)
1683 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
1684 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
1685 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
1686 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
1688 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
1689 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
1690 6ced4176 2019-07-12 stsp *tree_id = NULL;
1692 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
1693 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
1694 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
1695 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
1696 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1697 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1698 6ced4176 2019-07-12 stsp goto done;
1700 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
1701 6ced4176 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
1703 6ced4176 2019-07-12 stsp goto done;
1704 6ced4176 2019-07-12 stsp return NULL;
1707 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
1709 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
1710 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
1711 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
1712 6ced4176 2019-07-12 stsp goto done;
1715 6ced4176 2019-07-12 stsp err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
1716 6ced4176 2019-07-12 stsp in_repo_path);
1718 6ced4176 2019-07-12 stsp goto done;
1720 6ced4176 2019-07-12 stsp free(in_repo_path);
1721 6ced4176 2019-07-12 stsp in_repo_path = NULL;
1723 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
1725 6ced4176 2019-07-12 stsp goto done;
1727 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
1728 6ced4176 2019-07-12 stsp /* Check out a single file. */
1729 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
1730 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
1731 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
1732 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
1733 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1734 6ced4176 2019-07-12 stsp goto done;
1736 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
1737 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1738 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1739 6ced4176 2019-07-12 stsp goto done;
1742 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
1743 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
1745 6ced4176 2019-07-12 stsp return err;
1746 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
1747 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
1748 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
1749 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
1750 6ced4176 2019-07-12 stsp goto done;
1753 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
1754 6ced4176 2019-07-12 stsp worktree->base_commit_id, in_repo_path);
1756 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
1757 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
1758 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
1759 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
1760 6ced4176 2019-07-12 stsp goto done;
1762 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
1763 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1764 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1765 6ced4176 2019-07-12 stsp goto done;
1770 6ced4176 2019-07-12 stsp free(in_repo_path);
1771 6ced4176 2019-07-12 stsp if (err) {
1772 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
1773 6ced4176 2019-07-12 stsp free(*tree_relpath);
1774 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
1775 6ced4176 2019-07-12 stsp free(*tree_id);
1776 6ced4176 2019-07-12 stsp *tree_id = NULL;
1778 07ed472d 2019-07-12 stsp return err;
1781 07ed472d 2019-07-12 stsp static const struct got_error *
1782 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
1783 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
1784 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1785 07ed472d 2019-07-12 stsp void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1787 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
1788 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
1789 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
1790 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
1791 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
1793 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
1795 07ed472d 2019-07-12 stsp goto done;
1797 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
1798 07ed472d 2019-07-12 stsp worktree->base_commit_id);
1800 07ed472d 2019-07-12 stsp goto done;
1802 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1804 07ed472d 2019-07-12 stsp goto done;
1806 07ed472d 2019-07-12 stsp if (entry_name &&
1807 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
1808 07ed472d 2019-07-12 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
1809 07ed472d 2019-07-12 stsp goto done;
1812 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
1813 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
1814 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
1815 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
1816 07ed472d 2019-07-12 stsp arg.worktree = worktree;
1817 07ed472d 2019-07-12 stsp arg.repo = repo;
1818 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
1819 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
1820 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
1821 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
1822 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
1823 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
1826 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
1827 07ed472d 2019-07-12 stsp if (commit)
1828 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
1829 6ced4176 2019-07-12 stsp return err;
1832 9d31a1d8 2018-03-11 stsp const struct got_error *
1833 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
1834 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
1835 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
1836 f2ea84fa 2019-07-27 stsp got_worktree_cancel_cb cancel_cb, void *cancel_arg)
1838 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
1839 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
1840 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
1841 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
1842 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
1843 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
1844 f2ea84fa 2019-07-27 stsp struct tree_path_data {
1845 f2ea84fa 2019-07-27 stsp SIMPLEQ_ENTRY(tree_path_data) entry;
1846 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
1847 f2ea84fa 2019-07-27 stsp int entry_type;
1848 f2ea84fa 2019-07-27 stsp char *relpath;
1849 f2ea84fa 2019-07-27 stsp char *entry_name;
1850 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
1851 f2ea84fa 2019-07-27 stsp SIMPLEQ_HEAD(tree_paths, tree_path_data) tree_paths;
1853 f2ea84fa 2019-07-27 stsp SIMPLEQ_INIT(&tree_paths);
1855 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
1857 9d31a1d8 2018-03-11 stsp return err;
1859 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
1860 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
1861 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
1862 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
1863 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
1864 f2ea84fa 2019-07-27 stsp goto done;
1867 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
1868 f2ea84fa 2019-07-27 stsp &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
1869 f2ea84fa 2019-07-27 stsp if (err) {
1870 f2ea84fa 2019-07-27 stsp free(tpd);
1871 6ced4176 2019-07-12 stsp goto done;
1874 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
1875 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
1876 f2ea84fa 2019-07-27 stsp if (err) {
1877 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
1878 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
1879 f2ea84fa 2019-07-27 stsp free(tpd);
1880 f2ea84fa 2019-07-27 stsp goto done;
1883 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
1885 f2ea84fa 2019-07-27 stsp SIMPLEQ_INSERT_TAIL(&tree_paths, tpd, entry);
1889 51514078 2018-12-25 stsp * Read the file index.
1890 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
1891 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
1893 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
1895 c4cdcb68 2019-04-03 stsp goto done;
1897 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
1898 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
1899 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
1901 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
1902 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
1903 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
1907 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
1908 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
1909 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
1910 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
1911 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
1912 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
1913 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
1914 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
1918 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_NEXT(tpd, entry);
1920 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
1921 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
1922 af12c6b9 2019-06-04 stsp err = sync_err;
1924 9c6338c4 2019-06-02 stsp free(fileindex_path);
1926 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
1927 9d31a1d8 2018-03-11 stsp if (commit)
1928 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
1929 5ade8233 2019-07-12 stsp if (fileindex)
1930 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
1931 f2ea84fa 2019-07-27 stsp while (!SIMPLEQ_EMPTY(&tree_paths)) {
1932 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
1933 f2ea84fa 2019-07-27 stsp SIMPLEQ_REMOVE_HEAD(&tree_paths, entry);
1934 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
1935 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
1936 f2ea84fa 2019-07-27 stsp free(tpd);
1938 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
1939 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
1940 9d31a1d8 2018-03-11 stsp err = unlockerr;
1941 f8d1f275 2019-02-04 stsp return err;
1944 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
1945 234035bc 2019-06-01 stsp struct got_worktree *worktree;
1946 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
1947 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
1948 234035bc 2019-06-01 stsp void *progress_arg;
1949 234035bc 2019-06-01 stsp got_worktree_cancel_cb cancel_cb;
1950 234035bc 2019-06-01 stsp void *cancel_arg;
1951 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
1954 234035bc 2019-06-01 stsp static const struct got_error *
1955 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
1956 234035bc 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
1957 234035bc 2019-06-01 stsp struct got_object_id *id2, const char *path1, const char *path2,
1958 234035bc 2019-06-01 stsp struct got_repository *repo)
1960 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
1961 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
1962 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
1963 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
1964 234035bc 2019-06-01 stsp struct stat sb;
1965 234035bc 2019-06-01 stsp unsigned char status;
1966 234035bc 2019-06-01 stsp int local_changes_subsumed;
1968 234035bc 2019-06-01 stsp if (blob1 && blob2) {
1969 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
1970 d6c87207 2019-08-02 stsp strlen(path2));
1971 1ee397ad 2019-07-12 stsp if (ie == NULL)
1972 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
1973 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
1975 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1976 234035bc 2019-06-01 stsp path2) == -1)
1977 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
1979 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1981 234035bc 2019-06-01 stsp goto done;
1983 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
1984 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
1985 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
1986 234035bc 2019-06-01 stsp goto done;
1988 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
1989 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
1990 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
1991 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
1992 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
1993 234035bc 2019-06-01 stsp goto done;
1996 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree, blob1,
1997 818c7501 2019-07-11 stsp ondisk_path, path2, sb.st_mode, blob2, a->commit_id2, repo,
1998 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
1999 234035bc 2019-06-01 stsp } else if (blob1) {
2000 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2001 d6c87207 2019-08-02 stsp strlen(path1));
2002 1ee397ad 2019-07-12 stsp if (ie == NULL)
2003 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2004 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2006 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2007 2b92fad7 2019-06-02 stsp path1) == -1)
2008 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2010 2b92fad7 2019-06-02 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2012 2b92fad7 2019-06-02 stsp goto done;
2014 2b92fad7 2019-06-02 stsp switch (status) {
2015 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2016 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2017 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2019 1ee397ad 2019-07-12 stsp goto done;
2020 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2022 2b92fad7 2019-06-02 stsp goto done;
2024 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2026 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
2027 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
2028 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2029 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2031 1ee397ad 2019-07-12 stsp goto done;
2033 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2035 2b92fad7 2019-06-02 stsp case GOT_STATUS_ADD:
2036 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
2037 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
2038 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2039 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
2041 1ee397ad 2019-07-12 stsp goto done;
2043 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
2044 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
2046 1ee397ad 2019-07-12 stsp goto done;
2051 234035bc 2019-06-01 stsp } else if (blob2) {
2052 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2053 234035bc 2019-06-01 stsp path2) == -1)
2054 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2055 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2056 d6c87207 2019-08-02 stsp strlen(path2));
2058 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
2061 234035bc 2019-06-01 stsp goto done;
2062 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2063 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2064 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2065 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2066 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2067 1ee397ad 2019-07-12 stsp status, path2);
2068 234035bc 2019-06-01 stsp goto done;
2070 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
2071 818c7501 2019-07-11 stsp NULL, ondisk_path, path2, sb.st_mode, blob2,
2072 818c7501 2019-07-11 stsp a->commit_id2, repo,
2073 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
2074 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2075 234035bc 2019-06-01 stsp err = update_blob_fileindex_entry(a->worktree,
2076 234035bc 2019-06-01 stsp a->fileindex, ie, ondisk_path, ie->path,
2077 234035bc 2019-06-01 stsp blob2, 0);
2079 234035bc 2019-06-01 stsp goto done;
2082 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2083 234035bc 2019-06-01 stsp err = install_blob(a->worktree, ondisk_path, path2,
2084 234035bc 2019-06-01 stsp /* XXX get this from parent tree! */
2085 234035bc 2019-06-01 stsp GOT_DEFAULT_FILE_MODE,
2086 234035bc 2019-06-01 stsp sb.st_mode, blob2, 0, 0, repo,
2087 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
2089 234035bc 2019-06-01 stsp goto done;
2090 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_alloc(&ie,
2091 2b92fad7 2019-06-02 stsp ondisk_path, path2, NULL, NULL);
2093 234035bc 2019-06-01 stsp goto done;
2094 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
2095 2b92fad7 2019-06-02 stsp if (err) {
2096 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
2097 2b92fad7 2019-06-02 stsp goto done;
2102 234035bc 2019-06-01 stsp free(ondisk_path);
2103 234035bc 2019-06-01 stsp return err;
2106 234035bc 2019-06-01 stsp struct check_merge_ok_arg {
2107 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2108 234035bc 2019-06-01 stsp struct got_repository *repo;
2111 234035bc 2019-06-01 stsp static const struct got_error *
2112 234035bc 2019-06-01 stsp check_merge_ok(void *arg, struct got_fileindex_entry *ie)
2114 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
2115 234035bc 2019-06-01 stsp struct check_merge_ok_arg *a = arg;
2116 234035bc 2019-06-01 stsp unsigned char status;
2117 234035bc 2019-06-01 stsp struct stat sb;
2118 234035bc 2019-06-01 stsp char *ondisk_path;
2120 234035bc 2019-06-01 stsp /* Reject merges into a work tree with mixed base commits. */
2121 234035bc 2019-06-01 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
2122 234035bc 2019-06-01 stsp SHA1_DIGEST_LENGTH))
2123 234035bc 2019-06-01 stsp return got_error(GOT_ERR_MIXED_COMMITS);
2125 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
2127 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2129 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
2130 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
2132 234035bc 2019-06-01 stsp return err;
2133 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
2134 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
2136 234035bc 2019-06-01 stsp return NULL;
2139 818c7501 2019-07-11 stsp static const struct got_error *
2140 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2141 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
2142 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
2143 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2144 818c7501 2019-07-11 stsp got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2146 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
2147 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
2148 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2149 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
2151 03415a1a 2019-06-02 stsp if (commit_id1) {
2152 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
2153 03415a1a 2019-06-02 stsp worktree->path_prefix);
2155 03415a1a 2019-06-02 stsp goto done;
2157 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
2159 03415a1a 2019-06-02 stsp goto done;
2162 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
2163 234035bc 2019-06-01 stsp worktree->path_prefix);
2165 234035bc 2019-06-01 stsp goto done;
2167 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
2169 234035bc 2019-06-01 stsp goto done;
2171 234035bc 2019-06-01 stsp arg.worktree = worktree;
2172 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
2173 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
2174 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
2175 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
2176 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
2177 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
2178 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
2179 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2180 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2181 af12c6b9 2019-06-04 stsp err = sync_err;
2183 234035bc 2019-06-01 stsp if (tree1)
2184 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
2185 234035bc 2019-06-01 stsp if (tree2)
2186 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
2187 818c7501 2019-07-11 stsp return err;
2190 818c7501 2019-07-11 stsp const struct got_error *
2191 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
2192 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
2193 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2194 818c7501 2019-07-11 stsp void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2196 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
2197 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
2198 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
2199 818c7501 2019-07-11 stsp struct check_merge_ok_arg mok_arg;
2201 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
2203 818c7501 2019-07-11 stsp return err;
2205 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2207 818c7501 2019-07-11 stsp goto done;
2209 818c7501 2019-07-11 stsp mok_arg.worktree = worktree;
2210 818c7501 2019-07-11 stsp mok_arg.repo = repo;
2211 818c7501 2019-07-11 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
2212 818c7501 2019-07-11 stsp &mok_arg);
2214 818c7501 2019-07-11 stsp goto done;
2216 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
2217 818c7501 2019-07-11 stsp commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
2219 818c7501 2019-07-11 stsp if (fileindex)
2220 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
2221 818c7501 2019-07-11 stsp free(fileindex_path);
2222 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2223 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
2224 234035bc 2019-06-01 stsp err = unlockerr;
2225 234035bc 2019-06-01 stsp return err;
2228 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
2229 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
2230 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
2231 927df6b7 2019-02-10 stsp const char *status_path;
2232 927df6b7 2019-02-10 stsp size_t status_path_len;
2233 f8d1f275 2019-02-04 stsp struct got_repository *repo;
2234 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
2235 f8d1f275 2019-02-04 stsp void *status_arg;
2236 f8d1f275 2019-02-04 stsp got_worktree_cancel_cb cancel_cb;
2237 f8d1f275 2019-02-04 stsp void *cancel_arg;
2238 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
2239 6841da00 2019-08-08 stsp struct got_pathlist_head ignores;
2242 f8d1f275 2019-02-04 stsp static const struct got_error *
2243 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
2244 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
2245 927df6b7 2019-02-10 stsp struct got_repository *repo)
2247 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
2248 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
2249 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
2250 927df6b7 2019-02-10 stsp struct stat sb;
2251 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
2252 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
2253 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
2255 927df6b7 2019-02-10 stsp err = get_file_status(&status, &sb, ie, abspath, repo);
2257 98eaaa12 2019-08-03 stsp return err;
2259 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
2260 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_NO_CHANGE)
2261 98eaaa12 2019-08-03 stsp return NULL;
2263 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_blob(ie)) {
2264 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2265 98eaaa12 2019-08-03 stsp blob_idp = &blob_id;
2267 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
2268 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2269 98eaaa12 2019-08-03 stsp commit_idp = &commit_id;
2271 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
2272 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
2273 98eaaa12 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
2274 98eaaa12 2019-08-03 stsp SHA1_DIGEST_LENGTH);
2275 98eaaa12 2019-08-03 stsp staged_blob_idp = &staged_blob_id;
2278 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
2279 98eaaa12 2019-08-03 stsp ie->path, blob_idp, staged_blob_idp, commit_idp);
2282 927df6b7 2019-02-10 stsp static const struct got_error *
2283 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
2284 f8d1f275 2019-02-04 stsp struct dirent *de, const char *parent_path)
2286 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2287 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2288 f8d1f275 2019-02-04 stsp char *abspath;
2290 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2291 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2293 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
2294 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
2295 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
2296 927df6b7 2019-02-10 stsp return NULL;
2298 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2299 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
2300 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
2301 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2303 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
2304 f8d1f275 2019-02-04 stsp de->d_name) == -1)
2305 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2308 927df6b7 2019-02-10 stsp err = report_file_status(ie, abspath, a->status_cb, a->status_arg,
2310 f8d1f275 2019-02-04 stsp free(abspath);
2311 9d31a1d8 2018-03-11 stsp return err;
2314 f8d1f275 2019-02-04 stsp static const struct got_error *
2315 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2317 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2318 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
2319 2ec1f75b 2019-03-26 stsp unsigned char status;
2321 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2322 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2324 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
2325 927df6b7 2019-02-10 stsp return NULL;
2327 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2328 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2329 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
2330 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
2332 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
2333 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
2334 537ac44b 2019-08-03 stsp ie->path, &blob_id, NULL, &commit_id);
2338 6841da00 2019-08-08 stsp free_ignorelist(struct got_pathlist_head *ignorelist)
2340 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2342 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignorelist, entry)
2343 6841da00 2019-08-08 stsp free((char *)pe->path);
2344 6841da00 2019-08-08 stsp got_pathlist_free(ignorelist);
2348 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
2350 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2352 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
2353 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
2354 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
2355 6841da00 2019-08-08 stsp free((char *)pe->path);
2357 6841da00 2019-08-08 stsp got_pathlist_free(ignores);
2360 6841da00 2019-08-08 stsp static const struct got_error *
2361 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
2363 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
2364 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
2365 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
2366 6841da00 2019-08-08 stsp char *line = NULL, *pattern, *dirpath;
2367 6841da00 2019-08-08 stsp size_t linesize = 0;
2368 6841da00 2019-08-08 stsp ssize_t linelen;
2370 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
2371 6841da00 2019-08-08 stsp if (ignorelist == NULL)
2372 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
2373 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
2375 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
2376 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
2377 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
2378 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
2379 6841da00 2019-08-08 stsp line) == -1) {
2380 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
2381 6841da00 2019-08-08 stsp goto done;
2383 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
2385 6841da00 2019-08-08 stsp goto done;
2387 6841da00 2019-08-08 stsp if (ferror(f)) {
2388 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
2389 6841da00 2019-08-08 stsp goto done;
2392 6841da00 2019-08-08 stsp dirpath = strdup(path);
2393 6841da00 2019-08-08 stsp if (dirpath == NULL) {
2394 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
2395 6841da00 2019-08-08 stsp goto done;
2397 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
2399 6841da00 2019-08-08 stsp free(line);
2400 6841da00 2019-08-08 stsp if (err || pe == NULL) {
2401 6841da00 2019-08-08 stsp free(dirpath);
2402 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
2404 6841da00 2019-08-08 stsp return err;
2408 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
2410 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2413 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
2414 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
2415 6841da00 2019-08-08 stsp * ignores backwards.
2417 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
2418 6841da00 2019-08-08 stsp while (pe) {
2419 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
2420 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
2421 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
2422 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
2423 6841da00 2019-08-08 stsp if (fnmatch(pi->path, path,
2424 6841da00 2019-08-08 stsp FNM_PATHNAME | FNM_LEADING_DIR))
2429 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
2435 6841da00 2019-08-08 stsp static const struct got_error *
2436 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
2437 b80270a7 2019-08-08 stsp const char *path)
2439 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
2440 6841da00 2019-08-08 stsp char *ignorespath;
2441 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
2443 6841da00 2019-08-08 stsp /* TODO: read .gitignores as well... */
2444 b80270a7 2019-08-08 stsp if (asprintf(&ignorespath, "%s/%s%s.cvsignore", root_path, path,
2445 b80270a7 2019-08-08 stsp path[0] ? "/" : "") == -1)
2446 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
2448 6841da00 2019-08-08 stsp ignoresfile = fopen(ignorespath, "r");
2449 6841da00 2019-08-08 stsp if (ignoresfile == NULL) {
2450 6841da00 2019-08-08 stsp if (errno != ENOENT)
2451 6841da00 2019-08-08 stsp err = got_error_from_errno2("fopen",
2452 6841da00 2019-08-08 stsp ignorespath);
2454 6841da00 2019-08-08 stsp err = read_ignores(ignores, path, ignoresfile);
2456 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
2457 6841da00 2019-08-08 stsp err = got_error_from_errno2("flose", path);
2458 6841da00 2019-08-08 stsp free(ignorespath);
2459 6841da00 2019-08-08 stsp return err;
2462 f8d1f275 2019-02-04 stsp static const struct got_error *
2463 f8d1f275 2019-02-04 stsp status_new(void *arg, struct dirent *de, const char *parent_path)
2465 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
2466 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2467 f8d1f275 2019-02-04 stsp char *path = NULL;
2469 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2470 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2472 2c201a36 2019-02-10 stsp /* XXX ignore symlinks for now */
2473 2c201a36 2019-02-10 stsp if (de->d_type == DT_LNK)
2474 927df6b7 2019-02-10 stsp return NULL;
2476 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2477 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
2478 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2480 f8d1f275 2019-02-04 stsp path = de->d_name;
2483 6841da00 2019-08-08 stsp if (de->d_type == DT_DIR)
2484 b80270a7 2019-08-08 stsp err = add_ignores(&a->ignores, a->worktree->root_path, path);
2485 6841da00 2019-08-08 stsp else if (got_path_is_child(path, a->status_path, a->status_path_len)
2486 6841da00 2019-08-08 stsp && !match_ignores(&a->ignores, path))
2487 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
2488 537ac44b 2019-08-03 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL);
2489 f8d1f275 2019-02-04 stsp if (parent_path[0])
2490 f8d1f275 2019-02-04 stsp free(path);
2491 b72f483a 2019-02-05 stsp return err;
2494 347d1d3e 2019-07-12 stsp static const struct got_error *
2495 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
2496 abb4604f 2019-07-27 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
2497 abb4604f 2019-07-27 stsp void *status_arg, struct got_repository *repo)
2499 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
2500 abb4604f 2019-07-27 stsp struct stat sb;
2502 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
2504 abb4604f 2019-07-27 stsp return report_file_status(ie, ondisk_path, status_cb,
2505 abb4604f 2019-07-27 stsp status_arg, repo);
2507 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
2508 abb4604f 2019-07-27 stsp if (errno != ENOENT)
2509 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
2510 abb4604f 2019-07-27 stsp return NULL;
2513 abb4604f 2019-07-27 stsp if (S_ISREG(sb.st_mode))
2514 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
2515 537ac44b 2019-08-03 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL);
2517 abb4604f 2019-07-27 stsp return NULL;
2520 abb4604f 2019-07-27 stsp static const struct got_error *
2521 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
2522 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
2523 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
2524 347d1d3e 2019-07-12 stsp got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2526 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2527 f8d1f275 2019-02-04 stsp DIR *workdir = NULL;
2528 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
2529 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
2530 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
2532 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
2533 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
2534 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
2536 927df6b7 2019-02-10 stsp workdir = opendir(ondisk_path);
2537 927df6b7 2019-02-10 stsp if (workdir == NULL) {
2538 abb4604f 2019-07-27 stsp if (errno != ENOTDIR && errno != ENOENT)
2539 638f9024 2019-05-13 stsp err = got_error_from_errno2("opendir", ondisk_path);
2541 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
2542 abb4604f 2019-07-27 stsp fileindex, status_cb, status_arg, repo);
2544 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
2545 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
2546 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
2547 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
2548 abb4604f 2019-07-27 stsp arg.worktree = worktree;
2549 abb4604f 2019-07-27 stsp arg.status_path = path;
2550 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
2551 abb4604f 2019-07-27 stsp arg.repo = repo;
2552 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
2553 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
2554 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
2555 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
2556 6841da00 2019-08-08 stsp TAILQ_INIT(&arg.ignores);
2557 b80270a7 2019-08-08 stsp err = add_ignores(&arg.ignores, worktree->root_path, path);
2558 6841da00 2019-08-08 stsp if (err == NULL)
2559 6841da00 2019-08-08 stsp err = got_fileindex_diff_dir(fileindex, workdir,
2560 6841da00 2019-08-08 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
2561 6841da00 2019-08-08 stsp free_ignores(&arg.ignores);
2564 f8d1f275 2019-02-04 stsp if (workdir)
2565 f8d1f275 2019-02-04 stsp closedir(workdir);
2566 927df6b7 2019-02-10 stsp free(ondisk_path);
2567 347d1d3e 2019-07-12 stsp return err;
2570 347d1d3e 2019-07-12 stsp const struct got_error *
2571 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
2572 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2573 72ea6654 2019-07-27 stsp got_worktree_status_cb status_cb, void *status_arg,
2574 72ea6654 2019-07-27 stsp got_worktree_cancel_cb cancel_cb, void *cancel_arg)
2576 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
2577 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
2578 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
2579 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
2581 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2583 347d1d3e 2019-07-12 stsp return err;
2585 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2586 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
2587 72ea6654 2019-07-27 stsp status_cb, status_arg, cancel_cb, cancel_arg);
2591 f8d1f275 2019-02-04 stsp free(fileindex_path);
2592 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
2593 f8d1f275 2019-02-04 stsp return err;
2596 6c7ab921 2019-03-18 stsp const struct got_error *
2597 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
2598 6c7ab921 2019-03-18 stsp const char *arg)
2600 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
2601 d0710d08 2019-07-22 stsp char *resolved, *cwd = NULL, *path = NULL;
2602 6c7ab921 2019-03-18 stsp size_t len;
2604 6c7ab921 2019-03-18 stsp *wt_path = NULL;
2606 6c7ab921 2019-03-18 stsp resolved = realpath(arg, NULL);
2607 d0710d08 2019-07-22 stsp if (resolved == NULL) {
2608 d0710d08 2019-07-22 stsp if (errno != ENOENT)
2609 d0710d08 2019-07-22 stsp return got_error_from_errno2("realpath", arg);
2610 d0710d08 2019-07-22 stsp cwd = getcwd(NULL, 0);
2611 d0710d08 2019-07-22 stsp if (cwd == NULL)
2612 d0710d08 2019-07-22 stsp return got_error_from_errno("getcwd");
2613 d0710d08 2019-07-22 stsp if (asprintf(&resolved, "%s/%s", cwd, arg) == -1) {
2614 d0710d08 2019-07-22 stsp err = got_error_from_errno("asprintf");
2615 d0710d08 2019-07-22 stsp goto done;
2619 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
2620 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
2621 6c7ab921 2019-03-18 stsp err = got_error(GOT_ERR_BAD_PATH);
2622 6c7ab921 2019-03-18 stsp goto done;
2625 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
2626 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
2627 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
2629 f6d88e1a 2019-05-29 stsp goto done;
2631 f6d88e1a 2019-05-29 stsp path = strdup("");
2632 f6d88e1a 2019-05-29 stsp if (path == NULL) {
2633 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
2634 f6d88e1a 2019-05-29 stsp goto done;
2638 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
2639 6c7ab921 2019-03-18 stsp len = strlen(path);
2640 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
2641 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
2645 6c7ab921 2019-03-18 stsp free(resolved);
2646 d0710d08 2019-07-22 stsp free(cwd);
2647 6c7ab921 2019-03-18 stsp if (err == NULL)
2648 6c7ab921 2019-03-18 stsp *wt_path = path;
2650 6c7ab921 2019-03-18 stsp free(path);
2651 d00136be 2019-03-26 stsp return err;
2654 07f5b47a 2019-06-02 stsp static const struct got_error *
2655 07f5b47a 2019-06-02 stsp schedule_addition(const char *ondisk_path, struct got_fileindex *fileindex,
2656 07f5b47a 2019-06-02 stsp const char *relpath, got_worktree_status_cb status_cb, void *status_arg,
2657 07f5b47a 2019-06-02 stsp struct got_repository *repo)
2659 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
2660 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
2661 6d022e97 2019-08-04 stsp unsigned char status;
2662 6d022e97 2019-08-04 stsp struct stat sb;
2664 6d022e97 2019-08-04 stsp ie = got_fileindex_entry_get(fileindex, relpath, strlen(relpath));
2666 6d022e97 2019-08-04 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2668 6d022e97 2019-08-04 stsp return err;
2669 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
2670 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
2671 6d022e97 2019-08-04 stsp return NULL;
2672 6d022e97 2019-08-04 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
2675 07f5b47a 2019-06-02 stsp err = got_fileindex_entry_alloc(&ie, ondisk_path, relpath, NULL, NULL);
2677 07f5b47a 2019-06-02 stsp return err;
2679 07f5b47a 2019-06-02 stsp err = got_fileindex_entry_add(fileindex, ie);
2680 07f5b47a 2019-06-02 stsp if (err) {
2681 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
2682 07f5b47a 2019-06-02 stsp return err;
2685 c02b99b6 2019-07-27 stsp return report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
2688 d00136be 2019-03-26 stsp const struct got_error *
2689 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
2690 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
2691 1dd54920 2019-05-11 stsp got_worktree_status_cb status_cb, void *status_arg,
2692 031a5338 2019-03-26 stsp struct got_repository *repo)
2694 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
2695 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2696 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2697 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
2699 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
2701 d00136be 2019-03-26 stsp return err;
2703 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2705 d00136be 2019-03-26 stsp goto done;
2707 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
2708 6d022e97 2019-08-04 stsp char *ondisk_path;
2709 6d022e97 2019-08-04 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path,
2710 6d022e97 2019-08-04 stsp pe->path) == -1)
2711 6d022e97 2019-08-04 stsp return got_error_from_errno("asprintf");
2712 6d022e97 2019-08-04 stsp err = schedule_addition(ondisk_path, fileindex, pe->path,
2713 07f5b47a 2019-06-02 stsp status_cb, status_arg, repo);
2714 6d022e97 2019-08-04 stsp free(ondisk_path);
2718 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2719 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2720 af12c6b9 2019-06-04 stsp err = sync_err;
2722 fb399478 2019-07-12 stsp free(fileindex_path);
2723 d00136be 2019-03-26 stsp if (fileindex)
2724 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
2725 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2726 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
2727 d00136be 2019-03-26 stsp err = unlockerr;
2728 6c7ab921 2019-03-18 stsp return err;
2731 17ed4618 2019-06-02 stsp static const struct got_error *
2732 17ed4618 2019-06-02 stsp schedule_for_deletion(const char *ondisk_path, struct got_fileindex *fileindex,
2733 17ed4618 2019-06-02 stsp const char *relpath, int delete_local_mods,
2734 17ed4618 2019-06-02 stsp got_worktree_status_cb status_cb, void *status_arg,
2735 17ed4618 2019-06-02 stsp struct got_repository *repo)
2737 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
2738 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
2739 9acbc4fa 2019-08-03 stsp unsigned char status, staged_status;
2740 17ed4618 2019-06-02 stsp struct stat sb;
2742 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, relpath, strlen(relpath));
2743 17ed4618 2019-06-02 stsp if (ie == NULL)
2744 17ed4618 2019-06-02 stsp return got_error(GOT_ERR_BAD_PATH);
2746 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
2747 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
2748 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
2749 9acbc4fa 2019-08-03 stsp return NULL;
2750 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
2753 17ed4618 2019-06-02 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2755 17ed4618 2019-06-02 stsp return err;
2757 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
2758 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
2759 de426ea6 2019-08-03 stsp return NULL;
2760 f0b0c0ce 2019-08-04 stsp if (status == GOT_STATUS_MODIFY && !delete_local_mods)
2761 f0b0c0ce 2019-08-04 stsp return got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
2762 f0b0c0ce 2019-08-04 stsp if (status != GOT_STATUS_MODIFY &&
2763 f0b0c0ce 2019-08-04 stsp status != GOT_STATUS_MISSING)
2764 f0b0c0ce 2019-08-04 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
2767 f0b0c0ce 2019-08-04 stsp if (status != GOT_STATUS_MISSING && unlink(ondisk_path) != 0)
2768 17ed4618 2019-06-02 stsp return got_error_from_errno2("unlink", ondisk_path);
2770 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2771 17ed4618 2019-06-02 stsp return report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
2774 2ec1f75b 2019-03-26 stsp const struct got_error *
2775 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
2776 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
2777 2ec1f75b 2019-03-26 stsp got_worktree_status_cb status_cb, void *status_arg,
2778 2ec1f75b 2019-03-26 stsp struct got_repository *repo)
2780 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
2781 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
2782 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2783 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
2785 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
2787 2ec1f75b 2019-03-26 stsp return err;
2789 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2791 2ec1f75b 2019-03-26 stsp goto done;
2793 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
2794 6d022e97 2019-08-04 stsp char *ondisk_path;
2795 6d022e97 2019-08-04 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path,
2796 6d022e97 2019-08-04 stsp pe->path) == -1)
2797 6d022e97 2019-08-04 stsp return got_error_from_errno("asprintf");
2798 6d022e97 2019-08-04 stsp err = schedule_for_deletion(ondisk_path, fileindex, pe->path,
2799 17ed4618 2019-06-02 stsp delete_local_mods, status_cb, status_arg, repo);
2800 6d022e97 2019-08-04 stsp free(ondisk_path);
2804 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2805 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2806 af12c6b9 2019-06-04 stsp err = sync_err;
2808 fb399478 2019-07-12 stsp free(fileindex_path);
2809 2ec1f75b 2019-03-26 stsp if (fileindex)
2810 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
2811 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2812 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
2813 2ec1f75b 2019-03-26 stsp err = unlockerr;
2814 33aa809d 2019-08-08 stsp return err;
2817 33aa809d 2019-08-08 stsp static const struct got_error *
2818 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
2820 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
2821 33aa809d 2019-08-08 stsp char *line = NULL;
2822 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
2823 33aa809d 2019-08-08 stsp ssize_t linelen;
2825 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
2826 33aa809d 2019-08-08 stsp if (linelen == -1) {
2827 33aa809d 2019-08-08 stsp if (ferror(infile)) {
2828 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
2829 33aa809d 2019-08-08 stsp goto done;
2831 33aa809d 2019-08-08 stsp return NULL;
2833 33aa809d 2019-08-08 stsp if (outfile) {
2834 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
2835 33aa809d 2019-08-08 stsp if (n != linelen) {
2836 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
2837 33aa809d 2019-08-08 stsp goto done;
2840 33aa809d 2019-08-08 stsp if (rejectfile) {
2841 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
2842 33aa809d 2019-08-08 stsp if (n != linelen)
2843 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
2846 33aa809d 2019-08-08 stsp free(line);
2847 2ec1f75b 2019-03-26 stsp return err;
2850 33aa809d 2019-08-08 stsp static const struct got_error *
2851 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
2853 33aa809d 2019-08-08 stsp char *line = NULL;
2854 33aa809d 2019-08-08 stsp size_t linesize = 0;
2855 33aa809d 2019-08-08 stsp ssize_t linelen;
2857 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
2858 33aa809d 2019-08-08 stsp free(line);
2859 33aa809d 2019-08-08 stsp if (linelen == -1 && ferror(f))
2860 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
2861 33aa809d 2019-08-08 stsp return NULL;
2864 33aa809d 2019-08-08 stsp static const struct got_error *
2865 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
2866 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
2867 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
2869 33aa809d 2019-08-08 stsp const struct got_error *err;
2871 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
2872 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
2873 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
2875 33aa809d 2019-08-08 stsp return err;
2876 33aa809d 2019-08-08 stsp (*line_cur1)++;
2878 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
2879 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
2880 33aa809d 2019-08-08 stsp if (rejectfile)
2881 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
2883 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
2885 33aa809d 2019-08-08 stsp return err;
2886 33aa809d 2019-08-08 stsp (*line_cur2)++;
2888 33aa809d 2019-08-08 stsp /* Copy patched lines. */
2889 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
2890 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
2892 33aa809d 2019-08-08 stsp return err;
2893 33aa809d 2019-08-08 stsp (*line_cur2)++;
2895 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
2896 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 <= end_new) {
2897 33aa809d 2019-08-08 stsp if (rejectfile)
2898 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
2900 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
2902 33aa809d 2019-08-08 stsp return err;
2903 33aa809d 2019-08-08 stsp (*line_cur1)++;
2905 33aa809d 2019-08-08 stsp /* Copy old file's lines after patch. */
2906 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 <= end_old) {
2907 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, rejectfile);
2909 33aa809d 2019-08-08 stsp return err;
2910 33aa809d 2019-08-08 stsp (*line_cur1)++;
2913 33aa809d 2019-08-08 stsp return NULL;
2916 33aa809d 2019-08-08 stsp static const struct got_error *
2917 33aa809d 2019-08-08 stsp apply_or_reject_change(int *choice, struct got_diff_change *change, int n,
2918 33aa809d 2019-08-08 stsp int nchanges, struct got_diff_state *ds, struct got_diff_args *args,
2919 33aa809d 2019-08-08 stsp int diff_flags, const char *relpath, FILE *f1, FILE *f2, int *line_cur1,
2920 33aa809d 2019-08-08 stsp int *line_cur2, FILE *outfile, FILE *rejectfile,
2921 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
2923 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
2924 33aa809d 2019-08-08 stsp int start_old = change->cv.a;
2925 33aa809d 2019-08-08 stsp int end_old = change->cv.b;
2926 33aa809d 2019-08-08 stsp int start_new = change->cv.c;
2927 33aa809d 2019-08-08 stsp int end_new = change->cv.d;
2928 33aa809d 2019-08-08 stsp long pos1, pos2;
2929 33aa809d 2019-08-08 stsp FILE *hunkfile;
2931 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
2933 33aa809d 2019-08-08 stsp hunkfile = got_opentemp();
2934 33aa809d 2019-08-08 stsp if (hunkfile == NULL)
2935 33aa809d 2019-08-08 stsp return got_error_from_errno("got_opentemp");
2937 33aa809d 2019-08-08 stsp pos1 = ftell(f1);
2938 33aa809d 2019-08-08 stsp pos2 = ftell(f2);
2940 33aa809d 2019-08-08 stsp /* XXX TODO needs error checking */
2941 33aa809d 2019-08-08 stsp got_diff_dump_change(hunkfile, change, ds, args, f1, f2, diff_flags);
2943 33aa809d 2019-08-08 stsp if (fseek(f1, pos1, SEEK_SET) == -1) {
2944 33aa809d 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
2945 33aa809d 2019-08-08 stsp goto done;
2947 33aa809d 2019-08-08 stsp if (fseek(f2, pos2, SEEK_SET) == -1) {
2948 33aa809d 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
2949 33aa809d 2019-08-08 stsp goto done;
2951 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
2952 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
2953 33aa809d 2019-08-08 stsp goto done;
2956 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
2957 33aa809d 2019-08-08 stsp hunkfile, n, nchanges);
2959 33aa809d 2019-08-08 stsp goto done;
2961 33aa809d 2019-08-08 stsp switch (*choice) {
2962 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
2963 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
2964 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
2966 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
2967 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
2968 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
2970 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
2971 33aa809d 2019-08-08 stsp if (outfile) {
2972 33aa809d 2019-08-08 stsp /* Copy old file's lines until EOF. */
2973 33aa809d 2019-08-08 stsp while (!feof(f1)) {
2974 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
2976 33aa809d 2019-08-08 stsp goto done;
2977 33aa809d 2019-08-08 stsp (*line_cur1)++;
2980 33aa809d 2019-08-08 stsp if (rejectfile) {
2981 33aa809d 2019-08-08 stsp /* Copy new file's lines until EOF. */
2982 33aa809d 2019-08-08 stsp while (!feof(f2)) {
2983 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
2985 33aa809d 2019-08-08 stsp goto done;
2986 33aa809d 2019-08-08 stsp (*line_cur2)++;
2991 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
2995 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
2996 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
2997 33aa809d 2019-08-08 stsp return err;
3000 1f1abb7e 2019-08-08 stsp struct revert_file_args {
3001 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
3002 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
3003 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
3004 1f1abb7e 2019-08-08 stsp void *progress_arg;
3005 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
3006 33aa809d 2019-08-08 stsp void *patch_arg;
3007 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
3010 e20a8b6f 2019-06-04 stsp static const struct got_error *
3011 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
3012 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
3013 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
3014 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
3016 33aa809d 2019-08-08 stsp const struct got_error *err;
3017 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
3018 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
3019 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
3020 33aa809d 2019-08-08 stsp struct stat sb1, sb2;
3021 33aa809d 2019-08-08 stsp struct got_diff_changes *changes = NULL;
3022 33aa809d 2019-08-08 stsp struct got_diff_state *ds = NULL;
3023 33aa809d 2019-08-08 stsp struct got_diff_args *args = NULL;
3024 33aa809d 2019-08-08 stsp struct got_diff_change *change;
3025 33aa809d 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, have_content = 0;
3026 33aa809d 2019-08-08 stsp int n = 0;
3028 33aa809d 2019-08-08 stsp *path_outfile = NULL;
3030 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
3032 33aa809d 2019-08-08 stsp return err;
3034 33aa809d 2019-08-08 stsp f2 = fopen(path2, "r");
3035 33aa809d 2019-08-08 stsp if (f2 == NULL) {
3036 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fopen", path2);
3037 33aa809d 2019-08-08 stsp goto done;
3040 33aa809d 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
3042 33aa809d 2019-08-08 stsp goto done;
3044 e635744c 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob");
3046 33aa809d 2019-08-08 stsp goto done;
3048 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
3050 33aa809d 2019-08-08 stsp goto done;
3052 33aa809d 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
3053 33aa809d 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
3054 33aa809d 2019-08-08 stsp goto done;
3056 33aa809d 2019-08-08 stsp if (stat(path2, &sb2) == -1) {
3057 33aa809d 2019-08-08 stsp err = got_error_from_errno2("stat", path2);
3058 33aa809d 2019-08-08 stsp goto done;
3061 33aa809d 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
3062 33aa809d 2019-08-08 stsp f1, sb1.st_size, id_str, f2, sb2.st_size, path2, 3, NULL);
3064 33aa809d 2019-08-08 stsp goto done;
3066 e635744c 2019-08-08 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
3068 33aa809d 2019-08-08 stsp goto done;
3070 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
3071 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
3072 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
3073 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
3074 33aa809d 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
3075 33aa809d 2019-08-08 stsp int choice;
3076 33aa809d 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
3077 33aa809d 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
3078 33aa809d 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
3079 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
3080 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
3081 e635744c 2019-08-08 stsp patch_cb, patch_arg);
3083 33aa809d 2019-08-08 stsp goto done;
3084 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
3085 33aa809d 2019-08-08 stsp have_content = 1;
3086 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
3090 33aa809d 2019-08-08 stsp free(id_str);
3092 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
3093 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
3094 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
3095 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
3096 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
3097 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
3098 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
3099 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
3100 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
3101 33aa809d 2019-08-08 stsp if (err || !have_content) {
3102 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
3103 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
3104 33aa809d 2019-08-08 stsp free(*path_outfile);
3105 33aa809d 2019-08-08 stsp *path_outfile = NULL;
3107 33aa809d 2019-08-08 stsp free(args);
3109 33aa809d 2019-08-08 stsp got_diff_state_free(ds);
3112 33aa809d 2019-08-08 stsp if (changes)
3113 33aa809d 2019-08-08 stsp got_diff_free_changes(changes);
3114 33aa809d 2019-08-08 stsp free(path1);
3115 33aa809d 2019-08-08 stsp return err;
3118 33aa809d 2019-08-08 stsp static const struct got_error *
3119 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
3120 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
3121 1f1abb7e 2019-08-08 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
3123 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
3124 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
3125 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
3126 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
3127 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
3128 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
3129 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
3130 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
3131 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
3132 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
3134 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
3135 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
3136 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
3137 d3bcc3d1 2019-08-08 stsp return NULL;
3139 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3140 65084dad 2019-08-08 stsp if (ie == NULL)
3141 65084dad 2019-08-08 stsp return got_error(GOT_ERR_BAD_PATH);
3143 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
3144 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
3145 a129376b 2019-03-28 stsp if (err) {
3146 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
3147 a129376b 2019-03-28 stsp goto done;
3148 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
3149 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
3150 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
3151 e20a8b6f 2019-06-04 stsp goto done;
3154 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
3155 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
3156 a129376b 2019-03-28 stsp if (tree_path == NULL) {
3157 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3158 a129376b 2019-03-28 stsp goto done;
3161 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
3162 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
3163 a129376b 2019-03-28 stsp if (tree_path == NULL) {
3164 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3165 a129376b 2019-03-28 stsp goto done;
3168 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
3169 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
3170 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3171 a129376b 2019-03-28 stsp goto done;
3176 1f1abb7e 2019-08-08 stsp err = got_object_id_by_path(&tree_id, a->repo,
3177 1f1abb7e 2019-08-08 stsp a->worktree->base_commit_id, tree_path);
3178 a9fa2909 2019-07-27 stsp if (err) {
3179 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
3180 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
3181 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
3182 a9fa2909 2019-07-27 stsp goto done;
3184 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
3186 a9fa2909 2019-07-27 stsp goto done;
3188 a9fa2909 2019-07-27 stsp te_name = basename(ie->path);
3189 a9fa2909 2019-07-27 stsp if (te_name == NULL) {
3190 a9fa2909 2019-07-27 stsp err = got_error_from_errno2("basename", ie->path);
3191 a9fa2909 2019-07-27 stsp goto done;
3194 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
3195 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
3196 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
3197 a9fa2909 2019-07-27 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
3198 a9fa2909 2019-07-27 stsp goto done;
3202 a129376b 2019-03-28 stsp switch (status) {
3203 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
3204 33aa809d 2019-08-08 stsp if (a->patch_cb) {
3205 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
3206 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
3207 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
3209 33aa809d 2019-08-08 stsp goto done;
3210 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
3213 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
3214 1f1abb7e 2019-08-08 stsp ie->path);
3216 1ee397ad 2019-07-12 stsp goto done;
3217 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
3219 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
3220 33aa809d 2019-08-08 stsp if (a->patch_cb) {
3221 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
3222 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
3223 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
3225 33aa809d 2019-08-08 stsp goto done;
3226 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
3229 33aa809d 2019-08-08 stsp /* fall through */
3230 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
3231 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
3232 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
3233 e20a8b6f 2019-06-04 stsp struct got_object_id id;
3234 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3235 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3236 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1,
3237 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3239 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1,
3240 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3241 1f1abb7e 2019-08-08 stsp err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
3243 65084dad 2019-08-08 stsp goto done;
3245 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
3246 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
3247 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
3248 a129376b 2019-03-28 stsp goto done;
3251 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
3252 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
3253 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
3254 33aa809d 2019-08-08 stsp ondisk_path, ie->path, a->repo,
3255 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
3256 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
3258 33aa809d 2019-08-08 stsp if (rename(path_content, ondisk_path) == -1) {
3259 33aa809d 2019-08-08 stsp err = got_error_from_errno3("rename",
3260 33aa809d 2019-08-08 stsp path_content, ondisk_path);
3261 33aa809d 2019-08-08 stsp goto done;
3264 33aa809d 2019-08-08 stsp err = install_blob(a->worktree, ondisk_path, ie->path,
3265 33aa809d 2019-08-08 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
3266 33aa809d 2019-08-08 stsp got_fileindex_perms_to_st(ie), blob, 0, 1,
3267 33aa809d 2019-08-08 stsp a->repo, a->progress_cb, a->progress_arg);
3269 a129376b 2019-03-28 stsp goto done;
3270 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_DELETE) {
3271 33aa809d 2019-08-08 stsp err = update_blob_fileindex_entry(a->worktree,
3272 33aa809d 2019-08-08 stsp a->fileindex, ie, ondisk_path, ie->path,
3275 33aa809d 2019-08-08 stsp goto done;
3284 1f1abb7e 2019-08-08 stsp free(ondisk_path);
3285 33aa809d 2019-08-08 stsp free(path_content);
3286 e20a8b6f 2019-06-04 stsp free(parent_path);
3287 a129376b 2019-03-28 stsp free(tree_path);
3289 a129376b 2019-03-28 stsp got_object_blob_close(blob);
3291 a129376b 2019-03-28 stsp got_object_tree_close(tree);
3292 a129376b 2019-03-28 stsp free(tree_id);
3293 e20a8b6f 2019-06-04 stsp return err;
3296 e20a8b6f 2019-06-04 stsp const struct got_error *
3297 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
3298 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
3299 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3300 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
3301 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
3303 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
3304 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
3305 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
3306 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
3307 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
3308 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
3310 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
3312 e20a8b6f 2019-06-04 stsp return err;
3314 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3316 e20a8b6f 2019-06-04 stsp goto done;
3318 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
3319 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
3320 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
3321 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
3322 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
3323 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
3324 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
3325 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
3326 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3327 1f1abb7e 2019-08-08 stsp revert_file, &rfa, NULL, NULL);
3331 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3332 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
3333 e20a8b6f 2019-06-04 stsp err = sync_err;
3335 fb399478 2019-07-12 stsp free(fileindex_path);
3336 a129376b 2019-03-28 stsp if (fileindex)
3337 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
3338 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3339 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
3340 a129376b 2019-03-28 stsp err = unlockerr;
3341 c4296144 2019-05-09 stsp return err;
3344 cf066bf8 2019-05-09 stsp static void
3345 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
3347 24519714 2019-05-09 stsp free(ct->path);
3348 44d03001 2019-05-09 stsp free(ct->in_repo_path);
3349 768aea60 2019-05-09 stsp free(ct->ondisk_path);
3350 e75eb4da 2019-05-10 stsp free(ct->blob_id);
3351 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
3352 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
3353 b416585c 2019-05-13 stsp free(ct->base_commit_id);
3357 ed175427 2019-05-09 stsp struct collect_commitables_arg {
3358 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
3359 24519714 2019-05-09 stsp struct got_repository *repo;
3360 24519714 2019-05-09 stsp struct got_worktree *worktree;
3361 5f8a88c6 2019-08-03 stsp int have_staged_files;
3364 c4296144 2019-05-09 stsp static const struct got_error *
3365 88d0e355 2019-08-03 stsp collect_commitables(void *arg, unsigned char status,
3366 88d0e355 2019-08-03 stsp unsigned char staged_status, const char *relpath,
3367 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3368 537ac44b 2019-08-03 stsp struct got_object_id *commit_id)
3370 ed175427 2019-05-09 stsp struct collect_commitables_arg *a = arg;
3371 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
3372 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
3373 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
3374 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
3375 768aea60 2019-05-09 stsp struct stat sb;
3377 5f8a88c6 2019-08-03 stsp if (a->have_staged_files) {
3378 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
3379 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
3380 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
3381 5f8a88c6 2019-08-03 stsp return NULL;
3383 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
3384 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
3386 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
3387 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
3388 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
3389 5f8a88c6 2019-08-03 stsp return NULL;
3392 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
3393 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3394 036813ee 2019-05-09 stsp goto done;
3396 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
3397 036813ee 2019-05-09 stsp parent_path = strdup("");
3398 69960a46 2019-05-09 stsp if (parent_path == NULL)
3399 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
3401 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
3403 69960a46 2019-05-09 stsp return err;
3406 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
3407 cf066bf8 2019-05-09 stsp if (ct == NULL) {
3408 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
3409 c4296144 2019-05-09 stsp goto done;
3412 768aea60 2019-05-09 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
3413 768aea60 2019-05-09 stsp relpath) == -1) {
3414 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3415 768aea60 2019-05-09 stsp goto done;
3417 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_DELETE || staged_status == GOT_STATUS_DELETE) {
3418 768aea60 2019-05-09 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
3420 768aea60 2019-05-09 stsp if (lstat(ct->ondisk_path, &sb) != 0) {
3421 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
3422 768aea60 2019-05-09 stsp goto done;
3424 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
3427 44d03001 2019-05-09 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
3428 44d03001 2019-05-09 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
3429 44d03001 2019-05-09 stsp relpath) == -1) {
3430 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3431 44d03001 2019-05-09 stsp goto done;
3434 cf066bf8 2019-05-09 stsp ct->status = status;
3435 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
3436 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
3437 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
3438 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
3439 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
3440 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
3441 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3442 b416585c 2019-05-13 stsp goto done;
3444 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
3445 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
3446 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
3447 f0b75401 2019-08-03 stsp goto done;
3450 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
3451 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
3452 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
3453 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
3454 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3455 036813ee 2019-05-09 stsp goto done;
3458 24519714 2019-05-09 stsp ct->path = strdup(path);
3459 24519714 2019-05-09 stsp if (ct->path == NULL) {
3460 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3461 24519714 2019-05-09 stsp goto done;
3463 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
3465 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
3466 ed175427 2019-05-09 stsp free_commitable(ct);
3467 24519714 2019-05-09 stsp free(parent_path);
3468 036813ee 2019-05-09 stsp free(path);
3469 a129376b 2019-03-28 stsp return err;
3472 036813ee 2019-05-09 stsp static const struct got_error *write_tree(struct got_object_id **,
3473 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
3474 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3475 036813ee 2019-05-09 stsp struct got_repository *);
3477 ed175427 2019-05-09 stsp static const struct got_error *
3478 036813ee 2019-05-09 stsp write_subtree(struct got_object_id **new_subtree_id,
3479 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
3480 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
3481 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3482 afa376bf 2019-05-09 stsp struct got_repository *repo)
3484 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
3485 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
3486 036813ee 2019-05-09 stsp char *subpath;
3488 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
3489 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
3490 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3492 036813ee 2019-05-09 stsp err = got_object_open_as_tree(&subtree, repo, te->id);
3494 ed175427 2019-05-09 stsp return err;
3496 036813ee 2019-05-09 stsp err = write_tree(new_subtree_id, subtree, subpath, commitable_paths,
3497 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
3498 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
3499 036813ee 2019-05-09 stsp free(subpath);
3500 036813ee 2019-05-09 stsp return err;
3503 036813ee 2019-05-09 stsp static const struct got_error *
3504 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
3506 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3507 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
3509 036813ee 2019-05-09 stsp *match = 0;
3511 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
3512 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
3513 0f63689d 2019-05-10 stsp return NULL;
3516 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
3518 0f63689d 2019-05-10 stsp return err;
3519 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
3520 036813ee 2019-05-09 stsp free(ct_parent_path);
3521 036813ee 2019-05-09 stsp return err;
3524 768aea60 2019-05-09 stsp static mode_t
3525 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
3527 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
3530 036813ee 2019-05-09 stsp static const struct got_error *
3531 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
3532 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
3534 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3536 036813ee 2019-05-09 stsp *new_te = NULL;
3538 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
3540 036813ee 2019-05-09 stsp goto done;
3542 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
3544 036813ee 2019-05-09 stsp free((*new_te)->id);
3545 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
3546 5f8a88c6 2019-08-03 stsp (*new_te)->id = got_object_id_dup(ct->staged_blob_id);
3548 5f8a88c6 2019-08-03 stsp (*new_te)->id = got_object_id_dup(ct->blob_id);
3549 036813ee 2019-05-09 stsp if ((*new_te)->id == NULL) {
3550 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3551 036813ee 2019-05-09 stsp goto done;
3554 036813ee 2019-05-09 stsp if (err && *new_te) {
3555 036813ee 2019-05-09 stsp got_object_tree_entry_close(*new_te);
3556 036813ee 2019-05-09 stsp *new_te = NULL;
3558 036813ee 2019-05-09 stsp return err;
3561 036813ee 2019-05-09 stsp static const struct got_error *
3562 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
3563 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
3565 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3566 036813ee 2019-05-09 stsp char *ct_name;
3568 036813ee 2019-05-09 stsp *new_te = NULL;
3570 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
3571 036813ee 2019-05-09 stsp if (*new_te == NULL)
3572 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
3574 036813ee 2019-05-09 stsp ct_name = basename(ct->path);
3575 036813ee 2019-05-09 stsp if (ct_name == NULL) {
3576 638f9024 2019-05-13 stsp err = got_error_from_errno2("basename", ct->path);
3577 036813ee 2019-05-09 stsp goto done;
3579 036813ee 2019-05-09 stsp (*new_te)->name = strdup(ct_name);
3580 036813ee 2019-05-09 stsp if ((*new_te)->name == NULL) {
3581 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3582 036813ee 2019-05-09 stsp goto done;
3585 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
3587 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
3588 5f8a88c6 2019-08-03 stsp (*new_te)->id = got_object_id_dup(ct->staged_blob_id);
3590 5f8a88c6 2019-08-03 stsp (*new_te)->id = got_object_id_dup(ct->blob_id);
3591 036813ee 2019-05-09 stsp if ((*new_te)->id == NULL) {
3592 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3593 036813ee 2019-05-09 stsp goto done;
3596 036813ee 2019-05-09 stsp if (err && *new_te) {
3597 036813ee 2019-05-09 stsp got_object_tree_entry_close(*new_te);
3598 036813ee 2019-05-09 stsp *new_te = NULL;
3600 036813ee 2019-05-09 stsp return err;
3603 036813ee 2019-05-09 stsp static const struct got_error *
3604 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
3605 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
3607 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3608 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
3610 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
3612 036813ee 2019-05-09 stsp return err;
3613 036813ee 2019-05-09 stsp if (new_pe == NULL)
3614 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
3615 036813ee 2019-05-09 stsp return NULL;
3618 afa376bf 2019-05-09 stsp static const struct got_error *
3619 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
3620 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
3622 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
3623 5f8a88c6 2019-08-03 stsp unsigned char status;
3625 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
3626 afa376bf 2019-05-09 stsp ct_path++;
3628 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
3629 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
3631 5f8a88c6 2019-08-03 stsp status = ct->status;
3633 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
3634 537ac44b 2019-08-03 stsp ct_path, ct->blob_id, NULL, NULL);
3637 036813ee 2019-05-09 stsp static const struct got_error *
3638 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
3639 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
3641 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
3642 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
3643 44d03001 2019-05-09 stsp char *te_path;
3645 44d03001 2019-05-09 stsp *modified = 0;
3647 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
3648 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
3649 44d03001 2019-05-09 stsp te->name) == -1)
3650 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3652 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3653 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3654 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
3655 44d03001 2019-05-09 stsp strlen(te_path));
3656 44d03001 2019-05-09 stsp if (*modified)
3660 44d03001 2019-05-09 stsp free(te_path);
3661 44d03001 2019-05-09 stsp return err;
3664 44d03001 2019-05-09 stsp static const struct got_error *
3665 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
3666 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
3667 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
3669 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3670 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
3672 036813ee 2019-05-09 stsp *ctp = NULL;
3674 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3675 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3676 036813ee 2019-05-09 stsp char *ct_name = NULL;
3677 036813ee 2019-05-09 stsp int path_matches;
3679 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
3680 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
3681 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
3684 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
3685 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
3689 c4e12a88 2019-05-13 stsp if (got_object_id_cmp(ct->base_blob_id, te->id) != 0)
3692 036813ee 2019-05-09 stsp err = match_ct_parent_path(&path_matches, ct, base_tree_path);
3694 036813ee 2019-05-09 stsp return err;
3695 036813ee 2019-05-09 stsp if (!path_matches)
3698 036813ee 2019-05-09 stsp ct_name = basename(pe->path);
3699 036813ee 2019-05-09 stsp if (ct_name == NULL)
3700 638f9024 2019-05-13 stsp return got_error_from_errno2("basename", pe->path);
3702 036813ee 2019-05-09 stsp if (strcmp(te->name, ct_name) != 0)
3705 036813ee 2019-05-09 stsp *ctp = ct;
3709 2b496619 2019-07-10 stsp return err;
3712 2b496619 2019-07-10 stsp static const struct got_error *
3713 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
3714 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
3715 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
3716 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3717 2b496619 2019-07-10 stsp struct got_repository *repo)
3719 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
3720 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
3721 2b496619 2019-07-10 stsp char *subtree_path;
3723 2b496619 2019-07-10 stsp *new_tep = NULL;
3725 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
3726 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
3727 2b496619 2019-07-10 stsp child_path) == -1)
3728 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
3730 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
3731 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
3732 2b496619 2019-07-10 stsp new_te->name = strdup(child_path);
3733 2b496619 2019-07-10 stsp if (new_te->name == NULL) {
3734 2b496619 2019-07-10 stsp err = got_error_from_errno("strdup");
3735 2b496619 2019-07-10 stsp got_object_tree_entry_close(new_te);
3736 2b496619 2019-07-10 stsp goto done;
3738 2b496619 2019-07-10 stsp err = write_tree(&new_te->id, NULL, subtree_path,
3739 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
3740 2b496619 2019-07-10 stsp if (err) {
3741 2b496619 2019-07-10 stsp got_object_tree_entry_close(new_te);
3742 2b496619 2019-07-10 stsp goto done;
3745 2b496619 2019-07-10 stsp free(subtree_path);
3746 2b496619 2019-07-10 stsp if (err == NULL)
3747 2b496619 2019-07-10 stsp *new_tep = new_te;
3748 036813ee 2019-05-09 stsp return err;
3751 036813ee 2019-05-09 stsp static const struct got_error *
3752 036813ee 2019-05-09 stsp write_tree(struct got_object_id **new_tree_id,
3753 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
3754 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
3755 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3756 036813ee 2019-05-09 stsp struct got_repository *repo)
3758 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3759 036813ee 2019-05-09 stsp const struct got_tree_entries *base_entries = NULL;
3760 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
3761 036813ee 2019-05-09 stsp struct got_tree_entries new_tree_entries;
3762 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
3763 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
3765 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
3766 036813ee 2019-05-09 stsp new_tree_entries.nentries = 0;
3767 036813ee 2019-05-09 stsp SIMPLEQ_INIT(&new_tree_entries.head);
3769 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
3770 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3771 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3772 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
3774 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
3775 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
3776 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
3779 036813ee 2019-05-09 stsp if (!got_path_is_child(pe->path, path_base_tree,
3780 2f51b5b3 2019-05-09 stsp strlen(path_base_tree)))
3783 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
3784 036813ee 2019-05-09 stsp pe->path);
3786 036813ee 2019-05-09 stsp goto done;
3788 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
3789 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
3790 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
3792 036813ee 2019-05-09 stsp goto done;
3793 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
3795 afa376bf 2019-05-09 stsp goto done;
3796 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
3797 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
3799 2f51b5b3 2019-05-09 stsp goto done;
3801 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
3802 2b496619 2019-07-10 stsp if (base_tree == NULL ||
3803 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
3804 2b496619 2019-07-10 stsp == NULL) {
3805 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
3806 2b496619 2019-07-10 stsp child_path, path_base_tree,
3807 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
3810 2b496619 2019-07-10 stsp goto done;
3811 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
3813 2b496619 2019-07-10 stsp goto done;
3818 2f51b5b3 2019-05-09 stsp if (base_tree) {
3819 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
3820 2f51b5b3 2019-05-09 stsp base_entries = got_object_tree_get_entries(base_tree);
3821 2f51b5b3 2019-05-09 stsp SIMPLEQ_FOREACH(te, &base_entries->head, entry) {
3822 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
3824 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
3825 44d03001 2019-05-09 stsp int modified;
3826 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
3828 036813ee 2019-05-09 stsp goto done;
3829 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
3830 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
3832 2f51b5b3 2019-05-09 stsp goto done;
3833 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
3834 44d03001 2019-05-09 stsp if (modified) {
3835 44d03001 2019-05-09 stsp free(new_te->id);
3836 44d03001 2019-05-09 stsp err = write_subtree(&new_te->id, te,
3837 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
3838 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
3840 44d03001 2019-05-09 stsp goto done;
3842 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
3844 036813ee 2019-05-09 stsp goto done;
3848 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
3849 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
3851 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
3852 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
3853 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
3854 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
3855 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
3857 2f51b5b3 2019-05-09 stsp goto done;
3858 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
3860 2f51b5b3 2019-05-09 stsp goto done;
3862 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
3863 b416585c 2019-05-13 stsp status_arg);
3865 afa376bf 2019-05-09 stsp goto done;
3867 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
3868 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
3870 2f51b5b3 2019-05-09 stsp goto done;
3871 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
3873 2f51b5b3 2019-05-09 stsp goto done;
3878 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
3879 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, &paths, entry) {
3880 0b5cc0d6 2019-05-09 stsp struct got_tree_entry *te = pe->data;
3881 0b5cc0d6 2019-05-09 stsp new_tree_entries.nentries++;
3882 0b5cc0d6 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&new_tree_entries.head, te, entry);
3884 036813ee 2019-05-09 stsp err = got_object_tree_create(new_tree_id, &new_tree_entries, repo);
3886 ca2503ea 2019-05-09 stsp got_object_tree_entries_close(&new_tree_entries);
3887 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
3888 ed175427 2019-05-09 stsp return err;
3891 ebf99748 2019-05-09 stsp static const struct got_error *
3892 ebf99748 2019-05-09 stsp update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
3893 93ec1b5f 2019-07-12 stsp struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex)
3895 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
3896 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
3898 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3899 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
3900 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3902 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
3904 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
3905 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
3906 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
3907 ebf99748 2019-05-09 stsp got_fileindex_entry_free(ie);
3908 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
3909 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
3910 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
3911 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
3912 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
3913 5f8a88c6 2019-08-03 stsp ct->ondisk_path, ct->staged_blob_id->sha1,
3914 5f8a88c6 2019-08-03 stsp new_base_commit_id->sha1, 1);
3916 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
3917 e75eb4da 2019-05-10 stsp ct->ondisk_path, ct->blob_id->sha1,
3918 ebf99748 2019-05-09 stsp new_base_commit_id->sha1, 1);
3920 ebf99748 2019-05-09 stsp err = got_fileindex_entry_alloc(&ie,
3921 e75eb4da 2019-05-10 stsp ct->ondisk_path, pe->path, ct->blob_id->sha1,
3922 ebf99748 2019-05-09 stsp new_base_commit_id->sha1);
3925 ebf99748 2019-05-09 stsp err = got_fileindex_entry_add(fileindex, ie);
3930 d56d26ce 2019-05-10 stsp return err;
3934 d56d26ce 2019-05-10 stsp static const struct got_error *
3935 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
3936 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
3937 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
3938 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
3939 735ef5ac 2019-08-03 stsp int ood_errcode)
3941 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
3942 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
3944 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
3945 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
3946 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
3947 1a36436d 2019-06-10 stsp return NULL;
3949 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
3950 9bead371 2019-07-28 stsp * on matches file content in the branch head.
3952 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
3953 735ef5ac 2019-08-03 stsp in_repo_path);
3954 9bead371 2019-07-28 stsp if (err) {
3955 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
3956 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
3957 1a36436d 2019-06-10 stsp goto done;
3958 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
3959 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
3961 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
3962 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
3963 735ef5ac 2019-08-03 stsp in_repo_path);
3964 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3965 1a36436d 2019-06-10 stsp goto done;
3966 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
3970 1a36436d 2019-06-10 stsp return err;
3973 c4296144 2019-05-09 stsp const struct got_error *
3974 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
3975 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
3976 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id, struct got_worktree *worktree,
3977 5c1e53bc 2019-07-28 stsp const char *author, const char *committer,
3978 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
3979 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3980 afa376bf 2019-05-09 stsp struct got_repository *repo)
3982 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
3983 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
3984 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
3985 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
3986 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
3987 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
3988 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
3989 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
3990 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
3991 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
3992 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
3994 c4296144 2019-05-09 stsp *new_commit_id = NULL;
3996 de18fc63 2019-05-09 stsp SIMPLEQ_INIT(&parent_ids);
3998 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
4000 588edf97 2019-05-10 stsp goto done;
4002 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
4004 588edf97 2019-05-10 stsp goto done;
4006 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
4007 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
4012 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
4013 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
4017 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
4018 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4019 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4020 cf066bf8 2019-05-09 stsp char *ondisk_path;
4022 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
4023 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
4024 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
4027 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
4028 cf066bf8 2019-05-09 stsp ct->status != GOT_STATUS_MODIFY)
4031 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
4032 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
4033 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4034 cf066bf8 2019-05-09 stsp goto done;
4036 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
4037 a7055788 2019-05-09 stsp free(ondisk_path);
4039 cf066bf8 2019-05-09 stsp goto done;
4042 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
4043 39cd0ff6 2019-07-12 stsp err = write_tree(&new_tree_id, head_tree, "/", commitable_paths,
4044 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
4046 036813ee 2019-05-09 stsp goto done;
4048 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
4050 de18fc63 2019-05-09 stsp goto done;
4051 de18fc63 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
4052 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
4053 de18fc63 2019-05-09 stsp 1, author, time(NULL), committer, time(NULL), logmsg, repo);
4054 de18fc63 2019-05-09 stsp got_object_qid_free(pid);
4055 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
4056 33ad4cbe 2019-05-12 jcs free(logmsg);
4058 9d40349a 2019-05-09 stsp goto done;
4060 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
4061 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
4062 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
4063 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
4064 09f5bd90 2019-05-09 stsp goto done;
4066 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
4067 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
4069 09f5bd90 2019-05-09 stsp goto done;
4070 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
4072 ebf99748 2019-05-09 stsp goto done;
4073 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
4074 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
4075 09f5bd90 2019-05-09 stsp goto done;
4077 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
4078 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
4080 f2c16586 2019-05-09 stsp goto done;
4081 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
4083 f2c16586 2019-05-09 stsp goto done;
4085 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
4087 09f5bd90 2019-05-09 stsp goto done;
4089 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
4091 ebf99748 2019-05-09 stsp goto done;
4093 588edf97 2019-05-10 stsp if (head_tree)
4094 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
4095 588edf97 2019-05-10 stsp if (head_commit)
4096 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
4097 09f5bd90 2019-05-09 stsp free(head_commit_id2);
4098 2f17228e 2019-05-12 stsp if (head_ref2) {
4099 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
4100 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
4101 2f17228e 2019-05-12 stsp err = unlockerr;
4102 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
4104 39cd0ff6 2019-07-12 stsp return err;
4107 5c1e53bc 2019-07-28 stsp static const struct got_error *
4108 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
4109 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
4111 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
4112 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
4114 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
4115 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
4116 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
4118 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
4119 5c1e53bc 2019-07-28 stsp ct_path++;
4121 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
4122 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
4126 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
4127 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
4129 5c1e53bc 2019-07-28 stsp return NULL;
4132 f0b75401 2019-08-03 stsp static const struct got_error *
4133 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
4135 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
4137 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
4138 f0b75401 2019-08-03 stsp *have_staged_files = 1;
4139 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
4142 f0b75401 2019-08-03 stsp return NULL;
4145 5f8a88c6 2019-08-03 stsp static const struct got_error *
4146 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
4147 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
4149 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
4150 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
4152 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
4153 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
4155 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
4156 5f8a88c6 2019-08-03 stsp if (ie == NULL)
4157 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
4158 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
4159 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
4160 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
4163 5f8a88c6 2019-08-03 stsp return NULL;
4166 39cd0ff6 2019-07-12 stsp const struct got_error *
4167 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
4168 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
4169 39cd0ff6 2019-07-12 stsp const char *author, const char *committer,
4170 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
4171 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
4172 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
4174 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
4175 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
4176 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
4177 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
4178 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
4179 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
4180 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
4181 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
4182 f0b75401 2019-08-03 stsp int have_staged_files = 0;
4184 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
4186 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
4188 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
4190 39cd0ff6 2019-07-12 stsp goto done;
4192 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
4194 39cd0ff6 2019-07-12 stsp goto done;
4196 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
4198 39cd0ff6 2019-07-12 stsp goto done;
4200 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4202 39cd0ff6 2019-07-12 stsp goto done;
4204 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
4205 5f8a88c6 2019-08-03 stsp &have_staged_files);
4206 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
4207 5f8a88c6 2019-08-03 stsp goto done;
4208 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
4209 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
4211 5f8a88c6 2019-08-03 stsp goto done;
4214 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
4215 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
4216 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
4217 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
4218 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
4219 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4220 5c1e53bc 2019-07-28 stsp collect_commitables, &cc_arg, NULL, NULL);
4222 5c1e53bc 2019-07-28 stsp goto done;
4225 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
4226 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
4227 39cd0ff6 2019-07-12 stsp goto done;
4230 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
4231 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
4233 5c1e53bc 2019-07-28 stsp goto done;
4236 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
4237 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
4238 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
4240 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
4241 f0b75401 2019-08-03 stsp ct_path++;
4242 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
4243 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
4244 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
4246 b50cabdf 2019-07-12 stsp goto done;
4250 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
4251 5c1e53bc 2019-07-28 stsp head_commit_id, worktree, author, committer,
4252 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
4254 39cd0ff6 2019-07-12 stsp goto done;
4256 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
4257 93ec1b5f 2019-07-12 stsp fileindex);
4258 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4259 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
4260 39cd0ff6 2019-07-12 stsp err = sync_err;
4262 39cd0ff6 2019-07-12 stsp if (fileindex)
4263 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
4264 39cd0ff6 2019-07-12 stsp free(fileindex_path);
4265 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4266 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
4267 39cd0ff6 2019-07-12 stsp err = unlockerr;
4268 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
4269 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
4270 39cd0ff6 2019-07-12 stsp free_commitable(ct);
4272 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
4273 c4296144 2019-05-09 stsp return err;
4276 8656d6c4 2019-05-20 stsp const char *
4277 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
4279 8656d6c4 2019-05-20 stsp return ct->path;
4282 8656d6c4 2019-05-20 stsp unsigned int
4283 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
4285 8656d6c4 2019-05-20 stsp return ct->status;
4288 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
4289 818c7501 2019-07-11 stsp struct got_worktree *worktree;
4290 818c7501 2019-07-11 stsp struct got_repository *repo;
4293 818c7501 2019-07-11 stsp static const struct got_error *
4294 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
4296 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
4297 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
4298 818c7501 2019-07-11 stsp unsigned char status;
4299 818c7501 2019-07-11 stsp struct stat sb;
4300 818c7501 2019-07-11 stsp char *ondisk_path;
4302 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
4303 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
4304 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
4305 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
4307 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
4309 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
4311 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
4312 818c7501 2019-07-11 stsp err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
4313 818c7501 2019-07-11 stsp free(ondisk_path);
4315 818c7501 2019-07-11 stsp return err;
4317 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
4318 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
4319 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
4320 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
4322 818c7501 2019-07-11 stsp return NULL;
4325 818c7501 2019-07-11 stsp const struct got_error *
4326 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
4327 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
4328 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
4329 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
4331 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
4332 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
4333 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
4334 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
4335 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
4336 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
4338 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
4339 818c7501 2019-07-11 stsp *tmp_branch = NULL;
4340 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4342 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
4344 818c7501 2019-07-11 stsp return err;
4346 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
4348 818c7501 2019-07-11 stsp goto done;
4350 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
4351 818c7501 2019-07-11 stsp ok_arg.repo = repo;
4352 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
4355 818c7501 2019-07-11 stsp goto done;
4357 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4359 818c7501 2019-07-11 stsp goto done;
4361 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4363 818c7501 2019-07-11 stsp goto done;
4365 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4367 818c7501 2019-07-11 stsp goto done;
4369 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
4372 818c7501 2019-07-11 stsp goto done;
4374 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
4375 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
4377 818c7501 2019-07-11 stsp goto done;
4378 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
4380 818c7501 2019-07-11 stsp goto done;
4382 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
4384 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
4386 818c7501 2019-07-11 stsp goto done;
4388 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
4390 818c7501 2019-07-11 stsp goto done;
4392 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
4393 818c7501 2019-07-11 stsp worktree->base_commit_id);
4395 818c7501 2019-07-11 stsp goto done;
4396 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
4398 818c7501 2019-07-11 stsp goto done;
4400 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
4402 818c7501 2019-07-11 stsp goto done;
4404 818c7501 2019-07-11 stsp free(fileindex_path);
4405 818c7501 2019-07-11 stsp free(tmp_branch_name);
4406 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
4407 818c7501 2019-07-11 stsp free(branch_ref_name);
4408 818c7501 2019-07-11 stsp if (branch_ref)
4409 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
4410 818c7501 2019-07-11 stsp if (wt_branch)
4411 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
4412 818c7501 2019-07-11 stsp if (err) {
4413 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
4414 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
4415 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
4417 818c7501 2019-07-11 stsp if (*tmp_branch) {
4418 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
4419 818c7501 2019-07-11 stsp *tmp_branch = NULL;
4421 3e3a69f1 2019-07-25 stsp if (*fileindex) {
4422 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
4423 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4425 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
4427 818c7501 2019-07-11 stsp return err;
4430 818c7501 2019-07-11 stsp const struct got_error *
4431 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
4432 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
4433 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
4434 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
4436 818c7501 2019-07-11 stsp const struct got_error *err;
4437 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
4438 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
4439 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
4440 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
4441 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
4443 818c7501 2019-07-11 stsp *commit_id = NULL;
4444 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
4445 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
4446 3e3a69f1 2019-07-25 stsp *branch = NULL;
4447 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4449 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
4451 3e3a69f1 2019-07-25 stsp return err;
4453 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
4455 f032f1f7 2019-08-04 stsp goto done;
4457 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
4458 f032f1f7 2019-08-04 stsp &have_staged_files);
4459 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
4460 f032f1f7 2019-08-04 stsp goto done;
4461 f032f1f7 2019-08-04 stsp if (have_staged_files) {
4462 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
4463 3e3a69f1 2019-07-25 stsp goto done;
4466 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4468 f032f1f7 2019-08-04 stsp goto done;
4470 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4472 818c7501 2019-07-11 stsp goto done;
4474 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4476 818c7501 2019-07-11 stsp goto done;
4478 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4480 818c7501 2019-07-11 stsp goto done;
4482 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
4484 818c7501 2019-07-11 stsp goto done;
4486 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
4487 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
4489 818c7501 2019-07-11 stsp goto done;
4491 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4493 818c7501 2019-07-11 stsp goto done;
4495 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
4497 818c7501 2019-07-11 stsp goto done;
4499 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
4500 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
4502 818c7501 2019-07-11 stsp goto done;
4504 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
4506 818c7501 2019-07-11 stsp goto done;
4508 818c7501 2019-07-11 stsp free(commit_ref_name);
4509 818c7501 2019-07-11 stsp free(branch_ref_name);
4510 3e3a69f1 2019-07-25 stsp free(fileindex_path);
4511 818c7501 2019-07-11 stsp if (commit_ref)
4512 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
4513 818c7501 2019-07-11 stsp if (branch_ref)
4514 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
4515 818c7501 2019-07-11 stsp if (err) {
4516 818c7501 2019-07-11 stsp free(*commit_id);
4517 818c7501 2019-07-11 stsp *commit_id = NULL;
4518 818c7501 2019-07-11 stsp if (*tmp_branch) {
4519 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
4520 818c7501 2019-07-11 stsp *tmp_branch = NULL;
4522 818c7501 2019-07-11 stsp if (*new_base_branch) {
4523 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
4524 818c7501 2019-07-11 stsp *new_base_branch = NULL;
4526 818c7501 2019-07-11 stsp if (*branch) {
4527 818c7501 2019-07-11 stsp got_ref_close(*branch);
4528 818c7501 2019-07-11 stsp *branch = NULL;
4530 3e3a69f1 2019-07-25 stsp if (*fileindex) {
4531 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
4532 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4534 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
4536 818c7501 2019-07-11 stsp return err;
4539 818c7501 2019-07-11 stsp const struct got_error *
4540 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
4542 818c7501 2019-07-11 stsp const struct got_error *err;
4543 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
4545 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4547 818c7501 2019-07-11 stsp return err;
4549 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
4550 818c7501 2019-07-11 stsp free(tmp_branch_name);
4551 818c7501 2019-07-11 stsp return NULL;
4554 818c7501 2019-07-11 stsp static const struct got_error *
4555 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
4556 818c7501 2019-07-11 stsp char **logmsg, void *arg)
4558 0ebf8283 2019-07-24 stsp *logmsg = arg;
4559 818c7501 2019-07-11 stsp return NULL;
4562 818c7501 2019-07-11 stsp static const struct got_error *
4563 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
4564 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
4565 537ac44b 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
4567 818c7501 2019-07-11 stsp return NULL;
4570 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
4571 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
4572 01757395 2019-07-12 stsp void *progress_arg;
4573 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
4576 01757395 2019-07-12 stsp static const struct got_error *
4577 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
4579 01757395 2019-07-12 stsp const struct got_error *err;
4580 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
4582 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
4584 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
4586 01757395 2019-07-12 stsp return err;
4588 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
4589 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
4590 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
4591 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
4592 01757395 2019-07-12 stsp return NULL;
4594 01757395 2019-07-12 stsp p = strdup(path);
4595 01757395 2019-07-12 stsp if (p == NULL)
4596 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
4598 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
4599 01757395 2019-07-12 stsp if (err || new == NULL)
4601 01757395 2019-07-12 stsp return err;
4605 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
4607 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
4609 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
4610 01757395 2019-07-12 stsp free((char *)pe->path);
4612 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
4615 0ebf8283 2019-07-24 stsp static const struct got_error *
4616 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
4617 0ebf8283 2019-07-24 stsp struct got_repository *repo)
4619 818c7501 2019-07-11 stsp const struct got_error *err;
4620 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
4622 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4623 818c7501 2019-07-11 stsp if (err) {
4624 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
4625 818c7501 2019-07-11 stsp goto done;
4626 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
4628 818c7501 2019-07-11 stsp goto done;
4629 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
4631 818c7501 2019-07-11 stsp goto done;
4633 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
4636 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
4638 818c7501 2019-07-11 stsp goto done;
4639 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
4640 818c7501 2019-07-11 stsp free(stored_id);
4641 818c7501 2019-07-11 stsp if (cmp != 0) {
4642 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
4643 818c7501 2019-07-11 stsp goto done;
4647 0ebf8283 2019-07-24 stsp if (commit_ref)
4648 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
4649 0ebf8283 2019-07-24 stsp return err;
4652 0ebf8283 2019-07-24 stsp static const struct got_error *
4653 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
4654 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
4655 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
4656 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
4657 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4658 3e3a69f1 2019-07-25 stsp got_worktree_cancel_cb cancel_cb, void *cancel_arg)
4660 0ebf8283 2019-07-24 stsp const struct got_error *err;
4661 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
4662 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
4663 3e3a69f1 2019-07-25 stsp char *fileindex_path;
4665 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
4667 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
4669 0ebf8283 2019-07-24 stsp return err;
4671 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
4672 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
4673 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
4674 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
4675 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
4676 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
4677 818c7501 2019-07-11 stsp if (commit_ref)
4678 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
4679 818c7501 2019-07-11 stsp return err;
4682 818c7501 2019-07-11 stsp const struct got_error *
4683 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
4684 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
4685 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
4686 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
4687 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4688 0ebf8283 2019-07-24 stsp got_worktree_cancel_cb cancel_cb, void *cancel_arg)
4690 0ebf8283 2019-07-24 stsp const struct got_error *err;
4691 0ebf8283 2019-07-24 stsp char *commit_ref_name;
4693 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4695 0ebf8283 2019-07-24 stsp return err;
4697 0ebf8283 2019-07-24 stsp err = store_commit_id(commit_ref_name, commit_id, repo);
4699 0ebf8283 2019-07-24 stsp goto done;
4701 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
4702 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
4703 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
4705 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4706 0ebf8283 2019-07-24 stsp return err;
4709 0ebf8283 2019-07-24 stsp const struct got_error *
4710 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
4711 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
4712 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
4713 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
4714 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4715 0ebf8283 2019-07-24 stsp got_worktree_cancel_cb cancel_cb, void *cancel_arg)
4717 0ebf8283 2019-07-24 stsp const struct got_error *err;
4718 0ebf8283 2019-07-24 stsp char *commit_ref_name;
4720 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4722 0ebf8283 2019-07-24 stsp return err;
4724 0ebf8283 2019-07-24 stsp err = store_commit_id(commit_ref_name, commit_id, repo);
4726 0ebf8283 2019-07-24 stsp goto done;
4728 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
4729 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
4730 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
4732 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4733 0ebf8283 2019-07-24 stsp return err;
4736 0ebf8283 2019-07-24 stsp static const struct got_error *
4737 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
4738 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
4739 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
4740 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
4741 3e3a69f1 2019-07-25 stsp const char *new_logmsg, struct got_repository *repo)
4743 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
4744 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
4745 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
4746 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
4747 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
4748 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
4749 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
4751 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
4752 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
4754 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
4756 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
4758 3e3a69f1 2019-07-25 stsp return err;
4760 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
4761 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
4762 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
4763 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
4765 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
4766 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
4767 01757395 2019-07-12 stsp * TODO: Ideally, merged_paths would contain a list of commitables
4768 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
4770 01757395 2019-07-12 stsp if (merged_paths) {
4771 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
4772 8f8646e5 2019-07-25 stsp if (TAILQ_EMPTY(merged_paths)) {
4773 8f8646e5 2019-07-25 stsp err = got_error(GOT_ERR_NO_MERGED_PATHS);
4774 8f8646e5 2019-07-25 stsp goto done;
4776 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
4777 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
4778 01757395 2019-07-12 stsp repo, collect_commitables, &cc_arg, NULL, NULL);
4780 01757395 2019-07-12 stsp goto done;
4783 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
4784 01757395 2019-07-12 stsp collect_commitables, &cc_arg, NULL, NULL);
4786 01757395 2019-07-12 stsp goto done;
4789 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
4790 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
4791 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
4793 a0e95631 2019-07-12 stsp goto done;
4794 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
4795 a0e95631 2019-07-12 stsp goto done;
4798 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
4800 edd02c5e 2019-07-11 stsp goto done;
4802 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
4804 818c7501 2019-07-11 stsp goto done;
4806 0ebf8283 2019-07-24 stsp if (new_logmsg)
4807 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
4809 0ebf8283 2019-07-24 stsp logmsg = strdup(got_object_commit_get_logmsg(orig_commit));
4810 0ebf8283 2019-07-24 stsp if (logmsg == NULL)
4811 0ebf8283 2019-07-24 stsp return got_error_from_errno("strdup");
4813 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
4814 5c1e53bc 2019-07-28 stsp worktree, got_object_commit_get_author(orig_commit),
4815 a0e95631 2019-07-12 stsp got_object_commit_get_committer(orig_commit),
4816 0ebf8283 2019-07-24 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
4818 a0e95631 2019-07-12 stsp goto done;
4820 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
4822 a0e95631 2019-07-12 stsp goto done;
4824 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
4826 a0e95631 2019-07-12 stsp goto done;
4828 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
4829 93ec1b5f 2019-07-12 stsp fileindex);
4830 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4831 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
4832 a0e95631 2019-07-12 stsp err = sync_err;
4834 a0e95631 2019-07-12 stsp free(fileindex_path);
4835 a0e95631 2019-07-12 stsp free(head_commit_id);
4836 a0e95631 2019-07-12 stsp if (head_ref)
4837 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
4838 818c7501 2019-07-11 stsp if (err) {
4839 818c7501 2019-07-11 stsp free(*new_commit_id);
4840 818c7501 2019-07-11 stsp *new_commit_id = NULL;
4842 818c7501 2019-07-11 stsp return err;
4845 818c7501 2019-07-11 stsp const struct got_error *
4846 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
4847 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
4848 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4849 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
4850 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
4852 0ebf8283 2019-07-24 stsp const struct got_error *err;
4853 0ebf8283 2019-07-24 stsp char *commit_ref_name;
4854 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
4855 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
4857 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4859 0ebf8283 2019-07-24 stsp return err;
4861 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4863 0ebf8283 2019-07-24 stsp goto done;
4864 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
4866 0ebf8283 2019-07-24 stsp goto done;
4867 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
4868 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
4869 0ebf8283 2019-07-24 stsp goto done;
4872 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
4873 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
4875 0ebf8283 2019-07-24 stsp if (commit_ref)
4876 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
4877 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4878 0ebf8283 2019-07-24 stsp free(commit_id);
4879 0ebf8283 2019-07-24 stsp return err;
4882 0ebf8283 2019-07-24 stsp const struct got_error *
4883 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
4884 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
4885 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4886 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
4887 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
4888 0ebf8283 2019-07-24 stsp struct got_repository *repo)
4890 0ebf8283 2019-07-24 stsp const struct got_error *err;
4891 0ebf8283 2019-07-24 stsp char *commit_ref_name;
4892 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
4893 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
4895 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4897 0ebf8283 2019-07-24 stsp return err;
4899 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4901 0ebf8283 2019-07-24 stsp goto done;
4902 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
4904 0ebf8283 2019-07-24 stsp goto done;
4905 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
4906 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_COMMITID);
4907 0ebf8283 2019-07-24 stsp goto done;
4910 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
4911 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
4913 0ebf8283 2019-07-24 stsp if (commit_ref)
4914 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
4915 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4916 0ebf8283 2019-07-24 stsp free(commit_id);
4917 0ebf8283 2019-07-24 stsp return err;
4920 0ebf8283 2019-07-24 stsp const struct got_error *
4921 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
4922 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
4924 3e3a69f1 2019-07-25 stsp if (fileindex)
4925 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
4926 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
4929 69844fba 2019-07-11 stsp static const struct got_error *
4930 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
4932 69844fba 2019-07-11 stsp const struct got_error *err;
4933 69844fba 2019-07-11 stsp struct got_reference *ref;
4935 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
4936 69844fba 2019-07-11 stsp if (err) {
4937 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
4938 69844fba 2019-07-11 stsp return NULL;
4939 69844fba 2019-07-11 stsp return err;
4942 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
4943 69844fba 2019-07-11 stsp got_ref_close(ref);
4944 69844fba 2019-07-11 stsp return err;
4947 69844fba 2019-07-11 stsp static const struct got_error *
4948 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
4950 69844fba 2019-07-11 stsp const struct got_error *err;
4951 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
4952 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
4954 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4956 69844fba 2019-07-11 stsp goto done;
4957 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
4959 69844fba 2019-07-11 stsp goto done;
4961 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4963 69844fba 2019-07-11 stsp goto done;
4964 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
4966 69844fba 2019-07-11 stsp goto done;
4968 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4970 69844fba 2019-07-11 stsp goto done;
4971 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
4973 69844fba 2019-07-11 stsp goto done;
4975 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4977 69844fba 2019-07-11 stsp goto done;
4978 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
4980 69844fba 2019-07-11 stsp goto done;
4983 69844fba 2019-07-11 stsp free(tmp_branch_name);
4984 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
4985 69844fba 2019-07-11 stsp free(branch_ref_name);
4986 69844fba 2019-07-11 stsp free(commit_ref_name);
4987 69844fba 2019-07-11 stsp return err;
4990 818c7501 2019-07-11 stsp const struct got_error *
4991 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
4992 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
4993 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
4994 818c7501 2019-07-11 stsp struct got_repository *repo)
4996 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
4997 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
4999 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
5001 818c7501 2019-07-11 stsp return err;
5003 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
5005 818c7501 2019-07-11 stsp goto done;
5007 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
5009 818c7501 2019-07-11 stsp goto done;
5011 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
5013 818c7501 2019-07-11 stsp goto done;
5015 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
5017 3e3a69f1 2019-07-25 stsp if (fileindex)
5018 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5019 818c7501 2019-07-11 stsp free(new_head_commit_id);
5020 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5021 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
5022 818c7501 2019-07-11 stsp err = unlockerr;
5023 818c7501 2019-07-11 stsp return err;
5026 818c7501 2019-07-11 stsp const struct got_error *
5027 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
5028 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
5029 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
5030 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
5032 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
5033 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
5034 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
5035 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
5036 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
5037 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
5039 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
5041 818c7501 2019-07-11 stsp return err;
5043 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
5044 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
5046 818c7501 2019-07-11 stsp goto done;
5048 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
5050 818c7501 2019-07-11 stsp goto done;
5053 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
5054 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
5055 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
5057 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
5059 818c7501 2019-07-11 stsp goto done;
5061 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
5063 818c7501 2019-07-11 stsp goto done;
5065 ca355955 2019-07-12 stsp err = got_object_id_by_path(&tree_id, repo,
5066 ca355955 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
5068 ca355955 2019-07-12 stsp goto done;
5070 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
5072 ca355955 2019-07-12 stsp goto done;
5074 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5076 818c7501 2019-07-11 stsp goto done;
5078 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
5079 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
5080 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
5081 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
5082 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
5083 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
5084 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
5085 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
5086 1f1abb7e 2019-08-08 stsp revert_file, &rfa, NULL, NULL);
5088 1f1abb7e 2019-08-08 stsp goto sync;
5090 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
5091 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
5093 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5094 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
5095 ca355955 2019-07-12 stsp err = sync_err;
5097 818c7501 2019-07-11 stsp got_ref_close(resolved);
5098 a3a2faf2 2019-07-12 stsp free(tree_id);
5099 818c7501 2019-07-11 stsp free(commit_id);
5100 0ebf8283 2019-07-24 stsp if (fileindex)
5101 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
5102 0ebf8283 2019-07-24 stsp free(fileindex_path);
5104 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5105 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
5106 0ebf8283 2019-07-24 stsp err = unlockerr;
5107 0ebf8283 2019-07-24 stsp return err;
5110 0ebf8283 2019-07-24 stsp const struct got_error *
5111 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
5112 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
5113 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
5114 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
5116 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5117 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
5118 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
5119 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
5120 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
5121 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
5122 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
5123 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
5125 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5126 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
5127 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
5128 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5130 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
5132 0ebf8283 2019-07-24 stsp return err;
5134 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5136 0ebf8283 2019-07-24 stsp goto done;
5138 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
5139 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
5140 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5143 0ebf8283 2019-07-24 stsp goto done;
5145 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5147 0ebf8283 2019-07-24 stsp goto done;
5149 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5151 0ebf8283 2019-07-24 stsp goto done;
5153 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5154 0ebf8283 2019-07-24 stsp worktree);
5156 0ebf8283 2019-07-24 stsp goto done;
5158 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5161 0ebf8283 2019-07-24 stsp goto done;
5163 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
5165 0ebf8283 2019-07-24 stsp goto done;
5167 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
5169 0ebf8283 2019-07-24 stsp goto done;
5171 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
5172 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
5174 0ebf8283 2019-07-24 stsp goto done;
5175 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
5177 0ebf8283 2019-07-24 stsp goto done;
5178 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
5179 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
5180 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
5181 0ebf8283 2019-07-24 stsp goto done;
5184 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
5185 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
5187 0ebf8283 2019-07-24 stsp goto done;
5188 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
5190 0ebf8283 2019-07-24 stsp goto done;
5192 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
5194 0ebf8283 2019-07-24 stsp goto done;
5196 0ebf8283 2019-07-24 stsp free(fileindex_path);
5197 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
5198 0ebf8283 2019-07-24 stsp free(branch_ref_name);
5199 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
5200 0ebf8283 2019-07-24 stsp if (wt_branch)
5201 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
5202 0ebf8283 2019-07-24 stsp if (err) {
5203 0ebf8283 2019-07-24 stsp if (*branch_ref) {
5204 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
5205 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
5207 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
5208 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
5209 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5211 0ebf8283 2019-07-24 stsp free(*base_commit_id);
5212 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5213 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5214 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5216 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
5218 0ebf8283 2019-07-24 stsp return err;
5221 0ebf8283 2019-07-24 stsp const struct got_error *
5222 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
5223 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
5225 3e3a69f1 2019-07-25 stsp if (fileindex)
5226 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5227 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
5230 0ebf8283 2019-07-24 stsp const struct got_error *
5231 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
5232 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
5234 0ebf8283 2019-07-24 stsp const struct got_error *err;
5235 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
5237 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5239 0ebf8283 2019-07-24 stsp return err;
5241 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
5242 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
5243 0ebf8283 2019-07-24 stsp return NULL;
5246 0ebf8283 2019-07-24 stsp const struct got_error *
5247 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
5248 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
5249 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
5250 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
5252 0ebf8283 2019-07-24 stsp const struct got_error *err;
5253 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
5254 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
5255 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
5256 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
5257 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
5258 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
5260 0ebf8283 2019-07-24 stsp *commit_id = NULL;
5261 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5262 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
5263 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5265 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
5267 3e3a69f1 2019-07-25 stsp return err;
5269 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5271 f032f1f7 2019-08-04 stsp goto done;
5273 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
5274 f032f1f7 2019-08-04 stsp &have_staged_files);
5275 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
5276 f032f1f7 2019-08-04 stsp goto done;
5277 f032f1f7 2019-08-04 stsp if (have_staged_files) {
5278 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
5279 3e3a69f1 2019-07-25 stsp goto done;
5282 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5284 f032f1f7 2019-08-04 stsp goto done;
5286 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5288 0ebf8283 2019-07-24 stsp goto done;
5290 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5292 0ebf8283 2019-07-24 stsp goto done;
5294 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5295 0ebf8283 2019-07-24 stsp worktree);
5297 0ebf8283 2019-07-24 stsp goto done;
5299 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
5301 0ebf8283 2019-07-24 stsp goto done;
5303 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5305 0ebf8283 2019-07-24 stsp goto done;
5306 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
5308 0ebf8283 2019-07-24 stsp goto done;
5310 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
5312 0ebf8283 2019-07-24 stsp goto done;
5313 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
5315 0ebf8283 2019-07-24 stsp goto done;
5317 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
5319 0ebf8283 2019-07-24 stsp goto done;
5321 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5322 0ebf8283 2019-07-24 stsp free(branch_ref_name);
5323 3e3a69f1 2019-07-25 stsp free(fileindex_path);
5324 0ebf8283 2019-07-24 stsp if (commit_ref)
5325 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
5326 0ebf8283 2019-07-24 stsp if (base_commit_ref)
5327 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
5328 0ebf8283 2019-07-24 stsp if (err) {
5329 0ebf8283 2019-07-24 stsp free(*commit_id);
5330 0ebf8283 2019-07-24 stsp *commit_id = NULL;
5331 0ebf8283 2019-07-24 stsp free(*base_commit_id);
5332 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
5333 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
5334 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
5335 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5337 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5338 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5339 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5341 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
5343 0ebf8283 2019-07-24 stsp return err;
5346 0ebf8283 2019-07-24 stsp static const struct got_error *
5347 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
5349 0ebf8283 2019-07-24 stsp const struct got_error *err;
5350 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
5351 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
5353 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5355 0ebf8283 2019-07-24 stsp goto done;
5356 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
5358 0ebf8283 2019-07-24 stsp goto done;
5360 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5361 0ebf8283 2019-07-24 stsp worktree);
5363 0ebf8283 2019-07-24 stsp goto done;
5364 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
5366 0ebf8283 2019-07-24 stsp goto done;
5368 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5370 0ebf8283 2019-07-24 stsp goto done;
5371 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
5373 0ebf8283 2019-07-24 stsp goto done;
5375 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5377 0ebf8283 2019-07-24 stsp goto done;
5378 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
5380 0ebf8283 2019-07-24 stsp goto done;
5382 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
5383 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
5384 0ebf8283 2019-07-24 stsp free(branch_ref_name);
5385 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5386 0ebf8283 2019-07-24 stsp return err;
5389 0ebf8283 2019-07-24 stsp const struct got_error *
5390 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
5391 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
5392 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
5393 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
5395 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
5396 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
5397 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
5398 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
5399 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
5401 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
5403 0ebf8283 2019-07-24 stsp return err;
5405 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
5406 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
5408 0ebf8283 2019-07-24 stsp goto done;
5410 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
5412 0ebf8283 2019-07-24 stsp goto done;
5414 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
5416 0ebf8283 2019-07-24 stsp goto done;
5418 0ebf8283 2019-07-24 stsp err = got_object_id_by_path(&tree_id, repo, base_commit_id,
5419 0ebf8283 2019-07-24 stsp worktree->path_prefix);
5421 0ebf8283 2019-07-24 stsp goto done;
5423 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
5425 0ebf8283 2019-07-24 stsp goto done;
5427 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5429 0ebf8283 2019-07-24 stsp goto done;
5431 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
5432 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
5433 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
5434 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
5435 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
5436 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
5437 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
5438 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
5439 1f1abb7e 2019-08-08 stsp revert_file, &rfa, NULL, NULL);
5441 1f1abb7e 2019-08-08 stsp goto sync;
5443 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
5444 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
5446 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5447 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
5448 0ebf8283 2019-07-24 stsp err = sync_err;
5450 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
5451 0ebf8283 2019-07-24 stsp free(tree_id);
5452 818c7501 2019-07-11 stsp free(fileindex_path);
5454 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5455 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
5456 818c7501 2019-07-11 stsp err = unlockerr;
5457 818c7501 2019-07-11 stsp return err;
5460 0ebf8283 2019-07-24 stsp const struct got_error *
5461 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
5462 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5463 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
5465 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr;
5466 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
5467 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
5469 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
5471 0ebf8283 2019-07-24 stsp return err;
5473 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
5474 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
5476 0ebf8283 2019-07-24 stsp goto done;
5478 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
5480 0ebf8283 2019-07-24 stsp goto done;
5482 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
5484 0ebf8283 2019-07-24 stsp goto done;
5486 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
5488 0ebf8283 2019-07-24 stsp goto done;
5490 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
5492 3e3a69f1 2019-07-25 stsp if (fileindex)
5493 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5494 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
5495 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5496 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
5497 0ebf8283 2019-07-24 stsp err = unlockerr;
5498 0ebf8283 2019-07-24 stsp return err;
5501 0ebf8283 2019-07-24 stsp const struct got_error *
5502 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
5503 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
5505 0ebf8283 2019-07-24 stsp const struct got_error *err;
5506 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5508 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5510 0ebf8283 2019-07-24 stsp return err;
5512 0ebf8283 2019-07-24 stsp err = store_commit_id(commit_ref_name, commit_id, repo);
5514 0ebf8283 2019-07-24 stsp goto done;
5516 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
5518 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5519 0cb83759 2019-08-03 stsp return err;
5522 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
5523 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
5524 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
5525 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
5526 2db2652d 2019-08-07 stsp struct got_repository *repo;
5527 2db2652d 2019-08-07 stsp int have_changes;
5530 2db2652d 2019-08-07 stsp const struct got_error *
5531 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
5532 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
5533 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5534 2db2652d 2019-08-07 stsp struct got_object_id *commit_id)
5536 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
5537 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
5538 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
5539 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
5540 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
5541 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
5543 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
5544 8b13ce36 2019-08-08 stsp return NULL;
5546 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
5547 735ef5ac 2019-08-03 stsp if (ie == NULL)
5548 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
5550 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
5551 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
5552 735ef5ac 2019-08-03 stsp relpath) == -1)
5553 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
5555 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
5556 735ef5ac 2019-08-03 stsp memcpy(base_commit_id.sha1, ie->commit_sha1,
5557 735ef5ac 2019-08-03 stsp SHA1_DIGEST_LENGTH);
5558 735ef5ac 2019-08-03 stsp base_commit_idp = &base_commit_id;
5561 3aa5969e 2019-08-06 stsp if (status == GOT_STATUS_NO_CHANGE) {
5562 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_NO_CHANGE);
5563 3aa5969e 2019-08-06 stsp goto done;
5564 3aa5969e 2019-08-06 stsp } else if (status == GOT_STATUS_CONFLICT) {
5565 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
5566 3aa5969e 2019-08-06 stsp goto done;
5567 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
5568 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
5569 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
5570 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
5571 735ef5ac 2019-08-03 stsp goto done;
5574 2db2652d 2019-08-07 stsp a->have_changes = 1;
5576 735ef5ac 2019-08-03 stsp p = in_repo_path;
5577 735ef5ac 2019-08-03 stsp while (p[0] == '/')
5579 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
5580 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
5581 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
5583 735ef5ac 2019-08-03 stsp free(in_repo_path);
5584 dc424a06 2019-08-07 stsp return err;
5587 2db2652d 2019-08-07 stsp struct stage_path_arg {
5588 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
5589 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
5590 2db2652d 2019-08-07 stsp struct got_repository *repo;
5591 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
5592 2db2652d 2019-08-07 stsp void *status_arg;
5593 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
5594 2db2652d 2019-08-07 stsp void *patch_arg;
5597 2db2652d 2019-08-07 stsp static const struct got_error *
5598 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
5599 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
5600 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5601 2db2652d 2019-08-07 stsp struct got_object_id *commit_id)
5603 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
5604 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
5605 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
5606 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
5607 0cb83759 2019-08-03 stsp uint32_t stage;
5608 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
5610 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
5611 8b13ce36 2019-08-08 stsp return NULL;
5613 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
5614 d3e7c587 2019-08-03 stsp if (ie == NULL)
5615 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
5617 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
5618 2db2652d 2019-08-07 stsp relpath)== -1)
5619 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
5621 0cb83759 2019-08-03 stsp switch (status) {
5622 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
5623 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
5624 2db2652d 2019-08-07 stsp if (a->patch_cb) {
5625 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
5626 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
5627 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
5628 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
5631 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
5634 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
5635 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
5636 af5a81b2 2019-08-08 stsp ondisk_path, ie->path, a->repo,
5637 2db2652d 2019-08-07 stsp a->patch_cb, a->patch_arg);
5638 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
5642 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
5643 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
5646 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
5647 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
5648 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
5649 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
5651 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
5652 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
5653 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
5655 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
5656 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
5657 af5a81b2 2019-08-08 stsp new_staged_blob_id, NULL);
5659 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
5660 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
5662 2db2652d 2019-08-07 stsp if (a->patch_cb) {
5663 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
5664 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
5665 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
5668 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
5670 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
5671 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
5675 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
5676 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
5677 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
5679 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
5680 537ac44b 2019-08-03 stsp get_staged_status(ie), relpath, NULL, NULL, NULL);
5682 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
5683 d3e7c587 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_NO_CHANGE);
5685 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
5686 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
5689 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
5693 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
5694 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
5695 dc424a06 2019-08-07 stsp free(path_content);
5696 2db2652d 2019-08-07 stsp free(ondisk_path);
5697 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
5698 0ebf8283 2019-07-24 stsp return err;
5701 0cb83759 2019-08-03 stsp const struct got_error *
5702 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
5703 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
5704 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
5705 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
5706 1e71573e 2019-08-03 stsp struct got_repository *repo)
5708 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
5709 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
5710 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
5711 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
5712 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
5713 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
5714 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
5715 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
5717 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
5719 0cb83759 2019-08-03 stsp return err;
5721 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
5722 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
5724 735ef5ac 2019-08-03 stsp goto done;
5725 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
5727 735ef5ac 2019-08-03 stsp goto done;
5728 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
5730 0cb83759 2019-08-03 stsp goto done;
5732 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
5733 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
5734 2db2652d 2019-08-07 stsp oka.worktree = worktree;
5735 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
5736 2db2652d 2019-08-07 stsp oka.repo = repo;
5737 2db2652d 2019-08-07 stsp oka.have_changes = 0;
5738 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
5739 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
5740 2db2652d 2019-08-07 stsp check_stage_ok, &oka, NULL, NULL);
5742 735ef5ac 2019-08-03 stsp goto done;
5744 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
5745 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
5746 2db2652d 2019-08-07 stsp goto done;
5749 2db2652d 2019-08-07 stsp spa.worktree = worktree;
5750 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
5751 2db2652d 2019-08-07 stsp spa.repo = repo;
5752 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
5753 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
5754 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
5755 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
5756 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
5757 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
5758 2db2652d 2019-08-07 stsp stage_path, &spa, NULL, NULL);
5760 2db2652d 2019-08-07 stsp goto done;
5763 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5764 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
5765 0cb83759 2019-08-03 stsp err = sync_err;
5767 735ef5ac 2019-08-03 stsp if (head_ref)
5768 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
5769 735ef5ac 2019-08-03 stsp free(head_commit_id);
5770 0cb83759 2019-08-03 stsp free(fileindex_path);
5771 0cb83759 2019-08-03 stsp if (fileindex)
5772 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
5773 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5774 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
5775 0cb83759 2019-08-03 stsp err = unlockerr;
5776 0cb83759 2019-08-03 stsp return err;
5779 ad493afc 2019-08-03 stsp struct unstage_path_arg {
5780 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
5781 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
5782 ad493afc 2019-08-03 stsp struct got_repository *repo;
5783 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
5784 ad493afc 2019-08-03 stsp void *progress_arg;
5785 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
5786 2e1f37b0 2019-08-08 stsp void *patch_arg;
5789 2e1f37b0 2019-08-08 stsp static const struct got_error *
5790 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
5791 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
5792 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
5793 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
5794 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
5796 2e1f37b0 2019-08-08 stsp const struct got_error *err;
5797 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
5798 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
5799 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
5800 2e1f37b0 2019-08-08 stsp struct stat sb1, sb2;
5801 2e1f37b0 2019-08-08 stsp struct got_diff_changes *changes = NULL;
5802 2e1f37b0 2019-08-08 stsp struct got_diff_state *ds = NULL;
5803 2e1f37b0 2019-08-08 stsp struct got_diff_args *args = NULL;
5804 2e1f37b0 2019-08-08 stsp struct got_diff_change *change;
5805 2e1f37b0 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, n = 0;
5806 2e1f37b0 2019-08-08 stsp int have_content = 0, have_rejected_content = 0;
5808 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
5809 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
5811 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
5813 2e1f37b0 2019-08-08 stsp return err;
5814 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
5816 2e1f37b0 2019-08-08 stsp goto done;
5818 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
5820 2e1f37b0 2019-08-08 stsp goto done;
5822 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
5824 2e1f37b0 2019-08-08 stsp goto done;
5826 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
5828 2e1f37b0 2019-08-08 stsp goto done;
5830 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
5832 2e1f37b0 2019-08-08 stsp goto done;
5834 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
5836 2e1f37b0 2019-08-08 stsp goto done;
5838 2e1f37b0 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
5839 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
5840 2e1f37b0 2019-08-08 stsp goto done;
5843 2e1f37b0 2019-08-08 stsp if (stat(path2, &sb2) == -1) {
5844 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path2);
5845 2e1f37b0 2019-08-08 stsp goto done;
5848 2e1f37b0 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
5849 2e1f37b0 2019-08-08 stsp f1, sb1.st_size, label1, f2, sb2.st_size, path2, 3, NULL);
5851 2e1f37b0 2019-08-08 stsp goto done;
5853 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
5854 2e1f37b0 2019-08-08 stsp "got-unstaged-content");
5856 2e1f37b0 2019-08-08 stsp goto done;
5857 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
5858 2e1f37b0 2019-08-08 stsp "got-new-staged-content");
5860 2e1f37b0 2019-08-08 stsp goto done;
5862 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
5863 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
5864 2e1f37b0 2019-08-08 stsp goto done;
5866 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
5867 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
5868 2e1f37b0 2019-08-08 stsp goto done;
5870 2e1f37b0 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
5871 2e1f37b0 2019-08-08 stsp int choice;
5872 2e1f37b0 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
5873 2e1f37b0 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
5874 2e1f37b0 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
5875 2e1f37b0 2019-08-08 stsp outfile, rejectfile, patch_cb, patch_arg);
5877 2e1f37b0 2019-08-08 stsp goto done;
5878 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
5879 2e1f37b0 2019-08-08 stsp have_content = 1;
5881 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
5882 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
5886 2e1f37b0 2019-08-08 stsp free(label1);
5888 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
5889 2e1f37b0 2019-08-08 stsp if (staged_blob)
5890 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
5891 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
5892 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
5893 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
5894 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
5895 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
5896 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
5897 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
5898 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
5899 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
5900 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
5901 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
5902 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
5903 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
5904 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
5905 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
5906 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
5907 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
5908 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
5909 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
5911 2e1f37b0 2019-08-08 stsp if (err || !have_rejected_content) {
5912 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
5913 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
5914 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
5915 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
5916 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
5917 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
5919 2e1f37b0 2019-08-08 stsp free(args);
5921 2e1f37b0 2019-08-08 stsp got_diff_state_free(ds);
5924 2e1f37b0 2019-08-08 stsp if (changes)
5925 2e1f37b0 2019-08-08 stsp got_diff_free_changes(changes);
5926 2e1f37b0 2019-08-08 stsp free(path1);
5927 2e1f37b0 2019-08-08 stsp free(path2);
5928 2e1f37b0 2019-08-08 stsp return err;
5931 ad493afc 2019-08-03 stsp static const struct got_error *
5932 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
5933 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
5934 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5935 ad493afc 2019-08-03 stsp struct got_object_id *commit_id)
5937 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
5938 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
5939 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
5940 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
5941 2e1f37b0 2019-08-08 stsp char *ondisk_path = NULL, *path_unstaged_content = NULL;
5942 2e1f37b0 2019-08-08 stsp char *path_new_staged_content = NULL;
5943 ad493afc 2019-08-03 stsp int local_changes_subsumed;
5944 9bc94a15 2019-08-03 stsp struct stat sb;
5946 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
5947 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
5948 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
5949 2e1f37b0 2019-08-08 stsp return NULL;
5951 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
5952 ad493afc 2019-08-03 stsp if (ie == NULL)
5953 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
5955 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
5957 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
5959 ad493afc 2019-08-03 stsp switch (staged_status) {
5960 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
5961 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
5962 ad493afc 2019-08-03 stsp blob_id, 8192);
5965 ad493afc 2019-08-03 stsp /* fall through */
5966 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
5967 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
5968 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
5969 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
5970 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
5971 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
5974 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
5977 2e1f37b0 2019-08-08 stsp err = create_unstaged_content(
5978 2e1f37b0 2019-08-08 stsp &path_unstaged_content,
5979 2e1f37b0 2019-08-08 stsp &path_new_staged_content, blob_id,
5980 2e1f37b0 2019-08-08 stsp staged_blob_id, ie->path, a->repo,
5981 2e1f37b0 2019-08-08 stsp a->patch_cb, a->patch_arg);
5982 2e1f37b0 2019-08-08 stsp if (err || path_unstaged_content == NULL)
5984 2e1f37b0 2019-08-08 stsp if (path_new_staged_content) {
5985 2e1f37b0 2019-08-08 stsp err = got_object_blob_create(
5986 2e1f37b0 2019-08-08 stsp &staged_blob_id,
5987 2e1f37b0 2019-08-08 stsp path_new_staged_content,
5991 2e1f37b0 2019-08-08 stsp memcpy(ie->staged_blob_sha1,
5992 2e1f37b0 2019-08-08 stsp staged_blob_id->sha1,
5993 2e1f37b0 2019-08-08 stsp SHA1_DIGEST_LENGTH);
5995 2e1f37b0 2019-08-08 stsp err = merge_file(&local_changes_subsumed,
5996 2e1f37b0 2019-08-08 stsp a->worktree, blob_base, ondisk_path,
5997 2e1f37b0 2019-08-08 stsp relpath, got_fileindex_perms_to_st(ie),
5998 2e1f37b0 2019-08-08 stsp path_unstaged_content, "unstaged",
5999 2e1f37b0 2019-08-08 stsp a->repo, a->progress_cb, a->progress_arg);
6000 2e1f37b0 2019-08-08 stsp if (err == NULL &&
6001 2e1f37b0 2019-08-08 stsp path_new_staged_content == NULL)
6002 2e1f37b0 2019-08-08 stsp got_fileindex_entry_stage_set(ie,
6003 2e1f37b0 2019-08-08 stsp GOT_FILEIDX_STAGE_NONE);
6004 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
6007 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
6008 ad493afc 2019-08-03 stsp staged_blob_id, 8192);
6011 ad493afc 2019-08-03 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
6012 ad493afc 2019-08-03 stsp blob_base, ondisk_path, relpath,
6013 ad493afc 2019-08-03 stsp got_fileindex_perms_to_st(ie), blob_staged,
6014 ad493afc 2019-08-03 stsp commit_id ? commit_id : a->worktree->base_commit_id,
6015 ad493afc 2019-08-03 stsp a->repo, a->progress_cb, a->progress_arg);
6016 ad493afc 2019-08-03 stsp if (err == NULL)
6017 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
6018 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
6020 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
6021 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
6022 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
6023 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
6024 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
6027 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
6029 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
6030 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
6034 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
6035 9bc94a15 2019-08-03 stsp err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
6038 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
6042 ad493afc 2019-08-03 stsp free(ondisk_path);
6043 2e1f37b0 2019-08-08 stsp if (path_unstaged_content &&
6044 2e1f37b0 2019-08-08 stsp unlink(path_unstaged_content) == -1 && err == NULL)
6045 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
6046 2e1f37b0 2019-08-08 stsp if (path_new_staged_content &&
6047 2e1f37b0 2019-08-08 stsp unlink(path_new_staged_content) == -1 && err == NULL)
6048 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
6049 2e1f37b0 2019-08-08 stsp free(path_unstaged_content);
6050 2e1f37b0 2019-08-08 stsp free(path_new_staged_content);
6051 ad493afc 2019-08-03 stsp if (blob_base)
6052 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
6053 ad493afc 2019-08-03 stsp if (blob_staged)
6054 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
6055 ad493afc 2019-08-03 stsp return err;
6058 ad493afc 2019-08-03 stsp const struct got_error *
6059 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
6060 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
6061 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6062 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
6063 ad493afc 2019-08-03 stsp struct got_repository *repo)
6065 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
6066 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
6067 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
6068 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
6069 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
6071 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
6073 ad493afc 2019-08-03 stsp return err;
6075 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
6077 ad493afc 2019-08-03 stsp goto done;
6079 ad493afc 2019-08-03 stsp upa.worktree = worktree;
6080 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
6081 ad493afc 2019-08-03 stsp upa.repo = repo;
6082 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
6083 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
6084 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
6085 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
6086 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
6087 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
6088 ad493afc 2019-08-03 stsp unstage_path, &upa, NULL, NULL);
6090 ad493afc 2019-08-03 stsp goto done;
6093 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6094 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
6095 ad493afc 2019-08-03 stsp err = sync_err;
6097 ad493afc 2019-08-03 stsp free(fileindex_path);
6098 ad493afc 2019-08-03 stsp if (fileindex)
6099 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
6100 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6101 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
6102 ad493afc 2019-08-03 stsp err = unlockerr;
6103 ad493afc 2019-08-03 stsp return err;
