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 303e14b5 2019-09-23 stsp #include <time.h>
28 86c3caaf 2018-03-09 stsp #include <fcntl.h>
29 86c3caaf 2018-03-09 stsp #include <errno.h>
30 86c3caaf 2018-03-09 stsp #include <unistd.h>
31 9d31a1d8 2018-03-11 stsp #include <sha1.h>
32 9d31a1d8 2018-03-11 stsp #include <zlib.h>
33 9d31a1d8 2018-03-11 stsp #include <fnmatch.h>
34 512f0d0e 2019-01-02 stsp #include <libgen.h>
35 ec22038e 2019-03-10 stsp #include <uuid.h>
36 7154f6ce 2019-03-27 stsp #include <util.h>
38 86c3caaf 2018-03-09 stsp #include "got_error.h"
39 86c3caaf 2018-03-09 stsp #include "got_repository.h"
40 5261c201 2018-04-01 stsp #include "got_reference.h"
41 9d31a1d8 2018-03-11 stsp #include "got_object.h"
42 1dd54920 2019-05-11 stsp #include "got_path.h"
43 e6209546 2019-08-22 stsp #include "got_cancel.h"
44 86c3caaf 2018-03-09 stsp #include "got_worktree.h"
45 511a516b 2018-05-19 stsp #include "got_opentemp.h"
46 234035bc 2019-06-01 stsp #include "got_diff.h"
48 718b3ab0 2018-03-17 stsp #include "got_lib_worktree.h"
49 718b3ab0 2018-03-17 stsp #include "got_lib_sha1.h"
50 718b3ab0 2018-03-17 stsp #include "got_lib_fileindex.h"
51 63581804 2018-07-09 stsp #include "got_lib_inflate.h"
52 718b3ab0 2018-03-17 stsp #include "got_lib_delta.h"
53 718b3ab0 2018-03-17 stsp #include "got_lib_object.h"
54 ed175427 2019-05-09 stsp #include "got_lib_object_parse.h"
55 cf066bf8 2019-05-09 stsp #include "got_lib_object_create.h"
56 24519714 2019-05-09 stsp #include "got_lib_object_idset.h"
57 6353ad76 2019-02-08 stsp #include "got_lib_diff.h"
60 9d31a1d8 2018-03-11 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
63 f69721c3 2019-10-21 stsp #define GOT_MERGE_LABEL_MERGED "merged change"
64 f69721c3 2019-10-21 stsp #define GOT_MERGE_LABEL_BASE "3-way merge base"
66 99724ed4 2018-03-10 stsp static const struct got_error *
67 7ac97322 2018-03-11 stsp create_meta_file(const char *path_got, const char *name, const char *content)
69 99724ed4 2018-03-10 stsp const struct got_error *err = NULL;
72 2c7829a4 2019-06-17 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1)
73 2c7829a4 2019-06-17 stsp return got_error_from_errno("asprintf");
75 2c7829a4 2019-06-17 stsp err = got_path_create_file(path, content);
80 507dc3bb 2018-12-29 stsp static const struct got_error *
81 507dc3bb 2018-12-29 stsp update_meta_file(const char *path_got, const char *name, const char *content)
83 507dc3bb 2018-12-29 stsp const struct got_error *err = NULL;
84 507dc3bb 2018-12-29 stsp FILE *tmpfile = NULL;
85 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
86 507dc3bb 2018-12-29 stsp char *path = NULL;
88 507dc3bb 2018-12-29 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
89 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
90 507dc3bb 2018-12-29 stsp path = NULL;
94 507dc3bb 2018-12-29 stsp err = got_opentemp_named(&tmppath, &tmpfile, path);
98 507dc3bb 2018-12-29 stsp if (content) {
99 507dc3bb 2018-12-29 stsp int len = fprintf(tmpfile, "%s\n", content);
100 507dc3bb 2018-12-29 stsp if (len != strlen(content) + 1) {
101 638f9024 2019-05-13 stsp err = got_error_from_errno2("fprintf", tmppath);
106 507dc3bb 2018-12-29 stsp if (rename(tmppath, path) != 0) {
107 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath, path);
108 2a57020b 2019-02-20 stsp unlink(tmppath);
113 fb43ecf1 2019-02-11 stsp if (fclose(tmpfile) != 0 && err == NULL)
114 638f9024 2019-05-13 stsp err = got_error_from_errno2("fclose", tmppath);
115 230a42bd 2019-05-11 jcs free(tmppath);
116 99724ed4 2018-03-10 stsp return err;
119 09fe317a 2018-03-11 stsp static const struct got_error *
120 7ac97322 2018-03-11 stsp read_meta_file(char **content, const char *path_got, const char *name)
122 09fe317a 2018-03-11 stsp const struct got_error *err = NULL;
123 09fe317a 2018-03-11 stsp char *path;
124 09fe317a 2018-03-11 stsp int fd = -1;
126 09fe317a 2018-03-11 stsp struct stat sb;
128 09fe317a 2018-03-11 stsp *content = NULL;
130 7ac97322 2018-03-11 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
131 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
132 09fe317a 2018-03-11 stsp path = NULL;
136 ef99fdb1 2018-03-11 stsp fd = open(path, O_RDONLY | O_NOFOLLOW);
137 09fe317a 2018-03-11 stsp if (fd == -1) {
138 f02eaa22 2019-03-11 stsp if (errno == ENOENT)
139 a2e6d162 2019-07-27 stsp err = got_error_path(path, GOT_ERR_WORKTREE_META);
141 638f9024 2019-05-13 stsp err = got_error_from_errno2("open", path);
144 ef99fdb1 2018-03-11 stsp if (flock(fd, LOCK_SH | LOCK_NB) == -1) {
145 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
146 638f9024 2019-05-13 stsp : got_error_from_errno2("flock", path));
150 e4b9a50c 2019-07-27 stsp if (fstat(fd, &sb) != 0) {
151 e4b9a50c 2019-07-27 stsp err = got_error_from_errno2("fstat", path);
154 09fe317a 2018-03-11 stsp *content = calloc(1, sb.st_size);
155 09fe317a 2018-03-11 stsp if (*content == NULL) {
156 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
160 09fe317a 2018-03-11 stsp n = read(fd, *content, sb.st_size);
161 09fe317a 2018-03-11 stsp if (n != sb.st_size) {
162 638f9024 2019-05-13 stsp err = (n == -1 ? got_error_from_errno2("read", path) :
163 a2e6d162 2019-07-27 stsp got_error_path(path, GOT_ERR_WORKTREE_META));
166 09fe317a 2018-03-11 stsp if ((*content)[sb.st_size - 1] != '\n') {
167 a2e6d162 2019-07-27 stsp err = got_error_path(path, GOT_ERR_WORKTREE_META);
170 09fe317a 2018-03-11 stsp (*content)[sb.st_size - 1] = '\0';
173 09fe317a 2018-03-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
174 638f9024 2019-05-13 stsp err = got_error_from_errno2("close", path_got);
175 09fe317a 2018-03-11 stsp free(path);
177 09fe317a 2018-03-11 stsp free(*content);
178 09fe317a 2018-03-11 stsp *content = NULL;
180 09fe317a 2018-03-11 stsp return err;
183 024e9686 2019-05-14 stsp static const struct got_error *
184 024e9686 2019-05-14 stsp write_head_ref(const char *path_got, struct got_reference *head_ref)
186 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
187 024e9686 2019-05-14 stsp char *refstr = NULL;
189 024e9686 2019-05-14 stsp if (got_ref_is_symbolic(head_ref)) {
190 024e9686 2019-05-14 stsp refstr = got_ref_to_str(head_ref);
191 024e9686 2019-05-14 stsp if (refstr == NULL)
192 024e9686 2019-05-14 stsp return got_error_from_errno("got_ref_to_str");
194 024e9686 2019-05-14 stsp refstr = strdup(got_ref_get_name(head_ref));
195 024e9686 2019-05-14 stsp if (refstr == NULL)
196 024e9686 2019-05-14 stsp return got_error_from_errno("strdup");
198 024e9686 2019-05-14 stsp err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
199 024e9686 2019-05-14 stsp free(refstr);
200 024e9686 2019-05-14 stsp return err;
203 86c3caaf 2018-03-09 stsp const struct got_error *
204 86c3caaf 2018-03-09 stsp got_worktree_init(const char *path, struct got_reference *head_ref,
205 577ec78f 2018-03-11 stsp const char *prefix, struct got_repository *repo)
207 86c3caaf 2018-03-09 stsp const struct got_error *err = NULL;
208 65596e15 2018-12-24 stsp struct got_object_id *commit_id = NULL;
209 ec22038e 2019-03-10 stsp uuid_t uuid;
210 ec22038e 2019-03-10 stsp uint32_t uuid_status;
211 65596e15 2018-12-24 stsp int obj_type;
212 7ac97322 2018-03-11 stsp char *path_got = NULL;
213 1451e70d 2018-03-10 stsp char *formatstr = NULL;
214 0bb8a95e 2018-03-12 stsp char *absprefix = NULL;
215 65596e15 2018-12-24 stsp char *basestr = NULL;
216 ec22038e 2019-03-10 stsp char *uuidstr = NULL;
218 0c48fee2 2019-03-11 stsp if (strcmp(path, got_repo_get_path(repo)) == 0) {
219 0c48fee2 2019-03-11 stsp err = got_error(GOT_ERR_WORKTREE_REPO);
223 65596e15 2018-12-24 stsp err = got_ref_resolve(&commit_id, repo, head_ref);
225 65596e15 2018-12-24 stsp return err;
226 65596e15 2018-12-24 stsp err = got_object_get_type(&obj_type, repo, commit_id);
228 65596e15 2018-12-24 stsp return err;
229 65596e15 2018-12-24 stsp if (obj_type != GOT_OBJ_TYPE_COMMIT)
230 65596e15 2018-12-24 stsp return got_error(GOT_ERR_OBJ_TYPE);
232 0bb8a95e 2018-03-12 stsp if (!got_path_is_absolute(prefix)) {
233 0bb8a95e 2018-03-12 stsp if (asprintf(&absprefix, "/%s", prefix) == -1)
234 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
237 86c3caaf 2018-03-09 stsp /* Create top-level directory (may already exist). */
238 2cb4bacb 2018-03-11 stsp if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
239 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path);
243 86c3caaf 2018-03-09 stsp /* Create .got directory (may already exist). */
244 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
245 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
248 7ac97322 2018-03-11 stsp if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
249 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path_got);
253 056e7441 2018-03-11 stsp /* Create an empty lock file. */
254 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
258 86c3caaf 2018-03-09 stsp /* Create an empty file index. */
259 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
263 08d425ea 2018-12-24 stsp /* Write the HEAD reference. */
264 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
268 65596e15 2018-12-24 stsp /* Record our base commit. */
269 65596e15 2018-12-24 stsp err = got_object_id_str(&basestr, commit_id);
272 0f92850e 2018-12-25 stsp err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
276 1451e70d 2018-03-10 stsp /* Store path to repository. */
277 7839bc15 2019-01-06 stsp err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
278 7839bc15 2019-01-06 stsp got_repo_get_path(repo));
282 577ec78f 2018-03-11 stsp /* Store in-repository path prefix. */
283 0bb8a95e 2018-03-12 stsp err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
284 0bb8a95e 2018-03-12 stsp absprefix ? absprefix : prefix);
288 ec22038e 2019-03-10 stsp /* Generate UUID. */
289 ec22038e 2019-03-10 stsp uuid_create(&uuid, &uuid_status);
290 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
291 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_create");
294 ec22038e 2019-03-10 stsp uuid_to_string(&uuid, &uuidstr, &uuid_status);
295 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
296 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_to_string");
299 ec22038e 2019-03-10 stsp err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
303 9dce68ed 2018-03-10 stsp /* Stamp work tree with format file. */
304 1451e70d 2018-03-10 stsp if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
305 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
308 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
313 65596e15 2018-12-24 stsp free(commit_id);
314 7ac97322 2018-03-11 stsp free(path_got);
315 1451e70d 2018-03-10 stsp free(formatstr);
316 0bb8a95e 2018-03-12 stsp free(absprefix);
317 65596e15 2018-12-24 stsp free(basestr);
318 ec22038e 2019-03-10 stsp free(uuidstr);
319 86c3caaf 2018-03-09 stsp return err;
322 247140b2 2019-02-05 stsp static const struct got_error *
323 247140b2 2019-02-05 stsp open_worktree(struct got_worktree **worktree, const char *path)
325 6d9d28c3 2018-03-11 stsp const struct got_error *err = NULL;
326 7ac97322 2018-03-11 stsp char *path_got;
327 6d9d28c3 2018-03-11 stsp char *formatstr = NULL;
328 c442a90d 2019-03-10 stsp char *uuidstr = NULL;
329 056e7441 2018-03-11 stsp char *path_lock = NULL;
330 eaccb85f 2018-12-25 stsp char *base_commit_id_str = NULL;
331 6d9d28c3 2018-03-11 stsp int version, fd = -1;
332 6d9d28c3 2018-03-11 stsp const char *errstr;
333 eaccb85f 2018-12-25 stsp struct got_repository *repo = NULL;
334 c442a90d 2019-03-10 stsp uint32_t uuid_status;
336 6d9d28c3 2018-03-11 stsp *worktree = NULL;
338 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
339 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
340 7ac97322 2018-03-11 stsp path_got = NULL;
344 7ac97322 2018-03-11 stsp if (asprintf(&path_lock, "%s/%s", path_got, GOT_WORKTREE_LOCK) == -1) {
345 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
346 056e7441 2018-03-11 stsp path_lock = NULL;
350 056e7441 2018-03-11 stsp fd = open(path_lock, O_RDWR | O_EXLOCK | O_NONBLOCK);
351 6d9d28c3 2018-03-11 stsp if (fd == -1) {
352 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
353 638f9024 2019-05-13 stsp : got_error_from_errno2("open", path_lock));
357 7ac97322 2018-03-11 stsp err = read_meta_file(&formatstr, path_got, GOT_WORKTREE_FORMAT);
361 6d9d28c3 2018-03-11 stsp version = strtonum(formatstr, 1, INT_MAX, &errstr);
362 6d9d28c3 2018-03-11 stsp if (errstr) {
363 a2e6d162 2019-07-27 stsp err = got_error_msg(GOT_ERR_WORKTREE_META,
364 a2e6d162 2019-07-27 stsp "could not parse work tree format version number");
367 6d9d28c3 2018-03-11 stsp if (version != GOT_WORKTREE_FORMAT_VERSION) {
368 6d9d28c3 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_VERS);
372 6d9d28c3 2018-03-11 stsp *worktree = calloc(1, sizeof(**worktree));
373 6d9d28c3 2018-03-11 stsp if (*worktree == NULL) {
374 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
377 056e7441 2018-03-11 stsp (*worktree)->lockfd = -1;
379 0647c563 2019-03-11 stsp (*worktree)->root_path = strdup(path);
380 c88eb298 2018-03-11 stsp if ((*worktree)->root_path == NULL) {
381 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
384 cde76477 2018-03-11 stsp err = read_meta_file(&(*worktree)->repo_path, path_got,
385 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_REPOSITORY);
389 7ac97322 2018-03-11 stsp err = read_meta_file(&(*worktree)->path_prefix, path_got,
390 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_PATH_PREFIX);
394 eaccb85f 2018-12-25 stsp err = read_meta_file(&base_commit_id_str, path_got,
395 0f92850e 2018-12-25 stsp GOT_WORKTREE_BASE_COMMIT);
399 c442a90d 2019-03-10 stsp err = read_meta_file(&uuidstr, path_got, GOT_WORKTREE_UUID);
402 c442a90d 2019-03-10 stsp uuid_from_string(uuidstr, &(*worktree)->uuid, &uuid_status);
403 c442a90d 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
404 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_from_string");
408 c9956ddf 2019-09-08 stsp err = got_repo_open(&repo, (*worktree)->repo_path, NULL);
412 eaccb85f 2018-12-25 stsp err = got_object_resolve_id_str(&(*worktree)->base_commit_id, repo,
413 eaccb85f 2018-12-25 stsp base_commit_id_str);
417 36a38700 2019-05-10 stsp err = read_meta_file(&(*worktree)->head_ref_name, path_got,
418 36a38700 2019-05-10 stsp GOT_WORKTREE_HEAD_REF);
421 eaccb85f 2018-12-25 stsp got_repo_close(repo);
422 7ac97322 2018-03-11 stsp free(path_got);
423 056e7441 2018-03-11 stsp free(path_lock);
424 eaccb85f 2018-12-25 stsp free(base_commit_id_str);
425 c442a90d 2019-03-10 stsp free(uuidstr);
426 bd165944 2019-03-10 stsp free(formatstr);
428 6d9d28c3 2018-03-11 stsp if (fd != -1)
430 6d9d28c3 2018-03-11 stsp if (*worktree != NULL)
431 6d9d28c3 2018-03-11 stsp got_worktree_close(*worktree);
432 6d9d28c3 2018-03-11 stsp *worktree = NULL;
434 056e7441 2018-03-11 stsp (*worktree)->lockfd = fd;
436 6d9d28c3 2018-03-11 stsp return err;
439 247140b2 2019-02-05 stsp const struct got_error *
440 247140b2 2019-02-05 stsp got_worktree_open(struct got_worktree **worktree, const char *path)
442 247140b2 2019-02-05 stsp const struct got_error *err = NULL;
445 247140b2 2019-02-05 stsp err = open_worktree(worktree, path);
446 f02eaa22 2019-03-11 stsp if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT))
447 247140b2 2019-02-05 stsp return err;
448 247140b2 2019-02-05 stsp if (*worktree)
449 247140b2 2019-02-05 stsp return NULL;
450 247140b2 2019-02-05 stsp path = dirname(path);
451 d1542a27 2019-02-05 stsp if (path == NULL)
452 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
453 d1542a27 2019-02-05 stsp } while (!((path[0] == '.' || path[0] == '/') && path[1] == '\0'));
455 247140b2 2019-02-05 stsp return got_error(GOT_ERR_NOT_WORKTREE);
458 3a6ce05a 2019-02-11 stsp const struct got_error *
459 86c3caaf 2018-03-09 stsp got_worktree_close(struct got_worktree *worktree)
461 3a6ce05a 2019-02-11 stsp const struct got_error *err = NULL;
462 cde76477 2018-03-11 stsp free(worktree->repo_path);
463 6d9d28c3 2018-03-11 stsp free(worktree->path_prefix);
464 eaccb85f 2018-12-25 stsp free(worktree->base_commit_id);
465 36a38700 2019-05-10 stsp free(worktree->head_ref_name);
466 056e7441 2018-03-11 stsp if (worktree->lockfd != -1)
467 3a6ce05a 2019-02-11 stsp if (close(worktree->lockfd) != 0)
468 638f9024 2019-05-13 stsp err = got_error_from_errno2("close",
469 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree));
470 7f11502c 2019-08-28 hiltjo free(worktree->root_path);
471 6d9d28c3 2018-03-11 stsp free(worktree);
472 3a6ce05a 2019-02-11 stsp return err;
475 2fbdb5ae 2018-12-29 stsp const char *
476 c7f4312f 2019-02-05 stsp got_worktree_get_root_path(struct got_worktree *worktree)
478 c7f4312f 2019-02-05 stsp return worktree->root_path;
481 c7f4312f 2019-02-05 stsp const char *
482 86c3caaf 2018-03-09 stsp got_worktree_get_repo_path(struct got_worktree *worktree)
484 2fbdb5ae 2018-12-29 stsp return worktree->repo_path;
487 49520a32 2018-12-29 stsp const char *
488 49520a32 2018-12-29 stsp got_worktree_get_path_prefix(struct got_worktree *worktree)
490 f609be2e 2018-12-29 stsp return worktree->path_prefix;
493 e5dc7198 2018-12-29 stsp const struct got_error *
494 e5dc7198 2018-12-29 stsp got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
495 e5dc7198 2018-12-29 stsp const char *path_prefix)
497 e5dc7198 2018-12-29 stsp char *absprefix = NULL;
499 e5dc7198 2018-12-29 stsp if (!got_path_is_absolute(path_prefix)) {
500 e5dc7198 2018-12-29 stsp if (asprintf(&absprefix, "/%s", path_prefix) == -1)
501 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
503 e5dc7198 2018-12-29 stsp *match = (strcmp(absprefix ? absprefix : path_prefix,
504 e5dc7198 2018-12-29 stsp worktree->path_prefix) == 0);
505 e5dc7198 2018-12-29 stsp free(absprefix);
506 e5dc7198 2018-12-29 stsp return NULL;
509 bc70eb79 2019-05-09 stsp const char *
510 35be1456 2018-03-11 stsp got_worktree_get_head_ref_name(struct got_worktree *worktree)
512 36a38700 2019-05-10 stsp return worktree->head_ref_name;
515 024e9686 2019-05-14 stsp const struct got_error *
516 024e9686 2019-05-14 stsp got_worktree_set_head_ref(struct got_worktree *worktree,
517 024e9686 2019-05-14 stsp struct got_reference *head_ref)
519 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
520 024e9686 2019-05-14 stsp char *path_got = NULL, *head_ref_name = NULL;
522 024e9686 2019-05-14 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
523 024e9686 2019-05-14 stsp GOT_WORKTREE_GOT_DIR) == -1) {
524 024e9686 2019-05-14 stsp err = got_error_from_errno("asprintf");
525 024e9686 2019-05-14 stsp path_got = NULL;
529 024e9686 2019-05-14 stsp head_ref_name = strdup(got_ref_get_name(head_ref));
530 024e9686 2019-05-14 stsp if (head_ref_name == NULL) {
531 024e9686 2019-05-14 stsp err = got_error_from_errno("strdup");
535 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
539 024e9686 2019-05-14 stsp free(worktree->head_ref_name);
540 024e9686 2019-05-14 stsp worktree->head_ref_name = head_ref_name;
542 024e9686 2019-05-14 stsp free(path_got);
544 024e9686 2019-05-14 stsp free(head_ref_name);
545 024e9686 2019-05-14 stsp return err;
548 b72f483a 2019-02-05 stsp struct got_object_id *
549 507dc3bb 2018-12-29 stsp got_worktree_get_base_commit_id(struct got_worktree *worktree)
551 507dc3bb 2018-12-29 stsp return worktree->base_commit_id;
554 507dc3bb 2018-12-29 stsp const struct got_error *
555 507dc3bb 2018-12-29 stsp got_worktree_set_base_commit_id(struct got_worktree *worktree,
556 507dc3bb 2018-12-29 stsp struct got_repository *repo, struct got_object_id *commit_id)
558 507dc3bb 2018-12-29 stsp const struct got_error *err;
559 507dc3bb 2018-12-29 stsp struct got_object *obj = NULL;
560 507dc3bb 2018-12-29 stsp char *id_str = NULL;
561 507dc3bb 2018-12-29 stsp char *path_got = NULL;
563 507dc3bb 2018-12-29 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
564 507dc3bb 2018-12-29 stsp GOT_WORKTREE_GOT_DIR) == -1) {
565 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
566 507dc3bb 2018-12-29 stsp path_got = NULL;
570 507dc3bb 2018-12-29 stsp err = got_object_open(&obj, repo, commit_id);
572 507dc3bb 2018-12-29 stsp return err;
574 507dc3bb 2018-12-29 stsp if (obj->type != GOT_OBJ_TYPE_COMMIT) {
575 507dc3bb 2018-12-29 stsp err = got_error(GOT_ERR_OBJ_TYPE);
579 507dc3bb 2018-12-29 stsp /* Record our base commit. */
580 507dc3bb 2018-12-29 stsp err = got_object_id_str(&id_str, commit_id);
583 507dc3bb 2018-12-29 stsp err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
587 507dc3bb 2018-12-29 stsp free(worktree->base_commit_id);
588 507dc3bb 2018-12-29 stsp worktree->base_commit_id = got_object_id_dup(commit_id);
589 507dc3bb 2018-12-29 stsp if (worktree->base_commit_id == NULL) {
590 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
595 507dc3bb 2018-12-29 stsp got_object_close(obj);
596 507dc3bb 2018-12-29 stsp free(id_str);
597 507dc3bb 2018-12-29 stsp free(path_got);
598 507dc3bb 2018-12-29 stsp return err;
601 9d31a1d8 2018-03-11 stsp static const struct got_error *
602 9d31a1d8 2018-03-11 stsp lock_worktree(struct got_worktree *worktree, int operation)
604 9d31a1d8 2018-03-11 stsp if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
605 9d31a1d8 2018-03-11 stsp return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
606 638f9024 2019-05-13 stsp : got_error_from_errno2("flock",
607 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree)));
608 86c3caaf 2018-03-09 stsp return NULL;
611 21908da4 2019-01-13 stsp static const struct got_error *
612 4a1ddfc2 2019-01-12 stsp add_dir_on_disk(struct got_worktree *worktree, const char *path)
614 4a1ddfc2 2019-01-12 stsp const struct got_error *err = NULL;
615 4a1ddfc2 2019-01-12 stsp char *abspath;
617 4a1ddfc2 2019-01-12 stsp if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
618 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
620 0cd1c46a 2019-03-11 stsp err = got_path_mkdir(abspath);
621 ddcd8544 2019-03-11 stsp if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
622 ddcd8544 2019-03-11 stsp struct stat sb;
623 ddcd8544 2019-03-11 stsp err = NULL;
624 ddcd8544 2019-03-11 stsp if (lstat(abspath, &sb) == -1) {
625 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
626 ddcd8544 2019-03-11 stsp } else if (!S_ISDIR(sb.st_mode)) {
627 ddcd8544 2019-03-11 stsp /* TODO directory is obstructed; do something */
628 ddcd8544 2019-03-11 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
631 4a1ddfc2 2019-01-12 stsp free(abspath);
632 68c76935 2019-02-19 stsp return err;
635 68c76935 2019-02-19 stsp static const struct got_error *
636 68c76935 2019-02-19 stsp check_file_contents_equal(int *same, FILE *f1, FILE *f2)
638 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
639 68c76935 2019-02-19 stsp uint8_t fbuf1[8192];
640 68c76935 2019-02-19 stsp uint8_t fbuf2[8192];
641 68c76935 2019-02-19 stsp size_t flen1 = 0, flen2 = 0;
646 68c76935 2019-02-19 stsp flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
647 68c76935 2019-02-19 stsp if (flen1 == 0 && ferror(f1)) {
648 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
651 68c76935 2019-02-19 stsp flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
652 68c76935 2019-02-19 stsp if (flen2 == 0 && ferror(f2)) {
653 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
656 68c76935 2019-02-19 stsp if (flen1 == 0) {
657 68c76935 2019-02-19 stsp if (flen2 != 0)
660 68c76935 2019-02-19 stsp } else if (flen2 == 0) {
661 68c76935 2019-02-19 stsp if (flen1 != 0)
664 68c76935 2019-02-19 stsp } else if (flen1 == flen2) {
665 68c76935 2019-02-19 stsp if (memcmp(fbuf1, fbuf2, flen2) != 0) {
675 68c76935 2019-02-19 stsp return err;
678 68c76935 2019-02-19 stsp static const struct got_error *
679 68c76935 2019-02-19 stsp check_files_equal(int *same, const char *f1_path, const char *f2_path)
681 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
682 68c76935 2019-02-19 stsp struct stat sb;
683 68c76935 2019-02-19 stsp size_t size1, size2;
684 68c76935 2019-02-19 stsp FILE *f1 = NULL, *f2 = NULL;
688 68c76935 2019-02-19 stsp if (lstat(f1_path, &sb) != 0) {
689 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", f1_path);
692 68c76935 2019-02-19 stsp size1 = sb.st_size;
694 68c76935 2019-02-19 stsp if (lstat(f2_path, &sb) != 0) {
695 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", f2_path);
698 68c76935 2019-02-19 stsp size2 = sb.st_size;
700 68c76935 2019-02-19 stsp if (size1 != size2) {
702 68c76935 2019-02-19 stsp return NULL;
705 68c76935 2019-02-19 stsp f1 = fopen(f1_path, "r");
706 68c76935 2019-02-19 stsp if (f1 == NULL)
707 638f9024 2019-05-13 stsp return got_error_from_errno2("open", f1_path);
709 68c76935 2019-02-19 stsp f2 = fopen(f2_path, "r");
710 68c76935 2019-02-19 stsp if (f2 == NULL) {
711 638f9024 2019-05-13 stsp err = got_error_from_errno2("open", f2_path);
715 68c76935 2019-02-19 stsp err = check_file_contents_equal(same, f1, f2);
717 68c76935 2019-02-19 stsp if (f1 && fclose(f1) != 0 && err == NULL)
718 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
719 68c76935 2019-02-19 stsp if (f2 && fclose(f2) != 0 && err == NULL)
720 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
722 6353ad76 2019-02-08 stsp return err;
726 46b6ee73 2019-06-04 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
727 14c901f1 2019-08-08 stsp * the file at deriv_path acts as the first derived version, and the
728 14c901f1 2019-08-08 stsp * file on disk acts as the second derived version.
730 6353ad76 2019-02-08 stsp static const struct got_error *
731 14c901f1 2019-08-08 stsp merge_file(int *local_changes_subsumed, struct got_worktree *worktree,
732 46b6ee73 2019-06-04 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
733 14c901f1 2019-08-08 stsp const char *path, uint16_t st_mode, const char *deriv_path,
734 f69721c3 2019-10-21 stsp const char *label_orig, const char *label_deriv,
735 f69721c3 2019-10-21 stsp struct got_repository *repo,
736 14c901f1 2019-08-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
738 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
739 6353ad76 2019-02-08 stsp int merged_fd = -1;
740 14c901f1 2019-08-08 stsp FILE *f_orig = NULL;
741 14c901f1 2019-08-08 stsp char *blob_orig_path = NULL;
742 af54ae4a 2019-02-19 stsp char *merged_path = NULL, *base_path = NULL;
743 234035bc 2019-06-01 stsp int overlapcnt = 0;
744 af54ae4a 2019-02-19 stsp char *parent;
746 234035bc 2019-06-01 stsp *local_changes_subsumed = 0;
748 af54ae4a 2019-02-19 stsp parent = dirname(ondisk_path);
749 af54ae4a 2019-02-19 stsp if (parent == NULL)
750 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", ondisk_path);
752 af54ae4a 2019-02-19 stsp if (asprintf(&base_path, "%s/got-merged", parent) == -1)
753 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
755 af54ae4a 2019-02-19 stsp err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
759 af54ae4a 2019-02-19 stsp free(base_path);
760 46b6ee73 2019-06-04 stsp if (asprintf(&base_path, "%s/got-merge-blob-orig", parent) == -1) {
761 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
762 af54ae4a 2019-02-19 stsp base_path = NULL;
766 46b6ee73 2019-06-04 stsp err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
769 46b6ee73 2019-06-04 stsp if (blob_orig) {
770 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
771 46b6ee73 2019-06-04 stsp blob_orig);
776 1430b4e0 2019-03-27 stsp * If the file has no blob, this is an "add vs add" conflict,
777 1430b4e0 2019-03-27 stsp * and we simply use an empty ancestor file to make both files
778 1430b4e0 2019-03-27 stsp * appear in the merged result in their entirety.
782 14c901f1 2019-08-08 stsp err = got_merge_diff3(&overlapcnt, merged_fd, deriv_path,
783 f69721c3 2019-10-21 stsp blob_orig_path, ondisk_path, label_deriv, label_orig, NULL);
787 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
788 6353ad76 2019-02-08 stsp overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
792 816dc654 2019-02-16 stsp if (fsync(merged_fd) != 0) {
793 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
797 68c76935 2019-02-19 stsp /* Check if a clean merge has subsumed all local changes. */
798 68c76935 2019-02-19 stsp if (overlapcnt == 0) {
799 14c901f1 2019-08-08 stsp err = check_files_equal(local_changes_subsumed, deriv_path,
800 68c76935 2019-02-19 stsp merged_path);
805 70a0c8ec 2019-02-20 stsp if (chmod(merged_path, st_mode) != 0) {
806 638f9024 2019-05-13 stsp err = got_error_from_errno2("chmod", merged_path);
810 6353ad76 2019-02-08 stsp if (rename(merged_path, ondisk_path) != 0) {
811 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", merged_path,
812 230a42bd 2019-05-11 jcs ondisk_path);
813 2a57020b 2019-02-20 stsp unlink(merged_path);
818 3a6ce05a 2019-02-11 stsp if (merged_fd != -1 && close(merged_fd) != 0 && err == NULL)
819 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
820 46b6ee73 2019-06-04 stsp if (f_orig && fclose(f_orig) != 0 && err == NULL)
821 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
822 6353ad76 2019-02-08 stsp free(merged_path);
823 af54ae4a 2019-02-19 stsp free(base_path);
824 46b6ee73 2019-06-04 stsp if (blob_orig_path) {
825 46b6ee73 2019-06-04 stsp unlink(blob_orig_path);
826 46b6ee73 2019-06-04 stsp free(blob_orig_path);
828 14c901f1 2019-08-08 stsp return err;
832 14c901f1 2019-08-08 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
833 14c901f1 2019-08-08 stsp * blob_deriv acts as the first derived version, and the file on disk
834 14c901f1 2019-08-08 stsp * acts as the second derived version.
836 14c901f1 2019-08-08 stsp static const struct got_error *
837 14c901f1 2019-08-08 stsp merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
838 14c901f1 2019-08-08 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
839 f69721c3 2019-10-21 stsp const char *path, uint16_t st_mode, const char *label_orig,
840 f69721c3 2019-10-21 stsp struct got_blob_object *blob_deriv,
841 f69721c3 2019-10-21 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
842 f69721c3 2019-10-21 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
844 14c901f1 2019-08-08 stsp const struct got_error *err = NULL;
845 14c901f1 2019-08-08 stsp FILE *f_deriv = NULL;
846 14c901f1 2019-08-08 stsp char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
847 14c901f1 2019-08-08 stsp char *label_deriv = NULL, *parent;
849 14c901f1 2019-08-08 stsp *local_changes_subsumed = 0;
851 14c901f1 2019-08-08 stsp parent = dirname(ondisk_path);
852 14c901f1 2019-08-08 stsp if (parent == NULL)
853 14c901f1 2019-08-08 stsp return got_error_from_errno2("dirname", ondisk_path);
855 14c901f1 2019-08-08 stsp free(base_path);
856 14c901f1 2019-08-08 stsp if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
857 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
858 14c901f1 2019-08-08 stsp base_path = NULL;
862 14c901f1 2019-08-08 stsp err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
865 14c901f1 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
866 14c901f1 2019-08-08 stsp blob_deriv);
870 14c901f1 2019-08-08 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
873 f69721c3 2019-10-21 stsp if (asprintf(&label_deriv, "%s: commit %s",
874 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
875 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
879 14c901f1 2019-08-08 stsp err = merge_file(local_changes_subsumed, worktree, blob_orig,
880 f69721c3 2019-10-21 stsp ondisk_path, path, st_mode, blob_deriv_path, label_orig,
881 f69721c3 2019-10-21 stsp label_deriv, repo, progress_cb, progress_arg);
883 14c901f1 2019-08-08 stsp if (f_deriv && fclose(f_deriv) != 0 && err == NULL)
884 14c901f1 2019-08-08 stsp err = got_error_from_errno("fclose");
885 14c901f1 2019-08-08 stsp free(base_path);
886 14c901f1 2019-08-08 stsp if (blob_deriv_path) {
887 14c901f1 2019-08-08 stsp unlink(blob_deriv_path);
888 14c901f1 2019-08-08 stsp free(blob_deriv_path);
890 6353ad76 2019-02-08 stsp free(id_str);
891 818c7501 2019-07-11 stsp free(label_deriv);
892 4a1ddfc2 2019-01-12 stsp return err;
895 4a1ddfc2 2019-01-12 stsp static const struct got_error *
896 13d9040b 2019-03-27 stsp update_blob_fileindex_entry(struct got_worktree *worktree,
897 13d9040b 2019-03-27 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
898 13d9040b 2019-03-27 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
899 13d9040b 2019-03-27 stsp int update_timestamps)
901 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
903 13d9040b 2019-03-27 stsp if (ie == NULL)
904 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
906 13d9040b 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path,
907 13d9040b 2019-03-27 stsp blob->id.sha1, worktree->base_commit_id->sha1,
908 13d9040b 2019-03-27 stsp update_timestamps);
910 13d9040b 2019-03-27 stsp struct got_fileindex_entry *new_ie;
911 13d9040b 2019-03-27 stsp err = got_fileindex_entry_alloc(&new_ie, ondisk_path,
912 13d9040b 2019-03-27 stsp path, blob->id.sha1, worktree->base_commit_id->sha1);
914 13d9040b 2019-03-27 stsp err = got_fileindex_entry_add(fileindex, new_ie);
916 13d9040b 2019-03-27 stsp return err;
919 1ebedb77 2019-10-19 stsp static mode_t
920 1ebedb77 2019-10-19 stsp get_ondisk_perms(int executable, mode_t st_mode)
922 1ebedb77 2019-10-19 stsp mode_t xbits = S_IXUSR;
924 1ebedb77 2019-10-19 stsp if (executable) {
925 1ebedb77 2019-10-19 stsp /* Map read bits to execute bits. */
926 1ebedb77 2019-10-19 stsp if (st_mode & S_IRGRP)
927 1ebedb77 2019-10-19 stsp xbits |= S_IXGRP;
928 1ebedb77 2019-10-19 stsp if (st_mode & S_IROTH)
929 1ebedb77 2019-10-19 stsp xbits |= S_IXOTH;
930 1ebedb77 2019-10-19 stsp return st_mode | xbits;
933 1ebedb77 2019-10-19 stsp return (st_mode & ~(S_IXUSR | S_IXGRP | S_IXOTH));
936 13d9040b 2019-03-27 stsp static const struct got_error *
937 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
938 4b55f459 2019-09-08 stsp const char *path, uint16_t te_mode, uint16_t st_mode,
939 4b55f459 2019-09-08 stsp struct got_blob_object *blob, int restoring_missing_file,
940 4b55f459 2019-09-08 stsp int reverting_versioned_file, struct got_repository *repo,
941 4b55f459 2019-09-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
943 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
944 507dc3bb 2018-12-29 stsp int fd = -1;
945 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
946 507dc3bb 2018-12-29 stsp int update = 0;
947 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
949 c34b20a2 2018-03-12 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
950 9d31a1d8 2018-03-11 stsp GOT_DEFAULT_FILE_MODE);
951 9d31a1d8 2018-03-11 stsp if (fd == -1) {
952 21908da4 2019-01-13 stsp if (errno == ENOENT) {
953 21908da4 2019-01-13 stsp char *parent = dirname(path);
954 21908da4 2019-01-13 stsp if (parent == NULL)
955 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
956 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
958 21908da4 2019-01-13 stsp return err;
959 21908da4 2019-01-13 stsp fd = open(ondisk_path,
960 21908da4 2019-01-13 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
961 21908da4 2019-01-13 stsp GOT_DEFAULT_FILE_MODE);
962 21908da4 2019-01-13 stsp if (fd == -1)
963 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
964 230a42bd 2019-05-11 jcs ondisk_path);
965 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
966 b8f41171 2019-02-10 stsp if (!S_ISREG(st_mode)) {
967 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
968 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
971 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
972 507dc3bb 2018-12-29 stsp ondisk_path);
975 507dc3bb 2018-12-29 stsp update = 1;
978 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
981 a378724f 2019-02-10 stsp if (restoring_missing_file)
982 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING, path);
983 a129376b 2019-03-28 stsp else if (reverting_versioned_file)
984 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT, path);
986 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
987 a378724f 2019-02-10 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
991 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
993 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
994 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
997 9d31a1d8 2018-03-11 stsp if (len > 0) {
998 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
999 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1000 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
1001 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
1002 b87c6f83 2018-12-24 stsp goto done;
1003 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
1004 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
1005 b87c6f83 2018-12-24 stsp goto done;
1007 61d6eaa3 2018-12-24 stsp hdrlen = 0;
1009 9d31a1d8 2018-03-11 stsp } while (len != 0);
1011 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
1012 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
1013 816dc654 2019-02-16 stsp goto done;
1016 507dc3bb 2018-12-29 stsp if (update) {
1017 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
1018 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
1019 230a42bd 2019-05-11 jcs ondisk_path);
1020 2a57020b 2019-02-20 stsp unlink(tmppath);
1021 68ed9ba5 2019-02-10 stsp goto done;
1025 1ebedb77 2019-10-19 stsp if (chmod(ondisk_path,
1026 1ebedb77 2019-10-19 stsp get_ondisk_perms(te_mode & S_IXUSR, st_mode)) == -1) {
1027 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("chmod", ondisk_path);
1028 1ebedb77 2019-10-19 stsp goto done;
1032 3a6ce05a 2019-02-11 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
1033 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
1034 507dc3bb 2018-12-29 stsp free(tmppath);
1035 6353ad76 2019-02-08 stsp return err;
1038 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1039 6353ad76 2019-02-08 stsp static const struct got_error *
1040 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
1042 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
1043 7154f6ce 2019-03-27 stsp const char *markers[3] = {
1044 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
1045 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
1046 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
1048 7154f6ce 2019-03-27 stsp int i = 0;
1049 7154f6ce 2019-03-27 stsp char *line;
1050 7154f6ce 2019-03-27 stsp size_t len;
1051 7154f6ce 2019-03-27 stsp const char delim[3] = {'\0', '\0', '\0'};
1053 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1054 7154f6ce 2019-03-27 stsp line = fparseln(f, &len, NULL, delim, 0);
1055 7154f6ce 2019-03-27 stsp if (line == NULL) {
1056 7154f6ce 2019-03-27 stsp if (feof(f))
1058 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
1062 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1063 19332e6d 2019-05-13 stsp if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1065 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
1071 7154f6ce 2019-03-27 stsp return err;
1074 e2b1e152 2019-07-13 stsp static int
1075 1ebedb77 2019-10-19 stsp xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1077 1ebedb77 2019-10-19 stsp mode_t ie_mode = got_fileindex_perms_to_st(ie);
1078 1ebedb77 2019-10-19 stsp return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1081 1ebedb77 2019-10-19 stsp static int
1082 e2b1e152 2019-07-13 stsp stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1084 e2b1e152 2019-07-13 stsp return !(ie->ctime_sec == sb->st_ctime &&
1085 e2b1e152 2019-07-13 stsp ie->ctime_nsec == sb->st_ctimensec &&
1086 e2b1e152 2019-07-13 stsp ie->mtime_sec == sb->st_mtime &&
1087 e2b1e152 2019-07-13 stsp ie->mtime_nsec == sb->st_mtimensec &&
1088 1ebedb77 2019-10-19 stsp ie->size == (sb->st_size & 0xffffffff) &&
1089 1ebedb77 2019-10-19 stsp !xbit_differs(ie, sb->st_mode));
1092 c363b2c1 2019-08-03 stsp static unsigned char
1093 c363b2c1 2019-08-03 stsp get_staged_status(struct got_fileindex_entry *ie)
1095 c363b2c1 2019-08-03 stsp switch (got_fileindex_entry_stage_get(ie)) {
1096 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_ADD:
1097 c363b2c1 2019-08-03 stsp return GOT_STATUS_ADD;
1098 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_DELETE:
1099 c363b2c1 2019-08-03 stsp return GOT_STATUS_DELETE;
1100 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_MODIFY:
1101 c363b2c1 2019-08-03 stsp return GOT_STATUS_MODIFY;
1103 c363b2c1 2019-08-03 stsp return GOT_STATUS_NO_CHANGE;
1107 7154f6ce 2019-03-27 stsp static const struct got_error *
1108 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1109 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1110 b8f41171 2019-02-10 stsp struct got_repository *repo)
1112 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1113 6353ad76 2019-02-08 stsp struct got_object_id id;
1114 6353ad76 2019-02-08 stsp size_t hdrlen;
1115 6353ad76 2019-02-08 stsp FILE *f = NULL;
1116 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1117 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1118 6353ad76 2019-02-08 stsp size_t flen, blen;
1119 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
1121 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1123 339c298e 2019-07-27 stsp if (lstat(abspath, sb) == -1) {
1124 a378724f 2019-02-10 stsp if (errno == ENOENT) {
1125 abb4604f 2019-07-27 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1126 abb4604f 2019-07-27 stsp *status = GOT_STATUS_MISSING;
1128 abb4604f 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1129 a378724f 2019-02-10 stsp return NULL;
1131 339c298e 2019-07-27 stsp return got_error_from_errno2("lstat", abspath);
1134 339c298e 2019-07-27 stsp if (!S_ISREG(sb->st_mode)) {
1135 339c298e 2019-07-27 stsp *status = GOT_STATUS_OBSTRUCTED;
1136 339c298e 2019-07-27 stsp return NULL;
1139 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1140 339c298e 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1141 339c298e 2019-07-27 stsp return NULL;
1142 244725f2 2019-08-03 stsp } else if (!got_fileindex_entry_has_blob(ie) &&
1143 244725f2 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
1144 339c298e 2019-07-27 stsp *status = GOT_STATUS_ADD;
1145 339c298e 2019-07-27 stsp return NULL;
1148 e2b1e152 2019-07-13 stsp if (!stat_info_differs(ie, sb))
1149 339c298e 2019-07-27 stsp return NULL;
1151 c363b2c1 2019-08-03 stsp if (staged_status == GOT_STATUS_MODIFY ||
1152 c363b2c1 2019-08-03 stsp staged_status == GOT_STATUS_ADD)
1153 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1155 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1157 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1159 339c298e 2019-07-27 stsp return err;
1161 339c298e 2019-07-27 stsp f = fopen(abspath, "r");
1162 6353ad76 2019-02-08 stsp if (f == NULL) {
1163 339c298e 2019-07-27 stsp err = got_error_from_errno2("fopen", abspath);
1164 6353ad76 2019-02-08 stsp goto done;
1166 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1168 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1169 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1171 7154f6ce 2019-03-27 stsp goto done;
1172 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1173 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1174 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1175 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1176 7154f6ce 2019-03-27 stsp goto done;
1178 6353ad76 2019-02-08 stsp if (blen == 0) {
1179 6353ad76 2019-02-08 stsp if (flen != 0)
1180 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1182 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1183 6353ad76 2019-02-08 stsp if (blen != 0)
1184 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1186 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1187 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1188 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1189 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1193 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1196 6353ad76 2019-02-08 stsp hdrlen = 0;
1199 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1200 7154f6ce 2019-03-27 stsp rewind(f);
1201 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1202 1ebedb77 2019-10-19 stsp } else if (xbit_differs(ie, sb->st_mode))
1203 1ebedb77 2019-10-19 stsp *status = GOT_STATUS_MODE_CHANGE;
1206 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1208 6353ad76 2019-02-08 stsp fclose(f);
1209 9d31a1d8 2018-03-11 stsp return err;
1213 e2b1e152 2019-07-13 stsp * Update timestamps in the file index if a file is unmodified and
1214 e2b1e152 2019-07-13 stsp * we had to run a full content comparison to find out.
1216 e2b1e152 2019-07-13 stsp static const struct got_error *
1217 e2b1e152 2019-07-13 stsp sync_timestamps(char *ondisk_path, unsigned char status,
1218 e2b1e152 2019-07-13 stsp struct got_fileindex_entry *ie, struct stat *sb)
1220 e2b1e152 2019-07-13 stsp if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1221 e2b1e152 2019-07-13 stsp return got_fileindex_entry_update(ie, ondisk_path,
1222 e2b1e152 2019-07-13 stsp ie->blob_sha1, ie->commit_sha1, 1);
1224 e2b1e152 2019-07-13 stsp return NULL;
1227 9d31a1d8 2018-03-11 stsp static const struct got_error *
1228 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1229 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1230 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1231 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1232 0584f854 2019-04-06 stsp void *progress_arg)
1234 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1235 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1236 6353ad76 2019-02-08 stsp char *ondisk_path;
1237 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1238 b8f41171 2019-02-10 stsp struct stat sb;
1240 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1241 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1244 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1245 a76c42e6 2019-08-03 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1246 a76c42e6 2019-08-03 stsp goto done;
1248 abb4604f 2019-07-27 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1250 abb4604f 2019-07-27 stsp goto done;
1251 abb4604f 2019-07-27 stsp if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1252 abb4604f 2019-07-27 stsp sb.st_mode = got_fileindex_perms_to_st(ie);
1254 abb4604f 2019-07-27 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
1256 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1257 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1258 b8f41171 2019-02-10 stsp goto done;
1261 523b8417 2019-10-19 stsp if (ie && status != GOT_STATUS_MISSING &&
1262 523b8417 2019-10-19 stsp (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR)) {
1263 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1264 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1265 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1266 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1268 e2b1e152 2019-07-13 stsp goto done;
1269 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1271 6353ad76 2019-02-08 stsp goto done;
1273 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1274 1430b4e0 2019-03-27 stsp memcmp(ie->blob_sha1, te->id->sha1,
1275 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1276 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1277 b8f41171 2019-02-10 stsp goto done;
1281 8da9e5f4 2019-01-12 stsp err = got_object_open_as_blob(&blob, repo, te->id, 8192);
1283 6353ad76 2019-02-08 stsp goto done;
1285 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1286 234035bc 2019-06-01 stsp int update_timestamps;
1287 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1288 f69721c3 2019-10-21 stsp char *label_orig = NULL;
1289 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1290 234035bc 2019-06-01 stsp struct got_object_id id2;
1291 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1292 234035bc 2019-06-01 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1294 f69721c3 2019-10-21 stsp goto done;
1296 f69721c3 2019-10-21 stsp if (got_fileindex_entry_has_commit(ie)) {
1297 f69721c3 2019-10-21 stsp char id_str[SHA1_DIGEST_STRING_LENGTH];
1298 f69721c3 2019-10-21 stsp if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
1299 f69721c3 2019-10-21 stsp sizeof(id_str)) == NULL) {
1300 6dd1ece6 2019-11-10 stsp err = got_error_path(id_str,
1301 6dd1ece6 2019-11-10 stsp GOT_ERR_BAD_OBJ_ID_STR);
1302 f69721c3 2019-10-21 stsp goto done;
1304 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
1305 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
1306 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
1307 234035bc 2019-06-01 stsp goto done;
1310 234035bc 2019-06-01 stsp err = merge_blob(&update_timestamps, worktree, blob2,
1311 f69721c3 2019-10-21 stsp ondisk_path, path, sb.st_mode, label_orig, blob,
1312 818c7501 2019-07-11 stsp worktree->base_commit_id, repo,
1313 234035bc 2019-06-01 stsp progress_cb, progress_arg);
1314 f69721c3 2019-10-21 stsp free(label_orig);
1315 234035bc 2019-06-01 stsp if (blob2)
1316 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
1318 909d120e 2019-09-22 stsp goto done;
1320 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
1321 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
1322 234035bc 2019-06-01 stsp * unmodified files again.
1324 234035bc 2019-06-01 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1325 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
1326 234035bc 2019-06-01 stsp update_timestamps);
1327 1ebedb77 2019-10-19 stsp } else if (status == GOT_STATUS_MODE_CHANGE) {
1328 1ebedb77 2019-10-19 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1329 1ebedb77 2019-10-19 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1330 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
1331 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1333 1ee397ad 2019-07-12 stsp goto done;
1334 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1335 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 0);
1337 13d9040b 2019-03-27 stsp goto done;
1339 13d9040b 2019-03-27 stsp err = install_blob(worktree, ondisk_path, path, te->mode,
1340 a129376b 2019-03-28 stsp sb.st_mode, blob, status == GOT_STATUS_MISSING, 0,
1341 a129376b 2019-03-28 stsp repo, progress_cb, progress_arg);
1343 13d9040b 2019-03-27 stsp goto done;
1344 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1345 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 1);
1347 13d9040b 2019-03-27 stsp goto done;
1349 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
1351 6353ad76 2019-02-08 stsp free(ondisk_path);
1352 8da9e5f4 2019-01-12 stsp return err;
1355 90285c3b 2019-01-08 stsp static const struct got_error *
1356 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
1358 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
1359 90285c3b 2019-01-08 stsp char *ondisk_path = NULL;
1361 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
1362 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1364 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
1365 c97665ae 2019-01-13 stsp if (errno != ENOENT)
1366 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
1368 90285c3b 2019-01-08 stsp char *parent = dirname(ondisk_path);
1369 7a9df742 2019-01-08 stsp while (parent && strcmp(parent, root_path) != 0) {
1370 26c4ac4d 2019-01-08 stsp if (rmdir(parent) == -1) {
1371 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
1372 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
1376 90285c3b 2019-01-08 stsp parent = dirname(parent);
1379 90285c3b 2019-01-08 stsp free(ondisk_path);
1380 90285c3b 2019-01-08 stsp return err;
1383 708d8e67 2019-03-27 stsp static const struct got_error *
1384 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
1385 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
1386 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1388 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
1389 708d8e67 2019-03-27 stsp unsigned char status;
1390 708d8e67 2019-03-27 stsp struct stat sb;
1391 708d8e67 2019-03-27 stsp char *ondisk_path;
1393 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
1394 a76c42e6 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1396 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
1398 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1400 708d8e67 2019-03-27 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1402 708d8e67 2019-03-27 stsp return err;
1404 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
1405 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
1406 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
1408 1ee397ad 2019-07-12 stsp return err;
1410 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
1411 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
1413 fc6346c4 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
1416 708d8e67 2019-03-27 stsp return err;
1418 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
1420 1ee397ad 2019-07-12 stsp return err;
1421 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
1422 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
1424 fc6346c4 2019-03-27 stsp return err;
1426 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
1429 fc6346c4 2019-03-27 stsp return err;
1432 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
1433 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
1434 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
1435 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
1436 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
1437 8da9e5f4 2019-01-12 stsp void *progress_arg;
1438 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
1439 8da9e5f4 2019-01-12 stsp void *cancel_arg;
1442 512f0d0e 2019-01-02 stsp static const struct got_error *
1443 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
1444 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
1446 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1448 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1449 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1451 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
1452 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
1455 8da9e5f4 2019-01-12 stsp static const struct got_error *
1456 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1458 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1460 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1461 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1463 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
1464 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1467 9d31a1d8 2018-03-11 stsp static const struct got_error *
1468 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
1470 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1471 8da9e5f4 2019-01-12 stsp const struct got_error *err;
1472 8da9e5f4 2019-01-12 stsp char *path;
1474 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1475 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1477 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
1478 63c5ca5d 2019-08-24 stsp return NULL;
1480 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
1481 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
1483 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1485 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
1486 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
1488 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
1489 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1491 8da9e5f4 2019-01-12 stsp free(path);
1492 0cd1c46a 2019-03-11 stsp return err;
1495 818c7501 2019-07-11 stsp static const struct got_error *
1496 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
1498 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
1499 0647c563 2019-03-11 stsp char *uuidstr = NULL;
1500 0cd1c46a 2019-03-11 stsp uint32_t uuid_status;
1502 517bab73 2019-03-11 stsp *refname = NULL;
1504 0cd1c46a 2019-03-11 stsp uuid_to_string(&worktree->uuid, &uuidstr, &uuid_status);
1505 0cd1c46a 2019-03-11 stsp if (uuid_status != uuid_s_ok)
1506 cc483380 2019-09-01 stsp return got_error_uuid(uuid_status, "uuid_to_string");
1508 818c7501 2019-07-11 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr)
1510 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1511 0647c563 2019-03-11 stsp *refname = NULL;
1513 517bab73 2019-03-11 stsp free(uuidstr);
1514 517bab73 2019-03-11 stsp return err;
1517 818c7501 2019-07-11 stsp const struct got_error *
1518 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
1520 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
1523 818c7501 2019-07-11 stsp static const struct got_error *
1524 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
1526 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1527 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
1530 818c7501 2019-07-11 stsp static const struct got_error *
1531 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
1533 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
1536 818c7501 2019-07-11 stsp static const struct got_error *
1537 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
1539 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1540 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
1543 818c7501 2019-07-11 stsp static const struct got_error *
1544 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
1546 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1547 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
1550 0ebf8283 2019-07-24 stsp static const struct got_error *
1551 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
1553 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1554 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
1557 0ebf8283 2019-07-24 stsp static const struct got_error *
1558 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
1560 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1561 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
1564 0ebf8283 2019-07-24 stsp static const struct got_error *
1565 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
1567 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1568 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
1571 0ebf8283 2019-07-24 stsp static const struct got_error *
1572 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
1574 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1575 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
1578 0ebf8283 2019-07-24 stsp const struct got_error *
1579 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
1580 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
1582 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
1583 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
1584 0ebf8283 2019-07-24 stsp *path = NULL;
1585 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
1587 0ebf8283 2019-07-24 stsp return NULL;
1591 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
1592 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
1594 517bab73 2019-03-11 stsp static const struct got_error *
1595 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
1597 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
1598 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
1599 517bab73 2019-03-11 stsp char *refname;
1601 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
1603 517bab73 2019-03-11 stsp return err;
1605 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
1607 0cd1c46a 2019-03-11 stsp goto done;
1609 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
1611 0cd1c46a 2019-03-11 stsp free(refname);
1613 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
1614 3e3a69f1 2019-07-25 stsp return err;
1617 3e3a69f1 2019-07-25 stsp static const struct got_error *
1618 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
1620 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
1622 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
1623 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1624 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
1625 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
1627 9d31a1d8 2018-03-11 stsp return err;
1631 ebf99748 2019-05-09 stsp static const struct got_error *
1632 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
1633 4b55f459 2019-09-08 stsp struct got_worktree *worktree)
1635 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
1636 ebf99748 2019-05-09 stsp FILE *index = NULL;
1638 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1639 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
1640 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
1641 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
1643 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
1645 ebf99748 2019-05-09 stsp goto done;
1647 ebf99748 2019-05-09 stsp index = fopen(*fileindex_path, "rb");
1648 ebf99748 2019-05-09 stsp if (index == NULL) {
1649 ebf99748 2019-05-09 stsp if (errno != ENOENT)
1650 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
1652 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
1653 ebf99748 2019-05-09 stsp if (fclose(index) != 0 && err == NULL)
1654 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
1657 ebf99748 2019-05-09 stsp if (err) {
1658 ebf99748 2019-05-09 stsp free(*fileindex_path);
1659 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1660 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
1661 ebf99748 2019-05-09 stsp *fileindex = NULL;
1663 ebf99748 2019-05-09 stsp return err;
1666 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
1667 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
1668 c932eeeb 2019-05-22 stsp const char *path;
1669 c932eeeb 2019-05-22 stsp size_t path_len;
1670 c932eeeb 2019-05-22 stsp const char *entry_name;
1671 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
1672 a484d721 2019-06-10 stsp void *progress_arg;
1675 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
1676 c932eeeb 2019-05-22 stsp static const struct got_error *
1677 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
1679 1ee397ad 2019-07-12 stsp const struct got_error *err;
1680 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
1682 c932eeeb 2019-05-22 stsp if (a->entry_name) {
1683 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
1684 c932eeeb 2019-05-22 stsp return NULL;
1685 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
1686 102ff934 2019-06-11 stsp return NULL;
1688 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
1689 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
1690 c932eeeb 2019-05-22 stsp return NULL;
1692 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
1693 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
1694 edd02c5e 2019-07-11 stsp ie->path);
1696 1ee397ad 2019-07-12 stsp return err;
1698 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
1699 c932eeeb 2019-05-22 stsp return NULL;
1702 9c6338c4 2019-06-02 stsp static const struct got_error *
1703 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
1705 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
1706 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
1707 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
1709 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
1710 9c6338c4 2019-06-02 stsp fileindex_path);
1712 9c6338c4 2019-06-02 stsp goto done;
1714 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
1716 9c6338c4 2019-06-02 stsp goto done;
1718 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
1719 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
1720 9c6338c4 2019-06-02 stsp fileindex_path);
1721 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
1724 9c6338c4 2019-06-02 stsp if (new_index)
1725 9c6338c4 2019-06-02 stsp fclose(new_index);
1726 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
1727 9c6338c4 2019-06-02 stsp return err;
1730 6ced4176 2019-07-12 stsp static const struct got_error *
1731 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
1732 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
1733 6ced4176 2019-07-12 stsp struct got_worktree *worktree, struct got_repository *repo)
1735 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
1736 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
1737 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
1738 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
1740 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
1741 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
1742 6ced4176 2019-07-12 stsp *tree_id = NULL;
1744 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
1745 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
1746 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
1747 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
1748 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1749 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1750 6ced4176 2019-07-12 stsp goto done;
1752 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
1753 6ced4176 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
1755 6ced4176 2019-07-12 stsp goto done;
1756 6ced4176 2019-07-12 stsp return NULL;
1759 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
1761 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
1762 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
1763 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
1764 6ced4176 2019-07-12 stsp goto done;
1767 6ced4176 2019-07-12 stsp err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
1768 6ced4176 2019-07-12 stsp in_repo_path);
1770 6ced4176 2019-07-12 stsp goto done;
1772 6ced4176 2019-07-12 stsp free(in_repo_path);
1773 6ced4176 2019-07-12 stsp in_repo_path = NULL;
1775 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
1777 6ced4176 2019-07-12 stsp goto done;
1779 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
1780 6ced4176 2019-07-12 stsp /* Check out a single file. */
1781 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
1782 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
1783 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
1784 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
1785 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1786 6ced4176 2019-07-12 stsp goto done;
1788 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
1789 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1790 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1791 6ced4176 2019-07-12 stsp goto done;
1794 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
1795 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
1797 6ced4176 2019-07-12 stsp return err;
1798 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
1799 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
1800 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
1801 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
1802 6ced4176 2019-07-12 stsp goto done;
1805 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
1806 6ced4176 2019-07-12 stsp worktree->base_commit_id, in_repo_path);
1808 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
1809 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
1810 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
1811 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
1812 6ced4176 2019-07-12 stsp goto done;
1814 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
1815 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1816 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1817 6ced4176 2019-07-12 stsp goto done;
1822 6ced4176 2019-07-12 stsp free(in_repo_path);
1823 6ced4176 2019-07-12 stsp if (err) {
1824 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
1825 6ced4176 2019-07-12 stsp free(*tree_relpath);
1826 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
1827 6ced4176 2019-07-12 stsp free(*tree_id);
1828 6ced4176 2019-07-12 stsp *tree_id = NULL;
1830 07ed472d 2019-07-12 stsp return err;
1833 07ed472d 2019-07-12 stsp static const struct got_error *
1834 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
1835 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
1836 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1837 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
1839 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
1840 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
1841 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
1842 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
1843 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
1845 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
1847 07ed472d 2019-07-12 stsp goto done;
1849 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
1850 07ed472d 2019-07-12 stsp worktree->base_commit_id);
1852 07ed472d 2019-07-12 stsp goto done;
1854 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1856 07ed472d 2019-07-12 stsp goto done;
1858 07ed472d 2019-07-12 stsp if (entry_name &&
1859 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
1860 07ed472d 2019-07-12 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
1861 07ed472d 2019-07-12 stsp goto done;
1864 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
1865 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
1866 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
1867 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
1868 07ed472d 2019-07-12 stsp arg.worktree = worktree;
1869 07ed472d 2019-07-12 stsp arg.repo = repo;
1870 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
1871 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
1872 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
1873 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
1874 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
1875 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
1878 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
1879 07ed472d 2019-07-12 stsp if (commit)
1880 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
1881 6ced4176 2019-07-12 stsp return err;
1884 9d31a1d8 2018-03-11 stsp const struct got_error *
1885 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
1886 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
1887 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
1888 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
1890 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
1891 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
1892 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
1893 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
1894 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
1895 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
1896 f2ea84fa 2019-07-27 stsp struct tree_path_data {
1897 f2ea84fa 2019-07-27 stsp SIMPLEQ_ENTRY(tree_path_data) entry;
1898 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
1899 f2ea84fa 2019-07-27 stsp int entry_type;
1900 f2ea84fa 2019-07-27 stsp char *relpath;
1901 f2ea84fa 2019-07-27 stsp char *entry_name;
1902 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
1903 f2ea84fa 2019-07-27 stsp SIMPLEQ_HEAD(tree_paths, tree_path_data) tree_paths;
1905 f2ea84fa 2019-07-27 stsp SIMPLEQ_INIT(&tree_paths);
1907 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
1909 9d31a1d8 2018-03-11 stsp return err;
1911 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
1912 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
1913 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
1914 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
1915 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
1916 f2ea84fa 2019-07-27 stsp goto done;
1919 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
1920 f2ea84fa 2019-07-27 stsp &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
1921 f2ea84fa 2019-07-27 stsp if (err) {
1922 f2ea84fa 2019-07-27 stsp free(tpd);
1923 6ced4176 2019-07-12 stsp goto done;
1926 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
1927 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
1928 f2ea84fa 2019-07-27 stsp if (err) {
1929 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
1930 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
1931 f2ea84fa 2019-07-27 stsp free(tpd);
1932 f2ea84fa 2019-07-27 stsp goto done;
1935 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
1937 f2ea84fa 2019-07-27 stsp SIMPLEQ_INSERT_TAIL(&tree_paths, tpd, entry);
1941 51514078 2018-12-25 stsp * Read the file index.
1942 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
1943 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
1945 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
1947 c4cdcb68 2019-04-03 stsp goto done;
1949 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
1950 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
1951 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
1953 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
1954 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
1955 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
1959 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
1960 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
1961 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
1962 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
1963 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
1964 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
1965 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
1966 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
1970 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_NEXT(tpd, entry);
1972 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
1973 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
1974 af12c6b9 2019-06-04 stsp err = sync_err;
1976 9c6338c4 2019-06-02 stsp free(fileindex_path);
1978 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
1979 9d31a1d8 2018-03-11 stsp if (commit)
1980 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
1981 5ade8233 2019-07-12 stsp if (fileindex)
1982 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
1983 f2ea84fa 2019-07-27 stsp while (!SIMPLEQ_EMPTY(&tree_paths)) {
1984 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
1985 f2ea84fa 2019-07-27 stsp SIMPLEQ_REMOVE_HEAD(&tree_paths, entry);
1986 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
1987 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
1988 f2ea84fa 2019-07-27 stsp free(tpd);
1990 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
1991 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
1992 9d31a1d8 2018-03-11 stsp err = unlockerr;
1993 f8d1f275 2019-02-04 stsp return err;
1996 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
1997 234035bc 2019-06-01 stsp struct got_worktree *worktree;
1998 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
1999 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
2000 234035bc 2019-06-01 stsp void *progress_arg;
2001 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2002 234035bc 2019-06-01 stsp void *cancel_arg;
2003 f69721c3 2019-10-21 stsp const char *label_orig;
2004 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
2007 234035bc 2019-06-01 stsp static const struct got_error *
2008 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
2009 234035bc 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
2010 234035bc 2019-06-01 stsp struct got_object_id *id2, const char *path1, const char *path2,
2011 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
2013 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
2014 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
2015 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
2016 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
2017 234035bc 2019-06-01 stsp struct stat sb;
2018 234035bc 2019-06-01 stsp unsigned char status;
2019 234035bc 2019-06-01 stsp int local_changes_subsumed;
2021 234035bc 2019-06-01 stsp if (blob1 && blob2) {
2022 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2023 d6c87207 2019-08-02 stsp strlen(path2));
2024 1ee397ad 2019-07-12 stsp if (ie == NULL)
2025 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2026 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2028 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2029 234035bc 2019-06-01 stsp path2) == -1)
2030 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2032 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2034 234035bc 2019-06-01 stsp goto done;
2036 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2037 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2038 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
2039 234035bc 2019-06-01 stsp goto done;
2041 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2042 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2043 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2044 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2045 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
2046 234035bc 2019-06-01 stsp goto done;
2049 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree, blob1,
2050 f69721c3 2019-10-21 stsp ondisk_path, path2, sb.st_mode, a->label_orig, blob2,
2051 f69721c3 2019-10-21 stsp a->commit_id2, repo, a->progress_cb, a->progress_arg);
2052 234035bc 2019-06-01 stsp } else if (blob1) {
2053 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2054 d6c87207 2019-08-02 stsp strlen(path1));
2055 1ee397ad 2019-07-12 stsp if (ie == NULL)
2056 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2057 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2059 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2060 2b92fad7 2019-06-02 stsp path1) == -1)
2061 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2063 2b92fad7 2019-06-02 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2065 2b92fad7 2019-06-02 stsp goto done;
2067 2b92fad7 2019-06-02 stsp switch (status) {
2068 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2069 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2070 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2072 1ee397ad 2019-07-12 stsp goto done;
2073 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2075 2b92fad7 2019-06-02 stsp goto done;
2077 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2079 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
2080 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
2081 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2082 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2084 1ee397ad 2019-07-12 stsp goto done;
2086 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2088 2b92fad7 2019-06-02 stsp case GOT_STATUS_ADD:
2089 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
2090 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
2091 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2092 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
2094 1ee397ad 2019-07-12 stsp goto done;
2096 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
2097 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
2099 1ee397ad 2019-07-12 stsp goto done;
2104 234035bc 2019-06-01 stsp } else if (blob2) {
2105 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2106 234035bc 2019-06-01 stsp path2) == -1)
2107 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2108 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2109 d6c87207 2019-08-02 stsp strlen(path2));
2111 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
2114 234035bc 2019-06-01 stsp goto done;
2115 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2116 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2117 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2118 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2119 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2120 1ee397ad 2019-07-12 stsp status, path2);
2121 234035bc 2019-06-01 stsp goto done;
2123 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
2124 f69721c3 2019-10-21 stsp NULL, ondisk_path, path2, sb.st_mode,
2125 f69721c3 2019-10-21 stsp a->label_orig, blob2, a->commit_id2, repo,
2126 f69721c3 2019-10-21 stsp a->progress_cb,
2127 f69721c3 2019-10-21 stsp a->progress_arg);
2128 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2129 234035bc 2019-06-01 stsp err = update_blob_fileindex_entry(a->worktree,
2130 234035bc 2019-06-01 stsp a->fileindex, ie, ondisk_path, ie->path,
2131 234035bc 2019-06-01 stsp blob2, 0);
2133 234035bc 2019-06-01 stsp goto done;
2136 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2137 234035bc 2019-06-01 stsp err = install_blob(a->worktree, ondisk_path, path2,
2138 234035bc 2019-06-01 stsp /* XXX get this from parent tree! */
2139 234035bc 2019-06-01 stsp GOT_DEFAULT_FILE_MODE,
2140 234035bc 2019-06-01 stsp sb.st_mode, blob2, 0, 0, repo,
2141 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
2143 234035bc 2019-06-01 stsp goto done;
2144 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_alloc(&ie,
2145 2b92fad7 2019-06-02 stsp ondisk_path, path2, NULL, NULL);
2147 234035bc 2019-06-01 stsp goto done;
2148 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
2149 2b92fad7 2019-06-02 stsp if (err) {
2150 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
2151 2b92fad7 2019-06-02 stsp goto done;
2156 234035bc 2019-06-01 stsp free(ondisk_path);
2157 234035bc 2019-06-01 stsp return err;
2160 234035bc 2019-06-01 stsp struct check_merge_ok_arg {
2161 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2162 234035bc 2019-06-01 stsp struct got_repository *repo;
2165 234035bc 2019-06-01 stsp static const struct got_error *
2166 234035bc 2019-06-01 stsp check_merge_ok(void *arg, struct got_fileindex_entry *ie)
2168 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
2169 234035bc 2019-06-01 stsp struct check_merge_ok_arg *a = arg;
2170 234035bc 2019-06-01 stsp unsigned char status;
2171 234035bc 2019-06-01 stsp struct stat sb;
2172 234035bc 2019-06-01 stsp char *ondisk_path;
2174 234035bc 2019-06-01 stsp /* Reject merges into a work tree with mixed base commits. */
2175 234035bc 2019-06-01 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
2176 234035bc 2019-06-01 stsp SHA1_DIGEST_LENGTH))
2177 234035bc 2019-06-01 stsp return got_error(GOT_ERR_MIXED_COMMITS);
2179 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
2181 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2183 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
2184 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
2186 234035bc 2019-06-01 stsp return err;
2187 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
2188 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
2190 234035bc 2019-06-01 stsp return NULL;
2193 818c7501 2019-07-11 stsp static const struct got_error *
2194 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2195 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
2196 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
2197 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2198 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2200 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
2201 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
2202 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2203 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
2204 f69721c3 2019-10-21 stsp char *label_orig = NULL;
2206 03415a1a 2019-06-02 stsp if (commit_id1) {
2207 f69721c3 2019-10-21 stsp char *id_str;
2209 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
2210 03415a1a 2019-06-02 stsp worktree->path_prefix);
2212 03415a1a 2019-06-02 stsp goto done;
2214 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
2216 03415a1a 2019-06-02 stsp goto done;
2218 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str, commit_id1);
2220 f69721c3 2019-10-21 stsp goto done;
2222 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
2223 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
2224 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
2225 f69721c3 2019-10-21 stsp free(id_str);
2226 f69721c3 2019-10-21 stsp goto done;
2228 f69721c3 2019-10-21 stsp free(id_str);
2231 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
2232 234035bc 2019-06-01 stsp worktree->path_prefix);
2234 234035bc 2019-06-01 stsp goto done;
2236 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
2238 234035bc 2019-06-01 stsp goto done;
2240 234035bc 2019-06-01 stsp arg.worktree = worktree;
2241 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
2242 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
2243 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
2244 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
2245 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
2246 f69721c3 2019-10-21 stsp arg.label_orig = label_orig;
2247 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
2248 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
2249 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2250 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2251 af12c6b9 2019-06-04 stsp err = sync_err;
2253 234035bc 2019-06-01 stsp if (tree1)
2254 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
2255 234035bc 2019-06-01 stsp if (tree2)
2256 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
2257 f69721c3 2019-10-21 stsp free(label_orig);
2258 818c7501 2019-07-11 stsp return err;
2261 818c7501 2019-07-11 stsp const struct got_error *
2262 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
2263 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
2264 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2265 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2267 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
2268 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
2269 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
2270 818c7501 2019-07-11 stsp struct check_merge_ok_arg mok_arg;
2272 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
2274 818c7501 2019-07-11 stsp return err;
2276 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2278 818c7501 2019-07-11 stsp goto done;
2280 818c7501 2019-07-11 stsp mok_arg.worktree = worktree;
2281 818c7501 2019-07-11 stsp mok_arg.repo = repo;
2282 818c7501 2019-07-11 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
2283 818c7501 2019-07-11 stsp &mok_arg);
2285 818c7501 2019-07-11 stsp goto done;
2287 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
2288 818c7501 2019-07-11 stsp commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
2290 818c7501 2019-07-11 stsp if (fileindex)
2291 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
2292 818c7501 2019-07-11 stsp free(fileindex_path);
2293 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2294 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
2295 234035bc 2019-06-01 stsp err = unlockerr;
2296 234035bc 2019-06-01 stsp return err;
2299 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
2300 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
2301 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
2302 927df6b7 2019-02-10 stsp const char *status_path;
2303 927df6b7 2019-02-10 stsp size_t status_path_len;
2304 f8d1f275 2019-02-04 stsp struct got_repository *repo;
2305 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
2306 f8d1f275 2019-02-04 stsp void *status_arg;
2307 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2308 f8d1f275 2019-02-04 stsp void *cancel_arg;
2309 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
2310 6841da00 2019-08-08 stsp struct got_pathlist_head ignores;
2313 f8d1f275 2019-02-04 stsp static const struct got_error *
2314 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
2315 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
2316 927df6b7 2019-02-10 stsp struct got_repository *repo)
2318 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
2319 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
2320 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
2321 927df6b7 2019-02-10 stsp struct stat sb;
2322 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
2323 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
2324 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
2326 927df6b7 2019-02-10 stsp err = get_file_status(&status, &sb, ie, abspath, repo);
2328 98eaaa12 2019-08-03 stsp return err;
2330 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
2331 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_NO_CHANGE)
2332 98eaaa12 2019-08-03 stsp return NULL;
2334 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_blob(ie)) {
2335 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2336 98eaaa12 2019-08-03 stsp blob_idp = &blob_id;
2338 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
2339 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2340 98eaaa12 2019-08-03 stsp commit_idp = &commit_id;
2342 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
2343 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
2344 98eaaa12 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
2345 98eaaa12 2019-08-03 stsp SHA1_DIGEST_LENGTH);
2346 98eaaa12 2019-08-03 stsp staged_blob_idp = &staged_blob_id;
2349 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
2350 98eaaa12 2019-08-03 stsp ie->path, blob_idp, staged_blob_idp, commit_idp);
2353 927df6b7 2019-02-10 stsp static const struct got_error *
2354 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
2355 f8d1f275 2019-02-04 stsp struct dirent *de, const char *parent_path)
2357 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2358 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2359 f8d1f275 2019-02-04 stsp char *abspath;
2361 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2362 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2364 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
2365 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
2366 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
2367 927df6b7 2019-02-10 stsp return NULL;
2369 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2370 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
2371 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
2372 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2374 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
2375 f8d1f275 2019-02-04 stsp de->d_name) == -1)
2376 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2379 927df6b7 2019-02-10 stsp err = report_file_status(ie, abspath, a->status_cb, a->status_arg,
2381 f8d1f275 2019-02-04 stsp free(abspath);
2382 9d31a1d8 2018-03-11 stsp return err;
2385 f8d1f275 2019-02-04 stsp static const struct got_error *
2386 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2388 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2389 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
2390 2ec1f75b 2019-03-26 stsp unsigned char status;
2392 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2393 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2395 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
2396 927df6b7 2019-02-10 stsp return NULL;
2398 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2399 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2400 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
2401 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
2403 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
2404 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
2405 537ac44b 2019-08-03 stsp ie->path, &blob_id, NULL, &commit_id);
2409 6841da00 2019-08-08 stsp free_ignorelist(struct got_pathlist_head *ignorelist)
2411 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2413 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignorelist, entry)
2414 6841da00 2019-08-08 stsp free((char *)pe->path);
2415 6841da00 2019-08-08 stsp got_pathlist_free(ignorelist);
2419 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
2421 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2423 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
2424 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
2425 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
2426 6841da00 2019-08-08 stsp free((char *)pe->path);
2428 6841da00 2019-08-08 stsp got_pathlist_free(ignores);
2431 6841da00 2019-08-08 stsp static const struct got_error *
2432 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
2434 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
2435 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
2436 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
2437 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
2438 6841da00 2019-08-08 stsp size_t linesize = 0;
2439 6841da00 2019-08-08 stsp ssize_t linelen;
2441 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
2442 6841da00 2019-08-08 stsp if (ignorelist == NULL)
2443 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
2444 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
2446 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
2447 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
2448 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
2450 bd8de430 2019-10-04 stsp /* Git's ignores may contain comments. */
2451 bd8de430 2019-10-04 stsp if (line[0] == '#')
2454 bd8de430 2019-10-04 stsp /* Git's negated patterns are not (yet?) supported. */
2455 bd8de430 2019-10-04 stsp if (line[0] == '!')
2458 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
2459 6841da00 2019-08-08 stsp line) == -1) {
2460 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
2461 6841da00 2019-08-08 stsp goto done;
2463 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
2465 6841da00 2019-08-08 stsp goto done;
2467 6841da00 2019-08-08 stsp if (ferror(f)) {
2468 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
2469 6841da00 2019-08-08 stsp goto done;
2472 6841da00 2019-08-08 stsp dirpath = strdup(path);
2473 6841da00 2019-08-08 stsp if (dirpath == NULL) {
2474 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
2475 6841da00 2019-08-08 stsp goto done;
2477 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
2479 6841da00 2019-08-08 stsp free(line);
2480 6841da00 2019-08-08 stsp if (err || pe == NULL) {
2481 6841da00 2019-08-08 stsp free(dirpath);
2482 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
2484 6841da00 2019-08-08 stsp return err;
2488 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
2490 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2492 bd8de430 2019-10-04 stsp /* Handle patterns which match in all directories. */
2493 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pe, ignores, entry) {
2494 bd8de430 2019-10-04 stsp struct got_pathlist_head *ignorelist = pe->data;
2495 bd8de430 2019-10-04 stsp struct got_pathlist_entry *pi;
2497 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
2498 bd8de430 2019-10-04 stsp const char *p, *pattern = pi->path;
2500 bd8de430 2019-10-04 stsp if (strncmp(pattern, "**/", 3) != 0)
2502 bd8de430 2019-10-04 stsp pattern += 3;
2504 bd8de430 2019-10-04 stsp while (*p) {
2505 bd8de430 2019-10-04 stsp if (fnmatch(pattern, p,
2506 bd8de430 2019-10-04 stsp FNM_PATHNAME | FNM_LEADING_DIR)) {
2507 bd8de430 2019-10-04 stsp /* Retry in next directory. */
2508 bd8de430 2019-10-04 stsp while (*p && *p != '/')
2510 bd8de430 2019-10-04 stsp while (*p == '/')
2520 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
2521 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
2522 6841da00 2019-08-08 stsp * ignores backwards.
2524 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
2525 6841da00 2019-08-08 stsp while (pe) {
2526 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
2527 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
2528 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
2529 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
2530 bd8de430 2019-10-04 stsp const char *pattern = pi->path;
2531 bd8de430 2019-10-04 stsp int flags = FNM_LEADING_DIR;
2532 bd8de430 2019-10-04 stsp if (strstr(pattern, "/**/") == NULL)
2533 bd8de430 2019-10-04 stsp flags |= FNM_PATHNAME;
2534 bd8de430 2019-10-04 stsp if (fnmatch(pattern, path, flags))
2539 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
2545 6841da00 2019-08-08 stsp static const struct got_error *
2546 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
2547 bd8de430 2019-10-04 stsp const char *path, const char *ignores_filename)
2549 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
2550 6841da00 2019-08-08 stsp char *ignorespath;
2551 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
2553 bd8de430 2019-10-04 stsp if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
2554 bd8de430 2019-10-04 stsp path[0] ? "/" : "", ignores_filename) == -1)
2555 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
2557 6841da00 2019-08-08 stsp ignoresfile = fopen(ignorespath, "r");
2558 6841da00 2019-08-08 stsp if (ignoresfile == NULL) {
2559 40b289d7 2019-09-07 stsp if (errno != ENOENT && errno != EACCES)
2560 6841da00 2019-08-08 stsp err = got_error_from_errno2("fopen",
2561 6841da00 2019-08-08 stsp ignorespath);
2563 6841da00 2019-08-08 stsp err = read_ignores(ignores, path, ignoresfile);
2565 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
2566 6841da00 2019-08-08 stsp err = got_error_from_errno2("flose", path);
2567 6841da00 2019-08-08 stsp free(ignorespath);
2568 6841da00 2019-08-08 stsp return err;
2571 f8d1f275 2019-02-04 stsp static const struct got_error *
2572 f8d1f275 2019-02-04 stsp status_new(void *arg, struct dirent *de, const char *parent_path)
2574 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
2575 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2576 f8d1f275 2019-02-04 stsp char *path = NULL;
2578 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2579 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2581 2c201a36 2019-02-10 stsp /* XXX ignore symlinks for now */
2582 2c201a36 2019-02-10 stsp if (de->d_type == DT_LNK)
2583 927df6b7 2019-02-10 stsp return NULL;
2585 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2586 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
2587 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2589 f8d1f275 2019-02-04 stsp path = de->d_name;
2592 bd8de430 2019-10-04 stsp if (de->d_type == DT_DIR) {
2593 bd8de430 2019-10-04 stsp err = add_ignores(&a->ignores, a->worktree->root_path, path,
2594 bd8de430 2019-10-04 stsp ".cvsignore");
2595 bd8de430 2019-10-04 stsp if (err == NULL)
2596 bd8de430 2019-10-04 stsp err = add_ignores(&a->ignores, a->worktree->root_path,
2597 bd8de430 2019-10-04 stsp path, ".gitignore");
2599 6841da00 2019-08-08 stsp else if (got_path_is_child(path, a->status_path, a->status_path_len)
2600 6841da00 2019-08-08 stsp && !match_ignores(&a->ignores, path))
2601 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
2602 537ac44b 2019-08-03 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL);
2603 f8d1f275 2019-02-04 stsp if (parent_path[0])
2604 f8d1f275 2019-02-04 stsp free(path);
2605 b72f483a 2019-02-05 stsp return err;
2608 347d1d3e 2019-07-12 stsp static const struct got_error *
2609 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
2610 abb4604f 2019-07-27 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
2611 abb4604f 2019-07-27 stsp void *status_arg, struct got_repository *repo)
2613 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
2614 abb4604f 2019-07-27 stsp struct stat sb;
2616 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
2618 abb4604f 2019-07-27 stsp return report_file_status(ie, ondisk_path, status_cb,
2619 abb4604f 2019-07-27 stsp status_arg, repo);
2621 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
2622 abb4604f 2019-07-27 stsp if (errno != ENOENT)
2623 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
2624 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
2625 2a06fe5f 2019-08-24 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL);
2626 abb4604f 2019-07-27 stsp return NULL;
2629 abb4604f 2019-07-27 stsp if (S_ISREG(sb.st_mode))
2630 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
2631 537ac44b 2019-08-03 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL);
2633 abb4604f 2019-07-27 stsp return NULL;
2636 abb4604f 2019-07-27 stsp static const struct got_error *
2637 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
2638 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
2639 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
2640 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2642 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2643 f8d1f275 2019-02-04 stsp DIR *workdir = NULL;
2644 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
2645 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
2646 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
2648 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
2649 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
2650 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
2652 927df6b7 2019-02-10 stsp workdir = opendir(ondisk_path);
2653 927df6b7 2019-02-10 stsp if (workdir == NULL) {
2654 40b289d7 2019-09-07 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES)
2655 638f9024 2019-05-13 stsp err = got_error_from_errno2("opendir", ondisk_path);
2657 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
2658 abb4604f 2019-07-27 stsp fileindex, status_cb, status_arg, repo);
2660 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
2661 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
2662 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
2663 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
2664 abb4604f 2019-07-27 stsp arg.worktree = worktree;
2665 abb4604f 2019-07-27 stsp arg.status_path = path;
2666 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
2667 abb4604f 2019-07-27 stsp arg.repo = repo;
2668 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
2669 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
2670 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
2671 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
2672 6841da00 2019-08-08 stsp TAILQ_INIT(&arg.ignores);
2673 bd8de430 2019-10-04 stsp err = add_ignores(&arg.ignores, worktree->root_path, path,
2674 bd8de430 2019-10-04 stsp ".cvsignore");
2675 6841da00 2019-08-08 stsp if (err == NULL)
2676 bd8de430 2019-10-04 stsp err = add_ignores(&arg.ignores, worktree->root_path,
2677 bd8de430 2019-10-04 stsp path, ".gitignore");
2678 bd8de430 2019-10-04 stsp if (err == NULL)
2679 6841da00 2019-08-08 stsp err = got_fileindex_diff_dir(fileindex, workdir,
2680 6841da00 2019-08-08 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
2681 6841da00 2019-08-08 stsp free_ignores(&arg.ignores);
2684 f8d1f275 2019-02-04 stsp if (workdir)
2685 f8d1f275 2019-02-04 stsp closedir(workdir);
2686 927df6b7 2019-02-10 stsp free(ondisk_path);
2687 347d1d3e 2019-07-12 stsp return err;
2690 347d1d3e 2019-07-12 stsp const struct got_error *
2691 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
2692 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2693 72ea6654 2019-07-27 stsp got_worktree_status_cb status_cb, void *status_arg,
2694 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2696 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
2697 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
2698 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
2699 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
2701 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2703 347d1d3e 2019-07-12 stsp return err;
2705 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2706 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
2707 72ea6654 2019-07-27 stsp status_cb, status_arg, cancel_cb, cancel_arg);
2711 f8d1f275 2019-02-04 stsp free(fileindex_path);
2712 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
2713 f8d1f275 2019-02-04 stsp return err;
2716 6c7ab921 2019-03-18 stsp const struct got_error *
2717 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
2718 6c7ab921 2019-03-18 stsp const char *arg)
2720 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
2721 d0710d08 2019-07-22 stsp char *resolved, *cwd = NULL, *path = NULL;
2722 6c7ab921 2019-03-18 stsp size_t len;
2724 6c7ab921 2019-03-18 stsp *wt_path = NULL;
2726 6c7ab921 2019-03-18 stsp resolved = realpath(arg, NULL);
2727 d0710d08 2019-07-22 stsp if (resolved == NULL) {
2728 d0710d08 2019-07-22 stsp if (errno != ENOENT)
2729 d0710d08 2019-07-22 stsp return got_error_from_errno2("realpath", arg);
2730 d0710d08 2019-07-22 stsp cwd = getcwd(NULL, 0);
2731 d0710d08 2019-07-22 stsp if (cwd == NULL)
2732 d0710d08 2019-07-22 stsp return got_error_from_errno("getcwd");
2733 d0710d08 2019-07-22 stsp if (asprintf(&resolved, "%s/%s", cwd, arg) == -1) {
2734 d0710d08 2019-07-22 stsp err = got_error_from_errno("asprintf");
2735 d0710d08 2019-07-22 stsp goto done;
2739 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
2740 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
2741 6c7ab921 2019-03-18 stsp err = got_error(GOT_ERR_BAD_PATH);
2742 6c7ab921 2019-03-18 stsp goto done;
2745 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
2746 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
2747 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
2749 f6d88e1a 2019-05-29 stsp goto done;
2751 f6d88e1a 2019-05-29 stsp path = strdup("");
2752 f6d88e1a 2019-05-29 stsp if (path == NULL) {
2753 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
2754 f6d88e1a 2019-05-29 stsp goto done;
2758 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
2759 6c7ab921 2019-03-18 stsp len = strlen(path);
2760 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
2761 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
2765 6c7ab921 2019-03-18 stsp free(resolved);
2766 d0710d08 2019-07-22 stsp free(cwd);
2767 6c7ab921 2019-03-18 stsp if (err == NULL)
2768 6c7ab921 2019-03-18 stsp *wt_path = path;
2770 6c7ab921 2019-03-18 stsp free(path);
2771 d00136be 2019-03-26 stsp return err;
2774 07f5b47a 2019-06-02 stsp static const struct got_error *
2775 07f5b47a 2019-06-02 stsp schedule_addition(const char *ondisk_path, struct got_fileindex *fileindex,
2776 07f5b47a 2019-06-02 stsp const char *relpath, got_worktree_status_cb status_cb, void *status_arg,
2777 07f5b47a 2019-06-02 stsp struct got_repository *repo)
2779 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
2780 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
2781 6d022e97 2019-08-04 stsp unsigned char status;
2782 6d022e97 2019-08-04 stsp struct stat sb;
2784 6d022e97 2019-08-04 stsp ie = got_fileindex_entry_get(fileindex, relpath, strlen(relpath));
2786 6d022e97 2019-08-04 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2788 6d022e97 2019-08-04 stsp return err;
2789 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
2790 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
2791 6d022e97 2019-08-04 stsp return NULL;
2792 6d022e97 2019-08-04 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
2795 07f5b47a 2019-06-02 stsp err = got_fileindex_entry_alloc(&ie, ondisk_path, relpath, NULL, NULL);
2797 07f5b47a 2019-06-02 stsp return err;
2799 07f5b47a 2019-06-02 stsp err = got_fileindex_entry_add(fileindex, ie);
2800 07f5b47a 2019-06-02 stsp if (err) {
2801 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
2802 07f5b47a 2019-06-02 stsp return err;
2805 c02b99b6 2019-07-27 stsp return report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
2808 d00136be 2019-03-26 stsp const struct got_error *
2809 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
2810 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
2811 1dd54920 2019-05-11 stsp got_worktree_status_cb status_cb, void *status_arg,
2812 031a5338 2019-03-26 stsp struct got_repository *repo)
2814 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
2815 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2816 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2817 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
2819 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
2821 d00136be 2019-03-26 stsp return err;
2823 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2825 d00136be 2019-03-26 stsp goto done;
2827 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
2828 6d022e97 2019-08-04 stsp char *ondisk_path;
2829 6d022e97 2019-08-04 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path,
2830 6d022e97 2019-08-04 stsp pe->path) == -1)
2831 6d022e97 2019-08-04 stsp return got_error_from_errno("asprintf");
2832 6d022e97 2019-08-04 stsp err = schedule_addition(ondisk_path, fileindex, pe->path,
2833 07f5b47a 2019-06-02 stsp status_cb, status_arg, repo);
2834 6d022e97 2019-08-04 stsp free(ondisk_path);
2838 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2839 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2840 af12c6b9 2019-06-04 stsp err = sync_err;
2842 fb399478 2019-07-12 stsp free(fileindex_path);
2843 d00136be 2019-03-26 stsp if (fileindex)
2844 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
2845 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2846 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
2847 d00136be 2019-03-26 stsp err = unlockerr;
2848 6c7ab921 2019-03-18 stsp return err;
2851 17ed4618 2019-06-02 stsp static const struct got_error *
2852 17ed4618 2019-06-02 stsp schedule_for_deletion(const char *ondisk_path, struct got_fileindex *fileindex,
2853 17ed4618 2019-06-02 stsp const char *relpath, int delete_local_mods,
2854 17ed4618 2019-06-02 stsp got_worktree_status_cb status_cb, void *status_arg,
2855 17ed4618 2019-06-02 stsp struct got_repository *repo)
2857 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
2858 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
2859 9acbc4fa 2019-08-03 stsp unsigned char status, staged_status;
2860 17ed4618 2019-06-02 stsp struct stat sb;
2862 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, relpath, strlen(relpath));
2863 17ed4618 2019-06-02 stsp if (ie == NULL)
2864 17ed4618 2019-06-02 stsp return got_error(GOT_ERR_BAD_PATH);
2866 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
2867 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
2868 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
2869 9acbc4fa 2019-08-03 stsp return NULL;
2870 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
2873 17ed4618 2019-06-02 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2875 17ed4618 2019-06-02 stsp return err;
2877 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
2878 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
2879 de426ea6 2019-08-03 stsp return NULL;
2880 f0b0c0ce 2019-08-04 stsp if (status == GOT_STATUS_MODIFY && !delete_local_mods)
2881 f0b0c0ce 2019-08-04 stsp return got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
2882 f0b0c0ce 2019-08-04 stsp if (status != GOT_STATUS_MODIFY &&
2883 f0b0c0ce 2019-08-04 stsp status != GOT_STATUS_MISSING)
2884 f0b0c0ce 2019-08-04 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
2887 f0b0c0ce 2019-08-04 stsp if (status != GOT_STATUS_MISSING && unlink(ondisk_path) != 0)
2888 17ed4618 2019-06-02 stsp return got_error_from_errno2("unlink", ondisk_path);
2890 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2891 17ed4618 2019-06-02 stsp return report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
2894 2ec1f75b 2019-03-26 stsp const struct got_error *
2895 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
2896 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
2897 2ec1f75b 2019-03-26 stsp got_worktree_status_cb status_cb, void *status_arg,
2898 2ec1f75b 2019-03-26 stsp struct got_repository *repo)
2900 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
2901 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
2902 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2903 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
2905 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
2907 2ec1f75b 2019-03-26 stsp return err;
2909 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2911 2ec1f75b 2019-03-26 stsp goto done;
2913 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
2914 6d022e97 2019-08-04 stsp char *ondisk_path;
2915 6d022e97 2019-08-04 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path,
2916 6d022e97 2019-08-04 stsp pe->path) == -1)
2917 6d022e97 2019-08-04 stsp return got_error_from_errno("asprintf");
2918 6d022e97 2019-08-04 stsp err = schedule_for_deletion(ondisk_path, fileindex, pe->path,
2919 17ed4618 2019-06-02 stsp delete_local_mods, status_cb, status_arg, repo);
2920 6d022e97 2019-08-04 stsp free(ondisk_path);
2924 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2925 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2926 af12c6b9 2019-06-04 stsp err = sync_err;
2928 fb399478 2019-07-12 stsp free(fileindex_path);
2929 2ec1f75b 2019-03-26 stsp if (fileindex)
2930 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
2931 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2932 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
2933 2ec1f75b 2019-03-26 stsp err = unlockerr;
2934 33aa809d 2019-08-08 stsp return err;
2937 33aa809d 2019-08-08 stsp static const struct got_error *
2938 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
2940 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
2941 33aa809d 2019-08-08 stsp char *line = NULL;
2942 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
2943 33aa809d 2019-08-08 stsp ssize_t linelen;
2945 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
2946 33aa809d 2019-08-08 stsp if (linelen == -1) {
2947 33aa809d 2019-08-08 stsp if (ferror(infile)) {
2948 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
2949 33aa809d 2019-08-08 stsp goto done;
2951 33aa809d 2019-08-08 stsp return NULL;
2953 33aa809d 2019-08-08 stsp if (outfile) {
2954 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
2955 33aa809d 2019-08-08 stsp if (n != linelen) {
2956 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
2957 33aa809d 2019-08-08 stsp goto done;
2960 33aa809d 2019-08-08 stsp if (rejectfile) {
2961 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
2962 33aa809d 2019-08-08 stsp if (n != linelen)
2963 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
2966 33aa809d 2019-08-08 stsp free(line);
2967 2ec1f75b 2019-03-26 stsp return err;
2970 33aa809d 2019-08-08 stsp static const struct got_error *
2971 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
2973 33aa809d 2019-08-08 stsp char *line = NULL;
2974 33aa809d 2019-08-08 stsp size_t linesize = 0;
2975 33aa809d 2019-08-08 stsp ssize_t linelen;
2977 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
2978 500467ff 2019-09-25 hiltjo if (linelen == -1) {
2979 500467ff 2019-09-25 hiltjo if (ferror(f))
2980 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
2981 500467ff 2019-09-25 hiltjo return NULL;
2983 33aa809d 2019-08-08 stsp free(line);
2984 33aa809d 2019-08-08 stsp return NULL;
2987 33aa809d 2019-08-08 stsp static const struct got_error *
2988 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
2989 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
2990 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
2992 33aa809d 2019-08-08 stsp const struct got_error *err;
2994 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
2995 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
2996 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
2998 33aa809d 2019-08-08 stsp return err;
2999 33aa809d 2019-08-08 stsp (*line_cur1)++;
3001 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
3002 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
3003 33aa809d 2019-08-08 stsp if (rejectfile)
3004 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
3006 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
3008 33aa809d 2019-08-08 stsp return err;
3009 33aa809d 2019-08-08 stsp (*line_cur2)++;
3011 33aa809d 2019-08-08 stsp /* Copy patched lines. */
3012 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
3013 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
3015 33aa809d 2019-08-08 stsp return err;
3016 33aa809d 2019-08-08 stsp (*line_cur2)++;
3018 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
3019 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
3020 33aa809d 2019-08-08 stsp if (rejectfile)
3021 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
3023 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
3025 33aa809d 2019-08-08 stsp return err;
3026 33aa809d 2019-08-08 stsp (*line_cur1)++;
3029 f1e81a05 2019-08-10 stsp return NULL;
3032 f1e81a05 2019-08-10 stsp static const struct got_error *
3033 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
3034 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
3036 f1e81a05 2019-08-10 stsp const struct got_error *err;
3038 f1e81a05 2019-08-10 stsp if (outfile) {
3039 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
3040 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
3041 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
3043 f1e81a05 2019-08-10 stsp return err;
3044 f1e81a05 2019-08-10 stsp (*line_cur1)++;
3047 f1e81a05 2019-08-10 stsp if (rejectfile) {
3048 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
3049 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
3050 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
3052 f1e81a05 2019-08-10 stsp return err;
3053 f1e81a05 2019-08-10 stsp (*line_cur2)++;
3057 33aa809d 2019-08-08 stsp return NULL;
3060 33aa809d 2019-08-08 stsp static const struct got_error *
3061 33aa809d 2019-08-08 stsp apply_or_reject_change(int *choice, struct got_diff_change *change, int n,
3062 33aa809d 2019-08-08 stsp int nchanges, struct got_diff_state *ds, struct got_diff_args *args,
3063 33aa809d 2019-08-08 stsp int diff_flags, const char *relpath, FILE *f1, FILE *f2, int *line_cur1,
3064 33aa809d 2019-08-08 stsp int *line_cur2, FILE *outfile, FILE *rejectfile,
3065 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
3067 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
3068 33aa809d 2019-08-08 stsp int start_old = change->cv.a;
3069 33aa809d 2019-08-08 stsp int end_old = change->cv.b;
3070 33aa809d 2019-08-08 stsp int start_new = change->cv.c;
3071 33aa809d 2019-08-08 stsp int end_new = change->cv.d;
3072 33aa809d 2019-08-08 stsp long pos1, pos2;
3073 33aa809d 2019-08-08 stsp FILE *hunkfile;
3075 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
3077 33aa809d 2019-08-08 stsp hunkfile = got_opentemp();
3078 33aa809d 2019-08-08 stsp if (hunkfile == NULL)
3079 33aa809d 2019-08-08 stsp return got_error_from_errno("got_opentemp");
3081 33aa809d 2019-08-08 stsp pos1 = ftell(f1);
3082 33aa809d 2019-08-08 stsp pos2 = ftell(f2);
3084 33aa809d 2019-08-08 stsp /* XXX TODO needs error checking */
3085 33aa809d 2019-08-08 stsp got_diff_dump_change(hunkfile, change, ds, args, f1, f2, diff_flags);
3087 33aa809d 2019-08-08 stsp if (fseek(f1, pos1, SEEK_SET) == -1) {
3088 33aa809d 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
3089 33aa809d 2019-08-08 stsp goto done;
3091 33aa809d 2019-08-08 stsp if (fseek(f2, pos2, SEEK_SET) == -1) {
3092 33aa809d 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
3093 33aa809d 2019-08-08 stsp goto done;
3095 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
3096 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
3097 33aa809d 2019-08-08 stsp goto done;
3100 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
3101 33aa809d 2019-08-08 stsp hunkfile, n, nchanges);
3103 33aa809d 2019-08-08 stsp goto done;
3105 33aa809d 2019-08-08 stsp switch (*choice) {
3106 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
3107 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
3108 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
3110 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
3111 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
3112 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
3114 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
3117 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
3121 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
3122 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
3123 33aa809d 2019-08-08 stsp return err;
3126 1f1abb7e 2019-08-08 stsp struct revert_file_args {
3127 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
3128 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
3129 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
3130 1f1abb7e 2019-08-08 stsp void *progress_arg;
3131 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
3132 33aa809d 2019-08-08 stsp void *patch_arg;
3133 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
3136 e20a8b6f 2019-06-04 stsp static const struct got_error *
3137 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
3138 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
3139 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
3140 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
3142 33aa809d 2019-08-08 stsp const struct got_error *err;
3143 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
3144 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
3145 1ebedb77 2019-10-19 stsp int fd2 = -1;
3146 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
3147 33aa809d 2019-08-08 stsp struct stat sb1, sb2;
3148 33aa809d 2019-08-08 stsp struct got_diff_changes *changes = NULL;
3149 33aa809d 2019-08-08 stsp struct got_diff_state *ds = NULL;
3150 33aa809d 2019-08-08 stsp struct got_diff_args *args = NULL;
3151 33aa809d 2019-08-08 stsp struct got_diff_change *change;
3152 33aa809d 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, have_content = 0;
3153 33aa809d 2019-08-08 stsp int n = 0;
3155 33aa809d 2019-08-08 stsp *path_outfile = NULL;
3157 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
3159 33aa809d 2019-08-08 stsp return err;
3161 1ebedb77 2019-10-19 stsp fd2 = open(path2, O_RDONLY | O_NOFOLLOW);
3162 1ebedb77 2019-10-19 stsp if (fd2 == -1) {
3163 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("open", path2);
3164 1ebedb77 2019-10-19 stsp goto done;
3166 1ebedb77 2019-10-19 stsp if (fstat(fd2, &sb2) == -1) {
3167 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("fstat", path2);
3168 1ebedb77 2019-10-19 stsp goto done;
3171 1ebedb77 2019-10-19 stsp f2 = fdopen(fd2, "r");
3172 33aa809d 2019-08-08 stsp if (f2 == NULL) {
3173 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fopen", path2);
3174 33aa809d 2019-08-08 stsp goto done;
3178 33aa809d 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
3180 33aa809d 2019-08-08 stsp goto done;
3182 e635744c 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob");
3184 33aa809d 2019-08-08 stsp goto done;
3186 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
3188 33aa809d 2019-08-08 stsp goto done;
3190 33aa809d 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
3191 33aa809d 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
3192 33aa809d 2019-08-08 stsp goto done;
3195 33aa809d 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
3196 33aa809d 2019-08-08 stsp f1, sb1.st_size, id_str, f2, sb2.st_size, path2, 3, NULL);
3198 33aa809d 2019-08-08 stsp goto done;
3200 e635744c 2019-08-08 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
3202 33aa809d 2019-08-08 stsp goto done;
3204 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
3205 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
3206 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
3207 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
3208 33aa809d 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
3209 33aa809d 2019-08-08 stsp int choice;
3210 33aa809d 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
3211 33aa809d 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
3212 33aa809d 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
3213 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
3214 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
3215 e635744c 2019-08-08 stsp patch_cb, patch_arg);
3217 33aa809d 2019-08-08 stsp goto done;
3218 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
3219 33aa809d 2019-08-08 stsp have_content = 1;
3220 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
3223 1ebedb77 2019-10-19 stsp if (have_content) {
3224 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
3225 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
3226 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
3228 1ebedb77 2019-10-19 stsp goto done;
3230 1ebedb77 2019-10-19 stsp if (chmod(*path_outfile, sb2.st_mode) == -1) {
3231 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("chmod", path2);
3232 1ebedb77 2019-10-19 stsp goto done;
3236 33aa809d 2019-08-08 stsp free(id_str);
3238 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
3239 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
3240 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
3241 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
3242 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
3243 1ebedb77 2019-10-19 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3244 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("close", path2);
3245 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
3246 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
3247 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
3248 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
3249 33aa809d 2019-08-08 stsp if (err || !have_content) {
3250 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
3251 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
3252 33aa809d 2019-08-08 stsp free(*path_outfile);
3253 33aa809d 2019-08-08 stsp *path_outfile = NULL;
3255 33aa809d 2019-08-08 stsp free(args);
3257 33aa809d 2019-08-08 stsp got_diff_state_free(ds);
3260 33aa809d 2019-08-08 stsp if (changes)
3261 33aa809d 2019-08-08 stsp got_diff_free_changes(changes);
3262 33aa809d 2019-08-08 stsp free(path1);
3263 33aa809d 2019-08-08 stsp return err;
3266 33aa809d 2019-08-08 stsp static const struct got_error *
3267 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
3268 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
3269 1f1abb7e 2019-08-08 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
3271 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
3272 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
3273 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
3274 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
3275 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
3276 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
3277 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
3278 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
3279 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
3280 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
3282 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
3283 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
3284 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
3285 d3bcc3d1 2019-08-08 stsp return NULL;
3287 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
3288 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
3289 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
3291 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3292 65084dad 2019-08-08 stsp if (ie == NULL)
3293 65084dad 2019-08-08 stsp return got_error(GOT_ERR_BAD_PATH);
3295 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
3296 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
3297 a129376b 2019-03-28 stsp if (err) {
3298 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
3299 a129376b 2019-03-28 stsp goto done;
3300 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
3301 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
3302 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
3303 e20a8b6f 2019-06-04 stsp goto done;
3306 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
3307 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
3308 a129376b 2019-03-28 stsp if (tree_path == NULL) {
3309 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3310 a129376b 2019-03-28 stsp goto done;
3313 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
3314 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
3315 a129376b 2019-03-28 stsp if (tree_path == NULL) {
3316 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3317 a129376b 2019-03-28 stsp goto done;
3320 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
3321 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
3322 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3323 a129376b 2019-03-28 stsp goto done;
3328 1f1abb7e 2019-08-08 stsp err = got_object_id_by_path(&tree_id, a->repo,
3329 1f1abb7e 2019-08-08 stsp a->worktree->base_commit_id, tree_path);
3330 a9fa2909 2019-07-27 stsp if (err) {
3331 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
3332 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
3333 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
3334 a9fa2909 2019-07-27 stsp goto done;
3336 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
3338 a9fa2909 2019-07-27 stsp goto done;
3340 a9fa2909 2019-07-27 stsp te_name = basename(ie->path);
3341 a9fa2909 2019-07-27 stsp if (te_name == NULL) {
3342 a9fa2909 2019-07-27 stsp err = got_error_from_errno2("basename", ie->path);
3343 a9fa2909 2019-07-27 stsp goto done;
3346 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
3347 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
3348 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
3349 a9fa2909 2019-07-27 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
3350 a9fa2909 2019-07-27 stsp goto done;
3354 a129376b 2019-03-28 stsp switch (status) {
3355 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
3356 33aa809d 2019-08-08 stsp if (a->patch_cb) {
3357 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
3358 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
3359 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
3361 33aa809d 2019-08-08 stsp goto done;
3362 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
3365 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
3366 1f1abb7e 2019-08-08 stsp ie->path);
3368 1ee397ad 2019-07-12 stsp goto done;
3369 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
3371 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
3372 33aa809d 2019-08-08 stsp if (a->patch_cb) {
3373 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
3374 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
3375 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
3377 33aa809d 2019-08-08 stsp goto done;
3378 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
3381 33aa809d 2019-08-08 stsp /* fall through */
3382 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
3383 1ebedb77 2019-10-19 stsp case GOT_STATUS_MODE_CHANGE:
3384 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
3385 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
3386 e20a8b6f 2019-06-04 stsp struct got_object_id id;
3387 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3388 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3389 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1,
3390 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3392 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1,
3393 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3394 1f1abb7e 2019-08-08 stsp err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
3396 65084dad 2019-08-08 stsp goto done;
3398 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
3399 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
3400 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
3401 a129376b 2019-03-28 stsp goto done;
3404 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
3405 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
3406 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
3407 33aa809d 2019-08-08 stsp ondisk_path, ie->path, a->repo,
3408 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
3409 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
3411 33aa809d 2019-08-08 stsp if (rename(path_content, ondisk_path) == -1) {
3412 33aa809d 2019-08-08 stsp err = got_error_from_errno3("rename",
3413 33aa809d 2019-08-08 stsp path_content, ondisk_path);
3414 33aa809d 2019-08-08 stsp goto done;
3417 33aa809d 2019-08-08 stsp err = install_blob(a->worktree, ondisk_path, ie->path,
3418 33aa809d 2019-08-08 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
3419 33aa809d 2019-08-08 stsp got_fileindex_perms_to_st(ie), blob, 0, 1,
3420 33aa809d 2019-08-08 stsp a->repo, a->progress_cb, a->progress_arg);
3422 a129376b 2019-03-28 stsp goto done;
3423 1ebedb77 2019-10-19 stsp if (status == GOT_STATUS_DELETE ||
3424 1ebedb77 2019-10-19 stsp status == GOT_STATUS_MODE_CHANGE) {
3425 33aa809d 2019-08-08 stsp err = update_blob_fileindex_entry(a->worktree,
3426 33aa809d 2019-08-08 stsp a->fileindex, ie, ondisk_path, ie->path,
3429 33aa809d 2019-08-08 stsp goto done;
3438 1f1abb7e 2019-08-08 stsp free(ondisk_path);
3439 33aa809d 2019-08-08 stsp free(path_content);
3440 e20a8b6f 2019-06-04 stsp free(parent_path);
3441 a129376b 2019-03-28 stsp free(tree_path);
3443 a129376b 2019-03-28 stsp got_object_blob_close(blob);
3445 a129376b 2019-03-28 stsp got_object_tree_close(tree);
3446 a129376b 2019-03-28 stsp free(tree_id);
3447 e20a8b6f 2019-06-04 stsp return err;
3450 e20a8b6f 2019-06-04 stsp const struct got_error *
3451 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
3452 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
3453 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3454 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
3455 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
3457 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
3458 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
3459 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
3460 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
3461 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
3462 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
3464 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
3466 e20a8b6f 2019-06-04 stsp return err;
3468 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3470 e20a8b6f 2019-06-04 stsp goto done;
3472 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
3473 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
3474 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
3475 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
3476 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
3477 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
3478 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
3479 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
3480 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3481 1f1abb7e 2019-08-08 stsp revert_file, &rfa, NULL, NULL);
3485 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3486 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
3487 e20a8b6f 2019-06-04 stsp err = sync_err;
3489 fb399478 2019-07-12 stsp free(fileindex_path);
3490 a129376b 2019-03-28 stsp if (fileindex)
3491 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
3492 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3493 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
3494 a129376b 2019-03-28 stsp err = unlockerr;
3495 c4296144 2019-05-09 stsp return err;
3498 cf066bf8 2019-05-09 stsp static void
3499 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
3501 24519714 2019-05-09 stsp free(ct->path);
3502 44d03001 2019-05-09 stsp free(ct->in_repo_path);
3503 768aea60 2019-05-09 stsp free(ct->ondisk_path);
3504 e75eb4da 2019-05-10 stsp free(ct->blob_id);
3505 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
3506 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
3507 b416585c 2019-05-13 stsp free(ct->base_commit_id);
3511 ed175427 2019-05-09 stsp struct collect_commitables_arg {
3512 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
3513 24519714 2019-05-09 stsp struct got_repository *repo;
3514 24519714 2019-05-09 stsp struct got_worktree *worktree;
3515 5f8a88c6 2019-08-03 stsp int have_staged_files;
3518 c4296144 2019-05-09 stsp static const struct got_error *
3519 88d0e355 2019-08-03 stsp collect_commitables(void *arg, unsigned char status,
3520 88d0e355 2019-08-03 stsp unsigned char staged_status, const char *relpath,
3521 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3522 537ac44b 2019-08-03 stsp struct got_object_id *commit_id)
3524 ed175427 2019-05-09 stsp struct collect_commitables_arg *a = arg;
3525 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
3526 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
3527 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
3528 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
3529 768aea60 2019-05-09 stsp struct stat sb;
3531 5f8a88c6 2019-08-03 stsp if (a->have_staged_files) {
3532 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
3533 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
3534 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
3535 5f8a88c6 2019-08-03 stsp return NULL;
3537 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
3538 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
3540 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
3541 1ebedb77 2019-10-19 stsp status != GOT_STATUS_MODE_CHANGE &&
3542 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
3543 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
3544 5f8a88c6 2019-08-03 stsp return NULL;
3547 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
3548 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3549 036813ee 2019-05-09 stsp goto done;
3551 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
3552 036813ee 2019-05-09 stsp parent_path = strdup("");
3553 69960a46 2019-05-09 stsp if (parent_path == NULL)
3554 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
3556 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
3558 69960a46 2019-05-09 stsp return err;
3561 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
3562 cf066bf8 2019-05-09 stsp if (ct == NULL) {
3563 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
3564 c4296144 2019-05-09 stsp goto done;
3567 768aea60 2019-05-09 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
3568 768aea60 2019-05-09 stsp relpath) == -1) {
3569 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3570 768aea60 2019-05-09 stsp goto done;
3572 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_DELETE || staged_status == GOT_STATUS_DELETE) {
3573 768aea60 2019-05-09 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
3575 768aea60 2019-05-09 stsp if (lstat(ct->ondisk_path, &sb) != 0) {
3576 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
3577 768aea60 2019-05-09 stsp goto done;
3579 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
3582 44d03001 2019-05-09 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
3583 44d03001 2019-05-09 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
3584 44d03001 2019-05-09 stsp relpath) == -1) {
3585 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3586 44d03001 2019-05-09 stsp goto done;
3589 cf066bf8 2019-05-09 stsp ct->status = status;
3590 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
3591 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
3592 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
3593 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
3594 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
3595 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
3596 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3597 b416585c 2019-05-13 stsp goto done;
3599 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
3600 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
3601 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
3602 f0b75401 2019-08-03 stsp goto done;
3605 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
3606 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
3607 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
3608 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
3609 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3610 036813ee 2019-05-09 stsp goto done;
3613 24519714 2019-05-09 stsp ct->path = strdup(path);
3614 24519714 2019-05-09 stsp if (ct->path == NULL) {
3615 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3616 24519714 2019-05-09 stsp goto done;
3618 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
3620 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
3621 ed175427 2019-05-09 stsp free_commitable(ct);
3622 24519714 2019-05-09 stsp free(parent_path);
3623 036813ee 2019-05-09 stsp free(path);
3624 a129376b 2019-03-28 stsp return err;
3627 036813ee 2019-05-09 stsp static const struct got_error *write_tree(struct got_object_id **,
3628 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
3629 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3630 036813ee 2019-05-09 stsp struct got_repository *);
3632 ed175427 2019-05-09 stsp static const struct got_error *
3633 036813ee 2019-05-09 stsp write_subtree(struct got_object_id **new_subtree_id,
3634 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
3635 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
3636 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3637 afa376bf 2019-05-09 stsp struct got_repository *repo)
3639 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
3640 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
3641 036813ee 2019-05-09 stsp char *subpath;
3643 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
3644 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
3645 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3647 036813ee 2019-05-09 stsp err = got_object_open_as_tree(&subtree, repo, te->id);
3649 ed175427 2019-05-09 stsp return err;
3651 036813ee 2019-05-09 stsp err = write_tree(new_subtree_id, subtree, subpath, commitable_paths,
3652 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
3653 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
3654 036813ee 2019-05-09 stsp free(subpath);
3655 036813ee 2019-05-09 stsp return err;
3658 036813ee 2019-05-09 stsp static const struct got_error *
3659 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
3661 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3662 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
3664 036813ee 2019-05-09 stsp *match = 0;
3666 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
3667 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
3668 0f63689d 2019-05-10 stsp return NULL;
3671 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
3673 0f63689d 2019-05-10 stsp return err;
3674 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
3675 036813ee 2019-05-09 stsp free(ct_parent_path);
3676 036813ee 2019-05-09 stsp return err;
3679 768aea60 2019-05-09 stsp static mode_t
3680 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
3682 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
3685 036813ee 2019-05-09 stsp static const struct got_error *
3686 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
3687 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
3689 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3691 036813ee 2019-05-09 stsp *new_te = NULL;
3693 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
3695 036813ee 2019-05-09 stsp goto done;
3697 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
3699 036813ee 2019-05-09 stsp free((*new_te)->id);
3700 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
3701 5f8a88c6 2019-08-03 stsp (*new_te)->id = got_object_id_dup(ct->staged_blob_id);
3703 5f8a88c6 2019-08-03 stsp (*new_te)->id = got_object_id_dup(ct->blob_id);
3704 036813ee 2019-05-09 stsp if ((*new_te)->id == NULL) {
3705 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3706 036813ee 2019-05-09 stsp goto done;
3709 036813ee 2019-05-09 stsp if (err && *new_te) {
3710 036813ee 2019-05-09 stsp got_object_tree_entry_close(*new_te);
3711 036813ee 2019-05-09 stsp *new_te = NULL;
3713 036813ee 2019-05-09 stsp return err;
3716 036813ee 2019-05-09 stsp static const struct got_error *
3717 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
3718 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
3720 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3721 036813ee 2019-05-09 stsp char *ct_name;
3723 036813ee 2019-05-09 stsp *new_te = NULL;
3725 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
3726 036813ee 2019-05-09 stsp if (*new_te == NULL)
3727 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
3729 036813ee 2019-05-09 stsp ct_name = basename(ct->path);
3730 036813ee 2019-05-09 stsp if (ct_name == NULL) {
3731 638f9024 2019-05-13 stsp err = got_error_from_errno2("basename", ct->path);
3732 036813ee 2019-05-09 stsp goto done;
3734 036813ee 2019-05-09 stsp (*new_te)->name = strdup(ct_name);
3735 036813ee 2019-05-09 stsp if ((*new_te)->name == NULL) {
3736 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3737 036813ee 2019-05-09 stsp goto done;
3740 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
3742 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
3743 5f8a88c6 2019-08-03 stsp (*new_te)->id = got_object_id_dup(ct->staged_blob_id);
3745 5f8a88c6 2019-08-03 stsp (*new_te)->id = got_object_id_dup(ct->blob_id);
3746 036813ee 2019-05-09 stsp if ((*new_te)->id == NULL) {
3747 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3748 036813ee 2019-05-09 stsp goto done;
3751 036813ee 2019-05-09 stsp if (err && *new_te) {
3752 036813ee 2019-05-09 stsp got_object_tree_entry_close(*new_te);
3753 036813ee 2019-05-09 stsp *new_te = NULL;
3755 036813ee 2019-05-09 stsp return err;
3758 036813ee 2019-05-09 stsp static const struct got_error *
3759 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
3760 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
3762 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3763 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
3765 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
3767 036813ee 2019-05-09 stsp return err;
3768 036813ee 2019-05-09 stsp if (new_pe == NULL)
3769 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
3770 036813ee 2019-05-09 stsp return NULL;
3773 afa376bf 2019-05-09 stsp static const struct got_error *
3774 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
3775 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
3777 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
3778 5f8a88c6 2019-08-03 stsp unsigned char status;
3780 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
3781 afa376bf 2019-05-09 stsp ct_path++;
3783 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
3784 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
3786 5f8a88c6 2019-08-03 stsp status = ct->status;
3788 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
3789 537ac44b 2019-08-03 stsp ct_path, ct->blob_id, NULL, NULL);
3792 036813ee 2019-05-09 stsp static const struct got_error *
3793 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
3794 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
3796 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
3797 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
3798 44d03001 2019-05-09 stsp char *te_path;
3800 44d03001 2019-05-09 stsp *modified = 0;
3802 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
3803 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
3804 44d03001 2019-05-09 stsp te->name) == -1)
3805 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3807 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3808 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3809 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
3810 44d03001 2019-05-09 stsp strlen(te_path));
3811 44d03001 2019-05-09 stsp if (*modified)
3815 44d03001 2019-05-09 stsp free(te_path);
3816 44d03001 2019-05-09 stsp return err;
3819 44d03001 2019-05-09 stsp static const struct got_error *
3820 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
3821 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
3822 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
3824 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3825 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
3827 036813ee 2019-05-09 stsp *ctp = NULL;
3829 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3830 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3831 036813ee 2019-05-09 stsp char *ct_name = NULL;
3832 036813ee 2019-05-09 stsp int path_matches;
3834 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
3835 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
3836 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE &&
3837 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
3840 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
3841 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
3845 c4e12a88 2019-05-13 stsp if (got_object_id_cmp(ct->base_blob_id, te->id) != 0)
3848 036813ee 2019-05-09 stsp err = match_ct_parent_path(&path_matches, ct, base_tree_path);
3850 036813ee 2019-05-09 stsp return err;
3851 036813ee 2019-05-09 stsp if (!path_matches)
3854 036813ee 2019-05-09 stsp ct_name = basename(pe->path);
3855 036813ee 2019-05-09 stsp if (ct_name == NULL)
3856 638f9024 2019-05-13 stsp return got_error_from_errno2("basename", pe->path);
3858 036813ee 2019-05-09 stsp if (strcmp(te->name, ct_name) != 0)
3861 036813ee 2019-05-09 stsp *ctp = ct;
3865 2b496619 2019-07-10 stsp return err;
3868 2b496619 2019-07-10 stsp static const struct got_error *
3869 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
3870 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
3871 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
3872 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3873 2b496619 2019-07-10 stsp struct got_repository *repo)
3875 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
3876 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
3877 2b496619 2019-07-10 stsp char *subtree_path;
3879 2b496619 2019-07-10 stsp *new_tep = NULL;
3881 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
3882 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
3883 2b496619 2019-07-10 stsp child_path) == -1)
3884 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
3886 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
3887 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
3888 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
3889 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
3890 2b496619 2019-07-10 stsp new_te->name = strdup(child_path);
3891 2b496619 2019-07-10 stsp if (new_te->name == NULL) {
3892 2b496619 2019-07-10 stsp err = got_error_from_errno("strdup");
3893 2b496619 2019-07-10 stsp got_object_tree_entry_close(new_te);
3894 2b496619 2019-07-10 stsp goto done;
3896 2b496619 2019-07-10 stsp err = write_tree(&new_te->id, NULL, subtree_path,
3897 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
3898 2b496619 2019-07-10 stsp if (err) {
3899 2b496619 2019-07-10 stsp got_object_tree_entry_close(new_te);
3900 2b496619 2019-07-10 stsp goto done;
3903 2b496619 2019-07-10 stsp free(subtree_path);
3904 2b496619 2019-07-10 stsp if (err == NULL)
3905 2b496619 2019-07-10 stsp *new_tep = new_te;
3906 036813ee 2019-05-09 stsp return err;
3909 036813ee 2019-05-09 stsp static const struct got_error *
3910 036813ee 2019-05-09 stsp write_tree(struct got_object_id **new_tree_id,
3911 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
3912 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
3913 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3914 036813ee 2019-05-09 stsp struct got_repository *repo)
3916 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3917 036813ee 2019-05-09 stsp const struct got_tree_entries *base_entries = NULL;
3918 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
3919 036813ee 2019-05-09 stsp struct got_tree_entries new_tree_entries;
3920 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
3921 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
3923 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
3924 036813ee 2019-05-09 stsp new_tree_entries.nentries = 0;
3925 036813ee 2019-05-09 stsp SIMPLEQ_INIT(&new_tree_entries.head);
3927 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
3928 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3929 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3930 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
3932 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
3933 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
3934 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
3937 036813ee 2019-05-09 stsp if (!got_path_is_child(pe->path, path_base_tree,
3938 2f51b5b3 2019-05-09 stsp strlen(path_base_tree)))
3941 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
3942 036813ee 2019-05-09 stsp pe->path);
3944 036813ee 2019-05-09 stsp goto done;
3946 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
3947 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
3948 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
3950 036813ee 2019-05-09 stsp goto done;
3951 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
3953 afa376bf 2019-05-09 stsp goto done;
3954 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
3955 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
3957 2f51b5b3 2019-05-09 stsp goto done;
3959 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
3960 2b496619 2019-07-10 stsp if (base_tree == NULL ||
3961 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
3962 2b496619 2019-07-10 stsp == NULL) {
3963 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
3964 2b496619 2019-07-10 stsp child_path, path_base_tree,
3965 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
3968 2b496619 2019-07-10 stsp goto done;
3969 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
3971 2b496619 2019-07-10 stsp goto done;
3976 2f51b5b3 2019-05-09 stsp if (base_tree) {
3977 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
3978 2f51b5b3 2019-05-09 stsp base_entries = got_object_tree_get_entries(base_tree);
3979 2f51b5b3 2019-05-09 stsp SIMPLEQ_FOREACH(te, &base_entries->head, entry) {
3980 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
3982 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
3983 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
3984 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
3986 63c5ca5d 2019-08-24 stsp goto done;
3987 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
3989 63c5ca5d 2019-08-24 stsp goto done;
3993 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
3994 44d03001 2019-05-09 stsp int modified;
3995 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
3997 036813ee 2019-05-09 stsp goto done;
3998 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
3999 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
4001 2f51b5b3 2019-05-09 stsp goto done;
4002 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
4003 44d03001 2019-05-09 stsp if (modified) {
4004 44d03001 2019-05-09 stsp free(new_te->id);
4005 44d03001 2019-05-09 stsp err = write_subtree(&new_te->id, te,
4006 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
4007 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
4009 44d03001 2019-05-09 stsp goto done;
4011 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
4013 036813ee 2019-05-09 stsp goto done;
4017 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
4018 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
4020 f66c734c 2019-09-22 stsp goto done;
4022 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
4023 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
4024 1ebedb77 2019-10-19 stsp ct->status == GOT_STATUS_MODE_CHANGE ||
4025 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4026 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
4027 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
4029 2f51b5b3 2019-05-09 stsp goto done;
4030 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
4032 2f51b5b3 2019-05-09 stsp goto done;
4034 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
4035 b416585c 2019-05-13 stsp status_arg);
4037 afa376bf 2019-05-09 stsp goto done;
4039 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
4040 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
4042 2f51b5b3 2019-05-09 stsp goto done;
4043 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
4045 2f51b5b3 2019-05-09 stsp goto done;
4050 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
4051 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, &paths, entry) {
4052 0b5cc0d6 2019-05-09 stsp struct got_tree_entry *te = pe->data;
4053 0b5cc0d6 2019-05-09 stsp new_tree_entries.nentries++;
4054 0b5cc0d6 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&new_tree_entries.head, te, entry);
4056 036813ee 2019-05-09 stsp err = got_object_tree_create(new_tree_id, &new_tree_entries, repo);
4058 ca2503ea 2019-05-09 stsp got_object_tree_entries_close(&new_tree_entries);
4059 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
4060 ed175427 2019-05-09 stsp return err;
4063 ebf99748 2019-05-09 stsp static const struct got_error *
4064 ebf99748 2019-05-09 stsp update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
4065 72fd46fa 2019-09-06 stsp struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex,
4066 72fd46fa 2019-09-06 stsp int have_staged_files)
4068 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
4069 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
4071 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4072 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
4073 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4075 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
4077 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
4078 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
4079 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
4080 ebf99748 2019-05-09 stsp got_fileindex_entry_free(ie);
4081 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
4082 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4083 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
4084 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
4085 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
4086 5f8a88c6 2019-08-03 stsp ct->ondisk_path, ct->staged_blob_id->sha1,
4087 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
4088 72fd46fa 2019-09-06 stsp !have_staged_files);
4090 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
4091 e75eb4da 2019-05-10 stsp ct->ondisk_path, ct->blob_id->sha1,
4092 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
4093 72fd46fa 2019-09-06 stsp !have_staged_files);
4095 ebf99748 2019-05-09 stsp err = got_fileindex_entry_alloc(&ie,
4096 e75eb4da 2019-05-10 stsp ct->ondisk_path, pe->path, ct->blob_id->sha1,
4097 ebf99748 2019-05-09 stsp new_base_commit_id->sha1);
4100 ebf99748 2019-05-09 stsp err = got_fileindex_entry_add(fileindex, ie);
4105 d56d26ce 2019-05-10 stsp return err;
4109 d56d26ce 2019-05-10 stsp static const struct got_error *
4110 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
4111 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
4112 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
4113 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
4114 735ef5ac 2019-08-03 stsp int ood_errcode)
4116 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
4117 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
4119 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
4120 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
4121 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
4122 1a36436d 2019-06-10 stsp return NULL;
4124 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
4125 9bead371 2019-07-28 stsp * on matches file content in the branch head.
4127 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
4128 735ef5ac 2019-08-03 stsp in_repo_path);
4129 9bead371 2019-07-28 stsp if (err) {
4130 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
4131 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
4132 1a36436d 2019-06-10 stsp goto done;
4133 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
4134 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
4136 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
4137 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
4138 735ef5ac 2019-08-03 stsp in_repo_path);
4139 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
4140 1a36436d 2019-06-10 stsp goto done;
4141 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
4145 1a36436d 2019-06-10 stsp return err;
4148 c4296144 2019-05-09 stsp const struct got_error *
4149 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
4150 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
4151 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id, struct got_worktree *worktree,
4152 5c1e53bc 2019-07-28 stsp const char *author, const char *committer,
4153 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
4154 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4155 afa376bf 2019-05-09 stsp struct got_repository *repo)
4157 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4158 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
4159 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
4160 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
4161 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
4162 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
4163 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
4164 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
4165 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
4166 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
4167 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
4169 c4296144 2019-05-09 stsp *new_commit_id = NULL;
4171 de18fc63 2019-05-09 stsp SIMPLEQ_INIT(&parent_ids);
4173 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
4175 588edf97 2019-05-10 stsp goto done;
4177 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
4179 588edf97 2019-05-10 stsp goto done;
4181 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
4182 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
4187 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
4188 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
4192 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
4193 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4194 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4195 cf066bf8 2019-05-09 stsp char *ondisk_path;
4197 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
4198 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
4199 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
4202 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
4203 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODIFY &&
4204 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE)
4207 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
4208 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
4209 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4210 cf066bf8 2019-05-09 stsp goto done;
4212 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
4213 a7055788 2019-05-09 stsp free(ondisk_path);
4215 cf066bf8 2019-05-09 stsp goto done;
4218 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
4219 39cd0ff6 2019-07-12 stsp err = write_tree(&new_tree_id, head_tree, "/", commitable_paths,
4220 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
4222 036813ee 2019-05-09 stsp goto done;
4224 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
4226 de18fc63 2019-05-09 stsp goto done;
4227 de18fc63 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
4228 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
4229 de18fc63 2019-05-09 stsp 1, author, time(NULL), committer, time(NULL), logmsg, repo);
4230 de18fc63 2019-05-09 stsp got_object_qid_free(pid);
4231 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
4232 33ad4cbe 2019-05-12 jcs free(logmsg);
4234 9d40349a 2019-05-09 stsp goto done;
4236 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
4237 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
4238 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
4239 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
4240 09f5bd90 2019-05-09 stsp goto done;
4242 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
4243 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
4245 09f5bd90 2019-05-09 stsp goto done;
4246 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
4248 ebf99748 2019-05-09 stsp goto done;
4249 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
4250 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
4251 09f5bd90 2019-05-09 stsp goto done;
4253 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
4254 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
4256 f2c16586 2019-05-09 stsp goto done;
4257 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
4259 f2c16586 2019-05-09 stsp goto done;
4261 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
4263 09f5bd90 2019-05-09 stsp goto done;
4265 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
4267 ebf99748 2019-05-09 stsp goto done;
4269 588edf97 2019-05-10 stsp if (head_tree)
4270 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
4271 588edf97 2019-05-10 stsp if (head_commit)
4272 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
4273 09f5bd90 2019-05-09 stsp free(head_commit_id2);
4274 2f17228e 2019-05-12 stsp if (head_ref2) {
4275 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
4276 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
4277 2f17228e 2019-05-12 stsp err = unlockerr;
4278 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
4280 39cd0ff6 2019-07-12 stsp return err;
4283 5c1e53bc 2019-07-28 stsp static const struct got_error *
4284 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
4285 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
4287 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
4288 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
4290 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
4291 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
4292 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
4294 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
4295 5c1e53bc 2019-07-28 stsp ct_path++;
4297 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
4298 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
4302 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
4303 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
4305 5c1e53bc 2019-07-28 stsp return NULL;
4308 f0b75401 2019-08-03 stsp static const struct got_error *
4309 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
4311 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
4313 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
4314 f0b75401 2019-08-03 stsp *have_staged_files = 1;
4315 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
4318 f0b75401 2019-08-03 stsp return NULL;
4321 5f8a88c6 2019-08-03 stsp static const struct got_error *
4322 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
4323 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
4325 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
4326 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
4328 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
4329 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
4331 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
4332 5f8a88c6 2019-08-03 stsp if (ie == NULL)
4333 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
4334 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
4335 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
4336 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
4339 5f8a88c6 2019-08-03 stsp return NULL;
4342 39cd0ff6 2019-07-12 stsp const struct got_error *
4343 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
4344 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
4345 39cd0ff6 2019-07-12 stsp const char *author, const char *committer,
4346 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
4347 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
4348 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
4350 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
4351 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
4352 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
4353 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
4354 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
4355 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
4356 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
4357 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
4358 f0b75401 2019-08-03 stsp int have_staged_files = 0;
4360 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
4362 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
4364 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
4366 39cd0ff6 2019-07-12 stsp goto done;
4368 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
4370 39cd0ff6 2019-07-12 stsp goto done;
4372 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
4374 39cd0ff6 2019-07-12 stsp goto done;
4376 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4378 39cd0ff6 2019-07-12 stsp goto done;
4380 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
4381 5f8a88c6 2019-08-03 stsp &have_staged_files);
4382 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
4383 5f8a88c6 2019-08-03 stsp goto done;
4384 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
4385 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
4387 5f8a88c6 2019-08-03 stsp goto done;
4390 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
4391 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
4392 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
4393 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
4394 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
4395 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4396 5c1e53bc 2019-07-28 stsp collect_commitables, &cc_arg, NULL, NULL);
4398 5c1e53bc 2019-07-28 stsp goto done;
4401 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
4402 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
4403 39cd0ff6 2019-07-12 stsp goto done;
4406 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
4407 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
4409 5c1e53bc 2019-07-28 stsp goto done;
4412 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
4413 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
4414 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
4416 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
4417 f0b75401 2019-08-03 stsp ct_path++;
4418 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
4419 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
4420 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
4422 b50cabdf 2019-07-12 stsp goto done;
4426 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
4427 5c1e53bc 2019-07-28 stsp head_commit_id, worktree, author, committer,
4428 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
4430 39cd0ff6 2019-07-12 stsp goto done;
4432 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
4433 72fd46fa 2019-09-06 stsp fileindex, have_staged_files);
4434 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4435 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
4436 39cd0ff6 2019-07-12 stsp err = sync_err;
4438 39cd0ff6 2019-07-12 stsp if (fileindex)
4439 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
4440 39cd0ff6 2019-07-12 stsp free(fileindex_path);
4441 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4442 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
4443 39cd0ff6 2019-07-12 stsp err = unlockerr;
4444 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
4445 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
4446 39cd0ff6 2019-07-12 stsp free_commitable(ct);
4448 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
4449 c4296144 2019-05-09 stsp return err;
4452 8656d6c4 2019-05-20 stsp const char *
4453 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
4455 8656d6c4 2019-05-20 stsp return ct->path;
4458 8656d6c4 2019-05-20 stsp unsigned int
4459 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
4461 8656d6c4 2019-05-20 stsp return ct->status;
4464 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
4465 818c7501 2019-07-11 stsp struct got_worktree *worktree;
4466 818c7501 2019-07-11 stsp struct got_repository *repo;
4469 818c7501 2019-07-11 stsp static const struct got_error *
4470 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
4472 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
4473 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
4474 818c7501 2019-07-11 stsp unsigned char status;
4475 818c7501 2019-07-11 stsp struct stat sb;
4476 818c7501 2019-07-11 stsp char *ondisk_path;
4478 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
4479 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
4480 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
4481 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
4483 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
4485 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
4487 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
4488 818c7501 2019-07-11 stsp err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
4489 818c7501 2019-07-11 stsp free(ondisk_path);
4491 818c7501 2019-07-11 stsp return err;
4493 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
4494 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
4495 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
4496 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
4498 818c7501 2019-07-11 stsp return NULL;
4501 818c7501 2019-07-11 stsp const struct got_error *
4502 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
4503 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
4504 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
4505 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
4507 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
4508 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
4509 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
4510 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
4511 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
4512 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
4514 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
4515 818c7501 2019-07-11 stsp *tmp_branch = NULL;
4516 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4518 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
4520 818c7501 2019-07-11 stsp return err;
4522 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
4524 818c7501 2019-07-11 stsp goto done;
4526 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
4527 818c7501 2019-07-11 stsp ok_arg.repo = repo;
4528 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
4531 818c7501 2019-07-11 stsp goto done;
4533 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4535 818c7501 2019-07-11 stsp goto done;
4537 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4539 818c7501 2019-07-11 stsp goto done;
4541 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4543 818c7501 2019-07-11 stsp goto done;
4545 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
4548 818c7501 2019-07-11 stsp goto done;
4550 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
4551 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
4553 818c7501 2019-07-11 stsp goto done;
4554 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
4556 818c7501 2019-07-11 stsp goto done;
4558 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
4560 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
4562 818c7501 2019-07-11 stsp goto done;
4564 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
4566 818c7501 2019-07-11 stsp goto done;
4568 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
4569 818c7501 2019-07-11 stsp worktree->base_commit_id);
4571 818c7501 2019-07-11 stsp goto done;
4572 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
4574 818c7501 2019-07-11 stsp goto done;
4576 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
4578 818c7501 2019-07-11 stsp goto done;
4580 818c7501 2019-07-11 stsp free(fileindex_path);
4581 818c7501 2019-07-11 stsp free(tmp_branch_name);
4582 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
4583 818c7501 2019-07-11 stsp free(branch_ref_name);
4584 818c7501 2019-07-11 stsp if (branch_ref)
4585 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
4586 818c7501 2019-07-11 stsp if (wt_branch)
4587 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
4588 818c7501 2019-07-11 stsp if (err) {
4589 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
4590 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
4591 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
4593 818c7501 2019-07-11 stsp if (*tmp_branch) {
4594 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
4595 818c7501 2019-07-11 stsp *tmp_branch = NULL;
4597 3e3a69f1 2019-07-25 stsp if (*fileindex) {
4598 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
4599 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4601 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
4603 818c7501 2019-07-11 stsp return err;
4606 818c7501 2019-07-11 stsp const struct got_error *
4607 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
4608 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
4609 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
4610 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
4612 818c7501 2019-07-11 stsp const struct got_error *err;
4613 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
4614 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
4615 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
4616 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
4617 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
4619 818c7501 2019-07-11 stsp *commit_id = NULL;
4620 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
4621 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
4622 3e3a69f1 2019-07-25 stsp *branch = NULL;
4623 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4625 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
4627 3e3a69f1 2019-07-25 stsp return err;
4629 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
4631 f032f1f7 2019-08-04 stsp goto done;
4633 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
4634 f032f1f7 2019-08-04 stsp &have_staged_files);
4635 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
4636 f032f1f7 2019-08-04 stsp goto done;
4637 f032f1f7 2019-08-04 stsp if (have_staged_files) {
4638 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
4639 3e3a69f1 2019-07-25 stsp goto done;
4642 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4644 f032f1f7 2019-08-04 stsp goto done;
4646 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4648 818c7501 2019-07-11 stsp goto done;
4650 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4652 818c7501 2019-07-11 stsp goto done;
4654 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4656 818c7501 2019-07-11 stsp goto done;
4658 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
4660 818c7501 2019-07-11 stsp goto done;
4662 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
4663 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
4665 818c7501 2019-07-11 stsp goto done;
4667 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4669 818c7501 2019-07-11 stsp goto done;
4671 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
4673 818c7501 2019-07-11 stsp goto done;
4675 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
4676 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
4678 818c7501 2019-07-11 stsp goto done;
4680 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
4682 818c7501 2019-07-11 stsp goto done;
4684 818c7501 2019-07-11 stsp free(commit_ref_name);
4685 818c7501 2019-07-11 stsp free(branch_ref_name);
4686 3e3a69f1 2019-07-25 stsp free(fileindex_path);
4687 818c7501 2019-07-11 stsp if (commit_ref)
4688 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
4689 818c7501 2019-07-11 stsp if (branch_ref)
4690 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
4691 818c7501 2019-07-11 stsp if (err) {
4692 818c7501 2019-07-11 stsp free(*commit_id);
4693 818c7501 2019-07-11 stsp *commit_id = NULL;
4694 818c7501 2019-07-11 stsp if (*tmp_branch) {
4695 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
4696 818c7501 2019-07-11 stsp *tmp_branch = NULL;
4698 818c7501 2019-07-11 stsp if (*new_base_branch) {
4699 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
4700 818c7501 2019-07-11 stsp *new_base_branch = NULL;
4702 818c7501 2019-07-11 stsp if (*branch) {
4703 818c7501 2019-07-11 stsp got_ref_close(*branch);
4704 818c7501 2019-07-11 stsp *branch = NULL;
4706 3e3a69f1 2019-07-25 stsp if (*fileindex) {
4707 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
4708 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4710 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
4712 818c7501 2019-07-11 stsp return err;
4715 818c7501 2019-07-11 stsp const struct got_error *
4716 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
4718 818c7501 2019-07-11 stsp const struct got_error *err;
4719 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
4721 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4723 818c7501 2019-07-11 stsp return err;
4725 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
4726 818c7501 2019-07-11 stsp free(tmp_branch_name);
4727 818c7501 2019-07-11 stsp return NULL;
4730 818c7501 2019-07-11 stsp static const struct got_error *
4731 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
4732 818c7501 2019-07-11 stsp char **logmsg, void *arg)
4734 0ebf8283 2019-07-24 stsp *logmsg = arg;
4735 818c7501 2019-07-11 stsp return NULL;
4738 818c7501 2019-07-11 stsp static const struct got_error *
4739 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
4740 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
4741 537ac44b 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
4743 818c7501 2019-07-11 stsp return NULL;
4746 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
4747 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
4748 01757395 2019-07-12 stsp void *progress_arg;
4749 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
4752 01757395 2019-07-12 stsp static const struct got_error *
4753 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
4755 01757395 2019-07-12 stsp const struct got_error *err;
4756 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
4758 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
4760 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
4762 01757395 2019-07-12 stsp return err;
4764 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
4765 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
4766 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
4767 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
4768 01757395 2019-07-12 stsp return NULL;
4770 01757395 2019-07-12 stsp p = strdup(path);
4771 01757395 2019-07-12 stsp if (p == NULL)
4772 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
4774 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
4775 01757395 2019-07-12 stsp if (err || new == NULL)
4777 01757395 2019-07-12 stsp return err;
4781 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
4783 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
4785 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
4786 01757395 2019-07-12 stsp free((char *)pe->path);
4788 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
4791 0ebf8283 2019-07-24 stsp static const struct got_error *
4792 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
4793 0ebf8283 2019-07-24 stsp struct got_repository *repo)
4795 818c7501 2019-07-11 stsp const struct got_error *err;
4796 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
4798 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4799 818c7501 2019-07-11 stsp if (err) {
4800 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
4801 818c7501 2019-07-11 stsp goto done;
4802 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
4804 818c7501 2019-07-11 stsp goto done;
4805 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
4807 818c7501 2019-07-11 stsp goto done;
4809 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
4812 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
4814 818c7501 2019-07-11 stsp goto done;
4815 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
4816 818c7501 2019-07-11 stsp free(stored_id);
4817 818c7501 2019-07-11 stsp if (cmp != 0) {
4818 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
4819 818c7501 2019-07-11 stsp goto done;
4823 0ebf8283 2019-07-24 stsp if (commit_ref)
4824 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
4825 0ebf8283 2019-07-24 stsp return err;
4828 0ebf8283 2019-07-24 stsp static const struct got_error *
4829 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
4830 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
4831 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
4832 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
4833 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4834 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
4836 0ebf8283 2019-07-24 stsp const struct got_error *err;
4837 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
4838 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
4839 3e3a69f1 2019-07-25 stsp char *fileindex_path;
4841 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
4843 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
4845 0ebf8283 2019-07-24 stsp return err;
4847 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
4848 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
4849 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
4850 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
4851 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
4852 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
4853 818c7501 2019-07-11 stsp if (commit_ref)
4854 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
4855 818c7501 2019-07-11 stsp return err;
4858 818c7501 2019-07-11 stsp const struct got_error *
4859 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
4860 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
4861 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
4862 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
4863 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4864 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
4866 0ebf8283 2019-07-24 stsp const struct got_error *err;
4867 0ebf8283 2019-07-24 stsp char *commit_ref_name;
4869 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4871 0ebf8283 2019-07-24 stsp return err;
4873 0ebf8283 2019-07-24 stsp err = store_commit_id(commit_ref_name, commit_id, repo);
4875 0ebf8283 2019-07-24 stsp goto done;
4877 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
4878 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
4879 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
4881 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4882 0ebf8283 2019-07-24 stsp return err;
4885 0ebf8283 2019-07-24 stsp const struct got_error *
4886 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
4887 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
4888 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
4889 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
4890 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4891 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
4893 0ebf8283 2019-07-24 stsp const struct got_error *err;
4894 0ebf8283 2019-07-24 stsp char *commit_ref_name;
4896 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4898 0ebf8283 2019-07-24 stsp return err;
4900 0ebf8283 2019-07-24 stsp err = store_commit_id(commit_ref_name, commit_id, repo);
4902 0ebf8283 2019-07-24 stsp goto done;
4904 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
4905 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
4906 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
4908 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4909 0ebf8283 2019-07-24 stsp return err;
4912 0ebf8283 2019-07-24 stsp static const struct got_error *
4913 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
4914 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
4915 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
4916 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
4917 3e3a69f1 2019-07-25 stsp const char *new_logmsg, struct got_repository *repo)
4919 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
4920 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
4921 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
4922 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
4923 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
4924 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
4925 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
4927 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
4928 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
4930 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
4932 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
4934 3e3a69f1 2019-07-25 stsp return err;
4936 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
4937 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
4938 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
4939 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
4941 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
4942 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
4943 01757395 2019-07-12 stsp * TODO: Ideally, merged_paths would contain a list of commitables
4944 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
4946 01757395 2019-07-12 stsp if (merged_paths) {
4947 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
4948 8f8646e5 2019-07-25 stsp if (TAILQ_EMPTY(merged_paths)) {
4949 8f8646e5 2019-07-25 stsp err = got_error(GOT_ERR_NO_MERGED_PATHS);
4950 8f8646e5 2019-07-25 stsp goto done;
4952 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
4953 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
4954 01757395 2019-07-12 stsp repo, collect_commitables, &cc_arg, NULL, NULL);
4956 01757395 2019-07-12 stsp goto done;
4959 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
4960 01757395 2019-07-12 stsp collect_commitables, &cc_arg, NULL, NULL);
4962 01757395 2019-07-12 stsp goto done;
4965 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
4966 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
4967 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
4969 a0e95631 2019-07-12 stsp goto done;
4970 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
4971 a0e95631 2019-07-12 stsp goto done;
4974 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
4976 edd02c5e 2019-07-11 stsp goto done;
4978 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
4980 818c7501 2019-07-11 stsp goto done;
4982 5943eee2 2019-08-13 stsp if (new_logmsg) {
4983 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
4984 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
4985 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
4986 5943eee2 2019-08-13 stsp goto done;
4989 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
4991 5943eee2 2019-08-13 stsp goto done;
4994 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
4995 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
4996 5c1e53bc 2019-07-28 stsp worktree, got_object_commit_get_author(orig_commit),
4997 a0e95631 2019-07-12 stsp got_object_commit_get_committer(orig_commit),
4998 0ebf8283 2019-07-24 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
5000 a0e95631 2019-07-12 stsp goto done;
5002 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
5004 a0e95631 2019-07-12 stsp goto done;
5006 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
5008 a0e95631 2019-07-12 stsp goto done;
5010 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
5011 72fd46fa 2019-09-06 stsp fileindex, 0);
5012 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5013 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
5014 a0e95631 2019-07-12 stsp err = sync_err;
5016 a0e95631 2019-07-12 stsp free(fileindex_path);
5017 a0e95631 2019-07-12 stsp free(head_commit_id);
5018 a0e95631 2019-07-12 stsp if (head_ref)
5019 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
5020 818c7501 2019-07-11 stsp if (err) {
5021 818c7501 2019-07-11 stsp free(*new_commit_id);
5022 818c7501 2019-07-11 stsp *new_commit_id = NULL;
5024 818c7501 2019-07-11 stsp return err;
5027 818c7501 2019-07-11 stsp const struct got_error *
5028 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
5029 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
5030 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5031 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
5032 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
5034 0ebf8283 2019-07-24 stsp const struct got_error *err;
5035 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5036 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
5037 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
5039 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5041 0ebf8283 2019-07-24 stsp return err;
5043 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5045 0ebf8283 2019-07-24 stsp goto done;
5046 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
5048 0ebf8283 2019-07-24 stsp goto done;
5049 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
5050 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
5051 0ebf8283 2019-07-24 stsp goto done;
5054 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
5055 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
5057 0ebf8283 2019-07-24 stsp if (commit_ref)
5058 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
5059 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5060 0ebf8283 2019-07-24 stsp free(commit_id);
5061 0ebf8283 2019-07-24 stsp return err;
5064 0ebf8283 2019-07-24 stsp const struct got_error *
5065 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
5066 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
5067 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5068 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
5069 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
5070 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5072 0ebf8283 2019-07-24 stsp const struct got_error *err;
5073 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5074 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
5075 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
5077 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5079 0ebf8283 2019-07-24 stsp return err;
5081 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5083 0ebf8283 2019-07-24 stsp goto done;
5084 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
5086 0ebf8283 2019-07-24 stsp goto done;
5087 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
5088 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_COMMITID);
5089 0ebf8283 2019-07-24 stsp goto done;
5092 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
5093 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
5095 0ebf8283 2019-07-24 stsp if (commit_ref)
5096 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
5097 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5098 0ebf8283 2019-07-24 stsp free(commit_id);
5099 0ebf8283 2019-07-24 stsp return err;
5102 0ebf8283 2019-07-24 stsp const struct got_error *
5103 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
5104 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
5106 3e3a69f1 2019-07-25 stsp if (fileindex)
5107 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5108 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
5111 69844fba 2019-07-11 stsp static const struct got_error *
5112 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
5114 69844fba 2019-07-11 stsp const struct got_error *err;
5115 69844fba 2019-07-11 stsp struct got_reference *ref;
5117 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
5118 69844fba 2019-07-11 stsp if (err) {
5119 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
5120 69844fba 2019-07-11 stsp return NULL;
5121 69844fba 2019-07-11 stsp return err;
5124 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
5125 69844fba 2019-07-11 stsp got_ref_close(ref);
5126 69844fba 2019-07-11 stsp return err;
5129 69844fba 2019-07-11 stsp static const struct got_error *
5130 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
5132 69844fba 2019-07-11 stsp const struct got_error *err;
5133 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
5134 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
5136 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5138 69844fba 2019-07-11 stsp goto done;
5139 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
5141 69844fba 2019-07-11 stsp goto done;
5143 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5145 69844fba 2019-07-11 stsp goto done;
5146 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
5148 69844fba 2019-07-11 stsp goto done;
5150 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5152 69844fba 2019-07-11 stsp goto done;
5153 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
5155 69844fba 2019-07-11 stsp goto done;
5157 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5159 69844fba 2019-07-11 stsp goto done;
5160 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
5162 69844fba 2019-07-11 stsp goto done;
5165 69844fba 2019-07-11 stsp free(tmp_branch_name);
5166 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
5167 69844fba 2019-07-11 stsp free(branch_ref_name);
5168 69844fba 2019-07-11 stsp free(commit_ref_name);
5169 69844fba 2019-07-11 stsp return err;
5172 818c7501 2019-07-11 stsp const struct got_error *
5173 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
5174 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
5175 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
5176 818c7501 2019-07-11 stsp struct got_repository *repo)
5178 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
5179 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
5181 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
5183 818c7501 2019-07-11 stsp return err;
5185 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
5187 818c7501 2019-07-11 stsp goto done;
5189 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
5191 818c7501 2019-07-11 stsp goto done;
5193 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
5195 818c7501 2019-07-11 stsp goto done;
5197 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
5199 3e3a69f1 2019-07-25 stsp if (fileindex)
5200 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5201 818c7501 2019-07-11 stsp free(new_head_commit_id);
5202 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5203 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
5204 818c7501 2019-07-11 stsp err = unlockerr;
5205 818c7501 2019-07-11 stsp return err;
5208 818c7501 2019-07-11 stsp const struct got_error *
5209 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
5210 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
5211 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
5212 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
5214 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
5215 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
5216 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
5217 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
5218 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
5219 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
5221 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
5223 818c7501 2019-07-11 stsp return err;
5225 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
5226 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
5228 818c7501 2019-07-11 stsp goto done;
5230 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
5232 818c7501 2019-07-11 stsp goto done;
5235 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
5236 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
5237 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
5239 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
5241 818c7501 2019-07-11 stsp goto done;
5243 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
5245 818c7501 2019-07-11 stsp goto done;
5247 ca355955 2019-07-12 stsp err = got_object_id_by_path(&tree_id, repo,
5248 ca355955 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
5250 ca355955 2019-07-12 stsp goto done;
5252 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
5254 ca355955 2019-07-12 stsp goto done;
5256 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5258 818c7501 2019-07-11 stsp goto done;
5260 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
5261 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
5262 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
5263 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
5264 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
5265 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
5266 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
5267 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
5268 1f1abb7e 2019-08-08 stsp revert_file, &rfa, NULL, NULL);
5270 1f1abb7e 2019-08-08 stsp goto sync;
5272 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
5273 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
5275 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5276 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
5277 ca355955 2019-07-12 stsp err = sync_err;
5279 818c7501 2019-07-11 stsp got_ref_close(resolved);
5280 a3a2faf2 2019-07-12 stsp free(tree_id);
5281 818c7501 2019-07-11 stsp free(commit_id);
5282 0ebf8283 2019-07-24 stsp if (fileindex)
5283 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
5284 0ebf8283 2019-07-24 stsp free(fileindex_path);
5286 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5287 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
5288 0ebf8283 2019-07-24 stsp err = unlockerr;
5289 0ebf8283 2019-07-24 stsp return err;
5292 0ebf8283 2019-07-24 stsp const struct got_error *
5293 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
5294 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
5295 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
5296 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
5298 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5299 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
5300 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
5301 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
5302 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
5303 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
5304 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
5305 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
5307 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5308 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
5309 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
5310 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5312 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
5314 0ebf8283 2019-07-24 stsp return err;
5316 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5318 0ebf8283 2019-07-24 stsp goto done;
5320 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
5321 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
5322 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5325 0ebf8283 2019-07-24 stsp goto done;
5327 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5329 0ebf8283 2019-07-24 stsp goto done;
5331 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5333 0ebf8283 2019-07-24 stsp goto done;
5335 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5336 0ebf8283 2019-07-24 stsp worktree);
5338 0ebf8283 2019-07-24 stsp goto done;
5340 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5343 0ebf8283 2019-07-24 stsp goto done;
5345 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
5347 0ebf8283 2019-07-24 stsp goto done;
5349 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
5351 0ebf8283 2019-07-24 stsp goto done;
5353 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
5354 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
5356 0ebf8283 2019-07-24 stsp goto done;
5357 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
5359 0ebf8283 2019-07-24 stsp goto done;
5360 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
5361 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
5362 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
5363 0ebf8283 2019-07-24 stsp goto done;
5366 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
5367 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
5369 0ebf8283 2019-07-24 stsp goto done;
5370 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
5372 0ebf8283 2019-07-24 stsp goto done;
5374 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
5376 0ebf8283 2019-07-24 stsp goto done;
5378 0ebf8283 2019-07-24 stsp free(fileindex_path);
5379 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
5380 0ebf8283 2019-07-24 stsp free(branch_ref_name);
5381 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
5382 0ebf8283 2019-07-24 stsp if (wt_branch)
5383 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
5384 0ebf8283 2019-07-24 stsp if (err) {
5385 0ebf8283 2019-07-24 stsp if (*branch_ref) {
5386 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
5387 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
5389 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
5390 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
5391 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5393 0ebf8283 2019-07-24 stsp free(*base_commit_id);
5394 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5395 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5396 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5398 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
5400 0ebf8283 2019-07-24 stsp return err;
5403 0ebf8283 2019-07-24 stsp const struct got_error *
5404 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
5405 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
5407 3e3a69f1 2019-07-25 stsp if (fileindex)
5408 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5409 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
5412 0ebf8283 2019-07-24 stsp const struct got_error *
5413 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
5414 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
5416 0ebf8283 2019-07-24 stsp const struct got_error *err;
5417 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
5419 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5421 0ebf8283 2019-07-24 stsp return err;
5423 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
5424 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
5425 0ebf8283 2019-07-24 stsp return NULL;
5428 0ebf8283 2019-07-24 stsp const struct got_error *
5429 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
5430 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
5431 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
5432 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
5434 0ebf8283 2019-07-24 stsp const struct got_error *err;
5435 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
5436 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
5437 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
5438 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
5439 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
5440 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
5442 0ebf8283 2019-07-24 stsp *commit_id = NULL;
5443 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5444 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
5445 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5447 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
5449 3e3a69f1 2019-07-25 stsp return err;
5451 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5453 f032f1f7 2019-08-04 stsp goto done;
5455 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
5456 f032f1f7 2019-08-04 stsp &have_staged_files);
5457 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
5458 f032f1f7 2019-08-04 stsp goto done;
5459 f032f1f7 2019-08-04 stsp if (have_staged_files) {
5460 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
5461 3e3a69f1 2019-07-25 stsp goto done;
5464 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5466 f032f1f7 2019-08-04 stsp goto done;
5468 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5470 0ebf8283 2019-07-24 stsp goto done;
5472 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5474 0ebf8283 2019-07-24 stsp goto done;
5476 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5477 0ebf8283 2019-07-24 stsp worktree);
5479 0ebf8283 2019-07-24 stsp goto done;
5481 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
5483 0ebf8283 2019-07-24 stsp goto done;
5485 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5487 0ebf8283 2019-07-24 stsp goto done;
5488 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
5490 0ebf8283 2019-07-24 stsp goto done;
5492 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
5494 0ebf8283 2019-07-24 stsp goto done;
5495 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
5497 0ebf8283 2019-07-24 stsp goto done;
5499 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
5501 0ebf8283 2019-07-24 stsp goto done;
5503 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5504 0ebf8283 2019-07-24 stsp free(branch_ref_name);
5505 3e3a69f1 2019-07-25 stsp free(fileindex_path);
5506 0ebf8283 2019-07-24 stsp if (commit_ref)
5507 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
5508 0ebf8283 2019-07-24 stsp if (base_commit_ref)
5509 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
5510 0ebf8283 2019-07-24 stsp if (err) {
5511 0ebf8283 2019-07-24 stsp free(*commit_id);
5512 0ebf8283 2019-07-24 stsp *commit_id = NULL;
5513 0ebf8283 2019-07-24 stsp free(*base_commit_id);
5514 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
5515 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
5516 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
5517 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5519 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5520 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5521 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5523 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
5525 0ebf8283 2019-07-24 stsp return err;
5528 0ebf8283 2019-07-24 stsp static const struct got_error *
5529 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
5531 0ebf8283 2019-07-24 stsp const struct got_error *err;
5532 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
5533 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
5535 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5537 0ebf8283 2019-07-24 stsp goto done;
5538 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
5540 0ebf8283 2019-07-24 stsp goto done;
5542 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5543 0ebf8283 2019-07-24 stsp worktree);
5545 0ebf8283 2019-07-24 stsp goto done;
5546 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
5548 0ebf8283 2019-07-24 stsp goto done;
5550 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5552 0ebf8283 2019-07-24 stsp goto done;
5553 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
5555 0ebf8283 2019-07-24 stsp goto done;
5557 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5559 0ebf8283 2019-07-24 stsp goto done;
5560 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
5562 0ebf8283 2019-07-24 stsp goto done;
5564 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
5565 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
5566 0ebf8283 2019-07-24 stsp free(branch_ref_name);
5567 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5568 0ebf8283 2019-07-24 stsp return err;
5571 0ebf8283 2019-07-24 stsp const struct got_error *
5572 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
5573 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
5574 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
5575 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
5577 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
5578 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
5579 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
5580 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
5581 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
5583 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
5585 0ebf8283 2019-07-24 stsp return err;
5587 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
5588 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
5590 0ebf8283 2019-07-24 stsp goto done;
5592 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
5594 0ebf8283 2019-07-24 stsp goto done;
5596 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
5598 0ebf8283 2019-07-24 stsp goto done;
5600 0ebf8283 2019-07-24 stsp err = got_object_id_by_path(&tree_id, repo, base_commit_id,
5601 0ebf8283 2019-07-24 stsp worktree->path_prefix);
5603 0ebf8283 2019-07-24 stsp goto done;
5605 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
5607 0ebf8283 2019-07-24 stsp goto done;
5609 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5611 0ebf8283 2019-07-24 stsp goto done;
5613 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
5614 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
5615 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
5616 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
5617 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
5618 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
5619 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
5620 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
5621 1f1abb7e 2019-08-08 stsp revert_file, &rfa, NULL, NULL);
5623 1f1abb7e 2019-08-08 stsp goto sync;
5625 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
5626 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
5628 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5629 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
5630 0ebf8283 2019-07-24 stsp err = sync_err;
5632 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
5633 0ebf8283 2019-07-24 stsp free(tree_id);
5634 818c7501 2019-07-11 stsp free(fileindex_path);
5636 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5637 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
5638 818c7501 2019-07-11 stsp err = unlockerr;
5639 818c7501 2019-07-11 stsp return err;
5642 0ebf8283 2019-07-24 stsp const struct got_error *
5643 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
5644 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5645 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
5647 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr;
5648 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
5649 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
5651 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
5653 0ebf8283 2019-07-24 stsp return err;
5655 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
5656 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
5658 0ebf8283 2019-07-24 stsp goto done;
5660 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
5662 0ebf8283 2019-07-24 stsp goto done;
5664 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
5666 0ebf8283 2019-07-24 stsp goto done;
5668 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
5670 0ebf8283 2019-07-24 stsp goto done;
5672 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
5674 3e3a69f1 2019-07-25 stsp if (fileindex)
5675 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5676 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
5677 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5678 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
5679 0ebf8283 2019-07-24 stsp err = unlockerr;
5680 0ebf8283 2019-07-24 stsp return err;
5683 0ebf8283 2019-07-24 stsp const struct got_error *
5684 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
5685 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
5687 0ebf8283 2019-07-24 stsp const struct got_error *err;
5688 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5690 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5692 0ebf8283 2019-07-24 stsp return err;
5694 0ebf8283 2019-07-24 stsp err = store_commit_id(commit_ref_name, commit_id, repo);
5696 0ebf8283 2019-07-24 stsp goto done;
5698 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
5700 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5701 2822a352 2019-10-15 stsp return err;
5704 2822a352 2019-10-15 stsp const struct got_error *
5705 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **fileindex,
5706 2822a352 2019-10-15 stsp struct got_reference **branch_ref, struct got_reference **base_branch_ref,
5707 2822a352 2019-10-15 stsp struct got_worktree *worktree, const char *refname,
5708 2822a352 2019-10-15 stsp struct got_repository *repo)
5710 2822a352 2019-10-15 stsp const struct got_error *err = NULL;
5711 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
5712 2822a352 2019-10-15 stsp struct check_rebase_ok_arg ok_arg;
5714 2822a352 2019-10-15 stsp *fileindex = NULL;
5715 2822a352 2019-10-15 stsp *branch_ref = NULL;
5716 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
5718 2822a352 2019-10-15 stsp err = lock_worktree(worktree, LOCK_EX);
5720 2822a352 2019-10-15 stsp return err;
5722 2822a352 2019-10-15 stsp if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
5723 2822a352 2019-10-15 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
5724 2822a352 2019-10-15 stsp "cannot integrate a branch into itself; "
5725 2822a352 2019-10-15 stsp "update -b or different branch name required");
5726 2822a352 2019-10-15 stsp goto done;
5729 2822a352 2019-10-15 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5731 2822a352 2019-10-15 stsp goto done;
5733 2822a352 2019-10-15 stsp /* Preconditions are the same as for rebase. */
5734 2822a352 2019-10-15 stsp ok_arg.worktree = worktree;
5735 2822a352 2019-10-15 stsp ok_arg.repo = repo;
5736 2822a352 2019-10-15 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5739 2822a352 2019-10-15 stsp goto done;
5741 2822a352 2019-10-15 stsp err = got_ref_open(branch_ref, repo, refname, 1);
5743 2822a352 2019-10-15 stsp goto done;
5745 2822a352 2019-10-15 stsp err = got_ref_open(base_branch_ref, repo,
5746 2822a352 2019-10-15 stsp got_worktree_get_head_ref_name(worktree), 1);
5748 2822a352 2019-10-15 stsp if (err) {
5749 2822a352 2019-10-15 stsp if (*branch_ref) {
5750 2822a352 2019-10-15 stsp got_ref_close(*branch_ref);
5751 2822a352 2019-10-15 stsp *branch_ref = NULL;
5753 2822a352 2019-10-15 stsp if (*base_branch_ref) {
5754 2822a352 2019-10-15 stsp got_ref_close(*base_branch_ref);
5755 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
5757 2822a352 2019-10-15 stsp if (*fileindex) {
5758 2822a352 2019-10-15 stsp got_fileindex_free(*fileindex);
5759 2822a352 2019-10-15 stsp *fileindex = NULL;
5761 2822a352 2019-10-15 stsp lock_worktree(worktree, LOCK_SH);
5763 0cb83759 2019-08-03 stsp return err;
5766 2822a352 2019-10-15 stsp const struct got_error *
5767 2822a352 2019-10-15 stsp got_worktree_integrate_continue(struct got_worktree *worktree,
5768 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
5769 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref,
5770 2822a352 2019-10-15 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
5771 2822a352 2019-10-15 stsp got_cancel_cb cancel_cb, void *cancel_arg)
5773 2822a352 2019-10-15 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
5774 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
5775 2822a352 2019-10-15 stsp struct got_object_id *tree_id = NULL, *commit_id = NULL;
5777 2822a352 2019-10-15 stsp err = get_fileindex_path(&fileindex_path, worktree);
5779 2822a352 2019-10-15 stsp goto done;
5781 2822a352 2019-10-15 stsp err = got_ref_resolve(&commit_id, repo, branch_ref);
5783 2822a352 2019-10-15 stsp goto done;
5785 2822a352 2019-10-15 stsp err = got_object_id_by_path(&tree_id, repo, commit_id,
5786 2822a352 2019-10-15 stsp worktree->path_prefix);
5788 2822a352 2019-10-15 stsp goto done;
5790 2822a352 2019-10-15 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
5792 2822a352 2019-10-15 stsp goto done;
5794 2822a352 2019-10-15 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
5795 2822a352 2019-10-15 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
5797 2822a352 2019-10-15 stsp goto sync;
5799 2822a352 2019-10-15 stsp err = got_ref_change_ref(base_branch_ref, commit_id);
5801 2822a352 2019-10-15 stsp goto sync;
5803 2822a352 2019-10-15 stsp err = got_ref_write(base_branch_ref, repo);
5805 2822a352 2019-10-15 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5806 2822a352 2019-10-15 stsp if (sync_err && err == NULL)
5807 2822a352 2019-10-15 stsp err = sync_err;
5810 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(branch_ref);
5811 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
5812 2822a352 2019-10-15 stsp err = unlockerr;
5813 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
5815 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(base_branch_ref);
5816 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
5817 2822a352 2019-10-15 stsp err = unlockerr;
5818 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
5820 2822a352 2019-10-15 stsp got_fileindex_free(fileindex);
5821 2822a352 2019-10-15 stsp free(fileindex_path);
5822 2822a352 2019-10-15 stsp free(tree_id);
5824 2822a352 2019-10-15 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5825 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
5826 2822a352 2019-10-15 stsp err = unlockerr;
5827 2822a352 2019-10-15 stsp return err;
5830 2822a352 2019-10-15 stsp const struct got_error *
5831 2822a352 2019-10-15 stsp got_worktree_integrate_abort(struct got_worktree *worktree,
5832 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
5833 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref)
5835 8b692cd0 2019-10-21 stsp const struct got_error *err = NULL, *unlockerr = NULL;
5837 8b692cd0 2019-10-21 stsp got_fileindex_free(fileindex);
5839 8b692cd0 2019-10-21 stsp err = lock_worktree(worktree, LOCK_SH);
5841 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(branch_ref);
5842 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
5843 8b692cd0 2019-10-21 stsp err = unlockerr;
5844 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
5846 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(base_branch_ref);
5847 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
5848 8b692cd0 2019-10-21 stsp err = unlockerr;
5849 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
5851 8b692cd0 2019-10-21 stsp return err;
5854 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
5855 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
5856 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
5857 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
5858 2db2652d 2019-08-07 stsp struct got_repository *repo;
5859 2db2652d 2019-08-07 stsp int have_changes;
5862 2db2652d 2019-08-07 stsp const struct got_error *
5863 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
5864 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
5865 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5866 2db2652d 2019-08-07 stsp struct got_object_id *commit_id)
5868 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
5869 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
5870 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
5871 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
5872 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
5873 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
5875 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_UNVERSIONED ||
5876 7b5dc508 2019-10-28 stsp status == GOT_STATUS_NO_CHANGE)
5877 8b13ce36 2019-08-08 stsp return NULL;
5878 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
5879 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
5881 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
5882 735ef5ac 2019-08-03 stsp if (ie == NULL)
5883 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
5885 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
5886 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
5887 735ef5ac 2019-08-03 stsp relpath) == -1)
5888 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
5890 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
5891 735ef5ac 2019-08-03 stsp memcpy(base_commit_id.sha1, ie->commit_sha1,
5892 735ef5ac 2019-08-03 stsp SHA1_DIGEST_LENGTH);
5893 735ef5ac 2019-08-03 stsp base_commit_idp = &base_commit_id;
5896 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_CONFLICT) {
5897 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
5898 3aa5969e 2019-08-06 stsp goto done;
5899 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
5900 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
5901 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
5902 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
5903 735ef5ac 2019-08-03 stsp goto done;
5906 2db2652d 2019-08-07 stsp a->have_changes = 1;
5908 735ef5ac 2019-08-03 stsp p = in_repo_path;
5909 735ef5ac 2019-08-03 stsp while (p[0] == '/')
5911 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
5912 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
5913 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
5915 735ef5ac 2019-08-03 stsp free(in_repo_path);
5916 dc424a06 2019-08-07 stsp return err;
5919 2db2652d 2019-08-07 stsp struct stage_path_arg {
5920 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
5921 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
5922 2db2652d 2019-08-07 stsp struct got_repository *repo;
5923 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
5924 2db2652d 2019-08-07 stsp void *status_arg;
5925 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
5926 2db2652d 2019-08-07 stsp void *patch_arg;
5927 7b5dc508 2019-10-28 stsp int staged_something;
5930 2db2652d 2019-08-07 stsp static const struct got_error *
5931 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
5932 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
5933 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5934 2db2652d 2019-08-07 stsp struct got_object_id *commit_id)
5936 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
5937 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
5938 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
5939 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
5940 0cb83759 2019-08-03 stsp uint32_t stage;
5941 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
5943 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
5944 8b13ce36 2019-08-08 stsp return NULL;
5946 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
5947 d3e7c587 2019-08-03 stsp if (ie == NULL)
5948 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
5950 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
5951 2db2652d 2019-08-07 stsp relpath)== -1)
5952 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
5954 0cb83759 2019-08-03 stsp switch (status) {
5955 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
5956 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
5957 2db2652d 2019-08-07 stsp if (a->patch_cb) {
5958 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
5959 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
5960 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
5961 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
5964 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
5967 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
5968 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
5969 af5a81b2 2019-08-08 stsp ondisk_path, ie->path, a->repo,
5970 2db2652d 2019-08-07 stsp a->patch_cb, a->patch_arg);
5971 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
5975 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
5976 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
5979 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
5980 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
5981 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
5982 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
5984 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
5985 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
5986 7b5dc508 2019-10-28 stsp a->staged_something = 1;
5987 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
5989 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
5990 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
5991 af5a81b2 2019-08-08 stsp new_staged_blob_id, NULL);
5993 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
5994 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
5996 2db2652d 2019-08-07 stsp if (a->patch_cb) {
5997 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
5998 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
5999 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
6002 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
6004 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
6005 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
6009 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
6010 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
6011 7b5dc508 2019-10-28 stsp a->staged_something = 1;
6012 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
6014 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
6015 537ac44b 2019-08-03 stsp get_staged_status(ie), relpath, NULL, NULL, NULL);
6017 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
6019 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
6020 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
6022 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
6023 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
6026 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
6030 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
6031 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
6032 dc424a06 2019-08-07 stsp free(path_content);
6033 2db2652d 2019-08-07 stsp free(ondisk_path);
6034 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
6035 0ebf8283 2019-07-24 stsp return err;
6038 0cb83759 2019-08-03 stsp const struct got_error *
6039 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
6040 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
6041 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
6042 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
6043 1e71573e 2019-08-03 stsp struct got_repository *repo)
6045 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
6046 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
6047 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
6048 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
6049 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
6050 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
6051 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
6052 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
6054 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
6056 0cb83759 2019-08-03 stsp return err;
6058 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
6059 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
6061 735ef5ac 2019-08-03 stsp goto done;
6062 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6064 735ef5ac 2019-08-03 stsp goto done;
6065 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
6067 0cb83759 2019-08-03 stsp goto done;
6069 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
6070 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
6071 2db2652d 2019-08-07 stsp oka.worktree = worktree;
6072 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
6073 2db2652d 2019-08-07 stsp oka.repo = repo;
6074 2db2652d 2019-08-07 stsp oka.have_changes = 0;
6075 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
6076 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
6077 2db2652d 2019-08-07 stsp check_stage_ok, &oka, NULL, NULL);
6079 735ef5ac 2019-08-03 stsp goto done;
6081 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
6082 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
6083 2db2652d 2019-08-07 stsp goto done;
6086 2db2652d 2019-08-07 stsp spa.worktree = worktree;
6087 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
6088 2db2652d 2019-08-07 stsp spa.repo = repo;
6089 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
6090 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
6091 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
6092 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
6093 7b5dc508 2019-10-28 stsp spa.staged_something = 0;
6094 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
6095 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
6096 2db2652d 2019-08-07 stsp stage_path, &spa, NULL, NULL);
6098 2db2652d 2019-08-07 stsp goto done;
6100 7b5dc508 2019-10-28 stsp if (!spa.staged_something) {
6101 7b5dc508 2019-10-28 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
6102 7b5dc508 2019-10-28 stsp goto done;
6105 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6106 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
6107 0cb83759 2019-08-03 stsp err = sync_err;
6109 735ef5ac 2019-08-03 stsp if (head_ref)
6110 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
6111 735ef5ac 2019-08-03 stsp free(head_commit_id);
6112 0cb83759 2019-08-03 stsp free(fileindex_path);
6113 0cb83759 2019-08-03 stsp if (fileindex)
6114 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
6115 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6116 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
6117 0cb83759 2019-08-03 stsp err = unlockerr;
6118 0cb83759 2019-08-03 stsp return err;
6121 ad493afc 2019-08-03 stsp struct unstage_path_arg {
6122 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
6123 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
6124 ad493afc 2019-08-03 stsp struct got_repository *repo;
6125 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
6126 ad493afc 2019-08-03 stsp void *progress_arg;
6127 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
6128 2e1f37b0 2019-08-08 stsp void *patch_arg;
6131 2e1f37b0 2019-08-08 stsp static const struct got_error *
6132 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
6133 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
6134 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
6135 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
6136 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
6138 2e1f37b0 2019-08-08 stsp const struct got_error *err;
6139 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
6140 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
6141 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
6142 2e1f37b0 2019-08-08 stsp struct stat sb1, sb2;
6143 2e1f37b0 2019-08-08 stsp struct got_diff_changes *changes = NULL;
6144 2e1f37b0 2019-08-08 stsp struct got_diff_state *ds = NULL;
6145 2e1f37b0 2019-08-08 stsp struct got_diff_args *args = NULL;
6146 2e1f37b0 2019-08-08 stsp struct got_diff_change *change;
6147 2e1f37b0 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, n = 0;
6148 2e1f37b0 2019-08-08 stsp int have_content = 0, have_rejected_content = 0;
6150 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
6151 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
6153 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
6155 2e1f37b0 2019-08-08 stsp return err;
6156 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
6158 2e1f37b0 2019-08-08 stsp goto done;
6160 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
6162 2e1f37b0 2019-08-08 stsp goto done;
6164 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
6166 2e1f37b0 2019-08-08 stsp goto done;
6168 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
6170 2e1f37b0 2019-08-08 stsp goto done;
6172 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
6174 2e1f37b0 2019-08-08 stsp goto done;
6176 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
6178 2e1f37b0 2019-08-08 stsp goto done;
6180 2e1f37b0 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
6181 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
6182 2e1f37b0 2019-08-08 stsp goto done;
6185 2e1f37b0 2019-08-08 stsp if (stat(path2, &sb2) == -1) {
6186 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path2);
6187 2e1f37b0 2019-08-08 stsp goto done;
6190 2e1f37b0 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
6191 2e1f37b0 2019-08-08 stsp f1, sb1.st_size, label1, f2, sb2.st_size, path2, 3, NULL);
6193 2e1f37b0 2019-08-08 stsp goto done;
6195 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
6196 2e1f37b0 2019-08-08 stsp "got-unstaged-content");
6198 2e1f37b0 2019-08-08 stsp goto done;
6199 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
6200 2e1f37b0 2019-08-08 stsp "got-new-staged-content");
6202 2e1f37b0 2019-08-08 stsp goto done;
6204 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
6205 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
6206 2e1f37b0 2019-08-08 stsp goto done;
6208 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
6209 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
6210 2e1f37b0 2019-08-08 stsp goto done;
6212 2e1f37b0 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
6213 2e1f37b0 2019-08-08 stsp int choice;
6214 2e1f37b0 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
6215 2e1f37b0 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
6216 2e1f37b0 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
6217 2e1f37b0 2019-08-08 stsp outfile, rejectfile, patch_cb, patch_arg);
6219 2e1f37b0 2019-08-08 stsp goto done;
6220 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
6221 2e1f37b0 2019-08-08 stsp have_content = 1;
6223 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
6224 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
6227 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
6228 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
6229 f1e81a05 2019-08-10 stsp outfile, rejectfile);
6231 2e1f37b0 2019-08-08 stsp free(label1);
6233 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
6234 2e1f37b0 2019-08-08 stsp if (staged_blob)
6235 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
6236 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
6237 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
6238 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
6239 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
6240 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
6241 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
6242 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
6243 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
6244 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
6245 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
6246 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
6247 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
6248 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
6249 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
6250 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
6251 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
6252 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
6253 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
6254 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
6256 2e1f37b0 2019-08-08 stsp if (err || !have_rejected_content) {
6257 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
6258 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
6259 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
6260 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
6261 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
6262 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
6264 2e1f37b0 2019-08-08 stsp free(args);
6266 2e1f37b0 2019-08-08 stsp got_diff_state_free(ds);
6269 2e1f37b0 2019-08-08 stsp if (changes)
6270 2e1f37b0 2019-08-08 stsp got_diff_free_changes(changes);
6271 2e1f37b0 2019-08-08 stsp free(path1);
6272 2e1f37b0 2019-08-08 stsp free(path2);
6273 2e1f37b0 2019-08-08 stsp return err;
6276 ad493afc 2019-08-03 stsp static const struct got_error *
6277 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
6278 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
6279 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6280 ad493afc 2019-08-03 stsp struct got_object_id *commit_id)
6282 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
6283 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
6284 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
6285 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
6286 2e1f37b0 2019-08-08 stsp char *ondisk_path = NULL, *path_unstaged_content = NULL;
6287 2e1f37b0 2019-08-08 stsp char *path_new_staged_content = NULL;
6288 f69721c3 2019-10-21 stsp char *id_str = NULL, *label_orig = NULL;
6289 ad493afc 2019-08-03 stsp int local_changes_subsumed;
6290 9bc94a15 2019-08-03 stsp struct stat sb;
6292 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
6293 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
6294 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
6295 2e1f37b0 2019-08-08 stsp return NULL;
6297 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
6298 ad493afc 2019-08-03 stsp if (ie == NULL)
6299 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
6301 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
6303 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
6305 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str,
6306 f69721c3 2019-10-21 stsp commit_id ? commit_id : a->worktree->base_commit_id);
6308 f69721c3 2019-10-21 stsp goto done;
6309 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
6310 f69721c3 2019-10-21 stsp id_str) == -1) {
6311 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
6312 f69721c3 2019-10-21 stsp goto done;
6315 ad493afc 2019-08-03 stsp switch (staged_status) {
6316 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
6317 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
6318 ad493afc 2019-08-03 stsp blob_id, 8192);
6321 ad493afc 2019-08-03 stsp /* fall through */
6322 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
6323 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
6324 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
6325 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
6326 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
6327 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
6330 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
6333 2e1f37b0 2019-08-08 stsp err = create_unstaged_content(
6334 2e1f37b0 2019-08-08 stsp &path_unstaged_content,
6335 2e1f37b0 2019-08-08 stsp &path_new_staged_content, blob_id,
6336 2e1f37b0 2019-08-08 stsp staged_blob_id, ie->path, a->repo,
6337 2e1f37b0 2019-08-08 stsp a->patch_cb, a->patch_arg);
6338 2e1f37b0 2019-08-08 stsp if (err || path_unstaged_content == NULL)
6340 2e1f37b0 2019-08-08 stsp if (path_new_staged_content) {
6341 2e1f37b0 2019-08-08 stsp err = got_object_blob_create(
6342 2e1f37b0 2019-08-08 stsp &staged_blob_id,
6343 2e1f37b0 2019-08-08 stsp path_new_staged_content,
6347 2e1f37b0 2019-08-08 stsp memcpy(ie->staged_blob_sha1,
6348 2e1f37b0 2019-08-08 stsp staged_blob_id->sha1,
6349 2e1f37b0 2019-08-08 stsp SHA1_DIGEST_LENGTH);
6351 2e1f37b0 2019-08-08 stsp err = merge_file(&local_changes_subsumed,
6352 2e1f37b0 2019-08-08 stsp a->worktree, blob_base, ondisk_path,
6353 2e1f37b0 2019-08-08 stsp relpath, got_fileindex_perms_to_st(ie),
6354 f69721c3 2019-10-21 stsp path_unstaged_content, label_orig,
6355 f69721c3 2019-10-21 stsp "unstaged", a->repo, a->progress_cb,
6356 f69721c3 2019-10-21 stsp a->progress_arg);
6357 2e1f37b0 2019-08-08 stsp if (err == NULL &&
6358 2e1f37b0 2019-08-08 stsp path_new_staged_content == NULL)
6359 2e1f37b0 2019-08-08 stsp got_fileindex_entry_stage_set(ie,
6360 2e1f37b0 2019-08-08 stsp GOT_FILEIDX_STAGE_NONE);
6361 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
6364 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
6365 ad493afc 2019-08-03 stsp staged_blob_id, 8192);
6368 ad493afc 2019-08-03 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
6369 ad493afc 2019-08-03 stsp blob_base, ondisk_path, relpath,
6370 f69721c3 2019-10-21 stsp got_fileindex_perms_to_st(ie), label_orig, blob_staged,
6371 ad493afc 2019-08-03 stsp commit_id ? commit_id : a->worktree->base_commit_id,
6372 ad493afc 2019-08-03 stsp a->repo, a->progress_cb, a->progress_arg);
6373 ad493afc 2019-08-03 stsp if (err == NULL)
6374 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
6375 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
6377 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
6378 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
6379 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
6380 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
6381 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
6384 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
6386 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
6387 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
6391 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
6392 9bc94a15 2019-08-03 stsp err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
6395 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
6399 ad493afc 2019-08-03 stsp free(ondisk_path);
6400 2e1f37b0 2019-08-08 stsp if (path_unstaged_content &&
6401 2e1f37b0 2019-08-08 stsp unlink(path_unstaged_content) == -1 && err == NULL)
6402 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
6403 2e1f37b0 2019-08-08 stsp if (path_new_staged_content &&
6404 2e1f37b0 2019-08-08 stsp unlink(path_new_staged_content) == -1 && err == NULL)
6405 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
6406 2e1f37b0 2019-08-08 stsp free(path_unstaged_content);
6407 2e1f37b0 2019-08-08 stsp free(path_new_staged_content);
6408 ad493afc 2019-08-03 stsp if (blob_base)
6409 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
6410 ad493afc 2019-08-03 stsp if (blob_staged)
6411 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
6412 f69721c3 2019-10-21 stsp free(id_str);
6413 f69721c3 2019-10-21 stsp free(label_orig);
6414 ad493afc 2019-08-03 stsp return err;
6417 ad493afc 2019-08-03 stsp const struct got_error *
6418 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
6419 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
6420 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6421 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
6422 ad493afc 2019-08-03 stsp struct got_repository *repo)
6424 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
6425 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
6426 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
6427 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
6428 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
6430 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
6432 ad493afc 2019-08-03 stsp return err;
6434 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
6436 ad493afc 2019-08-03 stsp goto done;
6438 ad493afc 2019-08-03 stsp upa.worktree = worktree;
6439 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
6440 ad493afc 2019-08-03 stsp upa.repo = repo;
6441 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
6442 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
6443 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
6444 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
6445 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
6446 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
6447 ad493afc 2019-08-03 stsp unstage_path, &upa, NULL, NULL);
6449 ad493afc 2019-08-03 stsp goto done;
6452 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6453 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
6454 ad493afc 2019-08-03 stsp err = sync_err;
6456 ad493afc 2019-08-03 stsp free(fileindex_path);
6457 ad493afc 2019-08-03 stsp if (fileindex)
6458 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
6459 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6460 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
6461 ad493afc 2019-08-03 stsp err = unlockerr;
6462 ad493afc 2019-08-03 stsp return err;
