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 99724ed4 2018-03-10 stsp static const struct got_error *
64 7ac97322 2018-03-11 stsp create_meta_file(const char *path_got, const char *name, const char *content)
66 99724ed4 2018-03-10 stsp const struct got_error *err = NULL;
69 2c7829a4 2019-06-17 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1)
70 2c7829a4 2019-06-17 stsp return got_error_from_errno("asprintf");
72 2c7829a4 2019-06-17 stsp err = got_path_create_file(path, content);
77 507dc3bb 2018-12-29 stsp static const struct got_error *
78 507dc3bb 2018-12-29 stsp update_meta_file(const char *path_got, const char *name, const char *content)
80 507dc3bb 2018-12-29 stsp const struct got_error *err = NULL;
81 507dc3bb 2018-12-29 stsp FILE *tmpfile = NULL;
82 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
83 507dc3bb 2018-12-29 stsp char *path = NULL;
85 507dc3bb 2018-12-29 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
86 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
87 507dc3bb 2018-12-29 stsp path = NULL;
91 507dc3bb 2018-12-29 stsp err = got_opentemp_named(&tmppath, &tmpfile, path);
95 507dc3bb 2018-12-29 stsp if (content) {
96 507dc3bb 2018-12-29 stsp int len = fprintf(tmpfile, "%s\n", content);
97 507dc3bb 2018-12-29 stsp if (len != strlen(content) + 1) {
98 638f9024 2019-05-13 stsp err = got_error_from_errno2("fprintf", tmppath);
103 507dc3bb 2018-12-29 stsp if (rename(tmppath, path) != 0) {
104 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath, path);
105 2a57020b 2019-02-20 stsp unlink(tmppath);
110 fb43ecf1 2019-02-11 stsp if (fclose(tmpfile) != 0 && err == NULL)
111 638f9024 2019-05-13 stsp err = got_error_from_errno2("fclose", tmppath);
112 230a42bd 2019-05-11 jcs free(tmppath);
113 99724ed4 2018-03-10 stsp return err;
116 09fe317a 2018-03-11 stsp static const struct got_error *
117 7ac97322 2018-03-11 stsp read_meta_file(char **content, const char *path_got, const char *name)
119 09fe317a 2018-03-11 stsp const struct got_error *err = NULL;
120 09fe317a 2018-03-11 stsp char *path;
121 09fe317a 2018-03-11 stsp int fd = -1;
123 09fe317a 2018-03-11 stsp struct stat sb;
125 09fe317a 2018-03-11 stsp *content = NULL;
127 7ac97322 2018-03-11 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
128 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
129 09fe317a 2018-03-11 stsp path = NULL;
133 ef99fdb1 2018-03-11 stsp fd = open(path, O_RDONLY | O_NOFOLLOW);
134 09fe317a 2018-03-11 stsp if (fd == -1) {
135 f02eaa22 2019-03-11 stsp if (errno == ENOENT)
136 a2e6d162 2019-07-27 stsp err = got_error_path(path, GOT_ERR_WORKTREE_META);
138 638f9024 2019-05-13 stsp err = got_error_from_errno2("open", path);
141 ef99fdb1 2018-03-11 stsp if (flock(fd, LOCK_SH | LOCK_NB) == -1) {
142 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
143 638f9024 2019-05-13 stsp : got_error_from_errno2("flock", path));
147 e4b9a50c 2019-07-27 stsp if (fstat(fd, &sb) != 0) {
148 e4b9a50c 2019-07-27 stsp err = got_error_from_errno2("fstat", path);
151 09fe317a 2018-03-11 stsp *content = calloc(1, sb.st_size);
152 09fe317a 2018-03-11 stsp if (*content == NULL) {
153 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
157 09fe317a 2018-03-11 stsp n = read(fd, *content, sb.st_size);
158 09fe317a 2018-03-11 stsp if (n != sb.st_size) {
159 638f9024 2019-05-13 stsp err = (n == -1 ? got_error_from_errno2("read", path) :
160 a2e6d162 2019-07-27 stsp got_error_path(path, GOT_ERR_WORKTREE_META));
163 09fe317a 2018-03-11 stsp if ((*content)[sb.st_size - 1] != '\n') {
164 a2e6d162 2019-07-27 stsp err = got_error_path(path, GOT_ERR_WORKTREE_META);
167 09fe317a 2018-03-11 stsp (*content)[sb.st_size - 1] = '\0';
170 09fe317a 2018-03-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
171 638f9024 2019-05-13 stsp err = got_error_from_errno2("close", path_got);
172 09fe317a 2018-03-11 stsp free(path);
174 09fe317a 2018-03-11 stsp free(*content);
175 09fe317a 2018-03-11 stsp *content = NULL;
177 09fe317a 2018-03-11 stsp return err;
180 024e9686 2019-05-14 stsp static const struct got_error *
181 024e9686 2019-05-14 stsp write_head_ref(const char *path_got, struct got_reference *head_ref)
183 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
184 024e9686 2019-05-14 stsp char *refstr = NULL;
186 024e9686 2019-05-14 stsp if (got_ref_is_symbolic(head_ref)) {
187 024e9686 2019-05-14 stsp refstr = got_ref_to_str(head_ref);
188 024e9686 2019-05-14 stsp if (refstr == NULL)
189 024e9686 2019-05-14 stsp return got_error_from_errno("got_ref_to_str");
191 024e9686 2019-05-14 stsp refstr = strdup(got_ref_get_name(head_ref));
192 024e9686 2019-05-14 stsp if (refstr == NULL)
193 024e9686 2019-05-14 stsp return got_error_from_errno("strdup");
195 024e9686 2019-05-14 stsp err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
196 024e9686 2019-05-14 stsp free(refstr);
197 024e9686 2019-05-14 stsp return err;
200 86c3caaf 2018-03-09 stsp const struct got_error *
201 86c3caaf 2018-03-09 stsp got_worktree_init(const char *path, struct got_reference *head_ref,
202 577ec78f 2018-03-11 stsp const char *prefix, struct got_repository *repo)
204 86c3caaf 2018-03-09 stsp const struct got_error *err = NULL;
205 65596e15 2018-12-24 stsp struct got_object_id *commit_id = NULL;
206 ec22038e 2019-03-10 stsp uuid_t uuid;
207 ec22038e 2019-03-10 stsp uint32_t uuid_status;
208 65596e15 2018-12-24 stsp int obj_type;
209 7ac97322 2018-03-11 stsp char *path_got = NULL;
210 1451e70d 2018-03-10 stsp char *formatstr = NULL;
211 0bb8a95e 2018-03-12 stsp char *absprefix = NULL;
212 65596e15 2018-12-24 stsp char *basestr = NULL;
213 ec22038e 2019-03-10 stsp char *uuidstr = NULL;
215 0c48fee2 2019-03-11 stsp if (strcmp(path, got_repo_get_path(repo)) == 0) {
216 0c48fee2 2019-03-11 stsp err = got_error(GOT_ERR_WORKTREE_REPO);
220 65596e15 2018-12-24 stsp err = got_ref_resolve(&commit_id, repo, head_ref);
222 65596e15 2018-12-24 stsp return err;
223 65596e15 2018-12-24 stsp err = got_object_get_type(&obj_type, repo, commit_id);
225 65596e15 2018-12-24 stsp return err;
226 65596e15 2018-12-24 stsp if (obj_type != GOT_OBJ_TYPE_COMMIT)
227 65596e15 2018-12-24 stsp return got_error(GOT_ERR_OBJ_TYPE);
229 0bb8a95e 2018-03-12 stsp if (!got_path_is_absolute(prefix)) {
230 0bb8a95e 2018-03-12 stsp if (asprintf(&absprefix, "/%s", prefix) == -1)
231 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
234 86c3caaf 2018-03-09 stsp /* Create top-level directory (may already exist). */
235 2cb4bacb 2018-03-11 stsp if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
236 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path);
240 86c3caaf 2018-03-09 stsp /* Create .got directory (may already exist). */
241 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
242 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
245 7ac97322 2018-03-11 stsp if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
246 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path_got);
250 056e7441 2018-03-11 stsp /* Create an empty lock file. */
251 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
255 86c3caaf 2018-03-09 stsp /* Create an empty file index. */
256 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
260 08d425ea 2018-12-24 stsp /* Write the HEAD reference. */
261 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
265 65596e15 2018-12-24 stsp /* Record our base commit. */
266 65596e15 2018-12-24 stsp err = got_object_id_str(&basestr, commit_id);
269 0f92850e 2018-12-25 stsp err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
273 1451e70d 2018-03-10 stsp /* Store path to repository. */
274 7839bc15 2019-01-06 stsp err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
275 7839bc15 2019-01-06 stsp got_repo_get_path(repo));
279 577ec78f 2018-03-11 stsp /* Store in-repository path prefix. */
280 0bb8a95e 2018-03-12 stsp err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
281 0bb8a95e 2018-03-12 stsp absprefix ? absprefix : prefix);
285 ec22038e 2019-03-10 stsp /* Generate UUID. */
286 ec22038e 2019-03-10 stsp uuid_create(&uuid, &uuid_status);
287 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
288 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_create");
291 ec22038e 2019-03-10 stsp uuid_to_string(&uuid, &uuidstr, &uuid_status);
292 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
293 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_to_string");
296 ec22038e 2019-03-10 stsp err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
300 9dce68ed 2018-03-10 stsp /* Stamp work tree with format file. */
301 1451e70d 2018-03-10 stsp if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
302 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
305 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
310 65596e15 2018-12-24 stsp free(commit_id);
311 7ac97322 2018-03-11 stsp free(path_got);
312 1451e70d 2018-03-10 stsp free(formatstr);
313 0bb8a95e 2018-03-12 stsp free(absprefix);
314 65596e15 2018-12-24 stsp free(basestr);
315 ec22038e 2019-03-10 stsp free(uuidstr);
316 86c3caaf 2018-03-09 stsp return err;
319 247140b2 2019-02-05 stsp static const struct got_error *
320 247140b2 2019-02-05 stsp open_worktree(struct got_worktree **worktree, const char *path)
322 6d9d28c3 2018-03-11 stsp const struct got_error *err = NULL;
323 7ac97322 2018-03-11 stsp char *path_got;
324 6d9d28c3 2018-03-11 stsp char *formatstr = NULL;
325 c442a90d 2019-03-10 stsp char *uuidstr = NULL;
326 056e7441 2018-03-11 stsp char *path_lock = NULL;
327 eaccb85f 2018-12-25 stsp char *base_commit_id_str = NULL;
328 6d9d28c3 2018-03-11 stsp int version, fd = -1;
329 6d9d28c3 2018-03-11 stsp const char *errstr;
330 eaccb85f 2018-12-25 stsp struct got_repository *repo = NULL;
331 c442a90d 2019-03-10 stsp uint32_t uuid_status;
333 6d9d28c3 2018-03-11 stsp *worktree = NULL;
335 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
336 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
337 7ac97322 2018-03-11 stsp path_got = NULL;
341 7ac97322 2018-03-11 stsp if (asprintf(&path_lock, "%s/%s", path_got, GOT_WORKTREE_LOCK) == -1) {
342 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
343 056e7441 2018-03-11 stsp path_lock = NULL;
347 056e7441 2018-03-11 stsp fd = open(path_lock, O_RDWR | O_EXLOCK | O_NONBLOCK);
348 6d9d28c3 2018-03-11 stsp if (fd == -1) {
349 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
350 638f9024 2019-05-13 stsp : got_error_from_errno2("open", path_lock));
354 7ac97322 2018-03-11 stsp err = read_meta_file(&formatstr, path_got, GOT_WORKTREE_FORMAT);
358 6d9d28c3 2018-03-11 stsp version = strtonum(formatstr, 1, INT_MAX, &errstr);
359 6d9d28c3 2018-03-11 stsp if (errstr) {
360 a2e6d162 2019-07-27 stsp err = got_error_msg(GOT_ERR_WORKTREE_META,
361 a2e6d162 2019-07-27 stsp "could not parse work tree format version number");
364 6d9d28c3 2018-03-11 stsp if (version != GOT_WORKTREE_FORMAT_VERSION) {
365 6d9d28c3 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_VERS);
369 6d9d28c3 2018-03-11 stsp *worktree = calloc(1, sizeof(**worktree));
370 6d9d28c3 2018-03-11 stsp if (*worktree == NULL) {
371 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
374 056e7441 2018-03-11 stsp (*worktree)->lockfd = -1;
376 0647c563 2019-03-11 stsp (*worktree)->root_path = strdup(path);
377 c88eb298 2018-03-11 stsp if ((*worktree)->root_path == NULL) {
378 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
381 cde76477 2018-03-11 stsp err = read_meta_file(&(*worktree)->repo_path, path_got,
382 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_REPOSITORY);
386 7ac97322 2018-03-11 stsp err = read_meta_file(&(*worktree)->path_prefix, path_got,
387 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_PATH_PREFIX);
391 eaccb85f 2018-12-25 stsp err = read_meta_file(&base_commit_id_str, path_got,
392 0f92850e 2018-12-25 stsp GOT_WORKTREE_BASE_COMMIT);
396 c442a90d 2019-03-10 stsp err = read_meta_file(&uuidstr, path_got, GOT_WORKTREE_UUID);
399 c442a90d 2019-03-10 stsp uuid_from_string(uuidstr, &(*worktree)->uuid, &uuid_status);
400 c442a90d 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
401 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_from_string");
405 c9956ddf 2019-09-08 stsp err = got_repo_open(&repo, (*worktree)->repo_path, NULL);
409 eaccb85f 2018-12-25 stsp err = got_object_resolve_id_str(&(*worktree)->base_commit_id, repo,
410 eaccb85f 2018-12-25 stsp base_commit_id_str);
414 36a38700 2019-05-10 stsp err = read_meta_file(&(*worktree)->head_ref_name, path_got,
415 36a38700 2019-05-10 stsp GOT_WORKTREE_HEAD_REF);
418 eaccb85f 2018-12-25 stsp got_repo_close(repo);
419 7ac97322 2018-03-11 stsp free(path_got);
420 056e7441 2018-03-11 stsp free(path_lock);
421 eaccb85f 2018-12-25 stsp free(base_commit_id_str);
422 c442a90d 2019-03-10 stsp free(uuidstr);
423 bd165944 2019-03-10 stsp free(formatstr);
425 6d9d28c3 2018-03-11 stsp if (fd != -1)
427 6d9d28c3 2018-03-11 stsp if (*worktree != NULL)
428 6d9d28c3 2018-03-11 stsp got_worktree_close(*worktree);
429 6d9d28c3 2018-03-11 stsp *worktree = NULL;
431 056e7441 2018-03-11 stsp (*worktree)->lockfd = fd;
433 6d9d28c3 2018-03-11 stsp return err;
436 247140b2 2019-02-05 stsp const struct got_error *
437 247140b2 2019-02-05 stsp got_worktree_open(struct got_worktree **worktree, const char *path)
439 247140b2 2019-02-05 stsp const struct got_error *err = NULL;
442 247140b2 2019-02-05 stsp err = open_worktree(worktree, path);
443 f02eaa22 2019-03-11 stsp if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT))
444 247140b2 2019-02-05 stsp return err;
445 247140b2 2019-02-05 stsp if (*worktree)
446 247140b2 2019-02-05 stsp return NULL;
447 247140b2 2019-02-05 stsp path = dirname(path);
448 d1542a27 2019-02-05 stsp if (path == NULL)
449 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
450 d1542a27 2019-02-05 stsp } while (!((path[0] == '.' || path[0] == '/') && path[1] == '\0'));
452 247140b2 2019-02-05 stsp return got_error(GOT_ERR_NOT_WORKTREE);
455 3a6ce05a 2019-02-11 stsp const struct got_error *
456 86c3caaf 2018-03-09 stsp got_worktree_close(struct got_worktree *worktree)
458 3a6ce05a 2019-02-11 stsp const struct got_error *err = NULL;
459 cde76477 2018-03-11 stsp free(worktree->repo_path);
460 6d9d28c3 2018-03-11 stsp free(worktree->path_prefix);
461 eaccb85f 2018-12-25 stsp free(worktree->base_commit_id);
462 36a38700 2019-05-10 stsp free(worktree->head_ref_name);
463 056e7441 2018-03-11 stsp if (worktree->lockfd != -1)
464 3a6ce05a 2019-02-11 stsp if (close(worktree->lockfd) != 0)
465 638f9024 2019-05-13 stsp err = got_error_from_errno2("close",
466 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree));
467 7f11502c 2019-08-28 hiltjo free(worktree->root_path);
468 6d9d28c3 2018-03-11 stsp free(worktree);
469 3a6ce05a 2019-02-11 stsp return err;
472 2fbdb5ae 2018-12-29 stsp const char *
473 c7f4312f 2019-02-05 stsp got_worktree_get_root_path(struct got_worktree *worktree)
475 c7f4312f 2019-02-05 stsp return worktree->root_path;
478 c7f4312f 2019-02-05 stsp const char *
479 86c3caaf 2018-03-09 stsp got_worktree_get_repo_path(struct got_worktree *worktree)
481 2fbdb5ae 2018-12-29 stsp return worktree->repo_path;
484 49520a32 2018-12-29 stsp const char *
485 49520a32 2018-12-29 stsp got_worktree_get_path_prefix(struct got_worktree *worktree)
487 f609be2e 2018-12-29 stsp return worktree->path_prefix;
490 e5dc7198 2018-12-29 stsp const struct got_error *
491 e5dc7198 2018-12-29 stsp got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
492 e5dc7198 2018-12-29 stsp const char *path_prefix)
494 e5dc7198 2018-12-29 stsp char *absprefix = NULL;
496 e5dc7198 2018-12-29 stsp if (!got_path_is_absolute(path_prefix)) {
497 e5dc7198 2018-12-29 stsp if (asprintf(&absprefix, "/%s", path_prefix) == -1)
498 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
500 e5dc7198 2018-12-29 stsp *match = (strcmp(absprefix ? absprefix : path_prefix,
501 e5dc7198 2018-12-29 stsp worktree->path_prefix) == 0);
502 e5dc7198 2018-12-29 stsp free(absprefix);
503 e5dc7198 2018-12-29 stsp return NULL;
506 bc70eb79 2019-05-09 stsp const char *
507 35be1456 2018-03-11 stsp got_worktree_get_head_ref_name(struct got_worktree *worktree)
509 36a38700 2019-05-10 stsp return worktree->head_ref_name;
512 024e9686 2019-05-14 stsp const struct got_error *
513 024e9686 2019-05-14 stsp got_worktree_set_head_ref(struct got_worktree *worktree,
514 024e9686 2019-05-14 stsp struct got_reference *head_ref)
516 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
517 024e9686 2019-05-14 stsp char *path_got = NULL, *head_ref_name = NULL;
519 024e9686 2019-05-14 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
520 024e9686 2019-05-14 stsp GOT_WORKTREE_GOT_DIR) == -1) {
521 024e9686 2019-05-14 stsp err = got_error_from_errno("asprintf");
522 024e9686 2019-05-14 stsp path_got = NULL;
526 024e9686 2019-05-14 stsp head_ref_name = strdup(got_ref_get_name(head_ref));
527 024e9686 2019-05-14 stsp if (head_ref_name == NULL) {
528 024e9686 2019-05-14 stsp err = got_error_from_errno("strdup");
532 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
536 024e9686 2019-05-14 stsp free(worktree->head_ref_name);
537 024e9686 2019-05-14 stsp worktree->head_ref_name = head_ref_name;
539 024e9686 2019-05-14 stsp free(path_got);
541 024e9686 2019-05-14 stsp free(head_ref_name);
542 024e9686 2019-05-14 stsp return err;
545 b72f483a 2019-02-05 stsp struct got_object_id *
546 507dc3bb 2018-12-29 stsp got_worktree_get_base_commit_id(struct got_worktree *worktree)
548 507dc3bb 2018-12-29 stsp return worktree->base_commit_id;
551 507dc3bb 2018-12-29 stsp const struct got_error *
552 507dc3bb 2018-12-29 stsp got_worktree_set_base_commit_id(struct got_worktree *worktree,
553 507dc3bb 2018-12-29 stsp struct got_repository *repo, struct got_object_id *commit_id)
555 507dc3bb 2018-12-29 stsp const struct got_error *err;
556 507dc3bb 2018-12-29 stsp struct got_object *obj = NULL;
557 507dc3bb 2018-12-29 stsp char *id_str = NULL;
558 507dc3bb 2018-12-29 stsp char *path_got = NULL;
560 507dc3bb 2018-12-29 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
561 507dc3bb 2018-12-29 stsp GOT_WORKTREE_GOT_DIR) == -1) {
562 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
563 507dc3bb 2018-12-29 stsp path_got = NULL;
567 507dc3bb 2018-12-29 stsp err = got_object_open(&obj, repo, commit_id);
569 507dc3bb 2018-12-29 stsp return err;
571 507dc3bb 2018-12-29 stsp if (obj->type != GOT_OBJ_TYPE_COMMIT) {
572 507dc3bb 2018-12-29 stsp err = got_error(GOT_ERR_OBJ_TYPE);
576 507dc3bb 2018-12-29 stsp /* Record our base commit. */
577 507dc3bb 2018-12-29 stsp err = got_object_id_str(&id_str, commit_id);
580 507dc3bb 2018-12-29 stsp err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
584 507dc3bb 2018-12-29 stsp free(worktree->base_commit_id);
585 507dc3bb 2018-12-29 stsp worktree->base_commit_id = got_object_id_dup(commit_id);
586 507dc3bb 2018-12-29 stsp if (worktree->base_commit_id == NULL) {
587 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
592 507dc3bb 2018-12-29 stsp got_object_close(obj);
593 507dc3bb 2018-12-29 stsp free(id_str);
594 507dc3bb 2018-12-29 stsp free(path_got);
595 507dc3bb 2018-12-29 stsp return err;
598 9d31a1d8 2018-03-11 stsp static const struct got_error *
599 9d31a1d8 2018-03-11 stsp lock_worktree(struct got_worktree *worktree, int operation)
601 9d31a1d8 2018-03-11 stsp if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
602 9d31a1d8 2018-03-11 stsp return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
603 638f9024 2019-05-13 stsp : got_error_from_errno2("flock",
604 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree)));
605 86c3caaf 2018-03-09 stsp return NULL;
608 21908da4 2019-01-13 stsp static const struct got_error *
609 4a1ddfc2 2019-01-12 stsp add_dir_on_disk(struct got_worktree *worktree, const char *path)
611 4a1ddfc2 2019-01-12 stsp const struct got_error *err = NULL;
612 4a1ddfc2 2019-01-12 stsp char *abspath;
614 4a1ddfc2 2019-01-12 stsp if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
615 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
617 0cd1c46a 2019-03-11 stsp err = got_path_mkdir(abspath);
618 ddcd8544 2019-03-11 stsp if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
619 ddcd8544 2019-03-11 stsp struct stat sb;
620 ddcd8544 2019-03-11 stsp err = NULL;
621 ddcd8544 2019-03-11 stsp if (lstat(abspath, &sb) == -1) {
622 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
623 ddcd8544 2019-03-11 stsp } else if (!S_ISDIR(sb.st_mode)) {
624 ddcd8544 2019-03-11 stsp /* TODO directory is obstructed; do something */
625 ddcd8544 2019-03-11 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
628 4a1ddfc2 2019-01-12 stsp free(abspath);
629 68c76935 2019-02-19 stsp return err;
632 68c76935 2019-02-19 stsp static const struct got_error *
633 68c76935 2019-02-19 stsp check_file_contents_equal(int *same, FILE *f1, FILE *f2)
635 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
636 68c76935 2019-02-19 stsp uint8_t fbuf1[8192];
637 68c76935 2019-02-19 stsp uint8_t fbuf2[8192];
638 68c76935 2019-02-19 stsp size_t flen1 = 0, flen2 = 0;
643 68c76935 2019-02-19 stsp flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
644 68c76935 2019-02-19 stsp if (flen1 == 0 && ferror(f1)) {
645 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
648 68c76935 2019-02-19 stsp flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
649 68c76935 2019-02-19 stsp if (flen2 == 0 && ferror(f2)) {
650 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
653 68c76935 2019-02-19 stsp if (flen1 == 0) {
654 68c76935 2019-02-19 stsp if (flen2 != 0)
657 68c76935 2019-02-19 stsp } else if (flen2 == 0) {
658 68c76935 2019-02-19 stsp if (flen1 != 0)
661 68c76935 2019-02-19 stsp } else if (flen1 == flen2) {
662 68c76935 2019-02-19 stsp if (memcmp(fbuf1, fbuf2, flen2) != 0) {
672 68c76935 2019-02-19 stsp return err;
675 68c76935 2019-02-19 stsp static const struct got_error *
676 68c76935 2019-02-19 stsp check_files_equal(int *same, const char *f1_path, const char *f2_path)
678 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
679 68c76935 2019-02-19 stsp struct stat sb;
680 68c76935 2019-02-19 stsp size_t size1, size2;
681 68c76935 2019-02-19 stsp FILE *f1 = NULL, *f2 = NULL;
685 68c76935 2019-02-19 stsp if (lstat(f1_path, &sb) != 0) {
686 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", f1_path);
689 68c76935 2019-02-19 stsp size1 = sb.st_size;
691 68c76935 2019-02-19 stsp if (lstat(f2_path, &sb) != 0) {
692 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", f2_path);
695 68c76935 2019-02-19 stsp size2 = sb.st_size;
697 68c76935 2019-02-19 stsp if (size1 != size2) {
699 68c76935 2019-02-19 stsp return NULL;
702 68c76935 2019-02-19 stsp f1 = fopen(f1_path, "r");
703 68c76935 2019-02-19 stsp if (f1 == NULL)
704 638f9024 2019-05-13 stsp return got_error_from_errno2("open", f1_path);
706 68c76935 2019-02-19 stsp f2 = fopen(f2_path, "r");
707 68c76935 2019-02-19 stsp if (f2 == NULL) {
708 638f9024 2019-05-13 stsp err = got_error_from_errno2("open", f2_path);
712 68c76935 2019-02-19 stsp err = check_file_contents_equal(same, f1, f2);
714 68c76935 2019-02-19 stsp if (f1 && fclose(f1) != 0 && err == NULL)
715 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
716 68c76935 2019-02-19 stsp if (f2 && fclose(f2) != 0 && err == NULL)
717 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
719 6353ad76 2019-02-08 stsp return err;
723 46b6ee73 2019-06-04 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
724 14c901f1 2019-08-08 stsp * the file at deriv_path acts as the first derived version, and the
725 14c901f1 2019-08-08 stsp * file on disk acts as the second derived version.
727 6353ad76 2019-02-08 stsp static const struct got_error *
728 14c901f1 2019-08-08 stsp merge_file(int *local_changes_subsumed, struct got_worktree *worktree,
729 46b6ee73 2019-06-04 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
730 14c901f1 2019-08-08 stsp const char *path, uint16_t st_mode, const char *deriv_path,
731 14c901f1 2019-08-08 stsp const char *label_deriv, struct got_repository *repo,
732 14c901f1 2019-08-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
734 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
735 6353ad76 2019-02-08 stsp int merged_fd = -1;
736 14c901f1 2019-08-08 stsp FILE *f_orig = NULL;
737 14c901f1 2019-08-08 stsp char *blob_orig_path = NULL;
738 af54ae4a 2019-02-19 stsp char *merged_path = NULL, *base_path = NULL;
739 234035bc 2019-06-01 stsp int overlapcnt = 0;
740 af54ae4a 2019-02-19 stsp char *parent;
742 234035bc 2019-06-01 stsp *local_changes_subsumed = 0;
744 af54ae4a 2019-02-19 stsp parent = dirname(ondisk_path);
745 af54ae4a 2019-02-19 stsp if (parent == NULL)
746 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", ondisk_path);
748 af54ae4a 2019-02-19 stsp if (asprintf(&base_path, "%s/got-merged", parent) == -1)
749 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
751 af54ae4a 2019-02-19 stsp err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
755 af54ae4a 2019-02-19 stsp free(base_path);
756 46b6ee73 2019-06-04 stsp if (asprintf(&base_path, "%s/got-merge-blob-orig", parent) == -1) {
757 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
758 af54ae4a 2019-02-19 stsp base_path = NULL;
762 46b6ee73 2019-06-04 stsp err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
765 46b6ee73 2019-06-04 stsp if (blob_orig) {
766 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
767 46b6ee73 2019-06-04 stsp blob_orig);
772 1430b4e0 2019-03-27 stsp * If the file has no blob, this is an "add vs add" conflict,
773 1430b4e0 2019-03-27 stsp * and we simply use an empty ancestor file to make both files
774 1430b4e0 2019-03-27 stsp * appear in the merged result in their entirety.
778 14c901f1 2019-08-08 stsp err = got_merge_diff3(&overlapcnt, merged_fd, deriv_path,
779 818c7501 2019-07-11 stsp blob_orig_path, ondisk_path, label_deriv, path);
783 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
784 6353ad76 2019-02-08 stsp overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
788 816dc654 2019-02-16 stsp if (fsync(merged_fd) != 0) {
789 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
793 68c76935 2019-02-19 stsp /* Check if a clean merge has subsumed all local changes. */
794 68c76935 2019-02-19 stsp if (overlapcnt == 0) {
795 14c901f1 2019-08-08 stsp err = check_files_equal(local_changes_subsumed, deriv_path,
796 68c76935 2019-02-19 stsp merged_path);
801 70a0c8ec 2019-02-20 stsp if (chmod(merged_path, st_mode) != 0) {
802 638f9024 2019-05-13 stsp err = got_error_from_errno2("chmod", merged_path);
806 6353ad76 2019-02-08 stsp if (rename(merged_path, ondisk_path) != 0) {
807 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", merged_path,
808 230a42bd 2019-05-11 jcs ondisk_path);
809 2a57020b 2019-02-20 stsp unlink(merged_path);
814 3a6ce05a 2019-02-11 stsp if (merged_fd != -1 && close(merged_fd) != 0 && err == NULL)
815 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
816 46b6ee73 2019-06-04 stsp if (f_orig && fclose(f_orig) != 0 && err == NULL)
817 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
818 6353ad76 2019-02-08 stsp free(merged_path);
819 af54ae4a 2019-02-19 stsp free(base_path);
820 46b6ee73 2019-06-04 stsp if (blob_orig_path) {
821 46b6ee73 2019-06-04 stsp unlink(blob_orig_path);
822 46b6ee73 2019-06-04 stsp free(blob_orig_path);
824 14c901f1 2019-08-08 stsp return err;
828 14c901f1 2019-08-08 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
829 14c901f1 2019-08-08 stsp * blob_deriv acts as the first derived version, and the file on disk
830 14c901f1 2019-08-08 stsp * acts as the second derived version.
832 14c901f1 2019-08-08 stsp static const struct got_error *
833 14c901f1 2019-08-08 stsp merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
834 14c901f1 2019-08-08 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
835 14c901f1 2019-08-08 stsp const char *path, uint16_t st_mode, struct got_blob_object *blob_deriv,
836 14c901f1 2019-08-08 stsp struct got_object_id *deriv_base_commit_id,
837 14c901f1 2019-08-08 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
838 14c901f1 2019-08-08 stsp void *progress_arg)
840 14c901f1 2019-08-08 stsp const struct got_error *err = NULL;
841 14c901f1 2019-08-08 stsp FILE *f_deriv = NULL;
842 14c901f1 2019-08-08 stsp char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
843 14c901f1 2019-08-08 stsp char *label_deriv = NULL, *parent;
845 14c901f1 2019-08-08 stsp *local_changes_subsumed = 0;
847 14c901f1 2019-08-08 stsp parent = dirname(ondisk_path);
848 14c901f1 2019-08-08 stsp if (parent == NULL)
849 14c901f1 2019-08-08 stsp return got_error_from_errno2("dirname", ondisk_path);
851 14c901f1 2019-08-08 stsp free(base_path);
852 14c901f1 2019-08-08 stsp if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
853 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
854 14c901f1 2019-08-08 stsp base_path = NULL;
858 14c901f1 2019-08-08 stsp err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
861 14c901f1 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
862 14c901f1 2019-08-08 stsp blob_deriv);
866 14c901f1 2019-08-08 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
869 14c901f1 2019-08-08 stsp if (asprintf(&label_deriv, "commit %s", id_str) == -1) {
870 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
874 14c901f1 2019-08-08 stsp err = merge_file(local_changes_subsumed, worktree, blob_orig,
875 14c901f1 2019-08-08 stsp ondisk_path, path, st_mode, blob_deriv_path, label_deriv,
876 14c901f1 2019-08-08 stsp repo, progress_cb, progress_arg);
878 14c901f1 2019-08-08 stsp if (f_deriv && fclose(f_deriv) != 0 && err == NULL)
879 14c901f1 2019-08-08 stsp err = got_error_from_errno("fclose");
880 14c901f1 2019-08-08 stsp free(base_path);
881 14c901f1 2019-08-08 stsp if (blob_deriv_path) {
882 14c901f1 2019-08-08 stsp unlink(blob_deriv_path);
883 14c901f1 2019-08-08 stsp free(blob_deriv_path);
885 6353ad76 2019-02-08 stsp free(id_str);
886 818c7501 2019-07-11 stsp free(label_deriv);
887 4a1ddfc2 2019-01-12 stsp return err;
890 4a1ddfc2 2019-01-12 stsp static const struct got_error *
891 13d9040b 2019-03-27 stsp update_blob_fileindex_entry(struct got_worktree *worktree,
892 13d9040b 2019-03-27 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
893 13d9040b 2019-03-27 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
894 13d9040b 2019-03-27 stsp int update_timestamps)
896 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
898 13d9040b 2019-03-27 stsp if (ie == NULL)
899 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
901 13d9040b 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path,
902 13d9040b 2019-03-27 stsp blob->id.sha1, worktree->base_commit_id->sha1,
903 13d9040b 2019-03-27 stsp update_timestamps);
905 13d9040b 2019-03-27 stsp struct got_fileindex_entry *new_ie;
906 13d9040b 2019-03-27 stsp err = got_fileindex_entry_alloc(&new_ie, ondisk_path,
907 13d9040b 2019-03-27 stsp path, blob->id.sha1, worktree->base_commit_id->sha1);
909 13d9040b 2019-03-27 stsp err = got_fileindex_entry_add(fileindex, new_ie);
911 13d9040b 2019-03-27 stsp return err;
914 13d9040b 2019-03-27 stsp static const struct got_error *
915 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
916 4b55f459 2019-09-08 stsp const char *path, uint16_t te_mode, uint16_t st_mode,
917 4b55f459 2019-09-08 stsp struct got_blob_object *blob, int restoring_missing_file,
918 4b55f459 2019-09-08 stsp int reverting_versioned_file, struct got_repository *repo,
919 4b55f459 2019-09-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
921 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
922 507dc3bb 2018-12-29 stsp int fd = -1;
923 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
924 507dc3bb 2018-12-29 stsp int update = 0;
925 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
927 c34b20a2 2018-03-12 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
928 9d31a1d8 2018-03-11 stsp GOT_DEFAULT_FILE_MODE);
929 9d31a1d8 2018-03-11 stsp if (fd == -1) {
930 21908da4 2019-01-13 stsp if (errno == ENOENT) {
931 21908da4 2019-01-13 stsp char *parent = dirname(path);
932 21908da4 2019-01-13 stsp if (parent == NULL)
933 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
934 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
936 21908da4 2019-01-13 stsp return err;
937 21908da4 2019-01-13 stsp fd = open(ondisk_path,
938 21908da4 2019-01-13 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
939 21908da4 2019-01-13 stsp GOT_DEFAULT_FILE_MODE);
940 21908da4 2019-01-13 stsp if (fd == -1)
941 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
942 230a42bd 2019-05-11 jcs ondisk_path);
943 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
944 b8f41171 2019-02-10 stsp if (!S_ISREG(st_mode)) {
945 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
946 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
949 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
950 507dc3bb 2018-12-29 stsp ondisk_path);
953 507dc3bb 2018-12-29 stsp update = 1;
956 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
959 a378724f 2019-02-10 stsp if (restoring_missing_file)
960 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING, path);
961 a129376b 2019-03-28 stsp else if (reverting_versioned_file)
962 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT, path);
964 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
965 a378724f 2019-02-10 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
969 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
971 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
972 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
975 9d31a1d8 2018-03-11 stsp if (len > 0) {
976 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
977 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
978 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
979 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
981 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
982 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
985 61d6eaa3 2018-12-24 stsp hdrlen = 0;
987 9d31a1d8 2018-03-11 stsp } while (len != 0);
989 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
990 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
994 507dc3bb 2018-12-29 stsp if (update) {
995 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
996 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
997 230a42bd 2019-05-11 jcs ondisk_path);
998 2a57020b 2019-02-20 stsp unlink(tmppath);
1003 b8f41171 2019-02-10 stsp if (te_mode & S_IXUSR) {
1004 b8f41171 2019-02-10 stsp if (chmod(ondisk_path, st_mode | S_IXUSR) == -1) {
1005 638f9024 2019-05-13 stsp err = got_error_from_errno2("chmod", ondisk_path);
1006 507dc3bb 2018-12-29 stsp goto done;
1009 b8f41171 2019-02-10 stsp if (chmod(ondisk_path, st_mode & ~S_IXUSR) == -1) {
1010 638f9024 2019-05-13 stsp err = got_error_from_errno2("chmod", ondisk_path);
1011 68ed9ba5 2019-02-10 stsp goto done;
1016 3a6ce05a 2019-02-11 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
1017 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
1018 507dc3bb 2018-12-29 stsp free(tmppath);
1019 6353ad76 2019-02-08 stsp return err;
1022 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1023 6353ad76 2019-02-08 stsp static const struct got_error *
1024 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
1026 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
1027 7154f6ce 2019-03-27 stsp const char *markers[3] = {
1028 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
1029 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
1030 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
1032 7154f6ce 2019-03-27 stsp int i = 0;
1033 7154f6ce 2019-03-27 stsp char *line;
1034 7154f6ce 2019-03-27 stsp size_t len;
1035 7154f6ce 2019-03-27 stsp const char delim[3] = {'\0', '\0', '\0'};
1037 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1038 7154f6ce 2019-03-27 stsp line = fparseln(f, &len, NULL, delim, 0);
1039 7154f6ce 2019-03-27 stsp if (line == NULL) {
1040 7154f6ce 2019-03-27 stsp if (feof(f))
1042 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
1046 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1047 19332e6d 2019-05-13 stsp if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1049 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
1055 7154f6ce 2019-03-27 stsp return err;
1058 e2b1e152 2019-07-13 stsp static int
1059 e2b1e152 2019-07-13 stsp stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1061 e2b1e152 2019-07-13 stsp return !(ie->ctime_sec == sb->st_ctime &&
1062 e2b1e152 2019-07-13 stsp ie->ctime_nsec == sb->st_ctimensec &&
1063 e2b1e152 2019-07-13 stsp ie->mtime_sec == sb->st_mtime &&
1064 e2b1e152 2019-07-13 stsp ie->mtime_nsec == sb->st_mtimensec &&
1065 e2b1e152 2019-07-13 stsp ie->size == (sb->st_size & 0xffffffff));
1068 c363b2c1 2019-08-03 stsp static unsigned char
1069 c363b2c1 2019-08-03 stsp get_staged_status(struct got_fileindex_entry *ie)
1071 c363b2c1 2019-08-03 stsp switch (got_fileindex_entry_stage_get(ie)) {
1072 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_ADD:
1073 c363b2c1 2019-08-03 stsp return GOT_STATUS_ADD;
1074 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_DELETE:
1075 c363b2c1 2019-08-03 stsp return GOT_STATUS_DELETE;
1076 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_MODIFY:
1077 c363b2c1 2019-08-03 stsp return GOT_STATUS_MODIFY;
1079 c363b2c1 2019-08-03 stsp return GOT_STATUS_NO_CHANGE;
1083 7154f6ce 2019-03-27 stsp static const struct got_error *
1084 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1085 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1086 b8f41171 2019-02-10 stsp struct got_repository *repo)
1088 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1089 6353ad76 2019-02-08 stsp struct got_object_id id;
1090 6353ad76 2019-02-08 stsp size_t hdrlen;
1091 6353ad76 2019-02-08 stsp FILE *f = NULL;
1092 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1093 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1094 6353ad76 2019-02-08 stsp size_t flen, blen;
1095 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
1097 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1099 339c298e 2019-07-27 stsp if (lstat(abspath, sb) == -1) {
1100 a378724f 2019-02-10 stsp if (errno == ENOENT) {
1101 abb4604f 2019-07-27 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1102 abb4604f 2019-07-27 stsp *status = GOT_STATUS_MISSING;
1104 abb4604f 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1105 a378724f 2019-02-10 stsp return NULL;
1107 339c298e 2019-07-27 stsp return got_error_from_errno2("lstat", abspath);
1110 339c298e 2019-07-27 stsp if (!S_ISREG(sb->st_mode)) {
1111 339c298e 2019-07-27 stsp *status = GOT_STATUS_OBSTRUCTED;
1112 339c298e 2019-07-27 stsp return NULL;
1115 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1116 339c298e 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1117 339c298e 2019-07-27 stsp return NULL;
1118 244725f2 2019-08-03 stsp } else if (!got_fileindex_entry_has_blob(ie) &&
1119 244725f2 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
1120 339c298e 2019-07-27 stsp *status = GOT_STATUS_ADD;
1121 339c298e 2019-07-27 stsp return NULL;
1124 e2b1e152 2019-07-13 stsp if (!stat_info_differs(ie, sb))
1125 339c298e 2019-07-27 stsp return NULL;
1127 c363b2c1 2019-08-03 stsp if (staged_status == GOT_STATUS_MODIFY ||
1128 c363b2c1 2019-08-03 stsp staged_status == GOT_STATUS_ADD)
1129 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1131 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1133 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1135 339c298e 2019-07-27 stsp return err;
1137 339c298e 2019-07-27 stsp f = fopen(abspath, "r");
1138 6353ad76 2019-02-08 stsp if (f == NULL) {
1139 339c298e 2019-07-27 stsp err = got_error_from_errno2("fopen", abspath);
1140 6353ad76 2019-02-08 stsp goto done;
1142 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1144 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1145 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1147 7154f6ce 2019-03-27 stsp goto done;
1148 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1149 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1150 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1151 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1152 7154f6ce 2019-03-27 stsp goto done;
1154 6353ad76 2019-02-08 stsp if (blen == 0) {
1155 6353ad76 2019-02-08 stsp if (flen != 0)
1156 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1158 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1159 6353ad76 2019-02-08 stsp if (blen != 0)
1160 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1162 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1163 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1164 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1165 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1169 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1172 6353ad76 2019-02-08 stsp hdrlen = 0;
1175 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1176 7154f6ce 2019-03-27 stsp rewind(f);
1177 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1181 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1183 6353ad76 2019-02-08 stsp fclose(f);
1184 9d31a1d8 2018-03-11 stsp return err;
1188 e2b1e152 2019-07-13 stsp * Update timestamps in the file index if a file is unmodified and
1189 e2b1e152 2019-07-13 stsp * we had to run a full content comparison to find out.
1191 e2b1e152 2019-07-13 stsp static const struct got_error *
1192 e2b1e152 2019-07-13 stsp sync_timestamps(char *ondisk_path, unsigned char status,
1193 e2b1e152 2019-07-13 stsp struct got_fileindex_entry *ie, struct stat *sb)
1195 e2b1e152 2019-07-13 stsp if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1196 e2b1e152 2019-07-13 stsp return got_fileindex_entry_update(ie, ondisk_path,
1197 e2b1e152 2019-07-13 stsp ie->blob_sha1, ie->commit_sha1, 1);
1199 e2b1e152 2019-07-13 stsp return NULL;
1202 9d31a1d8 2018-03-11 stsp static const struct got_error *
1203 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1204 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1205 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1206 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1207 0584f854 2019-04-06 stsp void *progress_arg)
1209 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1210 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1211 6353ad76 2019-02-08 stsp char *ondisk_path;
1212 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1213 b8f41171 2019-02-10 stsp struct stat sb;
1215 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1216 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1219 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1220 a76c42e6 2019-08-03 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1221 a76c42e6 2019-08-03 stsp goto done;
1223 abb4604f 2019-07-27 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1225 abb4604f 2019-07-27 stsp goto done;
1226 abb4604f 2019-07-27 stsp if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1227 abb4604f 2019-07-27 stsp sb.st_mode = got_fileindex_perms_to_st(ie);
1229 abb4604f 2019-07-27 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
1231 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1232 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1233 b8f41171 2019-02-10 stsp goto done;
1236 b8f41171 2019-02-10 stsp if (ie && status != GOT_STATUS_MISSING) {
1237 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1238 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1239 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1240 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1242 e2b1e152 2019-07-13 stsp goto done;
1243 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1245 6353ad76 2019-02-08 stsp goto done;
1247 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1248 1430b4e0 2019-03-27 stsp memcmp(ie->blob_sha1, te->id->sha1,
1249 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1250 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1251 b8f41171 2019-02-10 stsp goto done;
1255 8da9e5f4 2019-01-12 stsp err = got_object_open_as_blob(&blob, repo, te->id, 8192);
1257 6353ad76 2019-02-08 stsp goto done;
1259 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1260 234035bc 2019-06-01 stsp int update_timestamps;
1261 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1262 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1263 234035bc 2019-06-01 stsp struct got_object_id id2;
1264 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1265 234035bc 2019-06-01 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1267 234035bc 2019-06-01 stsp goto done;
1269 234035bc 2019-06-01 stsp err = merge_blob(&update_timestamps, worktree, blob2,
1270 818c7501 2019-07-11 stsp ondisk_path, path, sb.st_mode, blob,
1271 818c7501 2019-07-11 stsp worktree->base_commit_id, repo,
1272 234035bc 2019-06-01 stsp progress_cb, progress_arg);
1273 234035bc 2019-06-01 stsp if (blob2)
1274 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
1276 909d120e 2019-09-22 stsp goto done;
1278 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
1279 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
1280 234035bc 2019-06-01 stsp * unmodified files again.
1282 234035bc 2019-06-01 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1283 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
1284 234035bc 2019-06-01 stsp update_timestamps);
1285 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
1286 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1288 1ee397ad 2019-07-12 stsp goto done;
1289 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1290 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 0);
1292 13d9040b 2019-03-27 stsp goto done;
1294 13d9040b 2019-03-27 stsp err = install_blob(worktree, ondisk_path, path, te->mode,
1295 a129376b 2019-03-28 stsp sb.st_mode, blob, status == GOT_STATUS_MISSING, 0,
1296 a129376b 2019-03-28 stsp repo, progress_cb, progress_arg);
1298 13d9040b 2019-03-27 stsp goto done;
1299 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1300 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 1);
1302 13d9040b 2019-03-27 stsp goto done;
1304 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
1306 6353ad76 2019-02-08 stsp free(ondisk_path);
1307 8da9e5f4 2019-01-12 stsp return err;
1310 90285c3b 2019-01-08 stsp static const struct got_error *
1311 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
1313 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
1314 90285c3b 2019-01-08 stsp char *ondisk_path = NULL;
1316 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
1317 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1319 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
1320 c97665ae 2019-01-13 stsp if (errno != ENOENT)
1321 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
1323 90285c3b 2019-01-08 stsp char *parent = dirname(ondisk_path);
1324 7a9df742 2019-01-08 stsp while (parent && strcmp(parent, root_path) != 0) {
1325 26c4ac4d 2019-01-08 stsp if (rmdir(parent) == -1) {
1326 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
1327 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
1331 90285c3b 2019-01-08 stsp parent = dirname(parent);
1334 90285c3b 2019-01-08 stsp free(ondisk_path);
1335 90285c3b 2019-01-08 stsp return err;
1338 708d8e67 2019-03-27 stsp static const struct got_error *
1339 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
1340 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
1341 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1343 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
1344 708d8e67 2019-03-27 stsp unsigned char status;
1345 708d8e67 2019-03-27 stsp struct stat sb;
1346 708d8e67 2019-03-27 stsp char *ondisk_path;
1348 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
1349 a76c42e6 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1351 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
1353 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1355 708d8e67 2019-03-27 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1357 708d8e67 2019-03-27 stsp return err;
1359 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
1360 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
1361 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
1363 1ee397ad 2019-07-12 stsp return err;
1365 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
1366 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
1368 fc6346c4 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
1371 708d8e67 2019-03-27 stsp return err;
1373 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
1375 1ee397ad 2019-07-12 stsp return err;
1376 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
1377 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
1379 fc6346c4 2019-03-27 stsp return err;
1381 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
1384 fc6346c4 2019-03-27 stsp return err;
1387 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
1388 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
1389 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
1390 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
1391 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
1392 8da9e5f4 2019-01-12 stsp void *progress_arg;
1393 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
1394 8da9e5f4 2019-01-12 stsp void *cancel_arg;
1397 512f0d0e 2019-01-02 stsp static const struct got_error *
1398 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
1399 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
1401 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1403 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1404 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1406 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
1407 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
1410 8da9e5f4 2019-01-12 stsp static const struct got_error *
1411 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1413 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1415 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1416 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1418 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
1419 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1422 9d31a1d8 2018-03-11 stsp static const struct got_error *
1423 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
1425 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1426 8da9e5f4 2019-01-12 stsp const struct got_error *err;
1427 8da9e5f4 2019-01-12 stsp char *path;
1429 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1430 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1432 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
1433 63c5ca5d 2019-08-24 stsp return NULL;
1435 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
1436 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
1438 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1440 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
1441 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
1443 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
1444 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1446 8da9e5f4 2019-01-12 stsp free(path);
1447 0cd1c46a 2019-03-11 stsp return err;
1450 818c7501 2019-07-11 stsp static const struct got_error *
1451 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
1453 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
1454 0647c563 2019-03-11 stsp char *uuidstr = NULL;
1455 0cd1c46a 2019-03-11 stsp uint32_t uuid_status;
1457 517bab73 2019-03-11 stsp *refname = NULL;
1459 0cd1c46a 2019-03-11 stsp uuid_to_string(&worktree->uuid, &uuidstr, &uuid_status);
1460 0cd1c46a 2019-03-11 stsp if (uuid_status != uuid_s_ok)
1461 cc483380 2019-09-01 stsp return got_error_uuid(uuid_status, "uuid_to_string");
1463 818c7501 2019-07-11 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr)
1465 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1466 0647c563 2019-03-11 stsp *refname = NULL;
1468 517bab73 2019-03-11 stsp free(uuidstr);
1469 517bab73 2019-03-11 stsp return err;
1472 818c7501 2019-07-11 stsp const struct got_error *
1473 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
1475 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
1478 818c7501 2019-07-11 stsp static const struct got_error *
1479 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
1481 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1482 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
1485 818c7501 2019-07-11 stsp static const struct got_error *
1486 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
1488 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
1491 818c7501 2019-07-11 stsp static const struct got_error *
1492 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
1494 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1495 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
1498 818c7501 2019-07-11 stsp static const struct got_error *
1499 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
1501 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1502 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
1505 0ebf8283 2019-07-24 stsp static const struct got_error *
1506 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
1508 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1509 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
1512 0ebf8283 2019-07-24 stsp static const struct got_error *
1513 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
1515 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1516 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
1519 0ebf8283 2019-07-24 stsp static const struct got_error *
1520 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
1522 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1523 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
1526 0ebf8283 2019-07-24 stsp static const struct got_error *
1527 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
1529 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1530 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
1533 0ebf8283 2019-07-24 stsp const struct got_error *
1534 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
1535 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
1537 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
1538 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
1539 0ebf8283 2019-07-24 stsp *path = NULL;
1540 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
1542 0ebf8283 2019-07-24 stsp return NULL;
1546 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
1547 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
1549 517bab73 2019-03-11 stsp static const struct got_error *
1550 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
1552 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
1553 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
1554 517bab73 2019-03-11 stsp char *refname;
1556 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
1558 517bab73 2019-03-11 stsp return err;
1560 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
1562 0cd1c46a 2019-03-11 stsp goto done;
1564 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
1566 0cd1c46a 2019-03-11 stsp free(refname);
1568 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
1569 3e3a69f1 2019-07-25 stsp return err;
1572 3e3a69f1 2019-07-25 stsp static const struct got_error *
1573 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
1575 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
1577 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
1578 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1579 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
1580 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
1582 9d31a1d8 2018-03-11 stsp return err;
1586 ebf99748 2019-05-09 stsp static const struct got_error *
1587 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
1588 4b55f459 2019-09-08 stsp struct got_worktree *worktree)
1590 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
1591 ebf99748 2019-05-09 stsp FILE *index = NULL;
1593 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1594 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
1595 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
1596 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
1598 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
1600 ebf99748 2019-05-09 stsp goto done;
1602 ebf99748 2019-05-09 stsp index = fopen(*fileindex_path, "rb");
1603 ebf99748 2019-05-09 stsp if (index == NULL) {
1604 ebf99748 2019-05-09 stsp if (errno != ENOENT)
1605 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
1607 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
1608 ebf99748 2019-05-09 stsp if (fclose(index) != 0 && err == NULL)
1609 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
1612 ebf99748 2019-05-09 stsp if (err) {
1613 ebf99748 2019-05-09 stsp free(*fileindex_path);
1614 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1615 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
1616 ebf99748 2019-05-09 stsp *fileindex = NULL;
1618 ebf99748 2019-05-09 stsp return err;
1621 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
1622 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
1623 c932eeeb 2019-05-22 stsp const char *path;
1624 c932eeeb 2019-05-22 stsp size_t path_len;
1625 c932eeeb 2019-05-22 stsp const char *entry_name;
1626 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
1627 a484d721 2019-06-10 stsp void *progress_arg;
1630 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
1631 c932eeeb 2019-05-22 stsp static const struct got_error *
1632 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
1634 1ee397ad 2019-07-12 stsp const struct got_error *err;
1635 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
1637 c932eeeb 2019-05-22 stsp if (a->entry_name) {
1638 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
1639 c932eeeb 2019-05-22 stsp return NULL;
1640 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
1641 102ff934 2019-06-11 stsp return NULL;
1643 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
1644 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
1645 c932eeeb 2019-05-22 stsp return NULL;
1647 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
1648 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
1649 edd02c5e 2019-07-11 stsp ie->path);
1651 1ee397ad 2019-07-12 stsp return err;
1653 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
1654 c932eeeb 2019-05-22 stsp return NULL;
1657 9c6338c4 2019-06-02 stsp static const struct got_error *
1658 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
1660 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
1661 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
1662 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
1664 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
1665 9c6338c4 2019-06-02 stsp fileindex_path);
1667 9c6338c4 2019-06-02 stsp goto done;
1669 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
1671 9c6338c4 2019-06-02 stsp goto done;
1673 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
1674 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
1675 9c6338c4 2019-06-02 stsp fileindex_path);
1676 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
1679 9c6338c4 2019-06-02 stsp if (new_index)
1680 9c6338c4 2019-06-02 stsp fclose(new_index);
1681 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
1682 9c6338c4 2019-06-02 stsp return err;
1685 6ced4176 2019-07-12 stsp static const struct got_error *
1686 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
1687 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
1688 6ced4176 2019-07-12 stsp struct got_worktree *worktree, struct got_repository *repo)
1690 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
1691 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
1692 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
1693 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
1695 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
1696 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
1697 6ced4176 2019-07-12 stsp *tree_id = NULL;
1699 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
1700 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
1701 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
1702 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
1703 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1704 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1705 6ced4176 2019-07-12 stsp goto done;
1707 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
1708 6ced4176 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
1710 6ced4176 2019-07-12 stsp goto done;
1711 6ced4176 2019-07-12 stsp return NULL;
1714 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
1716 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
1717 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
1718 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
1719 6ced4176 2019-07-12 stsp goto done;
1722 6ced4176 2019-07-12 stsp err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
1723 6ced4176 2019-07-12 stsp in_repo_path);
1725 6ced4176 2019-07-12 stsp goto done;
1727 6ced4176 2019-07-12 stsp free(in_repo_path);
1728 6ced4176 2019-07-12 stsp in_repo_path = NULL;
1730 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
1732 6ced4176 2019-07-12 stsp goto done;
1734 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
1735 6ced4176 2019-07-12 stsp /* Check out a single file. */
1736 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
1737 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
1738 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
1739 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
1740 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1741 6ced4176 2019-07-12 stsp goto done;
1743 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
1744 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1745 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1746 6ced4176 2019-07-12 stsp goto done;
1749 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
1750 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
1752 6ced4176 2019-07-12 stsp return err;
1753 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
1754 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
1755 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
1756 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
1757 6ced4176 2019-07-12 stsp goto done;
1760 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
1761 6ced4176 2019-07-12 stsp worktree->base_commit_id, in_repo_path);
1763 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
1764 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
1765 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
1766 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
1767 6ced4176 2019-07-12 stsp goto done;
1769 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
1770 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1771 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1772 6ced4176 2019-07-12 stsp goto done;
1777 6ced4176 2019-07-12 stsp free(in_repo_path);
1778 6ced4176 2019-07-12 stsp if (err) {
1779 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
1780 6ced4176 2019-07-12 stsp free(*tree_relpath);
1781 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
1782 6ced4176 2019-07-12 stsp free(*tree_id);
1783 6ced4176 2019-07-12 stsp *tree_id = NULL;
1785 07ed472d 2019-07-12 stsp return err;
1788 07ed472d 2019-07-12 stsp static const struct got_error *
1789 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
1790 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
1791 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1792 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
1794 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
1795 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
1796 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
1797 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
1798 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
1800 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
1802 07ed472d 2019-07-12 stsp goto done;
1804 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
1805 07ed472d 2019-07-12 stsp worktree->base_commit_id);
1807 07ed472d 2019-07-12 stsp goto done;
1809 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1811 07ed472d 2019-07-12 stsp goto done;
1813 07ed472d 2019-07-12 stsp if (entry_name &&
1814 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
1815 07ed472d 2019-07-12 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
1816 07ed472d 2019-07-12 stsp goto done;
1819 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
1820 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
1821 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
1822 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
1823 07ed472d 2019-07-12 stsp arg.worktree = worktree;
1824 07ed472d 2019-07-12 stsp arg.repo = repo;
1825 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
1826 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
1827 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
1828 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
1829 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
1830 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
1833 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
1834 07ed472d 2019-07-12 stsp if (commit)
1835 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
1836 6ced4176 2019-07-12 stsp return err;
1839 9d31a1d8 2018-03-11 stsp const struct got_error *
1840 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
1841 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
1842 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
1843 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
1845 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
1846 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
1847 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
1848 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
1849 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
1850 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
1851 f2ea84fa 2019-07-27 stsp struct tree_path_data {
1852 f2ea84fa 2019-07-27 stsp SIMPLEQ_ENTRY(tree_path_data) entry;
1853 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
1854 f2ea84fa 2019-07-27 stsp int entry_type;
1855 f2ea84fa 2019-07-27 stsp char *relpath;
1856 f2ea84fa 2019-07-27 stsp char *entry_name;
1857 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
1858 f2ea84fa 2019-07-27 stsp SIMPLEQ_HEAD(tree_paths, tree_path_data) tree_paths;
1860 f2ea84fa 2019-07-27 stsp SIMPLEQ_INIT(&tree_paths);
1862 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
1864 9d31a1d8 2018-03-11 stsp return err;
1866 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
1867 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
1868 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
1869 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
1870 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
1871 f2ea84fa 2019-07-27 stsp goto done;
1874 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
1875 f2ea84fa 2019-07-27 stsp &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
1876 f2ea84fa 2019-07-27 stsp if (err) {
1877 f2ea84fa 2019-07-27 stsp free(tpd);
1878 6ced4176 2019-07-12 stsp goto done;
1881 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
1882 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
1883 f2ea84fa 2019-07-27 stsp if (err) {
1884 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
1885 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
1886 f2ea84fa 2019-07-27 stsp free(tpd);
1887 f2ea84fa 2019-07-27 stsp goto done;
1890 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
1892 f2ea84fa 2019-07-27 stsp SIMPLEQ_INSERT_TAIL(&tree_paths, tpd, entry);
1896 51514078 2018-12-25 stsp * Read the file index.
1897 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
1898 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
1900 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
1902 c4cdcb68 2019-04-03 stsp goto done;
1904 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
1905 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
1906 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
1908 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
1909 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
1910 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
1914 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
1915 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
1916 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
1917 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
1918 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
1919 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
1920 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
1921 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
1925 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_NEXT(tpd, entry);
1927 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
1928 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
1929 af12c6b9 2019-06-04 stsp err = sync_err;
1931 9c6338c4 2019-06-02 stsp free(fileindex_path);
1933 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
1934 9d31a1d8 2018-03-11 stsp if (commit)
1935 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
1936 5ade8233 2019-07-12 stsp if (fileindex)
1937 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
1938 f2ea84fa 2019-07-27 stsp while (!SIMPLEQ_EMPTY(&tree_paths)) {
1939 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
1940 f2ea84fa 2019-07-27 stsp SIMPLEQ_REMOVE_HEAD(&tree_paths, entry);
1941 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
1942 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
1943 f2ea84fa 2019-07-27 stsp free(tpd);
1945 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
1946 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
1947 9d31a1d8 2018-03-11 stsp err = unlockerr;
1948 f8d1f275 2019-02-04 stsp return err;
1951 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
1952 234035bc 2019-06-01 stsp struct got_worktree *worktree;
1953 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
1954 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
1955 234035bc 2019-06-01 stsp void *progress_arg;
1956 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
1957 234035bc 2019-06-01 stsp void *cancel_arg;
1958 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
1961 234035bc 2019-06-01 stsp static const struct got_error *
1962 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
1963 234035bc 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
1964 234035bc 2019-06-01 stsp struct got_object_id *id2, const char *path1, const char *path2,
1965 234035bc 2019-06-01 stsp struct got_repository *repo)
1967 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
1968 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
1969 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
1970 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
1971 234035bc 2019-06-01 stsp struct stat sb;
1972 234035bc 2019-06-01 stsp unsigned char status;
1973 234035bc 2019-06-01 stsp int local_changes_subsumed;
1975 234035bc 2019-06-01 stsp if (blob1 && blob2) {
1976 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
1977 d6c87207 2019-08-02 stsp strlen(path2));
1978 1ee397ad 2019-07-12 stsp if (ie == NULL)
1979 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
1980 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
1982 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
1983 234035bc 2019-06-01 stsp path2) == -1)
1984 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
1986 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
1988 234035bc 2019-06-01 stsp goto done;
1990 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
1991 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
1992 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
1993 234035bc 2019-06-01 stsp goto done;
1995 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
1996 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
1997 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
1998 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
1999 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
2000 234035bc 2019-06-01 stsp goto done;
2003 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree, blob1,
2004 818c7501 2019-07-11 stsp ondisk_path, path2, sb.st_mode, blob2, a->commit_id2, repo,
2005 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
2006 234035bc 2019-06-01 stsp } else if (blob1) {
2007 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2008 d6c87207 2019-08-02 stsp strlen(path1));
2009 1ee397ad 2019-07-12 stsp if (ie == NULL)
2010 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2011 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2013 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2014 2b92fad7 2019-06-02 stsp path1) == -1)
2015 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2017 2b92fad7 2019-06-02 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2019 2b92fad7 2019-06-02 stsp goto done;
2021 2b92fad7 2019-06-02 stsp switch (status) {
2022 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2023 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2024 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2026 1ee397ad 2019-07-12 stsp goto done;
2027 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2029 2b92fad7 2019-06-02 stsp goto done;
2031 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2033 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
2034 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
2035 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2036 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2038 1ee397ad 2019-07-12 stsp goto done;
2040 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2042 2b92fad7 2019-06-02 stsp case GOT_STATUS_ADD:
2043 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
2044 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
2045 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2046 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
2048 1ee397ad 2019-07-12 stsp goto done;
2050 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
2051 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
2053 1ee397ad 2019-07-12 stsp goto done;
2058 234035bc 2019-06-01 stsp } else if (blob2) {
2059 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2060 234035bc 2019-06-01 stsp path2) == -1)
2061 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2062 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2063 d6c87207 2019-08-02 stsp strlen(path2));
2065 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
2068 234035bc 2019-06-01 stsp goto done;
2069 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2070 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2071 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2072 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2073 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2074 1ee397ad 2019-07-12 stsp status, path2);
2075 234035bc 2019-06-01 stsp goto done;
2077 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
2078 818c7501 2019-07-11 stsp NULL, ondisk_path, path2, sb.st_mode, blob2,
2079 818c7501 2019-07-11 stsp a->commit_id2, repo,
2080 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
2081 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2082 234035bc 2019-06-01 stsp err = update_blob_fileindex_entry(a->worktree,
2083 234035bc 2019-06-01 stsp a->fileindex, ie, ondisk_path, ie->path,
2084 234035bc 2019-06-01 stsp blob2, 0);
2086 234035bc 2019-06-01 stsp goto done;
2089 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2090 234035bc 2019-06-01 stsp err = install_blob(a->worktree, ondisk_path, path2,
2091 234035bc 2019-06-01 stsp /* XXX get this from parent tree! */
2092 234035bc 2019-06-01 stsp GOT_DEFAULT_FILE_MODE,
2093 234035bc 2019-06-01 stsp sb.st_mode, blob2, 0, 0, repo,
2094 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
2096 234035bc 2019-06-01 stsp goto done;
2097 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_alloc(&ie,
2098 2b92fad7 2019-06-02 stsp ondisk_path, path2, NULL, NULL);
2100 234035bc 2019-06-01 stsp goto done;
2101 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
2102 2b92fad7 2019-06-02 stsp if (err) {
2103 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
2104 2b92fad7 2019-06-02 stsp goto done;
2109 234035bc 2019-06-01 stsp free(ondisk_path);
2110 234035bc 2019-06-01 stsp return err;
2113 234035bc 2019-06-01 stsp struct check_merge_ok_arg {
2114 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2115 234035bc 2019-06-01 stsp struct got_repository *repo;
2118 234035bc 2019-06-01 stsp static const struct got_error *
2119 234035bc 2019-06-01 stsp check_merge_ok(void *arg, struct got_fileindex_entry *ie)
2121 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
2122 234035bc 2019-06-01 stsp struct check_merge_ok_arg *a = arg;
2123 234035bc 2019-06-01 stsp unsigned char status;
2124 234035bc 2019-06-01 stsp struct stat sb;
2125 234035bc 2019-06-01 stsp char *ondisk_path;
2127 234035bc 2019-06-01 stsp /* Reject merges into a work tree with mixed base commits. */
2128 234035bc 2019-06-01 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
2129 234035bc 2019-06-01 stsp SHA1_DIGEST_LENGTH))
2130 234035bc 2019-06-01 stsp return got_error(GOT_ERR_MIXED_COMMITS);
2132 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
2134 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2136 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
2137 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
2139 234035bc 2019-06-01 stsp return err;
2140 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
2141 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
2143 234035bc 2019-06-01 stsp return NULL;
2146 818c7501 2019-07-11 stsp static const struct got_error *
2147 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2148 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
2149 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
2150 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2151 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2153 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
2154 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
2155 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2156 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
2158 03415a1a 2019-06-02 stsp if (commit_id1) {
2159 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
2160 03415a1a 2019-06-02 stsp worktree->path_prefix);
2162 03415a1a 2019-06-02 stsp goto done;
2164 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
2166 03415a1a 2019-06-02 stsp goto done;
2169 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
2170 234035bc 2019-06-01 stsp worktree->path_prefix);
2172 234035bc 2019-06-01 stsp goto done;
2174 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
2176 234035bc 2019-06-01 stsp goto done;
2178 234035bc 2019-06-01 stsp arg.worktree = worktree;
2179 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
2180 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
2181 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
2182 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
2183 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
2184 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
2185 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
2186 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2187 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2188 af12c6b9 2019-06-04 stsp err = sync_err;
2190 234035bc 2019-06-01 stsp if (tree1)
2191 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
2192 234035bc 2019-06-01 stsp if (tree2)
2193 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
2194 818c7501 2019-07-11 stsp return err;
2197 818c7501 2019-07-11 stsp const struct got_error *
2198 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
2199 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
2200 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2201 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2203 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
2204 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
2205 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
2206 818c7501 2019-07-11 stsp struct check_merge_ok_arg mok_arg;
2208 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
2210 818c7501 2019-07-11 stsp return err;
2212 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2214 818c7501 2019-07-11 stsp goto done;
2216 818c7501 2019-07-11 stsp mok_arg.worktree = worktree;
2217 818c7501 2019-07-11 stsp mok_arg.repo = repo;
2218 818c7501 2019-07-11 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
2219 818c7501 2019-07-11 stsp &mok_arg);
2221 818c7501 2019-07-11 stsp goto done;
2223 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
2224 818c7501 2019-07-11 stsp commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
2226 818c7501 2019-07-11 stsp if (fileindex)
2227 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
2228 818c7501 2019-07-11 stsp free(fileindex_path);
2229 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2230 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
2231 234035bc 2019-06-01 stsp err = unlockerr;
2232 234035bc 2019-06-01 stsp return err;
2235 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
2236 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
2237 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
2238 927df6b7 2019-02-10 stsp const char *status_path;
2239 927df6b7 2019-02-10 stsp size_t status_path_len;
2240 f8d1f275 2019-02-04 stsp struct got_repository *repo;
2241 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
2242 f8d1f275 2019-02-04 stsp void *status_arg;
2243 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2244 f8d1f275 2019-02-04 stsp void *cancel_arg;
2245 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
2246 6841da00 2019-08-08 stsp struct got_pathlist_head ignores;
2249 f8d1f275 2019-02-04 stsp static const struct got_error *
2250 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
2251 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
2252 927df6b7 2019-02-10 stsp struct got_repository *repo)
2254 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
2255 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
2256 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
2257 927df6b7 2019-02-10 stsp struct stat sb;
2258 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
2259 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
2260 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
2262 927df6b7 2019-02-10 stsp err = get_file_status(&status, &sb, ie, abspath, repo);
2264 98eaaa12 2019-08-03 stsp return err;
2266 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
2267 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_NO_CHANGE)
2268 98eaaa12 2019-08-03 stsp return NULL;
2270 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_blob(ie)) {
2271 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2272 98eaaa12 2019-08-03 stsp blob_idp = &blob_id;
2274 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
2275 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2276 98eaaa12 2019-08-03 stsp commit_idp = &commit_id;
2278 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
2279 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
2280 98eaaa12 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
2281 98eaaa12 2019-08-03 stsp SHA1_DIGEST_LENGTH);
2282 98eaaa12 2019-08-03 stsp staged_blob_idp = &staged_blob_id;
2285 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
2286 98eaaa12 2019-08-03 stsp ie->path, blob_idp, staged_blob_idp, commit_idp);
2289 927df6b7 2019-02-10 stsp static const struct got_error *
2290 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
2291 f8d1f275 2019-02-04 stsp struct dirent *de, const char *parent_path)
2293 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2294 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2295 f8d1f275 2019-02-04 stsp char *abspath;
2297 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2298 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2300 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
2301 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
2302 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
2303 927df6b7 2019-02-10 stsp return NULL;
2305 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2306 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
2307 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
2308 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2310 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
2311 f8d1f275 2019-02-04 stsp de->d_name) == -1)
2312 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2315 927df6b7 2019-02-10 stsp err = report_file_status(ie, abspath, a->status_cb, a->status_arg,
2317 f8d1f275 2019-02-04 stsp free(abspath);
2318 9d31a1d8 2018-03-11 stsp return err;
2321 f8d1f275 2019-02-04 stsp static const struct got_error *
2322 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2324 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2325 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
2326 2ec1f75b 2019-03-26 stsp unsigned char status;
2328 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2329 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2331 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
2332 927df6b7 2019-02-10 stsp return NULL;
2334 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2335 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2336 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
2337 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
2339 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
2340 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
2341 537ac44b 2019-08-03 stsp ie->path, &blob_id, NULL, &commit_id);
2345 6841da00 2019-08-08 stsp free_ignorelist(struct got_pathlist_head *ignorelist)
2347 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2349 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignorelist, entry)
2350 6841da00 2019-08-08 stsp free((char *)pe->path);
2351 6841da00 2019-08-08 stsp got_pathlist_free(ignorelist);
2355 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
2357 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2359 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
2360 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
2361 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
2362 6841da00 2019-08-08 stsp free((char *)pe->path);
2364 6841da00 2019-08-08 stsp got_pathlist_free(ignores);
2367 6841da00 2019-08-08 stsp static const struct got_error *
2368 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
2370 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
2371 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
2372 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
2373 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
2374 6841da00 2019-08-08 stsp size_t linesize = 0;
2375 6841da00 2019-08-08 stsp ssize_t linelen;
2377 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
2378 6841da00 2019-08-08 stsp if (ignorelist == NULL)
2379 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
2380 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
2382 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
2383 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
2384 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
2385 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
2386 6841da00 2019-08-08 stsp line) == -1) {
2387 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
2388 6841da00 2019-08-08 stsp goto done;
2390 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
2392 6841da00 2019-08-08 stsp goto done;
2394 6841da00 2019-08-08 stsp if (ferror(f)) {
2395 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
2396 6841da00 2019-08-08 stsp goto done;
2399 6841da00 2019-08-08 stsp dirpath = strdup(path);
2400 6841da00 2019-08-08 stsp if (dirpath == NULL) {
2401 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
2402 6841da00 2019-08-08 stsp goto done;
2404 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
2406 6841da00 2019-08-08 stsp free(line);
2407 6841da00 2019-08-08 stsp if (err || pe == NULL) {
2408 6841da00 2019-08-08 stsp free(dirpath);
2409 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
2411 6841da00 2019-08-08 stsp return err;
2415 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
2417 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2420 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
2421 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
2422 6841da00 2019-08-08 stsp * ignores backwards.
2424 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
2425 6841da00 2019-08-08 stsp while (pe) {
2426 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
2427 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
2428 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
2429 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
2430 6841da00 2019-08-08 stsp if (fnmatch(pi->path, path,
2431 6841da00 2019-08-08 stsp FNM_PATHNAME | FNM_LEADING_DIR))
2436 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
2442 6841da00 2019-08-08 stsp static const struct got_error *
2443 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
2444 b80270a7 2019-08-08 stsp const char *path)
2446 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
2447 6841da00 2019-08-08 stsp char *ignorespath;
2448 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
2450 6841da00 2019-08-08 stsp /* TODO: read .gitignores as well... */
2451 b80270a7 2019-08-08 stsp if (asprintf(&ignorespath, "%s/%s%s.cvsignore", root_path, path,
2452 b80270a7 2019-08-08 stsp path[0] ? "/" : "") == -1)
2453 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
2455 6841da00 2019-08-08 stsp ignoresfile = fopen(ignorespath, "r");
2456 6841da00 2019-08-08 stsp if (ignoresfile == NULL) {
2457 40b289d7 2019-09-07 stsp if (errno != ENOENT && errno != EACCES)
2458 6841da00 2019-08-08 stsp err = got_error_from_errno2("fopen",
2459 6841da00 2019-08-08 stsp ignorespath);
2461 6841da00 2019-08-08 stsp err = read_ignores(ignores, path, ignoresfile);
2463 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
2464 6841da00 2019-08-08 stsp err = got_error_from_errno2("flose", path);
2465 6841da00 2019-08-08 stsp free(ignorespath);
2466 6841da00 2019-08-08 stsp return err;
2469 f8d1f275 2019-02-04 stsp static const struct got_error *
2470 f8d1f275 2019-02-04 stsp status_new(void *arg, struct dirent *de, const char *parent_path)
2472 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
2473 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2474 f8d1f275 2019-02-04 stsp char *path = NULL;
2476 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2477 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2479 2c201a36 2019-02-10 stsp /* XXX ignore symlinks for now */
2480 2c201a36 2019-02-10 stsp if (de->d_type == DT_LNK)
2481 927df6b7 2019-02-10 stsp return NULL;
2483 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2484 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
2485 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2487 f8d1f275 2019-02-04 stsp path = de->d_name;
2490 6841da00 2019-08-08 stsp if (de->d_type == DT_DIR)
2491 b80270a7 2019-08-08 stsp err = add_ignores(&a->ignores, a->worktree->root_path, path);
2492 6841da00 2019-08-08 stsp else if (got_path_is_child(path, a->status_path, a->status_path_len)
2493 6841da00 2019-08-08 stsp && !match_ignores(&a->ignores, path))
2494 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
2495 537ac44b 2019-08-03 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL);
2496 f8d1f275 2019-02-04 stsp if (parent_path[0])
2497 f8d1f275 2019-02-04 stsp free(path);
2498 b72f483a 2019-02-05 stsp return err;
2501 347d1d3e 2019-07-12 stsp static const struct got_error *
2502 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
2503 abb4604f 2019-07-27 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
2504 abb4604f 2019-07-27 stsp void *status_arg, struct got_repository *repo)
2506 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
2507 abb4604f 2019-07-27 stsp struct stat sb;
2509 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
2511 abb4604f 2019-07-27 stsp return report_file_status(ie, ondisk_path, status_cb,
2512 abb4604f 2019-07-27 stsp status_arg, repo);
2514 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
2515 abb4604f 2019-07-27 stsp if (errno != ENOENT)
2516 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
2517 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
2518 2a06fe5f 2019-08-24 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL);
2519 abb4604f 2019-07-27 stsp return NULL;
2522 abb4604f 2019-07-27 stsp if (S_ISREG(sb.st_mode))
2523 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
2524 537ac44b 2019-08-03 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL);
2526 abb4604f 2019-07-27 stsp return NULL;
2529 abb4604f 2019-07-27 stsp static const struct got_error *
2530 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
2531 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
2532 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
2533 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2535 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2536 f8d1f275 2019-02-04 stsp DIR *workdir = NULL;
2537 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
2538 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
2539 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
2541 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
2542 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
2543 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
2545 927df6b7 2019-02-10 stsp workdir = opendir(ondisk_path);
2546 927df6b7 2019-02-10 stsp if (workdir == NULL) {
2547 40b289d7 2019-09-07 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES)
2548 638f9024 2019-05-13 stsp err = got_error_from_errno2("opendir", ondisk_path);
2550 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
2551 abb4604f 2019-07-27 stsp fileindex, status_cb, status_arg, repo);
2553 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
2554 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
2555 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
2556 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
2557 abb4604f 2019-07-27 stsp arg.worktree = worktree;
2558 abb4604f 2019-07-27 stsp arg.status_path = path;
2559 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
2560 abb4604f 2019-07-27 stsp arg.repo = repo;
2561 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
2562 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
2563 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
2564 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
2565 6841da00 2019-08-08 stsp TAILQ_INIT(&arg.ignores);
2566 b80270a7 2019-08-08 stsp err = add_ignores(&arg.ignores, worktree->root_path, path);
2567 6841da00 2019-08-08 stsp if (err == NULL)
2568 6841da00 2019-08-08 stsp err = got_fileindex_diff_dir(fileindex, workdir,
2569 6841da00 2019-08-08 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
2570 6841da00 2019-08-08 stsp free_ignores(&arg.ignores);
2573 f8d1f275 2019-02-04 stsp if (workdir)
2574 f8d1f275 2019-02-04 stsp closedir(workdir);
2575 927df6b7 2019-02-10 stsp free(ondisk_path);
2576 347d1d3e 2019-07-12 stsp return err;
2579 347d1d3e 2019-07-12 stsp const struct got_error *
2580 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
2581 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2582 72ea6654 2019-07-27 stsp got_worktree_status_cb status_cb, void *status_arg,
2583 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2585 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
2586 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
2587 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
2588 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
2590 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2592 347d1d3e 2019-07-12 stsp return err;
2594 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2595 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
2596 72ea6654 2019-07-27 stsp status_cb, status_arg, cancel_cb, cancel_arg);
2600 f8d1f275 2019-02-04 stsp free(fileindex_path);
2601 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
2602 f8d1f275 2019-02-04 stsp return err;
2605 6c7ab921 2019-03-18 stsp const struct got_error *
2606 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
2607 6c7ab921 2019-03-18 stsp const char *arg)
2609 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
2610 d0710d08 2019-07-22 stsp char *resolved, *cwd = NULL, *path = NULL;
2611 6c7ab921 2019-03-18 stsp size_t len;
2613 6c7ab921 2019-03-18 stsp *wt_path = NULL;
2615 6c7ab921 2019-03-18 stsp resolved = realpath(arg, NULL);
2616 d0710d08 2019-07-22 stsp if (resolved == NULL) {
2617 d0710d08 2019-07-22 stsp if (errno != ENOENT)
2618 d0710d08 2019-07-22 stsp return got_error_from_errno2("realpath", arg);
2619 d0710d08 2019-07-22 stsp cwd = getcwd(NULL, 0);
2620 d0710d08 2019-07-22 stsp if (cwd == NULL)
2621 d0710d08 2019-07-22 stsp return got_error_from_errno("getcwd");
2622 d0710d08 2019-07-22 stsp if (asprintf(&resolved, "%s/%s", cwd, arg) == -1) {
2623 d0710d08 2019-07-22 stsp err = got_error_from_errno("asprintf");
2624 d0710d08 2019-07-22 stsp goto done;
2628 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
2629 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
2630 6c7ab921 2019-03-18 stsp err = got_error(GOT_ERR_BAD_PATH);
2631 6c7ab921 2019-03-18 stsp goto done;
2634 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
2635 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
2636 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
2638 f6d88e1a 2019-05-29 stsp goto done;
2640 f6d88e1a 2019-05-29 stsp path = strdup("");
2641 f6d88e1a 2019-05-29 stsp if (path == NULL) {
2642 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
2643 f6d88e1a 2019-05-29 stsp goto done;
2647 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
2648 6c7ab921 2019-03-18 stsp len = strlen(path);
2649 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
2650 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
2654 6c7ab921 2019-03-18 stsp free(resolved);
2655 d0710d08 2019-07-22 stsp free(cwd);
2656 6c7ab921 2019-03-18 stsp if (err == NULL)
2657 6c7ab921 2019-03-18 stsp *wt_path = path;
2659 6c7ab921 2019-03-18 stsp free(path);
2660 d00136be 2019-03-26 stsp return err;
2663 07f5b47a 2019-06-02 stsp static const struct got_error *
2664 07f5b47a 2019-06-02 stsp schedule_addition(const char *ondisk_path, struct got_fileindex *fileindex,
2665 07f5b47a 2019-06-02 stsp const char *relpath, got_worktree_status_cb status_cb, void *status_arg,
2666 07f5b47a 2019-06-02 stsp struct got_repository *repo)
2668 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
2669 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
2670 6d022e97 2019-08-04 stsp unsigned char status;
2671 6d022e97 2019-08-04 stsp struct stat sb;
2673 6d022e97 2019-08-04 stsp ie = got_fileindex_entry_get(fileindex, relpath, strlen(relpath));
2675 6d022e97 2019-08-04 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2677 6d022e97 2019-08-04 stsp return err;
2678 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
2679 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
2680 6d022e97 2019-08-04 stsp return NULL;
2681 6d022e97 2019-08-04 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
2684 07f5b47a 2019-06-02 stsp err = got_fileindex_entry_alloc(&ie, ondisk_path, relpath, NULL, NULL);
2686 07f5b47a 2019-06-02 stsp return err;
2688 07f5b47a 2019-06-02 stsp err = got_fileindex_entry_add(fileindex, ie);
2689 07f5b47a 2019-06-02 stsp if (err) {
2690 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
2691 07f5b47a 2019-06-02 stsp return err;
2694 c02b99b6 2019-07-27 stsp return report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
2697 d00136be 2019-03-26 stsp const struct got_error *
2698 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
2699 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
2700 1dd54920 2019-05-11 stsp got_worktree_status_cb status_cb, void *status_arg,
2701 031a5338 2019-03-26 stsp struct got_repository *repo)
2703 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
2704 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2705 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2706 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
2708 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
2710 d00136be 2019-03-26 stsp return err;
2712 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2714 d00136be 2019-03-26 stsp goto done;
2716 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
2717 6d022e97 2019-08-04 stsp char *ondisk_path;
2718 6d022e97 2019-08-04 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path,
2719 6d022e97 2019-08-04 stsp pe->path) == -1)
2720 6d022e97 2019-08-04 stsp return got_error_from_errno("asprintf");
2721 6d022e97 2019-08-04 stsp err = schedule_addition(ondisk_path, fileindex, pe->path,
2722 07f5b47a 2019-06-02 stsp status_cb, status_arg, repo);
2723 6d022e97 2019-08-04 stsp free(ondisk_path);
2727 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2728 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2729 af12c6b9 2019-06-04 stsp err = sync_err;
2731 fb399478 2019-07-12 stsp free(fileindex_path);
2732 d00136be 2019-03-26 stsp if (fileindex)
2733 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
2734 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2735 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
2736 d00136be 2019-03-26 stsp err = unlockerr;
2737 6c7ab921 2019-03-18 stsp return err;
2740 17ed4618 2019-06-02 stsp static const struct got_error *
2741 17ed4618 2019-06-02 stsp schedule_for_deletion(const char *ondisk_path, struct got_fileindex *fileindex,
2742 17ed4618 2019-06-02 stsp const char *relpath, int delete_local_mods,
2743 17ed4618 2019-06-02 stsp got_worktree_status_cb status_cb, void *status_arg,
2744 17ed4618 2019-06-02 stsp struct got_repository *repo)
2746 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
2747 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
2748 9acbc4fa 2019-08-03 stsp unsigned char status, staged_status;
2749 17ed4618 2019-06-02 stsp struct stat sb;
2751 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, relpath, strlen(relpath));
2752 17ed4618 2019-06-02 stsp if (ie == NULL)
2753 17ed4618 2019-06-02 stsp return got_error(GOT_ERR_BAD_PATH);
2755 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
2756 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
2757 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
2758 9acbc4fa 2019-08-03 stsp return NULL;
2759 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
2762 17ed4618 2019-06-02 stsp err = get_file_status(&status, &sb, ie, ondisk_path, repo);
2764 17ed4618 2019-06-02 stsp return err;
2766 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
2767 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
2768 de426ea6 2019-08-03 stsp return NULL;
2769 f0b0c0ce 2019-08-04 stsp if (status == GOT_STATUS_MODIFY && !delete_local_mods)
2770 f0b0c0ce 2019-08-04 stsp return got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
2771 f0b0c0ce 2019-08-04 stsp if (status != GOT_STATUS_MODIFY &&
2772 f0b0c0ce 2019-08-04 stsp status != GOT_STATUS_MISSING)
2773 f0b0c0ce 2019-08-04 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
2776 f0b0c0ce 2019-08-04 stsp if (status != GOT_STATUS_MISSING && unlink(ondisk_path) != 0)
2777 17ed4618 2019-06-02 stsp return got_error_from_errno2("unlink", ondisk_path);
2779 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2780 17ed4618 2019-06-02 stsp return report_file_status(ie, ondisk_path, status_cb, status_arg, repo);
2783 2ec1f75b 2019-03-26 stsp const struct got_error *
2784 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
2785 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
2786 2ec1f75b 2019-03-26 stsp got_worktree_status_cb status_cb, void *status_arg,
2787 2ec1f75b 2019-03-26 stsp struct got_repository *repo)
2789 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
2790 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
2791 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2792 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
2794 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
2796 2ec1f75b 2019-03-26 stsp return err;
2798 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2800 2ec1f75b 2019-03-26 stsp goto done;
2802 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
2803 6d022e97 2019-08-04 stsp char *ondisk_path;
2804 6d022e97 2019-08-04 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path,
2805 6d022e97 2019-08-04 stsp pe->path) == -1)
2806 6d022e97 2019-08-04 stsp return got_error_from_errno("asprintf");
2807 6d022e97 2019-08-04 stsp err = schedule_for_deletion(ondisk_path, fileindex, pe->path,
2808 17ed4618 2019-06-02 stsp delete_local_mods, status_cb, status_arg, repo);
2809 6d022e97 2019-08-04 stsp free(ondisk_path);
2813 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2814 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2815 af12c6b9 2019-06-04 stsp err = sync_err;
2817 fb399478 2019-07-12 stsp free(fileindex_path);
2818 2ec1f75b 2019-03-26 stsp if (fileindex)
2819 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
2820 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2821 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
2822 2ec1f75b 2019-03-26 stsp err = unlockerr;
2823 33aa809d 2019-08-08 stsp return err;
2826 33aa809d 2019-08-08 stsp static const struct got_error *
2827 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
2829 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
2830 33aa809d 2019-08-08 stsp char *line = NULL;
2831 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
2832 33aa809d 2019-08-08 stsp ssize_t linelen;
2834 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
2835 33aa809d 2019-08-08 stsp if (linelen == -1) {
2836 33aa809d 2019-08-08 stsp if (ferror(infile)) {
2837 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
2838 33aa809d 2019-08-08 stsp goto done;
2840 33aa809d 2019-08-08 stsp return NULL;
2842 33aa809d 2019-08-08 stsp if (outfile) {
2843 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
2844 33aa809d 2019-08-08 stsp if (n != linelen) {
2845 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
2846 33aa809d 2019-08-08 stsp goto done;
2849 33aa809d 2019-08-08 stsp if (rejectfile) {
2850 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
2851 33aa809d 2019-08-08 stsp if (n != linelen)
2852 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
2855 33aa809d 2019-08-08 stsp free(line);
2856 2ec1f75b 2019-03-26 stsp return err;
2859 33aa809d 2019-08-08 stsp static const struct got_error *
2860 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
2862 33aa809d 2019-08-08 stsp char *line = NULL;
2863 33aa809d 2019-08-08 stsp size_t linesize = 0;
2864 33aa809d 2019-08-08 stsp ssize_t linelen;
2866 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
2867 500467ff 2019-09-25 hiltjo if (linelen == -1) {
2868 500467ff 2019-09-25 hiltjo if (ferror(f))
2869 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
2870 500467ff 2019-09-25 hiltjo return NULL;
2872 33aa809d 2019-08-08 stsp free(line);
2873 33aa809d 2019-08-08 stsp return NULL;
2876 33aa809d 2019-08-08 stsp static const struct got_error *
2877 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
2878 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
2879 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
2881 33aa809d 2019-08-08 stsp const struct got_error *err;
2883 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
2884 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
2885 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
2887 33aa809d 2019-08-08 stsp return err;
2888 33aa809d 2019-08-08 stsp (*line_cur1)++;
2890 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
2891 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
2892 33aa809d 2019-08-08 stsp if (rejectfile)
2893 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
2895 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
2897 33aa809d 2019-08-08 stsp return err;
2898 33aa809d 2019-08-08 stsp (*line_cur2)++;
2900 33aa809d 2019-08-08 stsp /* Copy patched lines. */
2901 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
2902 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
2904 33aa809d 2019-08-08 stsp return err;
2905 33aa809d 2019-08-08 stsp (*line_cur2)++;
2907 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
2908 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
2909 33aa809d 2019-08-08 stsp if (rejectfile)
2910 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
2912 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
2914 33aa809d 2019-08-08 stsp return err;
2915 33aa809d 2019-08-08 stsp (*line_cur1)++;
2918 f1e81a05 2019-08-10 stsp return NULL;
2921 f1e81a05 2019-08-10 stsp static const struct got_error *
2922 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
2923 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
2925 f1e81a05 2019-08-10 stsp const struct got_error *err;
2927 f1e81a05 2019-08-10 stsp if (outfile) {
2928 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
2929 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
2930 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
2932 f1e81a05 2019-08-10 stsp return err;
2933 f1e81a05 2019-08-10 stsp (*line_cur1)++;
2936 f1e81a05 2019-08-10 stsp if (rejectfile) {
2937 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
2938 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
2939 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
2941 f1e81a05 2019-08-10 stsp return err;
2942 f1e81a05 2019-08-10 stsp (*line_cur2)++;
2946 33aa809d 2019-08-08 stsp return NULL;
2949 33aa809d 2019-08-08 stsp static const struct got_error *
2950 33aa809d 2019-08-08 stsp apply_or_reject_change(int *choice, struct got_diff_change *change, int n,
2951 33aa809d 2019-08-08 stsp int nchanges, struct got_diff_state *ds, struct got_diff_args *args,
2952 33aa809d 2019-08-08 stsp int diff_flags, const char *relpath, FILE *f1, FILE *f2, int *line_cur1,
2953 33aa809d 2019-08-08 stsp int *line_cur2, FILE *outfile, FILE *rejectfile,
2954 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
2956 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
2957 33aa809d 2019-08-08 stsp int start_old = change->cv.a;
2958 33aa809d 2019-08-08 stsp int end_old = change->cv.b;
2959 33aa809d 2019-08-08 stsp int start_new = change->cv.c;
2960 33aa809d 2019-08-08 stsp int end_new = change->cv.d;
2961 33aa809d 2019-08-08 stsp long pos1, pos2;
2962 33aa809d 2019-08-08 stsp FILE *hunkfile;
2964 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
2966 33aa809d 2019-08-08 stsp hunkfile = got_opentemp();
2967 33aa809d 2019-08-08 stsp if (hunkfile == NULL)
2968 33aa809d 2019-08-08 stsp return got_error_from_errno("got_opentemp");
2970 33aa809d 2019-08-08 stsp pos1 = ftell(f1);
2971 33aa809d 2019-08-08 stsp pos2 = ftell(f2);
2973 33aa809d 2019-08-08 stsp /* XXX TODO needs error checking */
2974 33aa809d 2019-08-08 stsp got_diff_dump_change(hunkfile, change, ds, args, f1, f2, diff_flags);
2976 33aa809d 2019-08-08 stsp if (fseek(f1, pos1, SEEK_SET) == -1) {
2977 33aa809d 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
2978 33aa809d 2019-08-08 stsp goto done;
2980 33aa809d 2019-08-08 stsp if (fseek(f2, pos2, SEEK_SET) == -1) {
2981 33aa809d 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
2982 33aa809d 2019-08-08 stsp goto done;
2984 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
2985 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
2986 33aa809d 2019-08-08 stsp goto done;
2989 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
2990 33aa809d 2019-08-08 stsp hunkfile, n, nchanges);
2992 33aa809d 2019-08-08 stsp goto done;
2994 33aa809d 2019-08-08 stsp switch (*choice) {
2995 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
2996 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
2997 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
2999 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
3000 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
3001 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
3003 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
3006 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
3010 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
3011 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
3012 33aa809d 2019-08-08 stsp return err;
3015 1f1abb7e 2019-08-08 stsp struct revert_file_args {
3016 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
3017 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
3018 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
3019 1f1abb7e 2019-08-08 stsp void *progress_arg;
3020 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
3021 33aa809d 2019-08-08 stsp void *patch_arg;
3022 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
3025 e20a8b6f 2019-06-04 stsp static const struct got_error *
3026 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
3027 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
3028 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
3029 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
3031 33aa809d 2019-08-08 stsp const struct got_error *err;
3032 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
3033 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
3034 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
3035 33aa809d 2019-08-08 stsp struct stat sb1, sb2;
3036 33aa809d 2019-08-08 stsp struct got_diff_changes *changes = NULL;
3037 33aa809d 2019-08-08 stsp struct got_diff_state *ds = NULL;
3038 33aa809d 2019-08-08 stsp struct got_diff_args *args = NULL;
3039 33aa809d 2019-08-08 stsp struct got_diff_change *change;
3040 33aa809d 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, have_content = 0;
3041 33aa809d 2019-08-08 stsp int n = 0;
3043 33aa809d 2019-08-08 stsp *path_outfile = NULL;
3045 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
3047 33aa809d 2019-08-08 stsp return err;
3049 33aa809d 2019-08-08 stsp f2 = fopen(path2, "r");
3050 33aa809d 2019-08-08 stsp if (f2 == NULL) {
3051 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fopen", path2);
3052 33aa809d 2019-08-08 stsp goto done;
3055 33aa809d 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
3057 33aa809d 2019-08-08 stsp goto done;
3059 e635744c 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob");
3061 33aa809d 2019-08-08 stsp goto done;
3063 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
3065 33aa809d 2019-08-08 stsp goto done;
3067 33aa809d 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
3068 33aa809d 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
3069 33aa809d 2019-08-08 stsp goto done;
3071 33aa809d 2019-08-08 stsp if (stat(path2, &sb2) == -1) {
3072 33aa809d 2019-08-08 stsp err = got_error_from_errno2("stat", path2);
3073 33aa809d 2019-08-08 stsp goto done;
3076 33aa809d 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
3077 33aa809d 2019-08-08 stsp f1, sb1.st_size, id_str, f2, sb2.st_size, path2, 3, NULL);
3079 33aa809d 2019-08-08 stsp goto done;
3081 e635744c 2019-08-08 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
3083 33aa809d 2019-08-08 stsp goto done;
3085 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
3086 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
3087 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
3088 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
3089 33aa809d 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
3090 33aa809d 2019-08-08 stsp int choice;
3091 33aa809d 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
3092 33aa809d 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
3093 33aa809d 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
3094 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
3095 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
3096 e635744c 2019-08-08 stsp patch_cb, patch_arg);
3098 33aa809d 2019-08-08 stsp goto done;
3099 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
3100 33aa809d 2019-08-08 stsp have_content = 1;
3101 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
3104 f1e81a05 2019-08-10 stsp if (have_content)
3105 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
3106 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
3107 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
3109 33aa809d 2019-08-08 stsp free(id_str);
3111 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
3112 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
3113 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
3114 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
3115 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
3116 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
3117 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
3118 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
3119 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
3120 33aa809d 2019-08-08 stsp if (err || !have_content) {
3121 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
3122 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
3123 33aa809d 2019-08-08 stsp free(*path_outfile);
3124 33aa809d 2019-08-08 stsp *path_outfile = NULL;
3126 33aa809d 2019-08-08 stsp free(args);
3128 33aa809d 2019-08-08 stsp got_diff_state_free(ds);
3131 33aa809d 2019-08-08 stsp if (changes)
3132 33aa809d 2019-08-08 stsp got_diff_free_changes(changes);
3133 33aa809d 2019-08-08 stsp free(path1);
3134 33aa809d 2019-08-08 stsp return err;
3137 33aa809d 2019-08-08 stsp static const struct got_error *
3138 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
3139 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
3140 1f1abb7e 2019-08-08 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
3142 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
3143 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
3144 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
3145 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
3146 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
3147 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
3148 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
3149 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
3150 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
3151 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
3153 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
3154 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
3155 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
3156 d3bcc3d1 2019-08-08 stsp return NULL;
3158 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
3159 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
3160 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
3162 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3163 65084dad 2019-08-08 stsp if (ie == NULL)
3164 65084dad 2019-08-08 stsp return got_error(GOT_ERR_BAD_PATH);
3166 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
3167 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
3168 a129376b 2019-03-28 stsp if (err) {
3169 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
3170 a129376b 2019-03-28 stsp goto done;
3171 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
3172 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
3173 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
3174 e20a8b6f 2019-06-04 stsp goto done;
3177 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
3178 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
3179 a129376b 2019-03-28 stsp if (tree_path == NULL) {
3180 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3181 a129376b 2019-03-28 stsp goto done;
3184 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
3185 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
3186 a129376b 2019-03-28 stsp if (tree_path == NULL) {
3187 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3188 a129376b 2019-03-28 stsp goto done;
3191 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
3192 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
3193 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3194 a129376b 2019-03-28 stsp goto done;
3199 1f1abb7e 2019-08-08 stsp err = got_object_id_by_path(&tree_id, a->repo,
3200 1f1abb7e 2019-08-08 stsp a->worktree->base_commit_id, tree_path);
3201 a9fa2909 2019-07-27 stsp if (err) {
3202 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
3203 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
3204 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
3205 a9fa2909 2019-07-27 stsp goto done;
3207 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
3209 a9fa2909 2019-07-27 stsp goto done;
3211 a9fa2909 2019-07-27 stsp te_name = basename(ie->path);
3212 a9fa2909 2019-07-27 stsp if (te_name == NULL) {
3213 a9fa2909 2019-07-27 stsp err = got_error_from_errno2("basename", ie->path);
3214 a9fa2909 2019-07-27 stsp goto done;
3217 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
3218 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
3219 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
3220 a9fa2909 2019-07-27 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
3221 a9fa2909 2019-07-27 stsp goto done;
3225 a129376b 2019-03-28 stsp switch (status) {
3226 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
3227 33aa809d 2019-08-08 stsp if (a->patch_cb) {
3228 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
3229 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
3230 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
3232 33aa809d 2019-08-08 stsp goto done;
3233 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
3236 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
3237 1f1abb7e 2019-08-08 stsp ie->path);
3239 1ee397ad 2019-07-12 stsp goto done;
3240 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
3242 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
3243 33aa809d 2019-08-08 stsp if (a->patch_cb) {
3244 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
3245 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
3246 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
3248 33aa809d 2019-08-08 stsp goto done;
3249 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
3252 33aa809d 2019-08-08 stsp /* fall through */
3253 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
3254 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
3255 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
3256 e20a8b6f 2019-06-04 stsp struct got_object_id id;
3257 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3258 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3259 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1,
3260 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3262 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1,
3263 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3264 1f1abb7e 2019-08-08 stsp err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
3266 65084dad 2019-08-08 stsp goto done;
3268 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
3269 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
3270 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
3271 a129376b 2019-03-28 stsp goto done;
3274 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
3275 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
3276 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
3277 33aa809d 2019-08-08 stsp ondisk_path, ie->path, a->repo,
3278 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
3279 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
3281 33aa809d 2019-08-08 stsp if (rename(path_content, ondisk_path) == -1) {
3282 33aa809d 2019-08-08 stsp err = got_error_from_errno3("rename",
3283 33aa809d 2019-08-08 stsp path_content, ondisk_path);
3284 33aa809d 2019-08-08 stsp goto done;
3287 33aa809d 2019-08-08 stsp err = install_blob(a->worktree, ondisk_path, ie->path,
3288 33aa809d 2019-08-08 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
3289 33aa809d 2019-08-08 stsp got_fileindex_perms_to_st(ie), blob, 0, 1,
3290 33aa809d 2019-08-08 stsp a->repo, a->progress_cb, a->progress_arg);
3292 a129376b 2019-03-28 stsp goto done;
3293 33aa809d 2019-08-08 stsp if (status == GOT_STATUS_DELETE) {
3294 33aa809d 2019-08-08 stsp err = update_blob_fileindex_entry(a->worktree,
3295 33aa809d 2019-08-08 stsp a->fileindex, ie, ondisk_path, ie->path,
3298 33aa809d 2019-08-08 stsp goto done;
3307 1f1abb7e 2019-08-08 stsp free(ondisk_path);
3308 33aa809d 2019-08-08 stsp free(path_content);
3309 e20a8b6f 2019-06-04 stsp free(parent_path);
3310 a129376b 2019-03-28 stsp free(tree_path);
3312 a129376b 2019-03-28 stsp got_object_blob_close(blob);
3314 a129376b 2019-03-28 stsp got_object_tree_close(tree);
3315 a129376b 2019-03-28 stsp free(tree_id);
3316 e20a8b6f 2019-06-04 stsp return err;
3319 e20a8b6f 2019-06-04 stsp const struct got_error *
3320 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
3321 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
3322 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3323 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
3324 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
3326 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
3327 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
3328 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
3329 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
3330 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
3331 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
3333 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
3335 e20a8b6f 2019-06-04 stsp return err;
3337 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3339 e20a8b6f 2019-06-04 stsp goto done;
3341 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
3342 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
3343 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
3344 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
3345 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
3346 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
3347 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
3348 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
3349 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3350 1f1abb7e 2019-08-08 stsp revert_file, &rfa, NULL, NULL);
3354 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3355 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
3356 e20a8b6f 2019-06-04 stsp err = sync_err;
3358 fb399478 2019-07-12 stsp free(fileindex_path);
3359 a129376b 2019-03-28 stsp if (fileindex)
3360 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
3361 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3362 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
3363 a129376b 2019-03-28 stsp err = unlockerr;
3364 c4296144 2019-05-09 stsp return err;
3367 cf066bf8 2019-05-09 stsp static void
3368 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
3370 24519714 2019-05-09 stsp free(ct->path);
3371 44d03001 2019-05-09 stsp free(ct->in_repo_path);
3372 768aea60 2019-05-09 stsp free(ct->ondisk_path);
3373 e75eb4da 2019-05-10 stsp free(ct->blob_id);
3374 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
3375 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
3376 b416585c 2019-05-13 stsp free(ct->base_commit_id);
3380 ed175427 2019-05-09 stsp struct collect_commitables_arg {
3381 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
3382 24519714 2019-05-09 stsp struct got_repository *repo;
3383 24519714 2019-05-09 stsp struct got_worktree *worktree;
3384 5f8a88c6 2019-08-03 stsp int have_staged_files;
3387 c4296144 2019-05-09 stsp static const struct got_error *
3388 88d0e355 2019-08-03 stsp collect_commitables(void *arg, unsigned char status,
3389 88d0e355 2019-08-03 stsp unsigned char staged_status, const char *relpath,
3390 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3391 537ac44b 2019-08-03 stsp struct got_object_id *commit_id)
3393 ed175427 2019-05-09 stsp struct collect_commitables_arg *a = arg;
3394 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
3395 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
3396 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
3397 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
3398 768aea60 2019-05-09 stsp struct stat sb;
3400 5f8a88c6 2019-08-03 stsp if (a->have_staged_files) {
3401 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
3402 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
3403 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
3404 5f8a88c6 2019-08-03 stsp return NULL;
3406 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
3407 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
3409 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
3410 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
3411 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
3412 5f8a88c6 2019-08-03 stsp return NULL;
3415 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
3416 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3417 036813ee 2019-05-09 stsp goto done;
3419 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
3420 036813ee 2019-05-09 stsp parent_path = strdup("");
3421 69960a46 2019-05-09 stsp if (parent_path == NULL)
3422 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
3424 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
3426 69960a46 2019-05-09 stsp return err;
3429 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
3430 cf066bf8 2019-05-09 stsp if (ct == NULL) {
3431 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
3432 c4296144 2019-05-09 stsp goto done;
3435 768aea60 2019-05-09 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
3436 768aea60 2019-05-09 stsp relpath) == -1) {
3437 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3438 768aea60 2019-05-09 stsp goto done;
3440 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_DELETE || staged_status == GOT_STATUS_DELETE) {
3441 768aea60 2019-05-09 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
3443 768aea60 2019-05-09 stsp if (lstat(ct->ondisk_path, &sb) != 0) {
3444 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
3445 768aea60 2019-05-09 stsp goto done;
3447 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
3450 44d03001 2019-05-09 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
3451 44d03001 2019-05-09 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
3452 44d03001 2019-05-09 stsp relpath) == -1) {
3453 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3454 44d03001 2019-05-09 stsp goto done;
3457 cf066bf8 2019-05-09 stsp ct->status = status;
3458 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
3459 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
3460 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
3461 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
3462 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
3463 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
3464 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3465 b416585c 2019-05-13 stsp goto done;
3467 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
3468 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
3469 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
3470 f0b75401 2019-08-03 stsp goto done;
3473 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
3474 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
3475 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
3476 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
3477 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3478 036813ee 2019-05-09 stsp goto done;
3481 24519714 2019-05-09 stsp ct->path = strdup(path);
3482 24519714 2019-05-09 stsp if (ct->path == NULL) {
3483 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3484 24519714 2019-05-09 stsp goto done;
3486 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
3488 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
3489 ed175427 2019-05-09 stsp free_commitable(ct);
3490 24519714 2019-05-09 stsp free(parent_path);
3491 036813ee 2019-05-09 stsp free(path);
3492 a129376b 2019-03-28 stsp return err;
3495 036813ee 2019-05-09 stsp static const struct got_error *write_tree(struct got_object_id **,
3496 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
3497 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3498 036813ee 2019-05-09 stsp struct got_repository *);
3500 ed175427 2019-05-09 stsp static const struct got_error *
3501 036813ee 2019-05-09 stsp write_subtree(struct got_object_id **new_subtree_id,
3502 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
3503 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
3504 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3505 afa376bf 2019-05-09 stsp struct got_repository *repo)
3507 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
3508 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
3509 036813ee 2019-05-09 stsp char *subpath;
3511 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
3512 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
3513 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3515 036813ee 2019-05-09 stsp err = got_object_open_as_tree(&subtree, repo, te->id);
3517 ed175427 2019-05-09 stsp return err;
3519 036813ee 2019-05-09 stsp err = write_tree(new_subtree_id, subtree, subpath, commitable_paths,
3520 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
3521 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
3522 036813ee 2019-05-09 stsp free(subpath);
3523 036813ee 2019-05-09 stsp return err;
3526 036813ee 2019-05-09 stsp static const struct got_error *
3527 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
3529 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3530 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
3532 036813ee 2019-05-09 stsp *match = 0;
3534 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
3535 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
3536 0f63689d 2019-05-10 stsp return NULL;
3539 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
3541 0f63689d 2019-05-10 stsp return err;
3542 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
3543 036813ee 2019-05-09 stsp free(ct_parent_path);
3544 036813ee 2019-05-09 stsp return err;
3547 768aea60 2019-05-09 stsp static mode_t
3548 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
3550 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
3553 036813ee 2019-05-09 stsp static const struct got_error *
3554 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
3555 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
3557 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3559 036813ee 2019-05-09 stsp *new_te = NULL;
3561 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
3563 036813ee 2019-05-09 stsp goto done;
3565 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
3567 036813ee 2019-05-09 stsp free((*new_te)->id);
3568 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
3569 5f8a88c6 2019-08-03 stsp (*new_te)->id = got_object_id_dup(ct->staged_blob_id);
3571 5f8a88c6 2019-08-03 stsp (*new_te)->id = got_object_id_dup(ct->blob_id);
3572 036813ee 2019-05-09 stsp if ((*new_te)->id == NULL) {
3573 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3574 036813ee 2019-05-09 stsp goto done;
3577 036813ee 2019-05-09 stsp if (err && *new_te) {
3578 036813ee 2019-05-09 stsp got_object_tree_entry_close(*new_te);
3579 036813ee 2019-05-09 stsp *new_te = NULL;
3581 036813ee 2019-05-09 stsp return err;
3584 036813ee 2019-05-09 stsp static const struct got_error *
3585 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
3586 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
3588 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3589 036813ee 2019-05-09 stsp char *ct_name;
3591 036813ee 2019-05-09 stsp *new_te = NULL;
3593 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
3594 036813ee 2019-05-09 stsp if (*new_te == NULL)
3595 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
3597 036813ee 2019-05-09 stsp ct_name = basename(ct->path);
3598 036813ee 2019-05-09 stsp if (ct_name == NULL) {
3599 638f9024 2019-05-13 stsp err = got_error_from_errno2("basename", ct->path);
3600 036813ee 2019-05-09 stsp goto done;
3602 036813ee 2019-05-09 stsp (*new_te)->name = strdup(ct_name);
3603 036813ee 2019-05-09 stsp if ((*new_te)->name == NULL) {
3604 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3605 036813ee 2019-05-09 stsp goto done;
3608 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
3610 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
3611 5f8a88c6 2019-08-03 stsp (*new_te)->id = got_object_id_dup(ct->staged_blob_id);
3613 5f8a88c6 2019-08-03 stsp (*new_te)->id = got_object_id_dup(ct->blob_id);
3614 036813ee 2019-05-09 stsp if ((*new_te)->id == NULL) {
3615 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3616 036813ee 2019-05-09 stsp goto done;
3619 036813ee 2019-05-09 stsp if (err && *new_te) {
3620 036813ee 2019-05-09 stsp got_object_tree_entry_close(*new_te);
3621 036813ee 2019-05-09 stsp *new_te = NULL;
3623 036813ee 2019-05-09 stsp return err;
3626 036813ee 2019-05-09 stsp static const struct got_error *
3627 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
3628 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
3630 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3631 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
3633 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
3635 036813ee 2019-05-09 stsp return err;
3636 036813ee 2019-05-09 stsp if (new_pe == NULL)
3637 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
3638 036813ee 2019-05-09 stsp return NULL;
3641 afa376bf 2019-05-09 stsp static const struct got_error *
3642 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
3643 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
3645 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
3646 5f8a88c6 2019-08-03 stsp unsigned char status;
3648 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
3649 afa376bf 2019-05-09 stsp ct_path++;
3651 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
3652 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
3654 5f8a88c6 2019-08-03 stsp status = ct->status;
3656 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
3657 537ac44b 2019-08-03 stsp ct_path, ct->blob_id, NULL, NULL);
3660 036813ee 2019-05-09 stsp static const struct got_error *
3661 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
3662 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
3664 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
3665 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
3666 44d03001 2019-05-09 stsp char *te_path;
3668 44d03001 2019-05-09 stsp *modified = 0;
3670 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
3671 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
3672 44d03001 2019-05-09 stsp te->name) == -1)
3673 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3675 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3676 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3677 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
3678 44d03001 2019-05-09 stsp strlen(te_path));
3679 44d03001 2019-05-09 stsp if (*modified)
3683 44d03001 2019-05-09 stsp free(te_path);
3684 44d03001 2019-05-09 stsp return err;
3687 44d03001 2019-05-09 stsp static const struct got_error *
3688 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
3689 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
3690 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
3692 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3693 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
3695 036813ee 2019-05-09 stsp *ctp = NULL;
3697 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3698 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3699 036813ee 2019-05-09 stsp char *ct_name = NULL;
3700 036813ee 2019-05-09 stsp int path_matches;
3702 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
3703 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
3704 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
3707 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
3708 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
3712 c4e12a88 2019-05-13 stsp if (got_object_id_cmp(ct->base_blob_id, te->id) != 0)
3715 036813ee 2019-05-09 stsp err = match_ct_parent_path(&path_matches, ct, base_tree_path);
3717 036813ee 2019-05-09 stsp return err;
3718 036813ee 2019-05-09 stsp if (!path_matches)
3721 036813ee 2019-05-09 stsp ct_name = basename(pe->path);
3722 036813ee 2019-05-09 stsp if (ct_name == NULL)
3723 638f9024 2019-05-13 stsp return got_error_from_errno2("basename", pe->path);
3725 036813ee 2019-05-09 stsp if (strcmp(te->name, ct_name) != 0)
3728 036813ee 2019-05-09 stsp *ctp = ct;
3732 2b496619 2019-07-10 stsp return err;
3735 2b496619 2019-07-10 stsp static const struct got_error *
3736 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
3737 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
3738 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
3739 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
3740 2b496619 2019-07-10 stsp struct got_repository *repo)
3742 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
3743 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
3744 2b496619 2019-07-10 stsp char *subtree_path;
3746 2b496619 2019-07-10 stsp *new_tep = NULL;
3748 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
3749 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
3750 2b496619 2019-07-10 stsp child_path) == -1)
3751 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
3753 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
3754 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
3755 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
3756 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
3757 2b496619 2019-07-10 stsp new_te->name = strdup(child_path);
3758 2b496619 2019-07-10 stsp if (new_te->name == NULL) {
3759 2b496619 2019-07-10 stsp err = got_error_from_errno("strdup");
3760 2b496619 2019-07-10 stsp got_object_tree_entry_close(new_te);
3761 2b496619 2019-07-10 stsp goto done;
3763 2b496619 2019-07-10 stsp err = write_tree(&new_te->id, NULL, subtree_path,
3764 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
3765 2b496619 2019-07-10 stsp if (err) {
3766 2b496619 2019-07-10 stsp got_object_tree_entry_close(new_te);
3767 2b496619 2019-07-10 stsp goto done;
3770 2b496619 2019-07-10 stsp free(subtree_path);
3771 2b496619 2019-07-10 stsp if (err == NULL)
3772 2b496619 2019-07-10 stsp *new_tep = new_te;
3773 036813ee 2019-05-09 stsp return err;
3776 036813ee 2019-05-09 stsp static const struct got_error *
3777 036813ee 2019-05-09 stsp write_tree(struct got_object_id **new_tree_id,
3778 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
3779 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
3780 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3781 036813ee 2019-05-09 stsp struct got_repository *repo)
3783 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3784 036813ee 2019-05-09 stsp const struct got_tree_entries *base_entries = NULL;
3785 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
3786 036813ee 2019-05-09 stsp struct got_tree_entries new_tree_entries;
3787 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
3788 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
3790 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
3791 036813ee 2019-05-09 stsp new_tree_entries.nentries = 0;
3792 036813ee 2019-05-09 stsp SIMPLEQ_INIT(&new_tree_entries.head);
3794 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
3795 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3796 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3797 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
3799 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
3800 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
3801 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
3804 036813ee 2019-05-09 stsp if (!got_path_is_child(pe->path, path_base_tree,
3805 2f51b5b3 2019-05-09 stsp strlen(path_base_tree)))
3808 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
3809 036813ee 2019-05-09 stsp pe->path);
3811 036813ee 2019-05-09 stsp goto done;
3813 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
3814 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
3815 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
3817 036813ee 2019-05-09 stsp goto done;
3818 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
3820 afa376bf 2019-05-09 stsp goto done;
3821 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
3822 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
3824 2f51b5b3 2019-05-09 stsp goto done;
3826 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
3827 2b496619 2019-07-10 stsp if (base_tree == NULL ||
3828 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
3829 2b496619 2019-07-10 stsp == NULL) {
3830 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
3831 2b496619 2019-07-10 stsp child_path, path_base_tree,
3832 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
3835 2b496619 2019-07-10 stsp goto done;
3836 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
3838 2b496619 2019-07-10 stsp goto done;
3843 2f51b5b3 2019-05-09 stsp if (base_tree) {
3844 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
3845 2f51b5b3 2019-05-09 stsp base_entries = got_object_tree_get_entries(base_tree);
3846 2f51b5b3 2019-05-09 stsp SIMPLEQ_FOREACH(te, &base_entries->head, entry) {
3847 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
3849 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
3850 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
3851 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
3853 63c5ca5d 2019-08-24 stsp goto done;
3854 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
3856 63c5ca5d 2019-08-24 stsp goto done;
3860 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
3861 44d03001 2019-05-09 stsp int modified;
3862 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
3864 036813ee 2019-05-09 stsp goto done;
3865 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
3866 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
3868 2f51b5b3 2019-05-09 stsp goto done;
3869 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
3870 44d03001 2019-05-09 stsp if (modified) {
3871 44d03001 2019-05-09 stsp free(new_te->id);
3872 44d03001 2019-05-09 stsp err = write_subtree(&new_te->id, te,
3873 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
3874 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
3876 44d03001 2019-05-09 stsp goto done;
3878 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
3880 036813ee 2019-05-09 stsp goto done;
3884 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
3885 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
3887 f66c734c 2019-09-22 stsp goto done;
3889 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
3890 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
3891 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
3892 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
3893 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
3895 2f51b5b3 2019-05-09 stsp goto done;
3896 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
3898 2f51b5b3 2019-05-09 stsp goto done;
3900 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
3901 b416585c 2019-05-13 stsp status_arg);
3903 afa376bf 2019-05-09 stsp goto done;
3905 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
3906 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
3908 2f51b5b3 2019-05-09 stsp goto done;
3909 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
3911 2f51b5b3 2019-05-09 stsp goto done;
3916 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
3917 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, &paths, entry) {
3918 0b5cc0d6 2019-05-09 stsp struct got_tree_entry *te = pe->data;
3919 0b5cc0d6 2019-05-09 stsp new_tree_entries.nentries++;
3920 0b5cc0d6 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&new_tree_entries.head, te, entry);
3922 036813ee 2019-05-09 stsp err = got_object_tree_create(new_tree_id, &new_tree_entries, repo);
3924 ca2503ea 2019-05-09 stsp got_object_tree_entries_close(&new_tree_entries);
3925 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
3926 ed175427 2019-05-09 stsp return err;
3929 ebf99748 2019-05-09 stsp static const struct got_error *
3930 ebf99748 2019-05-09 stsp update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
3931 72fd46fa 2019-09-06 stsp struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex,
3932 72fd46fa 2019-09-06 stsp int have_staged_files)
3934 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
3935 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
3937 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
3938 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
3939 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
3941 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
3943 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
3944 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
3945 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
3946 ebf99748 2019-05-09 stsp got_fileindex_entry_free(ie);
3947 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
3948 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
3949 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
3950 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
3951 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
3952 5f8a88c6 2019-08-03 stsp ct->ondisk_path, ct->staged_blob_id->sha1,
3953 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
3954 72fd46fa 2019-09-06 stsp !have_staged_files);
3956 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
3957 e75eb4da 2019-05-10 stsp ct->ondisk_path, ct->blob_id->sha1,
3958 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
3959 72fd46fa 2019-09-06 stsp !have_staged_files);
3961 ebf99748 2019-05-09 stsp err = got_fileindex_entry_alloc(&ie,
3962 e75eb4da 2019-05-10 stsp ct->ondisk_path, pe->path, ct->blob_id->sha1,
3963 ebf99748 2019-05-09 stsp new_base_commit_id->sha1);
3966 ebf99748 2019-05-09 stsp err = got_fileindex_entry_add(fileindex, ie);
3971 d56d26ce 2019-05-10 stsp return err;
3975 d56d26ce 2019-05-10 stsp static const struct got_error *
3976 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
3977 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
3978 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
3979 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
3980 735ef5ac 2019-08-03 stsp int ood_errcode)
3982 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
3983 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
3985 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
3986 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
3987 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
3988 1a36436d 2019-06-10 stsp return NULL;
3990 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
3991 9bead371 2019-07-28 stsp * on matches file content in the branch head.
3993 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
3994 735ef5ac 2019-08-03 stsp in_repo_path);
3995 9bead371 2019-07-28 stsp if (err) {
3996 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
3997 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
3998 1a36436d 2019-06-10 stsp goto done;
3999 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
4000 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
4002 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
4003 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
4004 735ef5ac 2019-08-03 stsp in_repo_path);
4005 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
4006 1a36436d 2019-06-10 stsp goto done;
4007 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
4011 1a36436d 2019-06-10 stsp return err;
4014 c4296144 2019-05-09 stsp const struct got_error *
4015 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
4016 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
4017 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id, struct got_worktree *worktree,
4018 5c1e53bc 2019-07-28 stsp const char *author, const char *committer,
4019 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
4020 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4021 afa376bf 2019-05-09 stsp struct got_repository *repo)
4023 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4024 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
4025 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
4026 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
4027 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
4028 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
4029 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
4030 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
4031 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
4032 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
4033 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
4035 c4296144 2019-05-09 stsp *new_commit_id = NULL;
4037 de18fc63 2019-05-09 stsp SIMPLEQ_INIT(&parent_ids);
4039 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
4041 588edf97 2019-05-10 stsp goto done;
4043 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
4045 588edf97 2019-05-10 stsp goto done;
4047 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
4048 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
4053 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
4054 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
4058 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
4059 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4060 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4061 cf066bf8 2019-05-09 stsp char *ondisk_path;
4063 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
4064 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
4065 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
4068 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
4069 cf066bf8 2019-05-09 stsp ct->status != GOT_STATUS_MODIFY)
4072 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
4073 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
4074 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4075 cf066bf8 2019-05-09 stsp goto done;
4077 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
4078 a7055788 2019-05-09 stsp free(ondisk_path);
4080 cf066bf8 2019-05-09 stsp goto done;
4083 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
4084 39cd0ff6 2019-07-12 stsp err = write_tree(&new_tree_id, head_tree, "/", commitable_paths,
4085 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
4087 036813ee 2019-05-09 stsp goto done;
4089 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
4091 de18fc63 2019-05-09 stsp goto done;
4092 de18fc63 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
4093 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
4094 de18fc63 2019-05-09 stsp 1, author, time(NULL), committer, time(NULL), logmsg, repo);
4095 de18fc63 2019-05-09 stsp got_object_qid_free(pid);
4096 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
4097 33ad4cbe 2019-05-12 jcs free(logmsg);
4099 9d40349a 2019-05-09 stsp goto done;
4101 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
4102 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
4103 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
4104 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
4105 09f5bd90 2019-05-09 stsp goto done;
4107 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
4108 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
4110 09f5bd90 2019-05-09 stsp goto done;
4111 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
4113 ebf99748 2019-05-09 stsp goto done;
4114 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
4115 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
4116 09f5bd90 2019-05-09 stsp goto done;
4118 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
4119 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
4121 f2c16586 2019-05-09 stsp goto done;
4122 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
4124 f2c16586 2019-05-09 stsp goto done;
4126 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
4128 09f5bd90 2019-05-09 stsp goto done;
4130 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
4132 ebf99748 2019-05-09 stsp goto done;
4134 588edf97 2019-05-10 stsp if (head_tree)
4135 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
4136 588edf97 2019-05-10 stsp if (head_commit)
4137 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
4138 09f5bd90 2019-05-09 stsp free(head_commit_id2);
4139 2f17228e 2019-05-12 stsp if (head_ref2) {
4140 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
4141 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
4142 2f17228e 2019-05-12 stsp err = unlockerr;
4143 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
4145 39cd0ff6 2019-07-12 stsp return err;
4148 5c1e53bc 2019-07-28 stsp static const struct got_error *
4149 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
4150 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
4152 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
4153 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
4155 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
4156 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
4157 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
4159 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
4160 5c1e53bc 2019-07-28 stsp ct_path++;
4162 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
4163 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
4167 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
4168 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
4170 5c1e53bc 2019-07-28 stsp return NULL;
4173 f0b75401 2019-08-03 stsp static const struct got_error *
4174 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
4176 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
4178 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
4179 f0b75401 2019-08-03 stsp *have_staged_files = 1;
4180 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
4183 f0b75401 2019-08-03 stsp return NULL;
4186 5f8a88c6 2019-08-03 stsp static const struct got_error *
4187 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
4188 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
4190 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
4191 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
4193 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
4194 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
4196 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
4197 5f8a88c6 2019-08-03 stsp if (ie == NULL)
4198 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
4199 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
4200 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
4201 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
4204 5f8a88c6 2019-08-03 stsp return NULL;
4207 39cd0ff6 2019-07-12 stsp const struct got_error *
4208 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
4209 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
4210 39cd0ff6 2019-07-12 stsp const char *author, const char *committer,
4211 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
4212 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
4213 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
4215 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
4216 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
4217 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
4218 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
4219 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
4220 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
4221 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
4222 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
4223 f0b75401 2019-08-03 stsp int have_staged_files = 0;
4225 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
4227 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
4229 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
4231 39cd0ff6 2019-07-12 stsp goto done;
4233 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
4235 39cd0ff6 2019-07-12 stsp goto done;
4237 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
4239 39cd0ff6 2019-07-12 stsp goto done;
4241 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4243 39cd0ff6 2019-07-12 stsp goto done;
4245 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
4246 5f8a88c6 2019-08-03 stsp &have_staged_files);
4247 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
4248 5f8a88c6 2019-08-03 stsp goto done;
4249 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
4250 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
4252 5f8a88c6 2019-08-03 stsp goto done;
4255 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
4256 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
4257 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
4258 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
4259 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
4260 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4261 5c1e53bc 2019-07-28 stsp collect_commitables, &cc_arg, NULL, NULL);
4263 5c1e53bc 2019-07-28 stsp goto done;
4266 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
4267 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
4268 39cd0ff6 2019-07-12 stsp goto done;
4271 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
4272 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
4274 5c1e53bc 2019-07-28 stsp goto done;
4277 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
4278 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
4279 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
4281 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
4282 f0b75401 2019-08-03 stsp ct_path++;
4283 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
4284 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
4285 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
4287 b50cabdf 2019-07-12 stsp goto done;
4291 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
4292 5c1e53bc 2019-07-28 stsp head_commit_id, worktree, author, committer,
4293 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
4295 39cd0ff6 2019-07-12 stsp goto done;
4297 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
4298 72fd46fa 2019-09-06 stsp fileindex, have_staged_files);
4299 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4300 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
4301 39cd0ff6 2019-07-12 stsp err = sync_err;
4303 39cd0ff6 2019-07-12 stsp if (fileindex)
4304 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
4305 39cd0ff6 2019-07-12 stsp free(fileindex_path);
4306 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4307 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
4308 39cd0ff6 2019-07-12 stsp err = unlockerr;
4309 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
4310 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
4311 39cd0ff6 2019-07-12 stsp free_commitable(ct);
4313 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
4314 c4296144 2019-05-09 stsp return err;
4317 8656d6c4 2019-05-20 stsp const char *
4318 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
4320 8656d6c4 2019-05-20 stsp return ct->path;
4323 8656d6c4 2019-05-20 stsp unsigned int
4324 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
4326 8656d6c4 2019-05-20 stsp return ct->status;
4329 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
4330 818c7501 2019-07-11 stsp struct got_worktree *worktree;
4331 818c7501 2019-07-11 stsp struct got_repository *repo;
4334 818c7501 2019-07-11 stsp static const struct got_error *
4335 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
4337 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
4338 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
4339 818c7501 2019-07-11 stsp unsigned char status;
4340 818c7501 2019-07-11 stsp struct stat sb;
4341 818c7501 2019-07-11 stsp char *ondisk_path;
4343 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
4344 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
4345 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
4346 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
4348 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
4350 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
4352 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
4353 818c7501 2019-07-11 stsp err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
4354 818c7501 2019-07-11 stsp free(ondisk_path);
4356 818c7501 2019-07-11 stsp return err;
4358 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
4359 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
4360 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
4361 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
4363 818c7501 2019-07-11 stsp return NULL;
4366 818c7501 2019-07-11 stsp const struct got_error *
4367 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
4368 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
4369 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
4370 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
4372 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
4373 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
4374 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
4375 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
4376 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
4377 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
4379 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
4380 818c7501 2019-07-11 stsp *tmp_branch = NULL;
4381 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4383 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
4385 818c7501 2019-07-11 stsp return err;
4387 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
4389 818c7501 2019-07-11 stsp goto done;
4391 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
4392 818c7501 2019-07-11 stsp ok_arg.repo = repo;
4393 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
4396 818c7501 2019-07-11 stsp goto done;
4398 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4400 818c7501 2019-07-11 stsp goto done;
4402 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4404 818c7501 2019-07-11 stsp goto done;
4406 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4408 818c7501 2019-07-11 stsp goto done;
4410 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
4413 818c7501 2019-07-11 stsp goto done;
4415 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
4416 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
4418 818c7501 2019-07-11 stsp goto done;
4419 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
4421 818c7501 2019-07-11 stsp goto done;
4423 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
4425 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
4427 818c7501 2019-07-11 stsp goto done;
4429 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
4431 818c7501 2019-07-11 stsp goto done;
4433 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
4434 818c7501 2019-07-11 stsp worktree->base_commit_id);
4436 818c7501 2019-07-11 stsp goto done;
4437 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
4439 818c7501 2019-07-11 stsp goto done;
4441 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
4443 818c7501 2019-07-11 stsp goto done;
4445 818c7501 2019-07-11 stsp free(fileindex_path);
4446 818c7501 2019-07-11 stsp free(tmp_branch_name);
4447 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
4448 818c7501 2019-07-11 stsp free(branch_ref_name);
4449 818c7501 2019-07-11 stsp if (branch_ref)
4450 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
4451 818c7501 2019-07-11 stsp if (wt_branch)
4452 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
4453 818c7501 2019-07-11 stsp if (err) {
4454 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
4455 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
4456 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
4458 818c7501 2019-07-11 stsp if (*tmp_branch) {
4459 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
4460 818c7501 2019-07-11 stsp *tmp_branch = NULL;
4462 3e3a69f1 2019-07-25 stsp if (*fileindex) {
4463 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
4464 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4466 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
4468 818c7501 2019-07-11 stsp return err;
4471 818c7501 2019-07-11 stsp const struct got_error *
4472 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
4473 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
4474 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
4475 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
4477 818c7501 2019-07-11 stsp const struct got_error *err;
4478 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
4479 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
4480 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
4481 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
4482 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
4484 818c7501 2019-07-11 stsp *commit_id = NULL;
4485 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
4486 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
4487 3e3a69f1 2019-07-25 stsp *branch = NULL;
4488 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4490 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
4492 3e3a69f1 2019-07-25 stsp return err;
4494 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
4496 f032f1f7 2019-08-04 stsp goto done;
4498 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
4499 f032f1f7 2019-08-04 stsp &have_staged_files);
4500 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
4501 f032f1f7 2019-08-04 stsp goto done;
4502 f032f1f7 2019-08-04 stsp if (have_staged_files) {
4503 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
4504 3e3a69f1 2019-07-25 stsp goto done;
4507 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4509 f032f1f7 2019-08-04 stsp goto done;
4511 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4513 818c7501 2019-07-11 stsp goto done;
4515 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4517 818c7501 2019-07-11 stsp goto done;
4519 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4521 818c7501 2019-07-11 stsp goto done;
4523 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
4525 818c7501 2019-07-11 stsp goto done;
4527 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
4528 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
4530 818c7501 2019-07-11 stsp goto done;
4532 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4534 818c7501 2019-07-11 stsp goto done;
4536 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
4538 818c7501 2019-07-11 stsp goto done;
4540 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
4541 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
4543 818c7501 2019-07-11 stsp goto done;
4545 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
4547 818c7501 2019-07-11 stsp goto done;
4549 818c7501 2019-07-11 stsp free(commit_ref_name);
4550 818c7501 2019-07-11 stsp free(branch_ref_name);
4551 3e3a69f1 2019-07-25 stsp free(fileindex_path);
4552 818c7501 2019-07-11 stsp if (commit_ref)
4553 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
4554 818c7501 2019-07-11 stsp if (branch_ref)
4555 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
4556 818c7501 2019-07-11 stsp if (err) {
4557 818c7501 2019-07-11 stsp free(*commit_id);
4558 818c7501 2019-07-11 stsp *commit_id = NULL;
4559 818c7501 2019-07-11 stsp if (*tmp_branch) {
4560 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
4561 818c7501 2019-07-11 stsp *tmp_branch = NULL;
4563 818c7501 2019-07-11 stsp if (*new_base_branch) {
4564 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
4565 818c7501 2019-07-11 stsp *new_base_branch = NULL;
4567 818c7501 2019-07-11 stsp if (*branch) {
4568 818c7501 2019-07-11 stsp got_ref_close(*branch);
4569 818c7501 2019-07-11 stsp *branch = NULL;
4571 3e3a69f1 2019-07-25 stsp if (*fileindex) {
4572 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
4573 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4575 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
4577 818c7501 2019-07-11 stsp return err;
4580 818c7501 2019-07-11 stsp const struct got_error *
4581 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
4583 818c7501 2019-07-11 stsp const struct got_error *err;
4584 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
4586 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4588 818c7501 2019-07-11 stsp return err;
4590 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
4591 818c7501 2019-07-11 stsp free(tmp_branch_name);
4592 818c7501 2019-07-11 stsp return NULL;
4595 818c7501 2019-07-11 stsp static const struct got_error *
4596 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
4597 818c7501 2019-07-11 stsp char **logmsg, void *arg)
4599 0ebf8283 2019-07-24 stsp *logmsg = arg;
4600 818c7501 2019-07-11 stsp return NULL;
4603 818c7501 2019-07-11 stsp static const struct got_error *
4604 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
4605 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
4606 537ac44b 2019-08-03 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
4608 818c7501 2019-07-11 stsp return NULL;
4611 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
4612 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
4613 01757395 2019-07-12 stsp void *progress_arg;
4614 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
4617 01757395 2019-07-12 stsp static const struct got_error *
4618 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
4620 01757395 2019-07-12 stsp const struct got_error *err;
4621 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
4623 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
4625 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
4627 01757395 2019-07-12 stsp return err;
4629 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
4630 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
4631 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
4632 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
4633 01757395 2019-07-12 stsp return NULL;
4635 01757395 2019-07-12 stsp p = strdup(path);
4636 01757395 2019-07-12 stsp if (p == NULL)
4637 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
4639 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
4640 01757395 2019-07-12 stsp if (err || new == NULL)
4642 01757395 2019-07-12 stsp return err;
4646 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
4648 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
4650 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
4651 01757395 2019-07-12 stsp free((char *)pe->path);
4653 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
4656 0ebf8283 2019-07-24 stsp static const struct got_error *
4657 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
4658 0ebf8283 2019-07-24 stsp struct got_repository *repo)
4660 818c7501 2019-07-11 stsp const struct got_error *err;
4661 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
4663 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4664 818c7501 2019-07-11 stsp if (err) {
4665 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
4666 818c7501 2019-07-11 stsp goto done;
4667 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
4669 818c7501 2019-07-11 stsp goto done;
4670 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
4672 818c7501 2019-07-11 stsp goto done;
4674 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
4677 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
4679 818c7501 2019-07-11 stsp goto done;
4680 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
4681 818c7501 2019-07-11 stsp free(stored_id);
4682 818c7501 2019-07-11 stsp if (cmp != 0) {
4683 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
4684 818c7501 2019-07-11 stsp goto done;
4688 0ebf8283 2019-07-24 stsp if (commit_ref)
4689 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
4690 0ebf8283 2019-07-24 stsp return err;
4693 0ebf8283 2019-07-24 stsp static const struct got_error *
4694 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
4695 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
4696 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
4697 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
4698 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4699 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
4701 0ebf8283 2019-07-24 stsp const struct got_error *err;
4702 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
4703 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
4704 3e3a69f1 2019-07-25 stsp char *fileindex_path;
4706 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
4708 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
4710 0ebf8283 2019-07-24 stsp return err;
4712 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
4713 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
4714 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
4715 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
4716 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
4717 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
4718 818c7501 2019-07-11 stsp if (commit_ref)
4719 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
4720 818c7501 2019-07-11 stsp return err;
4723 818c7501 2019-07-11 stsp const struct got_error *
4724 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
4725 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
4726 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
4727 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
4728 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4729 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
4731 0ebf8283 2019-07-24 stsp const struct got_error *err;
4732 0ebf8283 2019-07-24 stsp char *commit_ref_name;
4734 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4736 0ebf8283 2019-07-24 stsp return err;
4738 0ebf8283 2019-07-24 stsp err = store_commit_id(commit_ref_name, commit_id, repo);
4740 0ebf8283 2019-07-24 stsp goto done;
4742 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
4743 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
4744 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
4746 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4747 0ebf8283 2019-07-24 stsp return err;
4750 0ebf8283 2019-07-24 stsp const struct got_error *
4751 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
4752 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
4753 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
4754 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
4755 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
4756 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
4758 0ebf8283 2019-07-24 stsp const struct got_error *err;
4759 0ebf8283 2019-07-24 stsp char *commit_ref_name;
4761 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4763 0ebf8283 2019-07-24 stsp return err;
4765 0ebf8283 2019-07-24 stsp err = store_commit_id(commit_ref_name, commit_id, repo);
4767 0ebf8283 2019-07-24 stsp goto done;
4769 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
4770 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
4771 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
4773 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4774 0ebf8283 2019-07-24 stsp return err;
4777 0ebf8283 2019-07-24 stsp static const struct got_error *
4778 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
4779 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
4780 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
4781 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
4782 3e3a69f1 2019-07-25 stsp const char *new_logmsg, struct got_repository *repo)
4784 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
4785 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
4786 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
4787 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
4788 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
4789 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
4790 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
4792 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
4793 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
4795 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
4797 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
4799 3e3a69f1 2019-07-25 stsp return err;
4801 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
4802 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
4803 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
4804 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
4806 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
4807 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
4808 01757395 2019-07-12 stsp * TODO: Ideally, merged_paths would contain a list of commitables
4809 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
4811 01757395 2019-07-12 stsp if (merged_paths) {
4812 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
4813 8f8646e5 2019-07-25 stsp if (TAILQ_EMPTY(merged_paths)) {
4814 8f8646e5 2019-07-25 stsp err = got_error(GOT_ERR_NO_MERGED_PATHS);
4815 8f8646e5 2019-07-25 stsp goto done;
4817 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
4818 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
4819 01757395 2019-07-12 stsp repo, collect_commitables, &cc_arg, NULL, NULL);
4821 01757395 2019-07-12 stsp goto done;
4824 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
4825 01757395 2019-07-12 stsp collect_commitables, &cc_arg, NULL, NULL);
4827 01757395 2019-07-12 stsp goto done;
4830 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
4831 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
4832 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
4834 a0e95631 2019-07-12 stsp goto done;
4835 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
4836 a0e95631 2019-07-12 stsp goto done;
4839 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
4841 edd02c5e 2019-07-11 stsp goto done;
4843 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
4845 818c7501 2019-07-11 stsp goto done;
4847 5943eee2 2019-08-13 stsp if (new_logmsg) {
4848 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
4849 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
4850 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
4851 5943eee2 2019-08-13 stsp goto done;
4854 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
4856 5943eee2 2019-08-13 stsp goto done;
4859 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
4860 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
4861 5c1e53bc 2019-07-28 stsp worktree, got_object_commit_get_author(orig_commit),
4862 a0e95631 2019-07-12 stsp got_object_commit_get_committer(orig_commit),
4863 0ebf8283 2019-07-24 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
4865 a0e95631 2019-07-12 stsp goto done;
4867 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
4869 a0e95631 2019-07-12 stsp goto done;
4871 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
4873 a0e95631 2019-07-12 stsp goto done;
4875 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
4876 72fd46fa 2019-09-06 stsp fileindex, 0);
4877 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4878 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
4879 a0e95631 2019-07-12 stsp err = sync_err;
4881 a0e95631 2019-07-12 stsp free(fileindex_path);
4882 a0e95631 2019-07-12 stsp free(head_commit_id);
4883 a0e95631 2019-07-12 stsp if (head_ref)
4884 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
4885 818c7501 2019-07-11 stsp if (err) {
4886 818c7501 2019-07-11 stsp free(*new_commit_id);
4887 818c7501 2019-07-11 stsp *new_commit_id = NULL;
4889 818c7501 2019-07-11 stsp return err;
4892 818c7501 2019-07-11 stsp const struct got_error *
4893 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
4894 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
4895 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4896 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
4897 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
4899 0ebf8283 2019-07-24 stsp const struct got_error *err;
4900 0ebf8283 2019-07-24 stsp char *commit_ref_name;
4901 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
4902 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
4904 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4906 0ebf8283 2019-07-24 stsp return err;
4908 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4910 0ebf8283 2019-07-24 stsp goto done;
4911 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
4913 0ebf8283 2019-07-24 stsp goto done;
4914 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
4915 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
4916 0ebf8283 2019-07-24 stsp goto done;
4919 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
4920 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
4922 0ebf8283 2019-07-24 stsp if (commit_ref)
4923 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
4924 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4925 0ebf8283 2019-07-24 stsp free(commit_id);
4926 0ebf8283 2019-07-24 stsp return err;
4929 0ebf8283 2019-07-24 stsp const struct got_error *
4930 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
4931 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
4932 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4933 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
4934 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
4935 0ebf8283 2019-07-24 stsp struct got_repository *repo)
4937 0ebf8283 2019-07-24 stsp const struct got_error *err;
4938 0ebf8283 2019-07-24 stsp char *commit_ref_name;
4939 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
4940 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
4942 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
4944 0ebf8283 2019-07-24 stsp return err;
4946 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4948 0ebf8283 2019-07-24 stsp goto done;
4949 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
4951 0ebf8283 2019-07-24 stsp goto done;
4952 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
4953 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_HISTEDIT_COMMITID);
4954 0ebf8283 2019-07-24 stsp goto done;
4957 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
4958 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
4960 0ebf8283 2019-07-24 stsp if (commit_ref)
4961 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
4962 0ebf8283 2019-07-24 stsp free(commit_ref_name);
4963 0ebf8283 2019-07-24 stsp free(commit_id);
4964 0ebf8283 2019-07-24 stsp return err;
4967 0ebf8283 2019-07-24 stsp const struct got_error *
4968 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
4969 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
4971 3e3a69f1 2019-07-25 stsp if (fileindex)
4972 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
4973 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
4976 69844fba 2019-07-11 stsp static const struct got_error *
4977 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
4979 69844fba 2019-07-11 stsp const struct got_error *err;
4980 69844fba 2019-07-11 stsp struct got_reference *ref;
4982 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
4983 69844fba 2019-07-11 stsp if (err) {
4984 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
4985 69844fba 2019-07-11 stsp return NULL;
4986 69844fba 2019-07-11 stsp return err;
4989 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
4990 69844fba 2019-07-11 stsp got_ref_close(ref);
4991 69844fba 2019-07-11 stsp return err;
4994 69844fba 2019-07-11 stsp static const struct got_error *
4995 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
4997 69844fba 2019-07-11 stsp const struct got_error *err;
4998 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
4999 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
5001 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5003 69844fba 2019-07-11 stsp goto done;
5004 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
5006 69844fba 2019-07-11 stsp goto done;
5008 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5010 69844fba 2019-07-11 stsp goto done;
5011 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
5013 69844fba 2019-07-11 stsp goto done;
5015 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5017 69844fba 2019-07-11 stsp goto done;
5018 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
5020 69844fba 2019-07-11 stsp goto done;
5022 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5024 69844fba 2019-07-11 stsp goto done;
5025 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
5027 69844fba 2019-07-11 stsp goto done;
5030 69844fba 2019-07-11 stsp free(tmp_branch_name);
5031 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
5032 69844fba 2019-07-11 stsp free(branch_ref_name);
5033 69844fba 2019-07-11 stsp free(commit_ref_name);
5034 69844fba 2019-07-11 stsp return err;
5037 818c7501 2019-07-11 stsp const struct got_error *
5038 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
5039 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
5040 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
5041 818c7501 2019-07-11 stsp struct got_repository *repo)
5043 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
5044 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
5046 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
5048 818c7501 2019-07-11 stsp return err;
5050 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
5052 818c7501 2019-07-11 stsp goto done;
5054 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
5056 818c7501 2019-07-11 stsp goto done;
5058 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
5060 818c7501 2019-07-11 stsp goto done;
5062 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
5064 3e3a69f1 2019-07-25 stsp if (fileindex)
5065 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5066 818c7501 2019-07-11 stsp free(new_head_commit_id);
5067 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5068 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
5069 818c7501 2019-07-11 stsp err = unlockerr;
5070 818c7501 2019-07-11 stsp return err;
5073 818c7501 2019-07-11 stsp const struct got_error *
5074 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
5075 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
5076 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
5077 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
5079 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
5080 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
5081 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
5082 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
5083 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
5084 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
5086 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
5088 818c7501 2019-07-11 stsp return err;
5090 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
5091 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
5093 818c7501 2019-07-11 stsp goto done;
5095 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
5097 818c7501 2019-07-11 stsp goto done;
5100 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
5101 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
5102 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
5104 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
5106 818c7501 2019-07-11 stsp goto done;
5108 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
5110 818c7501 2019-07-11 stsp goto done;
5112 ca355955 2019-07-12 stsp err = got_object_id_by_path(&tree_id, repo,
5113 ca355955 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
5115 ca355955 2019-07-12 stsp goto done;
5117 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
5119 ca355955 2019-07-12 stsp goto done;
5121 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5123 818c7501 2019-07-11 stsp goto done;
5125 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
5126 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
5127 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
5128 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
5129 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
5130 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
5131 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
5132 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
5133 1f1abb7e 2019-08-08 stsp revert_file, &rfa, NULL, NULL);
5135 1f1abb7e 2019-08-08 stsp goto sync;
5137 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
5138 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
5140 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5141 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
5142 ca355955 2019-07-12 stsp err = sync_err;
5144 818c7501 2019-07-11 stsp got_ref_close(resolved);
5145 a3a2faf2 2019-07-12 stsp free(tree_id);
5146 818c7501 2019-07-11 stsp free(commit_id);
5147 0ebf8283 2019-07-24 stsp if (fileindex)
5148 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
5149 0ebf8283 2019-07-24 stsp free(fileindex_path);
5151 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5152 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
5153 0ebf8283 2019-07-24 stsp err = unlockerr;
5154 0ebf8283 2019-07-24 stsp return err;
5157 0ebf8283 2019-07-24 stsp const struct got_error *
5158 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
5159 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
5160 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
5161 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
5163 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5164 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
5165 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
5166 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
5167 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
5168 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
5169 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
5170 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
5172 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5173 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
5174 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
5175 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5177 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
5179 0ebf8283 2019-07-24 stsp return err;
5181 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5183 0ebf8283 2019-07-24 stsp goto done;
5185 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
5186 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
5187 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5190 0ebf8283 2019-07-24 stsp goto done;
5192 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5194 0ebf8283 2019-07-24 stsp goto done;
5196 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5198 0ebf8283 2019-07-24 stsp goto done;
5200 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5201 0ebf8283 2019-07-24 stsp worktree);
5203 0ebf8283 2019-07-24 stsp goto done;
5205 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5208 0ebf8283 2019-07-24 stsp goto done;
5210 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
5212 0ebf8283 2019-07-24 stsp goto done;
5214 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
5216 0ebf8283 2019-07-24 stsp goto done;
5218 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
5219 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
5221 0ebf8283 2019-07-24 stsp goto done;
5222 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
5224 0ebf8283 2019-07-24 stsp goto done;
5225 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
5226 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
5227 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
5228 0ebf8283 2019-07-24 stsp goto done;
5231 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
5232 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
5234 0ebf8283 2019-07-24 stsp goto done;
5235 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
5237 0ebf8283 2019-07-24 stsp goto done;
5239 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
5241 0ebf8283 2019-07-24 stsp goto done;
5243 0ebf8283 2019-07-24 stsp free(fileindex_path);
5244 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
5245 0ebf8283 2019-07-24 stsp free(branch_ref_name);
5246 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
5247 0ebf8283 2019-07-24 stsp if (wt_branch)
5248 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
5249 0ebf8283 2019-07-24 stsp if (err) {
5250 0ebf8283 2019-07-24 stsp if (*branch_ref) {
5251 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
5252 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
5254 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
5255 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
5256 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5258 0ebf8283 2019-07-24 stsp free(*base_commit_id);
5259 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5260 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5261 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5263 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
5265 0ebf8283 2019-07-24 stsp return err;
5268 0ebf8283 2019-07-24 stsp const struct got_error *
5269 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
5270 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
5272 3e3a69f1 2019-07-25 stsp if (fileindex)
5273 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5274 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
5277 0ebf8283 2019-07-24 stsp const struct got_error *
5278 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
5279 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
5281 0ebf8283 2019-07-24 stsp const struct got_error *err;
5282 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
5284 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5286 0ebf8283 2019-07-24 stsp return err;
5288 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
5289 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
5290 0ebf8283 2019-07-24 stsp return NULL;
5293 0ebf8283 2019-07-24 stsp const struct got_error *
5294 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
5295 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
5296 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
5297 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
5299 0ebf8283 2019-07-24 stsp const struct got_error *err;
5300 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
5301 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
5302 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
5303 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
5304 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
5305 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
5307 0ebf8283 2019-07-24 stsp *commit_id = NULL;
5308 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5309 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
5310 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5312 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
5314 3e3a69f1 2019-07-25 stsp return err;
5316 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5318 f032f1f7 2019-08-04 stsp goto done;
5320 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
5321 f032f1f7 2019-08-04 stsp &have_staged_files);
5322 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
5323 f032f1f7 2019-08-04 stsp goto done;
5324 f032f1f7 2019-08-04 stsp if (have_staged_files) {
5325 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
5326 3e3a69f1 2019-07-25 stsp goto done;
5329 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5331 f032f1f7 2019-08-04 stsp goto done;
5333 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5335 0ebf8283 2019-07-24 stsp goto done;
5337 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5339 0ebf8283 2019-07-24 stsp goto done;
5341 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5342 0ebf8283 2019-07-24 stsp worktree);
5344 0ebf8283 2019-07-24 stsp goto done;
5346 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
5348 0ebf8283 2019-07-24 stsp goto done;
5350 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5352 0ebf8283 2019-07-24 stsp goto done;
5353 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
5355 0ebf8283 2019-07-24 stsp goto done;
5357 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
5359 0ebf8283 2019-07-24 stsp goto done;
5360 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
5362 0ebf8283 2019-07-24 stsp goto done;
5364 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
5366 0ebf8283 2019-07-24 stsp goto done;
5368 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5369 0ebf8283 2019-07-24 stsp free(branch_ref_name);
5370 3e3a69f1 2019-07-25 stsp free(fileindex_path);
5371 0ebf8283 2019-07-24 stsp if (commit_ref)
5372 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
5373 0ebf8283 2019-07-24 stsp if (base_commit_ref)
5374 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
5375 0ebf8283 2019-07-24 stsp if (err) {
5376 0ebf8283 2019-07-24 stsp free(*commit_id);
5377 0ebf8283 2019-07-24 stsp *commit_id = NULL;
5378 0ebf8283 2019-07-24 stsp free(*base_commit_id);
5379 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
5380 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
5381 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
5382 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5384 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5385 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5386 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5388 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
5390 0ebf8283 2019-07-24 stsp return err;
5393 0ebf8283 2019-07-24 stsp static const struct got_error *
5394 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
5396 0ebf8283 2019-07-24 stsp const struct got_error *err;
5397 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
5398 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
5400 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5402 0ebf8283 2019-07-24 stsp goto done;
5403 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
5405 0ebf8283 2019-07-24 stsp goto done;
5407 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5408 0ebf8283 2019-07-24 stsp worktree);
5410 0ebf8283 2019-07-24 stsp goto done;
5411 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
5413 0ebf8283 2019-07-24 stsp goto done;
5415 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5417 0ebf8283 2019-07-24 stsp goto done;
5418 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
5420 0ebf8283 2019-07-24 stsp goto done;
5422 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5424 0ebf8283 2019-07-24 stsp goto done;
5425 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
5427 0ebf8283 2019-07-24 stsp goto done;
5429 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
5430 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
5431 0ebf8283 2019-07-24 stsp free(branch_ref_name);
5432 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5433 0ebf8283 2019-07-24 stsp return err;
5436 0ebf8283 2019-07-24 stsp const struct got_error *
5437 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
5438 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
5439 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
5440 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
5442 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
5443 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
5444 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
5445 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
5446 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
5448 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
5450 0ebf8283 2019-07-24 stsp return err;
5452 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
5453 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
5455 0ebf8283 2019-07-24 stsp goto done;
5457 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
5459 0ebf8283 2019-07-24 stsp goto done;
5461 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
5463 0ebf8283 2019-07-24 stsp goto done;
5465 0ebf8283 2019-07-24 stsp err = got_object_id_by_path(&tree_id, repo, base_commit_id,
5466 0ebf8283 2019-07-24 stsp worktree->path_prefix);
5468 0ebf8283 2019-07-24 stsp goto done;
5470 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
5472 0ebf8283 2019-07-24 stsp goto done;
5474 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5476 0ebf8283 2019-07-24 stsp goto done;
5478 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
5479 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
5480 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
5481 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
5482 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
5483 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
5484 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
5485 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
5486 1f1abb7e 2019-08-08 stsp revert_file, &rfa, NULL, NULL);
5488 1f1abb7e 2019-08-08 stsp goto sync;
5490 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
5491 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
5493 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5494 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
5495 0ebf8283 2019-07-24 stsp err = sync_err;
5497 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
5498 0ebf8283 2019-07-24 stsp free(tree_id);
5499 818c7501 2019-07-11 stsp free(fileindex_path);
5501 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5502 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
5503 818c7501 2019-07-11 stsp err = unlockerr;
5504 818c7501 2019-07-11 stsp return err;
5507 0ebf8283 2019-07-24 stsp const struct got_error *
5508 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
5509 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5510 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
5512 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr;
5513 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
5514 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
5516 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
5518 0ebf8283 2019-07-24 stsp return err;
5520 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
5521 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
5523 0ebf8283 2019-07-24 stsp goto done;
5525 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
5527 0ebf8283 2019-07-24 stsp goto done;
5529 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
5531 0ebf8283 2019-07-24 stsp goto done;
5533 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
5535 0ebf8283 2019-07-24 stsp goto done;
5537 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
5539 3e3a69f1 2019-07-25 stsp if (fileindex)
5540 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5541 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
5542 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5543 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
5544 0ebf8283 2019-07-24 stsp err = unlockerr;
5545 0ebf8283 2019-07-24 stsp return err;
5548 0ebf8283 2019-07-24 stsp const struct got_error *
5549 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
5550 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
5552 0ebf8283 2019-07-24 stsp const struct got_error *err;
5553 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5555 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5557 0ebf8283 2019-07-24 stsp return err;
5559 0ebf8283 2019-07-24 stsp err = store_commit_id(commit_ref_name, commit_id, repo);
5561 0ebf8283 2019-07-24 stsp goto done;
5563 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
5565 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5566 0cb83759 2019-08-03 stsp return err;
5569 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
5570 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
5571 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
5572 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
5573 2db2652d 2019-08-07 stsp struct got_repository *repo;
5574 2db2652d 2019-08-07 stsp int have_changes;
5577 2db2652d 2019-08-07 stsp const struct got_error *
5578 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
5579 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
5580 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5581 2db2652d 2019-08-07 stsp struct got_object_id *commit_id)
5583 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
5584 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
5585 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
5586 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
5587 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
5588 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
5590 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
5591 8b13ce36 2019-08-08 stsp return NULL;
5592 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
5593 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
5595 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
5596 735ef5ac 2019-08-03 stsp if (ie == NULL)
5597 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
5599 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
5600 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
5601 735ef5ac 2019-08-03 stsp relpath) == -1)
5602 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
5604 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
5605 735ef5ac 2019-08-03 stsp memcpy(base_commit_id.sha1, ie->commit_sha1,
5606 735ef5ac 2019-08-03 stsp SHA1_DIGEST_LENGTH);
5607 735ef5ac 2019-08-03 stsp base_commit_idp = &base_commit_id;
5610 3aa5969e 2019-08-06 stsp if (status == GOT_STATUS_NO_CHANGE) {
5611 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_NO_CHANGE);
5612 3aa5969e 2019-08-06 stsp goto done;
5613 3aa5969e 2019-08-06 stsp } else if (status == GOT_STATUS_CONFLICT) {
5614 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
5615 3aa5969e 2019-08-06 stsp goto done;
5616 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
5617 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
5618 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
5619 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
5620 735ef5ac 2019-08-03 stsp goto done;
5623 2db2652d 2019-08-07 stsp a->have_changes = 1;
5625 735ef5ac 2019-08-03 stsp p = in_repo_path;
5626 735ef5ac 2019-08-03 stsp while (p[0] == '/')
5628 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
5629 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
5630 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
5632 735ef5ac 2019-08-03 stsp free(in_repo_path);
5633 dc424a06 2019-08-07 stsp return err;
5636 2db2652d 2019-08-07 stsp struct stage_path_arg {
5637 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
5638 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
5639 2db2652d 2019-08-07 stsp struct got_repository *repo;
5640 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
5641 2db2652d 2019-08-07 stsp void *status_arg;
5642 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
5643 2db2652d 2019-08-07 stsp void *patch_arg;
5646 2db2652d 2019-08-07 stsp static const struct got_error *
5647 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
5648 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
5649 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5650 2db2652d 2019-08-07 stsp struct got_object_id *commit_id)
5652 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
5653 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
5654 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
5655 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
5656 0cb83759 2019-08-03 stsp uint32_t stage;
5657 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
5659 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
5660 8b13ce36 2019-08-08 stsp return NULL;
5662 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
5663 d3e7c587 2019-08-03 stsp if (ie == NULL)
5664 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
5666 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
5667 2db2652d 2019-08-07 stsp relpath)== -1)
5668 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
5670 0cb83759 2019-08-03 stsp switch (status) {
5671 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
5672 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
5673 2db2652d 2019-08-07 stsp if (a->patch_cb) {
5674 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
5675 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
5676 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
5677 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
5680 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
5683 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
5684 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
5685 af5a81b2 2019-08-08 stsp ondisk_path, ie->path, a->repo,
5686 2db2652d 2019-08-07 stsp a->patch_cb, a->patch_arg);
5687 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
5691 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
5692 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
5695 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
5696 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
5697 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
5698 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
5700 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
5701 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
5702 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
5704 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
5705 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
5706 af5a81b2 2019-08-08 stsp new_staged_blob_id, NULL);
5708 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
5709 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
5711 2db2652d 2019-08-07 stsp if (a->patch_cb) {
5712 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
5713 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
5714 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
5717 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
5719 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
5720 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
5724 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
5725 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
5726 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
5728 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
5729 537ac44b 2019-08-03 stsp get_staged_status(ie), relpath, NULL, NULL, NULL);
5731 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
5732 d3e7c587 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_NO_CHANGE);
5734 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
5735 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
5737 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
5738 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
5741 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
5745 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
5746 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
5747 dc424a06 2019-08-07 stsp free(path_content);
5748 2db2652d 2019-08-07 stsp free(ondisk_path);
5749 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
5750 0ebf8283 2019-07-24 stsp return err;
5753 0cb83759 2019-08-03 stsp const struct got_error *
5754 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
5755 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
5756 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
5757 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
5758 1e71573e 2019-08-03 stsp struct got_repository *repo)
5760 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
5761 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
5762 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
5763 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
5764 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
5765 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
5766 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
5767 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
5769 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
5771 0cb83759 2019-08-03 stsp return err;
5773 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
5774 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
5776 735ef5ac 2019-08-03 stsp goto done;
5777 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
5779 735ef5ac 2019-08-03 stsp goto done;
5780 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
5782 0cb83759 2019-08-03 stsp goto done;
5784 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
5785 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
5786 2db2652d 2019-08-07 stsp oka.worktree = worktree;
5787 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
5788 2db2652d 2019-08-07 stsp oka.repo = repo;
5789 2db2652d 2019-08-07 stsp oka.have_changes = 0;
5790 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
5791 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
5792 2db2652d 2019-08-07 stsp check_stage_ok, &oka, NULL, NULL);
5794 735ef5ac 2019-08-03 stsp goto done;
5796 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
5797 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
5798 2db2652d 2019-08-07 stsp goto done;
5801 2db2652d 2019-08-07 stsp spa.worktree = worktree;
5802 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
5803 2db2652d 2019-08-07 stsp spa.repo = repo;
5804 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
5805 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
5806 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
5807 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
5808 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
5809 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
5810 2db2652d 2019-08-07 stsp stage_path, &spa, NULL, NULL);
5812 2db2652d 2019-08-07 stsp goto done;
5815 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5816 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
5817 0cb83759 2019-08-03 stsp err = sync_err;
5819 735ef5ac 2019-08-03 stsp if (head_ref)
5820 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
5821 735ef5ac 2019-08-03 stsp free(head_commit_id);
5822 0cb83759 2019-08-03 stsp free(fileindex_path);
5823 0cb83759 2019-08-03 stsp if (fileindex)
5824 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
5825 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5826 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
5827 0cb83759 2019-08-03 stsp err = unlockerr;
5828 0cb83759 2019-08-03 stsp return err;
5831 ad493afc 2019-08-03 stsp struct unstage_path_arg {
5832 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
5833 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
5834 ad493afc 2019-08-03 stsp struct got_repository *repo;
5835 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
5836 ad493afc 2019-08-03 stsp void *progress_arg;
5837 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
5838 2e1f37b0 2019-08-08 stsp void *patch_arg;
5841 2e1f37b0 2019-08-08 stsp static const struct got_error *
5842 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
5843 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
5844 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
5845 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
5846 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
5848 2e1f37b0 2019-08-08 stsp const struct got_error *err;
5849 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
5850 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
5851 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
5852 2e1f37b0 2019-08-08 stsp struct stat sb1, sb2;
5853 2e1f37b0 2019-08-08 stsp struct got_diff_changes *changes = NULL;
5854 2e1f37b0 2019-08-08 stsp struct got_diff_state *ds = NULL;
5855 2e1f37b0 2019-08-08 stsp struct got_diff_args *args = NULL;
5856 2e1f37b0 2019-08-08 stsp struct got_diff_change *change;
5857 2e1f37b0 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, n = 0;
5858 2e1f37b0 2019-08-08 stsp int have_content = 0, have_rejected_content = 0;
5860 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
5861 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
5863 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
5865 2e1f37b0 2019-08-08 stsp return err;
5866 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
5868 2e1f37b0 2019-08-08 stsp goto done;
5870 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
5872 2e1f37b0 2019-08-08 stsp goto done;
5874 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
5876 2e1f37b0 2019-08-08 stsp goto done;
5878 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
5880 2e1f37b0 2019-08-08 stsp goto done;
5882 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
5884 2e1f37b0 2019-08-08 stsp goto done;
5886 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
5888 2e1f37b0 2019-08-08 stsp goto done;
5890 2e1f37b0 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
5891 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
5892 2e1f37b0 2019-08-08 stsp goto done;
5895 2e1f37b0 2019-08-08 stsp if (stat(path2, &sb2) == -1) {
5896 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path2);
5897 2e1f37b0 2019-08-08 stsp goto done;
5900 2e1f37b0 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
5901 2e1f37b0 2019-08-08 stsp f1, sb1.st_size, label1, f2, sb2.st_size, path2, 3, NULL);
5903 2e1f37b0 2019-08-08 stsp goto done;
5905 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
5906 2e1f37b0 2019-08-08 stsp "got-unstaged-content");
5908 2e1f37b0 2019-08-08 stsp goto done;
5909 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
5910 2e1f37b0 2019-08-08 stsp "got-new-staged-content");
5912 2e1f37b0 2019-08-08 stsp goto done;
5914 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
5915 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
5916 2e1f37b0 2019-08-08 stsp goto done;
5918 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
5919 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
5920 2e1f37b0 2019-08-08 stsp goto done;
5922 2e1f37b0 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
5923 2e1f37b0 2019-08-08 stsp int choice;
5924 2e1f37b0 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
5925 2e1f37b0 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
5926 2e1f37b0 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
5927 2e1f37b0 2019-08-08 stsp outfile, rejectfile, patch_cb, patch_arg);
5929 2e1f37b0 2019-08-08 stsp goto done;
5930 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
5931 2e1f37b0 2019-08-08 stsp have_content = 1;
5933 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
5934 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
5937 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
5938 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
5939 f1e81a05 2019-08-10 stsp outfile, rejectfile);
5941 2e1f37b0 2019-08-08 stsp free(label1);
5943 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
5944 2e1f37b0 2019-08-08 stsp if (staged_blob)
5945 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
5946 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
5947 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
5948 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
5949 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
5950 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
5951 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
5952 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
5953 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
5954 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
5955 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
5956 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
5957 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
5958 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
5959 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
5960 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
5961 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
5962 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
5963 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
5964 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
5966 2e1f37b0 2019-08-08 stsp if (err || !have_rejected_content) {
5967 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
5968 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
5969 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
5970 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
5971 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
5972 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
5974 2e1f37b0 2019-08-08 stsp free(args);
5976 2e1f37b0 2019-08-08 stsp got_diff_state_free(ds);
5979 2e1f37b0 2019-08-08 stsp if (changes)
5980 2e1f37b0 2019-08-08 stsp got_diff_free_changes(changes);
5981 2e1f37b0 2019-08-08 stsp free(path1);
5982 2e1f37b0 2019-08-08 stsp free(path2);
5983 2e1f37b0 2019-08-08 stsp return err;
5986 ad493afc 2019-08-03 stsp static const struct got_error *
5987 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
5988 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
5989 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5990 ad493afc 2019-08-03 stsp struct got_object_id *commit_id)
5992 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
5993 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
5994 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
5995 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
5996 2e1f37b0 2019-08-08 stsp char *ondisk_path = NULL, *path_unstaged_content = NULL;
5997 2e1f37b0 2019-08-08 stsp char *path_new_staged_content = NULL;
5998 ad493afc 2019-08-03 stsp int local_changes_subsumed;
5999 9bc94a15 2019-08-03 stsp struct stat sb;
6001 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
6002 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
6003 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
6004 2e1f37b0 2019-08-08 stsp return NULL;
6006 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
6007 ad493afc 2019-08-03 stsp if (ie == NULL)
6008 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
6010 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
6012 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
6014 ad493afc 2019-08-03 stsp switch (staged_status) {
6015 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
6016 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
6017 ad493afc 2019-08-03 stsp blob_id, 8192);
6020 ad493afc 2019-08-03 stsp /* fall through */
6021 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
6022 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
6023 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
6024 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
6025 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
6026 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
6029 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
6032 2e1f37b0 2019-08-08 stsp err = create_unstaged_content(
6033 2e1f37b0 2019-08-08 stsp &path_unstaged_content,
6034 2e1f37b0 2019-08-08 stsp &path_new_staged_content, blob_id,
6035 2e1f37b0 2019-08-08 stsp staged_blob_id, ie->path, a->repo,
6036 2e1f37b0 2019-08-08 stsp a->patch_cb, a->patch_arg);
6037 2e1f37b0 2019-08-08 stsp if (err || path_unstaged_content == NULL)
6039 2e1f37b0 2019-08-08 stsp if (path_new_staged_content) {
6040 2e1f37b0 2019-08-08 stsp err = got_object_blob_create(
6041 2e1f37b0 2019-08-08 stsp &staged_blob_id,
6042 2e1f37b0 2019-08-08 stsp path_new_staged_content,
6046 2e1f37b0 2019-08-08 stsp memcpy(ie->staged_blob_sha1,
6047 2e1f37b0 2019-08-08 stsp staged_blob_id->sha1,
6048 2e1f37b0 2019-08-08 stsp SHA1_DIGEST_LENGTH);
6050 2e1f37b0 2019-08-08 stsp err = merge_file(&local_changes_subsumed,
6051 2e1f37b0 2019-08-08 stsp a->worktree, blob_base, ondisk_path,
6052 2e1f37b0 2019-08-08 stsp relpath, got_fileindex_perms_to_st(ie),
6053 2e1f37b0 2019-08-08 stsp path_unstaged_content, "unstaged",
6054 2e1f37b0 2019-08-08 stsp a->repo, a->progress_cb, a->progress_arg);
6055 2e1f37b0 2019-08-08 stsp if (err == NULL &&
6056 2e1f37b0 2019-08-08 stsp path_new_staged_content == NULL)
6057 2e1f37b0 2019-08-08 stsp got_fileindex_entry_stage_set(ie,
6058 2e1f37b0 2019-08-08 stsp GOT_FILEIDX_STAGE_NONE);
6059 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
6062 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
6063 ad493afc 2019-08-03 stsp staged_blob_id, 8192);
6066 ad493afc 2019-08-03 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
6067 ad493afc 2019-08-03 stsp blob_base, ondisk_path, relpath,
6068 ad493afc 2019-08-03 stsp got_fileindex_perms_to_st(ie), blob_staged,
6069 ad493afc 2019-08-03 stsp commit_id ? commit_id : a->worktree->base_commit_id,
6070 ad493afc 2019-08-03 stsp a->repo, a->progress_cb, a->progress_arg);
6071 ad493afc 2019-08-03 stsp if (err == NULL)
6072 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
6073 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
6075 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
6076 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
6077 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
6078 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
6079 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
6082 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
6084 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
6085 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
6089 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
6090 9bc94a15 2019-08-03 stsp err = get_file_status(&status, &sb, ie, ondisk_path, a->repo);
6093 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
6097 ad493afc 2019-08-03 stsp free(ondisk_path);
6098 2e1f37b0 2019-08-08 stsp if (path_unstaged_content &&
6099 2e1f37b0 2019-08-08 stsp unlink(path_unstaged_content) == -1 && err == NULL)
6100 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
6101 2e1f37b0 2019-08-08 stsp if (path_new_staged_content &&
6102 2e1f37b0 2019-08-08 stsp unlink(path_new_staged_content) == -1 && err == NULL)
6103 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
6104 2e1f37b0 2019-08-08 stsp free(path_unstaged_content);
6105 2e1f37b0 2019-08-08 stsp free(path_new_staged_content);
6106 ad493afc 2019-08-03 stsp if (blob_base)
6107 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
6108 ad493afc 2019-08-03 stsp if (blob_staged)
6109 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
6110 ad493afc 2019-08-03 stsp return err;
6113 ad493afc 2019-08-03 stsp const struct got_error *
6114 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
6115 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
6116 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6117 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
6118 ad493afc 2019-08-03 stsp struct got_repository *repo)
6120 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
6121 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
6122 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
6123 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
6124 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
6126 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
6128 ad493afc 2019-08-03 stsp return err;
6130 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
6132 ad493afc 2019-08-03 stsp goto done;
6134 ad493afc 2019-08-03 stsp upa.worktree = worktree;
6135 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
6136 ad493afc 2019-08-03 stsp upa.repo = repo;
6137 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
6138 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
6139 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
6140 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
6141 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
6142 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
6143 ad493afc 2019-08-03 stsp unstage_path, &upa, NULL, NULL);
6145 ad493afc 2019-08-03 stsp goto done;
6148 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6149 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
6150 ad493afc 2019-08-03 stsp err = sync_err;
6152 ad493afc 2019-08-03 stsp free(fileindex_path);
6153 ad493afc 2019-08-03 stsp if (fileindex)
6154 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
6155 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6156 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
6157 ad493afc 2019-08-03 stsp err = unlockerr;
6158 ad493afc 2019-08-03 stsp return err;
