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 9d31a1d8 2018-03-11 stsp #include <sys/queue.h>
19 133d2798 2019-01-08 stsp #include <sys/tree.h>
21 d1f6d47b 2019-02-04 stsp #include <dirent.h>
22 12ce7a6c 2019-08-12 stsp #include <limits.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 e6209546 2019-08-22 stsp #include "got_cancel.h"
43 86c3caaf 2018-03-09 stsp #include "got_worktree.h"
44 511a516b 2018-05-19 stsp #include "got_opentemp.h"
45 234035bc 2019-06-01 stsp #include "got_diff.h"
47 718b3ab0 2018-03-17 stsp #include "got_lib_worktree.h"
48 718b3ab0 2018-03-17 stsp #include "got_lib_sha1.h"
49 718b3ab0 2018-03-17 stsp #include "got_lib_fileindex.h"
50 63581804 2018-07-09 stsp #include "got_lib_inflate.h"
51 718b3ab0 2018-03-17 stsp #include "got_lib_delta.h"
52 718b3ab0 2018-03-17 stsp #include "got_lib_object.h"
53 ed175427 2019-05-09 stsp #include "got_lib_object_parse.h"
54 cf066bf8 2019-05-09 stsp #include "got_lib_object_create.h"
55 24519714 2019-05-09 stsp #include "got_lib_object_idset.h"
56 6353ad76 2019-02-08 stsp #include "got_lib_diff.h"
59 9d31a1d8 2018-03-11 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
62 99724ed4 2018-03-10 stsp static const struct got_error *
63 7ac97322 2018-03-11 stsp create_meta_file(const char *path_got, const char *name, const char *content)
65 99724ed4 2018-03-10 stsp const struct got_error *err = NULL;
68 2c7829a4 2019-06-17 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1)
69 2c7829a4 2019-06-17 stsp return got_error_from_errno("asprintf");
71 2c7829a4 2019-06-17 stsp err = got_path_create_file(path, content);
76 507dc3bb 2018-12-29 stsp static const struct got_error *
77 507dc3bb 2018-12-29 stsp update_meta_file(const char *path_got, const char *name, const char *content)
79 507dc3bb 2018-12-29 stsp const struct got_error *err = NULL;
80 507dc3bb 2018-12-29 stsp FILE *tmpfile = NULL;
81 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
82 507dc3bb 2018-12-29 stsp char *path = NULL;
84 507dc3bb 2018-12-29 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
85 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
86 507dc3bb 2018-12-29 stsp path = NULL;
90 507dc3bb 2018-12-29 stsp err = got_opentemp_named(&tmppath, &tmpfile, path);
94 507dc3bb 2018-12-29 stsp if (content) {
95 507dc3bb 2018-12-29 stsp int len = fprintf(tmpfile, "%s\n", content);
96 507dc3bb 2018-12-29 stsp if (len != strlen(content) + 1) {
97 638f9024 2019-05-13 stsp err = got_error_from_errno2("fprintf", tmppath);
102 507dc3bb 2018-12-29 stsp if (rename(tmppath, path) != 0) {
103 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath, path);
104 2a57020b 2019-02-20 stsp unlink(tmppath);
109 fb43ecf1 2019-02-11 stsp if (fclose(tmpfile) != 0 && err == NULL)
110 638f9024 2019-05-13 stsp err = got_error_from_errno2("fclose", tmppath);
111 230a42bd 2019-05-11 jcs free(tmppath);
112 99724ed4 2018-03-10 stsp return err;
115 09fe317a 2018-03-11 stsp static const struct got_error *
116 7ac97322 2018-03-11 stsp read_meta_file(char **content, const char *path_got, const char *name)
118 09fe317a 2018-03-11 stsp const struct got_error *err = NULL;
119 09fe317a 2018-03-11 stsp char *path;
120 09fe317a 2018-03-11 stsp int fd = -1;
122 09fe317a 2018-03-11 stsp struct stat sb;
124 09fe317a 2018-03-11 stsp *content = NULL;
126 7ac97322 2018-03-11 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
127 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
128 09fe317a 2018-03-11 stsp path = NULL;
132 ef99fdb1 2018-03-11 stsp fd = open(path, O_RDONLY | O_NOFOLLOW);
133 09fe317a 2018-03-11 stsp if (fd == -1) {
134 f02eaa22 2019-03-11 stsp if (errno == ENOENT)
135 a2e6d162 2019-07-27 stsp err = got_error_path(path, GOT_ERR_WORKTREE_META);
137 638f9024 2019-05-13 stsp err = got_error_from_errno2("open", path);
140 ef99fdb1 2018-03-11 stsp if (flock(fd, LOCK_SH | LOCK_NB) == -1) {
141 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
142 638f9024 2019-05-13 stsp : got_error_from_errno2("flock", path));
146 e4b9a50c 2019-07-27 stsp if (fstat(fd, &sb) != 0) {
147 e4b9a50c 2019-07-27 stsp err = got_error_from_errno2("fstat", path);
150 09fe317a 2018-03-11 stsp *content = calloc(1, sb.st_size);
151 09fe317a 2018-03-11 stsp if (*content == NULL) {
152 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
156 09fe317a 2018-03-11 stsp n = read(fd, *content, sb.st_size);
157 09fe317a 2018-03-11 stsp if (n != sb.st_size) {
158 638f9024 2019-05-13 stsp err = (n == -1 ? got_error_from_errno2("read", path) :
159 a2e6d162 2019-07-27 stsp got_error_path(path, GOT_ERR_WORKTREE_META));
162 09fe317a 2018-03-11 stsp if ((*content)[sb.st_size - 1] != '\n') {
163 a2e6d162 2019-07-27 stsp err = got_error_path(path, GOT_ERR_WORKTREE_META);
166 09fe317a 2018-03-11 stsp (*content)[sb.st_size - 1] = '\0';
169 09fe317a 2018-03-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
170 638f9024 2019-05-13 stsp err = got_error_from_errno2("close", path_got);
171 09fe317a 2018-03-11 stsp free(path);
173 09fe317a 2018-03-11 stsp free(*content);
174 09fe317a 2018-03-11 stsp *content = NULL;
176 09fe317a 2018-03-11 stsp return err;
179 024e9686 2019-05-14 stsp static const struct got_error *
180 024e9686 2019-05-14 stsp write_head_ref(const char *path_got, struct got_reference *head_ref)
182 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
183 024e9686 2019-05-14 stsp char *refstr = NULL;
185 024e9686 2019-05-14 stsp if (got_ref_is_symbolic(head_ref)) {
186 024e9686 2019-05-14 stsp refstr = got_ref_to_str(head_ref);
187 024e9686 2019-05-14 stsp if (refstr == NULL)
188 024e9686 2019-05-14 stsp return got_error_from_errno("got_ref_to_str");
190 024e9686 2019-05-14 stsp refstr = strdup(got_ref_get_name(head_ref));
191 024e9686 2019-05-14 stsp if (refstr == NULL)
192 024e9686 2019-05-14 stsp return got_error_from_errno("strdup");
194 024e9686 2019-05-14 stsp err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
195 024e9686 2019-05-14 stsp free(refstr);
196 024e9686 2019-05-14 stsp return err;
199 86c3caaf 2018-03-09 stsp const struct got_error *
200 86c3caaf 2018-03-09 stsp got_worktree_init(const char *path, struct got_reference *head_ref,
201 577ec78f 2018-03-11 stsp const char *prefix, struct got_repository *repo)
203 86c3caaf 2018-03-09 stsp const struct got_error *err = NULL;
204 65596e15 2018-12-24 stsp struct got_object_id *commit_id = NULL;
205 ec22038e 2019-03-10 stsp uuid_t uuid;
206 ec22038e 2019-03-10 stsp uint32_t uuid_status;
207 65596e15 2018-12-24 stsp int obj_type;
208 7ac97322 2018-03-11 stsp char *path_got = NULL;
209 1451e70d 2018-03-10 stsp char *formatstr = NULL;
210 0bb8a95e 2018-03-12 stsp char *absprefix = NULL;
211 65596e15 2018-12-24 stsp char *basestr = NULL;
212 ec22038e 2019-03-10 stsp char *uuidstr = NULL;
214 0c48fee2 2019-03-11 stsp if (strcmp(path, got_repo_get_path(repo)) == 0) {
215 0c48fee2 2019-03-11 stsp err = got_error(GOT_ERR_WORKTREE_REPO);
219 65596e15 2018-12-24 stsp err = got_ref_resolve(&commit_id, repo, head_ref);
221 65596e15 2018-12-24 stsp return err;
222 65596e15 2018-12-24 stsp err = got_object_get_type(&obj_type, repo, commit_id);
224 65596e15 2018-12-24 stsp return err;
225 65596e15 2018-12-24 stsp if (obj_type != GOT_OBJ_TYPE_COMMIT)
226 65596e15 2018-12-24 stsp return got_error(GOT_ERR_OBJ_TYPE);
228 0bb8a95e 2018-03-12 stsp if (!got_path_is_absolute(prefix)) {
229 0bb8a95e 2018-03-12 stsp if (asprintf(&absprefix, "/%s", prefix) == -1)
230 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
233 86c3caaf 2018-03-09 stsp /* Create top-level directory (may already exist). */
234 2cb4bacb 2018-03-11 stsp if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
235 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path);
239 86c3caaf 2018-03-09 stsp /* Create .got directory (may already exist). */
240 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
241 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
244 7ac97322 2018-03-11 stsp if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
245 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path_got);
249 056e7441 2018-03-11 stsp /* Create an empty lock file. */
250 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
254 86c3caaf 2018-03-09 stsp /* Create an empty file index. */
255 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
259 08d425ea 2018-12-24 stsp /* Write the HEAD reference. */
260 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
264 65596e15 2018-12-24 stsp /* Record our base commit. */
265 65596e15 2018-12-24 stsp err = got_object_id_str(&basestr, commit_id);
268 0f92850e 2018-12-25 stsp err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
272 1451e70d 2018-03-10 stsp /* Store path to repository. */
273 7839bc15 2019-01-06 stsp err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
274 7839bc15 2019-01-06 stsp got_repo_get_path(repo));
278 577ec78f 2018-03-11 stsp /* Store in-repository path prefix. */
279 0bb8a95e 2018-03-12 stsp err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
280 0bb8a95e 2018-03-12 stsp absprefix ? absprefix : prefix);
284 ec22038e 2019-03-10 stsp /* Generate UUID. */
285 ec22038e 2019-03-10 stsp uuid_create(&uuid, &uuid_status);
286 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
287 ec22038e 2019-03-10 stsp err = got_error_uuid(uuid_status);
290 ec22038e 2019-03-10 stsp uuid_to_string(&uuid, &uuidstr, &uuid_status);
291 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
292 ec22038e 2019-03-10 stsp err = got_error_uuid(uuid_status);
295 ec22038e 2019-03-10 stsp err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
299 9dce68ed 2018-03-10 stsp /* Stamp work tree with format file. */
300 1451e70d 2018-03-10 stsp if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
301 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
304 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
309 65596e15 2018-12-24 stsp free(commit_id);
310 7ac97322 2018-03-11 stsp free(path_got);
311 1451e70d 2018-03-10 stsp free(formatstr);
312 0bb8a95e 2018-03-12 stsp free(absprefix);
313 65596e15 2018-12-24 stsp free(basestr);
314 ec22038e 2019-03-10 stsp free(uuidstr);
315 86c3caaf 2018-03-09 stsp return err;
318 247140b2 2019-02-05 stsp static const struct got_error *
319 247140b2 2019-02-05 stsp open_worktree(struct got_worktree **worktree, const char *path)
321 6d9d28c3 2018-03-11 stsp const struct got_error *err = NULL;
322 7ac97322 2018-03-11 stsp char *path_got;
323 6d9d28c3 2018-03-11 stsp char *formatstr = NULL;
324 c442a90d 2019-03-10 stsp char *uuidstr = NULL;
325 056e7441 2018-03-11 stsp char *path_lock = NULL;
326 eaccb85f 2018-12-25 stsp char *base_commit_id_str = NULL;
327 6d9d28c3 2018-03-11 stsp int version, fd = -1;
328 6d9d28c3 2018-03-11 stsp const char *errstr;
329 eaccb85f 2018-12-25 stsp struct got_repository *repo = NULL;
330 c442a90d 2019-03-10 stsp uint32_t uuid_status;
332 6d9d28c3 2018-03-11 stsp *worktree = NULL;
334 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
335 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
336 7ac97322 2018-03-11 stsp path_got = NULL;
340 7ac97322 2018-03-11 stsp if (asprintf(&path_lock, "%s/%s", path_got, GOT_WORKTREE_LOCK) == -1) {
341 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
342 056e7441 2018-03-11 stsp path_lock = NULL;
346 056e7441 2018-03-11 stsp fd = open(path_lock, O_RDWR | O_EXLOCK | O_NONBLOCK);
347 6d9d28c3 2018-03-11 stsp if (fd == -1) {
348 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
349 638f9024 2019-05-13 stsp : got_error_from_errno2("open", path_lock));
353 7ac97322 2018-03-11 stsp err = read_meta_file(&formatstr, path_got, GOT_WORKTREE_FORMAT);
357 6d9d28c3 2018-03-11 stsp version = strtonum(formatstr, 1, INT_MAX, &errstr);
358 6d9d28c3 2018-03-11 stsp if (errstr) {
359 a2e6d162 2019-07-27 stsp err = got_error_msg(GOT_ERR_WORKTREE_META,
360 a2e6d162 2019-07-27 stsp "could not parse work tree format version number");
363 6d9d28c3 2018-03-11 stsp if (version != GOT_WORKTREE_FORMAT_VERSION) {
364 6d9d28c3 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_VERS);
368 6d9d28c3 2018-03-11 stsp *worktree = calloc(1, sizeof(**worktree));
369 6d9d28c3 2018-03-11 stsp if (*worktree == NULL) {
370 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
373 056e7441 2018-03-11 stsp (*worktree)->lockfd = -1;
375 0647c563 2019-03-11 stsp (*worktree)->root_path = strdup(path);
376 c88eb298 2018-03-11 stsp if ((*worktree)->root_path == NULL) {
377 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
380 cde76477 2018-03-11 stsp err = read_meta_file(&(*worktree)->repo_path, path_got,
381 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_REPOSITORY);
385 7ac97322 2018-03-11 stsp err = read_meta_file(&(*worktree)->path_prefix, path_got,
386 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_PATH_PREFIX);
390 eaccb85f 2018-12-25 stsp err = read_meta_file(&base_commit_id_str, path_got,
391 0f92850e 2018-12-25 stsp GOT_WORKTREE_BASE_COMMIT);
395 c442a90d 2019-03-10 stsp err = read_meta_file(&uuidstr, path_got, GOT_WORKTREE_UUID);
398 c442a90d 2019-03-10 stsp uuid_from_string(uuidstr, &(*worktree)->uuid, &uuid_status);
399 c442a90d 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
400 c442a90d 2019-03-10 stsp err = got_error_uuid(uuid_status);
404 eaccb85f 2018-12-25 stsp err = got_repo_open(&repo, (*worktree)->repo_path);
408 eaccb85f 2018-12-25 stsp err = got_object_resolve_id_str(&(*worktree)->base_commit_id, repo,
409 eaccb85f 2018-12-25 stsp base_commit_id_str);
413 36a38700 2019-05-10 stsp err = read_meta_file(&(*worktree)->head_ref_name, path_got,
414 36a38700 2019-05-10 stsp GOT_WORKTREE_HEAD_REF);
417 eaccb85f 2018-12-25 stsp got_repo_close(repo);
418 7ac97322 2018-03-11 stsp free(path_got);
419 056e7441 2018-03-11 stsp free(path_lock);
420 eaccb85f 2018-12-25 stsp free(base_commit_id_str);
421 c442a90d 2019-03-10 stsp free(uuidstr);
422 bd165944 2019-03-10 stsp free(formatstr);
424 6d9d28c3 2018-03-11 stsp if (fd != -1)
426 6d9d28c3 2018-03-11 stsp if (*worktree != NULL)
427 6d9d28c3 2018-03-11 stsp got_worktree_close(*worktree);
428 6d9d28c3 2018-03-11 stsp *worktree = NULL;
430 056e7441 2018-03-11 stsp (*worktree)->lockfd = fd;
432 6d9d28c3 2018-03-11 stsp return err;
435 247140b2 2019-02-05 stsp const struct got_error *
436 247140b2 2019-02-05 stsp got_worktree_open(struct got_worktree **worktree, const char *path)
438 247140b2 2019-02-05 stsp const struct got_error *err = NULL;
441 247140b2 2019-02-05 stsp err = open_worktree(worktree, path);
442 f02eaa22 2019-03-11 stsp if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT))
443 247140b2 2019-02-05 stsp return err;
444 247140b2 2019-02-05 stsp if (*worktree)
445 247140b2 2019-02-05 stsp return NULL;
446 247140b2 2019-02-05 stsp path = dirname(path);
447 d1542a27 2019-02-05 stsp if (path == NULL)
448 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
449 d1542a27 2019-02-05 stsp } while (!((path[0] == '.' || path[0] == '/') && path[1] == '\0'));
451 247140b2 2019-02-05 stsp return got_error(GOT_ERR_NOT_WORKTREE);
454 3a6ce05a 2019-02-11 stsp const struct got_error *
455 86c3caaf 2018-03-09 stsp got_worktree_close(struct got_worktree *worktree)
457 3a6ce05a 2019-02-11 stsp const struct got_error *err = NULL;
458 c88eb298 2018-03-11 stsp free(worktree->root_path);
459 cde76477 2018-03-11 stsp free(worktree->repo_path);
460 6d9d28c3 2018-03-11 stsp free(worktree->path_prefix);
461 eaccb85f 2018-12-25 stsp free(worktree->base_commit_id);
462 36a38700 2019-05-10 stsp free(worktree->head_ref_name);
463 056e7441 2018-03-11 stsp if (worktree->lockfd != -1)
464 3a6ce05a 2019-02-11 stsp if (close(worktree->lockfd) != 0)
465 638f9024 2019-05-13 stsp err = got_error_from_errno2("close",
466 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree));
467 6d9d28c3 2018-03-11 stsp free(worktree);
468 3a6ce05a 2019-02-11 stsp return err;
471 2fbdb5ae 2018-12-29 stsp const char *
472 c7f4312f 2019-02-05 stsp got_worktree_get_root_path(struct got_worktree *worktree)
474 c7f4312f 2019-02-05 stsp return worktree->root_path;
477 c7f4312f 2019-02-05 stsp const char *
478 86c3caaf 2018-03-09 stsp got_worktree_get_repo_path(struct got_worktree *worktree)
480 2fbdb5ae 2018-12-29 stsp return worktree->repo_path;
483 49520a32 2018-12-29 stsp const char *
484 49520a32 2018-12-29 stsp got_worktree_get_path_prefix(struct got_worktree *worktree)
486 f609be2e 2018-12-29 stsp return worktree->path_prefix;
489 e5dc7198 2018-12-29 stsp const struct got_error *
490 e5dc7198 2018-12-29 stsp got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
491 e5dc7198 2018-12-29 stsp const char *path_prefix)
493 e5dc7198 2018-12-29 stsp char *absprefix = NULL;
495 e5dc7198 2018-12-29 stsp if (!got_path_is_absolute(path_prefix)) {
496 e5dc7198 2018-12-29 stsp if (asprintf(&absprefix, "/%s", path_prefix) == -1)
497 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
499 e5dc7198 2018-12-29 stsp *match = (strcmp(absprefix ? absprefix : path_prefix,
500 e5dc7198 2018-12-29 stsp worktree->path_prefix) == 0);
501 e5dc7198 2018-12-29 stsp free(absprefix);
502 e5dc7198 2018-12-29 stsp return NULL;
505 bc70eb79 2019-05-09 stsp const char *
506 35be1456 2018-03-11 stsp got_worktree_get_head_ref_name(struct got_worktree *worktree)
508 36a38700 2019-05-10 stsp return worktree->head_ref_name;
511 024e9686 2019-05-14 stsp const struct got_error *
512 024e9686 2019-05-14 stsp got_worktree_set_head_ref(struct got_worktree *worktree,
513 024e9686 2019-05-14 stsp struct got_reference *head_ref)
515 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
516 024e9686 2019-05-14 stsp char *path_got = NULL, *head_ref_name = NULL;
518 024e9686 2019-05-14 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
519 024e9686 2019-05-14 stsp GOT_WORKTREE_GOT_DIR) == -1) {
520 024e9686 2019-05-14 stsp err = got_error_from_errno("asprintf");
521 024e9686 2019-05-14 stsp path_got = NULL;
525 024e9686 2019-05-14 stsp head_ref_name = strdup(got_ref_get_name(head_ref));
526 024e9686 2019-05-14 stsp if (head_ref_name == NULL) {
527 024e9686 2019-05-14 stsp err = got_error_from_errno("strdup");
531 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
535 024e9686 2019-05-14 stsp free(worktree->head_ref_name);
536 024e9686 2019-05-14 stsp worktree->head_ref_name = head_ref_name;
538 024e9686 2019-05-14 stsp free(path_got);
540 024e9686 2019-05-14 stsp free(head_ref_name);
541 024e9686 2019-05-14 stsp return err;
544 b72f483a 2019-02-05 stsp struct got_object_id *
545 507dc3bb 2018-12-29 stsp got_worktree_get_base_commit_id(struct got_worktree *worktree)
547 507dc3bb 2018-12-29 stsp return worktree->base_commit_id;
550 507dc3bb 2018-12-29 stsp const struct got_error *
551 507dc3bb 2018-12-29 stsp got_worktree_set_base_commit_id(struct got_worktree *worktree,
552 507dc3bb 2018-12-29 stsp struct got_repository *repo, struct got_object_id *commit_id)
554 507dc3bb 2018-12-29 stsp const struct got_error *err;
555 507dc3bb 2018-12-29 stsp struct got_object *obj = NULL;
556 507dc3bb 2018-12-29 stsp char *id_str = NULL;
557 507dc3bb 2018-12-29 stsp char *path_got = NULL;
559 507dc3bb 2018-12-29 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
560 507dc3bb 2018-12-29 stsp GOT_WORKTREE_GOT_DIR) == -1) {
561 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
562 507dc3bb 2018-12-29 stsp path_got = NULL;
566 507dc3bb 2018-12-29 stsp err = got_object_open(&obj, repo, commit_id);
568 507dc3bb 2018-12-29 stsp return err;
570 507dc3bb 2018-12-29 stsp if (obj->type != GOT_OBJ_TYPE_COMMIT) {
571 507dc3bb 2018-12-29 stsp err = got_error(GOT_ERR_OBJ_TYPE);
575 507dc3bb 2018-12-29 stsp /* Record our base commit. */
576 507dc3bb 2018-12-29 stsp err = got_object_id_str(&id_str, commit_id);
579 507dc3bb 2018-12-29 stsp err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
583 507dc3bb 2018-12-29 stsp free(worktree->base_commit_id);
584 507dc3bb 2018-12-29 stsp worktree->base_commit_id = got_object_id_dup(commit_id);
585 507dc3bb 2018-12-29 stsp if (worktree->base_commit_id == NULL) {
586 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
591 507dc3bb 2018-12-29 stsp got_object_close(obj);
592 507dc3bb 2018-12-29 stsp free(id_str);
593 507dc3bb 2018-12-29 stsp free(path_got);
594 507dc3bb 2018-12-29 stsp return err;
597 9d31a1d8 2018-03-11 stsp static const struct got_error *
598 9d31a1d8 2018-03-11 stsp lock_worktree(struct got_worktree *worktree, int operation)
600 9d31a1d8 2018-03-11 stsp if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
601 9d31a1d8 2018-03-11 stsp return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
602 638f9024 2019-05-13 stsp : got_error_from_errno2("flock",
603 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree)));
604 86c3caaf 2018-03-09 stsp return NULL;
607 21908da4 2019-01-13 stsp static const struct got_error *
608 4a1ddfc2 2019-01-12 stsp add_dir_on_disk(struct got_worktree *worktree, const char *path)
610 4a1ddfc2 2019-01-12 stsp const struct got_error *err = NULL;
611 4a1ddfc2 2019-01-12 stsp char *abspath;
613 4a1ddfc2 2019-01-12 stsp if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
614 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
616 0cd1c46a 2019-03-11 stsp err = got_path_mkdir(abspath);
617 ddcd8544 2019-03-11 stsp if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
618 ddcd8544 2019-03-11 stsp struct stat sb;
619 ddcd8544 2019-03-11 stsp err = NULL;
620 ddcd8544 2019-03-11 stsp if (lstat(abspath, &sb) == -1) {
621 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
622 ddcd8544 2019-03-11 stsp } else if (!S_ISDIR(sb.st_mode)) {
623 ddcd8544 2019-03-11 stsp /* TODO directory is obstructed; do something */
624 ddcd8544 2019-03-11 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
627 4a1ddfc2 2019-01-12 stsp free(abspath);
628 68c76935 2019-02-19 stsp return err;
631 68c76935 2019-02-19 stsp static const struct got_error *
632 68c76935 2019-02-19 stsp check_file_contents_equal(int *same, FILE *f1, FILE *f2)
634 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
635 68c76935 2019-02-19 stsp uint8_t fbuf1[8192];
636 68c76935 2019-02-19 stsp uint8_t fbuf2[8192];
637 68c76935 2019-02-19 stsp size_t flen1 = 0, flen2 = 0;
642 68c76935 2019-02-19 stsp flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
643 68c76935 2019-02-19 stsp if (flen1 == 0 && ferror(f1)) {
644 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
647 68c76935 2019-02-19 stsp flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
648 68c76935 2019-02-19 stsp if (flen2 == 0 && ferror(f2)) {
649 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
652 68c76935 2019-02-19 stsp if (flen1 == 0) {
653 68c76935 2019-02-19 stsp if (flen2 != 0)
656 68c76935 2019-02-19 stsp } else if (flen2 == 0) {
657 68c76935 2019-02-19 stsp if (flen1 != 0)
660 68c76935 2019-02-19 stsp } else if (flen1 == flen2) {
661 68c76935 2019-02-19 stsp if (memcmp(fbuf1, fbuf2, flen2) != 0) {
671 68c76935 2019-02-19 stsp return err;
674 68c76935 2019-02-19 stsp static const struct got_error *
675 68c76935 2019-02-19 stsp check_files_equal(int *same, const char *f1_path, const char *f2_path)
677 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
678 68c76935 2019-02-19 stsp struct stat sb;
679 68c76935 2019-02-19 stsp size_t size1, size2;
680 68c76935 2019-02-19 stsp FILE *f1 = NULL, *f2 = NULL;
684 68c76935 2019-02-19 stsp if (lstat(f1_path, &sb) != 0) {
685 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", f1_path);
688 68c76935 2019-02-19 stsp size1 = sb.st_size;
690 68c76935 2019-02-19 stsp if (lstat(f2_path, &sb) != 0) {
691 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", f2_path);
694 68c76935 2019-02-19 stsp size2 = sb.st_size;
696 68c76935 2019-02-19 stsp if (size1 != size2) {
698 68c76935 2019-02-19 stsp return NULL;
701 68c76935 2019-02-19 stsp f1 = fopen(f1_path, "r");
702 68c76935 2019-02-19 stsp if (f1 == NULL)
703 638f9024 2019-05-13 stsp return got_error_from_errno2("open", f1_path);
705 68c76935 2019-02-19 stsp f2 = fopen(f2_path, "r");
706 68c76935 2019-02-19 stsp if (f2 == NULL) {
707 638f9024 2019-05-13 stsp err = got_error_from_errno2("open", f2_path);
711 68c76935 2019-02-19 stsp err = check_file_contents_equal(same, f1, f2);
713 68c76935 2019-02-19 stsp if (f1 && fclose(f1) != 0 && err == NULL)
714 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
715 68c76935 2019-02-19 stsp if (f2 && fclose(f2) != 0 && err == NULL)
716 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
718 6353ad76 2019-02-08 stsp return err;
722 46b6ee73 2019-06-04 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
723 14c901f1 2019-08-08 stsp * the file at deriv_path acts as the first derived version, and the
724 14c901f1 2019-08-08 stsp * file on disk acts as the second derived version.
726 6353ad76 2019-02-08 stsp static const struct got_error *
727 14c901f1 2019-08-08 stsp merge_file(int *local_changes_subsumed, struct got_worktree *worktree,
728 46b6ee73 2019-06-04 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
729 14c901f1 2019-08-08 stsp const char *path, uint16_t st_mode, const char *deriv_path,
730 14c901f1 2019-08-08 stsp const char *label_deriv, struct got_repository *repo,
731 14c901f1 2019-08-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
733 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
734 6353ad76 2019-02-08 stsp int merged_fd = -1;
735 14c901f1 2019-08-08 stsp FILE *f_orig = NULL;
736 14c901f1 2019-08-08 stsp char *blob_orig_path = NULL;
737 af54ae4a 2019-02-19 stsp char *merged_path = NULL, *base_path = NULL;
738 234035bc 2019-06-01 stsp int overlapcnt = 0;
739 af54ae4a 2019-02-19 stsp char *parent;
741 234035bc 2019-06-01 stsp *local_changes_subsumed = 0;
743 af54ae4a 2019-02-19 stsp parent = dirname(ondisk_path);
744 af54ae4a 2019-02-19 stsp if (parent == NULL)
745 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", ondisk_path);
747 af54ae4a 2019-02-19 stsp if (asprintf(&base_path, "%s/got-merged", parent) == -1)
748 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
750 af54ae4a 2019-02-19 stsp err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
754 af54ae4a 2019-02-19 stsp free(base_path);
755 46b6ee73 2019-06-04 stsp if (asprintf(&base_path, "%s/got-merge-blob-orig", parent) == -1) {
756 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
757 af54ae4a 2019-02-19 stsp base_path = NULL;
761 46b6ee73 2019-06-04 stsp err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
764 46b6ee73 2019-06-04 stsp if (blob_orig) {
765 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
766 46b6ee73 2019-06-04 stsp blob_orig);
771 1430b4e0 2019-03-27 stsp * If the file has no blob, this is an "add vs add" conflict,
772 1430b4e0 2019-03-27 stsp * and we simply use an empty ancestor file to make both files
773 1430b4e0 2019-03-27 stsp * appear in the merged result in their entirety.
777 14c901f1 2019-08-08 stsp err = got_merge_diff3(&overlapcnt, merged_fd, deriv_path,
778 818c7501 2019-07-11 stsp blob_orig_path, ondisk_path, label_deriv, path);
782 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
783 6353ad76 2019-02-08 stsp overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
787 816dc654 2019-02-16 stsp if (fsync(merged_fd) != 0) {
788 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
792 68c76935 2019-02-19 stsp /* Check if a clean merge has subsumed all local changes. */
793 68c76935 2019-02-19 stsp if (overlapcnt == 0) {
794 14c901f1 2019-08-08 stsp err = check_files_equal(local_changes_subsumed, deriv_path,
795 68c76935 2019-02-19 stsp merged_path);
800 70a0c8ec 2019-02-20 stsp if (chmod(merged_path, st_mode) != 0) {
801 638f9024 2019-05-13 stsp err = got_error_from_errno2("chmod", merged_path);
805 6353ad76 2019-02-08 stsp if (rename(merged_path, ondisk_path) != 0) {
806 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", merged_path,
807 230a42bd 2019-05-11 jcs ondisk_path);
808 2a57020b 2019-02-20 stsp unlink(merged_path);
813 3a6ce05a 2019-02-11 stsp if (merged_fd != -1 && close(merged_fd) != 0 && err == NULL)
814 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
815 46b6ee73 2019-06-04 stsp if (f_orig && fclose(f_orig) != 0 && err == NULL)
816 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
817 6353ad76 2019-02-08 stsp free(merged_path);
818 af54ae4a 2019-02-19 stsp free(base_path);
819 46b6ee73 2019-06-04 stsp if (blob_orig_path) {
820 46b6ee73 2019-06-04 stsp unlink(blob_orig_path);
821 46b6ee73 2019-06-04 stsp free(blob_orig_path);
823 14c901f1 2019-08-08 stsp return err;
827 14c901f1 2019-08-08 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
828 14c901f1 2019-08-08 stsp * blob_deriv acts as the first derived version, and the file on disk
829 14c901f1 2019-08-08 stsp * acts as the second derived version.
831 14c901f1 2019-08-08 stsp static const struct got_error *
832 14c901f1 2019-08-08 stsp merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
833 14c901f1 2019-08-08 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
834 14c901f1 2019-08-08 stsp const char *path, uint16_t st_mode, struct got_blob_object *blob_deriv,
835 14c901f1 2019-08-08 stsp struct got_object_id *deriv_base_commit_id,
836 14c901f1 2019-08-08 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
837 14c901f1 2019-08-08 stsp void *progress_arg)
839 14c901f1 2019-08-08 stsp const struct got_error *err = NULL;
840 14c901f1 2019-08-08 stsp FILE *f_deriv = NULL;
841 14c901f1 2019-08-08 stsp char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
842 14c901f1 2019-08-08 stsp char *label_deriv = NULL, *parent;
844 14c901f1 2019-08-08 stsp *local_changes_subsumed = 0;
846 14c901f1 2019-08-08 stsp parent = dirname(ondisk_path);
847 14c901f1 2019-08-08 stsp if (parent == NULL)
848 14c901f1 2019-08-08 stsp return got_error_from_errno2("dirname", ondisk_path);
850 14c901f1 2019-08-08 stsp free(base_path);
851 14c901f1 2019-08-08 stsp if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
852 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
853 14c901f1 2019-08-08 stsp base_path = NULL;
857 14c901f1 2019-08-08 stsp err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
860 14c901f1 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
861 14c901f1 2019-08-08 stsp blob_deriv);
865 14c901f1 2019-08-08 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
868 14c901f1 2019-08-08 stsp if (asprintf(&label_deriv, "commit %s", id_str) == -1) {
869 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
873 14c901f1 2019-08-08 stsp err = merge_file(local_changes_subsumed, worktree, blob_orig,
874 14c901f1 2019-08-08 stsp ondisk_path, path, st_mode, blob_deriv_path, label_deriv,
875 14c901f1 2019-08-08 stsp repo, progress_cb, progress_arg);
877 14c901f1 2019-08-08 stsp if (f_deriv && fclose(f_deriv) != 0 && err == NULL)
878 14c901f1 2019-08-08 stsp err = got_error_from_errno("fclose");
879 14c901f1 2019-08-08 stsp free(base_path);
880 14c901f1 2019-08-08 stsp if (blob_deriv_path) {
881 14c901f1 2019-08-08 stsp unlink(blob_deriv_path);
882 14c901f1 2019-08-08 stsp free(blob_deriv_path);
884 6353ad76 2019-02-08 stsp free(id_str);
885 818c7501 2019-07-11 stsp free(label_deriv);
886 4a1ddfc2 2019-01-12 stsp return err;
889 4a1ddfc2 2019-01-12 stsp static const struct got_error *
890 13d9040b 2019-03-27 stsp update_blob_fileindex_entry(struct got_worktree *worktree,
891 13d9040b 2019-03-27 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
892 13d9040b 2019-03-27 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
893 13d9040b 2019-03-27 stsp int update_timestamps)
895 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
897 13d9040b 2019-03-27 stsp if (ie == NULL)
898 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
900 13d9040b 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path,
901 13d9040b 2019-03-27 stsp blob->id.sha1, worktree->base_commit_id->sha1,
902 13d9040b 2019-03-27 stsp update_timestamps);
904 13d9040b 2019-03-27 stsp struct got_fileindex_entry *new_ie;
905 13d9040b 2019-03-27 stsp err = got_fileindex_entry_alloc(&new_ie, ondisk_path,
906 13d9040b 2019-03-27 stsp path, blob->id.sha1, worktree->base_commit_id->sha1);
908 13d9040b 2019-03-27 stsp err = got_fileindex_entry_add(fileindex, new_ie);
910 13d9040b 2019-03-27 stsp return err;
913 13d9040b 2019-03-27 stsp static const struct got_error *
914 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
915 13d9040b 2019-03-27 stsp const char *path, uint16_t te_mode, uint16_t st_mode,
916 13d9040b 2019-03-27 stsp struct got_blob_object *blob, int restoring_missing_file,
917 a129376b 2019-03-28 stsp int reverting_versioned_file, struct got_repository *repo,
918 a129376b 2019-03-28 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
920 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
921 507dc3bb 2018-12-29 stsp int fd = -1;
922 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
923 507dc3bb 2018-12-29 stsp int update = 0;
924 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
926 c34b20a2 2018-03-12 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
927 9d31a1d8 2018-03-11 stsp GOT_DEFAULT_FILE_MODE);
928 9d31a1d8 2018-03-11 stsp if (fd == -1) {
929 21908da4 2019-01-13 stsp if (errno == ENOENT) {
930 21908da4 2019-01-13 stsp char *parent = dirname(path);
931 21908da4 2019-01-13 stsp if (parent == NULL)
932 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
933 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
935 21908da4 2019-01-13 stsp return err;
936 21908da4 2019-01-13 stsp fd = open(ondisk_path,
937 21908da4 2019-01-13 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
938 21908da4 2019-01-13 stsp GOT_DEFAULT_FILE_MODE);
939 21908da4 2019-01-13 stsp if (fd == -1)
940 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
941 230a42bd 2019-05-11 jcs ondisk_path);
942 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
943 b8f41171 2019-02-10 stsp if (!S_ISREG(st_mode)) {
944 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
945 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
948 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
949 507dc3bb 2018-12-29 stsp ondisk_path);
952 507dc3bb 2018-12-29 stsp update = 1;
955 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
958 a378724f 2019-02-10 stsp if (restoring_missing_file)
959 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING, path);
960 a129376b 2019-03-28 stsp else if (reverting_versioned_file)
961 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT, path);
963 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
964 a378724f 2019-02-10 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
968 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
970 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
971 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
974 9d31a1d8 2018-03-11 stsp if (len > 0) {
975 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
976 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
977 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
978 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
980 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
981 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
984 61d6eaa3 2018-12-24 stsp hdrlen = 0;
986 9d31a1d8 2018-03-11 stsp } while (len != 0);
988 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
989 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
993 507dc3bb 2018-12-29 stsp if (update) {
994 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
995 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
996 230a42bd 2019-05-11 jcs ondisk_path);
997 2a57020b 2019-02-20 stsp unlink(tmppath);
1002 b8f41171 2019-02-10 stsp if (te_mode & S_IXUSR) {
1003 b8f41171 2019-02-10 stsp if (chmod(ondisk_path, st_mode | S_IXUSR) == -1) {
1004 638f9024 2019-05-13 stsp err = got_error_from_errno2("chmod", ondisk_path);
1005 507dc3bb 2018-12-29 stsp goto done;
1008 b8f41171 2019-02-10 stsp if (chmod(ondisk_path, st_mode & ~S_IXUSR) == -1) {
1009 638f9024 2019-05-13 stsp err = got_error_from_errno2("chmod", ondisk_path);
1010 68ed9ba5 2019-02-10 stsp goto done;
1015 3a6ce05a 2019-02-11 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
1016 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
1017 507dc3bb 2018-12-29 stsp free(tmppath);
1018 6353ad76 2019-02-08 stsp return err;
1021 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1022 6353ad76 2019-02-08 stsp static const struct got_error *
1023 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
1025 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
1026 7154f6ce 2019-03-27 stsp const char *markers[3] = {
1027 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
1028 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
1029 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
1031 7154f6ce 2019-03-27 stsp int i = 0;
1032 7154f6ce 2019-03-27 stsp char *line;
1033 7154f6ce 2019-03-27 stsp size_t len;
1034 7154f6ce 2019-03-27 stsp const char delim[3] = {'\0', '\0', '\0'};
1036 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1037 7154f6ce 2019-03-27 stsp line = fparseln(f, &len, NULL, delim, 0);
1038 7154f6ce 2019-03-27 stsp if (line == NULL) {
1039 7154f6ce 2019-03-27 stsp if (feof(f))
1041 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
1045 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1046 19332e6d 2019-05-13 stsp if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1048 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
1054 7154f6ce 2019-03-27 stsp return err;
1057 e2b1e152 2019-07-13 stsp static int
1058 e2b1e152 2019-07-13 stsp stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1060 e2b1e152 2019-07-13 stsp return !(ie->ctime_sec == sb->st_ctime &&
1061 e2b1e152 2019-07-13 stsp ie->ctime_nsec == sb->st_ctimensec &&
1062 e2b1e152 2019-07-13 stsp ie->mtime_sec == sb->st_mtime &&
1063 e2b1e152 2019-07-13 stsp ie->mtime_nsec == sb->st_mtimensec &&
1064 e2b1e152 2019-07-13 stsp ie->size == (sb->st_size & 0xffffffff));
1067 c363b2c1 2019-08-03 stsp static unsigned char
1068 c363b2c1 2019-08-03 stsp get_staged_status(struct got_fileindex_entry *ie)
1070 c363b2c1 2019-08-03 stsp switch (got_fileindex_entry_stage_get(ie)) {
1071 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_ADD:
1072 c363b2c1 2019-08-03 stsp return GOT_STATUS_ADD;
1073 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_DELETE:
1074 c363b2c1 2019-08-03 stsp return GOT_STATUS_DELETE;
1075 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_MODIFY:
1076 c363b2c1 2019-08-03 stsp return GOT_STATUS_MODIFY;
1078 c363b2c1 2019-08-03 stsp return GOT_STATUS_NO_CHANGE;
1082 7154f6ce 2019-03-27 stsp static const struct got_error *
1083 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1084 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1085 b8f41171 2019-02-10 stsp struct got_repository *repo)
1087 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1088 6353ad76 2019-02-08 stsp struct got_object_id id;
1089 6353ad76 2019-02-08 stsp size_t hdrlen;
1090 6353ad76 2019-02-08 stsp FILE *f = NULL;
1091 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1092 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1093 6353ad76 2019-02-08 stsp size_t flen, blen;
1094 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
1096 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1098 339c298e 2019-07-27 stsp if (lstat(abspath, sb) == -1) {
1099 a378724f 2019-02-10 stsp if (errno == ENOENT) {
1100 abb4604f 2019-07-27 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1101 abb4604f 2019-07-27 stsp *status = GOT_STATUS_MISSING;
1103 abb4604f 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1104 a378724f 2019-02-10 stsp return NULL;
1106 339c298e 2019-07-27 stsp return got_error_from_errno2("lstat", abspath);
1109 339c298e 2019-07-27 stsp if (!S_ISREG(sb->st_mode)) {
1110 339c298e 2019-07-27 stsp *status = GOT_STATUS_OBSTRUCTED;
1111 339c298e 2019-07-27 stsp return NULL;
1114 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1115 339c298e 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1116 339c298e 2019-07-27 stsp return NULL;
1117 244725f2 2019-08-03 stsp } else if (!got_fileindex_entry_has_blob(ie) &&
1118 244725f2 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
1119 339c298e 2019-07-27 stsp *status = GOT_STATUS_ADD;
1120 339c298e 2019-07-27 stsp return NULL;
1123 e2b1e152 2019-07-13 stsp if (!stat_info_differs(ie, sb))
1124 339c298e 2019-07-27 stsp return NULL;
1126 c363b2c1 2019-08-03 stsp if (staged_status == GOT_STATUS_MODIFY ||
1127 c363b2c1 2019-08-03 stsp staged_status == GOT_STATUS_ADD)
1128 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1130 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1132 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1134 339c298e 2019-07-27 stsp return err;
1136 339c298e 2019-07-27 stsp f = fopen(abspath, "r");
1137 6353ad76 2019-02-08 stsp if (f == NULL) {
1138 339c298e 2019-07-27 stsp err = got_error_from_errno2("fopen", abspath);
1139 6353ad76 2019-02-08 stsp goto done;
1141 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1143 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1144 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1146 7154f6ce 2019-03-27 stsp goto done;
1147 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1148 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1149 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1150 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1151 7154f6ce 2019-03-27 stsp goto done;
1153 6353ad76 2019-02-08 stsp if (blen == 0) {
1154 6353ad76 2019-02-08 stsp if (flen != 0)
1155 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1157 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1158 6353ad76 2019-02-08 stsp if (blen != 0)
1159 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1161 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1162 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1163 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1164 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1168 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1171 6353ad76 2019-02-08 stsp hdrlen = 0;
1174 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1175 7154f6ce 2019-03-27 stsp rewind(f);
1176 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1180 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1182 6353ad76 2019-02-08 stsp fclose(f);
1183 9d31a1d8 2018-03-11 stsp return err;
1187 e2b1e152 2019-07-13 stsp * Update timestamps in the file index if a file is unmodified and
1188 e2b1e152 2019-07-13 stsp * we had to run a full content comparison to find out.
1190 e2b1e152 2019-07-13 stsp static const struct got_error *
1191 e2b1e152 2019-07-13 stsp sync_timestamps(char *ondisk_path, unsigned char status,
1192 e2b1e152 2019-07-13 stsp struct got_fileindex_entry *ie, struct stat *sb)
1194 e2b1e152 2019-07-13 stsp if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1195 e2b1e152 2019-07-13 stsp return got_fileindex_entry_update(ie, ondisk_path,
1196 e2b1e152 2019-07-13 stsp ie->blob_sha1, ie->commit_sha1, 1);
1198 e2b1e152 2019-07-13 stsp return NULL;
1201 9d31a1d8 2018-03-11 stsp static const struct got_error *
1202 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1203 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1204 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1205 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1206 0584f854 2019-04-06 stsp void *progress_arg)
1208 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1209 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1210 6353ad76 2019-02-08 stsp char *ondisk_path;
1211 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1212 b8f41171 2019-02-10 stsp struct stat sb;
1214 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1215 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1218 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1219 a76c42e6 2019-08-03 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1220 a76c42e6 2019-08-03 stsp goto done;
1222 abb4604f 2019-07-27 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1224 abb4604f 2019-07-27 stsp goto done;
1225 abb4604f 2019-07-27 stsp if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1226 abb4604f 2019-07-27 stsp sb.st_mode = got_fileindex_perms_to_st(ie);
1228 abb4604f 2019-07-27 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
1230 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1231 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1232 b8f41171 2019-02-10 stsp goto done;
1235 b8f41171 2019-02-10 stsp if (ie && status != GOT_STATUS_MISSING) {
1236 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1237 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1238 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1239 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1241 e2b1e152 2019-07-13 stsp goto done;
1242 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1244 6353ad76 2019-02-08 stsp goto done;
1246 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1247 1430b4e0 2019-03-27 stsp memcmp(ie->blob_sha1, te->id->sha1,
1248 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1249 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1250 b8f41171 2019-02-10 stsp goto done;
1254 8da9e5f4 2019-01-12 stsp err = got_object_open_as_blob(&blob, repo, te->id, 8192);
1256 6353ad76 2019-02-08 stsp goto done;
1258 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1259 234035bc 2019-06-01 stsp int update_timestamps;
1260 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1261 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1262 234035bc 2019-06-01 stsp struct got_object_id id2;
1263 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1264 234035bc 2019-06-01 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1266 234035bc 2019-06-01 stsp goto done;
1268 234035bc 2019-06-01 stsp err = merge_blob(&update_timestamps, worktree, blob2,
1269 818c7501 2019-07-11 stsp ondisk_path, path, sb.st_mode, blob,
1270 818c7501 2019-07-11 stsp worktree->base_commit_id, repo,
1271 234035bc 2019-06-01 stsp progress_cb, progress_arg);
1272 234035bc 2019-06-01 stsp if (blob2)
1273 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
1275 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
1276 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
1277 234035bc 2019-06-01 stsp * unmodified files again.
1279 234035bc 2019-06-01 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1280 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
1281 234035bc 2019-06-01 stsp update_timestamps);
1282 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
1283 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1285 1ee397ad 2019-07-12 stsp goto done;
1286 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1287 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 0);
1289 13d9040b 2019-03-27 stsp goto done;
1291 13d9040b 2019-03-27 stsp err = install_blob(worktree, ondisk_path, path, te->mode,
1292 a129376b 2019-03-28 stsp sb.st_mode, blob, status == GOT_STATUS_MISSING, 0,
1293 a129376b 2019-03-28 stsp repo, progress_cb, progress_arg);
1295 13d9040b 2019-03-27 stsp goto done;
1296 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1297 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 1);
1299 13d9040b 2019-03-27 stsp goto done;
1301 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
1303 6353ad76 2019-02-08 stsp free(ondisk_path);
1304 8da9e5f4 2019-01-12 stsp return err;
1307 90285c3b 2019-01-08 stsp static const struct got_error *
1308 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
1310 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
1311 90285c3b 2019-01-08 stsp char *ondisk_path = NULL;
1313 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
1314 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1316 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
1317 c97665ae 2019-01-13 stsp if (errno != ENOENT)
1318 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
1320 90285c3b 2019-01-08 stsp char *parent = dirname(ondisk_path);
1321 7a9df742 2019-01-08 stsp while (parent && strcmp(parent, root_path) != 0) {
1322 26c4ac4d 2019-01-08 stsp if (rmdir(parent) == -1) {
1323 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
1324 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
1328 90285c3b 2019-01-08 stsp parent = dirname(parent);
1331 90285c3b 2019-01-08 stsp free(ondisk_path);
1332 90285c3b 2019-01-08 stsp return err;
1335 708d8e67 2019-03-27 stsp static const struct got_error *
1336 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
1337 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
1338 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1340 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
1341 708d8e67 2019-03-27 stsp unsigned char status;
1342 708d8e67 2019-03-27 stsp struct stat sb;
1343 708d8e67 2019-03-27 stsp char *ondisk_path;
1345 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
1346 a76c42e6 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1348 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
1350 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1352 708d8e67 2019-03-27 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1354 708d8e67 2019-03-27 stsp return err;
1356 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
1357 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
1358 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
1360 1ee397ad 2019-07-12 stsp return err;
1362 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
1363 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
1365 fc6346c4 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
1368 708d8e67 2019-03-27 stsp return err;
1370 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
1372 1ee397ad 2019-07-12 stsp return err;
1373 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
1374 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
1376 fc6346c4 2019-03-27 stsp return err;
1378 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
1381 fc6346c4 2019-03-27 stsp return err;
1384 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
1385 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
1386 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
1387 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
1388 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
1389 8da9e5f4 2019-01-12 stsp void *progress_arg;
1390 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
1391 8da9e5f4 2019-01-12 stsp void *cancel_arg;
1394 512f0d0e 2019-01-02 stsp static const struct got_error *
1395 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
1396 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
1398 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1400 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1401 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1403 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
1404 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
1407 8da9e5f4 2019-01-12 stsp static const struct got_error *
1408 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1410 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1412 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1413 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1415 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
1416 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1419 9d31a1d8 2018-03-11 stsp static const struct got_error *
1420 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
1422 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1423 8da9e5f4 2019-01-12 stsp const struct got_error *err;
1424 8da9e5f4 2019-01-12 stsp char *path;
1426 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1427 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1429 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
1430 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
1432 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1434 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
1435 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
1437 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
1438 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1440 8da9e5f4 2019-01-12 stsp free(path);
1441 0cd1c46a 2019-03-11 stsp return err;
1444 818c7501 2019-07-11 stsp static const struct got_error *
1445 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
1447 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
1448 0647c563 2019-03-11 stsp char *uuidstr = NULL;
1449 0cd1c46a 2019-03-11 stsp uint32_t uuid_status;
1451 517bab73 2019-03-11 stsp *refname = NULL;
1453 0cd1c46a 2019-03-11 stsp uuid_to_string(&worktree->uuid, &uuidstr, &uuid_status);
1454 0cd1c46a 2019-03-11 stsp if (uuid_status != uuid_s_ok)
1455 0cd1c46a 2019-03-11 stsp return got_error_uuid(uuid_status);
1457 818c7501 2019-07-11 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr)
1459 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1460 0647c563 2019-03-11 stsp *refname = NULL;
1462 517bab73 2019-03-11 stsp free(uuidstr);
1463 517bab73 2019-03-11 stsp return err;
1466 818c7501 2019-07-11 stsp const struct got_error *
1467 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
1469 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
1472 818c7501 2019-07-11 stsp static const struct got_error *
1473 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
1475 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1476 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
1479 818c7501 2019-07-11 stsp static const struct got_error *
1480 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
1482 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
1485 818c7501 2019-07-11 stsp static const struct got_error *
1486 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
1488 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1489 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
1492 818c7501 2019-07-11 stsp static const struct got_error *
1493 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
1495 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1496 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
1499 0ebf8283 2019-07-24 stsp static const struct got_error *
1500 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
1502 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1503 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
1506 0ebf8283 2019-07-24 stsp static const struct got_error *
1507 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
1509 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1510 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
1513 0ebf8283 2019-07-24 stsp static const struct got_error *
1514 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
1516 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1517 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
1520 0ebf8283 2019-07-24 stsp static const struct got_error *
1521 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
1523 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1524 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
1527 0ebf8283 2019-07-24 stsp const struct got_error *
1528 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
1529 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
1531 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
1532 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
1533 0ebf8283 2019-07-24 stsp *path = NULL;
1534 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
1536 0ebf8283 2019-07-24 stsp return NULL;
1540 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
1541 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
1543 517bab73 2019-03-11 stsp static const struct got_error *
1544 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
1546 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
1547 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
1548 517bab73 2019-03-11 stsp char *refname;
1550 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
1552 517bab73 2019-03-11 stsp return err;
1554 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
1556 0cd1c46a 2019-03-11 stsp goto done;
1558 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
1560 0cd1c46a 2019-03-11 stsp free(refname);
1562 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
1563 3e3a69f1 2019-07-25 stsp return err;
1566 3e3a69f1 2019-07-25 stsp static const struct got_error *
1567 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
1569 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
1571 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
1572 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1573 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
1574 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
1576 9d31a1d8 2018-03-11 stsp return err;
1580 ebf99748 2019-05-09 stsp static const struct got_error *
1581 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
1582 ebf99748 2019-05-09 stsp struct got_worktree *worktree)
1584 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
1585 ebf99748 2019-05-09 stsp FILE *index = NULL;
1587 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1588 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
1589 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
1590 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
1592 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
1594 ebf99748 2019-05-09 stsp goto done;
1596 ebf99748 2019-05-09 stsp index = fopen(*fileindex_path, "rb");
1597 ebf99748 2019-05-09 stsp if (index == NULL) {
1598 ebf99748 2019-05-09 stsp if (errno != ENOENT)
1599 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
1601 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
1602 ebf99748 2019-05-09 stsp if (fclose(index) != 0 && err == NULL)
1603 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
1606 ebf99748 2019-05-09 stsp if (err) {
1607 ebf99748 2019-05-09 stsp free(*fileindex_path);
1608 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1609 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
1610 ebf99748 2019-05-09 stsp *fileindex = NULL;
1612 ebf99748 2019-05-09 stsp return err;
1615 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
1616 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
1617 c932eeeb 2019-05-22 stsp const char *path;
1618 c932eeeb 2019-05-22 stsp size_t path_len;
1619 c932eeeb 2019-05-22 stsp const char *entry_name;
1620 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
1621 a484d721 2019-06-10 stsp void *progress_arg;
1624 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
1625 c932eeeb 2019-05-22 stsp static const struct got_error *
1626 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
1628 1ee397ad 2019-07-12 stsp const struct got_error *err;
1629 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
1631 c932eeeb 2019-05-22 stsp if (a->entry_name) {
1632 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
1633 c932eeeb 2019-05-22 stsp return NULL;
1634 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
1635 102ff934 2019-06-11 stsp return NULL;
1637 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
1638 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
1639 c932eeeb 2019-05-22 stsp return NULL;
1641 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
1642 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
1643 edd02c5e 2019-07-11 stsp ie->path);
1645 1ee397ad 2019-07-12 stsp return err;
1647 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
1648 c932eeeb 2019-05-22 stsp return NULL;
1651 9c6338c4 2019-06-02 stsp static const struct got_error *
1652 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
1654 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
1655 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
1656 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
1658 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
1659 9c6338c4 2019-06-02 stsp fileindex_path);
1661 9c6338c4 2019-06-02 stsp goto done;
1663 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
1665 9c6338c4 2019-06-02 stsp goto done;
1667 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
1668 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
1669 9c6338c4 2019-06-02 stsp fileindex_path);
1670 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
1673 9c6338c4 2019-06-02 stsp if (new_index)
1674 9c6338c4 2019-06-02 stsp fclose(new_index);
1675 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
1676 9c6338c4 2019-06-02 stsp return err;
1679 6ced4176 2019-07-12 stsp static const struct got_error *
1680 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
1681 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
1682 6ced4176 2019-07-12 stsp struct got_worktree *worktree, struct got_repository *repo)
1684 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
1685 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
1686 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
1687 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
1689 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
1690 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
1691 6ced4176 2019-07-12 stsp *tree_id = NULL;
1693 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
1694 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
1695 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
1696 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
1697 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1698 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1699 6ced4176 2019-07-12 stsp goto done;
1701 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
1702 6ced4176 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
1704 6ced4176 2019-07-12 stsp goto done;
1705 6ced4176 2019-07-12 stsp return NULL;
1708 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
1710 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
1711 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
1712 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
1713 6ced4176 2019-07-12 stsp goto done;
1716 6ced4176 2019-07-12 stsp err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
1717 6ced4176 2019-07-12 stsp in_repo_path);
1719 6ced4176 2019-07-12 stsp goto done;
1721 6ced4176 2019-07-12 stsp free(in_repo_path);
1722 6ced4176 2019-07-12 stsp in_repo_path = NULL;
1724 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
1726 6ced4176 2019-07-12 stsp goto done;
1728 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
1729 6ced4176 2019-07-12 stsp /* Check out a single file. */
1730 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
1731 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
1732 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
1733 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
1734 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1735 6ced4176 2019-07-12 stsp goto done;
1737 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
1738 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1739 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1740 6ced4176 2019-07-12 stsp goto done;
1743 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
1744 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
1746 6ced4176 2019-07-12 stsp return err;
1747 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
1748 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
1749 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
1750 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
1751 6ced4176 2019-07-12 stsp goto done;
1754 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
1755 6ced4176 2019-07-12 stsp worktree->base_commit_id, in_repo_path);
1757 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
1758 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
1759 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
1760 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
1761 6ced4176 2019-07-12 stsp goto done;
1763 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
1764 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1765 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1766 6ced4176 2019-07-12 stsp goto done;
1771 6ced4176 2019-07-12 stsp free(in_repo_path);
1772 6ced4176 2019-07-12 stsp if (err) {
1773 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
1774 6ced4176 2019-07-12 stsp free(*tree_relpath);
1775 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
1776 6ced4176 2019-07-12 stsp free(*tree_id);
1777 6ced4176 2019-07-12 stsp *tree_id = NULL;
1779 07ed472d 2019-07-12 stsp return err;
1782 07ed472d 2019-07-12 stsp static const struct got_error *
1783 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
1784 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
1785 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1786 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
1788 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
1789 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
1790 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
1791 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
1792 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
1794 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
1796 07ed472d 2019-07-12 stsp goto done;
1798 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
1799 07ed472d 2019-07-12 stsp worktree->base_commit_id);
1801 07ed472d 2019-07-12 stsp goto done;
1803 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1805 07ed472d 2019-07-12 stsp goto done;
1807 07ed472d 2019-07-12 stsp if (entry_name &&
1808 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
1809 07ed472d 2019-07-12 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
1810 07ed472d 2019-07-12 stsp goto done;
1813 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
1814 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
1815 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
1816 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
1817 07ed472d 2019-07-12 stsp arg.worktree = worktree;
1818 07ed472d 2019-07-12 stsp arg.repo = repo;
1819 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
1820 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
1821 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
1822 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
1823 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
1824 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
1827 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
1828 07ed472d 2019-07-12 stsp if (commit)
1829 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
1830 6ced4176 2019-07-12 stsp return err;
1833 9d31a1d8 2018-03-11 stsp const struct got_error *
1834 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
1835 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
1836 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
1837 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
1839 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
1840 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
1841 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
1842 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
1843 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
1844 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
1845 f2ea84fa 2019-07-27 stsp struct tree_path_data {
1846 f2ea84fa 2019-07-27 stsp SIMPLEQ_ENTRY(tree_path_data) entry;
1847 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
1848 f2ea84fa 2019-07-27 stsp int entry_type;
1849 f2ea84fa 2019-07-27 stsp char *relpath;
1850 f2ea84fa 2019-07-27 stsp char *entry_name;
1851 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
1852 f2ea84fa 2019-07-27 stsp SIMPLEQ_HEAD(tree_paths, tree_path_data) tree_paths;
1854 f2ea84fa 2019-07-27 stsp SIMPLEQ_INIT(&tree_paths);
1856 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
1858 9d31a1d8 2018-03-11 stsp return err;
1860 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
1861 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
1862 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
1863 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
1864 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
1865 f2ea84fa 2019-07-27 stsp goto done;
1868 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
1869 f2ea84fa 2019-07-27 stsp &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
1870 f2ea84fa 2019-07-27 stsp if (err) {
1871 f2ea84fa 2019-07-27 stsp free(tpd);
1872 6ced4176 2019-07-12 stsp goto done;
1875 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
1876 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
1877 f2ea84fa 2019-07-27 stsp if (err) {
1878 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
1879 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
1880 f2ea84fa 2019-07-27 stsp free(tpd);
1881 f2ea84fa 2019-07-27 stsp goto done;
1884 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
1886 f2ea84fa 2019-07-27 stsp SIMPLEQ_INSERT_TAIL(&tree_paths, tpd, entry);
1890 51514078 2018-12-25 stsp * Read the file index.
1891 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
1892 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
1894 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
1896 c4cdcb68 2019-04-03 stsp goto done;
1898 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
1899 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
1900 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
1902 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
1903 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
1904 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
1908 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
1909 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
1910 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
1911 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
1912 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
1913 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
1914 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
1915 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
1919 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_NEXT(tpd, entry);
1921 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
1922 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
1923 af12c6b9 2019-06-04 stsp err = sync_err;
1925 9c6338c4 2019-06-02 stsp free(fileindex_path);
1927 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
1928 9d31a1d8 2018-03-11 stsp if (commit)
1929 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
1930 5ade8233 2019-07-12 stsp if (fileindex)
1931 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
1932 f2ea84fa 2019-07-27 stsp while (!SIMPLEQ_EMPTY(&tree_paths)) {
1933 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
1934 f2ea84fa 2019-07-27 stsp SIMPLEQ_REMOVE_HEAD(&tree_paths, entry);
1935 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
1936 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
1937 f2ea84fa 2019-07-27 stsp free(tpd);
1939 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
1940 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
1941 9d31a1d8 2018-03-11 stsp err = unlockerr;
1942 f8d1f275 2019-02-04 stsp return err;
1945 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
1946 234035bc 2019-06-01 stsp struct got_worktree *worktree;
1947 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
1948 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
1949 234035bc 2019-06-01 stsp void *progress_arg;
1950 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
1951 234035bc 2019-06-01 stsp void *cancel_arg;
1952 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
1955 234035bc 2019-06-01 stsp static const struct got_error *
1956 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
1957 234035bc 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
1958 234035bc 2019-06-01 stsp struct got_object_id *id2, const char *path1, const char *path2,
1959 234035bc 2019-06-01 stsp struct got_repository *repo)
1961 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
1962 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
1963 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
1964 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
1965 234035bc 2019-06-01 stsp struct stat sb;
1966 234035bc 2019-06-01 stsp unsigned char status;
1967 234035bc 2019-06-01 stsp int local_changes_subsumed;
1969 234035bc 2019-06-01 stsp if (blob1 && blob2) {
1970 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
1971 d6c87207 2019-08-02 stsp strlen(path2));
1972 1ee397ad 2019-07-12 stsp if (ie == NULL)
1973 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
1974 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
1976 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1977 234035bc 2019-06-01 stsp path2) == -1)
1978 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
1980 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1982 234035bc 2019-06-01 stsp goto done;
1984 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
1985 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
1986 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
1987 234035bc 2019-06-01 stsp goto done;
1989 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
1990 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
1991 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
1992 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
1993 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
1994 234035bc 2019-06-01 stsp goto done;
1997 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree, blob1,
1998 818c7501 2019-07-11 stsp ondisk_path, path2, sb.st_mode, blob2, a->commit_id2, repo,
1999 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
2000 234035bc 2019-06-01 stsp } else if (blob1) {
2001 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2002 d6c87207 2019-08-02 stsp strlen(path1));
2003 1ee397ad 2019-07-12 stsp if (ie == NULL)
2004 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2005 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2007 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2008 2b92fad7 2019-06-02 stsp path1) == -1)
2009 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2011 2b92fad7 2019-06-02 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2013 2b92fad7 2019-06-02 stsp goto done;
2015 2b92fad7 2019-06-02 stsp switch (status) {
2016 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2017 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2018 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2020 1ee397ad 2019-07-12 stsp goto done;
2021 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2023 2b92fad7 2019-06-02 stsp goto done;
2025 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2027 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
2028 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
2029 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2030 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2032 1ee397ad 2019-07-12 stsp goto done;
2034 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2036 2b92fad7 2019-06-02 stsp case GOT_STATUS_ADD:
2037 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
2038 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
2039 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2040 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
2042 1ee397ad 2019-07-12 stsp goto done;
2044 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
2045 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
2047 1ee397ad 2019-07-12 stsp goto done;
2052 234035bc 2019-06-01 stsp } else if (blob2) {
2053 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2054 234035bc 2019-06-01 stsp path2) == -1)
2055 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2056 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2057 d6c87207 2019-08-02 stsp strlen(path2));
2059 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
2062 234035bc 2019-06-01 stsp goto done;
2063 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2064 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2065 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2066 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2067 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2068 1ee397ad 2019-07-12 stsp status, path2);
2069 234035bc 2019-06-01 stsp goto done;
2071 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
2072 818c7501 2019-07-11 stsp NULL, ondisk_path, path2, sb.st_mode, blob2,
2073 818c7501 2019-07-11 stsp a->commit_id2, repo,
2074 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
2075 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2076 234035bc 2019-06-01 stsp err = update_blob_fileindex_entry(a->worktree,
2077 234035bc 2019-06-01 stsp a->fileindex, ie, ondisk_path, ie->path,
2078 234035bc 2019-06-01 stsp blob2, 0);
2080 234035bc 2019-06-01 stsp goto done;
2083 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2084 234035bc 2019-06-01 stsp err = install_blob(a->worktree, ondisk_path, path2,
2085 234035bc 2019-06-01 stsp /* XXX get this from parent tree! */
2086 234035bc 2019-06-01 stsp GOT_DEFAULT_FILE_MODE,
2087 234035bc 2019-06-01 stsp sb.st_mode, blob2, 0, 0, repo,
2088 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
2090 234035bc 2019-06-01 stsp goto done;
2091 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_alloc(&ie,
2092 2b92fad7 2019-06-02 stsp ondisk_path, path2, NULL, NULL);
2094 234035bc 2019-06-01 stsp goto done;
2095 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
2096 2b92fad7 2019-06-02 stsp if (err) {
2097 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
2098 2b92fad7 2019-06-02 stsp goto done;
2103 234035bc 2019-06-01 stsp free(ondisk_path);
2104 234035bc 2019-06-01 stsp return err;
2107 234035bc 2019-06-01 stsp struct check_merge_ok_arg {
2108 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2109 234035bc 2019-06-01 stsp struct got_repository *repo;
2112 234035bc 2019-06-01 stsp static const struct got_error *
2113 234035bc 2019-06-01 stsp check_merge_ok(void *arg, struct got_fileindex_entry *ie)
2115 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
2116 234035bc 2019-06-01 stsp struct check_merge_ok_arg *a = arg;
2117 234035bc 2019-06-01 stsp unsigned char status;
2118 234035bc 2019-06-01 stsp struct stat sb;
2119 234035bc 2019-06-01 stsp char *ondisk_path;
2121 234035bc 2019-06-01 stsp /* Reject merges into a work tree with mixed base commits. */
2122 234035bc 2019-06-01 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
2123 234035bc 2019-06-01 stsp SHA1_DIGEST_LENGTH))
2124 234035bc 2019-06-01 stsp return got_error(GOT_ERR_MIXED_COMMITS);
2126 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
2128 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2130 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
2131 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
2133 234035bc 2019-06-01 stsp return err;
2134 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
2135 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
2137 234035bc 2019-06-01 stsp return NULL;
2140 818c7501 2019-07-11 stsp static const struct got_error *
2141 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2142 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
2143 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
2144 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2145 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2147 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
2148 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
2149 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2150 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
2152 03415a1a 2019-06-02 stsp if (commit_id1) {
2153 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
2154 03415a1a 2019-06-02 stsp worktree->path_prefix);
2156 03415a1a 2019-06-02 stsp goto done;
2158 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
2160 03415a1a 2019-06-02 stsp goto done;
2163 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
2164 234035bc 2019-06-01 stsp worktree->path_prefix);
2166 234035bc 2019-06-01 stsp goto done;
2168 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
2170 234035bc 2019-06-01 stsp goto done;
2172 234035bc 2019-06-01 stsp arg.worktree = worktree;
2173 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
2174 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
2175 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
2176 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
2177 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
2178 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
2179 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
2180 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2181 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2182 af12c6b9 2019-06-04 stsp err = sync_err;
2184 234035bc 2019-06-01 stsp if (tree1)
2185 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
2186 234035bc 2019-06-01 stsp if (tree2)
2187 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
2188 818c7501 2019-07-11 stsp return err;
2191 818c7501 2019-07-11 stsp const struct got_error *
2192 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
2193 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
2194 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2195 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2197 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
2198 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
2199 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
2200 818c7501 2019-07-11 stsp struct check_merge_ok_arg mok_arg;
2202 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
2204 818c7501 2019-07-11 stsp return err;
2206 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2208 818c7501 2019-07-11 stsp goto done;
2210 818c7501 2019-07-11 stsp mok_arg.worktree = worktree;
2211 818c7501 2019-07-11 stsp mok_arg.repo = repo;
2212 818c7501 2019-07-11 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
2213 818c7501 2019-07-11 stsp &mok_arg);
2215 818c7501 2019-07-11 stsp goto done;
2217 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
2218 818c7501 2019-07-11 stsp commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
2220 818c7501 2019-07-11 stsp if (fileindex)
2221 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
2222 818c7501 2019-07-11 stsp free(fileindex_path);
2223 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2224 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
2225 234035bc 2019-06-01 stsp err = unlockerr;
2226 234035bc 2019-06-01 stsp return err;
2229 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
2230 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
2231 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
2232 927df6b7 2019-02-10 stsp const char *status_path;
2233 927df6b7 2019-02-10 stsp size_t status_path_len;
2234 f8d1f275 2019-02-04 stsp struct got_repository *repo;
2235 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
2236 f8d1f275 2019-02-04 stsp void *status_arg;
2237 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2238 f8d1f275 2019-02-04 stsp void *cancel_arg;
2239 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
2240 6841da00 2019-08-08 stsp struct got_pathlist_head ignores;
2243 f8d1f275 2019-02-04 stsp static const struct got_error *
2244 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
2245 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
2246 927df6b7 2019-02-10 stsp struct got_repository *repo)
2248 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
2249 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
2250 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
2251 927df6b7 2019-02-10 stsp struct stat sb;
2252 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
2253 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
2254 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
2256 927df6b7 2019-02-10 stsp err = get_file_status(&status, &sb, ie, abspath, repo);
2258 98eaaa12 2019-08-03 stsp return err;
2260 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
2261 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_NO_CHANGE)
2262 98eaaa12 2019-08-03 stsp return NULL;
2264 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_blob(ie)) {
2265 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2266 98eaaa12 2019-08-03 stsp blob_idp = &blob_id;
2268 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
2269 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2270 98eaaa12 2019-08-03 stsp commit_idp = &commit_id;
2272 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
2273 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
2274 98eaaa12 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
2275 98eaaa12 2019-08-03 stsp SHA1_DIGEST_LENGTH);
2276 98eaaa12 2019-08-03 stsp staged_blob_idp = &staged_blob_id;
2279 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
2280 98eaaa12 2019-08-03 stsp ie->path, blob_idp, staged_blob_idp, commit_idp);
2283 927df6b7 2019-02-10 stsp static const struct got_error *
2284 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
2285 f8d1f275 2019-02-04 stsp struct dirent *de, const char *parent_path)
2287 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2288 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2289 f8d1f275 2019-02-04 stsp char *abspath;
2291 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2292 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2294 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
2295 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
2296 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
2297 927df6b7 2019-02-10 stsp return NULL;
2299 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2300 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
2301 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
2302 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2304 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
2305 f8d1f275 2019-02-04 stsp de->d_name) == -1)
2306 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2309 927df6b7 2019-02-10 stsp err = report_file_status(ie, abspath, a->status_cb, a->status_arg,
2311 f8d1f275 2019-02-04 stsp free(abspath);
2312 9d31a1d8 2018-03-11 stsp return err;
2315 f8d1f275 2019-02-04 stsp static const struct got_error *
2316 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2318 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2319 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
2320 2ec1f75b 2019-03-26 stsp unsigned char status;
2322 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2323 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2325 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
2326 927df6b7 2019-02-10 stsp return NULL;
2328 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2329 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2330 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
2331 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
2333 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
2334 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
2335 537ac44b 2019-08-03 stsp ie->path, &blob_id, NULL, &commit_id);
2339 6841da00 2019-08-08 stsp free_ignorelist(struct got_pathlist_head *ignorelist)
2341 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2343 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignorelist, entry)
2344 6841da00 2019-08-08 stsp free((char *)pe->path);
2345 6841da00 2019-08-08 stsp got_pathlist_free(ignorelist);
2349 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
2351 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2353 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
2354 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
2355 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
2356 6841da00 2019-08-08 stsp free((char *)pe->path);
2358 6841da00 2019-08-08 stsp got_pathlist_free(ignores);
2361 6841da00 2019-08-08 stsp static const struct got_error *
2362 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
2364 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
2365 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
2366 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
2367 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
2368 6841da00 2019-08-08 stsp size_t linesize = 0;
2369 6841da00 2019-08-08 stsp ssize_t linelen;
2371 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
2372 6841da00 2019-08-08 stsp if (ignorelist == NULL)
2373 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
2374 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
2376 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
2377 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
2378 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
2379 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
2380 6841da00 2019-08-08 stsp line) == -1) {
2381 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
2382 6841da00 2019-08-08 stsp goto done;
2384 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
2386 6841da00 2019-08-08 stsp goto done;
2388 6841da00 2019-08-08 stsp if (ferror(f)) {
2389 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
2390 6841da00 2019-08-08 stsp goto done;
2393 6841da00 2019-08-08 stsp dirpath = strdup(path);
2394 6841da00 2019-08-08 stsp if (dirpath == NULL) {
2395 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
2396 6841da00 2019-08-08 stsp goto done;
2398 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
2400 6841da00 2019-08-08 stsp free(line);
2401 6841da00 2019-08-08 stsp if (err || pe == NULL) {
2402 6841da00 2019-08-08 stsp free(dirpath);
2403 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
2405 6841da00 2019-08-08 stsp return err;
2409 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
2411 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2414 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
2415 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
2416 6841da00 2019-08-08 stsp * ignores backwards.
2418 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
2419 6841da00 2019-08-08 stsp while (pe) {
2420 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
2421 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
2422 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
2423 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
2424 6841da00 2019-08-08 stsp if (fnmatch(pi->path, path,
2425 6841da00 2019-08-08 stsp FNM_PATHNAME | FNM_LEADING_DIR))
2430 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
2436 6841da00 2019-08-08 stsp static const struct got_error *
2437 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
2438 b80270a7 2019-08-08 stsp const char *path)
2440 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
2441 6841da00 2019-08-08 stsp char *ignorespath;
2442 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
2444 6841da00 2019-08-08 stsp /* TODO: read .gitignores as well... */
2445 b80270a7 2019-08-08 stsp if (asprintf(&ignorespath, "%s/%s%s.cvsignore", root_path, path,
2446 b80270a7 2019-08-08 stsp path[0] ? "/" : "") == -1)
2447 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
2449 6841da00 2019-08-08 stsp ignoresfile = fopen(ignorespath, "r");
2450 6841da00 2019-08-08 stsp if (ignoresfile == NULL) {
2451 6841da00 2019-08-08 stsp if (errno != ENOENT)
2452 6841da00 2019-08-08 stsp err = got_error_from_errno2("fopen",
2453 6841da00 2019-08-08 stsp ignorespath);
2455 6841da00 2019-08-08 stsp err = read_ignores(ignores, path, ignoresfile);
2457 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
2458 6841da00 2019-08-08 stsp err = got_error_from_errno2("flose", path);
2459 6841da00 2019-08-08 stsp free(ignorespath);
2460 6841da00 2019-08-08 stsp return err;
2463 f8d1f275 2019-02-04 stsp static const struct got_error *
2464 f8d1f275 2019-02-04 stsp status_new(void *arg, struct dirent *de, const char *parent_path)
2466 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
2467 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2468 f8d1f275 2019-02-04 stsp char *path = NULL;
2470 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2471 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2473 2c201a36 2019-02-10 stsp /* XXX ignore symlinks for now */
2474 2c201a36 2019-02-10 stsp if (de->d_type == DT_LNK)
2475 927df6b7 2019-02-10 stsp return NULL;
2477 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2478 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
2479 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2481 f8d1f275 2019-02-04 stsp path = de->d_name;
2484 6841da00 2019-08-08 stsp if (de->d_type == DT_DIR)
2485 b80270a7 2019-08-08 stsp err = add_ignores(&a->ignores, a->worktree->root_path, path);
2486 6841da00 2019-08-08 stsp else if (got_path_is_child(path, a->status_path, a->status_path_len)
2487 6841da00 2019-08-08 stsp && !match_ignores(&a->ignores, path))
2488 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
2489 537ac44b 2019-08-03 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL);
2490 f8d1f275 2019-02-04 stsp if (parent_path[0])
2491 f8d1f275 2019-02-04 stsp free(path);
2492 b72f483a 2019-02-05 stsp return err;
2495 347d1d3e 2019-07-12 stsp static const struct got_error *
2496 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
2497 abb4604f 2019-07-27 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
2498 abb4604f 2019-07-27 stsp void *status_arg, struct got_repository *repo)
2500 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
2501 abb4604f 2019-07-27 stsp struct stat sb;
2503 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
2505 abb4604f 2019-07-27 stsp return report_file_status(ie, ondisk_path, status_cb,
2506 abb4604f 2019-07-27 stsp status_arg, repo);
2508 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
2509 abb4604f 2019-07-27 stsp if (errno != ENOENT)
2510 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
2511 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
2512 2a06fe5f 2019-08-24 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL);
2513 abb4604f 2019-07-27 stsp return NULL;
2516 abb4604f 2019-07-27 stsp if (S_ISREG(sb.st_mode))
2517 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
2518 537ac44b 2019-08-03 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL);
2520 abb4604f 2019-07-27 stsp return NULL;
2523 abb4604f 2019-07-27 stsp static const struct got_error *
2524 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
2525 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
2526 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
2527 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2529 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2530 f8d1f275 2019-02-04 stsp DIR *workdir = NULL;
2531 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
2532 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
2533 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
2535 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
2536 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
2537 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
2539 927df6b7 2019-02-10 stsp workdir = opendir(ondisk_path);
2540 927df6b7 2019-02-10 stsp if (workdir == NULL) {
2541 abb4604f 2019-07-27 stsp if (errno != ENOTDIR && errno != ENOENT)
2542 638f9024 2019-05-13 stsp err = got_error_from_errno2("opendir", ondisk_path);
2544 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
2545 abb4604f 2019-07-27 stsp fileindex, status_cb, status_arg, repo);
2547 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
2548 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
2549 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
2550 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
2551 abb4604f 2019-07-27 stsp arg.worktree = worktree;
2552 abb4604f 2019-07-27 stsp arg.status_path = path;
2553 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
2554 abb4604f 2019-07-27 stsp arg.repo = repo;
2555 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
2556 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
2557 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
2558 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
2559 6841da00 2019-08-08 stsp TAILQ_INIT(&arg.ignores);
2560 b80270a7 2019-08-08 stsp err = add_ignores(&arg.ignores, worktree->root_path, path);
2561 6841da00 2019-08-08 stsp if (err == NULL)
2562 6841da00 2019-08-08 stsp err = got_fileindex_diff_dir(fileindex, workdir,
2563 6841da00 2019-08-08 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
2564 6841da00 2019-08-08 stsp free_ignores(&arg.ignores);
2567 f8d1f275 2019-02-04 stsp if (workdir)
2568 f8d1f275 2019-02-04 stsp closedir(workdir);
2569 927df6b7 2019-02-10 stsp free(ondisk_path);
2570 347d1d3e 2019-07-12 stsp return err;
2573 347d1d3e 2019-07-12 stsp const struct got_error *
2574 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
2575 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2576 72ea6654 2019-07-27 stsp got_worktree_status_cb status_cb, void *status_arg,
2577 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2579 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
2580 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
2581 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
2582 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
2584 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2586 347d1d3e 2019-07-12 stsp return err;
2588 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2589 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
2590 72ea6654 2019-07-27 stsp status_cb, status_arg, cancel_cb, cancel_arg);
2594 f8d1f275 2019-02-04 stsp free(fileindex_path);
2595 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
2596 f8d1f275 2019-02-04 stsp return err;
2599 6c7ab921 2019-03-18 stsp const struct got_error *
2600 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
2601 6c7ab921 2019-03-18 stsp const char *arg)
2603 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
2604 d0710d08 2019-07-22 stsp char *resolved, *cwd = NULL, *path = NULL;
2605 6c7ab921 2019-03-18 stsp size_t len;
2607 6c7ab921 2019-03-18 stsp *wt_path = NULL;
2609 6c7ab921 2019-03-18 stsp resolved = realpath(arg, NULL);
2610 d0710d08 2019-07-22 stsp if (resolved == NULL) {
2611 d0710d08 2019-07-22 stsp if (errno != ENOENT)
2612 d0710d08 2019-07-22 stsp return got_error_from_errno2("realpath", arg);
2613 d0710d08 2019-07-22 stsp cwd = getcwd(NULL, 0);
2614 d0710d08 2019-07-22 stsp if (cwd == NULL)
2615 d0710d08 2019-07-22 stsp return got_error_from_errno("getcwd");
2616 d0710d08 2019-07-22 stsp if (asprintf(&resolved, "%s/%s", cwd, arg) == -1) {
2617 d0710d08 2019-07-22 stsp err = got_error_from_errno("asprintf");
2618 d0710d08 2019-07-22 stsp goto done;
2622 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
2623 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
2624 6c7ab921 2019-03-18 stsp err = got_error(GOT_ERR_BAD_PATH);
2625 6c7ab921 2019-03-18 stsp goto done;
2628 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
2629 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
2630 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
2632 f6d88e1a 2019-05-29 stsp goto done;
2634 f6d88e1a 2019-05-29 stsp path = strdup("");
2635 f6d88e1a 2019-05-29 stsp if (path == NULL) {
2636 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
2637 f6d88e1a 2019-05-29 stsp goto done;
2641 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
2642 6c7ab921 2019-03-18 stsp len = strlen(path);
2643 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
2644 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
2648 6c7ab921 2019-03-18 stsp free(resolved);
2649 d0710d08 2019-07-22 stsp free(cwd);
2650 6c7ab921 2019-03-18 stsp if (err == NULL)
2651 6c7ab921 2019-03-18 stsp *wt_path = path;
2653 6c7ab921 2019-03-18 stsp free(path);
2654 d00136be 2019-03-26 stsp return err;
2657 07f5b47a 2019-06-02 stsp static const struct got_error *
2658 07f5b47a 2019-06-02 stsp schedule_addition(const char *ondisk_path, struct got_fileindex *fileindex,
2659 07f5b47a 2019-06-02 stsp const char *relpath, got_worktree_status_cb status_cb, void *status_arg,
2660 07f5b47a 2019-06-02 stsp struct got_repository *repo)
2662 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
2663 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
2664 6d022e97 2019-08-04 stsp unsigned char status;
2665 6d022e97 2019-08-04 stsp struct stat sb;
2667 6d022e97 2019-08-04 stsp ie = got_fileindex_entry_get(fileindex, relpath, strlen(relpath));
2669 6d022e97 2019-08-04 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2671 6d022e97 2019-08-04 stsp return err;
2672 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
2673 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
2674 6d022e97 2019-08-04 stsp return NULL;
2675 6d022e97 2019-08-04 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
2678 07f5b47a 2019-06-02 stsp err = got_fileindex_entry_alloc(&ie, ondisk_path, relpath, NULL, NULL);
2680 07f5b47a 2019-06-02 stsp return err;
2682 07f5b47a 2019-06-02 stsp err = got_fileindex_entry_add(fileindex, ie);
2683 07f5b47a 2019-06-02 stsp if (err) {
2684 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
2685 07f5b47a 2019-06-02 stsp return err;
2688 c02b99b6 2019-07-27 stsp return report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
2691 d00136be 2019-03-26 stsp const struct got_error *
2692 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
2693 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
2694 1dd54920 2019-05-11 stsp got_worktree_status_cb status_cb, void *status_arg,
2695 031a5338 2019-03-26 stsp struct got_repository *repo)
2697 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
2698 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2699 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2700 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
2702 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
2704 d00136be 2019-03-26 stsp return err;
2706 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2708 d00136be 2019-03-26 stsp goto done;
2710 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
2711 6d022e97 2019-08-04 stsp char *ondisk_path;
2712 6d022e97 2019-08-04 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path,
2713 6d022e97 2019-08-04 stsp pe->path) == -1)
2714 6d022e97 2019-08-04 stsp return got_error_from_errno("asprintf");
2715 6d022e97 2019-08-04 stsp err = schedule_addition(ondisk_path, fileindex, pe->path,
2716 07f5b47a 2019-06-02 stsp status_cb, status_arg, repo);
2717 6d022e97 2019-08-04 stsp free(ondisk_path);
2721 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2722 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2723 af12c6b9 2019-06-04 stsp err = sync_err;
2725 fb399478 2019-07-12 stsp free(fileindex_path);
2726 d00136be 2019-03-26 stsp if (fileindex)
2727 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
2728 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2729 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
2730 d00136be 2019-03-26 stsp err = unlockerr;
2731 6c7ab921 2019-03-18 stsp return err;
2734 17ed4618 2019-06-02 stsp static const struct got_error *
2735 17ed4618 2019-06-02 stsp schedule_for_deletion(const char *ondisk_path, struct got_fileindex *fileindex,
2736 17ed4618 2019-06-02 stsp const char *relpath, int delete_local_mods,
2737 17ed4618 2019-06-02 stsp got_worktree_status_cb status_cb, void *status_arg,
2738 17ed4618 2019-06-02 stsp struct got_repository *repo)
2740 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
2741 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
2742 9acbc4fa 2019-08-03 stsp unsigned char status, staged_status;
2743 17ed4618 2019-06-02 stsp struct stat sb;
2745 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, relpath, strlen(relpath));
2746 17ed4618 2019-06-02 stsp if (ie == NULL)
2747 17ed4618 2019-06-02 stsp return got_error(GOT_ERR_BAD_PATH);
2749 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
2750 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
2751 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
2752 9acbc4fa 2019-08-03 stsp return NULL;
2753 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
2756 17ed4618 2019-06-02 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2758 17ed4618 2019-06-02 stsp return err;
2760 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
2761 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
2762 de426ea6 2019-08-03 stsp return NULL;
2763 f0b0c0ce 2019-08-04 stsp if (status == GOT_STATUS_MODIFY && !delete_local_mods)
2764 f0b0c0ce 2019-08-04 stsp return got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
2765 f0b0c0ce 2019-08-04 stsp if (status != GOT_STATUS_MODIFY &&
2766 f0b0c0ce 2019-08-04 stsp status != GOT_STATUS_MISSING)
2767 f0b0c0ce 2019-08-04 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
2770 f0b0c0ce 2019-08-04 stsp if (status != GOT_STATUS_MISSING && unlink(ondisk_path) != 0)
2771 17ed4618 2019-06-02 stsp return got_error_from_errno2("unlink", ondisk_path);
2773 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2774 17ed4618 2019-06-02 stsp return report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
2777 2ec1f75b 2019-03-26 stsp const struct got_error *
2778 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
2779 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
2780 2ec1f75b 2019-03-26 stsp got_worktree_status_cb status_cb, void *status_arg,
2781 2ec1f75b 2019-03-26 stsp struct got_repository *repo)
2783 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
2784 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
2785 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2786 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
2788 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
2790 2ec1f75b 2019-03-26 stsp return err;
2792 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2794 2ec1f75b 2019-03-26 stsp goto done;
2796 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
2797 6d022e97 2019-08-04 stsp char *ondisk_path;
2798 6d022e97 2019-08-04 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path,
2799 6d022e97 2019-08-04 stsp pe->path) == -1)
2800 6d022e97 2019-08-04 stsp return got_error_from_errno("asprintf");
2801 6d022e97 2019-08-04 stsp err = schedule_for_deletion(ondisk_path, fileindex, pe->path,
2802 17ed4618 2019-06-02 stsp delete_local_mods, status_cb, status_arg, repo);
2803 6d022e97 2019-08-04 stsp free(ondisk_path);
2807 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2808 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2809 af12c6b9 2019-06-04 stsp err = sync_err;
2811 fb399478 2019-07-12 stsp free(fileindex_path);
2812 2ec1f75b 2019-03-26 stsp if (fileindex)
2813 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
2814 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2815 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
2816 2ec1f75b 2019-03-26 stsp err = unlockerr;
2817 33aa809d 2019-08-08 stsp return err;
2820 33aa809d 2019-08-08 stsp static const struct got_error *
2821 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
2823 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
2824 33aa809d 2019-08-08 stsp char *line = NULL;
2825 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
2826 33aa809d 2019-08-08 stsp ssize_t linelen;
2828 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
2829 33aa809d 2019-08-08 stsp if (linelen == -1) {
2830 33aa809d 2019-08-08 stsp if (ferror(infile)) {
2831 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
2832 33aa809d 2019-08-08 stsp goto done;
2834 33aa809d 2019-08-08 stsp return NULL;
2836 33aa809d 2019-08-08 stsp if (outfile) {
2837 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
2838 33aa809d 2019-08-08 stsp if (n != linelen) {
2839 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
2840 33aa809d 2019-08-08 stsp goto done;
2843 33aa809d 2019-08-08 stsp if (rejectfile) {
2844 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
2845 33aa809d 2019-08-08 stsp if (n != linelen)
2846 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
2849 33aa809d 2019-08-08 stsp free(line);
2850 2ec1f75b 2019-03-26 stsp return err;
2853 33aa809d 2019-08-08 stsp static const struct got_error *
2854 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
2856 33aa809d 2019-08-08 stsp char *line = NULL;
2857 33aa809d 2019-08-08 stsp size_t linesize = 0;
2858 33aa809d 2019-08-08 stsp ssize_t linelen;
2860 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
2861 33aa809d 2019-08-08 stsp free(line);
2862 33aa809d 2019-08-08 stsp if (linelen == -1 && ferror(f))
2863 33aa809d 2019-08-08 stsp return got_error_from_errno("getline");
2864 33aa809d 2019-08-08 stsp return NULL;
2867 33aa809d 2019-08-08 stsp static const struct got_error *
2868 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
2869 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
2870 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
2872 33aa809d 2019-08-08 stsp const struct got_error *err;
2874 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
2875 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
2876 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
2878 33aa809d 2019-08-08 stsp return err;
2879 33aa809d 2019-08-08 stsp (*line_cur1)++;
2881 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
2882 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
2883 33aa809d 2019-08-08 stsp if (rejectfile)
2884 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
2886 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
2888 33aa809d 2019-08-08 stsp return err;
2889 33aa809d 2019-08-08 stsp (*line_cur2)++;
2891 33aa809d 2019-08-08 stsp /* Copy patched lines. */
2892 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
2893 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
2895 33aa809d 2019-08-08 stsp return err;
2896 33aa809d 2019-08-08 stsp (*line_cur2)++;
2898 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
2899 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
2900 33aa809d 2019-08-08 stsp if (rejectfile)
2901 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
2903 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
2905 33aa809d 2019-08-08 stsp return err;
2906 33aa809d 2019-08-08 stsp (*line_cur1)++;
2909 f1e81a05 2019-08-10 stsp return NULL;
2912 f1e81a05 2019-08-10 stsp static const struct got_error *
2913 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
2914 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
2916 f1e81a05 2019-08-10 stsp const struct got_error *err;
2918 f1e81a05 2019-08-10 stsp if (outfile) {
2919 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
2920 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
2921 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
2923 f1e81a05 2019-08-10 stsp return err;
2924 f1e81a05 2019-08-10 stsp (*line_cur1)++;
2927 f1e81a05 2019-08-10 stsp if (rejectfile) {
2928 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
2929 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
2930 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
2932 f1e81a05 2019-08-10 stsp return err;
2933 f1e81a05 2019-08-10 stsp (*line_cur2)++;
2937 33aa809d 2019-08-08 stsp return NULL;
2940 33aa809d 2019-08-08 stsp static const struct got_error *
2941 33aa809d 2019-08-08 stsp apply_or_reject_change(int *choice, struct got_diff_change *change, int n,
2942 33aa809d 2019-08-08 stsp int nchanges, struct got_diff_state *ds, struct got_diff_args *args,
2943 33aa809d 2019-08-08 stsp int diff_flags, const char *relpath, FILE *f1, FILE *f2, int *line_cur1,
2944 33aa809d 2019-08-08 stsp int *line_cur2, FILE *outfile, FILE *rejectfile,
2945 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
2947 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
2948 33aa809d 2019-08-08 stsp int start_old = change->cv.a;
2949 33aa809d 2019-08-08 stsp int end_old = change->cv.b;
2950 33aa809d 2019-08-08 stsp int start_new = change->cv.c;
2951 33aa809d 2019-08-08 stsp int end_new = change->cv.d;
2952 33aa809d 2019-08-08 stsp long pos1, pos2;
2953 33aa809d 2019-08-08 stsp FILE *hunkfile;
2955 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
2957 33aa809d 2019-08-08 stsp hunkfile = got_opentemp();
2958 33aa809d 2019-08-08 stsp if (hunkfile == NULL)
2959 33aa809d 2019-08-08 stsp return got_error_from_errno("got_opentemp");
2961 33aa809d 2019-08-08 stsp pos1 = ftell(f1);
2962 33aa809d 2019-08-08 stsp pos2 = ftell(f2);
2964 33aa809d 2019-08-08 stsp /* XXX TODO needs error checking */
2965 33aa809d 2019-08-08 stsp got_diff_dump_change(hunkfile, change, ds, args, f1, f2, diff_flags);
2967 33aa809d 2019-08-08 stsp if (fseek(f1, pos1, SEEK_SET) == -1) {
2968 33aa809d 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
2969 33aa809d 2019-08-08 stsp goto done;
2971 33aa809d 2019-08-08 stsp if (fseek(f2, pos2, SEEK_SET) == -1) {
2972 33aa809d 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
2973 33aa809d 2019-08-08 stsp goto done;
2975 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
2976 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
2977 33aa809d 2019-08-08 stsp goto done;
2980 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
2981 33aa809d 2019-08-08 stsp hunkfile, n, nchanges);
2983 33aa809d 2019-08-08 stsp goto done;
2985 33aa809d 2019-08-08 stsp switch (*choice) {
2986 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
2987 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
2988 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
2990 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
2991 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
2992 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
2994 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
2997 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
3001 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
3002 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
3003 33aa809d 2019-08-08 stsp return err;
3006 1f1abb7e 2019-08-08 stsp struct revert_file_args {
3007 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
3008 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
3009 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
3010 1f1abb7e 2019-08-08 stsp void *progress_arg;
3011 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
3012 33aa809d 2019-08-08 stsp void *patch_arg;
3013 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
3016 e20a8b6f 2019-06-04 stsp static const struct got_error *
3017 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
3018 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
3019 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
3020 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
3022 33aa809d 2019-08-08 stsp const struct got_error *err;
3023 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
3024 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
3025 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
3026 33aa809d 2019-08-08 stsp struct stat sb1, sb2;
3027 33aa809d 2019-08-08 stsp struct got_diff_changes *changes = NULL;
3028 33aa809d 2019-08-08 stsp struct got_diff_state *ds = NULL;
3029 33aa809d 2019-08-08 stsp struct got_diff_args *args = NULL;
3030 33aa809d 2019-08-08 stsp struct got_diff_change *change;
3031 33aa809d 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, have_content = 0;
3032 33aa809d 2019-08-08 stsp int n = 0;
3034 33aa809d 2019-08-08 stsp *path_outfile = NULL;
3036 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
3038 33aa809d 2019-08-08 stsp return err;
3040 33aa809d 2019-08-08 stsp f2 = fopen(path2, "r");
3041 33aa809d 2019-08-08 stsp if (f2 == NULL) {
3042 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fopen", path2);
3043 33aa809d 2019-08-08 stsp goto done;
3046 33aa809d 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
3048 33aa809d 2019-08-08 stsp goto done;
3050 e635744c 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob");
3052 33aa809d 2019-08-08 stsp goto done;
3054 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
3056 33aa809d 2019-08-08 stsp goto done;
3058 33aa809d 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
3059 33aa809d 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
3060 33aa809d 2019-08-08 stsp goto done;
3062 33aa809d 2019-08-08 stsp if (stat(path2, &sb2) == -1) {
3063 33aa809d 2019-08-08 stsp err = got_error_from_errno2("stat", path2);
3064 33aa809d 2019-08-08 stsp goto done;
3067 33aa809d 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
3068 33aa809d 2019-08-08 stsp f1, sb1.st_size, id_str, f2, sb2.st_size, path2, 3, NULL);
3070 33aa809d 2019-08-08 stsp goto done;
3072 e635744c 2019-08-08 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
3074 33aa809d 2019-08-08 stsp goto done;
3076 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
3077 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
3078 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
3079 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
3080 33aa809d 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
3081 33aa809d 2019-08-08 stsp int choice;
3082 33aa809d 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
3083 33aa809d 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
3084 33aa809d 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
3085 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
3086 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
3087 e635744c 2019-08-08 stsp patch_cb, patch_arg);
3089 33aa809d 2019-08-08 stsp goto done;
3090 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
3091 33aa809d 2019-08-08 stsp have_content = 1;
3092 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
3095 f1e81a05 2019-08-10 stsp if (have_content)
3096 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
3097 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
3098 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
3100 33aa809d 2019-08-08 stsp free(id_str);
3102 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
3103 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
3104 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
3105 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
3106 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
3107 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
3108 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
3109 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
3110 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
3111 33aa809d 2019-08-08 stsp if (err || !have_content) {
3112 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
3113 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
3114 33aa809d 2019-08-08 stsp free(*path_outfile);
3115 33aa809d 2019-08-08 stsp *path_outfile = NULL;
3117 33aa809d 2019-08-08 stsp free(args);
3119 33aa809d 2019-08-08 stsp got_diff_state_free(ds);
3122 33aa809d 2019-08-08 stsp if (changes)
3123 33aa809d 2019-08-08 stsp got_diff_free_changes(changes);
3124 33aa809d 2019-08-08 stsp free(path1);
3125 33aa809d 2019-08-08 stsp return err;
3128 33aa809d 2019-08-08 stsp static const struct got_error *
3129 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
3130 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
3131 1f1abb7e 2019-08-08 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
3133 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
3134 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
3135 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
3136 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
3137 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
3138 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
3139 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
3140 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
3141 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
3142 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
3144 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
3145 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
3146 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
3147 d3bcc3d1 2019-08-08 stsp return NULL;
3149 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
3150 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
3151 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
3153 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3154 65084dad 2019-08-08 stsp if (ie == NULL)
3155 65084dad 2019-08-08 stsp return got_error(GOT_ERR_BAD_PATH);
3157 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
3158 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
3159 a129376b 2019-03-28 stsp if (err) {
3160 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
3161 a129376b 2019-03-28 stsp goto done;
3162 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
3163 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
3164 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
3165 e20a8b6f 2019-06-04 stsp goto done;
3168 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
3169 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
3170 a129376b 2019-03-28 stsp if (tree_path == NULL) {
3171 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3172 a129376b 2019-03-28 stsp goto done;
3175 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
3176 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
3177 a129376b 2019-03-28 stsp if (tree_path == NULL) {
3178 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3179 a129376b 2019-03-28 stsp goto done;
3182 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
3183 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
3184 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3185 a129376b 2019-03-28 stsp goto done;
3190 1f1abb7e 2019-08-08 stsp err = got_object_id_by_path(&tree_id, a->repo,
3191 1f1abb7e 2019-08-08 stsp a->worktree->base_commit_id, tree_path);
3192 a9fa2909 2019-07-27 stsp if (err) {
3193 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
3194 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
3195 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
3196 a9fa2909 2019-07-27 stsp goto done;
3198 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
3200 a9fa2909 2019-07-27 stsp goto done;
3202 a9fa2909 2019-07-27 stsp te_name = basename(ie->path);
3203 a9fa2909 2019-07-27 stsp if (te_name == NULL) {
3204 a9fa2909 2019-07-27 stsp err = got_error_from_errno2("basename", ie->path);
3205 a9fa2909 2019-07-27 stsp goto done;
3208 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
3209 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
3210 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
3211 a9fa2909 2019-07-27 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
3212 a9fa2909 2019-07-27 stsp goto done;
3216 a129376b 2019-03-28 stsp switch (status) {
3217 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
3218 33aa809d 2019-08-08 stsp if (a->patch_cb) {
3219 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
3220 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
3221 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
3223 33aa809d 2019-08-08 stsp goto done;
3224 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
3227 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
3228 1f1abb7e 2019-08-08 stsp ie->path);
3230 1ee397ad 2019-07-12 stsp goto done;
3231 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
3233 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
3234 33aa809d 2019-08-08 stsp if (a->patch_cb) {
3235 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
3236 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
3237 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
3239 33aa809d 2019-08-08 stsp goto done;
3240 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
3243 33aa809d 2019-08-08 stsp /* fall through */
3244 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
3245 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
3246 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
3247 e20a8b6f 2019-06-04 stsp struct got_object_id id;
3248 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3249 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3250 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1,
3251 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3253 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1,
3254 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3255 1f1abb7e 2019-08-08 stsp err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
3257 65084dad 2019-08-08 stsp goto done;
3259 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
3260 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
3261 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
3262 a129376b 2019-03-28 stsp goto done;
3265 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
3266 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
3267 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
3268 33aa809d 2019-08-08 stsp ondisk_path, ie->path, a->repo,
3269 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
3270 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
3272 33aa809d 2019-08-08 stsp if (rename(path_content, ondisk_path) == -1) {
3273 33aa809d 2019-08-08 stsp err = got_error_from_errno3("rename",
3274 33aa809d 2019-08-08 stsp path_content, ondisk_path);
3275 33aa809d 2019-08-08 stsp goto done;
3278 33aa809d 2019-08-08 stsp err = install_blob(a->worktree, ondisk_path, ie->path,
3279 33aa809d 2019-08-08 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
3280 33aa809d 2019-08-08 stsp got_fileindex_perms_to_st(ie), blob, 0, 1,
3281 33aa809d 2019-08-08 stsp a->repo, a->progress_cb, a->progress_arg);
3283 a129376b 2019-03-28 stsp goto done;
3284 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_DELETE) {
3285 33aa809d 2019-08-08 stsp err = update_blob_fileindex_entry(a->worktree,
3286 33aa809d 2019-08-08 stsp a->fileindex, ie, ondisk_path, ie->path,
3289 33aa809d 2019-08-08 stsp goto done;
3298 1f1abb7e 2019-08-08 stsp free(ondisk_path);
3299 33aa809d 2019-08-08 stsp free(path_content);
3300 e20a8b6f 2019-06-04 stsp free(parent_path);
3301 a129376b 2019-03-28 stsp free(tree_path);
3303 a129376b 2019-03-28 stsp got_object_blob_close(blob);
3305 a129376b 2019-03-28 stsp got_object_tree_close(tree);
3306 a129376b 2019-03-28 stsp free(tree_id);
3307 e20a8b6f 2019-06-04 stsp return err;
3310 e20a8b6f 2019-06-04 stsp const struct got_error *
3311 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
3312 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
3313 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3314 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
3315 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
3317 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
3318 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
3319 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
3320 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
3321 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
3322 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
3324 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
3326 e20a8b6f 2019-06-04 stsp return err;
3328 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3330 e20a8b6f 2019-06-04 stsp goto done;
3332 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
3333 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
3334 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
3335 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
3336 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
3337 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
3338 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
3339 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
3340 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3341 1f1abb7e 2019-08-08 stsp revert_file, &rfa, NULL, NULL);
3345 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3346 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
3347 e20a8b6f 2019-06-04 stsp err = sync_err;
3349 fb399478 2019-07-12 stsp free(fileindex_path);
3350 a129376b 2019-03-28 stsp if (fileindex)
3351 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
3352 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3353 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
3354 a129376b 2019-03-28 stsp err = unlockerr;
3355 c4296144 2019-05-09 stsp return err;
3358 cf066bf8 2019-05-09 stsp static void
3359 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
3361 24519714 2019-05-09 stsp free(ct->path);
3362 44d03001 2019-05-09 stsp free(ct->in_repo_path);
3363 768aea60 2019-05-09 stsp free(ct->ondisk_path);
3364 e75eb4da 2019-05-10 stsp free(ct->blob_id);
3365 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
3366 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
3367 b416585c 2019-05-13 stsp free(ct->base_commit_id);
3371 ed175427 2019-05-09 stsp struct collect_commitables_arg {
3372 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
3373 24519714 2019-05-09 stsp struct got_repository *repo;
3374 24519714 2019-05-09 stsp struct got_worktree *worktree;
3375 5f8a88c6 2019-08-03 stsp int have_staged_files;
3378 c4296144 2019-05-09 stsp static const struct got_error *
3379 88d0e355 2019-08-03 stsp collect_commitables(void *arg, unsigned char status,
3380 88d0e355 2019-08-03 stsp unsigned char staged_status, const char *relpath,
3381 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3382 537ac44b 2019-08-03 stsp struct got_object_id *commit_id)
3384 ed175427 2019-05-09 stsp struct collect_commitables_arg *a = arg;
3385 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
3386 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
3387 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
3388 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
3389 768aea60 2019-05-09 stsp struct stat sb;
3391 5f8a88c6 2019-08-03 stsp if (a->have_staged_files) {
3392 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
3393 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
3394 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
3395 5f8a88c6 2019-08-03 stsp return NULL;
3397 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
3398 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
3400 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
3401 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
3402 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
3403 5f8a88c6 2019-08-03 stsp return NULL;
3406 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
3407 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3408 036813ee 2019-05-09 stsp goto done;
3410 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
3411 036813ee 2019-05-09 stsp parent_path = strdup("");
3412 69960a46 2019-05-09 stsp if (parent_path == NULL)
3413 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
3415 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
3417 69960a46 2019-05-09 stsp return err;
3420 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
3421 cf066bf8 2019-05-09 stsp if (ct == NULL) {
3422 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
3423 c4296144 2019-05-09 stsp goto done;
3426 768aea60 2019-05-09 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
3427 768aea60 2019-05-09 stsp relpath) == -1) {
3428 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3429 768aea60 2019-05-09 stsp goto done;
3431 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_DELETE || staged_status == GOT_STATUS_DELETE) {
3432 768aea60 2019-05-09 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
3434 768aea60 2019-05-09 stsp if (lstat(ct->ondisk_path, &sb) != 0) {
3435 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
3436 768aea60 2019-05-09 stsp goto done;
3438 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
3441 44d03001 2019-05-09 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
3442 44d03001 2019-05-09 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
3443 44d03001 2019-05-09 stsp relpath) == -1) {
3444 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3445 44d03001 2019-05-09 stsp goto done;
3448 cf066bf8 2019-05-09 stsp ct->status = status;
3449 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
3450 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
3451 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
3452 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
3453 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
3454 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
3455 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3456 b416585c 2019-05-13 stsp goto done;
3458 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
3459 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
3460 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
3461 f0b75401 2019-08-03 stsp goto done;
3464 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
3465 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
3466 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
3467 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
3468 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3469 036813ee 2019-05-09 stsp goto done;
3472 24519714 2019-05-09 stsp ct->path = strdup(path);
3473 24519714 2019-05-09 stsp if (ct->path == NULL) {
3474 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3475 24519714 2019-05-09 stsp goto done;
3477 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
3479 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
3480 ed175427 2019-05-09 stsp free_commitable(ct);
3481 24519714 2019-05-09 stsp free(parent_path);
3482 036813ee 2019-05-09 stsp free(path);
3483 a129376b 2019-03-28 stsp return err;
3486 036813ee 2019-05-09 stsp static const struct got_error *write_tree(struct got_object_id **,
3487 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
3488 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3489 036813ee 2019-05-09 stsp struct got_repository *);
3491 ed175427 2019-05-09 stsp static const struct got_error *
3492 036813ee 2019-05-09 stsp write_subtree(struct got_object_id **new_subtree_id,
3493 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
3494 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
3495 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3496 afa376bf 2019-05-09 stsp struct got_repository *repo)
3498 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
3499 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
3500 036813ee 2019-05-09 stsp char *subpath;
3502 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
3503 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
3504 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3506 036813ee 2019-05-09 stsp err = got_object_open_as_tree(&subtree, repo, te->id);
3508 ed175427 2019-05-09 stsp return err;
3510 036813ee 2019-05-09 stsp err = write_tree(new_subtree_id, subtree, subpath, commitable_paths,
3511 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
3512 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
3513 036813ee 2019-05-09 stsp free(subpath);
3514 036813ee 2019-05-09 stsp return err;
3517 036813ee 2019-05-09 stsp static const struct got_error *
3518 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
3520 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3521 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
3523 036813ee 2019-05-09 stsp *match = 0;
3525 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
3526 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
3527 0f63689d 2019-05-10 stsp return NULL;
3530 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
3532 0f63689d 2019-05-10 stsp return err;
3533 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
3534 036813ee 2019-05-09 stsp free(ct_parent_path);
3535 036813ee 2019-05-09 stsp return err;
3538 768aea60 2019-05-09 stsp static mode_t
3539 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
3541 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
3544 036813ee 2019-05-09 stsp static const struct got_error *
3545 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
3546 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
3548 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3550 036813ee 2019-05-09 stsp *new_te = NULL;
3552 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
3554 036813ee 2019-05-09 stsp goto done;
3556 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
3558 036813ee 2019-05-09 stsp free((*new_te)->id);
3559 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
3560 5f8a88c6 2019-08-03 stsp (*new_te)->id = got_object_id_dup(ct->staged_blob_id);
3562 5f8a88c6 2019-08-03 stsp (*new_te)->id = got_object_id_dup(ct->blob_id);
3563 036813ee 2019-05-09 stsp if ((*new_te)->id == NULL) {
3564 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3565 036813ee 2019-05-09 stsp goto done;
3568 036813ee 2019-05-09 stsp if (err && *new_te) {
3569 036813ee 2019-05-09 stsp got_object_tree_entry_close(*new_te);
3570 036813ee 2019-05-09 stsp *new_te = NULL;
3572 036813ee 2019-05-09 stsp return err;
3575 036813ee 2019-05-09 stsp static const struct got_error *
3576 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
3577 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
3579 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3580 036813ee 2019-05-09 stsp char *ct_name;
3582 036813ee 2019-05-09 stsp *new_te = NULL;
3584 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
3585 036813ee 2019-05-09 stsp if (*new_te == NULL)
3586 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
3588 036813ee 2019-05-09 stsp ct_name = basename(ct->path);
3589 036813ee 2019-05-09 stsp if (ct_name == NULL) {
3590 638f9024 2019-05-13 stsp err = got_error_from_errno2("basename", ct->path);
3591 036813ee 2019-05-09 stsp goto done;
3593 036813ee 2019-05-09 stsp (*new_te)->name = strdup(ct_name);
3594 036813ee 2019-05-09 stsp if ((*new_te)->name == NULL) {
3595 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3596 036813ee 2019-05-09 stsp goto done;
3599 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
3601 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
3602 5f8a88c6 2019-08-03 stsp (*new_te)->id = got_object_id_dup(ct->staged_blob_id);
3604 5f8a88c6 2019-08-03 stsp (*new_te)->id = got_object_id_dup(ct->blob_id);
3605 036813ee 2019-05-09 stsp if ((*new_te)->id == NULL) {
3606 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3607 036813ee 2019-05-09 stsp goto done;
3610 036813ee 2019-05-09 stsp if (err && *new_te) {
3611 036813ee 2019-05-09 stsp got_object_tree_entry_close(*new_te);
3612 036813ee 2019-05-09 stsp *new_te = NULL;
3614 036813ee 2019-05-09 stsp return err;
3617 036813ee 2019-05-09 stsp static const struct got_error *
3618 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
3619 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
3621 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3622 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
3624 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
3626 036813ee 2019-05-09 stsp return err;
3627 036813ee 2019-05-09 stsp if (new_pe == NULL)
3628 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
3629 036813ee 2019-05-09 stsp return NULL;
3632 afa376bf 2019-05-09 stsp static const struct got_error *
3633 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
3634 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
3636 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
3637 5f8a88c6 2019-08-03 stsp unsigned char status;
3639 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
3640 afa376bf 2019-05-09 stsp ct_path++;
3642 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
3643 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
3645 5f8a88c6 2019-08-03 stsp status = ct->status;
3647 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
3648 537ac44b 2019-08-03 stsp ct_path, ct->blob_id, NULL, NULL);
3651 036813ee 2019-05-09 stsp static const struct got_error *
3652 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
3653 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
3655 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
3656 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
3657 44d03001 2019-05-09 stsp char *te_path;
3659 44d03001 2019-05-09 stsp *modified = 0;
3661 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
3662 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
3663 44d03001 2019-05-09 stsp te->name) == -1)
3664 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3666 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3667 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3668 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
3669 44d03001 2019-05-09 stsp strlen(te_path));
3670 44d03001 2019-05-09 stsp if (*modified)
3674 44d03001 2019-05-09 stsp free(te_path);
3675 44d03001 2019-05-09 stsp return err;
3678 44d03001 2019-05-09 stsp static const struct got_error *
3679 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
3680 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
3681 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
3683 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3684 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
3686 036813ee 2019-05-09 stsp *ctp = NULL;
3688 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3689 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3690 036813ee 2019-05-09 stsp char *ct_name = NULL;
3691 036813ee 2019-05-09 stsp int path_matches;
3693 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
3694 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
3695 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
3698 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
3699 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
3703 c4e12a88 2019-05-13 stsp if (got_object_id_cmp(ct->base_blob_id, te->id) != 0)
3706 036813ee 2019-05-09 stsp err = match_ct_parent_path(&path_matches, ct, base_tree_path);
3708 036813ee 2019-05-09 stsp return err;
3709 036813ee 2019-05-09 stsp if (!path_matches)
3712 036813ee 2019-05-09 stsp ct_name = basename(pe->path);
3713 036813ee 2019-05-09 stsp if (ct_name == NULL)
3714 638f9024 2019-05-13 stsp return got_error_from_errno2("basename", pe->path);
3716 036813ee 2019-05-09 stsp if (strcmp(te->name, ct_name) != 0)
3719 036813ee 2019-05-09 stsp *ctp = ct;
3723 2b496619 2019-07-10 stsp return err;
3726 2b496619 2019-07-10 stsp static const struct got_error *
3727 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
3728 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
3729 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
3730 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3731 2b496619 2019-07-10 stsp struct got_repository *repo)
3733 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
3734 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
3735 2b496619 2019-07-10 stsp char *subtree_path;
3737 2b496619 2019-07-10 stsp *new_tep = NULL;
3739 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
3740 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
3741 2b496619 2019-07-10 stsp child_path) == -1)
3742 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
3744 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
3745 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
3746 2b496619 2019-07-10 stsp new_te->name = strdup(child_path);
3747 2b496619 2019-07-10 stsp if (new_te->name == NULL) {
3748 2b496619 2019-07-10 stsp err = got_error_from_errno("strdup");
3749 2b496619 2019-07-10 stsp got_object_tree_entry_close(new_te);
3750 2b496619 2019-07-10 stsp goto done;
3752 2b496619 2019-07-10 stsp err = write_tree(&new_te->id, NULL, subtree_path,
3753 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
3754 2b496619 2019-07-10 stsp if (err) {
3755 2b496619 2019-07-10 stsp got_object_tree_entry_close(new_te);
3756 2b496619 2019-07-10 stsp goto done;
3759 2b496619 2019-07-10 stsp free(subtree_path);
3760 2b496619 2019-07-10 stsp if (err == NULL)
3761 2b496619 2019-07-10 stsp *new_tep = new_te;
3762 036813ee 2019-05-09 stsp return err;
3765 036813ee 2019-05-09 stsp static const struct got_error *
3766 036813ee 2019-05-09 stsp write_tree(struct got_object_id **new_tree_id,
3767 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
3768 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
3769 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3770 036813ee 2019-05-09 stsp struct got_repository *repo)
3772 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3773 036813ee 2019-05-09 stsp const struct got_tree_entries *base_entries = NULL;
3774 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
3775 036813ee 2019-05-09 stsp struct got_tree_entries new_tree_entries;
3776 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
3777 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
3779 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
3780 036813ee 2019-05-09 stsp new_tree_entries.nentries = 0;
3781 036813ee 2019-05-09 stsp SIMPLEQ_INIT(&new_tree_entries.head);
3783 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
3784 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3785 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3786 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
3788 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
3789 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
3790 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
3793 036813ee 2019-05-09 stsp if (!got_path_is_child(pe->path, path_base_tree,
3794 2f51b5b3 2019-05-09 stsp strlen(path_base_tree)))
3797 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
3798 036813ee 2019-05-09 stsp pe->path);
3800 036813ee 2019-05-09 stsp goto done;
3802 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
3803 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
3804 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
3806 036813ee 2019-05-09 stsp goto done;
3807 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
3809 afa376bf 2019-05-09 stsp goto done;
3810 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
3811 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
3813 2f51b5b3 2019-05-09 stsp goto done;
3815 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
3816 2b496619 2019-07-10 stsp if (base_tree == NULL ||
3817 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
3818 2b496619 2019-07-10 stsp == NULL) {
3819 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
3820 2b496619 2019-07-10 stsp child_path, path_base_tree,
3821 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
3824 2b496619 2019-07-10 stsp goto done;
3825 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
3827 2b496619 2019-07-10 stsp goto done;
3832 2f51b5b3 2019-05-09 stsp if (base_tree) {
3833 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
3834 2f51b5b3 2019-05-09 stsp base_entries = got_object_tree_get_entries(base_tree);
3835 2f51b5b3 2019-05-09 stsp SIMPLEQ_FOREACH(te, &base_entries->head, entry) {
3836 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
3838 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
3839 44d03001 2019-05-09 stsp int modified;
3840 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
3842 036813ee 2019-05-09 stsp goto done;
3843 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
3844 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
3846 2f51b5b3 2019-05-09 stsp goto done;
3847 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
3848 44d03001 2019-05-09 stsp if (modified) {
3849 44d03001 2019-05-09 stsp free(new_te->id);
3850 44d03001 2019-05-09 stsp err = write_subtree(&new_te->id, te,
3851 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
3852 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
3854 44d03001 2019-05-09 stsp goto done;
3856 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
3858 036813ee 2019-05-09 stsp goto done;
3862 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
3863 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
3865 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
3866 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
3867 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
3868 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
3869 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
3871 2f51b5b3 2019-05-09 stsp goto done;
3872 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
3874 2f51b5b3 2019-05-09 stsp goto done;
3876 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
3877 b416585c 2019-05-13 stsp status_arg);
3879 afa376bf 2019-05-09 stsp goto done;
3881 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
3882 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
3884 2f51b5b3 2019-05-09 stsp goto done;
3885 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
3887 2f51b5b3 2019-05-09 stsp goto done;
3892 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
3893 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, &paths, entry) {
3894 0b5cc0d6 2019-05-09 stsp struct got_tree_entry *te = pe->data;
3895 0b5cc0d6 2019-05-09 stsp new_tree_entries.nentries++;
3896 0b5cc0d6 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&new_tree_entries.head, te, entry);
3898 036813ee 2019-05-09 stsp err = got_object_tree_create(new_tree_id, &new_tree_entries, repo);
3900 ca2503ea 2019-05-09 stsp got_object_tree_entries_close(&new_tree_entries);
3901 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
3902 ed175427 2019-05-09 stsp return err;
3905 ebf99748 2019-05-09 stsp static const struct got_error *
3906 ebf99748 2019-05-09 stsp update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
3907 93ec1b5f 2019-07-12 stsp struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex)
3909 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
3910 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
3912 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3913 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
3914 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3916 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
3918 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
3919 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
3920 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
3921 ebf99748 2019-05-09 stsp got_fileindex_entry_free(ie);
3922 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
3923 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
3924 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
3925 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
3926 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
3927 5f8a88c6 2019-08-03 stsp ct->ondisk_path, ct->staged_blob_id->sha1,
3928 5f8a88c6 2019-08-03 stsp new_base_commit_id->sha1, 1);
3930 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
3931 e75eb4da 2019-05-10 stsp ct->ondisk_path, ct->blob_id->sha1,
3932 ebf99748 2019-05-09 stsp new_base_commit_id->sha1, 1);
3934 ebf99748 2019-05-09 stsp err = got_fileindex_entry_alloc(&ie,
3935 e75eb4da 2019-05-10 stsp ct->ondisk_path, pe->path, ct->blob_id->sha1,
3936 ebf99748 2019-05-09 stsp new_base_commit_id->sha1);
3939 ebf99748 2019-05-09 stsp err = got_fileindex_entry_add(fileindex, ie);
3944 d56d26ce 2019-05-10 stsp return err;
3948 d56d26ce 2019-05-10 stsp static const struct got_error *
3949 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
3950 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
3951 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
3952 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
3953 735ef5ac 2019-08-03 stsp int ood_errcode)
3955 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
3956 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
3958 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
3959 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
3960 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
3961 1a36436d 2019-06-10 stsp return NULL;
3963 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
3964 9bead371 2019-07-28 stsp * on matches file content in the branch head.
3966 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
3967 735ef5ac 2019-08-03 stsp in_repo_path);
3968 9bead371 2019-07-28 stsp if (err) {
3969 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
3970 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
3971 1a36436d 2019-06-10 stsp goto done;
3972 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
3973 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
3975 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
3976 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
3977 735ef5ac 2019-08-03 stsp in_repo_path);
3978 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3979 1a36436d 2019-06-10 stsp goto done;
3980 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
3984 1a36436d 2019-06-10 stsp return err;
3987 c4296144 2019-05-09 stsp const struct got_error *
3988 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
3989 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
3990 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id, struct got_worktree *worktree,
3991 5c1e53bc 2019-07-28 stsp const char *author, const char *committer,
3992 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
3993 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3994 afa376bf 2019-05-09 stsp struct got_repository *repo)
3996 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
3997 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
3998 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
3999 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
4000 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
4001 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
4002 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
4003 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
4004 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
4005 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
4006 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
4008 c4296144 2019-05-09 stsp *new_commit_id = NULL;
4010 de18fc63 2019-05-09 stsp SIMPLEQ_INIT(&parent_ids);
4012 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
4014 588edf97 2019-05-10 stsp goto done;
4016 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
4018 588edf97 2019-05-10 stsp goto done;
4020 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
4021 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
4026 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
4027 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
4031 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
4032 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4033 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4034 cf066bf8 2019-05-09 stsp char *ondisk_path;
4036 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
4037 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
4038 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
4041 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
4042 cf066bf8 2019-05-09 stsp ct->status != GOT_STATUS_MODIFY)
4045 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
4046 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
4047 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4048 cf066bf8 2019-05-09 stsp goto done;
4050 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
4051 a7055788 2019-05-09 stsp free(ondisk_path);
4053 cf066bf8 2019-05-09 stsp goto done;
4056 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
4057 39cd0ff6 2019-07-12 stsp err = write_tree(&new_tree_id, head_tree, "/", commitable_paths,
4058 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
4060 036813ee 2019-05-09 stsp goto done;
4062 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
4064 de18fc63 2019-05-09 stsp goto done;
4065 de18fc63 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
4066 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
4067 de18fc63 2019-05-09 stsp 1, author, time(NULL), committer, time(NULL), logmsg, repo);
4068 de18fc63 2019-05-09 stsp got_object_qid_free(pid);
4069 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
4070 33ad4cbe 2019-05-12 jcs free(logmsg);
4072 9d40349a 2019-05-09 stsp goto done;
4074 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
4075 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
4076 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
4077 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
4078 09f5bd90 2019-05-09 stsp goto done;
4080 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
4081 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
4083 09f5bd90 2019-05-09 stsp goto done;
4084 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
4086 ebf99748 2019-05-09 stsp goto done;
4087 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
4088 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
4089 09f5bd90 2019-05-09 stsp goto done;
4091 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
4092 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
4094 f2c16586 2019-05-09 stsp goto done;
4095 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
4097 f2c16586 2019-05-09 stsp goto done;
4099 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
4101 09f5bd90 2019-05-09 stsp goto done;
4103 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
4105 ebf99748 2019-05-09 stsp goto done;
4107 588edf97 2019-05-10 stsp if (head_tree)
4108 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
4109 588edf97 2019-05-10 stsp if (head_commit)
4110 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
4111 09f5bd90 2019-05-09 stsp free(head_commit_id2);
4112 2f17228e 2019-05-12 stsp if (head_ref2) {
4113 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
4114 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
4115 2f17228e 2019-05-12 stsp err = unlockerr;
4116 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
4118 39cd0ff6 2019-07-12 stsp return err;
4121 5c1e53bc 2019-07-28 stsp static const struct got_error *
4122 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
4123 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
4125 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
4126 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
4128 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
4129 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
4130 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
4132 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
4133 5c1e53bc 2019-07-28 stsp ct_path++;
4135 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
4136 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
4140 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
4141 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
4143 5c1e53bc 2019-07-28 stsp return NULL;
4146 f0b75401 2019-08-03 stsp static const struct got_error *
4147 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
4149 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
4151 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
4152 f0b75401 2019-08-03 stsp *have_staged_files = 1;
4153 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
4156 f0b75401 2019-08-03 stsp return NULL;
4159 5f8a88c6 2019-08-03 stsp static const struct got_error *
4160 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
4161 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
4163 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
4164 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
4166 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
4167 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
4169 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
4170 5f8a88c6 2019-08-03 stsp if (ie == NULL)
4171 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
4172 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
4173 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
4174 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
4177 5f8a88c6 2019-08-03 stsp return NULL;
4180 39cd0ff6 2019-07-12 stsp const struct got_error *
4181 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
4182 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
4183 39cd0ff6 2019-07-12 stsp const char *author, const char *committer,
4184 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
4185 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
4186 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
4188 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
4189 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
4190 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
4191 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
4192 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
4193 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
4194 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
4195 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
4196 f0b75401 2019-08-03 stsp int have_staged_files = 0;
4198 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
4200 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
4202 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
4204 39cd0ff6 2019-07-12 stsp goto done;
4206 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
4208 39cd0ff6 2019-07-12 stsp goto done;
4210 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
4212 39cd0ff6 2019-07-12 stsp goto done;
4214 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4216 39cd0ff6 2019-07-12 stsp goto done;
4218 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
4219 5f8a88c6 2019-08-03 stsp &have_staged_files);
4220 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
4221 5f8a88c6 2019-08-03 stsp goto done;
4222 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
4223 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
4225 5f8a88c6 2019-08-03 stsp goto done;
4228 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
4229 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
4230 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
4231 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
4232 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
4233 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4234 5c1e53bc 2019-07-28 stsp collect_commitables, &cc_arg, NULL, NULL);
4236 5c1e53bc 2019-07-28 stsp goto done;
4239 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
4240 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
4241 39cd0ff6 2019-07-12 stsp goto done;
4244 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
4245 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
4247 5c1e53bc 2019-07-28 stsp goto done;
4250 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
4251 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
4252 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
4254 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
4255 f0b75401 2019-08-03 stsp ct_path++;
4256 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
4257 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
4258 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
4260 b50cabdf 2019-07-12 stsp goto done;
4264 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
4265 5c1e53bc 2019-07-28 stsp head_commit_id, worktree, author, committer,
4266 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
4268 39cd0ff6 2019-07-12 stsp goto done;
4270 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
4271 93ec1b5f 2019-07-12 stsp fileindex);
4272 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4273 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
4274 39cd0ff6 2019-07-12 stsp err = sync_err;
4276 39cd0ff6 2019-07-12 stsp if (fileindex)
4277 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
4278 39cd0ff6 2019-07-12 stsp free(fileindex_path);
4279 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4280 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
4281 39cd0ff6 2019-07-12 stsp err = unlockerr;
4282 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
4283 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
4284 39cd0ff6 2019-07-12 stsp free_commitable(ct);
4286 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
4287 c4296144 2019-05-09 stsp return err;
4290 8656d6c4 2019-05-20 stsp const char *
4291 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
4293 8656d6c4 2019-05-20 stsp return ct->path;
4296 8656d6c4 2019-05-20 stsp unsigned int
4297 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
4299 8656d6c4 2019-05-20 stsp return ct->status;
4302 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
4303 818c7501 2019-07-11 stsp struct got_worktree *worktree;
4304 818c7501 2019-07-11 stsp struct got_repository *repo;
4307 818c7501 2019-07-11 stsp static const struct got_error *
4308 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
4310 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
4311 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
4312 818c7501 2019-07-11 stsp unsigned char status;
4313 818c7501 2019-07-11 stsp struct stat sb;
4314 818c7501 2019-07-11 stsp char *ondisk_path;
4316 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
4317 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
4318 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
4319 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
4321 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
4323 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
4325 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
4326 818c7501 2019-07-11 stsp err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
4327 818c7501 2019-07-11 stsp free(ondisk_path);
4329 818c7501 2019-07-11 stsp return err;
4331 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
4332 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
4333 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
4334 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
4336 818c7501 2019-07-11 stsp return NULL;
4339 818c7501 2019-07-11 stsp const struct got_error *
4340 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
4341 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
4342 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
4343 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
4345 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
4346 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
4347 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
4348 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
4349 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
4350 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
4352 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
4353 818c7501 2019-07-11 stsp *tmp_branch = NULL;
4354 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4356 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
4358 818c7501 2019-07-11 stsp return err;
4360 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
4362 818c7501 2019-07-11 stsp goto done;
4364 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
4365 818c7501 2019-07-11 stsp ok_arg.repo = repo;
4366 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
4369 818c7501 2019-07-11 stsp goto done;
4371 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4373 818c7501 2019-07-11 stsp goto done;
4375 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4377 818c7501 2019-07-11 stsp goto done;
4379 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4381 818c7501 2019-07-11 stsp goto done;
4383 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
4386 818c7501 2019-07-11 stsp goto done;
4388 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
4389 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
4391 818c7501 2019-07-11 stsp goto done;
4392 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
4394 818c7501 2019-07-11 stsp goto done;
4396 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
4398 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
4400 818c7501 2019-07-11 stsp goto done;
4402 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
4404 818c7501 2019-07-11 stsp goto done;
4406 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
4407 818c7501 2019-07-11 stsp worktree->base_commit_id);
4409 818c7501 2019-07-11 stsp goto done;
4410 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
4412 818c7501 2019-07-11 stsp goto done;
4414 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
4416 818c7501 2019-07-11 stsp goto done;
4418 818c7501 2019-07-11 stsp free(fileindex_path);
4419 818c7501 2019-07-11 stsp free(tmp_branch_name);
4420 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
4421 818c7501 2019-07-11 stsp free(branch_ref_name);
4422 818c7501 2019-07-11 stsp if (branch_ref)
4423 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
4424 818c7501 2019-07-11 stsp if (wt_branch)
4425 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
4426 818c7501 2019-07-11 stsp if (err) {
4427 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
4428 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
4429 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
4431 818c7501 2019-07-11 stsp if (*tmp_branch) {
4432 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
4433 818c7501 2019-07-11 stsp *tmp_branch = NULL;
4435 3e3a69f1 2019-07-25 stsp if (*fileindex) {
4436 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
4437 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4439 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
4441 818c7501 2019-07-11 stsp return err;
4444 818c7501 2019-07-11 stsp const struct got_error *
4445 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
4446 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
4447 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
4448 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
4450 818c7501 2019-07-11 stsp const struct got_error *err;
4451 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
4452 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
4453 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
4454 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
4455 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
4457 818c7501 2019-07-11 stsp *commit_id = NULL;
4458 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
4459 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
4460 3e3a69f1 2019-07-25 stsp *branch = NULL;
4461 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4463 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
4465 3e3a69f1 2019-07-25 stsp return err;
4467 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
4469 f032f1f7 2019-08-04 stsp goto done;
4471 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
4472 f032f1f7 2019-08-04 stsp &have_staged_files);
4473 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
4474 f032f1f7 2019-08-04 stsp goto done;
4475 f032f1f7 2019-08-04 stsp if (have_staged_files) {
4476 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
4477 3e3a69f1 2019-07-25 stsp goto done;
4480 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4482 f032f1f7 2019-08-04 stsp goto done;
4484 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4486 818c7501 2019-07-11 stsp goto done;
4488 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4490 818c7501 2019-07-11 stsp goto done;
4492 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4494 818c7501 2019-07-11 stsp goto done;
4496 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
4498 818c7501 2019-07-11 stsp goto done;
4500 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
4501 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
4503 818c7501 2019-07-11 stsp goto done;
4505 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4507 818c7501 2019-07-11 stsp goto done;
4509 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
4511 818c7501 2019-07-11 stsp goto done;
4513 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
4514 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
4516 818c7501 2019-07-11 stsp goto done;
4518 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
4520 818c7501 2019-07-11 stsp goto done;
4522 818c7501 2019-07-11 stsp free(commit_ref_name);
4523 818c7501 2019-07-11 stsp free(branch_ref_name);
4524 3e3a69f1 2019-07-25 stsp free(fileindex_path);
4525 818c7501 2019-07-11 stsp if (commit_ref)
4526 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
4527 818c7501 2019-07-11 stsp if (branch_ref)
4528 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
4529 818c7501 2019-07-11 stsp if (err) {
4530 818c7501 2019-07-11 stsp free(*commit_id);
4531 818c7501 2019-07-11 stsp *commit_id = NULL;
4532 818c7501 2019-07-11 stsp if (*tmp_branch) {
4533 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
4534 818c7501 2019-07-11 stsp *tmp_branch = NULL;
4536 818c7501 2019-07-11 stsp if (*new_base_branch) {
4537 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
4538 818c7501 2019-07-11 stsp *new_base_branch = NULL;
4540 818c7501 2019-07-11 stsp if (*branch) {
4541 818c7501 2019-07-11 stsp got_ref_close(*branch);
4542 818c7501 2019-07-11 stsp *branch = NULL;
4544 3e3a69f1 2019-07-25 stsp if (*fileindex) {
4545 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
4546 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4548 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
4550 818c7501 2019-07-11 stsp return err;
4553 818c7501 2019-07-11 stsp const struct got_error *
4554 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
4556 818c7501 2019-07-11 stsp const struct got_error *err;
4557 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
4559 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4561 818c7501 2019-07-11 stsp return err;
4563 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
4564 818c7501 2019-07-11 stsp free(tmp_branch_name);
4565 818c7501 2019-07-11 stsp return NULL;
4568 818c7501 2019-07-11 stsp static const struct got_error *
4569 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
4570 818c7501 2019-07-11 stsp char **logmsg, void *arg)
4572 0ebf8283 2019-07-24 stsp *logmsg = arg;
4573 818c7501 2019-07-11 stsp return NULL;
4576 818c7501 2019-07-11 stsp static const struct got_error *
4577 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
4578 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
4579 537ac44b 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
4581 818c7501 2019-07-11 stsp return NULL;
4584 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
4585 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
4586 01757395 2019-07-12 stsp void *progress_arg;
4587 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
4590 01757395 2019-07-12 stsp static const struct got_error *
4591 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
4593 01757395 2019-07-12 stsp const struct got_error *err;
4594 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
4596 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
4598 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
4600 01757395 2019-07-12 stsp return err;
4602 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
4603 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
4604 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
4605 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
4606 01757395 2019-07-12 stsp return NULL;
4608 01757395 2019-07-12 stsp p = strdup(path);
4609 01757395 2019-07-12 stsp if (p == NULL)
4610 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
4612 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
4613 01757395 2019-07-12 stsp if (err || new == NULL)
4615 01757395 2019-07-12 stsp return err;
4619 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
4621 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
4623 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
4624 01757395 2019-07-12 stsp free((char *)pe->path);
4626 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
4629 0ebf8283 2019-07-24 stsp static const struct got_error *
4630 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
4631 0ebf8283 2019-07-24 stsp struct got_repository *repo)
4633 818c7501 2019-07-11 stsp const struct got_error *err;
4634 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
4636 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4637 818c7501 2019-07-11 stsp if (err) {
4638 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
4639 818c7501 2019-07-11 stsp goto done;
4640 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
4642 818c7501 2019-07-11 stsp goto done;
4643 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
4645 818c7501 2019-07-11 stsp goto done;
4647 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
4650 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
4652 818c7501 2019-07-11 stsp goto done;
4653 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
4654 818c7501 2019-07-11 stsp free(stored_id);
4655 818c7501 2019-07-11 stsp if (cmp != 0) {
4656 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
4657 818c7501 2019-07-11 stsp goto done;
4661 0ebf8283 2019-07-24 stsp if (commit_ref)
4662 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
4663 0ebf8283 2019-07-24 stsp return err;
4666 0ebf8283 2019-07-24 stsp static const struct got_error *
4667 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
4668 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
4669 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
4670 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
4671 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4672 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
4674 0ebf8283 2019-07-24 stsp const struct got_error *err;
4675 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
4676 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
4677 3e3a69f1 2019-07-25 stsp char *fileindex_path;
4679 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
4681 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
4683 0ebf8283 2019-07-24 stsp return err;
4685 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
4686 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
4687 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
4688 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
4689 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
4690 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
4691 818c7501 2019-07-11 stsp if (commit_ref)
4692 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
4693 818c7501 2019-07-11 stsp return err;
4696 818c7501 2019-07-11 stsp const struct got_error *
4697 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
4698 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
4699 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
4700 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
4701 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4702 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
4704 0ebf8283 2019-07-24 stsp const struct got_error *err;
4705 0ebf8283 2019-07-24 stsp char *commit_ref_name;
4707 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4709 0ebf8283 2019-07-24 stsp return err;
4711 0ebf8283 2019-07-24 stsp err = store_commit_id(commit_ref_name, commit_id, repo);
4713 0ebf8283 2019-07-24 stsp goto done;
4715 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
4716 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
4717 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
4719 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4720 0ebf8283 2019-07-24 stsp return err;
4723 0ebf8283 2019-07-24 stsp const struct got_error *
4724 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
4725 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
4726 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
4727 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
4728 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4729 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
4731 0ebf8283 2019-07-24 stsp const struct got_error *err;
4732 0ebf8283 2019-07-24 stsp char *commit_ref_name;
4734 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4736 0ebf8283 2019-07-24 stsp return err;
4738 0ebf8283 2019-07-24 stsp err = store_commit_id(commit_ref_name, commit_id, repo);
4740 0ebf8283 2019-07-24 stsp goto done;
4742 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
4743 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
4744 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
4746 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4747 0ebf8283 2019-07-24 stsp return err;
4750 0ebf8283 2019-07-24 stsp static const struct got_error *
4751 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
4752 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
4753 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
4754 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
4755 3e3a69f1 2019-07-25 stsp const char *new_logmsg, struct got_repository *repo)
4757 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
4758 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
4759 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
4760 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
4761 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
4762 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
4763 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
4765 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
4766 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
4768 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
4770 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
4772 3e3a69f1 2019-07-25 stsp return err;
4774 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
4775 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
4776 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
4777 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
4779 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
4780 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
4781 01757395 2019-07-12 stsp * TODO: Ideally, merged_paths would contain a list of commitables
4782 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
4784 01757395 2019-07-12 stsp if (merged_paths) {
4785 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
4786 8f8646e5 2019-07-25 stsp if (TAILQ_EMPTY(merged_paths)) {
4787 8f8646e5 2019-07-25 stsp err = got_error(GOT_ERR_NO_MERGED_PATHS);
4788 8f8646e5 2019-07-25 stsp goto done;
4790 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
4791 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
4792 01757395 2019-07-12 stsp repo, collect_commitables, &cc_arg, NULL, NULL);
4794 01757395 2019-07-12 stsp goto done;
4797 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
4798 01757395 2019-07-12 stsp collect_commitables, &cc_arg, NULL, NULL);
4800 01757395 2019-07-12 stsp goto done;
4803 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
4804 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
4805 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
4807 a0e95631 2019-07-12 stsp goto done;
4808 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
4809 a0e95631 2019-07-12 stsp goto done;
4812 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
4814 edd02c5e 2019-07-11 stsp goto done;
4816 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
4818 818c7501 2019-07-11 stsp goto done;
4820 5943eee2 2019-08-13 stsp if (new_logmsg) {
4821 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
4822 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
4823 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
4824 5943eee2 2019-08-13 stsp goto done;
4827 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
4829 5943eee2 2019-08-13 stsp goto done;
4832 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
4833 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
4834 5c1e53bc 2019-07-28 stsp worktree, got_object_commit_get_author(orig_commit),
4835 a0e95631 2019-07-12 stsp got_object_commit_get_committer(orig_commit),
4836 0ebf8283 2019-07-24 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
4838 a0e95631 2019-07-12 stsp goto done;
4840 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
4842 a0e95631 2019-07-12 stsp goto done;
4844 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
4846 a0e95631 2019-07-12 stsp goto done;
4848 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
4849 93ec1b5f 2019-07-12 stsp fileindex);
4850 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4851 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
4852 a0e95631 2019-07-12 stsp err = sync_err;
4854 a0e95631 2019-07-12 stsp free(fileindex_path);
4855 a0e95631 2019-07-12 stsp free(head_commit_id);
4856 a0e95631 2019-07-12 stsp if (head_ref)
4857 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
4858 818c7501 2019-07-11 stsp if (err) {
4859 818c7501 2019-07-11 stsp free(*new_commit_id);
4860 818c7501 2019-07-11 stsp *new_commit_id = NULL;
4862 818c7501 2019-07-11 stsp return err;
4865 818c7501 2019-07-11 stsp const struct got_error *
4866 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
4867 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
4868 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4869 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
4870 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
4872 0ebf8283 2019-07-24 stsp const struct got_error *err;
4873 0ebf8283 2019-07-24 stsp char *commit_ref_name;
4874 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
4875 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
4877 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4879 0ebf8283 2019-07-24 stsp return err;
4881 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4883 0ebf8283 2019-07-24 stsp goto done;
4884 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
4886 0ebf8283 2019-07-24 stsp goto done;
4887 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
4888 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
4889 0ebf8283 2019-07-24 stsp goto done;
4892 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
4893 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
4895 0ebf8283 2019-07-24 stsp if (commit_ref)
4896 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
4897 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4898 0ebf8283 2019-07-24 stsp free(commit_id);
4899 0ebf8283 2019-07-24 stsp return err;
4902 0ebf8283 2019-07-24 stsp const struct got_error *
4903 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
4904 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
4905 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4906 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
4907 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
4908 0ebf8283 2019-07-24 stsp struct got_repository *repo)
4910 0ebf8283 2019-07-24 stsp const struct got_error *err;
4911 0ebf8283 2019-07-24 stsp char *commit_ref_name;
4912 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
4913 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
4915 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4917 0ebf8283 2019-07-24 stsp return err;
4919 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4921 0ebf8283 2019-07-24 stsp goto done;
4922 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
4924 0ebf8283 2019-07-24 stsp goto done;
4925 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
4926 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_COMMITID);
4927 0ebf8283 2019-07-24 stsp goto done;
4930 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
4931 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
4933 0ebf8283 2019-07-24 stsp if (commit_ref)
4934 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
4935 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4936 0ebf8283 2019-07-24 stsp free(commit_id);
4937 0ebf8283 2019-07-24 stsp return err;
4940 0ebf8283 2019-07-24 stsp const struct got_error *
4941 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
4942 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
4944 3e3a69f1 2019-07-25 stsp if (fileindex)
4945 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
4946 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
4949 69844fba 2019-07-11 stsp static const struct got_error *
4950 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
4952 69844fba 2019-07-11 stsp const struct got_error *err;
4953 69844fba 2019-07-11 stsp struct got_reference *ref;
4955 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
4956 69844fba 2019-07-11 stsp if (err) {
4957 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
4958 69844fba 2019-07-11 stsp return NULL;
4959 69844fba 2019-07-11 stsp return err;
4962 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
4963 69844fba 2019-07-11 stsp got_ref_close(ref);
4964 69844fba 2019-07-11 stsp return err;
4967 69844fba 2019-07-11 stsp static const struct got_error *
4968 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
4970 69844fba 2019-07-11 stsp const struct got_error *err;
4971 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
4972 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
4974 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4976 69844fba 2019-07-11 stsp goto done;
4977 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
4979 69844fba 2019-07-11 stsp goto done;
4981 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4983 69844fba 2019-07-11 stsp goto done;
4984 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
4986 69844fba 2019-07-11 stsp goto done;
4988 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4990 69844fba 2019-07-11 stsp goto done;
4991 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
4993 69844fba 2019-07-11 stsp goto done;
4995 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4997 69844fba 2019-07-11 stsp goto done;
4998 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
5000 69844fba 2019-07-11 stsp goto done;
5003 69844fba 2019-07-11 stsp free(tmp_branch_name);
5004 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
5005 69844fba 2019-07-11 stsp free(branch_ref_name);
5006 69844fba 2019-07-11 stsp free(commit_ref_name);
5007 69844fba 2019-07-11 stsp return err;
5010 818c7501 2019-07-11 stsp const struct got_error *
5011 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
5012 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
5013 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
5014 818c7501 2019-07-11 stsp struct got_repository *repo)
5016 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
5017 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
5019 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
5021 818c7501 2019-07-11 stsp return err;
5023 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
5025 818c7501 2019-07-11 stsp goto done;
5027 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
5029 818c7501 2019-07-11 stsp goto done;
5031 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
5033 818c7501 2019-07-11 stsp goto done;
5035 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
5037 3e3a69f1 2019-07-25 stsp if (fileindex)
5038 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5039 818c7501 2019-07-11 stsp free(new_head_commit_id);
5040 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5041 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
5042 818c7501 2019-07-11 stsp err = unlockerr;
5043 818c7501 2019-07-11 stsp return err;
5046 818c7501 2019-07-11 stsp const struct got_error *
5047 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
5048 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
5049 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
5050 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
5052 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
5053 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
5054 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
5055 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
5056 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
5057 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
5059 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
5061 818c7501 2019-07-11 stsp return err;
5063 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
5064 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
5066 818c7501 2019-07-11 stsp goto done;
5068 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
5070 818c7501 2019-07-11 stsp goto done;
5073 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
5074 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
5075 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
5077 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
5079 818c7501 2019-07-11 stsp goto done;
5081 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
5083 818c7501 2019-07-11 stsp goto done;
5085 ca355955 2019-07-12 stsp err = got_object_id_by_path(&tree_id, repo,
5086 ca355955 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
5088 ca355955 2019-07-12 stsp goto done;
5090 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
5092 ca355955 2019-07-12 stsp goto done;
5094 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5096 818c7501 2019-07-11 stsp goto done;
5098 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
5099 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
5100 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
5101 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
5102 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
5103 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
5104 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
5105 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
5106 1f1abb7e 2019-08-08 stsp revert_file, &rfa, NULL, NULL);
5108 1f1abb7e 2019-08-08 stsp goto sync;
5110 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
5111 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
5113 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5114 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
5115 ca355955 2019-07-12 stsp err = sync_err;
5117 818c7501 2019-07-11 stsp got_ref_close(resolved);
5118 a3a2faf2 2019-07-12 stsp free(tree_id);
5119 818c7501 2019-07-11 stsp free(commit_id);
5120 0ebf8283 2019-07-24 stsp if (fileindex)
5121 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
5122 0ebf8283 2019-07-24 stsp free(fileindex_path);
5124 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5125 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
5126 0ebf8283 2019-07-24 stsp err = unlockerr;
5127 0ebf8283 2019-07-24 stsp return err;
5130 0ebf8283 2019-07-24 stsp const struct got_error *
5131 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
5132 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
5133 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
5134 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
5136 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5137 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
5138 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
5139 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
5140 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
5141 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
5142 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
5143 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
5145 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5146 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
5147 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
5148 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5150 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
5152 0ebf8283 2019-07-24 stsp return err;
5154 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5156 0ebf8283 2019-07-24 stsp goto done;
5158 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
5159 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
5160 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5163 0ebf8283 2019-07-24 stsp goto done;
5165 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5167 0ebf8283 2019-07-24 stsp goto done;
5169 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5171 0ebf8283 2019-07-24 stsp goto done;
5173 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5174 0ebf8283 2019-07-24 stsp worktree);
5176 0ebf8283 2019-07-24 stsp goto done;
5178 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5181 0ebf8283 2019-07-24 stsp goto done;
5183 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
5185 0ebf8283 2019-07-24 stsp goto done;
5187 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
5189 0ebf8283 2019-07-24 stsp goto done;
5191 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
5192 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
5194 0ebf8283 2019-07-24 stsp goto done;
5195 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
5197 0ebf8283 2019-07-24 stsp goto done;
5198 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
5199 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
5200 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
5201 0ebf8283 2019-07-24 stsp goto done;
5204 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
5205 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
5207 0ebf8283 2019-07-24 stsp goto done;
5208 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
5210 0ebf8283 2019-07-24 stsp goto done;
5212 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
5214 0ebf8283 2019-07-24 stsp goto done;
5216 0ebf8283 2019-07-24 stsp free(fileindex_path);
5217 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
5218 0ebf8283 2019-07-24 stsp free(branch_ref_name);
5219 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
5220 0ebf8283 2019-07-24 stsp if (wt_branch)
5221 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
5222 0ebf8283 2019-07-24 stsp if (err) {
5223 0ebf8283 2019-07-24 stsp if (*branch_ref) {
5224 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
5225 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
5227 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
5228 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
5229 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5231 0ebf8283 2019-07-24 stsp free(*base_commit_id);
5232 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5233 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5234 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5236 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
5238 0ebf8283 2019-07-24 stsp return err;
5241 0ebf8283 2019-07-24 stsp const struct got_error *
5242 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
5243 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
5245 3e3a69f1 2019-07-25 stsp if (fileindex)
5246 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5247 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
5250 0ebf8283 2019-07-24 stsp const struct got_error *
5251 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
5252 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
5254 0ebf8283 2019-07-24 stsp const struct got_error *err;
5255 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
5257 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5259 0ebf8283 2019-07-24 stsp return err;
5261 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
5262 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
5263 0ebf8283 2019-07-24 stsp return NULL;
5266 0ebf8283 2019-07-24 stsp const struct got_error *
5267 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
5268 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
5269 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
5270 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
5272 0ebf8283 2019-07-24 stsp const struct got_error *err;
5273 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
5274 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
5275 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
5276 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
5277 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
5278 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
5280 0ebf8283 2019-07-24 stsp *commit_id = NULL;
5281 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5282 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
5283 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5285 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
5287 3e3a69f1 2019-07-25 stsp return err;
5289 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5291 f032f1f7 2019-08-04 stsp goto done;
5293 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
5294 f032f1f7 2019-08-04 stsp &have_staged_files);
5295 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
5296 f032f1f7 2019-08-04 stsp goto done;
5297 f032f1f7 2019-08-04 stsp if (have_staged_files) {
5298 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
5299 3e3a69f1 2019-07-25 stsp goto done;
5302 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5304 f032f1f7 2019-08-04 stsp goto done;
5306 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5308 0ebf8283 2019-07-24 stsp goto done;
5310 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5312 0ebf8283 2019-07-24 stsp goto done;
5314 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5315 0ebf8283 2019-07-24 stsp worktree);
5317 0ebf8283 2019-07-24 stsp goto done;
5319 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
5321 0ebf8283 2019-07-24 stsp goto done;
5323 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5325 0ebf8283 2019-07-24 stsp goto done;
5326 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
5328 0ebf8283 2019-07-24 stsp goto done;
5330 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
5332 0ebf8283 2019-07-24 stsp goto done;
5333 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
5335 0ebf8283 2019-07-24 stsp goto done;
5337 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
5339 0ebf8283 2019-07-24 stsp goto done;
5341 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5342 0ebf8283 2019-07-24 stsp free(branch_ref_name);
5343 3e3a69f1 2019-07-25 stsp free(fileindex_path);
5344 0ebf8283 2019-07-24 stsp if (commit_ref)
5345 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
5346 0ebf8283 2019-07-24 stsp if (base_commit_ref)
5347 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
5348 0ebf8283 2019-07-24 stsp if (err) {
5349 0ebf8283 2019-07-24 stsp free(*commit_id);
5350 0ebf8283 2019-07-24 stsp *commit_id = NULL;
5351 0ebf8283 2019-07-24 stsp free(*base_commit_id);
5352 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
5353 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
5354 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
5355 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5357 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5358 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5359 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5361 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
5363 0ebf8283 2019-07-24 stsp return err;
5366 0ebf8283 2019-07-24 stsp static const struct got_error *
5367 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
5369 0ebf8283 2019-07-24 stsp const struct got_error *err;
5370 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
5371 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
5373 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5375 0ebf8283 2019-07-24 stsp goto done;
5376 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
5378 0ebf8283 2019-07-24 stsp goto done;
5380 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5381 0ebf8283 2019-07-24 stsp worktree);
5383 0ebf8283 2019-07-24 stsp goto done;
5384 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
5386 0ebf8283 2019-07-24 stsp goto done;
5388 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5390 0ebf8283 2019-07-24 stsp goto done;
5391 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
5393 0ebf8283 2019-07-24 stsp goto done;
5395 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5397 0ebf8283 2019-07-24 stsp goto done;
5398 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
5400 0ebf8283 2019-07-24 stsp goto done;
5402 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
5403 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
5404 0ebf8283 2019-07-24 stsp free(branch_ref_name);
5405 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5406 0ebf8283 2019-07-24 stsp return err;
5409 0ebf8283 2019-07-24 stsp const struct got_error *
5410 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
5411 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
5412 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
5413 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
5415 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
5416 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
5417 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
5418 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
5419 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
5421 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
5423 0ebf8283 2019-07-24 stsp return err;
5425 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
5426 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
5428 0ebf8283 2019-07-24 stsp goto done;
5430 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
5432 0ebf8283 2019-07-24 stsp goto done;
5434 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
5436 0ebf8283 2019-07-24 stsp goto done;
5438 0ebf8283 2019-07-24 stsp err = got_object_id_by_path(&tree_id, repo, base_commit_id,
5439 0ebf8283 2019-07-24 stsp worktree->path_prefix);
5441 0ebf8283 2019-07-24 stsp goto done;
5443 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
5445 0ebf8283 2019-07-24 stsp goto done;
5447 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5449 0ebf8283 2019-07-24 stsp goto done;
5451 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
5452 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
5453 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
5454 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
5455 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
5456 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
5457 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
5458 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
5459 1f1abb7e 2019-08-08 stsp revert_file, &rfa, NULL, NULL);
5461 1f1abb7e 2019-08-08 stsp goto sync;
5463 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
5464 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
5466 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5467 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
5468 0ebf8283 2019-07-24 stsp err = sync_err;
5470 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
5471 0ebf8283 2019-07-24 stsp free(tree_id);
5472 818c7501 2019-07-11 stsp free(fileindex_path);
5474 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5475 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
5476 818c7501 2019-07-11 stsp err = unlockerr;
5477 818c7501 2019-07-11 stsp return err;
5480 0ebf8283 2019-07-24 stsp const struct got_error *
5481 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
5482 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5483 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
5485 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr;
5486 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
5487 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
5489 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
5491 0ebf8283 2019-07-24 stsp return err;
5493 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
5494 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
5496 0ebf8283 2019-07-24 stsp goto done;
5498 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
5500 0ebf8283 2019-07-24 stsp goto done;
5502 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
5504 0ebf8283 2019-07-24 stsp goto done;
5506 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
5508 0ebf8283 2019-07-24 stsp goto done;
5510 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
5512 3e3a69f1 2019-07-25 stsp if (fileindex)
5513 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5514 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
5515 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5516 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
5517 0ebf8283 2019-07-24 stsp err = unlockerr;
5518 0ebf8283 2019-07-24 stsp return err;
5521 0ebf8283 2019-07-24 stsp const struct got_error *
5522 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
5523 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
5525 0ebf8283 2019-07-24 stsp const struct got_error *err;
5526 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5528 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5530 0ebf8283 2019-07-24 stsp return err;
5532 0ebf8283 2019-07-24 stsp err = store_commit_id(commit_ref_name, commit_id, repo);
5534 0ebf8283 2019-07-24 stsp goto done;
5536 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
5538 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5539 0cb83759 2019-08-03 stsp return err;
5542 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
5543 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
5544 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
5545 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
5546 2db2652d 2019-08-07 stsp struct got_repository *repo;
5547 2db2652d 2019-08-07 stsp int have_changes;
5550 2db2652d 2019-08-07 stsp const struct got_error *
5551 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
5552 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
5553 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5554 2db2652d 2019-08-07 stsp struct got_object_id *commit_id)
5556 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
5557 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
5558 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
5559 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
5560 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
5561 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
5563 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
5564 8b13ce36 2019-08-08 stsp return NULL;
5565 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
5566 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
5568 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
5569 735ef5ac 2019-08-03 stsp if (ie == NULL)
5570 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
5572 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
5573 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
5574 735ef5ac 2019-08-03 stsp relpath) == -1)
5575 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
5577 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
5578 735ef5ac 2019-08-03 stsp memcpy(base_commit_id.sha1, ie->commit_sha1,
5579 735ef5ac 2019-08-03 stsp SHA1_DIGEST_LENGTH);
5580 735ef5ac 2019-08-03 stsp base_commit_idp = &base_commit_id;
5583 3aa5969e 2019-08-06 stsp if (status == GOT_STATUS_NO_CHANGE) {
5584 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_NO_CHANGE);
5585 3aa5969e 2019-08-06 stsp goto done;
5586 3aa5969e 2019-08-06 stsp } else if (status == GOT_STATUS_CONFLICT) {
5587 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
5588 3aa5969e 2019-08-06 stsp goto done;
5589 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
5590 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
5591 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
5592 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
5593 735ef5ac 2019-08-03 stsp goto done;
5596 2db2652d 2019-08-07 stsp a->have_changes = 1;
5598 735ef5ac 2019-08-03 stsp p = in_repo_path;
5599 735ef5ac 2019-08-03 stsp while (p[0] == '/')
5601 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
5602 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
5603 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
5605 735ef5ac 2019-08-03 stsp free(in_repo_path);
5606 dc424a06 2019-08-07 stsp return err;
5609 2db2652d 2019-08-07 stsp struct stage_path_arg {
5610 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
5611 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
5612 2db2652d 2019-08-07 stsp struct got_repository *repo;
5613 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
5614 2db2652d 2019-08-07 stsp void *status_arg;
5615 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
5616 2db2652d 2019-08-07 stsp void *patch_arg;
5619 2db2652d 2019-08-07 stsp static const struct got_error *
5620 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
5621 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
5622 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5623 2db2652d 2019-08-07 stsp struct got_object_id *commit_id)
5625 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
5626 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
5627 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
5628 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
5629 0cb83759 2019-08-03 stsp uint32_t stage;
5630 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
5632 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
5633 8b13ce36 2019-08-08 stsp return NULL;
5635 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
5636 d3e7c587 2019-08-03 stsp if (ie == NULL)
5637 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
5639 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
5640 2db2652d 2019-08-07 stsp relpath)== -1)
5641 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
5643 0cb83759 2019-08-03 stsp switch (status) {
5644 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
5645 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
5646 2db2652d 2019-08-07 stsp if (a->patch_cb) {
5647 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
5648 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
5649 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
5650 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
5653 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
5656 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
5657 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
5658 af5a81b2 2019-08-08 stsp ondisk_path, ie->path, a->repo,
5659 2db2652d 2019-08-07 stsp a->patch_cb, a->patch_arg);
5660 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
5664 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
5665 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
5668 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
5669 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
5670 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
5671 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
5673 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
5674 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
5675 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
5677 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
5678 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
5679 af5a81b2 2019-08-08 stsp new_staged_blob_id, NULL);
5681 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
5682 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
5684 2db2652d 2019-08-07 stsp if (a->patch_cb) {
5685 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
5686 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
5687 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
5690 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
5692 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
5693 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
5697 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
5698 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
5699 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
5701 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
5702 537ac44b 2019-08-03 stsp get_staged_status(ie), relpath, NULL, NULL, NULL);
5704 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
5705 d3e7c587 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_NO_CHANGE);
5707 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
5708 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
5710 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
5711 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
5714 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
5718 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
5719 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
5720 dc424a06 2019-08-07 stsp free(path_content);
5721 2db2652d 2019-08-07 stsp free(ondisk_path);
5722 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
5723 0ebf8283 2019-07-24 stsp return err;
5726 0cb83759 2019-08-03 stsp const struct got_error *
5727 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
5728 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
5729 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
5730 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
5731 1e71573e 2019-08-03 stsp struct got_repository *repo)
5733 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
5734 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
5735 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
5736 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
5737 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
5738 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
5739 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
5740 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
5742 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
5744 0cb83759 2019-08-03 stsp return err;
5746 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
5747 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
5749 735ef5ac 2019-08-03 stsp goto done;
5750 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
5752 735ef5ac 2019-08-03 stsp goto done;
5753 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
5755 0cb83759 2019-08-03 stsp goto done;
5757 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
5758 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
5759 2db2652d 2019-08-07 stsp oka.worktree = worktree;
5760 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
5761 2db2652d 2019-08-07 stsp oka.repo = repo;
5762 2db2652d 2019-08-07 stsp oka.have_changes = 0;
5763 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
5764 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
5765 2db2652d 2019-08-07 stsp check_stage_ok, &oka, NULL, NULL);
5767 735ef5ac 2019-08-03 stsp goto done;
5769 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
5770 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
5771 2db2652d 2019-08-07 stsp goto done;
5774 2db2652d 2019-08-07 stsp spa.worktree = worktree;
5775 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
5776 2db2652d 2019-08-07 stsp spa.repo = repo;
5777 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
5778 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
5779 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
5780 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
5781 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
5782 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
5783 2db2652d 2019-08-07 stsp stage_path, &spa, NULL, NULL);
5785 2db2652d 2019-08-07 stsp goto done;
5788 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5789 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
5790 0cb83759 2019-08-03 stsp err = sync_err;
5792 735ef5ac 2019-08-03 stsp if (head_ref)
5793 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
5794 735ef5ac 2019-08-03 stsp free(head_commit_id);
5795 0cb83759 2019-08-03 stsp free(fileindex_path);
5796 0cb83759 2019-08-03 stsp if (fileindex)
5797 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
5798 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5799 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
5800 0cb83759 2019-08-03 stsp err = unlockerr;
5801 0cb83759 2019-08-03 stsp return err;
5804 ad493afc 2019-08-03 stsp struct unstage_path_arg {
5805 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
5806 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
5807 ad493afc 2019-08-03 stsp struct got_repository *repo;
5808 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
5809 ad493afc 2019-08-03 stsp void *progress_arg;
5810 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
5811 2e1f37b0 2019-08-08 stsp void *patch_arg;
5814 2e1f37b0 2019-08-08 stsp static const struct got_error *
5815 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
5816 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
5817 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
5818 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
5819 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
5821 2e1f37b0 2019-08-08 stsp const struct got_error *err;
5822 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
5823 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
5824 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
5825 2e1f37b0 2019-08-08 stsp struct stat sb1, sb2;
5826 2e1f37b0 2019-08-08 stsp struct got_diff_changes *changes = NULL;
5827 2e1f37b0 2019-08-08 stsp struct got_diff_state *ds = NULL;
5828 2e1f37b0 2019-08-08 stsp struct got_diff_args *args = NULL;
5829 2e1f37b0 2019-08-08 stsp struct got_diff_change *change;
5830 2e1f37b0 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, n = 0;
5831 2e1f37b0 2019-08-08 stsp int have_content = 0, have_rejected_content = 0;
5833 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
5834 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
5836 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
5838 2e1f37b0 2019-08-08 stsp return err;
5839 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
5841 2e1f37b0 2019-08-08 stsp goto done;
5843 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
5845 2e1f37b0 2019-08-08 stsp goto done;
5847 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
5849 2e1f37b0 2019-08-08 stsp goto done;
5851 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
5853 2e1f37b0 2019-08-08 stsp goto done;
5855 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
5857 2e1f37b0 2019-08-08 stsp goto done;
5859 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
5861 2e1f37b0 2019-08-08 stsp goto done;
5863 2e1f37b0 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
5864 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
5865 2e1f37b0 2019-08-08 stsp goto done;
5868 2e1f37b0 2019-08-08 stsp if (stat(path2, &sb2) == -1) {
5869 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path2);
5870 2e1f37b0 2019-08-08 stsp goto done;
5873 2e1f37b0 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
5874 2e1f37b0 2019-08-08 stsp f1, sb1.st_size, label1, f2, sb2.st_size, path2, 3, NULL);
5876 2e1f37b0 2019-08-08 stsp goto done;
5878 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
5879 2e1f37b0 2019-08-08 stsp "got-unstaged-content");
5881 2e1f37b0 2019-08-08 stsp goto done;
5882 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
5883 2e1f37b0 2019-08-08 stsp "got-new-staged-content");
5885 2e1f37b0 2019-08-08 stsp goto done;
5887 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
5888 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
5889 2e1f37b0 2019-08-08 stsp goto done;
5891 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
5892 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
5893 2e1f37b0 2019-08-08 stsp goto done;
5895 2e1f37b0 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
5896 2e1f37b0 2019-08-08 stsp int choice;
5897 2e1f37b0 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
5898 2e1f37b0 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
5899 2e1f37b0 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
5900 2e1f37b0 2019-08-08 stsp outfile, rejectfile, patch_cb, patch_arg);
5902 2e1f37b0 2019-08-08 stsp goto done;
5903 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
5904 2e1f37b0 2019-08-08 stsp have_content = 1;
5906 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
5907 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
5910 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
5911 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
5912 f1e81a05 2019-08-10 stsp outfile, rejectfile);
5914 2e1f37b0 2019-08-08 stsp free(label1);
5916 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
5917 2e1f37b0 2019-08-08 stsp if (staged_blob)
5918 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
5919 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
5920 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
5921 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
5922 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
5923 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
5924 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
5925 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
5926 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
5927 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
5928 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
5929 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
5930 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
5931 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
5932 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
5933 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
5934 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
5935 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
5936 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
5937 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
5939 2e1f37b0 2019-08-08 stsp if (err || !have_rejected_content) {
5940 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
5941 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
5942 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
5943 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
5944 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
5945 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
5947 2e1f37b0 2019-08-08 stsp free(args);
5949 2e1f37b0 2019-08-08 stsp got_diff_state_free(ds);
5952 2e1f37b0 2019-08-08 stsp if (changes)
5953 2e1f37b0 2019-08-08 stsp got_diff_free_changes(changes);
5954 2e1f37b0 2019-08-08 stsp free(path1);
5955 2e1f37b0 2019-08-08 stsp free(path2);
5956 2e1f37b0 2019-08-08 stsp return err;
5959 ad493afc 2019-08-03 stsp static const struct got_error *
5960 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
5961 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
5962 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5963 ad493afc 2019-08-03 stsp struct got_object_id *commit_id)
5965 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
5966 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
5967 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
5968 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
5969 2e1f37b0 2019-08-08 stsp char *ondisk_path = NULL, *path_unstaged_content = NULL;
5970 2e1f37b0 2019-08-08 stsp char *path_new_staged_content = NULL;
5971 ad493afc 2019-08-03 stsp int local_changes_subsumed;
5972 9bc94a15 2019-08-03 stsp struct stat sb;
5974 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
5975 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
5976 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
5977 2e1f37b0 2019-08-08 stsp return NULL;
5979 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
5980 ad493afc 2019-08-03 stsp if (ie == NULL)
5981 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
5983 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
5985 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
5987 ad493afc 2019-08-03 stsp switch (staged_status) {
5988 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
5989 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
5990 ad493afc 2019-08-03 stsp blob_id, 8192);
5993 ad493afc 2019-08-03 stsp /* fall through */
5994 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
5995 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
5996 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
5997 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
5998 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
5999 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
6002 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
6005 2e1f37b0 2019-08-08 stsp err = create_unstaged_content(
6006 2e1f37b0 2019-08-08 stsp &path_unstaged_content,
6007 2e1f37b0 2019-08-08 stsp &path_new_staged_content, blob_id,
6008 2e1f37b0 2019-08-08 stsp staged_blob_id, ie->path, a->repo,
6009 2e1f37b0 2019-08-08 stsp a->patch_cb, a->patch_arg);
6010 2e1f37b0 2019-08-08 stsp if (err || path_unstaged_content == NULL)
6012 2e1f37b0 2019-08-08 stsp if (path_new_staged_content) {
6013 2e1f37b0 2019-08-08 stsp err = got_object_blob_create(
6014 2e1f37b0 2019-08-08 stsp &staged_blob_id,
6015 2e1f37b0 2019-08-08 stsp path_new_staged_content,
6019 2e1f37b0 2019-08-08 stsp memcpy(ie->staged_blob_sha1,
6020 2e1f37b0 2019-08-08 stsp staged_blob_id->sha1,
6021 2e1f37b0 2019-08-08 stsp SHA1_DIGEST_LENGTH);
6023 2e1f37b0 2019-08-08 stsp err = merge_file(&local_changes_subsumed,
6024 2e1f37b0 2019-08-08 stsp a->worktree, blob_base, ondisk_path,
6025 2e1f37b0 2019-08-08 stsp relpath, got_fileindex_perms_to_st(ie),
6026 2e1f37b0 2019-08-08 stsp path_unstaged_content, "unstaged",
6027 2e1f37b0 2019-08-08 stsp a->repo, a->progress_cb, a->progress_arg);
6028 2e1f37b0 2019-08-08 stsp if (err == NULL &&
6029 2e1f37b0 2019-08-08 stsp path_new_staged_content == NULL)
6030 2e1f37b0 2019-08-08 stsp got_fileindex_entry_stage_set(ie,
6031 2e1f37b0 2019-08-08 stsp GOT_FILEIDX_STAGE_NONE);
6032 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
6035 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
6036 ad493afc 2019-08-03 stsp staged_blob_id, 8192);
6039 ad493afc 2019-08-03 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
6040 ad493afc 2019-08-03 stsp blob_base, ondisk_path, relpath,
6041 ad493afc 2019-08-03 stsp got_fileindex_perms_to_st(ie), blob_staged,
6042 ad493afc 2019-08-03 stsp commit_id ? commit_id : a->worktree->base_commit_id,
6043 ad493afc 2019-08-03 stsp a->repo, a->progress_cb, a->progress_arg);
6044 ad493afc 2019-08-03 stsp if (err == NULL)
6045 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
6046 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
6048 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
6049 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
6050 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
6051 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
6052 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
6055 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
6057 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
6058 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
6062 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
6063 9bc94a15 2019-08-03 stsp err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
6066 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
6070 ad493afc 2019-08-03 stsp free(ondisk_path);
6071 2e1f37b0 2019-08-08 stsp if (path_unstaged_content &&
6072 2e1f37b0 2019-08-08 stsp unlink(path_unstaged_content) == -1 && err == NULL)
6073 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
6074 2e1f37b0 2019-08-08 stsp if (path_new_staged_content &&
6075 2e1f37b0 2019-08-08 stsp unlink(path_new_staged_content) == -1 && err == NULL)
6076 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
6077 2e1f37b0 2019-08-08 stsp free(path_unstaged_content);
6078 2e1f37b0 2019-08-08 stsp free(path_new_staged_content);
6079 ad493afc 2019-08-03 stsp if (blob_base)
6080 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
6081 ad493afc 2019-08-03 stsp if (blob_staged)
6082 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
6083 ad493afc 2019-08-03 stsp return err;
6086 ad493afc 2019-08-03 stsp const struct got_error *
6087 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
6088 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
6089 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6090 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
6091 ad493afc 2019-08-03 stsp struct got_repository *repo)
6093 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
6094 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
6095 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
6096 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
6097 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
6099 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
6101 ad493afc 2019-08-03 stsp return err;
6103 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
6105 ad493afc 2019-08-03 stsp goto done;
6107 ad493afc 2019-08-03 stsp upa.worktree = worktree;
6108 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
6109 ad493afc 2019-08-03 stsp upa.repo = repo;
6110 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
6111 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
6112 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
6113 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
6114 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
6115 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
6116 ad493afc 2019-08-03 stsp unstage_path, &upa, NULL, NULL);
6118 ad493afc 2019-08-03 stsp goto done;
6121 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6122 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
6123 ad493afc 2019-08-03 stsp err = sync_err;
6125 ad493afc 2019-08-03 stsp free(fileindex_path);
6126 ad493afc 2019-08-03 stsp if (fileindex)
6127 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
6128 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6129 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
6130 ad493afc 2019-08-03 stsp err = unlockerr;
6131 ad493afc 2019-08-03 stsp return err;
