Blame


1 86c3caaf 2018-03-09 stsp /*
2 5aa81393 2020-01-06 stsp * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
3 86c3caaf 2018-03-09 stsp *
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.
7 86c3caaf 2018-03-09 stsp *
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.
15 86c3caaf 2018-03-09 stsp */
16 86c3caaf 2018-03-09 stsp
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>
20 86c3caaf 2018-03-09 stsp
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>
37 86c3caaf 2018-03-09 stsp
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"
47 86c3caaf 2018-03-09 stsp
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"
58 9d31a1d8 2018-03-11 stsp
59 9d31a1d8 2018-03-11 stsp #ifndef MIN
60 9d31a1d8 2018-03-11 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
61 9d31a1d8 2018-03-11 stsp #endif
62 f69721c3 2019-10-21 stsp
63 f69721c3 2019-10-21 stsp #define GOT_MERGE_LABEL_MERGED "merged change"
64 f69721c3 2019-10-21 stsp #define GOT_MERGE_LABEL_BASE "3-way merge base"
65 86c3caaf 2018-03-09 stsp
66 99724ed4 2018-03-10 stsp static const struct got_error *
67 7ac97322 2018-03-11 stsp create_meta_file(const char *path_got, const char *name, const char *content)
68 99724ed4 2018-03-10 stsp {
69 99724ed4 2018-03-10 stsp const struct got_error *err = NULL;
70 99724ed4 2018-03-10 stsp char *path;
71 99724ed4 2018-03-10 stsp
72 2c7829a4 2019-06-17 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1)
73 2c7829a4 2019-06-17 stsp return got_error_from_errno("asprintf");
74 99724ed4 2018-03-10 stsp
75 2c7829a4 2019-06-17 stsp err = got_path_create_file(path, content);
76 99724ed4 2018-03-10 stsp free(path);
77 507dc3bb 2018-12-29 stsp return err;
78 507dc3bb 2018-12-29 stsp }
79 507dc3bb 2018-12-29 stsp
80 507dc3bb 2018-12-29 stsp static const struct got_error *
81 507dc3bb 2018-12-29 stsp update_meta_file(const char *path_got, const char *name, const char *content)
82 507dc3bb 2018-12-29 stsp {
83 507dc3bb 2018-12-29 stsp const struct got_error *err = NULL;
84 507dc3bb 2018-12-29 stsp FILE *tmpfile = NULL;
85 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
86 507dc3bb 2018-12-29 stsp char *path = NULL;
87 507dc3bb 2018-12-29 stsp
88 507dc3bb 2018-12-29 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
89 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
90 507dc3bb 2018-12-29 stsp path = NULL;
91 507dc3bb 2018-12-29 stsp goto done;
92 507dc3bb 2018-12-29 stsp }
93 507dc3bb 2018-12-29 stsp
94 507dc3bb 2018-12-29 stsp err = got_opentemp_named(&tmppath, &tmpfile, path);
95 507dc3bb 2018-12-29 stsp if (err)
96 507dc3bb 2018-12-29 stsp goto done;
97 507dc3bb 2018-12-29 stsp
98 507dc3bb 2018-12-29 stsp if (content) {
99 507dc3bb 2018-12-29 stsp int len = fprintf(tmpfile, "%s\n", content);
100 507dc3bb 2018-12-29 stsp if (len != strlen(content) + 1) {
101 638f9024 2019-05-13 stsp err = got_error_from_errno2("fprintf", tmppath);
102 507dc3bb 2018-12-29 stsp goto done;
103 507dc3bb 2018-12-29 stsp }
104 507dc3bb 2018-12-29 stsp }
105 507dc3bb 2018-12-29 stsp
106 507dc3bb 2018-12-29 stsp if (rename(tmppath, path) != 0) {
107 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath, path);
108 2a57020b 2019-02-20 stsp unlink(tmppath);
109 507dc3bb 2018-12-29 stsp goto done;
110 507dc3bb 2018-12-29 stsp }
111 507dc3bb 2018-12-29 stsp
112 507dc3bb 2018-12-29 stsp done:
113 fb43ecf1 2019-02-11 stsp if (fclose(tmpfile) != 0 && err == NULL)
114 638f9024 2019-05-13 stsp err = got_error_from_errno2("fclose", tmppath);
115 230a42bd 2019-05-11 jcs free(tmppath);
116 99724ed4 2018-03-10 stsp return err;
117 99724ed4 2018-03-10 stsp }
118 99724ed4 2018-03-10 stsp
119 09fe317a 2018-03-11 stsp static const struct got_error *
120 7ac97322 2018-03-11 stsp read_meta_file(char **content, const char *path_got, const char *name)
121 09fe317a 2018-03-11 stsp {
122 09fe317a 2018-03-11 stsp const struct got_error *err = NULL;
123 09fe317a 2018-03-11 stsp char *path;
124 09fe317a 2018-03-11 stsp int fd = -1;
125 09fe317a 2018-03-11 stsp ssize_t n;
126 09fe317a 2018-03-11 stsp struct stat sb;
127 09fe317a 2018-03-11 stsp
128 09fe317a 2018-03-11 stsp *content = NULL;
129 09fe317a 2018-03-11 stsp
130 7ac97322 2018-03-11 stsp if (asprintf(&path, "%s/%s", path_got, name) == -1) {
131 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
132 09fe317a 2018-03-11 stsp path = NULL;
133 09fe317a 2018-03-11 stsp goto done;
134 09fe317a 2018-03-11 stsp }
135 09fe317a 2018-03-11 stsp
136 ef99fdb1 2018-03-11 stsp fd = open(path, O_RDONLY | O_NOFOLLOW);
137 09fe317a 2018-03-11 stsp if (fd == -1) {
138 f02eaa22 2019-03-11 stsp if (errno == ENOENT)
139 a2e6d162 2019-07-27 stsp err = got_error_path(path, GOT_ERR_WORKTREE_META);
140 f02eaa22 2019-03-11 stsp else
141 638f9024 2019-05-13 stsp err = got_error_from_errno2("open", path);
142 ef99fdb1 2018-03-11 stsp goto done;
143 ef99fdb1 2018-03-11 stsp }
144 ef99fdb1 2018-03-11 stsp if (flock(fd, LOCK_SH | LOCK_NB) == -1) {
145 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
146 638f9024 2019-05-13 stsp : got_error_from_errno2("flock", path));
147 09fe317a 2018-03-11 stsp goto done;
148 09fe317a 2018-03-11 stsp }
149 09fe317a 2018-03-11 stsp
150 e4b9a50c 2019-07-27 stsp if (fstat(fd, &sb) != 0) {
151 e4b9a50c 2019-07-27 stsp err = got_error_from_errno2("fstat", path);
152 d10c9b58 2019-02-19 stsp goto done;
153 d10c9b58 2019-02-19 stsp }
154 09fe317a 2018-03-11 stsp *content = calloc(1, sb.st_size);
155 09fe317a 2018-03-11 stsp if (*content == NULL) {
156 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
157 09fe317a 2018-03-11 stsp goto done;
158 09fe317a 2018-03-11 stsp }
159 09fe317a 2018-03-11 stsp
160 09fe317a 2018-03-11 stsp n = read(fd, *content, sb.st_size);
161 09fe317a 2018-03-11 stsp if (n != sb.st_size) {
162 638f9024 2019-05-13 stsp err = (n == -1 ? got_error_from_errno2("read", path) :
163 a2e6d162 2019-07-27 stsp got_error_path(path, GOT_ERR_WORKTREE_META));
164 09fe317a 2018-03-11 stsp goto done;
165 09fe317a 2018-03-11 stsp }
166 09fe317a 2018-03-11 stsp if ((*content)[sb.st_size - 1] != '\n') {
167 a2e6d162 2019-07-27 stsp err = got_error_path(path, GOT_ERR_WORKTREE_META);
168 09fe317a 2018-03-11 stsp goto done;
169 09fe317a 2018-03-11 stsp }
170 09fe317a 2018-03-11 stsp (*content)[sb.st_size - 1] = '\0';
171 09fe317a 2018-03-11 stsp
172 09fe317a 2018-03-11 stsp done:
173 09fe317a 2018-03-11 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
174 638f9024 2019-05-13 stsp err = got_error_from_errno2("close", path_got);
175 09fe317a 2018-03-11 stsp free(path);
176 09fe317a 2018-03-11 stsp if (err) {
177 09fe317a 2018-03-11 stsp free(*content);
178 09fe317a 2018-03-11 stsp *content = NULL;
179 09fe317a 2018-03-11 stsp }
180 09fe317a 2018-03-11 stsp return err;
181 09fe317a 2018-03-11 stsp }
182 09fe317a 2018-03-11 stsp
183 024e9686 2019-05-14 stsp static const struct got_error *
184 024e9686 2019-05-14 stsp write_head_ref(const char *path_got, struct got_reference *head_ref)
185 024e9686 2019-05-14 stsp {
186 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
187 024e9686 2019-05-14 stsp char *refstr = NULL;
188 024e9686 2019-05-14 stsp
189 024e9686 2019-05-14 stsp if (got_ref_is_symbolic(head_ref)) {
190 024e9686 2019-05-14 stsp refstr = got_ref_to_str(head_ref);
191 024e9686 2019-05-14 stsp if (refstr == NULL)
192 024e9686 2019-05-14 stsp return got_error_from_errno("got_ref_to_str");
193 024e9686 2019-05-14 stsp } else {
194 024e9686 2019-05-14 stsp refstr = strdup(got_ref_get_name(head_ref));
195 024e9686 2019-05-14 stsp if (refstr == NULL)
196 024e9686 2019-05-14 stsp return got_error_from_errno("strdup");
197 024e9686 2019-05-14 stsp }
198 024e9686 2019-05-14 stsp err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
199 024e9686 2019-05-14 stsp free(refstr);
200 024e9686 2019-05-14 stsp return err;
201 024e9686 2019-05-14 stsp }
202 024e9686 2019-05-14 stsp
203 86c3caaf 2018-03-09 stsp const struct got_error *
204 86c3caaf 2018-03-09 stsp got_worktree_init(const char *path, struct got_reference *head_ref,
205 577ec78f 2018-03-11 stsp const char *prefix, struct got_repository *repo)
206 86c3caaf 2018-03-09 stsp {
207 86c3caaf 2018-03-09 stsp const struct got_error *err = NULL;
208 65596e15 2018-12-24 stsp struct got_object_id *commit_id = NULL;
209 ec22038e 2019-03-10 stsp uuid_t uuid;
210 ec22038e 2019-03-10 stsp uint32_t uuid_status;
211 65596e15 2018-12-24 stsp int obj_type;
212 7ac97322 2018-03-11 stsp char *path_got = NULL;
213 1451e70d 2018-03-10 stsp char *formatstr = NULL;
214 0bb8a95e 2018-03-12 stsp char *absprefix = NULL;
215 65596e15 2018-12-24 stsp char *basestr = NULL;
216 ec22038e 2019-03-10 stsp char *uuidstr = NULL;
217 65596e15 2018-12-24 stsp
218 0c48fee2 2019-03-11 stsp if (strcmp(path, got_repo_get_path(repo)) == 0) {
219 0c48fee2 2019-03-11 stsp err = got_error(GOT_ERR_WORKTREE_REPO);
220 0c48fee2 2019-03-11 stsp goto done;
221 0c48fee2 2019-03-11 stsp }
222 0c48fee2 2019-03-11 stsp
223 65596e15 2018-12-24 stsp err = got_ref_resolve(&commit_id, repo, head_ref);
224 65596e15 2018-12-24 stsp if (err)
225 65596e15 2018-12-24 stsp return err;
226 65596e15 2018-12-24 stsp err = got_object_get_type(&obj_type, repo, commit_id);
227 65596e15 2018-12-24 stsp if (err)
228 65596e15 2018-12-24 stsp return err;
229 65596e15 2018-12-24 stsp if (obj_type != GOT_OBJ_TYPE_COMMIT)
230 65596e15 2018-12-24 stsp return got_error(GOT_ERR_OBJ_TYPE);
231 86c3caaf 2018-03-09 stsp
232 0bb8a95e 2018-03-12 stsp if (!got_path_is_absolute(prefix)) {
233 0bb8a95e 2018-03-12 stsp if (asprintf(&absprefix, "/%s", prefix) == -1)
234 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
235 0bb8a95e 2018-03-12 stsp }
236 577ec78f 2018-03-11 stsp
237 86c3caaf 2018-03-09 stsp /* Create top-level directory (may already exist). */
238 2cb4bacb 2018-03-11 stsp if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
239 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path);
240 86c3caaf 2018-03-09 stsp goto done;
241 86c3caaf 2018-03-09 stsp }
242 86c3caaf 2018-03-09 stsp
243 86c3caaf 2018-03-09 stsp /* Create .got directory (may already exist). */
244 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
245 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
246 86c3caaf 2018-03-09 stsp goto done;
247 86c3caaf 2018-03-09 stsp }
248 7ac97322 2018-03-11 stsp if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
249 638f9024 2019-05-13 stsp err = got_error_from_errno2("mkdir", path_got);
250 86c3caaf 2018-03-09 stsp goto done;
251 86c3caaf 2018-03-09 stsp }
252 86c3caaf 2018-03-09 stsp
253 056e7441 2018-03-11 stsp /* Create an empty lock file. */
254 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
255 056e7441 2018-03-11 stsp if (err)
256 056e7441 2018-03-11 stsp goto done;
257 056e7441 2018-03-11 stsp
258 86c3caaf 2018-03-09 stsp /* Create an empty file index. */
259 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
260 99724ed4 2018-03-10 stsp if (err)
261 86c3caaf 2018-03-09 stsp goto done;
262 86c3caaf 2018-03-09 stsp
263 08d425ea 2018-12-24 stsp /* Write the HEAD reference. */
264 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
265 65596e15 2018-12-24 stsp if (err)
266 65596e15 2018-12-24 stsp goto done;
267 65596e15 2018-12-24 stsp
268 65596e15 2018-12-24 stsp /* Record our base commit. */
269 65596e15 2018-12-24 stsp err = got_object_id_str(&basestr, commit_id);
270 65596e15 2018-12-24 stsp if (err)
271 65596e15 2018-12-24 stsp goto done;
272 0f92850e 2018-12-25 stsp err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
273 99724ed4 2018-03-10 stsp if (err)
274 86c3caaf 2018-03-09 stsp goto done;
275 86c3caaf 2018-03-09 stsp
276 1451e70d 2018-03-10 stsp /* Store path to repository. */
277 7839bc15 2019-01-06 stsp err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
278 7839bc15 2019-01-06 stsp got_repo_get_path(repo));
279 99724ed4 2018-03-10 stsp if (err)
280 86c3caaf 2018-03-09 stsp goto done;
281 86c3caaf 2018-03-09 stsp
282 577ec78f 2018-03-11 stsp /* Store in-repository path prefix. */
283 0bb8a95e 2018-03-12 stsp err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
284 0bb8a95e 2018-03-12 stsp absprefix ? absprefix : prefix);
285 ec22038e 2019-03-10 stsp if (err)
286 ec22038e 2019-03-10 stsp goto done;
287 ec22038e 2019-03-10 stsp
288 ec22038e 2019-03-10 stsp /* Generate UUID. */
289 ec22038e 2019-03-10 stsp uuid_create(&uuid, &uuid_status);
290 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
291 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_create");
292 ec22038e 2019-03-10 stsp goto done;
293 ec22038e 2019-03-10 stsp }
294 ec22038e 2019-03-10 stsp uuid_to_string(&uuid, &uuidstr, &uuid_status);
295 ec22038e 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
296 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_to_string");
297 ec22038e 2019-03-10 stsp goto done;
298 ec22038e 2019-03-10 stsp }
299 ec22038e 2019-03-10 stsp err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
300 577ec78f 2018-03-11 stsp if (err)
301 577ec78f 2018-03-11 stsp goto done;
302 577ec78f 2018-03-11 stsp
303 9dce68ed 2018-03-10 stsp /* Stamp work tree with format file. */
304 1451e70d 2018-03-10 stsp if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
305 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
306 1451e70d 2018-03-10 stsp goto done;
307 1451e70d 2018-03-10 stsp }
308 7ac97322 2018-03-11 stsp err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
309 99724ed4 2018-03-10 stsp if (err)
310 1451e70d 2018-03-10 stsp goto done;
311 1451e70d 2018-03-10 stsp
312 86c3caaf 2018-03-09 stsp done:
313 65596e15 2018-12-24 stsp free(commit_id);
314 7ac97322 2018-03-11 stsp free(path_got);
315 1451e70d 2018-03-10 stsp free(formatstr);
316 0bb8a95e 2018-03-12 stsp free(absprefix);
317 65596e15 2018-12-24 stsp free(basestr);
318 ec22038e 2019-03-10 stsp free(uuidstr);
319 86c3caaf 2018-03-09 stsp return err;
320 86c3caaf 2018-03-09 stsp }
321 86c3caaf 2018-03-09 stsp
322 247140b2 2019-02-05 stsp static const struct got_error *
323 247140b2 2019-02-05 stsp open_worktree(struct got_worktree **worktree, const char *path)
324 86c3caaf 2018-03-09 stsp {
325 6d9d28c3 2018-03-11 stsp const struct got_error *err = NULL;
326 7ac97322 2018-03-11 stsp char *path_got;
327 6d9d28c3 2018-03-11 stsp char *formatstr = NULL;
328 c442a90d 2019-03-10 stsp char *uuidstr = NULL;
329 056e7441 2018-03-11 stsp char *path_lock = NULL;
330 eaccb85f 2018-12-25 stsp char *base_commit_id_str = NULL;
331 6d9d28c3 2018-03-11 stsp int version, fd = -1;
332 6d9d28c3 2018-03-11 stsp const char *errstr;
333 eaccb85f 2018-12-25 stsp struct got_repository *repo = NULL;
334 c442a90d 2019-03-10 stsp uint32_t uuid_status;
335 6d9d28c3 2018-03-11 stsp
336 6d9d28c3 2018-03-11 stsp *worktree = NULL;
337 6d9d28c3 2018-03-11 stsp
338 7ac97322 2018-03-11 stsp if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
339 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
340 7ac97322 2018-03-11 stsp path_got = NULL;
341 6d9d28c3 2018-03-11 stsp goto done;
342 6d9d28c3 2018-03-11 stsp }
343 6d9d28c3 2018-03-11 stsp
344 7ac97322 2018-03-11 stsp if (asprintf(&path_lock, "%s/%s", path_got, GOT_WORKTREE_LOCK) == -1) {
345 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
346 056e7441 2018-03-11 stsp path_lock = NULL;
347 6d9d28c3 2018-03-11 stsp goto done;
348 6d9d28c3 2018-03-11 stsp }
349 6d9d28c3 2018-03-11 stsp
350 056e7441 2018-03-11 stsp fd = open(path_lock, O_RDWR | O_EXLOCK | O_NONBLOCK);
351 6d9d28c3 2018-03-11 stsp if (fd == -1) {
352 73a5ef67 2018-03-11 stsp err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
353 638f9024 2019-05-13 stsp : got_error_from_errno2("open", path_lock));
354 6d9d28c3 2018-03-11 stsp goto done;
355 6d9d28c3 2018-03-11 stsp }
356 6d9d28c3 2018-03-11 stsp
357 7ac97322 2018-03-11 stsp err = read_meta_file(&formatstr, path_got, GOT_WORKTREE_FORMAT);
358 6d9d28c3 2018-03-11 stsp if (err)
359 6d9d28c3 2018-03-11 stsp goto done;
360 6d9d28c3 2018-03-11 stsp
361 6d9d28c3 2018-03-11 stsp version = strtonum(formatstr, 1, INT_MAX, &errstr);
362 6d9d28c3 2018-03-11 stsp if (errstr) {
363 a2e6d162 2019-07-27 stsp err = got_error_msg(GOT_ERR_WORKTREE_META,
364 a2e6d162 2019-07-27 stsp "could not parse work tree format version number");
365 6d9d28c3 2018-03-11 stsp goto done;
366 6d9d28c3 2018-03-11 stsp }
367 6d9d28c3 2018-03-11 stsp if (version != GOT_WORKTREE_FORMAT_VERSION) {
368 6d9d28c3 2018-03-11 stsp err = got_error(GOT_ERR_WORKTREE_VERS);
369 6d9d28c3 2018-03-11 stsp goto done;
370 6d9d28c3 2018-03-11 stsp }
371 6d9d28c3 2018-03-11 stsp
372 6d9d28c3 2018-03-11 stsp *worktree = calloc(1, sizeof(**worktree));
373 6d9d28c3 2018-03-11 stsp if (*worktree == NULL) {
374 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
375 6d9d28c3 2018-03-11 stsp goto done;
376 6d9d28c3 2018-03-11 stsp }
377 056e7441 2018-03-11 stsp (*worktree)->lockfd = -1;
378 6d9d28c3 2018-03-11 stsp
379 0647c563 2019-03-11 stsp (*worktree)->root_path = strdup(path);
380 c88eb298 2018-03-11 stsp if ((*worktree)->root_path == NULL) {
381 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
382 6d9d28c3 2018-03-11 stsp goto done;
383 6d9d28c3 2018-03-11 stsp }
384 cde76477 2018-03-11 stsp err = read_meta_file(&(*worktree)->repo_path, path_got,
385 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_REPOSITORY);
386 6d9d28c3 2018-03-11 stsp if (err)
387 6d9d28c3 2018-03-11 stsp goto done;
388 eaccb85f 2018-12-25 stsp
389 7ac97322 2018-03-11 stsp err = read_meta_file(&(*worktree)->path_prefix, path_got,
390 6d9d28c3 2018-03-11 stsp GOT_WORKTREE_PATH_PREFIX);
391 93a30277 2018-12-24 stsp if (err)
392 93a30277 2018-12-24 stsp goto done;
393 93a30277 2018-12-24 stsp
394 eaccb85f 2018-12-25 stsp err = read_meta_file(&base_commit_id_str, path_got,
395 0f92850e 2018-12-25 stsp GOT_WORKTREE_BASE_COMMIT);
396 c442a90d 2019-03-10 stsp if (err)
397 c442a90d 2019-03-10 stsp goto done;
398 c442a90d 2019-03-10 stsp
399 c442a90d 2019-03-10 stsp err = read_meta_file(&uuidstr, path_got, GOT_WORKTREE_UUID);
400 eaccb85f 2018-12-25 stsp if (err)
401 c442a90d 2019-03-10 stsp goto done;
402 c442a90d 2019-03-10 stsp uuid_from_string(uuidstr, &(*worktree)->uuid, &uuid_status);
403 c442a90d 2019-03-10 stsp if (uuid_status != uuid_s_ok) {
404 cc483380 2019-09-01 stsp err = got_error_uuid(uuid_status, "uuid_from_string");
405 eaccb85f 2018-12-25 stsp goto done;
406 c442a90d 2019-03-10 stsp }
407 eaccb85f 2018-12-25 stsp
408 c9956ddf 2019-09-08 stsp err = got_repo_open(&repo, (*worktree)->repo_path, NULL);
409 eaccb85f 2018-12-25 stsp if (err)
410 eaccb85f 2018-12-25 stsp goto done;
411 eaccb85f 2018-12-25 stsp
412 eaccb85f 2018-12-25 stsp err = got_object_resolve_id_str(&(*worktree)->base_commit_id, repo,
413 eaccb85f 2018-12-25 stsp base_commit_id_str);
414 f5baf295 2018-03-11 stsp if (err)
415 6d9d28c3 2018-03-11 stsp goto done;
416 6d9d28c3 2018-03-11 stsp
417 36a38700 2019-05-10 stsp err = read_meta_file(&(*worktree)->head_ref_name, path_got,
418 36a38700 2019-05-10 stsp GOT_WORKTREE_HEAD_REF);
419 6d9d28c3 2018-03-11 stsp done:
420 eaccb85f 2018-12-25 stsp if (repo)
421 eaccb85f 2018-12-25 stsp got_repo_close(repo);
422 7ac97322 2018-03-11 stsp free(path_got);
423 056e7441 2018-03-11 stsp free(path_lock);
424 eaccb85f 2018-12-25 stsp free(base_commit_id_str);
425 c442a90d 2019-03-10 stsp free(uuidstr);
426 bd165944 2019-03-10 stsp free(formatstr);
427 6d9d28c3 2018-03-11 stsp if (err) {
428 6d9d28c3 2018-03-11 stsp if (fd != -1)
429 6d9d28c3 2018-03-11 stsp close(fd);
430 6d9d28c3 2018-03-11 stsp if (*worktree != NULL)
431 6d9d28c3 2018-03-11 stsp got_worktree_close(*worktree);
432 6d9d28c3 2018-03-11 stsp *worktree = NULL;
433 6d9d28c3 2018-03-11 stsp } else
434 056e7441 2018-03-11 stsp (*worktree)->lockfd = fd;
435 6d9d28c3 2018-03-11 stsp
436 6d9d28c3 2018-03-11 stsp return err;
437 86c3caaf 2018-03-09 stsp }
438 247140b2 2019-02-05 stsp
439 247140b2 2019-02-05 stsp const struct got_error *
440 247140b2 2019-02-05 stsp got_worktree_open(struct got_worktree **worktree, const char *path)
441 247140b2 2019-02-05 stsp {
442 247140b2 2019-02-05 stsp const struct got_error *err = NULL;
443 86c3caaf 2018-03-09 stsp
444 247140b2 2019-02-05 stsp do {
445 247140b2 2019-02-05 stsp err = open_worktree(worktree, path);
446 f02eaa22 2019-03-11 stsp if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT))
447 247140b2 2019-02-05 stsp return err;
448 247140b2 2019-02-05 stsp if (*worktree)
449 247140b2 2019-02-05 stsp return NULL;
450 247140b2 2019-02-05 stsp path = dirname(path);
451 d1542a27 2019-02-05 stsp if (path == NULL)
452 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
453 d1542a27 2019-02-05 stsp } while (!((path[0] == '.' || path[0] == '/') && path[1] == '\0'));
454 247140b2 2019-02-05 stsp
455 247140b2 2019-02-05 stsp return got_error(GOT_ERR_NOT_WORKTREE);
456 247140b2 2019-02-05 stsp }
457 247140b2 2019-02-05 stsp
458 3a6ce05a 2019-02-11 stsp const struct got_error *
459 86c3caaf 2018-03-09 stsp got_worktree_close(struct got_worktree *worktree)
460 86c3caaf 2018-03-09 stsp {
461 3a6ce05a 2019-02-11 stsp const struct got_error *err = NULL;
462 cde76477 2018-03-11 stsp free(worktree->repo_path);
463 6d9d28c3 2018-03-11 stsp free(worktree->path_prefix);
464 eaccb85f 2018-12-25 stsp free(worktree->base_commit_id);
465 36a38700 2019-05-10 stsp free(worktree->head_ref_name);
466 056e7441 2018-03-11 stsp if (worktree->lockfd != -1)
467 3a6ce05a 2019-02-11 stsp if (close(worktree->lockfd) != 0)
468 638f9024 2019-05-13 stsp err = got_error_from_errno2("close",
469 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree));
470 7f11502c 2019-08-28 hiltjo free(worktree->root_path);
471 6d9d28c3 2018-03-11 stsp free(worktree);
472 3a6ce05a 2019-02-11 stsp return err;
473 86c3caaf 2018-03-09 stsp }
474 86c3caaf 2018-03-09 stsp
475 2fbdb5ae 2018-12-29 stsp const char *
476 c7f4312f 2019-02-05 stsp got_worktree_get_root_path(struct got_worktree *worktree)
477 c7f4312f 2019-02-05 stsp {
478 c7f4312f 2019-02-05 stsp return worktree->root_path;
479 c7f4312f 2019-02-05 stsp }
480 c7f4312f 2019-02-05 stsp
481 c7f4312f 2019-02-05 stsp const char *
482 86c3caaf 2018-03-09 stsp got_worktree_get_repo_path(struct got_worktree *worktree)
483 86c3caaf 2018-03-09 stsp {
484 2fbdb5ae 2018-12-29 stsp return worktree->repo_path;
485 49520a32 2018-12-29 stsp }
486 49520a32 2018-12-29 stsp
487 49520a32 2018-12-29 stsp const char *
488 49520a32 2018-12-29 stsp got_worktree_get_path_prefix(struct got_worktree *worktree)
489 49520a32 2018-12-29 stsp {
490 f609be2e 2018-12-29 stsp return worktree->path_prefix;
491 e5dc7198 2018-12-29 stsp }
492 e5dc7198 2018-12-29 stsp
493 e5dc7198 2018-12-29 stsp const struct got_error *
494 e5dc7198 2018-12-29 stsp got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
495 e5dc7198 2018-12-29 stsp const char *path_prefix)
496 e5dc7198 2018-12-29 stsp {
497 e5dc7198 2018-12-29 stsp char *absprefix = NULL;
498 e5dc7198 2018-12-29 stsp
499 e5dc7198 2018-12-29 stsp if (!got_path_is_absolute(path_prefix)) {
500 e5dc7198 2018-12-29 stsp if (asprintf(&absprefix, "/%s", path_prefix) == -1)
501 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
502 e5dc7198 2018-12-29 stsp }
503 e5dc7198 2018-12-29 stsp *match = (strcmp(absprefix ? absprefix : path_prefix,
504 e5dc7198 2018-12-29 stsp worktree->path_prefix) == 0);
505 e5dc7198 2018-12-29 stsp free(absprefix);
506 e5dc7198 2018-12-29 stsp return NULL;
507 86c3caaf 2018-03-09 stsp }
508 86c3caaf 2018-03-09 stsp
509 bc70eb79 2019-05-09 stsp const char *
510 35be1456 2018-03-11 stsp got_worktree_get_head_ref_name(struct got_worktree *worktree)
511 86c3caaf 2018-03-09 stsp {
512 36a38700 2019-05-10 stsp return worktree->head_ref_name;
513 024e9686 2019-05-14 stsp }
514 024e9686 2019-05-14 stsp
515 024e9686 2019-05-14 stsp const struct got_error *
516 024e9686 2019-05-14 stsp got_worktree_set_head_ref(struct got_worktree *worktree,
517 024e9686 2019-05-14 stsp struct got_reference *head_ref)
518 024e9686 2019-05-14 stsp {
519 024e9686 2019-05-14 stsp const struct got_error *err = NULL;
520 024e9686 2019-05-14 stsp char *path_got = NULL, *head_ref_name = NULL;
521 024e9686 2019-05-14 stsp
522 024e9686 2019-05-14 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
523 024e9686 2019-05-14 stsp GOT_WORKTREE_GOT_DIR) == -1) {
524 024e9686 2019-05-14 stsp err = got_error_from_errno("asprintf");
525 024e9686 2019-05-14 stsp path_got = NULL;
526 024e9686 2019-05-14 stsp goto done;
527 024e9686 2019-05-14 stsp }
528 024e9686 2019-05-14 stsp
529 024e9686 2019-05-14 stsp head_ref_name = strdup(got_ref_get_name(head_ref));
530 024e9686 2019-05-14 stsp if (head_ref_name == NULL) {
531 024e9686 2019-05-14 stsp err = got_error_from_errno("strdup");
532 024e9686 2019-05-14 stsp goto done;
533 024e9686 2019-05-14 stsp }
534 024e9686 2019-05-14 stsp
535 024e9686 2019-05-14 stsp err = write_head_ref(path_got, head_ref);
536 024e9686 2019-05-14 stsp if (err)
537 024e9686 2019-05-14 stsp goto done;
538 024e9686 2019-05-14 stsp
539 024e9686 2019-05-14 stsp free(worktree->head_ref_name);
540 024e9686 2019-05-14 stsp worktree->head_ref_name = head_ref_name;
541 024e9686 2019-05-14 stsp done:
542 024e9686 2019-05-14 stsp free(path_got);
543 024e9686 2019-05-14 stsp if (err)
544 024e9686 2019-05-14 stsp free(head_ref_name);
545 024e9686 2019-05-14 stsp return err;
546 507dc3bb 2018-12-29 stsp }
547 507dc3bb 2018-12-29 stsp
548 b72f483a 2019-02-05 stsp struct got_object_id *
549 507dc3bb 2018-12-29 stsp got_worktree_get_base_commit_id(struct got_worktree *worktree)
550 507dc3bb 2018-12-29 stsp {
551 507dc3bb 2018-12-29 stsp return worktree->base_commit_id;
552 86c3caaf 2018-03-09 stsp }
553 86c3caaf 2018-03-09 stsp
554 507dc3bb 2018-12-29 stsp const struct got_error *
555 507dc3bb 2018-12-29 stsp got_worktree_set_base_commit_id(struct got_worktree *worktree,
556 507dc3bb 2018-12-29 stsp struct got_repository *repo, struct got_object_id *commit_id)
557 507dc3bb 2018-12-29 stsp {
558 507dc3bb 2018-12-29 stsp const struct got_error *err;
559 507dc3bb 2018-12-29 stsp struct got_object *obj = NULL;
560 507dc3bb 2018-12-29 stsp char *id_str = NULL;
561 507dc3bb 2018-12-29 stsp char *path_got = NULL;
562 507dc3bb 2018-12-29 stsp
563 507dc3bb 2018-12-29 stsp if (asprintf(&path_got, "%s/%s", worktree->root_path,
564 507dc3bb 2018-12-29 stsp GOT_WORKTREE_GOT_DIR) == -1) {
565 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
566 507dc3bb 2018-12-29 stsp path_got = NULL;
567 507dc3bb 2018-12-29 stsp goto done;
568 507dc3bb 2018-12-29 stsp }
569 507dc3bb 2018-12-29 stsp
570 507dc3bb 2018-12-29 stsp err = got_object_open(&obj, repo, commit_id);
571 507dc3bb 2018-12-29 stsp if (err)
572 507dc3bb 2018-12-29 stsp return err;
573 507dc3bb 2018-12-29 stsp
574 507dc3bb 2018-12-29 stsp if (obj->type != GOT_OBJ_TYPE_COMMIT) {
575 507dc3bb 2018-12-29 stsp err = got_error(GOT_ERR_OBJ_TYPE);
576 507dc3bb 2018-12-29 stsp goto done;
577 507dc3bb 2018-12-29 stsp }
578 507dc3bb 2018-12-29 stsp
579 507dc3bb 2018-12-29 stsp /* Record our base commit. */
580 507dc3bb 2018-12-29 stsp err = got_object_id_str(&id_str, commit_id);
581 507dc3bb 2018-12-29 stsp if (err)
582 507dc3bb 2018-12-29 stsp goto done;
583 507dc3bb 2018-12-29 stsp err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
584 507dc3bb 2018-12-29 stsp if (err)
585 507dc3bb 2018-12-29 stsp goto done;
586 507dc3bb 2018-12-29 stsp
587 507dc3bb 2018-12-29 stsp free(worktree->base_commit_id);
588 507dc3bb 2018-12-29 stsp worktree->base_commit_id = got_object_id_dup(commit_id);
589 507dc3bb 2018-12-29 stsp if (worktree->base_commit_id == NULL) {
590 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
591 507dc3bb 2018-12-29 stsp goto done;
592 507dc3bb 2018-12-29 stsp }
593 507dc3bb 2018-12-29 stsp done:
594 507dc3bb 2018-12-29 stsp if (obj)
595 507dc3bb 2018-12-29 stsp got_object_close(obj);
596 507dc3bb 2018-12-29 stsp free(id_str);
597 507dc3bb 2018-12-29 stsp free(path_got);
598 507dc3bb 2018-12-29 stsp return err;
599 507dc3bb 2018-12-29 stsp }
600 507dc3bb 2018-12-29 stsp
601 9d31a1d8 2018-03-11 stsp static const struct got_error *
602 9d31a1d8 2018-03-11 stsp lock_worktree(struct got_worktree *worktree, int operation)
603 86c3caaf 2018-03-09 stsp {
604 9d31a1d8 2018-03-11 stsp if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
605 9d31a1d8 2018-03-11 stsp return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
606 638f9024 2019-05-13 stsp : got_error_from_errno2("flock",
607 230a42bd 2019-05-11 jcs got_worktree_get_root_path(worktree)));
608 86c3caaf 2018-03-09 stsp return NULL;
609 21908da4 2019-01-13 stsp }
610 21908da4 2019-01-13 stsp
611 21908da4 2019-01-13 stsp static const struct got_error *
612 4a1ddfc2 2019-01-12 stsp add_dir_on_disk(struct got_worktree *worktree, const char *path)
613 4a1ddfc2 2019-01-12 stsp {
614 4a1ddfc2 2019-01-12 stsp const struct got_error *err = NULL;
615 4a1ddfc2 2019-01-12 stsp char *abspath;
616 4a1ddfc2 2019-01-12 stsp
617 4a1ddfc2 2019-01-12 stsp if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
618 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
619 4a1ddfc2 2019-01-12 stsp
620 0cd1c46a 2019-03-11 stsp err = got_path_mkdir(abspath);
621 ddcd8544 2019-03-11 stsp if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
622 ddcd8544 2019-03-11 stsp struct stat sb;
623 ddcd8544 2019-03-11 stsp err = NULL;
624 ddcd8544 2019-03-11 stsp if (lstat(abspath, &sb) == -1) {
625 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", abspath);
626 ddcd8544 2019-03-11 stsp } else if (!S_ISDIR(sb.st_mode)) {
627 ddcd8544 2019-03-11 stsp /* TODO directory is obstructed; do something */
628 ddcd8544 2019-03-11 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
629 ddcd8544 2019-03-11 stsp }
630 ddcd8544 2019-03-11 stsp }
631 4a1ddfc2 2019-01-12 stsp free(abspath);
632 68c76935 2019-02-19 stsp return err;
633 68c76935 2019-02-19 stsp }
634 68c76935 2019-02-19 stsp
635 68c76935 2019-02-19 stsp static const struct got_error *
636 68c76935 2019-02-19 stsp check_file_contents_equal(int *same, FILE *f1, FILE *f2)
637 68c76935 2019-02-19 stsp {
638 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
639 68c76935 2019-02-19 stsp uint8_t fbuf1[8192];
640 68c76935 2019-02-19 stsp uint8_t fbuf2[8192];
641 68c76935 2019-02-19 stsp size_t flen1 = 0, flen2 = 0;
642 68c76935 2019-02-19 stsp
643 68c76935 2019-02-19 stsp *same = 1;
644 68c76935 2019-02-19 stsp
645 230a42bd 2019-05-11 jcs for (;;) {
646 68c76935 2019-02-19 stsp flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
647 68c76935 2019-02-19 stsp if (flen1 == 0 && ferror(f1)) {
648 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
649 68c76935 2019-02-19 stsp break;
650 68c76935 2019-02-19 stsp }
651 68c76935 2019-02-19 stsp flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
652 68c76935 2019-02-19 stsp if (flen2 == 0 && ferror(f2)) {
653 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
654 68c76935 2019-02-19 stsp break;
655 68c76935 2019-02-19 stsp }
656 68c76935 2019-02-19 stsp if (flen1 == 0) {
657 68c76935 2019-02-19 stsp if (flen2 != 0)
658 68c76935 2019-02-19 stsp *same = 0;
659 68c76935 2019-02-19 stsp break;
660 68c76935 2019-02-19 stsp } else if (flen2 == 0) {
661 68c76935 2019-02-19 stsp if (flen1 != 0)
662 68c76935 2019-02-19 stsp *same = 0;
663 68c76935 2019-02-19 stsp break;
664 68c76935 2019-02-19 stsp } else if (flen1 == flen2) {
665 68c76935 2019-02-19 stsp if (memcmp(fbuf1, fbuf2, flen2) != 0) {
666 68c76935 2019-02-19 stsp *same = 0;
667 68c76935 2019-02-19 stsp break;
668 68c76935 2019-02-19 stsp }
669 68c76935 2019-02-19 stsp } else {
670 68c76935 2019-02-19 stsp *same = 0;
671 68c76935 2019-02-19 stsp break;
672 68c76935 2019-02-19 stsp }
673 68c76935 2019-02-19 stsp }
674 68c76935 2019-02-19 stsp
675 68c76935 2019-02-19 stsp return err;
676 68c76935 2019-02-19 stsp }
677 68c76935 2019-02-19 stsp
678 68c76935 2019-02-19 stsp static const struct got_error *
679 68c76935 2019-02-19 stsp check_files_equal(int *same, const char *f1_path, const char *f2_path)
680 68c76935 2019-02-19 stsp {
681 68c76935 2019-02-19 stsp const struct got_error *err = NULL;
682 68c76935 2019-02-19 stsp struct stat sb;
683 68c76935 2019-02-19 stsp size_t size1, size2;
684 68c76935 2019-02-19 stsp FILE *f1 = NULL, *f2 = NULL;
685 68c76935 2019-02-19 stsp
686 68c76935 2019-02-19 stsp *same = 1;
687 68c76935 2019-02-19 stsp
688 68c76935 2019-02-19 stsp if (lstat(f1_path, &sb) != 0) {
689 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", f1_path);
690 68c76935 2019-02-19 stsp goto done;
691 68c76935 2019-02-19 stsp }
692 68c76935 2019-02-19 stsp size1 = sb.st_size;
693 68c76935 2019-02-19 stsp
694 68c76935 2019-02-19 stsp if (lstat(f2_path, &sb) != 0) {
695 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", f2_path);
696 68c76935 2019-02-19 stsp goto done;
697 68c76935 2019-02-19 stsp }
698 68c76935 2019-02-19 stsp size2 = sb.st_size;
699 68c76935 2019-02-19 stsp
700 68c76935 2019-02-19 stsp if (size1 != size2) {
701 68c76935 2019-02-19 stsp *same = 0;
702 68c76935 2019-02-19 stsp return NULL;
703 68c76935 2019-02-19 stsp }
704 68c76935 2019-02-19 stsp
705 68c76935 2019-02-19 stsp f1 = fopen(f1_path, "r");
706 68c76935 2019-02-19 stsp if (f1 == NULL)
707 60522982 2019-12-15 stsp return got_error_from_errno2("fopen", f1_path);
708 68c76935 2019-02-19 stsp
709 68c76935 2019-02-19 stsp f2 = fopen(f2_path, "r");
710 68c76935 2019-02-19 stsp if (f2 == NULL) {
711 60522982 2019-12-15 stsp err = got_error_from_errno2("fopen", f2_path);
712 68c76935 2019-02-19 stsp goto done;
713 68c76935 2019-02-19 stsp }
714 68c76935 2019-02-19 stsp
715 68c76935 2019-02-19 stsp err = check_file_contents_equal(same, f1, f2);
716 68c76935 2019-02-19 stsp done:
717 68c76935 2019-02-19 stsp if (f1 && fclose(f1) != 0 && err == NULL)
718 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
719 68c76935 2019-02-19 stsp if (f2 && fclose(f2) != 0 && err == NULL)
720 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
721 68c76935 2019-02-19 stsp
722 6353ad76 2019-02-08 stsp return err;
723 6353ad76 2019-02-08 stsp }
724 6353ad76 2019-02-08 stsp
725 6353ad76 2019-02-08 stsp /*
726 46b6ee73 2019-06-04 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
727 14c901f1 2019-08-08 stsp * the file at deriv_path acts as the first derived version, and the
728 14c901f1 2019-08-08 stsp * file on disk acts as the second derived version.
729 6353ad76 2019-02-08 stsp */
730 6353ad76 2019-02-08 stsp static const struct got_error *
731 14c901f1 2019-08-08 stsp merge_file(int *local_changes_subsumed, struct got_worktree *worktree,
732 46b6ee73 2019-06-04 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
733 14c901f1 2019-08-08 stsp const char *path, uint16_t st_mode, const char *deriv_path,
734 f69721c3 2019-10-21 stsp const char *label_orig, const char *label_deriv,
735 f69721c3 2019-10-21 stsp struct got_repository *repo,
736 14c901f1 2019-08-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
737 6353ad76 2019-02-08 stsp {
738 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
739 6353ad76 2019-02-08 stsp int merged_fd = -1;
740 14c901f1 2019-08-08 stsp FILE *f_orig = NULL;
741 14c901f1 2019-08-08 stsp char *blob_orig_path = NULL;
742 af54ae4a 2019-02-19 stsp char *merged_path = NULL, *base_path = NULL;
743 234035bc 2019-06-01 stsp int overlapcnt = 0;
744 af54ae4a 2019-02-19 stsp char *parent;
745 6353ad76 2019-02-08 stsp
746 234035bc 2019-06-01 stsp *local_changes_subsumed = 0;
747 234035bc 2019-06-01 stsp
748 af54ae4a 2019-02-19 stsp parent = dirname(ondisk_path);
749 af54ae4a 2019-02-19 stsp if (parent == NULL)
750 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", ondisk_path);
751 af54ae4a 2019-02-19 stsp
752 af54ae4a 2019-02-19 stsp if (asprintf(&base_path, "%s/got-merged", parent) == -1)
753 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
754 af54ae4a 2019-02-19 stsp
755 af54ae4a 2019-02-19 stsp err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path);
756 6353ad76 2019-02-08 stsp if (err)
757 6353ad76 2019-02-08 stsp goto done;
758 6353ad76 2019-02-08 stsp
759 af54ae4a 2019-02-19 stsp free(base_path);
760 46b6ee73 2019-06-04 stsp if (asprintf(&base_path, "%s/got-merge-blob-orig", parent) == -1) {
761 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
762 af54ae4a 2019-02-19 stsp base_path = NULL;
763 af54ae4a 2019-02-19 stsp goto done;
764 af54ae4a 2019-02-19 stsp }
765 af54ae4a 2019-02-19 stsp
766 46b6ee73 2019-06-04 stsp err = got_opentemp_named(&blob_orig_path, &f_orig, base_path);
767 6353ad76 2019-02-08 stsp if (err)
768 6353ad76 2019-02-08 stsp goto done;
769 46b6ee73 2019-06-04 stsp if (blob_orig) {
770 6c4c42e0 2019-06-24 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
771 46b6ee73 2019-06-04 stsp blob_orig);
772 1430b4e0 2019-03-27 stsp if (err)
773 1430b4e0 2019-03-27 stsp goto done;
774 1430b4e0 2019-03-27 stsp } else {
775 1430b4e0 2019-03-27 stsp /*
776 1430b4e0 2019-03-27 stsp * If the file has no blob, this is an "add vs add" conflict,
777 1430b4e0 2019-03-27 stsp * and we simply use an empty ancestor file to make both files
778 1430b4e0 2019-03-27 stsp * appear in the merged result in their entirety.
779 1430b4e0 2019-03-27 stsp */
780 1430b4e0 2019-03-27 stsp }
781 6353ad76 2019-02-08 stsp
782 14c901f1 2019-08-08 stsp err = got_merge_diff3(&overlapcnt, merged_fd, deriv_path,
783 f69721c3 2019-10-21 stsp blob_orig_path, ondisk_path, label_deriv, label_orig, NULL);
784 6353ad76 2019-02-08 stsp if (err)
785 6353ad76 2019-02-08 stsp goto done;
786 6353ad76 2019-02-08 stsp
787 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
788 6353ad76 2019-02-08 stsp overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
789 1ee397ad 2019-07-12 stsp if (err)
790 1ee397ad 2019-07-12 stsp goto done;
791 6353ad76 2019-02-08 stsp
792 816dc654 2019-02-16 stsp if (fsync(merged_fd) != 0) {
793 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
794 816dc654 2019-02-16 stsp goto done;
795 68c76935 2019-02-19 stsp }
796 68c76935 2019-02-19 stsp
797 68c76935 2019-02-19 stsp /* Check if a clean merge has subsumed all local changes. */
798 68c76935 2019-02-19 stsp if (overlapcnt == 0) {
799 14c901f1 2019-08-08 stsp err = check_files_equal(local_changes_subsumed, deriv_path,
800 68c76935 2019-02-19 stsp merged_path);
801 68c76935 2019-02-19 stsp if (err)
802 68c76935 2019-02-19 stsp goto done;
803 816dc654 2019-02-16 stsp }
804 6353ad76 2019-02-08 stsp
805 2ad902c0 2019-12-15 stsp if (fchmod(merged_fd, st_mode) != 0) {
806 2ad902c0 2019-12-15 stsp err = got_error_from_errno2("fchmod", merged_path);
807 70a0c8ec 2019-02-20 stsp goto done;
808 70a0c8ec 2019-02-20 stsp }
809 70a0c8ec 2019-02-20 stsp
810 6353ad76 2019-02-08 stsp if (rename(merged_path, ondisk_path) != 0) {
811 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", merged_path,
812 230a42bd 2019-05-11 jcs ondisk_path);
813 6353ad76 2019-02-08 stsp goto done;
814 6353ad76 2019-02-08 stsp }
815 6353ad76 2019-02-08 stsp done:
816 fdcb7daf 2019-12-15 stsp if (err) {
817 fdcb7daf 2019-12-15 stsp if (merged_path)
818 fdcb7daf 2019-12-15 stsp unlink(merged_path);
819 fdcb7daf 2019-12-15 stsp }
820 3a6ce05a 2019-02-11 stsp if (merged_fd != -1 && close(merged_fd) != 0 && err == NULL)
821 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
822 46b6ee73 2019-06-04 stsp if (f_orig && fclose(f_orig) != 0 && err == NULL)
823 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
824 6353ad76 2019-02-08 stsp free(merged_path);
825 af54ae4a 2019-02-19 stsp free(base_path);
826 46b6ee73 2019-06-04 stsp if (blob_orig_path) {
827 46b6ee73 2019-06-04 stsp unlink(blob_orig_path);
828 46b6ee73 2019-06-04 stsp free(blob_orig_path);
829 6353ad76 2019-02-08 stsp }
830 14c901f1 2019-08-08 stsp return err;
831 14c901f1 2019-08-08 stsp }
832 14c901f1 2019-08-08 stsp
833 14c901f1 2019-08-08 stsp /*
834 14c901f1 2019-08-08 stsp * Perform a 3-way merge where blob_orig acts as the common ancestor,
835 14c901f1 2019-08-08 stsp * blob_deriv acts as the first derived version, and the file on disk
836 14c901f1 2019-08-08 stsp * acts as the second derived version.
837 14c901f1 2019-08-08 stsp */
838 14c901f1 2019-08-08 stsp static const struct got_error *
839 14c901f1 2019-08-08 stsp merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
840 14c901f1 2019-08-08 stsp struct got_blob_object *blob_orig, const char *ondisk_path,
841 f69721c3 2019-10-21 stsp const char *path, uint16_t st_mode, const char *label_orig,
842 f69721c3 2019-10-21 stsp struct got_blob_object *blob_deriv,
843 f69721c3 2019-10-21 stsp struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
844 f69721c3 2019-10-21 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
845 14c901f1 2019-08-08 stsp {
846 14c901f1 2019-08-08 stsp const struct got_error *err = NULL;
847 14c901f1 2019-08-08 stsp FILE *f_deriv = NULL;
848 14c901f1 2019-08-08 stsp char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
849 14c901f1 2019-08-08 stsp char *label_deriv = NULL, *parent;
850 14c901f1 2019-08-08 stsp
851 14c901f1 2019-08-08 stsp *local_changes_subsumed = 0;
852 14c901f1 2019-08-08 stsp
853 14c901f1 2019-08-08 stsp parent = dirname(ondisk_path);
854 14c901f1 2019-08-08 stsp if (parent == NULL)
855 14c901f1 2019-08-08 stsp return got_error_from_errno2("dirname", ondisk_path);
856 14c901f1 2019-08-08 stsp
857 14c901f1 2019-08-08 stsp free(base_path);
858 14c901f1 2019-08-08 stsp if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
859 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
860 14c901f1 2019-08-08 stsp base_path = NULL;
861 14c901f1 2019-08-08 stsp goto done;
862 14c901f1 2019-08-08 stsp }
863 14c901f1 2019-08-08 stsp
864 14c901f1 2019-08-08 stsp err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path);
865 14c901f1 2019-08-08 stsp if (err)
866 14c901f1 2019-08-08 stsp goto done;
867 14c901f1 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
868 14c901f1 2019-08-08 stsp blob_deriv);
869 14c901f1 2019-08-08 stsp if (err)
870 14c901f1 2019-08-08 stsp goto done;
871 14c901f1 2019-08-08 stsp
872 14c901f1 2019-08-08 stsp err = got_object_id_str(&id_str, deriv_base_commit_id);
873 14c901f1 2019-08-08 stsp if (err)
874 14c901f1 2019-08-08 stsp goto done;
875 f69721c3 2019-10-21 stsp if (asprintf(&label_deriv, "%s: commit %s",
876 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_MERGED, id_str) == -1) {
877 14c901f1 2019-08-08 stsp err = got_error_from_errno("asprintf");
878 14c901f1 2019-08-08 stsp goto done;
879 14c901f1 2019-08-08 stsp }
880 14c901f1 2019-08-08 stsp
881 14c901f1 2019-08-08 stsp err = merge_file(local_changes_subsumed, worktree, blob_orig,
882 f69721c3 2019-10-21 stsp ondisk_path, path, st_mode, blob_deriv_path, label_orig,
883 f69721c3 2019-10-21 stsp label_deriv, repo, progress_cb, progress_arg);
884 14c901f1 2019-08-08 stsp done:
885 14c901f1 2019-08-08 stsp if (f_deriv && fclose(f_deriv) != 0 && err == NULL)
886 14c901f1 2019-08-08 stsp err = got_error_from_errno("fclose");
887 14c901f1 2019-08-08 stsp free(base_path);
888 14c901f1 2019-08-08 stsp if (blob_deriv_path) {
889 14c901f1 2019-08-08 stsp unlink(blob_deriv_path);
890 14c901f1 2019-08-08 stsp free(blob_deriv_path);
891 14c901f1 2019-08-08 stsp }
892 6353ad76 2019-02-08 stsp free(id_str);
893 818c7501 2019-07-11 stsp free(label_deriv);
894 4a1ddfc2 2019-01-12 stsp return err;
895 4a1ddfc2 2019-01-12 stsp }
896 4a1ddfc2 2019-01-12 stsp
897 4a1ddfc2 2019-01-12 stsp static const struct got_error *
898 13d9040b 2019-03-27 stsp update_blob_fileindex_entry(struct got_worktree *worktree,
899 13d9040b 2019-03-27 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
900 13d9040b 2019-03-27 stsp const char *ondisk_path, const char *path, struct got_blob_object *blob,
901 13d9040b 2019-03-27 stsp int update_timestamps)
902 13d9040b 2019-03-27 stsp {
903 13d9040b 2019-03-27 stsp const struct got_error *err = NULL;
904 13d9040b 2019-03-27 stsp
905 13d9040b 2019-03-27 stsp if (ie == NULL)
906 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
907 13d9040b 2019-03-27 stsp if (ie)
908 13d9040b 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path,
909 13d9040b 2019-03-27 stsp blob->id.sha1, worktree->base_commit_id->sha1,
910 13d9040b 2019-03-27 stsp update_timestamps);
911 13d9040b 2019-03-27 stsp else {
912 13d9040b 2019-03-27 stsp struct got_fileindex_entry *new_ie;
913 13d9040b 2019-03-27 stsp err = got_fileindex_entry_alloc(&new_ie, ondisk_path,
914 13d9040b 2019-03-27 stsp path, blob->id.sha1, worktree->base_commit_id->sha1);
915 13d9040b 2019-03-27 stsp if (!err)
916 13d9040b 2019-03-27 stsp err = got_fileindex_entry_add(fileindex, new_ie);
917 13d9040b 2019-03-27 stsp }
918 13d9040b 2019-03-27 stsp return err;
919 1ebedb77 2019-10-19 stsp }
920 1ebedb77 2019-10-19 stsp
921 1ebedb77 2019-10-19 stsp static mode_t
922 1ebedb77 2019-10-19 stsp get_ondisk_perms(int executable, mode_t st_mode)
923 1ebedb77 2019-10-19 stsp {
924 1ebedb77 2019-10-19 stsp mode_t xbits = S_IXUSR;
925 1ebedb77 2019-10-19 stsp
926 1ebedb77 2019-10-19 stsp if (executable) {
927 1ebedb77 2019-10-19 stsp /* Map read bits to execute bits. */
928 1ebedb77 2019-10-19 stsp if (st_mode & S_IRGRP)
929 1ebedb77 2019-10-19 stsp xbits |= S_IXGRP;
930 1ebedb77 2019-10-19 stsp if (st_mode & S_IROTH)
931 1ebedb77 2019-10-19 stsp xbits |= S_IXOTH;
932 1ebedb77 2019-10-19 stsp return st_mode | xbits;
933 1ebedb77 2019-10-19 stsp }
934 1ebedb77 2019-10-19 stsp
935 1ebedb77 2019-10-19 stsp return (st_mode & ~(S_IXUSR | S_IXGRP | S_IXOTH));
936 13d9040b 2019-03-27 stsp }
937 13d9040b 2019-03-27 stsp
938 13d9040b 2019-03-27 stsp static const struct got_error *
939 13d9040b 2019-03-27 stsp install_blob(struct got_worktree *worktree, const char *ondisk_path,
940 bb51a5b4 2020-01-13 stsp const char *path, mode_t te_mode, mode_t st_mode,
941 4b55f459 2019-09-08 stsp struct got_blob_object *blob, int restoring_missing_file,
942 4b55f459 2019-09-08 stsp int reverting_versioned_file, struct got_repository *repo,
943 4b55f459 2019-09-08 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
944 9d31a1d8 2018-03-11 stsp {
945 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
946 507dc3bb 2018-12-29 stsp int fd = -1;
947 9d31a1d8 2018-03-11 stsp size_t len, hdrlen;
948 507dc3bb 2018-12-29 stsp int update = 0;
949 507dc3bb 2018-12-29 stsp char *tmppath = NULL;
950 9d31a1d8 2018-03-11 stsp
951 c34b20a2 2018-03-12 stsp fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
952 9d31a1d8 2018-03-11 stsp GOT_DEFAULT_FILE_MODE);
953 9d31a1d8 2018-03-11 stsp if (fd == -1) {
954 21908da4 2019-01-13 stsp if (errno == ENOENT) {
955 21908da4 2019-01-13 stsp char *parent = dirname(path);
956 21908da4 2019-01-13 stsp if (parent == NULL)
957 638f9024 2019-05-13 stsp return got_error_from_errno2("dirname", path);
958 21908da4 2019-01-13 stsp err = add_dir_on_disk(worktree, parent);
959 21908da4 2019-01-13 stsp if (err)
960 21908da4 2019-01-13 stsp return err;
961 21908da4 2019-01-13 stsp fd = open(ondisk_path,
962 21908da4 2019-01-13 stsp O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
963 21908da4 2019-01-13 stsp GOT_DEFAULT_FILE_MODE);
964 21908da4 2019-01-13 stsp if (fd == -1)
965 638f9024 2019-05-13 stsp return got_error_from_errno2("open",
966 230a42bd 2019-05-11 jcs ondisk_path);
967 21908da4 2019-01-13 stsp } else if (errno == EEXIST) {
968 b8f41171 2019-02-10 stsp if (!S_ISREG(st_mode)) {
969 9d31a1d8 2018-03-11 stsp /* TODO file is obstructed; do something */
970 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_FILE_OBSTRUCTED);
971 507dc3bb 2018-12-29 stsp goto done;
972 d70b8e30 2018-12-27 stsp } else {
973 507dc3bb 2018-12-29 stsp err = got_opentemp_named_fd(&tmppath, &fd,
974 507dc3bb 2018-12-29 stsp ondisk_path);
975 507dc3bb 2018-12-29 stsp if (err)
976 507dc3bb 2018-12-29 stsp goto done;
977 507dc3bb 2018-12-29 stsp update = 1;
978 9d31a1d8 2018-03-11 stsp }
979 507dc3bb 2018-12-29 stsp } else
980 638f9024 2019-05-13 stsp return got_error_from_errno2("open", ondisk_path);
981 9d31a1d8 2018-03-11 stsp }
982 9d31a1d8 2018-03-11 stsp
983 a378724f 2019-02-10 stsp if (restoring_missing_file)
984 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING, path);
985 a129376b 2019-03-28 stsp else if (reverting_versioned_file)
986 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT, path);
987 a378724f 2019-02-10 stsp else
988 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg,
989 a378724f 2019-02-10 stsp update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
990 1ee397ad 2019-07-12 stsp if (err)
991 1ee397ad 2019-07-12 stsp goto done;
992 d7b62c98 2018-12-27 stsp
993 9d31a1d8 2018-03-11 stsp hdrlen = got_object_blob_get_hdrlen(blob);
994 9d31a1d8 2018-03-11 stsp do {
995 9d31a1d8 2018-03-11 stsp const uint8_t *buf = got_object_blob_get_read_buf(blob);
996 9d31a1d8 2018-03-11 stsp err = got_object_blob_read_block(&len, blob);
997 9d31a1d8 2018-03-11 stsp if (err)
998 9d31a1d8 2018-03-11 stsp break;
999 9d31a1d8 2018-03-11 stsp if (len > 0) {
1000 9d31a1d8 2018-03-11 stsp /* Skip blob object header first time around. */
1001 9d31a1d8 2018-03-11 stsp ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1002 9d31a1d8 2018-03-11 stsp if (outlen == -1) {
1003 638f9024 2019-05-13 stsp err = got_error_from_errno("write");
1004 b87c6f83 2018-12-24 stsp goto done;
1005 61d6eaa3 2018-12-24 stsp } else if (outlen != len - hdrlen) {
1006 9d31a1d8 2018-03-11 stsp err = got_error(GOT_ERR_IO);
1007 b87c6f83 2018-12-24 stsp goto done;
1008 9d31a1d8 2018-03-11 stsp }
1009 61d6eaa3 2018-12-24 stsp hdrlen = 0;
1010 9d31a1d8 2018-03-11 stsp }
1011 9d31a1d8 2018-03-11 stsp } while (len != 0);
1012 9d31a1d8 2018-03-11 stsp
1013 816dc654 2019-02-16 stsp if (fsync(fd) != 0) {
1014 638f9024 2019-05-13 stsp err = got_error_from_errno("fsync");
1015 816dc654 2019-02-16 stsp goto done;
1016 816dc654 2019-02-16 stsp }
1017 9d31a1d8 2018-03-11 stsp
1018 507dc3bb 2018-12-29 stsp if (update) {
1019 507dc3bb 2018-12-29 stsp if (rename(tmppath, ondisk_path) != 0) {
1020 638f9024 2019-05-13 stsp err = got_error_from_errno3("rename", tmppath,
1021 230a42bd 2019-05-11 jcs ondisk_path);
1022 2a57020b 2019-02-20 stsp unlink(tmppath);
1023 68ed9ba5 2019-02-10 stsp goto done;
1024 68ed9ba5 2019-02-10 stsp }
1025 68ed9ba5 2019-02-10 stsp }
1026 ba8a0d4d 2019-02-10 stsp
1027 1ebedb77 2019-10-19 stsp if (chmod(ondisk_path,
1028 1ebedb77 2019-10-19 stsp get_ondisk_perms(te_mode & S_IXUSR, st_mode)) == -1) {
1029 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("chmod", ondisk_path);
1030 1ebedb77 2019-10-19 stsp goto done;
1031 507dc3bb 2018-12-29 stsp }
1032 507dc3bb 2018-12-29 stsp
1033 9d31a1d8 2018-03-11 stsp done:
1034 3a6ce05a 2019-02-11 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
1035 638f9024 2019-05-13 stsp err = got_error_from_errno("close");
1036 507dc3bb 2018-12-29 stsp free(tmppath);
1037 6353ad76 2019-02-08 stsp return err;
1038 6353ad76 2019-02-08 stsp }
1039 6353ad76 2019-02-08 stsp
1040 7154f6ce 2019-03-27 stsp /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1041 6353ad76 2019-02-08 stsp static const struct got_error *
1042 7154f6ce 2019-03-27 stsp get_modified_file_content_status(unsigned char *status, FILE *f)
1043 7154f6ce 2019-03-27 stsp {
1044 7154f6ce 2019-03-27 stsp const struct got_error *err = NULL;
1045 7154f6ce 2019-03-27 stsp const char *markers[3] = {
1046 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_BEGIN,
1047 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_SEP,
1048 7154f6ce 2019-03-27 stsp GOT_DIFF_CONFLICT_MARKER_END
1049 7154f6ce 2019-03-27 stsp };
1050 7154f6ce 2019-03-27 stsp int i = 0;
1051 7154f6ce 2019-03-27 stsp char *line;
1052 7154f6ce 2019-03-27 stsp size_t len;
1053 7154f6ce 2019-03-27 stsp const char delim[3] = {'\0', '\0', '\0'};
1054 7154f6ce 2019-03-27 stsp
1055 7154f6ce 2019-03-27 stsp while (*status == GOT_STATUS_MODIFY) {
1056 7154f6ce 2019-03-27 stsp line = fparseln(f, &len, NULL, delim, 0);
1057 7154f6ce 2019-03-27 stsp if (line == NULL) {
1058 7154f6ce 2019-03-27 stsp if (feof(f))
1059 7154f6ce 2019-03-27 stsp break;
1060 7154f6ce 2019-03-27 stsp err = got_ferror(f, GOT_ERR_IO);
1061 7154f6ce 2019-03-27 stsp break;
1062 7154f6ce 2019-03-27 stsp }
1063 7154f6ce 2019-03-27 stsp
1064 7154f6ce 2019-03-27 stsp if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1065 19332e6d 2019-05-13 stsp if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1066 19332e6d 2019-05-13 stsp == 0)
1067 7154f6ce 2019-03-27 stsp *status = GOT_STATUS_CONFLICT;
1068 7154f6ce 2019-03-27 stsp else
1069 7154f6ce 2019-03-27 stsp i++;
1070 7154f6ce 2019-03-27 stsp }
1071 7154f6ce 2019-03-27 stsp }
1072 7154f6ce 2019-03-27 stsp
1073 7154f6ce 2019-03-27 stsp return err;
1074 e2b1e152 2019-07-13 stsp }
1075 e2b1e152 2019-07-13 stsp
1076 e2b1e152 2019-07-13 stsp static int
1077 1ebedb77 2019-10-19 stsp xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1078 1ebedb77 2019-10-19 stsp {
1079 1ebedb77 2019-10-19 stsp mode_t ie_mode = got_fileindex_perms_to_st(ie);
1080 1ebedb77 2019-10-19 stsp return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1081 1ebedb77 2019-10-19 stsp }
1082 1ebedb77 2019-10-19 stsp
1083 1ebedb77 2019-10-19 stsp static int
1084 e2b1e152 2019-07-13 stsp stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1085 e2b1e152 2019-07-13 stsp {
1086 e2b1e152 2019-07-13 stsp return !(ie->ctime_sec == sb->st_ctime &&
1087 e2b1e152 2019-07-13 stsp ie->ctime_nsec == sb->st_ctimensec &&
1088 e2b1e152 2019-07-13 stsp ie->mtime_sec == sb->st_mtime &&
1089 e2b1e152 2019-07-13 stsp ie->mtime_nsec == sb->st_mtimensec &&
1090 1ebedb77 2019-10-19 stsp ie->size == (sb->st_size & 0xffffffff) &&
1091 1ebedb77 2019-10-19 stsp !xbit_differs(ie, sb->st_mode));
1092 c363b2c1 2019-08-03 stsp }
1093 c363b2c1 2019-08-03 stsp
1094 c363b2c1 2019-08-03 stsp static unsigned char
1095 c363b2c1 2019-08-03 stsp get_staged_status(struct got_fileindex_entry *ie)
1096 c363b2c1 2019-08-03 stsp {
1097 c363b2c1 2019-08-03 stsp switch (got_fileindex_entry_stage_get(ie)) {
1098 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_ADD:
1099 c363b2c1 2019-08-03 stsp return GOT_STATUS_ADD;
1100 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_DELETE:
1101 c363b2c1 2019-08-03 stsp return GOT_STATUS_DELETE;
1102 c363b2c1 2019-08-03 stsp case GOT_FILEIDX_STAGE_MODIFY:
1103 c363b2c1 2019-08-03 stsp return GOT_STATUS_MODIFY;
1104 c363b2c1 2019-08-03 stsp default:
1105 c363b2c1 2019-08-03 stsp return GOT_STATUS_NO_CHANGE;
1106 c363b2c1 2019-08-03 stsp }
1107 7154f6ce 2019-03-27 stsp }
1108 7154f6ce 2019-03-27 stsp
1109 7154f6ce 2019-03-27 stsp static const struct got_error *
1110 b8f41171 2019-02-10 stsp get_file_status(unsigned char *status, struct stat *sb,
1111 b8f41171 2019-02-10 stsp struct got_fileindex_entry *ie, const char *abspath,
1112 7f91a133 2019-12-13 stsp int dirfd, const char *de_name, struct got_repository *repo)
1113 6353ad76 2019-02-08 stsp {
1114 6353ad76 2019-02-08 stsp const struct got_error *err = NULL;
1115 6353ad76 2019-02-08 stsp struct got_object_id id;
1116 6353ad76 2019-02-08 stsp size_t hdrlen;
1117 1338848f 2019-12-13 stsp int fd = -1;
1118 6353ad76 2019-02-08 stsp FILE *f = NULL;
1119 6353ad76 2019-02-08 stsp uint8_t fbuf[8192];
1120 6353ad76 2019-02-08 stsp struct got_blob_object *blob = NULL;
1121 6353ad76 2019-02-08 stsp size_t flen, blen;
1122 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
1123 6353ad76 2019-02-08 stsp
1124 6353ad76 2019-02-08 stsp *status = GOT_STATUS_NO_CHANGE;
1125 6353ad76 2019-02-08 stsp
1126 7f91a133 2019-12-13 stsp /*
1127 7f91a133 2019-12-13 stsp * Whenever the caller provides a directory descriptor and a
1128 7f91a133 2019-12-13 stsp * directory entry name for the file, use them! This prevents
1129 7f91a133 2019-12-13 stsp * race conditions if filesystem paths change beneath our feet.
1130 7f91a133 2019-12-13 stsp */
1131 7f91a133 2019-12-13 stsp if (dirfd != -1) {
1132 3d35a492 2019-12-13 stsp if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1133 882ef1b9 2019-12-13 stsp if (errno == ENOENT) {
1134 882ef1b9 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1135 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1136 882ef1b9 2019-12-13 stsp else
1137 882ef1b9 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1138 882ef1b9 2019-12-13 stsp goto done;
1139 882ef1b9 2019-12-13 stsp }
1140 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstatat", abspath);
1141 3d35a492 2019-12-13 stsp goto done;
1142 3d35a492 2019-12-13 stsp }
1143 7f91a133 2019-12-13 stsp } else {
1144 7f91a133 2019-12-13 stsp fd = open(abspath, O_RDONLY | O_NOFOLLOW);
1145 7f91a133 2019-12-13 stsp if (fd == -1 && errno != ENOENT)
1146 7f91a133 2019-12-13 stsp return got_error_from_errno2("open", abspath);
1147 3d35a492 2019-12-13 stsp if (fd == -1 || fstat(fd, sb) == -1) {
1148 3d35a492 2019-12-13 stsp if (errno == ENOENT) {
1149 3d35a492 2019-12-13 stsp if (got_fileindex_entry_has_file_on_disk(ie))
1150 3d35a492 2019-12-13 stsp *status = GOT_STATUS_MISSING;
1151 3d35a492 2019-12-13 stsp else
1152 3d35a492 2019-12-13 stsp *status = GOT_STATUS_DELETE;
1153 3d35a492 2019-12-13 stsp goto done;
1154 3d35a492 2019-12-13 stsp }
1155 3d35a492 2019-12-13 stsp err = got_error_from_errno2("fstat", abspath);
1156 1338848f 2019-12-13 stsp goto done;
1157 a378724f 2019-02-10 stsp }
1158 a378724f 2019-02-10 stsp }
1159 6353ad76 2019-02-08 stsp
1160 339c298e 2019-07-27 stsp if (!S_ISREG(sb->st_mode)) {
1161 339c298e 2019-07-27 stsp *status = GOT_STATUS_OBSTRUCTED;
1162 1338848f 2019-12-13 stsp goto done;
1163 3f148bc6 2019-07-27 stsp }
1164 efdd40df 2019-07-27 stsp
1165 2ec1f75b 2019-03-26 stsp if (!got_fileindex_entry_has_file_on_disk(ie)) {
1166 339c298e 2019-07-27 stsp *status = GOT_STATUS_DELETE;
1167 1338848f 2019-12-13 stsp goto done;
1168 244725f2 2019-08-03 stsp } else if (!got_fileindex_entry_has_blob(ie) &&
1169 244725f2 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
1170 339c298e 2019-07-27 stsp *status = GOT_STATUS_ADD;
1171 1338848f 2019-12-13 stsp goto done;
1172 d00136be 2019-03-26 stsp }
1173 b8f41171 2019-02-10 stsp
1174 e2b1e152 2019-07-13 stsp if (!stat_info_differs(ie, sb))
1175 1338848f 2019-12-13 stsp goto done;
1176 6353ad76 2019-02-08 stsp
1177 c363b2c1 2019-08-03 stsp if (staged_status == GOT_STATUS_MODIFY ||
1178 c363b2c1 2019-08-03 stsp staged_status == GOT_STATUS_ADD)
1179 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1180 c363b2c1 2019-08-03 stsp else
1181 c363b2c1 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1182 c363b2c1 2019-08-03 stsp
1183 6353ad76 2019-02-08 stsp err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
1184 6353ad76 2019-02-08 stsp if (err)
1185 1338848f 2019-12-13 stsp goto done;
1186 6353ad76 2019-02-08 stsp
1187 3d35a492 2019-12-13 stsp if (dirfd != -1) {
1188 3d35a492 2019-12-13 stsp fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
1189 ab0d4361 2019-12-13 stsp if (fd == -1) {
1190 ab0d4361 2019-12-13 stsp err = got_error_from_errno2("openat", abspath);
1191 ab0d4361 2019-12-13 stsp goto done;
1192 ab0d4361 2019-12-13 stsp }
1193 3d35a492 2019-12-13 stsp }
1194 3d35a492 2019-12-13 stsp
1195 1338848f 2019-12-13 stsp f = fdopen(fd, "r");
1196 6353ad76 2019-02-08 stsp if (f == NULL) {
1197 60522982 2019-12-15 stsp err = got_error_from_errno2("fdopen", abspath);
1198 6353ad76 2019-02-08 stsp goto done;
1199 6353ad76 2019-02-08 stsp }
1200 1338848f 2019-12-13 stsp fd = -1;
1201 6353ad76 2019-02-08 stsp hdrlen = got_object_blob_get_hdrlen(blob);
1202 656b1f76 2019-05-11 jcs for (;;) {
1203 6353ad76 2019-02-08 stsp const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1204 6353ad76 2019-02-08 stsp err = got_object_blob_read_block(&blen, blob);
1205 6353ad76 2019-02-08 stsp if (err)
1206 7154f6ce 2019-03-27 stsp goto done;
1207 3cbbd752 2019-02-19 stsp /* Skip length of blob object header first time around. */
1208 3cbbd752 2019-02-19 stsp flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1209 80c5c120 2019-02-19 stsp if (flen == 0 && ferror(f)) {
1210 638f9024 2019-05-13 stsp err = got_error_from_errno("fread");
1211 7154f6ce 2019-03-27 stsp goto done;
1212 80c5c120 2019-02-19 stsp }
1213 6353ad76 2019-02-08 stsp if (blen == 0) {
1214 6353ad76 2019-02-08 stsp if (flen != 0)
1215 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1216 6353ad76 2019-02-08 stsp break;
1217 6353ad76 2019-02-08 stsp } else if (flen == 0) {
1218 6353ad76 2019-02-08 stsp if (blen != 0)
1219 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1220 6353ad76 2019-02-08 stsp break;
1221 6353ad76 2019-02-08 stsp } else if (blen - hdrlen == flen) {
1222 6353ad76 2019-02-08 stsp /* Skip blob object header first time around. */
1223 6353ad76 2019-02-08 stsp if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1224 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1225 6353ad76 2019-02-08 stsp break;
1226 6353ad76 2019-02-08 stsp }
1227 6353ad76 2019-02-08 stsp } else {
1228 276262e8 2019-02-08 stsp *status = GOT_STATUS_MODIFY;
1229 6353ad76 2019-02-08 stsp break;
1230 6353ad76 2019-02-08 stsp }
1231 6353ad76 2019-02-08 stsp hdrlen = 0;
1232 6353ad76 2019-02-08 stsp }
1233 7154f6ce 2019-03-27 stsp
1234 7154f6ce 2019-03-27 stsp if (*status == GOT_STATUS_MODIFY) {
1235 7154f6ce 2019-03-27 stsp rewind(f);
1236 7154f6ce 2019-03-27 stsp err = get_modified_file_content_status(status, f);
1237 1ebedb77 2019-10-19 stsp } else if (xbit_differs(ie, sb->st_mode))
1238 1ebedb77 2019-10-19 stsp *status = GOT_STATUS_MODE_CHANGE;
1239 6353ad76 2019-02-08 stsp done:
1240 6353ad76 2019-02-08 stsp if (blob)
1241 6353ad76 2019-02-08 stsp got_object_blob_close(blob);
1242 43ff8261 2019-12-13 stsp if (f != NULL && fclose(f) == EOF && err == NULL)
1243 f4d199c9 2019-12-13 stsp err = got_error_from_errno2("fclose", abspath);
1244 1338848f 2019-12-13 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
1245 1338848f 2019-12-13 stsp err = got_error_from_errno2("close", abspath);
1246 9d31a1d8 2018-03-11 stsp return err;
1247 e2b1e152 2019-07-13 stsp }
1248 e2b1e152 2019-07-13 stsp
1249 e2b1e152 2019-07-13 stsp /*
1250 e2b1e152 2019-07-13 stsp * Update timestamps in the file index if a file is unmodified and
1251 e2b1e152 2019-07-13 stsp * we had to run a full content comparison to find out.
1252 e2b1e152 2019-07-13 stsp */
1253 e2b1e152 2019-07-13 stsp static const struct got_error *
1254 e2b1e152 2019-07-13 stsp sync_timestamps(char *ondisk_path, unsigned char status,
1255 e2b1e152 2019-07-13 stsp struct got_fileindex_entry *ie, struct stat *sb)
1256 e2b1e152 2019-07-13 stsp {
1257 e2b1e152 2019-07-13 stsp if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1258 e2b1e152 2019-07-13 stsp return got_fileindex_entry_update(ie, ondisk_path,
1259 e2b1e152 2019-07-13 stsp ie->blob_sha1, ie->commit_sha1, 1);
1260 e2b1e152 2019-07-13 stsp
1261 e2b1e152 2019-07-13 stsp return NULL;
1262 9d31a1d8 2018-03-11 stsp }
1263 9d31a1d8 2018-03-11 stsp
1264 9d31a1d8 2018-03-11 stsp static const struct got_error *
1265 8da9e5f4 2019-01-12 stsp update_blob(struct got_worktree *worktree,
1266 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1267 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *path,
1268 8da9e5f4 2019-01-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1269 0584f854 2019-04-06 stsp void *progress_arg)
1270 9d31a1d8 2018-03-11 stsp {
1271 9d31a1d8 2018-03-11 stsp const struct got_error *err = NULL;
1272 9d31a1d8 2018-03-11 stsp struct got_blob_object *blob = NULL;
1273 6353ad76 2019-02-08 stsp char *ondisk_path;
1274 6353ad76 2019-02-08 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
1275 b8f41171 2019-02-10 stsp struct stat sb;
1276 9d31a1d8 2018-03-11 stsp
1277 6353ad76 2019-02-08 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1278 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1279 6353ad76 2019-02-08 stsp
1280 abb4604f 2019-07-27 stsp if (ie) {
1281 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1282 a76c42e6 2019-08-03 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1283 a76c42e6 2019-08-03 stsp goto done;
1284 a76c42e6 2019-08-03 stsp }
1285 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1286 7f91a133 2019-12-13 stsp repo);
1287 abb4604f 2019-07-27 stsp if (err)
1288 abb4604f 2019-07-27 stsp goto done;
1289 abb4604f 2019-07-27 stsp if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1290 abb4604f 2019-07-27 stsp sb.st_mode = got_fileindex_perms_to_st(ie);
1291 abb4604f 2019-07-27 stsp } else
1292 abb4604f 2019-07-27 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
1293 6353ad76 2019-02-08 stsp
1294 b8f41171 2019-02-10 stsp if (status == GOT_STATUS_OBSTRUCTED) {
1295 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, status, path);
1296 b8f41171 2019-02-10 stsp goto done;
1297 b8f41171 2019-02-10 stsp }
1298 b8f41171 2019-02-10 stsp
1299 523b8417 2019-10-19 stsp if (ie && status != GOT_STATUS_MISSING &&
1300 523b8417 2019-10-19 stsp (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR)) {
1301 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_commit(ie) &&
1302 1430b4e0 2019-03-27 stsp memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1303 b8f41171 2019-02-10 stsp SHA1_DIGEST_LENGTH) == 0) {
1304 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1305 e2b1e152 2019-07-13 stsp if (err)
1306 e2b1e152 2019-07-13 stsp goto done;
1307 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1308 b8f41171 2019-02-10 stsp path);
1309 6353ad76 2019-02-08 stsp goto done;
1310 a378724f 2019-02-10 stsp }
1311 1430b4e0 2019-03-27 stsp if (got_fileindex_entry_has_blob(ie) &&
1312 56e0773d 2019-11-28 stsp memcmp(ie->blob_sha1, te->id.sha1,
1313 e2b1e152 2019-07-13 stsp SHA1_DIGEST_LENGTH) == 0) {
1314 e2b1e152 2019-07-13 stsp err = sync_timestamps(ondisk_path, status, ie, &sb);
1315 b8f41171 2019-02-10 stsp goto done;
1316 e2b1e152 2019-07-13 stsp }
1317 9d31a1d8 2018-03-11 stsp }
1318 9d31a1d8 2018-03-11 stsp
1319 56e0773d 2019-11-28 stsp err = got_object_open_as_blob(&blob, repo, &te->id, 8192);
1320 8da9e5f4 2019-01-12 stsp if (err)
1321 6353ad76 2019-02-08 stsp goto done;
1322 512f0d0e 2019-01-02 stsp
1323 234035bc 2019-06-01 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1324 234035bc 2019-06-01 stsp int update_timestamps;
1325 234035bc 2019-06-01 stsp struct got_blob_object *blob2 = NULL;
1326 f69721c3 2019-10-21 stsp char *label_orig = NULL;
1327 234035bc 2019-06-01 stsp if (got_fileindex_entry_has_blob(ie)) {
1328 234035bc 2019-06-01 stsp struct got_object_id id2;
1329 234035bc 2019-06-01 stsp memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1330 234035bc 2019-06-01 stsp err = got_object_open_as_blob(&blob2, repo, &id2, 8192);
1331 234035bc 2019-06-01 stsp if (err)
1332 f69721c3 2019-10-21 stsp goto done;
1333 f69721c3 2019-10-21 stsp }
1334 f69721c3 2019-10-21 stsp if (got_fileindex_entry_has_commit(ie)) {
1335 f69721c3 2019-10-21 stsp char id_str[SHA1_DIGEST_STRING_LENGTH];
1336 f69721c3 2019-10-21 stsp if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
1337 f69721c3 2019-10-21 stsp sizeof(id_str)) == NULL) {
1338 6dd1ece6 2019-11-10 stsp err = got_error_path(id_str,
1339 6dd1ece6 2019-11-10 stsp GOT_ERR_BAD_OBJ_ID_STR);
1340 f69721c3 2019-10-21 stsp goto done;
1341 f69721c3 2019-10-21 stsp }
1342 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
1343 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
1344 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
1345 234035bc 2019-06-01 stsp goto done;
1346 f69721c3 2019-10-21 stsp }
1347 234035bc 2019-06-01 stsp }
1348 234035bc 2019-06-01 stsp err = merge_blob(&update_timestamps, worktree, blob2,
1349 f69721c3 2019-10-21 stsp ondisk_path, path, sb.st_mode, label_orig, blob,
1350 818c7501 2019-07-11 stsp worktree->base_commit_id, repo,
1351 234035bc 2019-06-01 stsp progress_cb, progress_arg);
1352 f69721c3 2019-10-21 stsp free(label_orig);
1353 234035bc 2019-06-01 stsp if (blob2)
1354 234035bc 2019-06-01 stsp got_object_blob_close(blob2);
1355 909d120e 2019-09-22 stsp if (err)
1356 909d120e 2019-09-22 stsp goto done;
1357 234035bc 2019-06-01 stsp /*
1358 234035bc 2019-06-01 stsp * Do not update timestamps of files with local changes.
1359 234035bc 2019-06-01 stsp * Otherwise, a future status walk would treat them as
1360 234035bc 2019-06-01 stsp * unmodified files again.
1361 234035bc 2019-06-01 stsp */
1362 234035bc 2019-06-01 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1363 234035bc 2019-06-01 stsp blob->id.sha1, worktree->base_commit_id->sha1,
1364 234035bc 2019-06-01 stsp update_timestamps);
1365 1ebedb77 2019-10-19 stsp } else if (status == GOT_STATUS_MODE_CHANGE) {
1366 1ebedb77 2019-10-19 stsp err = got_fileindex_entry_update(ie, ondisk_path,
1367 1ebedb77 2019-10-19 stsp blob->id.sha1, worktree->base_commit_id->sha1, 0);
1368 234035bc 2019-06-01 stsp } else if (status == GOT_STATUS_DELETE) {
1369 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1370 1ee397ad 2019-07-12 stsp if (err)
1371 1ee397ad 2019-07-12 stsp goto done;
1372 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1373 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 0);
1374 13d9040b 2019-03-27 stsp if (err)
1375 13d9040b 2019-03-27 stsp goto done;
1376 13d9040b 2019-03-27 stsp } else {
1377 13d9040b 2019-03-27 stsp err = install_blob(worktree, ondisk_path, path, te->mode,
1378 a129376b 2019-03-28 stsp sb.st_mode, blob, status == GOT_STATUS_MISSING, 0,
1379 a129376b 2019-03-28 stsp repo, progress_cb, progress_arg);
1380 13d9040b 2019-03-27 stsp if (err)
1381 13d9040b 2019-03-27 stsp goto done;
1382 13d9040b 2019-03-27 stsp err = update_blob_fileindex_entry(worktree, fileindex, ie,
1383 13d9040b 2019-03-27 stsp ondisk_path, path, blob, 1);
1384 13d9040b 2019-03-27 stsp if (err)
1385 13d9040b 2019-03-27 stsp goto done;
1386 13d9040b 2019-03-27 stsp }
1387 8da9e5f4 2019-01-12 stsp got_object_blob_close(blob);
1388 6353ad76 2019-02-08 stsp done:
1389 6353ad76 2019-02-08 stsp free(ondisk_path);
1390 8da9e5f4 2019-01-12 stsp return err;
1391 90285c3b 2019-01-08 stsp }
1392 90285c3b 2019-01-08 stsp
1393 90285c3b 2019-01-08 stsp static const struct got_error *
1394 7a9df742 2019-01-08 stsp remove_ondisk_file(const char *root_path, const char *path)
1395 90285c3b 2019-01-08 stsp {
1396 90285c3b 2019-01-08 stsp const struct got_error *err = NULL;
1397 90285c3b 2019-01-08 stsp char *ondisk_path = NULL;
1398 90285c3b 2019-01-08 stsp
1399 7a9df742 2019-01-08 stsp if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
1400 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1401 90285c3b 2019-01-08 stsp
1402 c97665ae 2019-01-13 stsp if (unlink(ondisk_path) == -1) {
1403 c97665ae 2019-01-13 stsp if (errno != ENOENT)
1404 638f9024 2019-05-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
1405 c97665ae 2019-01-13 stsp } else {
1406 90285c3b 2019-01-08 stsp char *parent = dirname(ondisk_path);
1407 7a9df742 2019-01-08 stsp while (parent && strcmp(parent, root_path) != 0) {
1408 26c4ac4d 2019-01-08 stsp if (rmdir(parent) == -1) {
1409 26c4ac4d 2019-01-08 stsp if (errno != ENOTEMPTY)
1410 638f9024 2019-05-13 stsp err = got_error_from_errno2("rmdir",
1411 230a42bd 2019-05-11 jcs parent);
1412 90285c3b 2019-01-08 stsp break;
1413 90285c3b 2019-01-08 stsp }
1414 90285c3b 2019-01-08 stsp parent = dirname(parent);
1415 90285c3b 2019-01-08 stsp }
1416 90285c3b 2019-01-08 stsp }
1417 90285c3b 2019-01-08 stsp free(ondisk_path);
1418 90285c3b 2019-01-08 stsp return err;
1419 512f0d0e 2019-01-02 stsp }
1420 512f0d0e 2019-01-02 stsp
1421 708d8e67 2019-03-27 stsp static const struct got_error *
1422 708d8e67 2019-03-27 stsp delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
1423 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie, struct got_repository *repo,
1424 0584f854 2019-04-06 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
1425 708d8e67 2019-03-27 stsp {
1426 fc6346c4 2019-03-27 stsp const struct got_error *err = NULL;
1427 708d8e67 2019-03-27 stsp unsigned char status;
1428 708d8e67 2019-03-27 stsp struct stat sb;
1429 708d8e67 2019-03-27 stsp char *ondisk_path;
1430 708d8e67 2019-03-27 stsp
1431 a76c42e6 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
1432 a76c42e6 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1433 a76c42e6 2019-08-03 stsp
1434 708d8e67 2019-03-27 stsp if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
1435 708d8e67 2019-03-27 stsp == -1)
1436 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1437 708d8e67 2019-03-27 stsp
1438 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
1439 708d8e67 2019-03-27 stsp if (err)
1440 708d8e67 2019-03-27 stsp return err;
1441 708d8e67 2019-03-27 stsp
1442 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
1443 fc6346c4 2019-03-27 stsp status == GOT_STATUS_ADD) {
1444 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
1445 1ee397ad 2019-07-12 stsp if (err)
1446 1ee397ad 2019-07-12 stsp return err;
1447 fc6346c4 2019-03-27 stsp /*
1448 fc6346c4 2019-03-27 stsp * Preserve the working file and change the deleted blob's
1449 fc6346c4 2019-03-27 stsp * entry into a schedule-add entry.
1450 fc6346c4 2019-03-27 stsp */
1451 fc6346c4 2019-03-27 stsp err = got_fileindex_entry_update(ie, ondisk_path, NULL, NULL,
1452 fc6346c4 2019-03-27 stsp 0);
1453 708d8e67 2019-03-27 stsp if (err)
1454 708d8e67 2019-03-27 stsp return err;
1455 fc6346c4 2019-03-27 stsp } else {
1456 1ee397ad 2019-07-12 stsp err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
1457 1ee397ad 2019-07-12 stsp if (err)
1458 1ee397ad 2019-07-12 stsp return err;
1459 fc6346c4 2019-03-27 stsp if (status == GOT_STATUS_NO_CHANGE) {
1460 fc6346c4 2019-03-27 stsp err = remove_ondisk_file(worktree->root_path, ie->path);
1461 fc6346c4 2019-03-27 stsp if (err)
1462 fc6346c4 2019-03-27 stsp return err;
1463 fc6346c4 2019-03-27 stsp }
1464 fc6346c4 2019-03-27 stsp got_fileindex_entry_remove(fileindex, ie);
1465 708d8e67 2019-03-27 stsp }
1466 708d8e67 2019-03-27 stsp
1467 fc6346c4 2019-03-27 stsp return err;
1468 708d8e67 2019-03-27 stsp }
1469 708d8e67 2019-03-27 stsp
1470 8da9e5f4 2019-01-12 stsp struct diff_cb_arg {
1471 8da9e5f4 2019-01-12 stsp struct got_fileindex *fileindex;
1472 8da9e5f4 2019-01-12 stsp struct got_worktree *worktree;
1473 8da9e5f4 2019-01-12 stsp struct got_repository *repo;
1474 8da9e5f4 2019-01-12 stsp got_worktree_checkout_cb progress_cb;
1475 8da9e5f4 2019-01-12 stsp void *progress_arg;
1476 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
1477 8da9e5f4 2019-01-12 stsp void *cancel_arg;
1478 8da9e5f4 2019-01-12 stsp };
1479 8da9e5f4 2019-01-12 stsp
1480 512f0d0e 2019-01-02 stsp static const struct got_error *
1481 8da9e5f4 2019-01-12 stsp diff_old_new(void *arg, struct got_fileindex_entry *ie,
1482 8da9e5f4 2019-01-12 stsp struct got_tree_entry *te, const char *parent_path)
1483 512f0d0e 2019-01-02 stsp {
1484 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1485 0584f854 2019-04-06 stsp
1486 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1487 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1488 512f0d0e 2019-01-02 stsp
1489 8da9e5f4 2019-01-12 stsp return update_blob(a->worktree, a->fileindex, ie, te,
1490 0584f854 2019-04-06 stsp ie->path, a->repo, a->progress_cb, a->progress_arg);
1491 8da9e5f4 2019-01-12 stsp }
1492 512f0d0e 2019-01-02 stsp
1493 8da9e5f4 2019-01-12 stsp static const struct got_error *
1494 8da9e5f4 2019-01-12 stsp diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
1495 8da9e5f4 2019-01-12 stsp {
1496 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1497 7a9df742 2019-01-08 stsp
1498 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1499 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1500 0584f854 2019-04-06 stsp
1501 234035bc 2019-06-01 stsp return delete_blob(a->worktree, a->fileindex, ie,
1502 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1503 9d31a1d8 2018-03-11 stsp }
1504 9d31a1d8 2018-03-11 stsp
1505 9d31a1d8 2018-03-11 stsp static const struct got_error *
1506 8da9e5f4 2019-01-12 stsp diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
1507 9d31a1d8 2018-03-11 stsp {
1508 8da9e5f4 2019-01-12 stsp struct diff_cb_arg *a = arg;
1509 8da9e5f4 2019-01-12 stsp const struct got_error *err;
1510 8da9e5f4 2019-01-12 stsp char *path;
1511 9d31a1d8 2018-03-11 stsp
1512 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
1513 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
1514 0584f854 2019-04-06 stsp
1515 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te))
1516 63c5ca5d 2019-08-24 stsp return NULL;
1517 63c5ca5d 2019-08-24 stsp
1518 8da9e5f4 2019-01-12 stsp if (asprintf(&path, "%s%s%s", parent_path,
1519 8da9e5f4 2019-01-12 stsp parent_path[0] ? "/" : "", te->name)
1520 8da9e5f4 2019-01-12 stsp == -1)
1521 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
1522 9d31a1d8 2018-03-11 stsp
1523 8da9e5f4 2019-01-12 stsp if (S_ISDIR(te->mode))
1524 8da9e5f4 2019-01-12 stsp err = add_dir_on_disk(a->worktree, path);
1525 8da9e5f4 2019-01-12 stsp else
1526 8da9e5f4 2019-01-12 stsp err = update_blob(a->worktree, a->fileindex, NULL, te, path,
1527 0584f854 2019-04-06 stsp a->repo, a->progress_cb, a->progress_arg);
1528 9d31a1d8 2018-03-11 stsp
1529 8da9e5f4 2019-01-12 stsp free(path);
1530 0cd1c46a 2019-03-11 stsp return err;
1531 0cd1c46a 2019-03-11 stsp }
1532 0cd1c46a 2019-03-11 stsp
1533 818c7501 2019-07-11 stsp static const struct got_error *
1534 818c7501 2019-07-11 stsp get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
1535 0cd1c46a 2019-03-11 stsp {
1536 0cd1c46a 2019-03-11 stsp const struct got_error *err = NULL;
1537 0647c563 2019-03-11 stsp char *uuidstr = NULL;
1538 0cd1c46a 2019-03-11 stsp uint32_t uuid_status;
1539 0cd1c46a 2019-03-11 stsp
1540 517bab73 2019-03-11 stsp *refname = NULL;
1541 517bab73 2019-03-11 stsp
1542 0cd1c46a 2019-03-11 stsp uuid_to_string(&worktree->uuid, &uuidstr, &uuid_status);
1543 0cd1c46a 2019-03-11 stsp if (uuid_status != uuid_s_ok)
1544 cc483380 2019-09-01 stsp return got_error_uuid(uuid_status, "uuid_to_string");
1545 0cd1c46a 2019-03-11 stsp
1546 818c7501 2019-07-11 stsp if (asprintf(refname, "%s-%s", prefix, uuidstr)
1547 0647c563 2019-03-11 stsp == -1) {
1548 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1549 0647c563 2019-03-11 stsp *refname = NULL;
1550 0cd1c46a 2019-03-11 stsp }
1551 517bab73 2019-03-11 stsp free(uuidstr);
1552 517bab73 2019-03-11 stsp return err;
1553 517bab73 2019-03-11 stsp }
1554 517bab73 2019-03-11 stsp
1555 818c7501 2019-07-11 stsp const struct got_error *
1556 818c7501 2019-07-11 stsp got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
1557 818c7501 2019-07-11 stsp {
1558 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
1559 818c7501 2019-07-11 stsp }
1560 818c7501 2019-07-11 stsp
1561 818c7501 2019-07-11 stsp static const struct got_error *
1562 818c7501 2019-07-11 stsp get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
1563 818c7501 2019-07-11 stsp {
1564 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1565 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
1566 818c7501 2019-07-11 stsp }
1567 818c7501 2019-07-11 stsp
1568 818c7501 2019-07-11 stsp static const struct got_error *
1569 818c7501 2019-07-11 stsp get_newbase_symref_name(char **refname, struct got_worktree *worktree)
1570 818c7501 2019-07-11 stsp {
1571 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
1572 818c7501 2019-07-11 stsp }
1573 818c7501 2019-07-11 stsp
1574 818c7501 2019-07-11 stsp static const struct got_error *
1575 818c7501 2019-07-11 stsp get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
1576 818c7501 2019-07-11 stsp {
1577 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1578 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
1579 818c7501 2019-07-11 stsp }
1580 818c7501 2019-07-11 stsp
1581 818c7501 2019-07-11 stsp static const struct got_error *
1582 818c7501 2019-07-11 stsp get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
1583 818c7501 2019-07-11 stsp {
1584 818c7501 2019-07-11 stsp return get_ref_name(refname, worktree,
1585 818c7501 2019-07-11 stsp GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
1586 0ebf8283 2019-07-24 stsp }
1587 0ebf8283 2019-07-24 stsp
1588 0ebf8283 2019-07-24 stsp static const struct got_error *
1589 0ebf8283 2019-07-24 stsp get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
1590 0ebf8283 2019-07-24 stsp {
1591 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1592 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
1593 0ebf8283 2019-07-24 stsp }
1594 0ebf8283 2019-07-24 stsp
1595 0ebf8283 2019-07-24 stsp static const struct got_error *
1596 0ebf8283 2019-07-24 stsp get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
1597 0ebf8283 2019-07-24 stsp {
1598 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1599 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
1600 0ebf8283 2019-07-24 stsp }
1601 0ebf8283 2019-07-24 stsp
1602 0ebf8283 2019-07-24 stsp static const struct got_error *
1603 0ebf8283 2019-07-24 stsp get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
1604 0ebf8283 2019-07-24 stsp {
1605 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1606 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
1607 818c7501 2019-07-11 stsp }
1608 818c7501 2019-07-11 stsp
1609 0ebf8283 2019-07-24 stsp static const struct got_error *
1610 0ebf8283 2019-07-24 stsp get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
1611 0ebf8283 2019-07-24 stsp {
1612 0ebf8283 2019-07-24 stsp return get_ref_name(refname, worktree,
1613 0ebf8283 2019-07-24 stsp GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
1614 0ebf8283 2019-07-24 stsp }
1615 818c7501 2019-07-11 stsp
1616 0ebf8283 2019-07-24 stsp const struct got_error *
1617 c3022ba5 2019-07-27 stsp got_worktree_get_histedit_script_path(char **path,
1618 c3022ba5 2019-07-27 stsp struct got_worktree *worktree)
1619 0ebf8283 2019-07-24 stsp {
1620 0ebf8283 2019-07-24 stsp if (asprintf(path, "%s/%s/%s", worktree->root_path,
1621 c3022ba5 2019-07-27 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
1622 0ebf8283 2019-07-24 stsp *path = NULL;
1623 0ebf8283 2019-07-24 stsp return got_error_from_errno("asprintf");
1624 0ebf8283 2019-07-24 stsp }
1625 0ebf8283 2019-07-24 stsp return NULL;
1626 0ebf8283 2019-07-24 stsp }
1627 0ebf8283 2019-07-24 stsp
1628 517bab73 2019-03-11 stsp /*
1629 517bab73 2019-03-11 stsp * Prevent Git's garbage collector from deleting our base commit by
1630 517bab73 2019-03-11 stsp * setting a reference to our base commit's ID.
1631 517bab73 2019-03-11 stsp */
1632 517bab73 2019-03-11 stsp static const struct got_error *
1633 517bab73 2019-03-11 stsp ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
1634 517bab73 2019-03-11 stsp {
1635 517bab73 2019-03-11 stsp const struct got_error *err = NULL;
1636 517bab73 2019-03-11 stsp struct got_reference *ref = NULL;
1637 517bab73 2019-03-11 stsp char *refname;
1638 517bab73 2019-03-11 stsp
1639 517bab73 2019-03-11 stsp err = got_worktree_get_base_ref_name(&refname, worktree);
1640 517bab73 2019-03-11 stsp if (err)
1641 517bab73 2019-03-11 stsp return err;
1642 0cd1c46a 2019-03-11 stsp
1643 0cd1c46a 2019-03-11 stsp err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
1644 0cd1c46a 2019-03-11 stsp if (err)
1645 0cd1c46a 2019-03-11 stsp goto done;
1646 0cd1c46a 2019-03-11 stsp
1647 0cd1c46a 2019-03-11 stsp err = got_ref_write(ref, repo);
1648 0cd1c46a 2019-03-11 stsp done:
1649 0cd1c46a 2019-03-11 stsp free(refname);
1650 0cd1c46a 2019-03-11 stsp if (ref)
1651 0cd1c46a 2019-03-11 stsp got_ref_close(ref);
1652 3e3a69f1 2019-07-25 stsp return err;
1653 3e3a69f1 2019-07-25 stsp }
1654 3e3a69f1 2019-07-25 stsp
1655 3e3a69f1 2019-07-25 stsp static const struct got_error *
1656 3e3a69f1 2019-07-25 stsp get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
1657 3e3a69f1 2019-07-25 stsp {
1658 3e3a69f1 2019-07-25 stsp const struct got_error *err = NULL;
1659 3e3a69f1 2019-07-25 stsp
1660 3e3a69f1 2019-07-25 stsp if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
1661 3e3a69f1 2019-07-25 stsp GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
1662 3e3a69f1 2019-07-25 stsp err = got_error_from_errno("asprintf");
1663 3e3a69f1 2019-07-25 stsp *fileindex_path = NULL;
1664 3e3a69f1 2019-07-25 stsp }
1665 9d31a1d8 2018-03-11 stsp return err;
1666 9d31a1d8 2018-03-11 stsp }
1667 9d31a1d8 2018-03-11 stsp
1668 3e3a69f1 2019-07-25 stsp
1669 ebf99748 2019-05-09 stsp static const struct got_error *
1670 ebf99748 2019-05-09 stsp open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
1671 4b55f459 2019-09-08 stsp struct got_worktree *worktree)
1672 ebf99748 2019-05-09 stsp {
1673 ebf99748 2019-05-09 stsp const struct got_error *err = NULL;
1674 ebf99748 2019-05-09 stsp FILE *index = NULL;
1675 0cd1c46a 2019-03-11 stsp
1676 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1677 ebf99748 2019-05-09 stsp *fileindex = got_fileindex_alloc();
1678 ebf99748 2019-05-09 stsp if (*fileindex == NULL)
1679 638f9024 2019-05-13 stsp return got_error_from_errno("got_fileindex_alloc");
1680 ebf99748 2019-05-09 stsp
1681 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(fileindex_path, worktree);
1682 3e3a69f1 2019-07-25 stsp if (err)
1683 ebf99748 2019-05-09 stsp goto done;
1684 ebf99748 2019-05-09 stsp
1685 ebf99748 2019-05-09 stsp index = fopen(*fileindex_path, "rb");
1686 ebf99748 2019-05-09 stsp if (index == NULL) {
1687 ebf99748 2019-05-09 stsp if (errno != ENOENT)
1688 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", *fileindex_path);
1689 ebf99748 2019-05-09 stsp } else {
1690 ebf99748 2019-05-09 stsp err = got_fileindex_read(*fileindex, index);
1691 ebf99748 2019-05-09 stsp if (fclose(index) != 0 && err == NULL)
1692 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
1693 ebf99748 2019-05-09 stsp }
1694 ebf99748 2019-05-09 stsp done:
1695 ebf99748 2019-05-09 stsp if (err) {
1696 ebf99748 2019-05-09 stsp free(*fileindex_path);
1697 ebf99748 2019-05-09 stsp *fileindex_path = NULL;
1698 950a4a90 2019-07-10 stsp got_fileindex_free(*fileindex);
1699 ebf99748 2019-05-09 stsp *fileindex = NULL;
1700 ebf99748 2019-05-09 stsp }
1701 ebf99748 2019-05-09 stsp return err;
1702 ebf99748 2019-05-09 stsp }
1703 c932eeeb 2019-05-22 stsp
1704 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg {
1705 c932eeeb 2019-05-22 stsp struct got_object_id *base_commit_id;
1706 c932eeeb 2019-05-22 stsp const char *path;
1707 c932eeeb 2019-05-22 stsp size_t path_len;
1708 c932eeeb 2019-05-22 stsp const char *entry_name;
1709 a484d721 2019-06-10 stsp got_worktree_checkout_cb progress_cb;
1710 a484d721 2019-06-10 stsp void *progress_arg;
1711 c932eeeb 2019-05-22 stsp };
1712 ebf99748 2019-05-09 stsp
1713 c932eeeb 2019-05-22 stsp /* Bump base commit ID of all files within an updated part of the work tree. */
1714 c932eeeb 2019-05-22 stsp static const struct got_error *
1715 c932eeeb 2019-05-22 stsp bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
1716 c932eeeb 2019-05-22 stsp {
1717 1ee397ad 2019-07-12 stsp const struct got_error *err;
1718 c932eeeb 2019-05-22 stsp struct bump_base_commit_id_arg *a = arg;
1719 c932eeeb 2019-05-22 stsp
1720 c932eeeb 2019-05-22 stsp if (a->entry_name) {
1721 c932eeeb 2019-05-22 stsp if (strcmp(ie->path, a->path) != 0)
1722 c932eeeb 2019-05-22 stsp return NULL;
1723 c932eeeb 2019-05-22 stsp } else if (!got_path_is_child(ie->path, a->path, a->path_len))
1724 102ff934 2019-06-11 stsp return NULL;
1725 102ff934 2019-06-11 stsp
1726 102ff934 2019-06-11 stsp if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
1727 102ff934 2019-06-11 stsp SHA1_DIGEST_LENGTH) == 0)
1728 c932eeeb 2019-05-22 stsp return NULL;
1729 c932eeeb 2019-05-22 stsp
1730 1ee397ad 2019-07-12 stsp if (a->progress_cb) {
1731 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
1732 edd02c5e 2019-07-11 stsp ie->path);
1733 1ee397ad 2019-07-12 stsp if (err)
1734 1ee397ad 2019-07-12 stsp return err;
1735 1ee397ad 2019-07-12 stsp }
1736 c932eeeb 2019-05-22 stsp memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
1737 c932eeeb 2019-05-22 stsp return NULL;
1738 9c6338c4 2019-06-02 stsp }
1739 9c6338c4 2019-06-02 stsp
1740 9c6338c4 2019-06-02 stsp static const struct got_error *
1741 9c6338c4 2019-06-02 stsp sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
1742 9c6338c4 2019-06-02 stsp {
1743 9c6338c4 2019-06-02 stsp const struct got_error *err = NULL;
1744 9c6338c4 2019-06-02 stsp char *new_fileindex_path = NULL;
1745 9c6338c4 2019-06-02 stsp FILE *new_index = NULL;
1746 867630bb 2020-01-17 stsp struct timespec timeout;
1747 9c6338c4 2019-06-02 stsp
1748 9c6338c4 2019-06-02 stsp err = got_opentemp_named(&new_fileindex_path, &new_index,
1749 9c6338c4 2019-06-02 stsp fileindex_path);
1750 9c6338c4 2019-06-02 stsp if (err)
1751 9c6338c4 2019-06-02 stsp goto done;
1752 9c6338c4 2019-06-02 stsp
1753 9c6338c4 2019-06-02 stsp err = got_fileindex_write(fileindex, new_index);
1754 9c6338c4 2019-06-02 stsp if (err)
1755 9c6338c4 2019-06-02 stsp goto done;
1756 9c6338c4 2019-06-02 stsp
1757 9c6338c4 2019-06-02 stsp if (rename(new_fileindex_path, fileindex_path) != 0) {
1758 9c6338c4 2019-06-02 stsp err = got_error_from_errno3("rename", new_fileindex_path,
1759 9c6338c4 2019-06-02 stsp fileindex_path);
1760 9c6338c4 2019-06-02 stsp unlink(new_fileindex_path);
1761 9c6338c4 2019-06-02 stsp }
1762 867630bb 2020-01-17 stsp
1763 867630bb 2020-01-17 stsp /*
1764 867630bb 2020-01-17 stsp * Sleep for a short amount of time to ensure that files modified after
1765 867630bb 2020-01-17 stsp * this program exits have a different time stamp from the one which
1766 867630bb 2020-01-17 stsp * was recorded in the file index.
1767 867630bb 2020-01-17 stsp */
1768 867630bb 2020-01-17 stsp timeout.tv_sec = 0;
1769 867630bb 2020-01-17 stsp timeout.tv_nsec = 1;
1770 867630bb 2020-01-17 stsp nanosleep(&timeout, NULL);
1771 9c6338c4 2019-06-02 stsp done:
1772 9c6338c4 2019-06-02 stsp if (new_index)
1773 9c6338c4 2019-06-02 stsp fclose(new_index);
1774 9c6338c4 2019-06-02 stsp free(new_fileindex_path);
1775 9c6338c4 2019-06-02 stsp return err;
1776 c932eeeb 2019-05-22 stsp }
1777 6ced4176 2019-07-12 stsp
1778 6ced4176 2019-07-12 stsp static const struct got_error *
1779 6ced4176 2019-07-12 stsp find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
1780 6ced4176 2019-07-12 stsp struct got_object_id **tree_id, const char *wt_relpath,
1781 6ced4176 2019-07-12 stsp struct got_worktree *worktree, struct got_repository *repo)
1782 6ced4176 2019-07-12 stsp {
1783 6ced4176 2019-07-12 stsp const struct got_error *err = NULL;
1784 6ced4176 2019-07-12 stsp struct got_object_id *id = NULL;
1785 6ced4176 2019-07-12 stsp char *in_repo_path = NULL;
1786 6ced4176 2019-07-12 stsp int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
1787 6ced4176 2019-07-12 stsp
1788 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
1789 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
1790 6ced4176 2019-07-12 stsp *tree_id = NULL;
1791 6ced4176 2019-07-12 stsp
1792 6ced4176 2019-07-12 stsp if (wt_relpath[0] == '\0') {
1793 6ced4176 2019-07-12 stsp /* Check out all files within the work tree. */
1794 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_TREE;
1795 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
1796 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1797 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1798 6ced4176 2019-07-12 stsp goto done;
1799 6ced4176 2019-07-12 stsp }
1800 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
1801 6ced4176 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
1802 6ced4176 2019-07-12 stsp if (err)
1803 6ced4176 2019-07-12 stsp goto done;
1804 6ced4176 2019-07-12 stsp return NULL;
1805 6ced4176 2019-07-12 stsp }
1806 6ced4176 2019-07-12 stsp
1807 6ced4176 2019-07-12 stsp /* Check out a subset of files in the work tree. */
1808 6ced4176 2019-07-12 stsp
1809 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
1810 6ced4176 2019-07-12 stsp is_root_wt ? "" : "/", wt_relpath) == -1) {
1811 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
1812 6ced4176 2019-07-12 stsp goto done;
1813 6ced4176 2019-07-12 stsp }
1814 6ced4176 2019-07-12 stsp
1815 6ced4176 2019-07-12 stsp err = got_object_id_by_path(&id, repo, worktree->base_commit_id,
1816 6ced4176 2019-07-12 stsp in_repo_path);
1817 6ced4176 2019-07-12 stsp if (err)
1818 6ced4176 2019-07-12 stsp goto done;
1819 6ced4176 2019-07-12 stsp
1820 6ced4176 2019-07-12 stsp free(in_repo_path);
1821 6ced4176 2019-07-12 stsp in_repo_path = NULL;
1822 6ced4176 2019-07-12 stsp
1823 6ced4176 2019-07-12 stsp err = got_object_get_type(entry_type, repo, id);
1824 6ced4176 2019-07-12 stsp if (err)
1825 6ced4176 2019-07-12 stsp goto done;
1826 c932eeeb 2019-05-22 stsp
1827 6ced4176 2019-07-12 stsp if (*entry_type == GOT_OBJ_TYPE_BLOB) {
1828 6ced4176 2019-07-12 stsp /* Check out a single file. */
1829 6ced4176 2019-07-12 stsp if (strchr(wt_relpath, '/') == NULL) {
1830 6ced4176 2019-07-12 stsp /* Check out a single file in work tree's root dir. */
1831 6ced4176 2019-07-12 stsp in_repo_path = strdup(worktree->path_prefix);
1832 6ced4176 2019-07-12 stsp if (in_repo_path == NULL) {
1833 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1834 6ced4176 2019-07-12 stsp goto done;
1835 6ced4176 2019-07-12 stsp }
1836 6ced4176 2019-07-12 stsp *tree_relpath = strdup("");
1837 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1838 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1839 6ced4176 2019-07-12 stsp goto done;
1840 6ced4176 2019-07-12 stsp }
1841 6ced4176 2019-07-12 stsp } else {
1842 6ced4176 2019-07-12 stsp /* Check out a single file in a subdirectory. */
1843 6ced4176 2019-07-12 stsp err = got_path_dirname(tree_relpath, wt_relpath);
1844 6ced4176 2019-07-12 stsp if (err)
1845 6ced4176 2019-07-12 stsp return err;
1846 6ced4176 2019-07-12 stsp if (asprintf(&in_repo_path, "%s%s%s",
1847 6ced4176 2019-07-12 stsp worktree->path_prefix, is_root_wt ? "" : "/",
1848 6ced4176 2019-07-12 stsp *tree_relpath) == -1) {
1849 6ced4176 2019-07-12 stsp err = got_error_from_errno("asprintf");
1850 6ced4176 2019-07-12 stsp goto done;
1851 6ced4176 2019-07-12 stsp }
1852 6ced4176 2019-07-12 stsp }
1853 6ced4176 2019-07-12 stsp err = got_object_id_by_path(tree_id, repo,
1854 6ced4176 2019-07-12 stsp worktree->base_commit_id, in_repo_path);
1855 6ced4176 2019-07-12 stsp } else {
1856 6ced4176 2019-07-12 stsp /* Check out all files within a subdirectory. */
1857 6ced4176 2019-07-12 stsp *tree_id = got_object_id_dup(id);
1858 6ced4176 2019-07-12 stsp if (*tree_id == NULL) {
1859 6ced4176 2019-07-12 stsp err = got_error_from_errno("got_object_id_dup");
1860 6ced4176 2019-07-12 stsp goto done;
1861 6ced4176 2019-07-12 stsp }
1862 6ced4176 2019-07-12 stsp *tree_relpath = strdup(wt_relpath);
1863 6ced4176 2019-07-12 stsp if (*tree_relpath == NULL) {
1864 6ced4176 2019-07-12 stsp err = got_error_from_errno("strdup");
1865 6ced4176 2019-07-12 stsp goto done;
1866 6ced4176 2019-07-12 stsp }
1867 6ced4176 2019-07-12 stsp }
1868 6ced4176 2019-07-12 stsp done:
1869 6ced4176 2019-07-12 stsp free(id);
1870 6ced4176 2019-07-12 stsp free(in_repo_path);
1871 6ced4176 2019-07-12 stsp if (err) {
1872 6ced4176 2019-07-12 stsp *entry_type = GOT_OBJ_TYPE_ANY;
1873 6ced4176 2019-07-12 stsp free(*tree_relpath);
1874 6ced4176 2019-07-12 stsp *tree_relpath = NULL;
1875 6ced4176 2019-07-12 stsp free(*tree_id);
1876 6ced4176 2019-07-12 stsp *tree_id = NULL;
1877 6ced4176 2019-07-12 stsp }
1878 07ed472d 2019-07-12 stsp return err;
1879 07ed472d 2019-07-12 stsp }
1880 07ed472d 2019-07-12 stsp
1881 07ed472d 2019-07-12 stsp static const struct got_error *
1882 07ed472d 2019-07-12 stsp checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
1883 07ed472d 2019-07-12 stsp const char *relpath, struct got_object_id *tree_id, const char *entry_name,
1884 07ed472d 2019-07-12 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1885 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
1886 07ed472d 2019-07-12 stsp {
1887 07ed472d 2019-07-12 stsp const struct got_error *err = NULL;
1888 07ed472d 2019-07-12 stsp struct got_commit_object *commit = NULL;
1889 07ed472d 2019-07-12 stsp struct got_tree_object *tree = NULL;
1890 07ed472d 2019-07-12 stsp struct got_fileindex_diff_tree_cb diff_cb;
1891 07ed472d 2019-07-12 stsp struct diff_cb_arg arg;
1892 07ed472d 2019-07-12 stsp
1893 07ed472d 2019-07-12 stsp err = ref_base_commit(worktree, repo);
1894 7f47418f 2019-12-20 stsp if (err) {
1895 6201aef3 2020-02-02 stsp if (!(err->code == GOT_ERR_ERRNO &&
1896 6201aef3 2020-02-02 stsp (errno == EACCES || errno == EROFS)))
1897 7f47418f 2019-12-20 stsp goto done;
1898 7f47418f 2019-12-20 stsp err = (*progress_cb)(progress_arg,
1899 7f47418f 2019-12-20 stsp GOT_STATUS_BASE_REF_ERR, worktree->root_path);
1900 7f47418f 2019-12-20 stsp if (err)
1901 7f47418f 2019-12-20 stsp return err;
1902 7f47418f 2019-12-20 stsp }
1903 07ed472d 2019-07-12 stsp
1904 07ed472d 2019-07-12 stsp err = got_object_open_as_commit(&commit, repo,
1905 07ed472d 2019-07-12 stsp worktree->base_commit_id);
1906 07ed472d 2019-07-12 stsp if (err)
1907 07ed472d 2019-07-12 stsp goto done;
1908 07ed472d 2019-07-12 stsp
1909 07ed472d 2019-07-12 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1910 07ed472d 2019-07-12 stsp if (err)
1911 07ed472d 2019-07-12 stsp goto done;
1912 07ed472d 2019-07-12 stsp
1913 07ed472d 2019-07-12 stsp if (entry_name &&
1914 07ed472d 2019-07-12 stsp got_object_tree_find_entry(tree, entry_name) == NULL) {
1915 07ed472d 2019-07-12 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
1916 07ed472d 2019-07-12 stsp goto done;
1917 07ed472d 2019-07-12 stsp }
1918 07ed472d 2019-07-12 stsp
1919 07ed472d 2019-07-12 stsp diff_cb.diff_old_new = diff_old_new;
1920 07ed472d 2019-07-12 stsp diff_cb.diff_old = diff_old;
1921 07ed472d 2019-07-12 stsp diff_cb.diff_new = diff_new;
1922 07ed472d 2019-07-12 stsp arg.fileindex = fileindex;
1923 07ed472d 2019-07-12 stsp arg.worktree = worktree;
1924 07ed472d 2019-07-12 stsp arg.repo = repo;
1925 07ed472d 2019-07-12 stsp arg.progress_cb = progress_cb;
1926 07ed472d 2019-07-12 stsp arg.progress_arg = progress_arg;
1927 07ed472d 2019-07-12 stsp arg.cancel_cb = cancel_cb;
1928 07ed472d 2019-07-12 stsp arg.cancel_arg = cancel_arg;
1929 07ed472d 2019-07-12 stsp err = got_fileindex_diff_tree(fileindex, tree, relpath,
1930 07ed472d 2019-07-12 stsp entry_name, repo, &diff_cb, &arg);
1931 07ed472d 2019-07-12 stsp done:
1932 07ed472d 2019-07-12 stsp if (tree)
1933 07ed472d 2019-07-12 stsp got_object_tree_close(tree);
1934 07ed472d 2019-07-12 stsp if (commit)
1935 07ed472d 2019-07-12 stsp got_object_commit_close(commit);
1936 6ced4176 2019-07-12 stsp return err;
1937 6ced4176 2019-07-12 stsp }
1938 6ced4176 2019-07-12 stsp
1939 9d31a1d8 2018-03-11 stsp const struct got_error *
1940 f2ea84fa 2019-07-27 stsp got_worktree_checkout_files(struct got_worktree *worktree,
1941 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
1942 f2ea84fa 2019-07-27 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
1943 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
1944 9d31a1d8 2018-03-11 stsp {
1945 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
1946 9d31a1d8 2018-03-11 stsp struct got_commit_object *commit = NULL;
1947 9d31a1d8 2018-03-11 stsp struct got_tree_object *tree = NULL;
1948 9d31a1d8 2018-03-11 stsp struct got_fileindex *fileindex = NULL;
1949 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
1950 f2ea84fa 2019-07-27 stsp struct got_pathlist_entry *pe;
1951 f2ea84fa 2019-07-27 stsp struct tree_path_data {
1952 f2ea84fa 2019-07-27 stsp SIMPLEQ_ENTRY(tree_path_data) entry;
1953 f2ea84fa 2019-07-27 stsp struct got_object_id *tree_id;
1954 f2ea84fa 2019-07-27 stsp int entry_type;
1955 f2ea84fa 2019-07-27 stsp char *relpath;
1956 f2ea84fa 2019-07-27 stsp char *entry_name;
1957 f2ea84fa 2019-07-27 stsp } *tpd = NULL;
1958 f2ea84fa 2019-07-27 stsp SIMPLEQ_HEAD(tree_paths, tree_path_data) tree_paths;
1959 9d31a1d8 2018-03-11 stsp
1960 f2ea84fa 2019-07-27 stsp SIMPLEQ_INIT(&tree_paths);
1961 f2ea84fa 2019-07-27 stsp
1962 9d31a1d8 2018-03-11 stsp err = lock_worktree(worktree, LOCK_EX);
1963 9d31a1d8 2018-03-11 stsp if (err)
1964 9d31a1d8 2018-03-11 stsp return err;
1965 93a30277 2018-12-24 stsp
1966 f2ea84fa 2019-07-27 stsp /* Map all specified paths to in-repository trees. */
1967 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
1968 f2ea84fa 2019-07-27 stsp tpd = malloc(sizeof(*tpd));
1969 f2ea84fa 2019-07-27 stsp if (tpd == NULL) {
1970 f2ea84fa 2019-07-27 stsp err = got_error_from_errno("malloc");
1971 f2ea84fa 2019-07-27 stsp goto done;
1972 f2ea84fa 2019-07-27 stsp }
1973 6ced4176 2019-07-12 stsp
1974 f2ea84fa 2019-07-27 stsp err = find_tree_entry_for_checkout(&tpd->entry_type,
1975 f2ea84fa 2019-07-27 stsp &tpd->relpath, &tpd->tree_id, pe->path, worktree, repo);
1976 f2ea84fa 2019-07-27 stsp if (err) {
1977 f2ea84fa 2019-07-27 stsp free(tpd);
1978 6ced4176 2019-07-12 stsp goto done;
1979 6ced4176 2019-07-12 stsp }
1980 f2ea84fa 2019-07-27 stsp
1981 f2ea84fa 2019-07-27 stsp if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
1982 f2ea84fa 2019-07-27 stsp err = got_path_basename(&tpd->entry_name, pe->path);
1983 f2ea84fa 2019-07-27 stsp if (err) {
1984 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
1985 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
1986 f2ea84fa 2019-07-27 stsp free(tpd);
1987 f2ea84fa 2019-07-27 stsp goto done;
1988 f2ea84fa 2019-07-27 stsp }
1989 f2ea84fa 2019-07-27 stsp } else
1990 f2ea84fa 2019-07-27 stsp tpd->entry_name = NULL;
1991 f2ea84fa 2019-07-27 stsp
1992 f2ea84fa 2019-07-27 stsp SIMPLEQ_INSERT_TAIL(&tree_paths, tpd, entry);
1993 6ced4176 2019-07-12 stsp }
1994 6ced4176 2019-07-12 stsp
1995 51514078 2018-12-25 stsp /*
1996 51514078 2018-12-25 stsp * Read the file index.
1997 51514078 2018-12-25 stsp * Checking out files is supposed to be an idempotent operation.
1998 51514078 2018-12-25 stsp * If the on-disk file index is incomplete we will try to complete it.
1999 51514078 2018-12-25 stsp */
2000 ebf99748 2019-05-09 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2001 8da9e5f4 2019-01-12 stsp if (err)
2002 c4cdcb68 2019-04-03 stsp goto done;
2003 c4cdcb68 2019-04-03 stsp
2004 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
2005 f2ea84fa 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2006 711d9cd9 2019-07-12 stsp struct bump_base_commit_id_arg bbc_arg;
2007 f2ea84fa 2019-07-27 stsp
2008 f2ea84fa 2019-07-27 stsp err = checkout_files(worktree, fileindex, tpd->relpath,
2009 f2ea84fa 2019-07-27 stsp tpd->tree_id, tpd->entry_name, repo,
2010 f2ea84fa 2019-07-27 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
2011 f2ea84fa 2019-07-27 stsp if (err)
2012 f2ea84fa 2019-07-27 stsp break;
2013 f2ea84fa 2019-07-27 stsp
2014 711d9cd9 2019-07-12 stsp bbc_arg.base_commit_id = worktree->base_commit_id;
2015 f2ea84fa 2019-07-27 stsp bbc_arg.entry_name = tpd->entry_name;
2016 f2ea84fa 2019-07-27 stsp bbc_arg.path = pe->path;
2017 f2b16ada 2019-08-02 stsp bbc_arg.path_len = pe->path_len;
2018 711d9cd9 2019-07-12 stsp bbc_arg.progress_cb = progress_cb;
2019 711d9cd9 2019-07-12 stsp bbc_arg.progress_arg = progress_arg;
2020 711d9cd9 2019-07-12 stsp err = got_fileindex_for_each_entry_safe(fileindex,
2021 711d9cd9 2019-07-12 stsp bump_base_commit_id, &bbc_arg);
2022 f2ea84fa 2019-07-27 stsp if (err)
2023 f2ea84fa 2019-07-27 stsp break;
2024 f2ea84fa 2019-07-27 stsp
2025 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_NEXT(tpd, entry);
2026 711d9cd9 2019-07-12 stsp }
2027 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2028 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2029 af12c6b9 2019-06-04 stsp err = sync_err;
2030 9d31a1d8 2018-03-11 stsp done:
2031 9c6338c4 2019-06-02 stsp free(fileindex_path);
2032 edfa7d7f 2018-09-11 stsp if (tree)
2033 edfa7d7f 2018-09-11 stsp got_object_tree_close(tree);
2034 9d31a1d8 2018-03-11 stsp if (commit)
2035 9d31a1d8 2018-03-11 stsp got_object_commit_close(commit);
2036 5ade8233 2019-07-12 stsp if (fileindex)
2037 5ade8233 2019-07-12 stsp got_fileindex_free(fileindex);
2038 f2ea84fa 2019-07-27 stsp while (!SIMPLEQ_EMPTY(&tree_paths)) {
2039 f2ea84fa 2019-07-27 stsp tpd = SIMPLEQ_FIRST(&tree_paths);
2040 f2ea84fa 2019-07-27 stsp SIMPLEQ_REMOVE_HEAD(&tree_paths, entry);
2041 f2ea84fa 2019-07-27 stsp free(tpd->relpath);
2042 f2ea84fa 2019-07-27 stsp free(tpd->tree_id);
2043 f2ea84fa 2019-07-27 stsp free(tpd);
2044 f2ea84fa 2019-07-27 stsp }
2045 9d31a1d8 2018-03-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2046 9d31a1d8 2018-03-11 stsp if (unlockerr && err == NULL)
2047 9d31a1d8 2018-03-11 stsp err = unlockerr;
2048 f8d1f275 2019-02-04 stsp return err;
2049 f8d1f275 2019-02-04 stsp }
2050 f8d1f275 2019-02-04 stsp
2051 234035bc 2019-06-01 stsp struct merge_file_cb_arg {
2052 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2053 234035bc 2019-06-01 stsp struct got_fileindex *fileindex;
2054 234035bc 2019-06-01 stsp got_worktree_checkout_cb progress_cb;
2055 234035bc 2019-06-01 stsp void *progress_arg;
2056 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2057 234035bc 2019-06-01 stsp void *cancel_arg;
2058 f69721c3 2019-10-21 stsp const char *label_orig;
2059 818c7501 2019-07-11 stsp struct got_object_id *commit_id2;
2060 234035bc 2019-06-01 stsp };
2061 234035bc 2019-06-01 stsp
2062 234035bc 2019-06-01 stsp static const struct got_error *
2063 234035bc 2019-06-01 stsp merge_file_cb(void *arg, struct got_blob_object *blob1,
2064 234035bc 2019-06-01 stsp struct got_blob_object *blob2, struct got_object_id *id1,
2065 234035bc 2019-06-01 stsp struct got_object_id *id2, const char *path1, const char *path2,
2066 46f68b20 2019-10-19 stsp mode_t mode1, mode_t mode2, struct got_repository *repo)
2067 234035bc 2019-06-01 stsp {
2068 234035bc 2019-06-01 stsp static const struct got_error *err = NULL;
2069 234035bc 2019-06-01 stsp struct merge_file_cb_arg *a = arg;
2070 234035bc 2019-06-01 stsp struct got_fileindex_entry *ie;
2071 234035bc 2019-06-01 stsp char *ondisk_path = NULL;
2072 234035bc 2019-06-01 stsp struct stat sb;
2073 234035bc 2019-06-01 stsp unsigned char status;
2074 234035bc 2019-06-01 stsp int local_changes_subsumed;
2075 234035bc 2019-06-01 stsp
2076 234035bc 2019-06-01 stsp if (blob1 && blob2) {
2077 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2078 d6c87207 2019-08-02 stsp strlen(path2));
2079 1ee397ad 2019-07-12 stsp if (ie == NULL)
2080 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2081 1ee397ad 2019-07-12 stsp GOT_STATUS_MISSING, path2);
2082 234035bc 2019-06-01 stsp
2083 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2084 234035bc 2019-06-01 stsp path2) == -1)
2085 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2086 234035bc 2019-06-01 stsp
2087 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2088 7f91a133 2019-12-13 stsp repo);
2089 234035bc 2019-06-01 stsp if (err)
2090 234035bc 2019-06-01 stsp goto done;
2091 234035bc 2019-06-01 stsp
2092 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2093 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2094 1ee397ad 2019-07-12 stsp GOT_STATUS_MERGE, path2);
2095 234035bc 2019-06-01 stsp goto done;
2096 234035bc 2019-06-01 stsp }
2097 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2098 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2099 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2100 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2101 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path2);
2102 234035bc 2019-06-01 stsp goto done;
2103 234035bc 2019-06-01 stsp }
2104 234035bc 2019-06-01 stsp
2105 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree, blob1,
2106 f69721c3 2019-10-21 stsp ondisk_path, path2, sb.st_mode, a->label_orig, blob2,
2107 f69721c3 2019-10-21 stsp a->commit_id2, repo, a->progress_cb, a->progress_arg);
2108 234035bc 2019-06-01 stsp } else if (blob1) {
2109 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path1,
2110 d6c87207 2019-08-02 stsp strlen(path1));
2111 1ee397ad 2019-07-12 stsp if (ie == NULL)
2112 1ee397ad 2019-07-12 stsp return (*a->progress_cb)(a->progress_arg,
2113 3c24af98 2020-02-07 tracey GOT_STATUS_MISSING, path1);
2114 2b92fad7 2019-06-02 stsp
2115 2b92fad7 2019-06-02 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2116 2b92fad7 2019-06-02 stsp path1) == -1)
2117 2b92fad7 2019-06-02 stsp return got_error_from_errno("asprintf");
2118 2b92fad7 2019-06-02 stsp
2119 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2120 7f91a133 2019-12-13 stsp repo);
2121 2b92fad7 2019-06-02 stsp if (err)
2122 2b92fad7 2019-06-02 stsp goto done;
2123 2b92fad7 2019-06-02 stsp
2124 2b92fad7 2019-06-02 stsp switch (status) {
2125 2b92fad7 2019-06-02 stsp case GOT_STATUS_NO_CHANGE:
2126 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2127 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2128 1ee397ad 2019-07-12 stsp if (err)
2129 1ee397ad 2019-07-12 stsp goto done;
2130 2b92fad7 2019-06-02 stsp err = remove_ondisk_file(a->worktree->root_path, path1);
2131 2b92fad7 2019-06-02 stsp if (err)
2132 2b92fad7 2019-06-02 stsp goto done;
2133 2b92fad7 2019-06-02 stsp if (ie)
2134 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2135 2b92fad7 2019-06-02 stsp break;
2136 2b92fad7 2019-06-02 stsp case GOT_STATUS_DELETE:
2137 2b92fad7 2019-06-02 stsp case GOT_STATUS_MISSING:
2138 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2139 1ee397ad 2019-07-12 stsp GOT_STATUS_DELETE, path1);
2140 1ee397ad 2019-07-12 stsp if (err)
2141 1ee397ad 2019-07-12 stsp goto done;
2142 2b92fad7 2019-06-02 stsp if (ie)
2143 2b92fad7 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
2144 2b92fad7 2019-06-02 stsp break;
2145 2b92fad7 2019-06-02 stsp case GOT_STATUS_ADD:
2146 2b92fad7 2019-06-02 stsp case GOT_STATUS_MODIFY:
2147 2b92fad7 2019-06-02 stsp case GOT_STATUS_CONFLICT:
2148 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2149 2b92fad7 2019-06-02 stsp GOT_STATUS_CANNOT_DELETE, path1);
2150 1ee397ad 2019-07-12 stsp if (err)
2151 1ee397ad 2019-07-12 stsp goto done;
2152 2b92fad7 2019-06-02 stsp break;
2153 2b92fad7 2019-06-02 stsp case GOT_STATUS_OBSTRUCTED:
2154 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path1);
2155 1ee397ad 2019-07-12 stsp if (err)
2156 1ee397ad 2019-07-12 stsp goto done;
2157 2b92fad7 2019-06-02 stsp break;
2158 2b92fad7 2019-06-02 stsp default:
2159 2b92fad7 2019-06-02 stsp break;
2160 2b92fad7 2019-06-02 stsp }
2161 234035bc 2019-06-01 stsp } else if (blob2) {
2162 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2163 234035bc 2019-06-01 stsp path2) == -1)
2164 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2165 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(a->fileindex, path2,
2166 d6c87207 2019-08-02 stsp strlen(path2));
2167 234035bc 2019-06-01 stsp if (ie) {
2168 234035bc 2019-06-01 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
2169 7f91a133 2019-12-13 stsp -1, NULL, repo);
2170 234035bc 2019-06-01 stsp if (err)
2171 234035bc 2019-06-01 stsp goto done;
2172 234035bc 2019-06-01 stsp if (status != GOT_STATUS_NO_CHANGE &&
2173 234035bc 2019-06-01 stsp status != GOT_STATUS_MODIFY &&
2174 234035bc 2019-06-01 stsp status != GOT_STATUS_CONFLICT &&
2175 234035bc 2019-06-01 stsp status != GOT_STATUS_ADD) {
2176 1ee397ad 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg,
2177 1ee397ad 2019-07-12 stsp status, path2);
2178 234035bc 2019-06-01 stsp goto done;
2179 234035bc 2019-06-01 stsp }
2180 234035bc 2019-06-01 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
2181 f69721c3 2019-10-21 stsp NULL, ondisk_path, path2, sb.st_mode,
2182 f69721c3 2019-10-21 stsp a->label_orig, blob2, a->commit_id2, repo,
2183 f69721c3 2019-10-21 stsp a->progress_cb,
2184 f69721c3 2019-10-21 stsp a->progress_arg);
2185 234035bc 2019-06-01 stsp if (status == GOT_STATUS_DELETE) {
2186 234035bc 2019-06-01 stsp err = update_blob_fileindex_entry(a->worktree,
2187 234035bc 2019-06-01 stsp a->fileindex, ie, ondisk_path, ie->path,
2188 234035bc 2019-06-01 stsp blob2, 0);
2189 234035bc 2019-06-01 stsp if (err)
2190 234035bc 2019-06-01 stsp goto done;
2191 234035bc 2019-06-01 stsp }
2192 234035bc 2019-06-01 stsp } else {
2193 234035bc 2019-06-01 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
2194 234035bc 2019-06-01 stsp err = install_blob(a->worktree, ondisk_path, path2,
2195 234035bc 2019-06-01 stsp /* XXX get this from parent tree! */
2196 234035bc 2019-06-01 stsp GOT_DEFAULT_FILE_MODE,
2197 234035bc 2019-06-01 stsp sb.st_mode, blob2, 0, 0, repo,
2198 234035bc 2019-06-01 stsp a->progress_cb, a->progress_arg);
2199 234035bc 2019-06-01 stsp if (err)
2200 234035bc 2019-06-01 stsp goto done;
2201 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_alloc(&ie,
2202 2b92fad7 2019-06-02 stsp ondisk_path, path2, NULL, NULL);
2203 234035bc 2019-06-01 stsp if (err)
2204 234035bc 2019-06-01 stsp goto done;
2205 2b92fad7 2019-06-02 stsp err = got_fileindex_entry_add(a->fileindex, ie);
2206 2b92fad7 2019-06-02 stsp if (err) {
2207 2b92fad7 2019-06-02 stsp got_fileindex_entry_free(ie);
2208 2b92fad7 2019-06-02 stsp goto done;
2209 2b92fad7 2019-06-02 stsp }
2210 234035bc 2019-06-01 stsp }
2211 234035bc 2019-06-01 stsp }
2212 234035bc 2019-06-01 stsp done:
2213 234035bc 2019-06-01 stsp free(ondisk_path);
2214 234035bc 2019-06-01 stsp return err;
2215 234035bc 2019-06-01 stsp }
2216 234035bc 2019-06-01 stsp
2217 234035bc 2019-06-01 stsp struct check_merge_ok_arg {
2218 234035bc 2019-06-01 stsp struct got_worktree *worktree;
2219 234035bc 2019-06-01 stsp struct got_repository *repo;
2220 234035bc 2019-06-01 stsp };
2221 234035bc 2019-06-01 stsp
2222 234035bc 2019-06-01 stsp static const struct got_error *
2223 234035bc 2019-06-01 stsp check_merge_ok(void *arg, struct got_fileindex_entry *ie)
2224 234035bc 2019-06-01 stsp {
2225 234035bc 2019-06-01 stsp const struct got_error *err = NULL;
2226 234035bc 2019-06-01 stsp struct check_merge_ok_arg *a = arg;
2227 234035bc 2019-06-01 stsp unsigned char status;
2228 234035bc 2019-06-01 stsp struct stat sb;
2229 234035bc 2019-06-01 stsp char *ondisk_path;
2230 234035bc 2019-06-01 stsp
2231 234035bc 2019-06-01 stsp /* Reject merges into a work tree with mixed base commits. */
2232 234035bc 2019-06-01 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
2233 234035bc 2019-06-01 stsp SHA1_DIGEST_LENGTH))
2234 234035bc 2019-06-01 stsp return got_error(GOT_ERR_MIXED_COMMITS);
2235 234035bc 2019-06-01 stsp
2236 234035bc 2019-06-01 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
2237 234035bc 2019-06-01 stsp == -1)
2238 234035bc 2019-06-01 stsp return got_error_from_errno("asprintf");
2239 234035bc 2019-06-01 stsp
2240 234035bc 2019-06-01 stsp /* Reject merges into a work tree with conflicted files. */
2241 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
2242 234035bc 2019-06-01 stsp if (err)
2243 234035bc 2019-06-01 stsp return err;
2244 234035bc 2019-06-01 stsp if (status == GOT_STATUS_CONFLICT)
2245 234035bc 2019-06-01 stsp return got_error(GOT_ERR_CONFLICTS);
2246 234035bc 2019-06-01 stsp
2247 234035bc 2019-06-01 stsp return NULL;
2248 234035bc 2019-06-01 stsp }
2249 234035bc 2019-06-01 stsp
2250 818c7501 2019-07-11 stsp static const struct got_error *
2251 818c7501 2019-07-11 stsp merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2252 818c7501 2019-07-11 stsp const char *fileindex_path, struct got_object_id *commit_id1,
2253 818c7501 2019-07-11 stsp struct got_object_id *commit_id2, struct got_repository *repo,
2254 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2255 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2256 234035bc 2019-06-01 stsp {
2257 818c7501 2019-07-11 stsp const struct got_error *err = NULL, *sync_err;
2258 234035bc 2019-06-01 stsp struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
2259 234035bc 2019-06-01 stsp struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2260 234035bc 2019-06-01 stsp struct merge_file_cb_arg arg;
2261 f69721c3 2019-10-21 stsp char *label_orig = NULL;
2262 234035bc 2019-06-01 stsp
2263 03415a1a 2019-06-02 stsp if (commit_id1) {
2264 f69721c3 2019-10-21 stsp char *id_str;
2265 f69721c3 2019-10-21 stsp
2266 03415a1a 2019-06-02 stsp err = got_object_id_by_path(&tree_id1, repo, commit_id1,
2267 03415a1a 2019-06-02 stsp worktree->path_prefix);
2268 03415a1a 2019-06-02 stsp if (err)
2269 03415a1a 2019-06-02 stsp goto done;
2270 03415a1a 2019-06-02 stsp
2271 03415a1a 2019-06-02 stsp err = got_object_open_as_tree(&tree1, repo, tree_id1);
2272 03415a1a 2019-06-02 stsp if (err)
2273 03415a1a 2019-06-02 stsp goto done;
2274 f69721c3 2019-10-21 stsp
2275 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str, commit_id1);
2276 f69721c3 2019-10-21 stsp if (err)
2277 f69721c3 2019-10-21 stsp goto done;
2278 f69721c3 2019-10-21 stsp
2279 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s",
2280 f69721c3 2019-10-21 stsp GOT_MERGE_LABEL_BASE, id_str) == -1) {
2281 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
2282 f69721c3 2019-10-21 stsp free(id_str);
2283 f69721c3 2019-10-21 stsp goto done;
2284 f69721c3 2019-10-21 stsp }
2285 f69721c3 2019-10-21 stsp free(id_str);
2286 03415a1a 2019-06-02 stsp }
2287 234035bc 2019-06-01 stsp
2288 234035bc 2019-06-01 stsp err = got_object_id_by_path(&tree_id2, repo, commit_id2,
2289 234035bc 2019-06-01 stsp worktree->path_prefix);
2290 234035bc 2019-06-01 stsp if (err)
2291 234035bc 2019-06-01 stsp goto done;
2292 234035bc 2019-06-01 stsp
2293 234035bc 2019-06-01 stsp err = got_object_open_as_tree(&tree2, repo, tree_id2);
2294 234035bc 2019-06-01 stsp if (err)
2295 234035bc 2019-06-01 stsp goto done;
2296 234035bc 2019-06-01 stsp
2297 234035bc 2019-06-01 stsp arg.worktree = worktree;
2298 234035bc 2019-06-01 stsp arg.fileindex = fileindex;
2299 234035bc 2019-06-01 stsp arg.progress_cb = progress_cb;
2300 234035bc 2019-06-01 stsp arg.progress_arg = progress_arg;
2301 234035bc 2019-06-01 stsp arg.cancel_cb = cancel_cb;
2302 234035bc 2019-06-01 stsp arg.cancel_arg = cancel_arg;
2303 f69721c3 2019-10-21 stsp arg.label_orig = label_orig;
2304 818c7501 2019-07-11 stsp arg.commit_id2 = commit_id2;
2305 31b4484f 2019-07-27 stsp err = got_diff_tree(tree1, tree2, "", "", repo, merge_file_cb, &arg, 1);
2306 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2307 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2308 af12c6b9 2019-06-04 stsp err = sync_err;
2309 234035bc 2019-06-01 stsp done:
2310 234035bc 2019-06-01 stsp if (tree1)
2311 234035bc 2019-06-01 stsp got_object_tree_close(tree1);
2312 234035bc 2019-06-01 stsp if (tree2)
2313 234035bc 2019-06-01 stsp got_object_tree_close(tree2);
2314 f69721c3 2019-10-21 stsp free(label_orig);
2315 818c7501 2019-07-11 stsp return err;
2316 818c7501 2019-07-11 stsp }
2317 234035bc 2019-06-01 stsp
2318 818c7501 2019-07-11 stsp const struct got_error *
2319 818c7501 2019-07-11 stsp got_worktree_merge_files(struct got_worktree *worktree,
2320 818c7501 2019-07-11 stsp struct got_object_id *commit_id1, struct got_object_id *commit_id2,
2321 818c7501 2019-07-11 stsp struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2322 e6209546 2019-08-22 stsp void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2323 818c7501 2019-07-11 stsp {
2324 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
2325 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
2326 818c7501 2019-07-11 stsp struct got_fileindex *fileindex = NULL;
2327 818c7501 2019-07-11 stsp struct check_merge_ok_arg mok_arg;
2328 818c7501 2019-07-11 stsp
2329 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
2330 818c7501 2019-07-11 stsp if (err)
2331 818c7501 2019-07-11 stsp return err;
2332 818c7501 2019-07-11 stsp
2333 818c7501 2019-07-11 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2334 818c7501 2019-07-11 stsp if (err)
2335 818c7501 2019-07-11 stsp goto done;
2336 818c7501 2019-07-11 stsp
2337 818c7501 2019-07-11 stsp mok_arg.worktree = worktree;
2338 818c7501 2019-07-11 stsp mok_arg.repo = repo;
2339 818c7501 2019-07-11 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_merge_ok,
2340 818c7501 2019-07-11 stsp &mok_arg);
2341 818c7501 2019-07-11 stsp if (err)
2342 818c7501 2019-07-11 stsp goto done;
2343 818c7501 2019-07-11 stsp
2344 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
2345 818c7501 2019-07-11 stsp commit_id2, repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
2346 818c7501 2019-07-11 stsp done:
2347 818c7501 2019-07-11 stsp if (fileindex)
2348 818c7501 2019-07-11 stsp got_fileindex_free(fileindex);
2349 818c7501 2019-07-11 stsp free(fileindex_path);
2350 234035bc 2019-06-01 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2351 234035bc 2019-06-01 stsp if (unlockerr && err == NULL)
2352 234035bc 2019-06-01 stsp err = unlockerr;
2353 234035bc 2019-06-01 stsp return err;
2354 234035bc 2019-06-01 stsp }
2355 234035bc 2019-06-01 stsp
2356 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg {
2357 f8d1f275 2019-02-04 stsp struct got_fileindex *fileindex;
2358 f8d1f275 2019-02-04 stsp struct got_worktree *worktree;
2359 927df6b7 2019-02-10 stsp const char *status_path;
2360 927df6b7 2019-02-10 stsp size_t status_path_len;
2361 f8d1f275 2019-02-04 stsp struct got_repository *repo;
2362 f8d1f275 2019-02-04 stsp got_worktree_status_cb status_cb;
2363 f8d1f275 2019-02-04 stsp void *status_arg;
2364 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb;
2365 f8d1f275 2019-02-04 stsp void *cancel_arg;
2366 6841da00 2019-08-08 stsp /* A pathlist containing per-directory pathlists of ignore patterns. */
2367 6841da00 2019-08-08 stsp struct got_pathlist_head ignores;
2368 f2a9dc41 2019-12-13 tracey int report_unchanged;
2369 f8d1f275 2019-02-04 stsp };
2370 88d0e355 2019-08-03 stsp
2371 f8d1f275 2019-02-04 stsp static const struct got_error *
2372 927df6b7 2019-02-10 stsp report_file_status(struct got_fileindex_entry *ie, const char *abspath,
2373 7f91a133 2019-12-13 stsp int dirfd, const char *de_name,
2374 927df6b7 2019-02-10 stsp got_worktree_status_cb status_cb, void *status_arg,
2375 f2a9dc41 2019-12-13 tracey struct got_repository *repo, int report_unchanged)
2376 927df6b7 2019-02-10 stsp {
2377 927df6b7 2019-02-10 stsp const struct got_error *err = NULL;
2378 927df6b7 2019-02-10 stsp unsigned char status = GOT_STATUS_NO_CHANGE;
2379 c363b2c1 2019-08-03 stsp unsigned char staged_status = get_staged_status(ie);
2380 927df6b7 2019-02-10 stsp struct stat sb;
2381 537ac44b 2019-08-03 stsp struct got_object_id blob_id, commit_id, staged_blob_id;
2382 98eaaa12 2019-08-03 stsp struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
2383 98eaaa12 2019-08-03 stsp struct got_object_id *staged_blob_idp = NULL;
2384 927df6b7 2019-02-10 stsp
2385 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
2386 98eaaa12 2019-08-03 stsp if (err)
2387 98eaaa12 2019-08-03 stsp return err;
2388 98eaaa12 2019-08-03 stsp
2389 98eaaa12 2019-08-03 stsp if (status == GOT_STATUS_NO_CHANGE &&
2390 f2a9dc41 2019-12-13 tracey staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
2391 98eaaa12 2019-08-03 stsp return NULL;
2392 98eaaa12 2019-08-03 stsp
2393 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_blob(ie)) {
2394 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2395 98eaaa12 2019-08-03 stsp blob_idp = &blob_id;
2396 98eaaa12 2019-08-03 stsp }
2397 98eaaa12 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
2398 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2399 98eaaa12 2019-08-03 stsp commit_idp = &commit_id;
2400 927df6b7 2019-02-10 stsp }
2401 98eaaa12 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
2402 98eaaa12 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
2403 98eaaa12 2019-08-03 stsp memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
2404 98eaaa12 2019-08-03 stsp SHA1_DIGEST_LENGTH);
2405 98eaaa12 2019-08-03 stsp staged_blob_idp = &staged_blob_id;
2406 98eaaa12 2019-08-03 stsp }
2407 98eaaa12 2019-08-03 stsp
2408 98eaaa12 2019-08-03 stsp return (*status_cb)(status_arg, status, staged_status,
2409 12463d8b 2019-12-13 stsp ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
2410 927df6b7 2019-02-10 stsp }
2411 927df6b7 2019-02-10 stsp
2412 927df6b7 2019-02-10 stsp static const struct got_error *
2413 f8d1f275 2019-02-04 stsp status_old_new(void *arg, struct got_fileindex_entry *ie,
2414 7f91a133 2019-12-13 stsp struct dirent *de, const char *parent_path, int dirfd)
2415 f8d1f275 2019-02-04 stsp {
2416 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2417 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2418 f8d1f275 2019-02-04 stsp char *abspath;
2419 f8d1f275 2019-02-04 stsp
2420 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2421 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2422 0584f854 2019-04-06 stsp
2423 d572f586 2019-08-02 stsp if (got_path_cmp(parent_path, a->status_path,
2424 d572f586 2019-08-02 stsp strlen(parent_path), a->status_path_len) != 0 &&
2425 927df6b7 2019-02-10 stsp !got_path_is_child(parent_path, a->status_path, a->status_path_len))
2426 927df6b7 2019-02-10 stsp return NULL;
2427 927df6b7 2019-02-10 stsp
2428 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2429 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
2430 f8d1f275 2019-02-04 stsp parent_path, de->d_name) == -1)
2431 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2432 f8d1f275 2019-02-04 stsp } else {
2433 f8d1f275 2019-02-04 stsp if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
2434 f8d1f275 2019-02-04 stsp de->d_name) == -1)
2435 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2436 f8d1f275 2019-02-04 stsp }
2437 f8d1f275 2019-02-04 stsp
2438 7f91a133 2019-12-13 stsp err = report_file_status(ie, abspath, dirfd, de->d_name,
2439 7f91a133 2019-12-13 stsp a->status_cb, a->status_arg, a->repo, a->report_unchanged);
2440 f8d1f275 2019-02-04 stsp free(abspath);
2441 9d31a1d8 2018-03-11 stsp return err;
2442 9d31a1d8 2018-03-11 stsp }
2443 f8d1f275 2019-02-04 stsp
2444 f8d1f275 2019-02-04 stsp static const struct got_error *
2445 f8d1f275 2019-02-04 stsp status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2446 f8d1f275 2019-02-04 stsp {
2447 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2448 016a88dd 2019-05-13 stsp struct got_object_id blob_id, commit_id;
2449 2ec1f75b 2019-03-26 stsp unsigned char status;
2450 927df6b7 2019-02-10 stsp
2451 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2452 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2453 0584f854 2019-04-06 stsp
2454 c577a9ce 2019-07-27 stsp if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
2455 927df6b7 2019-02-10 stsp return NULL;
2456 927df6b7 2019-02-10 stsp
2457 016a88dd 2019-05-13 stsp memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
2458 016a88dd 2019-05-13 stsp memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
2459 2ec1f75b 2019-03-26 stsp if (got_fileindex_entry_has_file_on_disk(ie))
2460 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_MISSING;
2461 2ec1f75b 2019-03-26 stsp else
2462 2ec1f75b 2019-03-26 stsp status = GOT_STATUS_DELETE;
2463 88d0e355 2019-08-03 stsp return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
2464 12463d8b 2019-12-13 stsp ie->path, &blob_id, NULL, &commit_id, -1, NULL);
2465 6841da00 2019-08-08 stsp }
2466 6841da00 2019-08-08 stsp
2467 6841da00 2019-08-08 stsp void
2468 6841da00 2019-08-08 stsp free_ignorelist(struct got_pathlist_head *ignorelist)
2469 6841da00 2019-08-08 stsp {
2470 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2471 6841da00 2019-08-08 stsp
2472 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignorelist, entry)
2473 6841da00 2019-08-08 stsp free((char *)pe->path);
2474 6841da00 2019-08-08 stsp got_pathlist_free(ignorelist);
2475 6841da00 2019-08-08 stsp }
2476 6841da00 2019-08-08 stsp
2477 6841da00 2019-08-08 stsp void
2478 6841da00 2019-08-08 stsp free_ignores(struct got_pathlist_head *ignores)
2479 6841da00 2019-08-08 stsp {
2480 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2481 6841da00 2019-08-08 stsp
2482 6841da00 2019-08-08 stsp TAILQ_FOREACH(pe, ignores, entry) {
2483 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
2484 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
2485 6841da00 2019-08-08 stsp free((char *)pe->path);
2486 6841da00 2019-08-08 stsp }
2487 6841da00 2019-08-08 stsp got_pathlist_free(ignores);
2488 6841da00 2019-08-08 stsp }
2489 6841da00 2019-08-08 stsp
2490 6841da00 2019-08-08 stsp static const struct got_error *
2491 6841da00 2019-08-08 stsp read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
2492 6841da00 2019-08-08 stsp {
2493 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
2494 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe = NULL;
2495 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist;
2496 a0de39f3 2019-08-09 stsp char *line = NULL, *pattern, *dirpath = NULL;
2497 6841da00 2019-08-08 stsp size_t linesize = 0;
2498 6841da00 2019-08-08 stsp ssize_t linelen;
2499 6841da00 2019-08-08 stsp
2500 6841da00 2019-08-08 stsp ignorelist = calloc(1, sizeof(*ignorelist));
2501 6841da00 2019-08-08 stsp if (ignorelist == NULL)
2502 6841da00 2019-08-08 stsp return got_error_from_errno("calloc");
2503 6841da00 2019-08-08 stsp TAILQ_INIT(ignorelist);
2504 6841da00 2019-08-08 stsp
2505 6841da00 2019-08-08 stsp while ((linelen = getline(&line, &linesize, f)) != -1) {
2506 6841da00 2019-08-08 stsp if (linelen > 0 && line[linelen - 1] == '\n')
2507 6841da00 2019-08-08 stsp line[linelen - 1] = '\0';
2508 bd8de430 2019-10-04 stsp
2509 bd8de430 2019-10-04 stsp /* Git's ignores may contain comments. */
2510 bd8de430 2019-10-04 stsp if (line[0] == '#')
2511 bd8de430 2019-10-04 stsp continue;
2512 bd8de430 2019-10-04 stsp
2513 bd8de430 2019-10-04 stsp /* Git's negated patterns are not (yet?) supported. */
2514 bd8de430 2019-10-04 stsp if (line[0] == '!')
2515 bd8de430 2019-10-04 stsp continue;
2516 bd8de430 2019-10-04 stsp
2517 6841da00 2019-08-08 stsp if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
2518 6841da00 2019-08-08 stsp line) == -1) {
2519 6841da00 2019-08-08 stsp err = got_error_from_errno("asprintf");
2520 6841da00 2019-08-08 stsp goto done;
2521 6841da00 2019-08-08 stsp }
2522 6841da00 2019-08-08 stsp err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
2523 6841da00 2019-08-08 stsp if (err)
2524 6841da00 2019-08-08 stsp goto done;
2525 6841da00 2019-08-08 stsp }
2526 6841da00 2019-08-08 stsp if (ferror(f)) {
2527 6841da00 2019-08-08 stsp err = got_error_from_errno("getline");
2528 6841da00 2019-08-08 stsp goto done;
2529 6841da00 2019-08-08 stsp }
2530 6841da00 2019-08-08 stsp
2531 6841da00 2019-08-08 stsp dirpath = strdup(path);
2532 6841da00 2019-08-08 stsp if (dirpath == NULL) {
2533 6841da00 2019-08-08 stsp err = got_error_from_errno("strdup");
2534 6841da00 2019-08-08 stsp goto done;
2535 6841da00 2019-08-08 stsp }
2536 6841da00 2019-08-08 stsp err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
2537 6841da00 2019-08-08 stsp done:
2538 6841da00 2019-08-08 stsp free(line);
2539 6841da00 2019-08-08 stsp if (err || pe == NULL) {
2540 6841da00 2019-08-08 stsp free(dirpath);
2541 6841da00 2019-08-08 stsp free_ignorelist(ignorelist);
2542 6841da00 2019-08-08 stsp }
2543 6841da00 2019-08-08 stsp return err;
2544 6841da00 2019-08-08 stsp }
2545 6841da00 2019-08-08 stsp
2546 6841da00 2019-08-08 stsp int
2547 6841da00 2019-08-08 stsp match_ignores(struct got_pathlist_head *ignores, const char *path)
2548 6841da00 2019-08-08 stsp {
2549 6841da00 2019-08-08 stsp struct got_pathlist_entry *pe;
2550 bd8de430 2019-10-04 stsp
2551 bd8de430 2019-10-04 stsp /* Handle patterns which match in all directories. */
2552 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pe, ignores, entry) {
2553 bd8de430 2019-10-04 stsp struct got_pathlist_head *ignorelist = pe->data;
2554 bd8de430 2019-10-04 stsp struct got_pathlist_entry *pi;
2555 bd8de430 2019-10-04 stsp
2556 bd8de430 2019-10-04 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
2557 bd8de430 2019-10-04 stsp const char *p, *pattern = pi->path;
2558 6841da00 2019-08-08 stsp
2559 bd8de430 2019-10-04 stsp if (strncmp(pattern, "**/", 3) != 0)
2560 bd8de430 2019-10-04 stsp continue;
2561 bd8de430 2019-10-04 stsp pattern += 3;
2562 bd8de430 2019-10-04 stsp p = path;
2563 bd8de430 2019-10-04 stsp while (*p) {
2564 bd8de430 2019-10-04 stsp if (fnmatch(pattern, p,
2565 bd8de430 2019-10-04 stsp FNM_PATHNAME | FNM_LEADING_DIR)) {
2566 bd8de430 2019-10-04 stsp /* Retry in next directory. */
2567 bd8de430 2019-10-04 stsp while (*p && *p != '/')
2568 bd8de430 2019-10-04 stsp p++;
2569 bd8de430 2019-10-04 stsp while (*p == '/')
2570 bd8de430 2019-10-04 stsp p++;
2571 bd8de430 2019-10-04 stsp continue;
2572 bd8de430 2019-10-04 stsp }
2573 bd8de430 2019-10-04 stsp return 1;
2574 bd8de430 2019-10-04 stsp }
2575 bd8de430 2019-10-04 stsp }
2576 bd8de430 2019-10-04 stsp }
2577 bd8de430 2019-10-04 stsp
2578 6841da00 2019-08-08 stsp /*
2579 6841da00 2019-08-08 stsp * The ignores pathlist contains ignore lists from children before
2580 6841da00 2019-08-08 stsp * parents, so we can find the most specific ignorelist by walking
2581 6841da00 2019-08-08 stsp * ignores backwards.
2582 6841da00 2019-08-08 stsp */
2583 6841da00 2019-08-08 stsp pe = TAILQ_LAST(ignores, got_pathlist_head);
2584 6841da00 2019-08-08 stsp while (pe) {
2585 6841da00 2019-08-08 stsp if (got_path_is_child(path, pe->path, pe->path_len)) {
2586 6841da00 2019-08-08 stsp struct got_pathlist_head *ignorelist = pe->data;
2587 6841da00 2019-08-08 stsp struct got_pathlist_entry *pi;
2588 6841da00 2019-08-08 stsp TAILQ_FOREACH(pi, ignorelist, entry) {
2589 bd8de430 2019-10-04 stsp const char *pattern = pi->path;
2590 bd8de430 2019-10-04 stsp int flags = FNM_LEADING_DIR;
2591 bd8de430 2019-10-04 stsp if (strstr(pattern, "/**/") == NULL)
2592 bd8de430 2019-10-04 stsp flags |= FNM_PATHNAME;
2593 bd8de430 2019-10-04 stsp if (fnmatch(pattern, path, flags))
2594 6841da00 2019-08-08 stsp continue;
2595 6841da00 2019-08-08 stsp return 1;
2596 6841da00 2019-08-08 stsp }
2597 6841da00 2019-08-08 stsp }
2598 6841da00 2019-08-08 stsp pe = TAILQ_PREV(pe, got_pathlist_head, entry);
2599 6841da00 2019-08-08 stsp }
2600 6841da00 2019-08-08 stsp
2601 6841da00 2019-08-08 stsp return 0;
2602 6841da00 2019-08-08 stsp }
2603 6841da00 2019-08-08 stsp
2604 6841da00 2019-08-08 stsp static const struct got_error *
2605 b80270a7 2019-08-08 stsp add_ignores(struct got_pathlist_head *ignores, const char *root_path,
2606 886cec17 2019-12-15 stsp const char *path, int dirfd, const char *ignores_filename)
2607 6841da00 2019-08-08 stsp {
2608 6841da00 2019-08-08 stsp const struct got_error *err = NULL;
2609 6841da00 2019-08-08 stsp char *ignorespath;
2610 886cec17 2019-12-15 stsp int fd = -1;
2611 6841da00 2019-08-08 stsp FILE *ignoresfile = NULL;
2612 6841da00 2019-08-08 stsp
2613 bd8de430 2019-10-04 stsp if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
2614 bd8de430 2019-10-04 stsp path[0] ? "/" : "", ignores_filename) == -1)
2615 6841da00 2019-08-08 stsp return got_error_from_errno("asprintf");
2616 6841da00 2019-08-08 stsp
2617 886cec17 2019-12-15 stsp if (dirfd != -1) {
2618 886cec17 2019-12-15 stsp fd = openat(dirfd, ignores_filename, O_RDONLY | O_NOFOLLOW);
2619 886cec17 2019-12-15 stsp if (fd == -1) {
2620 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
2621 886cec17 2019-12-15 stsp err = got_error_from_errno2("openat",
2622 886cec17 2019-12-15 stsp ignorespath);
2623 886cec17 2019-12-15 stsp } else {
2624 886cec17 2019-12-15 stsp ignoresfile = fdopen(fd, "r");
2625 886cec17 2019-12-15 stsp if (ignoresfile == NULL)
2626 886cec17 2019-12-15 stsp err = got_error_from_errno2("fdopen",
2627 886cec17 2019-12-15 stsp ignorespath);
2628 886cec17 2019-12-15 stsp else {
2629 886cec17 2019-12-15 stsp fd = -1;
2630 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
2631 886cec17 2019-12-15 stsp }
2632 886cec17 2019-12-15 stsp }
2633 886cec17 2019-12-15 stsp } else {
2634 886cec17 2019-12-15 stsp ignoresfile = fopen(ignorespath, "r");
2635 886cec17 2019-12-15 stsp if (ignoresfile == NULL) {
2636 886cec17 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
2637 886cec17 2019-12-15 stsp err = got_error_from_errno2("fopen",
2638 886cec17 2019-12-15 stsp ignorespath);
2639 886cec17 2019-12-15 stsp } else
2640 886cec17 2019-12-15 stsp err = read_ignores(ignores, path, ignoresfile);
2641 886cec17 2019-12-15 stsp }
2642 6841da00 2019-08-08 stsp
2643 6841da00 2019-08-08 stsp if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
2644 4e68cba3 2019-11-23 stsp err = got_error_from_errno2("fclose", path);
2645 886cec17 2019-12-15 stsp if (fd != -1 && close(fd) == -1 && err == NULL)
2646 886cec17 2019-12-15 stsp err = got_error_from_errno2("close", path);
2647 6841da00 2019-08-08 stsp free(ignorespath);
2648 6841da00 2019-08-08 stsp return err;
2649 f8d1f275 2019-02-04 stsp }
2650 f8d1f275 2019-02-04 stsp
2651 f8d1f275 2019-02-04 stsp static const struct got_error *
2652 7f91a133 2019-12-13 stsp status_new(void *arg, struct dirent *de, const char *parent_path, int dirfd)
2653 f8d1f275 2019-02-04 stsp {
2654 b72f483a 2019-02-05 stsp const struct got_error *err = NULL;
2655 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg *a = arg;
2656 f8d1f275 2019-02-04 stsp char *path = NULL;
2657 f8d1f275 2019-02-04 stsp
2658 0584f854 2019-04-06 stsp if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2659 0584f854 2019-04-06 stsp return got_error(GOT_ERR_CANCELLED);
2660 0584f854 2019-04-06 stsp
2661 2c201a36 2019-02-10 stsp /* XXX ignore symlinks for now */
2662 2c201a36 2019-02-10 stsp if (de->d_type == DT_LNK)
2663 927df6b7 2019-02-10 stsp return NULL;
2664 927df6b7 2019-02-10 stsp
2665 f8d1f275 2019-02-04 stsp if (parent_path[0]) {
2666 f8d1f275 2019-02-04 stsp if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
2667 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2668 f8d1f275 2019-02-04 stsp } else {
2669 f8d1f275 2019-02-04 stsp path = de->d_name;
2670 f8d1f275 2019-02-04 stsp }
2671 f8d1f275 2019-02-04 stsp
2672 bd8de430 2019-10-04 stsp if (de->d_type == DT_DIR) {
2673 32d2fb48 2019-12-15 stsp int subdirfd = openat(dirfd, de->d_name,
2674 886cec17 2019-12-15 stsp O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
2675 32d2fb48 2019-12-15 stsp if (subdirfd == -1) {
2676 32d2fb48 2019-12-15 stsp if (errno != ENOENT && errno != EACCES)
2677 32d2fb48 2019-12-15 stsp err = got_error_from_errno2("openat", path);
2678 32d2fb48 2019-12-15 stsp } else {
2679 bd8de430 2019-10-04 stsp err = add_ignores(&a->ignores, a->worktree->root_path,
2680 886cec17 2019-12-15 stsp path, subdirfd, ".cvsignore");
2681 886cec17 2019-12-15 stsp if (err == NULL)
2682 886cec17 2019-12-15 stsp err = add_ignores(&a->ignores,
2683 886cec17 2019-12-15 stsp a->worktree->root_path, path,
2684 886cec17 2019-12-15 stsp subdirfd, ".gitignore");
2685 886cec17 2019-12-15 stsp if (close(subdirfd) == -1 && err == NULL)
2686 886cec17 2019-12-15 stsp err = got_error_from_errno2("close", path);
2687 886cec17 2019-12-15 stsp }
2688 886cec17 2019-12-15 stsp } else if (got_path_is_child(path, a->status_path, a->status_path_len)
2689 6841da00 2019-08-08 stsp && !match_ignores(&a->ignores, path))
2690 c577a9ce 2019-07-27 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
2691 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
2692 f8d1f275 2019-02-04 stsp if (parent_path[0])
2693 f8d1f275 2019-02-04 stsp free(path);
2694 b72f483a 2019-02-05 stsp return err;
2695 f8d1f275 2019-02-04 stsp }
2696 f8d1f275 2019-02-04 stsp
2697 347d1d3e 2019-07-12 stsp static const struct got_error *
2698 abb4604f 2019-07-27 stsp report_single_file_status(const char *path, const char *ondisk_path,
2699 abb4604f 2019-07-27 stsp struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
2700 f2a9dc41 2019-12-13 tracey void *status_arg, struct got_repository *repo, int report_unchanged)
2701 abb4604f 2019-07-27 stsp {
2702 abb4604f 2019-07-27 stsp struct got_fileindex_entry *ie;
2703 abb4604f 2019-07-27 stsp struct stat sb;
2704 abb4604f 2019-07-27 stsp
2705 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, path, strlen(path));
2706 abb4604f 2019-07-27 stsp if (ie)
2707 7f91a133 2019-12-13 stsp return report_file_status(ie, ondisk_path, -1, NULL,
2708 7f91a133 2019-12-13 stsp status_cb, status_arg, repo, report_unchanged);
2709 abb4604f 2019-07-27 stsp
2710 abb4604f 2019-07-27 stsp if (lstat(ondisk_path, &sb) == -1) {
2711 abb4604f 2019-07-27 stsp if (errno != ENOENT)
2712 abb4604f 2019-07-27 stsp return got_error_from_errno2("lstat", ondisk_path);
2713 2a06fe5f 2019-08-24 stsp return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
2714 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
2715 abb4604f 2019-07-27 stsp return NULL;
2716 abb4604f 2019-07-27 stsp }
2717 abb4604f 2019-07-27 stsp
2718 abb4604f 2019-07-27 stsp if (S_ISREG(sb.st_mode))
2719 88d0e355 2019-08-03 stsp return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
2720 12463d8b 2019-12-13 stsp GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
2721 abb4604f 2019-07-27 stsp
2722 abb4604f 2019-07-27 stsp return NULL;
2723 abb4604f 2019-07-27 stsp }
2724 abb4604f 2019-07-27 stsp
2725 abb4604f 2019-07-27 stsp static const struct got_error *
2726 347d1d3e 2019-07-12 stsp worktree_status(struct got_worktree *worktree, const char *path,
2727 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex, struct got_repository *repo,
2728 347d1d3e 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
2729 f2a9dc41 2019-12-13 tracey got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
2730 f2a9dc41 2019-12-13 tracey int report_unchanged)
2731 f8d1f275 2019-02-04 stsp {
2732 f8d1f275 2019-02-04 stsp const struct got_error *err = NULL;
2733 6fc93f37 2019-12-13 stsp int fd = -1;
2734 d43a8a88 2019-02-05 stsp struct got_fileindex_diff_dir_cb fdiff_cb;
2735 f8d1f275 2019-02-04 stsp struct diff_dir_cb_arg arg;
2736 927df6b7 2019-02-10 stsp char *ondisk_path = NULL;
2737 f8d1f275 2019-02-04 stsp
2738 927df6b7 2019-02-10 stsp if (asprintf(&ondisk_path, "%s%s%s",
2739 8dc303cc 2019-07-27 stsp worktree->root_path, path[0] ? "/" : "", path) == -1)
2740 8dc303cc 2019-07-27 stsp return got_error_from_errno("asprintf");
2741 8dc303cc 2019-07-27 stsp
2742 6fc93f37 2019-12-13 stsp fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
2743 6fc93f37 2019-12-13 stsp if (fd == -1) {
2744 40b289d7 2019-09-07 stsp if (errno != ENOTDIR && errno != ENOENT && errno != EACCES)
2745 6fc93f37 2019-12-13 stsp err = got_error_from_errno2("open", ondisk_path);
2746 abb4604f 2019-07-27 stsp else
2747 abb4604f 2019-07-27 stsp err = report_single_file_status(path, ondisk_path,
2748 f2a9dc41 2019-12-13 tracey fileindex, status_cb, status_arg, repo,
2749 f2a9dc41 2019-12-13 tracey report_unchanged);
2750 abb4604f 2019-07-27 stsp } else {
2751 abb4604f 2019-07-27 stsp fdiff_cb.diff_old_new = status_old_new;
2752 abb4604f 2019-07-27 stsp fdiff_cb.diff_old = status_old;
2753 abb4604f 2019-07-27 stsp fdiff_cb.diff_new = status_new;
2754 abb4604f 2019-07-27 stsp arg.fileindex = fileindex;
2755 abb4604f 2019-07-27 stsp arg.worktree = worktree;
2756 abb4604f 2019-07-27 stsp arg.status_path = path;
2757 abb4604f 2019-07-27 stsp arg.status_path_len = strlen(path);
2758 abb4604f 2019-07-27 stsp arg.repo = repo;
2759 abb4604f 2019-07-27 stsp arg.status_cb = status_cb;
2760 abb4604f 2019-07-27 stsp arg.status_arg = status_arg;
2761 abb4604f 2019-07-27 stsp arg.cancel_cb = cancel_cb;
2762 abb4604f 2019-07-27 stsp arg.cancel_arg = cancel_arg;
2763 f2a9dc41 2019-12-13 tracey arg.report_unchanged = report_unchanged;
2764 6841da00 2019-08-08 stsp TAILQ_INIT(&arg.ignores);
2765 022fae89 2019-12-06 tracey if (!no_ignores) {
2766 bd8de430 2019-10-04 stsp err = add_ignores(&arg.ignores, worktree->root_path,
2767 886cec17 2019-12-15 stsp path, fd, ".cvsignore");
2768 022fae89 2019-12-06 tracey if (err == NULL)
2769 022fae89 2019-12-06 tracey err = add_ignores(&arg.ignores,
2770 886cec17 2019-12-15 stsp worktree->root_path, path, fd,
2771 886cec17 2019-12-15 stsp ".gitignore");
2772 022fae89 2019-12-06 tracey }
2773 bd8de430 2019-10-04 stsp if (err == NULL)
2774 6fc93f37 2019-12-13 stsp err = got_fileindex_diff_dir(fileindex, fd,
2775 6841da00 2019-08-08 stsp worktree->root_path, path, repo, &fdiff_cb, &arg);
2776 6841da00 2019-08-08 stsp free_ignores(&arg.ignores);
2777 927df6b7 2019-02-10 stsp }
2778 8dc303cc 2019-07-27 stsp
2779 6fc93f37 2019-12-13 stsp if (fd != -1 && close(fd) != 0 && err == NULL)
2780 6fc93f37 2019-12-13 stsp err = got_error_from_errno("close");
2781 927df6b7 2019-02-10 stsp free(ondisk_path);
2782 347d1d3e 2019-07-12 stsp return err;
2783 347d1d3e 2019-07-12 stsp }
2784 347d1d3e 2019-07-12 stsp
2785 347d1d3e 2019-07-12 stsp const struct got_error *
2786 72ea6654 2019-07-27 stsp got_worktree_status(struct got_worktree *worktree,
2787 72ea6654 2019-07-27 stsp struct got_pathlist_head *paths, struct got_repository *repo,
2788 72ea6654 2019-07-27 stsp got_worktree_status_cb status_cb, void *status_arg,
2789 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
2790 347d1d3e 2019-07-12 stsp {
2791 347d1d3e 2019-07-12 stsp const struct got_error *err = NULL;
2792 347d1d3e 2019-07-12 stsp char *fileindex_path = NULL;
2793 347d1d3e 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
2794 72ea6654 2019-07-27 stsp struct got_pathlist_entry *pe;
2795 347d1d3e 2019-07-12 stsp
2796 347d1d3e 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2797 347d1d3e 2019-07-12 stsp if (err)
2798 347d1d3e 2019-07-12 stsp return err;
2799 347d1d3e 2019-07-12 stsp
2800 72ea6654 2019-07-27 stsp TAILQ_FOREACH(pe, paths, entry) {
2801 72ea6654 2019-07-27 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
2802 f2a9dc41 2019-12-13 tracey status_cb, status_arg, cancel_cb, cancel_arg, 0, 0);
2803 72ea6654 2019-07-27 stsp if (err)
2804 72ea6654 2019-07-27 stsp break;
2805 72ea6654 2019-07-27 stsp }
2806 f8d1f275 2019-02-04 stsp free(fileindex_path);
2807 f8d1f275 2019-02-04 stsp got_fileindex_free(fileindex);
2808 f8d1f275 2019-02-04 stsp return err;
2809 f8d1f275 2019-02-04 stsp }
2810 6c7ab921 2019-03-18 stsp
2811 6c7ab921 2019-03-18 stsp const struct got_error *
2812 6c7ab921 2019-03-18 stsp got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
2813 6c7ab921 2019-03-18 stsp const char *arg)
2814 6c7ab921 2019-03-18 stsp {
2815 6c7ab921 2019-03-18 stsp const struct got_error *err = NULL;
2816 d0710d08 2019-07-22 stsp char *resolved, *cwd = NULL, *path = NULL;
2817 6c7ab921 2019-03-18 stsp size_t len;
2818 6c7ab921 2019-03-18 stsp
2819 6c7ab921 2019-03-18 stsp *wt_path = NULL;
2820 6c7ab921 2019-03-18 stsp
2821 6c7ab921 2019-03-18 stsp resolved = realpath(arg, NULL);
2822 d0710d08 2019-07-22 stsp if (resolved == NULL) {
2823 d0710d08 2019-07-22 stsp if (errno != ENOENT)
2824 d0710d08 2019-07-22 stsp return got_error_from_errno2("realpath", arg);
2825 d0710d08 2019-07-22 stsp cwd = getcwd(NULL, 0);
2826 d0710d08 2019-07-22 stsp if (cwd == NULL)
2827 d0710d08 2019-07-22 stsp return got_error_from_errno("getcwd");
2828 d0710d08 2019-07-22 stsp if (asprintf(&resolved, "%s/%s", cwd, arg) == -1) {
2829 d0710d08 2019-07-22 stsp err = got_error_from_errno("asprintf");
2830 d0710d08 2019-07-22 stsp goto done;
2831 d0710d08 2019-07-22 stsp }
2832 d0710d08 2019-07-22 stsp }
2833 6c7ab921 2019-03-18 stsp
2834 6c7ab921 2019-03-18 stsp if (strncmp(got_worktree_get_root_path(worktree), resolved,
2835 6c7ab921 2019-03-18 stsp strlen(got_worktree_get_root_path(worktree)))) {
2836 63f810e6 2020-02-29 stsp err = got_error_path(resolved, GOT_ERR_BAD_PATH);
2837 6c7ab921 2019-03-18 stsp goto done;
2838 6c7ab921 2019-03-18 stsp }
2839 6c7ab921 2019-03-18 stsp
2840 f6d88e1a 2019-05-29 stsp if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
2841 f6d88e1a 2019-05-29 stsp err = got_path_skip_common_ancestor(&path,
2842 f6d88e1a 2019-05-29 stsp got_worktree_get_root_path(worktree), resolved);
2843 f6d88e1a 2019-05-29 stsp if (err)
2844 f6d88e1a 2019-05-29 stsp goto done;
2845 f6d88e1a 2019-05-29 stsp } else {
2846 f6d88e1a 2019-05-29 stsp path = strdup("");
2847 f6d88e1a 2019-05-29 stsp if (path == NULL) {
2848 f6d88e1a 2019-05-29 stsp err = got_error_from_errno("strdup");
2849 f6d88e1a 2019-05-29 stsp goto done;
2850 f6d88e1a 2019-05-29 stsp }
2851 6c7ab921 2019-03-18 stsp }
2852 6c7ab921 2019-03-18 stsp
2853 6c7ab921 2019-03-18 stsp /* XXX status walk can't deal with trailing slash! */
2854 6c7ab921 2019-03-18 stsp len = strlen(path);
2855 3f17dee4 2019-07-27 stsp while (len > 0 && path[len - 1] == '/') {
2856 6c7ab921 2019-03-18 stsp path[len - 1] = '\0';
2857 6c7ab921 2019-03-18 stsp len--;
2858 6c7ab921 2019-03-18 stsp }
2859 6c7ab921 2019-03-18 stsp done:
2860 6c7ab921 2019-03-18 stsp free(resolved);
2861 d0710d08 2019-07-22 stsp free(cwd);
2862 6c7ab921 2019-03-18 stsp if (err == NULL)
2863 6c7ab921 2019-03-18 stsp *wt_path = path;
2864 6c7ab921 2019-03-18 stsp else
2865 6c7ab921 2019-03-18 stsp free(path);
2866 d00136be 2019-03-26 stsp return err;
2867 d00136be 2019-03-26 stsp }
2868 d00136be 2019-03-26 stsp
2869 4e68cba3 2019-11-23 stsp struct schedule_addition_args {
2870 4e68cba3 2019-11-23 stsp struct got_worktree *worktree;
2871 4e68cba3 2019-11-23 stsp struct got_fileindex *fileindex;
2872 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb;
2873 4e68cba3 2019-11-23 stsp void *progress_arg;
2874 4e68cba3 2019-11-23 stsp struct got_repository *repo;
2875 4e68cba3 2019-11-23 stsp };
2876 4e68cba3 2019-11-23 stsp
2877 4e68cba3 2019-11-23 stsp static const struct got_error *
2878 4e68cba3 2019-11-23 stsp schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
2879 4e68cba3 2019-11-23 stsp const char *relpath, struct got_object_id *blob_id,
2880 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
2881 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
2882 07f5b47a 2019-06-02 stsp {
2883 4e68cba3 2019-11-23 stsp struct schedule_addition_args *a = arg;
2884 07f5b47a 2019-06-02 stsp const struct got_error *err = NULL;
2885 07f5b47a 2019-06-02 stsp struct got_fileindex_entry *ie;
2886 6d022e97 2019-08-04 stsp struct stat sb;
2887 dbb83fbd 2019-12-12 stsp char *ondisk_path;
2888 07f5b47a 2019-06-02 stsp
2889 dbb83fbd 2019-12-12 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2890 dbb83fbd 2019-12-12 stsp relpath) == -1)
2891 dbb83fbd 2019-12-12 stsp return got_error_from_errno("asprintf");
2892 dbb83fbd 2019-12-12 stsp
2893 4e68cba3 2019-11-23 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
2894 6d022e97 2019-08-04 stsp if (ie) {
2895 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
2896 12463d8b 2019-12-13 stsp de_name, a->repo);
2897 6d022e97 2019-08-04 stsp if (err)
2898 dbb83fbd 2019-12-12 stsp goto done;
2899 6d022e97 2019-08-04 stsp /* Re-adding an existing entry is a no-op. */
2900 6d022e97 2019-08-04 stsp if (status == GOT_STATUS_ADD)
2901 dbb83fbd 2019-12-12 stsp goto done;
2902 dbb83fbd 2019-12-12 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
2903 dbb83fbd 2019-12-12 stsp if (err)
2904 dbb83fbd 2019-12-12 stsp goto done;
2905 6d022e97 2019-08-04 stsp }
2906 07f5b47a 2019-06-02 stsp
2907 dbb83fbd 2019-12-12 stsp if (status != GOT_STATUS_UNVERSIONED) {
2908 dbb83fbd 2019-12-12 stsp err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
2909 dbb83fbd 2019-12-12 stsp goto done;
2910 4e68cba3 2019-11-23 stsp }
2911 07f5b47a 2019-06-02 stsp
2912 dbb83fbd 2019-12-12 stsp err = got_fileindex_entry_alloc(&ie, ondisk_path, relpath, NULL, NULL);
2913 4e68cba3 2019-11-23 stsp if (err)
2914 4e68cba3 2019-11-23 stsp goto done;
2915 4e68cba3 2019-11-23 stsp
2916 4e68cba3 2019-11-23 stsp err = got_fileindex_entry_add(a->fileindex, ie);
2917 07f5b47a 2019-06-02 stsp if (err) {
2918 07f5b47a 2019-06-02 stsp got_fileindex_entry_free(ie);
2919 4e68cba3 2019-11-23 stsp goto done;
2920 07f5b47a 2019-06-02 stsp }
2921 4e68cba3 2019-11-23 stsp done:
2922 dbb83fbd 2019-12-12 stsp free(ondisk_path);
2923 dbb83fbd 2019-12-12 stsp if (err)
2924 dbb83fbd 2019-12-12 stsp return err;
2925 dbb83fbd 2019-12-12 stsp if (status == GOT_STATUS_ADD)
2926 dbb83fbd 2019-12-12 stsp return NULL;
2927 dbb83fbd 2019-12-12 stsp return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
2928 07f5b47a 2019-06-02 stsp }
2929 07f5b47a 2019-06-02 stsp
2930 d00136be 2019-03-26 stsp const struct got_error *
2931 031a5338 2019-03-26 stsp got_worktree_schedule_add(struct got_worktree *worktree,
2932 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths,
2933 4e68cba3 2019-11-23 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
2934 022fae89 2019-12-06 tracey struct got_repository *repo, int no_ignores)
2935 d00136be 2019-03-26 stsp {
2936 d00136be 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
2937 9c6338c4 2019-06-02 stsp char *fileindex_path = NULL;
2938 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
2939 1dd54920 2019-05-11 stsp struct got_pathlist_entry *pe;
2940 4e68cba3 2019-11-23 stsp struct schedule_addition_args saa;
2941 d00136be 2019-03-26 stsp
2942 d00136be 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
2943 d00136be 2019-03-26 stsp if (err)
2944 d00136be 2019-03-26 stsp return err;
2945 d00136be 2019-03-26 stsp
2946 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
2947 d00136be 2019-03-26 stsp if (err)
2948 d00136be 2019-03-26 stsp goto done;
2949 d00136be 2019-03-26 stsp
2950 4e68cba3 2019-11-23 stsp saa.worktree = worktree;
2951 4e68cba3 2019-11-23 stsp saa.fileindex = fileindex;
2952 4e68cba3 2019-11-23 stsp saa.progress_cb = progress_cb;
2953 4e68cba3 2019-11-23 stsp saa.progress_arg = progress_arg;
2954 4e68cba3 2019-11-23 stsp saa.repo = repo;
2955 4e68cba3 2019-11-23 stsp
2956 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
2957 4e68cba3 2019-11-23 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
2958 f2a9dc41 2019-12-13 tracey schedule_addition, &saa, NULL, NULL, no_ignores, 0);
2959 1dd54920 2019-05-11 stsp if (err)
2960 af12c6b9 2019-06-04 stsp break;
2961 1dd54920 2019-05-11 stsp }
2962 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
2963 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
2964 af12c6b9 2019-06-04 stsp err = sync_err;
2965 d00136be 2019-03-26 stsp done:
2966 fb399478 2019-07-12 stsp free(fileindex_path);
2967 d00136be 2019-03-26 stsp if (fileindex)
2968 d00136be 2019-03-26 stsp got_fileindex_free(fileindex);
2969 d00136be 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
2970 d00136be 2019-03-26 stsp if (unlockerr && err == NULL)
2971 d00136be 2019-03-26 stsp err = unlockerr;
2972 6c7ab921 2019-03-18 stsp return err;
2973 6c7ab921 2019-03-18 stsp }
2974 17ed4618 2019-06-02 stsp
2975 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args {
2976 f2a9dc41 2019-12-13 tracey struct got_worktree *worktree;
2977 f2a9dc41 2019-12-13 tracey struct got_fileindex *fileindex;
2978 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb;
2979 f2a9dc41 2019-12-13 tracey void *progress_arg;
2980 f2a9dc41 2019-12-13 tracey struct got_repository *repo;
2981 f2a9dc41 2019-12-13 tracey int delete_local_mods;
2982 70e3e7f5 2019-12-13 tracey int keep_on_disk;
2983 f2a9dc41 2019-12-13 tracey };
2984 f2a9dc41 2019-12-13 tracey
2985 f2a9dc41 2019-12-13 tracey static const struct got_error *
2986 f2a9dc41 2019-12-13 tracey schedule_for_deletion(void *arg, unsigned char status,
2987 f2a9dc41 2019-12-13 tracey unsigned char staged_status, const char *relpath,
2988 f2a9dc41 2019-12-13 tracey struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
2989 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
2990 17ed4618 2019-06-02 stsp {
2991 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args *a = arg;
2992 17ed4618 2019-06-02 stsp const struct got_error *err = NULL;
2993 17ed4618 2019-06-02 stsp struct got_fileindex_entry *ie = NULL;
2994 17ed4618 2019-06-02 stsp struct stat sb;
2995 15341bfd 2020-03-05 tracey char *ondisk_path, *parent = NULL;
2996 17ed4618 2019-06-02 stsp
2997 f2a9dc41 2019-12-13 tracey ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
2998 17ed4618 2019-06-02 stsp if (ie == NULL)
2999 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
3000 2ec1f75b 2019-03-26 stsp
3001 9acbc4fa 2019-08-03 stsp staged_status = get_staged_status(ie);
3002 9acbc4fa 2019-08-03 stsp if (staged_status != GOT_STATUS_NO_CHANGE) {
3003 9acbc4fa 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
3004 9acbc4fa 2019-08-03 stsp return NULL;
3005 9acbc4fa 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STAGED);
3006 9acbc4fa 2019-08-03 stsp }
3007 9acbc4fa 2019-08-03 stsp
3008 f2a9dc41 2019-12-13 tracey if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3009 f2a9dc41 2019-12-13 tracey relpath) == -1)
3010 f2a9dc41 2019-12-13 tracey return got_error_from_errno("asprintf");
3011 f2a9dc41 2019-12-13 tracey
3012 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
3013 12463d8b 2019-12-13 stsp a->repo);
3014 17ed4618 2019-06-02 stsp if (err)
3015 f2a9dc41 2019-12-13 tracey goto done;
3016 17ed4618 2019-06-02 stsp
3017 17ed4618 2019-06-02 stsp if (status != GOT_STATUS_NO_CHANGE) {
3018 17ed4618 2019-06-02 stsp if (status == GOT_STATUS_DELETE)
3019 f2a9dc41 2019-12-13 tracey goto done;
3020 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
3021 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
3022 f2a9dc41 2019-12-13 tracey goto done;
3023 f2a9dc41 2019-12-13 tracey }
3024 f2a9dc41 2019-12-13 tracey if (status != GOT_STATUS_MODIFY &&
3025 f2a9dc41 2019-12-13 tracey status != GOT_STATUS_MISSING) {
3026 f2a9dc41 2019-12-13 tracey err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3027 f2a9dc41 2019-12-13 tracey goto done;
3028 f2a9dc41 2019-12-13 tracey }
3029 17ed4618 2019-06-02 stsp }
3030 17ed4618 2019-06-02 stsp
3031 70e3e7f5 2019-12-13 tracey if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
3032 12463d8b 2019-12-13 stsp if (dirfd != -1) {
3033 12463d8b 2019-12-13 stsp if (unlinkat(dirfd, de_name, 0) != 0) {
3034 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlinkat",
3035 12463d8b 2019-12-13 stsp ondisk_path);
3036 12463d8b 2019-12-13 stsp goto done;
3037 12463d8b 2019-12-13 stsp }
3038 12463d8b 2019-12-13 stsp } else if (unlink(ondisk_path) != 0) {
3039 12463d8b 2019-12-13 stsp err = got_error_from_errno2("unlink", ondisk_path);
3040 12463d8b 2019-12-13 stsp goto done;
3041 15341bfd 2020-03-05 tracey }
3042 15341bfd 2020-03-05 tracey
3043 15341bfd 2020-03-05 tracey parent = dirname(ondisk_path);
3044 15341bfd 2020-03-05 tracey
3045 15341bfd 2020-03-05 tracey if (parent == NULL) {
3046 15341bfd 2020-03-05 tracey err = got_error_from_errno2("dirname", ondisk_path);
3047 15341bfd 2020-03-05 tracey goto done;
3048 15341bfd 2020-03-05 tracey }
3049 15341bfd 2020-03-05 tracey while (parent && strcmp(parent, a->worktree->root_path) != 0) {
3050 15341bfd 2020-03-05 tracey if (rmdir(parent) == -1) {
3051 15341bfd 2020-03-05 tracey if (errno != ENOTEMPTY)
3052 15341bfd 2020-03-05 tracey err = got_error_from_errno2("rmdir",
3053 15341bfd 2020-03-05 tracey parent);
3054 15341bfd 2020-03-05 tracey break;
3055 15341bfd 2020-03-05 tracey }
3056 15341bfd 2020-03-05 tracey parent = dirname(parent);
3057 15341bfd 2020-03-05 tracey if (parent == NULL) {
3058 15341bfd 2020-03-05 tracey err = got_error_from_errno2("dirname", parent);
3059 15341bfd 2020-03-05 tracey goto done;
3060 15341bfd 2020-03-05 tracey }
3061 12463d8b 2019-12-13 stsp }
3062 f2a9dc41 2019-12-13 tracey }
3063 17ed4618 2019-06-02 stsp
3064 17ed4618 2019-06-02 stsp got_fileindex_entry_mark_deleted_from_disk(ie);
3065 f2a9dc41 2019-12-13 tracey done:
3066 f2a9dc41 2019-12-13 tracey free(ondisk_path);
3067 f2a9dc41 2019-12-13 tracey if (err)
3068 f2a9dc41 2019-12-13 tracey return err;
3069 f2a9dc41 2019-12-13 tracey if (status == GOT_STATUS_DELETE)
3070 f2a9dc41 2019-12-13 tracey return NULL;
3071 f2a9dc41 2019-12-13 tracey return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
3072 f2a9dc41 2019-12-13 tracey staged_status, relpath);
3073 17ed4618 2019-06-02 stsp }
3074 17ed4618 2019-06-02 stsp
3075 2ec1f75b 2019-03-26 stsp const struct got_error *
3076 2ec1f75b 2019-03-26 stsp got_worktree_schedule_delete(struct got_worktree *worktree,
3077 6d022e97 2019-08-04 stsp struct got_pathlist_head *paths, int delete_local_mods,
3078 f2a9dc41 2019-12-13 tracey got_worktree_delete_cb progress_cb, void *progress_arg,
3079 70e3e7f5 2019-12-13 tracey struct got_repository *repo, int keep_on_disk)
3080 2ec1f75b 2019-03-26 stsp {
3081 2ec1f75b 2019-03-26 stsp struct got_fileindex *fileindex = NULL;
3082 17ed4618 2019-06-02 stsp char *fileindex_path = NULL;
3083 af12c6b9 2019-06-04 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
3084 17ed4618 2019-06-02 stsp struct got_pathlist_entry *pe;
3085 f2a9dc41 2019-12-13 tracey struct schedule_deletion_args sda;
3086 2ec1f75b 2019-03-26 stsp
3087 2ec1f75b 2019-03-26 stsp err = lock_worktree(worktree, LOCK_EX);
3088 2ec1f75b 2019-03-26 stsp if (err)
3089 2ec1f75b 2019-03-26 stsp return err;
3090 2ec1f75b 2019-03-26 stsp
3091 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3092 2ec1f75b 2019-03-26 stsp if (err)
3093 2ec1f75b 2019-03-26 stsp goto done;
3094 f2a9dc41 2019-12-13 tracey
3095 f2a9dc41 2019-12-13 tracey sda.worktree = worktree;
3096 f2a9dc41 2019-12-13 tracey sda.fileindex = fileindex;
3097 f2a9dc41 2019-12-13 tracey sda.progress_cb = progress_cb;
3098 f2a9dc41 2019-12-13 tracey sda.progress_arg = progress_arg;
3099 f2a9dc41 2019-12-13 tracey sda.repo = repo;
3100 f2a9dc41 2019-12-13 tracey sda.delete_local_mods = delete_local_mods;
3101 70e3e7f5 2019-12-13 tracey sda.keep_on_disk = keep_on_disk;
3102 2ec1f75b 2019-03-26 stsp
3103 6d022e97 2019-08-04 stsp TAILQ_FOREACH(pe, paths, entry) {
3104 f2a9dc41 2019-12-13 tracey err = worktree_status(worktree, pe->path, fileindex, repo,
3105 f2a9dc41 2019-12-13 tracey schedule_for_deletion, &sda, NULL, NULL, 0, 1);
3106 17ed4618 2019-06-02 stsp if (err)
3107 af12c6b9 2019-06-04 stsp break;
3108 2ec1f75b 2019-03-26 stsp }
3109 af12c6b9 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3110 af12c6b9 2019-06-04 stsp if (sync_err && err == NULL)
3111 af12c6b9 2019-06-04 stsp err = sync_err;
3112 2ec1f75b 2019-03-26 stsp done:
3113 fb399478 2019-07-12 stsp free(fileindex_path);
3114 2ec1f75b 2019-03-26 stsp if (fileindex)
3115 2ec1f75b 2019-03-26 stsp got_fileindex_free(fileindex);
3116 2ec1f75b 2019-03-26 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3117 2ec1f75b 2019-03-26 stsp if (unlockerr && err == NULL)
3118 2ec1f75b 2019-03-26 stsp err = unlockerr;
3119 33aa809d 2019-08-08 stsp return err;
3120 33aa809d 2019-08-08 stsp }
3121 33aa809d 2019-08-08 stsp
3122 33aa809d 2019-08-08 stsp static const struct got_error *
3123 33aa809d 2019-08-08 stsp copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
3124 33aa809d 2019-08-08 stsp {
3125 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
3126 33aa809d 2019-08-08 stsp char *line = NULL;
3127 33aa809d 2019-08-08 stsp size_t linesize = 0, n;
3128 33aa809d 2019-08-08 stsp ssize_t linelen;
3129 33aa809d 2019-08-08 stsp
3130 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, infile);
3131 33aa809d 2019-08-08 stsp if (linelen == -1) {
3132 33aa809d 2019-08-08 stsp if (ferror(infile)) {
3133 33aa809d 2019-08-08 stsp err = got_error_from_errno("getline");
3134 33aa809d 2019-08-08 stsp goto done;
3135 33aa809d 2019-08-08 stsp }
3136 33aa809d 2019-08-08 stsp return NULL;
3137 33aa809d 2019-08-08 stsp }
3138 33aa809d 2019-08-08 stsp if (outfile) {
3139 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, outfile);
3140 33aa809d 2019-08-08 stsp if (n != linelen) {
3141 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
3142 33aa809d 2019-08-08 stsp goto done;
3143 33aa809d 2019-08-08 stsp }
3144 33aa809d 2019-08-08 stsp }
3145 33aa809d 2019-08-08 stsp if (rejectfile) {
3146 33aa809d 2019-08-08 stsp n = fwrite(line, 1, linelen, rejectfile);
3147 33aa809d 2019-08-08 stsp if (n != linelen)
3148 33aa809d 2019-08-08 stsp err = got_ferror(outfile, GOT_ERR_IO);
3149 33aa809d 2019-08-08 stsp }
3150 33aa809d 2019-08-08 stsp done:
3151 33aa809d 2019-08-08 stsp free(line);
3152 2ec1f75b 2019-03-26 stsp return err;
3153 2ec1f75b 2019-03-26 stsp }
3154 1f1abb7e 2019-08-08 stsp
3155 33aa809d 2019-08-08 stsp static const struct got_error *
3156 33aa809d 2019-08-08 stsp skip_one_line(FILE *f)
3157 33aa809d 2019-08-08 stsp {
3158 33aa809d 2019-08-08 stsp char *line = NULL;
3159 33aa809d 2019-08-08 stsp size_t linesize = 0;
3160 33aa809d 2019-08-08 stsp ssize_t linelen;
3161 33aa809d 2019-08-08 stsp
3162 33aa809d 2019-08-08 stsp linelen = getline(&line, &linesize, f);
3163 500467ff 2019-09-25 hiltjo if (linelen == -1) {
3164 500467ff 2019-09-25 hiltjo if (ferror(f))
3165 500467ff 2019-09-25 hiltjo return got_error_from_errno("getline");
3166 500467ff 2019-09-25 hiltjo return NULL;
3167 500467ff 2019-09-25 hiltjo }
3168 33aa809d 2019-08-08 stsp free(line);
3169 33aa809d 2019-08-08 stsp return NULL;
3170 33aa809d 2019-08-08 stsp }
3171 33aa809d 2019-08-08 stsp
3172 33aa809d 2019-08-08 stsp static const struct got_error *
3173 33aa809d 2019-08-08 stsp copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
3174 33aa809d 2019-08-08 stsp int start_old, int end_old, int start_new, int end_new,
3175 33aa809d 2019-08-08 stsp FILE *outfile, FILE *rejectfile)
3176 33aa809d 2019-08-08 stsp {
3177 33aa809d 2019-08-08 stsp const struct got_error *err;
3178 33aa809d 2019-08-08 stsp
3179 33aa809d 2019-08-08 stsp /* Copy old file's lines leading up to patch. */
3180 33aa809d 2019-08-08 stsp while (!feof(f1) && *line_cur1 < start_old) {
3181 33aa809d 2019-08-08 stsp err = copy_one_line(f1, outfile, NULL);
3182 33aa809d 2019-08-08 stsp if (err)
3183 33aa809d 2019-08-08 stsp return err;
3184 33aa809d 2019-08-08 stsp (*line_cur1)++;
3185 33aa809d 2019-08-08 stsp }
3186 33aa809d 2019-08-08 stsp /* Skip new file's lines leading up to patch. */
3187 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 < start_new) {
3188 33aa809d 2019-08-08 stsp if (rejectfile)
3189 33aa809d 2019-08-08 stsp err = copy_one_line(f2, NULL, rejectfile);
3190 33aa809d 2019-08-08 stsp else
3191 33aa809d 2019-08-08 stsp err = skip_one_line(f2);
3192 33aa809d 2019-08-08 stsp if (err)
3193 33aa809d 2019-08-08 stsp return err;
3194 33aa809d 2019-08-08 stsp (*line_cur2)++;
3195 33aa809d 2019-08-08 stsp }
3196 33aa809d 2019-08-08 stsp /* Copy patched lines. */
3197 33aa809d 2019-08-08 stsp while (!feof(f2) && *line_cur2 <= end_new) {
3198 33aa809d 2019-08-08 stsp err = copy_one_line(f2, outfile, NULL);
3199 33aa809d 2019-08-08 stsp if (err)
3200 33aa809d 2019-08-08 stsp return err;
3201 33aa809d 2019-08-08 stsp (*line_cur2)++;
3202 33aa809d 2019-08-08 stsp }
3203 33aa809d 2019-08-08 stsp /* Skip over old file's replaced lines. */
3204 f1e81a05 2019-08-10 stsp while (!feof(f1) && *line_cur1 <= end_old) {
3205 33aa809d 2019-08-08 stsp if (rejectfile)
3206 33aa809d 2019-08-08 stsp err = copy_one_line(f1, NULL, rejectfile);
3207 33aa809d 2019-08-08 stsp else
3208 33aa809d 2019-08-08 stsp err = skip_one_line(f1);
3209 33aa809d 2019-08-08 stsp if (err)
3210 33aa809d 2019-08-08 stsp return err;
3211 33aa809d 2019-08-08 stsp (*line_cur1)++;
3212 33aa809d 2019-08-08 stsp }
3213 f1e81a05 2019-08-10 stsp
3214 f1e81a05 2019-08-10 stsp return NULL;
3215 f1e81a05 2019-08-10 stsp }
3216 f1e81a05 2019-08-10 stsp
3217 f1e81a05 2019-08-10 stsp static const struct got_error *
3218 f1e81a05 2019-08-10 stsp copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
3219 f1e81a05 2019-08-10 stsp FILE *outfile, FILE *rejectfile)
3220 f1e81a05 2019-08-10 stsp {
3221 f1e81a05 2019-08-10 stsp const struct got_error *err;
3222 f1e81a05 2019-08-10 stsp
3223 f1e81a05 2019-08-10 stsp if (outfile) {
3224 f1e81a05 2019-08-10 stsp /* Copy old file's lines until EOF. */
3225 f1e81a05 2019-08-10 stsp while (!feof(f1)) {
3226 f1e81a05 2019-08-10 stsp err = copy_one_line(f1, outfile, NULL);
3227 f1e81a05 2019-08-10 stsp if (err)
3228 f1e81a05 2019-08-10 stsp return err;
3229 f1e81a05 2019-08-10 stsp (*line_cur1)++;
3230 f1e81a05 2019-08-10 stsp }
3231 f1e81a05 2019-08-10 stsp }
3232 f1e81a05 2019-08-10 stsp if (rejectfile) {
3233 f1e81a05 2019-08-10 stsp /* Copy new file's lines until EOF. */
3234 f1e81a05 2019-08-10 stsp while (!feof(f2)) {
3235 f1e81a05 2019-08-10 stsp err = copy_one_line(f2, NULL, rejectfile);
3236 f1e81a05 2019-08-10 stsp if (err)
3237 f1e81a05 2019-08-10 stsp return err;
3238 f1e81a05 2019-08-10 stsp (*line_cur2)++;
3239 f1e81a05 2019-08-10 stsp }
3240 33aa809d 2019-08-08 stsp }
3241 33aa809d 2019-08-08 stsp
3242 33aa809d 2019-08-08 stsp return NULL;
3243 33aa809d 2019-08-08 stsp }
3244 33aa809d 2019-08-08 stsp
3245 33aa809d 2019-08-08 stsp static const struct got_error *
3246 33aa809d 2019-08-08 stsp apply_or_reject_change(int *choice, struct got_diff_change *change, int n,
3247 33aa809d 2019-08-08 stsp int nchanges, struct got_diff_state *ds, struct got_diff_args *args,
3248 33aa809d 2019-08-08 stsp int diff_flags, const char *relpath, FILE *f1, FILE *f2, int *line_cur1,
3249 33aa809d 2019-08-08 stsp int *line_cur2, FILE *outfile, FILE *rejectfile,
3250 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
3251 33aa809d 2019-08-08 stsp {
3252 33aa809d 2019-08-08 stsp const struct got_error *err = NULL;
3253 33aa809d 2019-08-08 stsp int start_old = change->cv.a;
3254 33aa809d 2019-08-08 stsp int end_old = change->cv.b;
3255 33aa809d 2019-08-08 stsp int start_new = change->cv.c;
3256 33aa809d 2019-08-08 stsp int end_new = change->cv.d;
3257 33aa809d 2019-08-08 stsp long pos1, pos2;
3258 33aa809d 2019-08-08 stsp FILE *hunkfile;
3259 33aa809d 2019-08-08 stsp
3260 33aa809d 2019-08-08 stsp *choice = GOT_PATCH_CHOICE_NONE;
3261 33aa809d 2019-08-08 stsp
3262 33aa809d 2019-08-08 stsp hunkfile = got_opentemp();
3263 33aa809d 2019-08-08 stsp if (hunkfile == NULL)
3264 33aa809d 2019-08-08 stsp return got_error_from_errno("got_opentemp");
3265 33aa809d 2019-08-08 stsp
3266 33aa809d 2019-08-08 stsp pos1 = ftell(f1);
3267 33aa809d 2019-08-08 stsp pos2 = ftell(f2);
3268 33aa809d 2019-08-08 stsp
3269 33aa809d 2019-08-08 stsp /* XXX TODO needs error checking */
3270 33aa809d 2019-08-08 stsp got_diff_dump_change(hunkfile, change, ds, args, f1, f2, diff_flags);
3271 33aa809d 2019-08-08 stsp
3272 33aa809d 2019-08-08 stsp if (fseek(f1, pos1, SEEK_SET) == -1) {
3273 33aa809d 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
3274 33aa809d 2019-08-08 stsp goto done;
3275 33aa809d 2019-08-08 stsp }
3276 33aa809d 2019-08-08 stsp if (fseek(f2, pos2, SEEK_SET) == -1) {
3277 33aa809d 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
3278 33aa809d 2019-08-08 stsp goto done;
3279 33aa809d 2019-08-08 stsp }
3280 33aa809d 2019-08-08 stsp if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
3281 33aa809d 2019-08-08 stsp err = got_ferror(hunkfile, GOT_ERR_IO);
3282 33aa809d 2019-08-08 stsp goto done;
3283 33aa809d 2019-08-08 stsp }
3284 33aa809d 2019-08-08 stsp
3285 33aa809d 2019-08-08 stsp err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
3286 33aa809d 2019-08-08 stsp hunkfile, n, nchanges);
3287 33aa809d 2019-08-08 stsp if (err)
3288 33aa809d 2019-08-08 stsp goto done;
3289 33aa809d 2019-08-08 stsp
3290 33aa809d 2019-08-08 stsp switch (*choice) {
3291 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_YES:
3292 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
3293 33aa809d 2019-08-08 stsp end_old, start_new, end_new, outfile, rejectfile);
3294 33aa809d 2019-08-08 stsp break;
3295 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_NO:
3296 33aa809d 2019-08-08 stsp err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
3297 33aa809d 2019-08-08 stsp end_old, start_new, end_new, rejectfile, outfile);
3298 33aa809d 2019-08-08 stsp break;
3299 33aa809d 2019-08-08 stsp case GOT_PATCH_CHOICE_QUIT:
3300 33aa809d 2019-08-08 stsp break;
3301 33aa809d 2019-08-08 stsp default:
3302 33aa809d 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
3303 33aa809d 2019-08-08 stsp break;
3304 33aa809d 2019-08-08 stsp }
3305 33aa809d 2019-08-08 stsp done:
3306 33aa809d 2019-08-08 stsp if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
3307 33aa809d 2019-08-08 stsp err = got_error_from_errno("fclose");
3308 33aa809d 2019-08-08 stsp return err;
3309 33aa809d 2019-08-08 stsp }
3310 33aa809d 2019-08-08 stsp
3311 1f1abb7e 2019-08-08 stsp struct revert_file_args {
3312 1f1abb7e 2019-08-08 stsp struct got_worktree *worktree;
3313 1f1abb7e 2019-08-08 stsp struct got_fileindex *fileindex;
3314 1f1abb7e 2019-08-08 stsp got_worktree_checkout_cb progress_cb;
3315 1f1abb7e 2019-08-08 stsp void *progress_arg;
3316 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb;
3317 33aa809d 2019-08-08 stsp void *patch_arg;
3318 1f1abb7e 2019-08-08 stsp struct got_repository *repo;
3319 1f1abb7e 2019-08-08 stsp };
3320 a129376b 2019-03-28 stsp
3321 e20a8b6f 2019-06-04 stsp static const struct got_error *
3322 e635744c 2019-08-08 stsp create_patched_content(char **path_outfile, int reverse_patch,
3323 e635744c 2019-08-08 stsp struct got_object_id *blob_id, const char *path2,
3324 12463d8b 2019-12-13 stsp int dirfd2, const char *de_name2,
3325 e635744c 2019-08-08 stsp const char *relpath, struct got_repository *repo,
3326 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
3327 33aa809d 2019-08-08 stsp {
3328 33aa809d 2019-08-08 stsp const struct got_error *err;
3329 33aa809d 2019-08-08 stsp struct got_blob_object *blob = NULL;
3330 33aa809d 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
3331 1ebedb77 2019-10-19 stsp int fd2 = -1;
3332 33aa809d 2019-08-08 stsp char *path1 = NULL, *id_str = NULL;
3333 33aa809d 2019-08-08 stsp struct stat sb1, sb2;
3334 33aa809d 2019-08-08 stsp struct got_diff_changes *changes = NULL;
3335 33aa809d 2019-08-08 stsp struct got_diff_state *ds = NULL;
3336 33aa809d 2019-08-08 stsp struct got_diff_args *args = NULL;
3337 33aa809d 2019-08-08 stsp struct got_diff_change *change;
3338 33aa809d 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, have_content = 0;
3339 33aa809d 2019-08-08 stsp int n = 0;
3340 33aa809d 2019-08-08 stsp
3341 33aa809d 2019-08-08 stsp *path_outfile = NULL;
3342 33aa809d 2019-08-08 stsp
3343 33aa809d 2019-08-08 stsp err = got_object_id_str(&id_str, blob_id);
3344 33aa809d 2019-08-08 stsp if (err)
3345 33aa809d 2019-08-08 stsp return err;
3346 33aa809d 2019-08-08 stsp
3347 12463d8b 2019-12-13 stsp if (dirfd2 != -1) {
3348 12463d8b 2019-12-13 stsp fd2 = openat(dirfd2, de_name2, O_RDONLY | O_NOFOLLOW);
3349 12463d8b 2019-12-13 stsp if (fd2 == -1) {
3350 12463d8b 2019-12-13 stsp err = got_error_from_errno2("openat", path2);
3351 12463d8b 2019-12-13 stsp goto done;
3352 12463d8b 2019-12-13 stsp }
3353 12463d8b 2019-12-13 stsp } else {
3354 12463d8b 2019-12-13 stsp fd2 = open(path2, O_RDONLY | O_NOFOLLOW);
3355 12463d8b 2019-12-13 stsp if (fd2 == -1) {
3356 12463d8b 2019-12-13 stsp err = got_error_from_errno2("open", path2);
3357 12463d8b 2019-12-13 stsp goto done;
3358 12463d8b 2019-12-13 stsp }
3359 1ebedb77 2019-10-19 stsp }
3360 1ebedb77 2019-10-19 stsp if (fstat(fd2, &sb2) == -1) {
3361 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("fstat", path2);
3362 1ebedb77 2019-10-19 stsp goto done;
3363 1ebedb77 2019-10-19 stsp }
3364 1ebedb77 2019-10-19 stsp
3365 1ebedb77 2019-10-19 stsp f2 = fdopen(fd2, "r");
3366 33aa809d 2019-08-08 stsp if (f2 == NULL) {
3367 60522982 2019-12-15 stsp err = got_error_from_errno2("fdopen", path2);
3368 33aa809d 2019-08-08 stsp goto done;
3369 33aa809d 2019-08-08 stsp }
3370 1ebedb77 2019-10-19 stsp fd2 = -1;
3371 33aa809d 2019-08-08 stsp
3372 33aa809d 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
3373 33aa809d 2019-08-08 stsp if (err)
3374 33aa809d 2019-08-08 stsp goto done;
3375 33aa809d 2019-08-08 stsp
3376 e635744c 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-patched-blob");
3377 33aa809d 2019-08-08 stsp if (err)
3378 33aa809d 2019-08-08 stsp goto done;
3379 33aa809d 2019-08-08 stsp
3380 33aa809d 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
3381 33aa809d 2019-08-08 stsp if (err)
3382 33aa809d 2019-08-08 stsp goto done;
3383 33aa809d 2019-08-08 stsp
3384 33aa809d 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
3385 33aa809d 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
3386 33aa809d 2019-08-08 stsp goto done;
3387 33aa809d 2019-08-08 stsp }
3388 33aa809d 2019-08-08 stsp
3389 33aa809d 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
3390 33aa809d 2019-08-08 stsp f1, sb1.st_size, id_str, f2, sb2.st_size, path2, 3, NULL);
3391 33aa809d 2019-08-08 stsp if (err)
3392 33aa809d 2019-08-08 stsp goto done;
3393 33aa809d 2019-08-08 stsp
3394 e635744c 2019-08-08 stsp err = got_opentemp_named(path_outfile, &outfile, "got-patched-content");
3395 33aa809d 2019-08-08 stsp if (err)
3396 33aa809d 2019-08-08 stsp goto done;
3397 33aa809d 2019-08-08 stsp
3398 33aa809d 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1)
3399 33aa809d 2019-08-08 stsp return got_ferror(f1, GOT_ERR_IO);
3400 33aa809d 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1)
3401 33aa809d 2019-08-08 stsp return got_ferror(f2, GOT_ERR_IO);
3402 33aa809d 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
3403 33aa809d 2019-08-08 stsp int choice;
3404 33aa809d 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
3405 33aa809d 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
3406 33aa809d 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
3407 e635744c 2019-08-08 stsp reverse_patch ? NULL : outfile,
3408 e635744c 2019-08-08 stsp reverse_patch ? outfile : NULL,
3409 e635744c 2019-08-08 stsp patch_cb, patch_arg);
3410 33aa809d 2019-08-08 stsp if (err)
3411 33aa809d 2019-08-08 stsp goto done;
3412 33aa809d 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
3413 33aa809d 2019-08-08 stsp have_content = 1;
3414 33aa809d 2019-08-08 stsp else if (choice == GOT_PATCH_CHOICE_QUIT)
3415 33aa809d 2019-08-08 stsp break;
3416 33aa809d 2019-08-08 stsp }
3417 1ebedb77 2019-10-19 stsp if (have_content) {
3418 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
3419 f1e81a05 2019-08-10 stsp reverse_patch ? NULL : outfile,
3420 f1e81a05 2019-08-10 stsp reverse_patch ? outfile : NULL);
3421 1ebedb77 2019-10-19 stsp if (err)
3422 1ebedb77 2019-10-19 stsp goto done;
3423 1ebedb77 2019-10-19 stsp
3424 1ebedb77 2019-10-19 stsp if (chmod(*path_outfile, sb2.st_mode) == -1) {
3425 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("chmod", path2);
3426 1ebedb77 2019-10-19 stsp goto done;
3427 1ebedb77 2019-10-19 stsp }
3428 1ebedb77 2019-10-19 stsp }
3429 33aa809d 2019-08-08 stsp done:
3430 33aa809d 2019-08-08 stsp free(id_str);
3431 33aa809d 2019-08-08 stsp if (blob)
3432 33aa809d 2019-08-08 stsp got_object_blob_close(blob);
3433 33aa809d 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
3434 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
3435 33aa809d 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
3436 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
3437 1ebedb77 2019-10-19 stsp if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3438 1ebedb77 2019-10-19 stsp err = got_error_from_errno2("close", path2);
3439 33aa809d 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
3440 33aa809d 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_outfile);
3441 33aa809d 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
3442 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
3443 33aa809d 2019-08-08 stsp if (err || !have_content) {
3444 33aa809d 2019-08-08 stsp if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
3445 33aa809d 2019-08-08 stsp err = got_error_from_errno2("unlink", *path_outfile);
3446 33aa809d 2019-08-08 stsp free(*path_outfile);
3447 33aa809d 2019-08-08 stsp *path_outfile = NULL;
3448 33aa809d 2019-08-08 stsp }
3449 33aa809d 2019-08-08 stsp free(args);
3450 33aa809d 2019-08-08 stsp if (ds) {
3451 33aa809d 2019-08-08 stsp got_diff_state_free(ds);
3452 33aa809d 2019-08-08 stsp free(ds);
3453 33aa809d 2019-08-08 stsp }
3454 33aa809d 2019-08-08 stsp if (changes)
3455 33aa809d 2019-08-08 stsp got_diff_free_changes(changes);
3456 33aa809d 2019-08-08 stsp free(path1);
3457 33aa809d 2019-08-08 stsp return err;
3458 33aa809d 2019-08-08 stsp }
3459 33aa809d 2019-08-08 stsp
3460 33aa809d 2019-08-08 stsp static const struct got_error *
3461 1f1abb7e 2019-08-08 stsp revert_file(void *arg, unsigned char status, unsigned char staged_status,
3462 1f1abb7e 2019-08-08 stsp const char *relpath, struct got_object_id *blob_id,
3463 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3464 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
3465 a129376b 2019-03-28 stsp {
3466 1f1abb7e 2019-08-08 stsp struct revert_file_args *a = arg;
3467 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL;
3468 1f1abb7e 2019-08-08 stsp char *parent_path = NULL;
3469 e20a8b6f 2019-06-04 stsp struct got_fileindex_entry *ie;
3470 a129376b 2019-03-28 stsp struct got_tree_object *tree = NULL;
3471 e20a8b6f 2019-06-04 stsp struct got_object_id *tree_id = NULL;
3472 24278f30 2019-08-03 stsp const struct got_tree_entry *te = NULL;
3473 e20a8b6f 2019-06-04 stsp char *tree_path = NULL, *te_name;
3474 33aa809d 2019-08-08 stsp char *ondisk_path = NULL, *path_content = NULL;
3475 a129376b 2019-03-28 stsp struct got_blob_object *blob = NULL;
3476 a129376b 2019-03-28 stsp
3477 d3bcc3d1 2019-08-08 stsp /* Reverting a staged deletion is a no-op. */
3478 d3bcc3d1 2019-08-08 stsp if (status == GOT_STATUS_DELETE &&
3479 d3bcc3d1 2019-08-08 stsp staged_status != GOT_STATUS_NO_CHANGE)
3480 d3bcc3d1 2019-08-08 stsp return NULL;
3481 3d69ad8d 2019-08-17 semarie
3482 3d69ad8d 2019-08-17 semarie if (status == GOT_STATUS_UNVERSIONED)
3483 3d69ad8d 2019-08-17 semarie return (*a->progress_cb)(a->progress_arg,
3484 3d69ad8d 2019-08-17 semarie GOT_STATUS_UNVERSIONED, relpath);
3485 d3bcc3d1 2019-08-08 stsp
3486 1f1abb7e 2019-08-08 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3487 65084dad 2019-08-08 stsp if (ie == NULL)
3488 63f810e6 2020-02-29 stsp return got_error_path(relpath, GOT_ERR_BAD_PATH);
3489 a129376b 2019-03-28 stsp
3490 a129376b 2019-03-28 stsp /* Construct in-repository path of tree which contains this blob. */
3491 a129376b 2019-03-28 stsp err = got_path_dirname(&parent_path, ie->path);
3492 a129376b 2019-03-28 stsp if (err) {
3493 a129376b 2019-03-28 stsp if (err->code != GOT_ERR_BAD_PATH)
3494 a129376b 2019-03-28 stsp goto done;
3495 e20a8b6f 2019-06-04 stsp parent_path = strdup("/");
3496 e20a8b6f 2019-06-04 stsp if (parent_path == NULL) {
3497 e20a8b6f 2019-06-04 stsp err = got_error_from_errno("strdup");
3498 e20a8b6f 2019-06-04 stsp goto done;
3499 e20a8b6f 2019-06-04 stsp }
3500 a129376b 2019-03-28 stsp }
3501 1f1abb7e 2019-08-08 stsp if (got_path_is_root_dir(a->worktree->path_prefix)) {
3502 a129376b 2019-03-28 stsp tree_path = strdup(parent_path);
3503 a129376b 2019-03-28 stsp if (tree_path == NULL) {
3504 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3505 a129376b 2019-03-28 stsp goto done;
3506 a129376b 2019-03-28 stsp }
3507 a129376b 2019-03-28 stsp } else {
3508 a129376b 2019-03-28 stsp if (got_path_is_root_dir(parent_path)) {
3509 1f1abb7e 2019-08-08 stsp tree_path = strdup(a->worktree->path_prefix);
3510 a129376b 2019-03-28 stsp if (tree_path == NULL) {
3511 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3512 a129376b 2019-03-28 stsp goto done;
3513 a129376b 2019-03-28 stsp }
3514 a129376b 2019-03-28 stsp } else {
3515 a129376b 2019-03-28 stsp if (asprintf(&tree_path, "%s/%s",
3516 1f1abb7e 2019-08-08 stsp a->worktree->path_prefix, parent_path) == -1) {
3517 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3518 a129376b 2019-03-28 stsp goto done;
3519 a129376b 2019-03-28 stsp }
3520 a129376b 2019-03-28 stsp }
3521 a129376b 2019-03-28 stsp }
3522 a129376b 2019-03-28 stsp
3523 1f1abb7e 2019-08-08 stsp err = got_object_id_by_path(&tree_id, a->repo,
3524 1f1abb7e 2019-08-08 stsp a->worktree->base_commit_id, tree_path);
3525 a9fa2909 2019-07-27 stsp if (err) {
3526 a9fa2909 2019-07-27 stsp if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
3527 24278f30 2019-08-03 stsp (status == GOT_STATUS_ADD ||
3528 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_ADD)))
3529 a9fa2909 2019-07-27 stsp goto done;
3530 a9fa2909 2019-07-27 stsp } else {
3531 1f1abb7e 2019-08-08 stsp err = got_object_open_as_tree(&tree, a->repo, tree_id);
3532 a9fa2909 2019-07-27 stsp if (err)
3533 a9fa2909 2019-07-27 stsp goto done;
3534 a9fa2909 2019-07-27 stsp
3535 a9fa2909 2019-07-27 stsp te_name = basename(ie->path);
3536 a9fa2909 2019-07-27 stsp if (te_name == NULL) {
3537 a9fa2909 2019-07-27 stsp err = got_error_from_errno2("basename", ie->path);
3538 a9fa2909 2019-07-27 stsp goto done;
3539 a9fa2909 2019-07-27 stsp }
3540 a9fa2909 2019-07-27 stsp
3541 a9fa2909 2019-07-27 stsp te = got_object_tree_find_entry(tree, te_name);
3542 24278f30 2019-08-03 stsp if (te == NULL && status != GOT_STATUS_ADD &&
3543 24278f30 2019-08-03 stsp staged_status != GOT_STATUS_ADD) {
3544 a9fa2909 2019-07-27 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
3545 a9fa2909 2019-07-27 stsp goto done;
3546 a9fa2909 2019-07-27 stsp }
3547 a129376b 2019-03-28 stsp }
3548 a129376b 2019-03-28 stsp
3549 a129376b 2019-03-28 stsp switch (status) {
3550 a129376b 2019-03-28 stsp case GOT_STATUS_ADD:
3551 33aa809d 2019-08-08 stsp if (a->patch_cb) {
3552 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
3553 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
3554 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
3555 33aa809d 2019-08-08 stsp if (err)
3556 33aa809d 2019-08-08 stsp goto done;
3557 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
3558 33aa809d 2019-08-08 stsp break;
3559 33aa809d 2019-08-08 stsp }
3560 1f1abb7e 2019-08-08 stsp err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
3561 1f1abb7e 2019-08-08 stsp ie->path);
3562 1ee397ad 2019-07-12 stsp if (err)
3563 1ee397ad 2019-07-12 stsp goto done;
3564 1f1abb7e 2019-08-08 stsp got_fileindex_entry_remove(a->fileindex, ie);
3565 a129376b 2019-03-28 stsp break;
3566 a129376b 2019-03-28 stsp case GOT_STATUS_DELETE:
3567 33aa809d 2019-08-08 stsp if (a->patch_cb) {
3568 33aa809d 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
3569 33aa809d 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
3570 33aa809d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
3571 33aa809d 2019-08-08 stsp if (err)
3572 33aa809d 2019-08-08 stsp goto done;
3573 33aa809d 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
3574 33aa809d 2019-08-08 stsp break;
3575 33aa809d 2019-08-08 stsp }
3576 33aa809d 2019-08-08 stsp /* fall through */
3577 a129376b 2019-03-28 stsp case GOT_STATUS_MODIFY:
3578 1ebedb77 2019-10-19 stsp case GOT_STATUS_MODE_CHANGE:
3579 a129376b 2019-03-28 stsp case GOT_STATUS_CONFLICT:
3580 e20a8b6f 2019-06-04 stsp case GOT_STATUS_MISSING: {
3581 e20a8b6f 2019-06-04 stsp struct got_object_id id;
3582 24278f30 2019-08-03 stsp if (staged_status == GOT_STATUS_ADD ||
3583 24278f30 2019-08-03 stsp staged_status == GOT_STATUS_MODIFY) {
3584 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->staged_blob_sha1,
3585 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3586 24278f30 2019-08-03 stsp } else
3587 24278f30 2019-08-03 stsp memcpy(id.sha1, ie->blob_sha1,
3588 24278f30 2019-08-03 stsp SHA1_DIGEST_LENGTH);
3589 1f1abb7e 2019-08-08 stsp err = got_object_open_as_blob(&blob, a->repo, &id, 8192);
3590 a129376b 2019-03-28 stsp if (err)
3591 65084dad 2019-08-08 stsp goto done;
3592 65084dad 2019-08-08 stsp
3593 65084dad 2019-08-08 stsp if (asprintf(&ondisk_path, "%s/%s",
3594 65084dad 2019-08-08 stsp got_worktree_get_root_path(a->worktree), relpath) == -1) {
3595 65084dad 2019-08-08 stsp err = got_error_from_errno("asprintf");
3596 a129376b 2019-03-28 stsp goto done;
3597 65084dad 2019-08-08 stsp }
3598 65084dad 2019-08-08 stsp
3599 33aa809d 2019-08-08 stsp if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
3600 33aa809d 2019-08-08 stsp status == GOT_STATUS_CONFLICT)) {
3601 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 1, &id,
3602 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path, a->repo,
3603 33aa809d 2019-08-08 stsp a->patch_cb, a->patch_arg);
3604 33aa809d 2019-08-08 stsp if (err || path_content == NULL)
3605 33aa809d 2019-08-08 stsp break;
3606 33aa809d 2019-08-08 stsp if (rename(path_content, ondisk_path) == -1) {
3607 33aa809d 2019-08-08 stsp err = got_error_from_errno3("rename",
3608 33aa809d 2019-08-08 stsp path_content, ondisk_path);
3609 33aa809d 2019-08-08 stsp goto done;
3610 33aa809d 2019-08-08 stsp }
3611 33aa809d 2019-08-08 stsp } else {
3612 33aa809d 2019-08-08 stsp err = install_blob(a->worktree, ondisk_path, ie->path,
3613 33aa809d 2019-08-08 stsp te ? te->mode : GOT_DEFAULT_FILE_MODE,
3614 33aa809d 2019-08-08 stsp got_fileindex_perms_to_st(ie), blob, 0, 1,
3615 33aa809d 2019-08-08 stsp a->repo, a->progress_cb, a->progress_arg);
3616 a129376b 2019-03-28 stsp if (err)
3617 a129376b 2019-03-28 stsp goto done;
3618 1ebedb77 2019-10-19 stsp if (status == GOT_STATUS_DELETE ||
3619 1ebedb77 2019-10-19 stsp status == GOT_STATUS_MODE_CHANGE) {
3620 33aa809d 2019-08-08 stsp err = update_blob_fileindex_entry(a->worktree,
3621 33aa809d 2019-08-08 stsp a->fileindex, ie, ondisk_path, ie->path,
3622 33aa809d 2019-08-08 stsp blob, 1);
3623 33aa809d 2019-08-08 stsp if (err)
3624 33aa809d 2019-08-08 stsp goto done;
3625 33aa809d 2019-08-08 stsp }
3626 a129376b 2019-03-28 stsp }
3627 a129376b 2019-03-28 stsp break;
3628 e20a8b6f 2019-06-04 stsp }
3629 a129376b 2019-03-28 stsp default:
3630 1f1abb7e 2019-08-08 stsp break;
3631 a129376b 2019-03-28 stsp }
3632 a129376b 2019-03-28 stsp done:
3633 1f1abb7e 2019-08-08 stsp free(ondisk_path);
3634 33aa809d 2019-08-08 stsp free(path_content);
3635 e20a8b6f 2019-06-04 stsp free(parent_path);
3636 a129376b 2019-03-28 stsp free(tree_path);
3637 a129376b 2019-03-28 stsp if (blob)
3638 a129376b 2019-03-28 stsp got_object_blob_close(blob);
3639 a129376b 2019-03-28 stsp if (tree)
3640 a129376b 2019-03-28 stsp got_object_tree_close(tree);
3641 a129376b 2019-03-28 stsp free(tree_id);
3642 e20a8b6f 2019-06-04 stsp return err;
3643 e20a8b6f 2019-06-04 stsp }
3644 e20a8b6f 2019-06-04 stsp
3645 e20a8b6f 2019-06-04 stsp const struct got_error *
3646 e20a8b6f 2019-06-04 stsp got_worktree_revert(struct got_worktree *worktree,
3647 2163d960 2019-08-08 stsp struct got_pathlist_head *paths,
3648 e20a8b6f 2019-06-04 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
3649 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
3650 e20a8b6f 2019-06-04 stsp struct got_repository *repo)
3651 e20a8b6f 2019-06-04 stsp {
3652 e20a8b6f 2019-06-04 stsp struct got_fileindex *fileindex = NULL;
3653 e20a8b6f 2019-06-04 stsp char *fileindex_path = NULL;
3654 e20a8b6f 2019-06-04 stsp const struct got_error *err = NULL, *unlockerr = NULL;
3655 e20a8b6f 2019-06-04 stsp const struct got_error *sync_err = NULL;
3656 e20a8b6f 2019-06-04 stsp struct got_pathlist_entry *pe;
3657 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
3658 e20a8b6f 2019-06-04 stsp
3659 e20a8b6f 2019-06-04 stsp err = lock_worktree(worktree, LOCK_EX);
3660 e20a8b6f 2019-06-04 stsp if (err)
3661 e20a8b6f 2019-06-04 stsp return err;
3662 e20a8b6f 2019-06-04 stsp
3663 3605a814 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
3664 e20a8b6f 2019-06-04 stsp if (err)
3665 e20a8b6f 2019-06-04 stsp goto done;
3666 e20a8b6f 2019-06-04 stsp
3667 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
3668 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
3669 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
3670 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
3671 33aa809d 2019-08-08 stsp rfa.patch_cb = patch_cb;
3672 33aa809d 2019-08-08 stsp rfa.patch_arg = patch_arg;
3673 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
3674 2163d960 2019-08-08 stsp TAILQ_FOREACH(pe, paths, entry) {
3675 1f1abb7e 2019-08-08 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
3676 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
3677 e20a8b6f 2019-06-04 stsp if (err)
3678 af12c6b9 2019-06-04 stsp break;
3679 e20a8b6f 2019-06-04 stsp }
3680 e20a8b6f 2019-06-04 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
3681 e20a8b6f 2019-06-04 stsp if (sync_err && err == NULL)
3682 e20a8b6f 2019-06-04 stsp err = sync_err;
3683 af12c6b9 2019-06-04 stsp done:
3684 fb399478 2019-07-12 stsp free(fileindex_path);
3685 a129376b 2019-03-28 stsp if (fileindex)
3686 a129376b 2019-03-28 stsp got_fileindex_free(fileindex);
3687 a129376b 2019-03-28 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
3688 a129376b 2019-03-28 stsp if (unlockerr && err == NULL)
3689 a129376b 2019-03-28 stsp err = unlockerr;
3690 c4296144 2019-05-09 stsp return err;
3691 c4296144 2019-05-09 stsp }
3692 c4296144 2019-05-09 stsp
3693 cf066bf8 2019-05-09 stsp static void
3694 33ad4cbe 2019-05-12 jcs free_commitable(struct got_commitable *ct)
3695 cf066bf8 2019-05-09 stsp {
3696 24519714 2019-05-09 stsp free(ct->path);
3697 44d03001 2019-05-09 stsp free(ct->in_repo_path);
3698 768aea60 2019-05-09 stsp free(ct->ondisk_path);
3699 e75eb4da 2019-05-10 stsp free(ct->blob_id);
3700 c4e12a88 2019-05-13 stsp free(ct->base_blob_id);
3701 f0b75401 2019-08-03 stsp free(ct->staged_blob_id);
3702 b416585c 2019-05-13 stsp free(ct->base_commit_id);
3703 cf066bf8 2019-05-09 stsp free(ct);
3704 cf066bf8 2019-05-09 stsp }
3705 24519714 2019-05-09 stsp
3706 ed175427 2019-05-09 stsp struct collect_commitables_arg {
3707 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths;
3708 24519714 2019-05-09 stsp struct got_repository *repo;
3709 24519714 2019-05-09 stsp struct got_worktree *worktree;
3710 5f8a88c6 2019-08-03 stsp int have_staged_files;
3711 24519714 2019-05-09 stsp };
3712 cf066bf8 2019-05-09 stsp
3713 c4296144 2019-05-09 stsp static const struct got_error *
3714 88d0e355 2019-08-03 stsp collect_commitables(void *arg, unsigned char status,
3715 88d0e355 2019-08-03 stsp unsigned char staged_status, const char *relpath,
3716 537ac44b 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3717 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
3718 c4296144 2019-05-09 stsp {
3719 ed175427 2019-05-09 stsp struct collect_commitables_arg *a = arg;
3720 c4296144 2019-05-09 stsp const struct got_error *err = NULL;
3721 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
3722 c4296144 2019-05-09 stsp struct got_pathlist_entry *new = NULL;
3723 036813ee 2019-05-09 stsp char *parent_path = NULL, *path = NULL;
3724 768aea60 2019-05-09 stsp struct stat sb;
3725 c4296144 2019-05-09 stsp
3726 5f8a88c6 2019-08-03 stsp if (a->have_staged_files) {
3727 5f8a88c6 2019-08-03 stsp if (staged_status != GOT_STATUS_MODIFY &&
3728 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_ADD &&
3729 5f8a88c6 2019-08-03 stsp staged_status != GOT_STATUS_DELETE)
3730 5f8a88c6 2019-08-03 stsp return NULL;
3731 5f8a88c6 2019-08-03 stsp } else {
3732 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_CONFLICT)
3733 5f8a88c6 2019-08-03 stsp return got_error(GOT_ERR_COMMIT_CONFLICT);
3734 c4296144 2019-05-09 stsp
3735 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_MODIFY &&
3736 1ebedb77 2019-10-19 stsp status != GOT_STATUS_MODE_CHANGE &&
3737 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_ADD &&
3738 5f8a88c6 2019-08-03 stsp status != GOT_STATUS_DELETE)
3739 5f8a88c6 2019-08-03 stsp return NULL;
3740 5f8a88c6 2019-08-03 stsp }
3741 0b5cc0d6 2019-05-09 stsp
3742 036813ee 2019-05-09 stsp if (asprintf(&path, "/%s", relpath) == -1) {
3743 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3744 036813ee 2019-05-09 stsp goto done;
3745 036813ee 2019-05-09 stsp }
3746 036813ee 2019-05-09 stsp if (strcmp(path, "/") == 0) {
3747 036813ee 2019-05-09 stsp parent_path = strdup("");
3748 69960a46 2019-05-09 stsp if (parent_path == NULL)
3749 638f9024 2019-05-13 stsp return got_error_from_errno("strdup");
3750 69960a46 2019-05-09 stsp } else {
3751 69960a46 2019-05-09 stsp err = got_path_dirname(&parent_path, path);
3752 69960a46 2019-05-09 stsp if (err)
3753 69960a46 2019-05-09 stsp return err;
3754 69960a46 2019-05-09 stsp }
3755 c4296144 2019-05-09 stsp
3756 036813ee 2019-05-09 stsp ct = calloc(1, sizeof(*ct));
3757 cf066bf8 2019-05-09 stsp if (ct == NULL) {
3758 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
3759 c4296144 2019-05-09 stsp goto done;
3760 768aea60 2019-05-09 stsp }
3761 768aea60 2019-05-09 stsp
3762 768aea60 2019-05-09 stsp if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
3763 768aea60 2019-05-09 stsp relpath) == -1) {
3764 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3765 768aea60 2019-05-09 stsp goto done;
3766 768aea60 2019-05-09 stsp }
3767 5f8a88c6 2019-08-03 stsp if (status == GOT_STATUS_DELETE || staged_status == GOT_STATUS_DELETE) {
3768 768aea60 2019-05-09 stsp sb.st_mode = GOT_DEFAULT_FILE_MODE;
3769 768aea60 2019-05-09 stsp } else {
3770 12463d8b 2019-12-13 stsp if (dirfd != -1) {
3771 12463d8b 2019-12-13 stsp if (fstatat(dirfd, de_name, &sb,
3772 12463d8b 2019-12-13 stsp AT_SYMLINK_NOFOLLOW) == -1) {
3773 82223ffc 2019-12-13 stsp err = got_error_from_errno2("fstatat",
3774 12463d8b 2019-12-13 stsp ct->ondisk_path);
3775 12463d8b 2019-12-13 stsp goto done;
3776 12463d8b 2019-12-13 stsp }
3777 12463d8b 2019-12-13 stsp } else if (lstat(ct->ondisk_path, &sb) == -1) {
3778 638f9024 2019-05-13 stsp err = got_error_from_errno2("lstat", ct->ondisk_path);
3779 768aea60 2019-05-09 stsp goto done;
3780 768aea60 2019-05-09 stsp }
3781 768aea60 2019-05-09 stsp ct->mode = sb.st_mode;
3782 c4296144 2019-05-09 stsp }
3783 c4296144 2019-05-09 stsp
3784 44d03001 2019-05-09 stsp if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
3785 44d03001 2019-05-09 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
3786 44d03001 2019-05-09 stsp relpath) == -1) {
3787 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3788 44d03001 2019-05-09 stsp goto done;
3789 44d03001 2019-05-09 stsp }
3790 44d03001 2019-05-09 stsp
3791 cf066bf8 2019-05-09 stsp ct->status = status;
3792 5f8a88c6 2019-08-03 stsp ct->staged_status = staged_status;
3793 e75eb4da 2019-05-10 stsp ct->blob_id = NULL; /* will be filled in when blob gets created */
3794 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_ADD &&
3795 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) {
3796 016a88dd 2019-05-13 stsp ct->base_blob_id = got_object_id_dup(blob_id);
3797 c4e12a88 2019-05-13 stsp if (ct->base_blob_id == NULL) {
3798 b416585c 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3799 b416585c 2019-05-13 stsp goto done;
3800 b416585c 2019-05-13 stsp }
3801 b416585c 2019-05-13 stsp ct->base_commit_id = got_object_id_dup(commit_id);
3802 b416585c 2019-05-13 stsp if (ct->base_commit_id == NULL) {
3803 f0b75401 2019-08-03 stsp err = got_error_from_errno("got_object_id_dup");
3804 f0b75401 2019-08-03 stsp goto done;
3805 f0b75401 2019-08-03 stsp }
3806 f0b75401 2019-08-03 stsp }
3807 f0b75401 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
3808 f0b75401 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
3809 f0b75401 2019-08-03 stsp ct->staged_blob_id = got_object_id_dup(staged_blob_id);
3810 f0b75401 2019-08-03 stsp if (ct->staged_blob_id == NULL) {
3811 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3812 036813ee 2019-05-09 stsp goto done;
3813 036813ee 2019-05-09 stsp }
3814 ca2503ea 2019-05-09 stsp }
3815 24519714 2019-05-09 stsp ct->path = strdup(path);
3816 24519714 2019-05-09 stsp if (ct->path == NULL) {
3817 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
3818 24519714 2019-05-09 stsp goto done;
3819 24519714 2019-05-09 stsp }
3820 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
3821 c4296144 2019-05-09 stsp done:
3822 c42269f6 2019-05-09 stsp if (ct && (err || new == NULL))
3823 ed175427 2019-05-09 stsp free_commitable(ct);
3824 24519714 2019-05-09 stsp free(parent_path);
3825 036813ee 2019-05-09 stsp free(path);
3826 a129376b 2019-03-28 stsp return err;
3827 a129376b 2019-03-28 stsp }
3828 c4296144 2019-05-09 stsp
3829 036813ee 2019-05-09 stsp static const struct got_error *write_tree(struct got_object_id **,
3830 036813ee 2019-05-09 stsp struct got_tree_object *, const char *, struct got_pathlist_head *,
3831 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3832 036813ee 2019-05-09 stsp struct got_repository *);
3833 ed175427 2019-05-09 stsp
3834 ed175427 2019-05-09 stsp static const struct got_error *
3835 036813ee 2019-05-09 stsp write_subtree(struct got_object_id **new_subtree_id,
3836 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *parent_path,
3837 afa376bf 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
3838 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
3839 afa376bf 2019-05-09 stsp struct got_repository *repo)
3840 ed175427 2019-05-09 stsp {
3841 ed175427 2019-05-09 stsp const struct got_error *err = NULL;
3842 036813ee 2019-05-09 stsp struct got_tree_object *subtree;
3843 036813ee 2019-05-09 stsp char *subpath;
3844 ed175427 2019-05-09 stsp
3845 036813ee 2019-05-09 stsp if (asprintf(&subpath, "%s%s%s", parent_path,
3846 baa7dcfa 2019-05-09 stsp got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
3847 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3848 ed175427 2019-05-09 stsp
3849 56e0773d 2019-11-28 stsp err = got_object_open_as_tree(&subtree, repo, &te->id);
3850 ed175427 2019-05-09 stsp if (err)
3851 ed175427 2019-05-09 stsp return err;
3852 ed175427 2019-05-09 stsp
3853 036813ee 2019-05-09 stsp err = write_tree(new_subtree_id, subtree, subpath, commitable_paths,
3854 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
3855 036813ee 2019-05-09 stsp got_object_tree_close(subtree);
3856 036813ee 2019-05-09 stsp free(subpath);
3857 036813ee 2019-05-09 stsp return err;
3858 036813ee 2019-05-09 stsp }
3859 ed175427 2019-05-09 stsp
3860 036813ee 2019-05-09 stsp static const struct got_error *
3861 33ad4cbe 2019-05-12 jcs match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
3862 036813ee 2019-05-09 stsp {
3863 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3864 036813ee 2019-05-09 stsp char *ct_parent_path = NULL;
3865 ed175427 2019-05-09 stsp
3866 036813ee 2019-05-09 stsp *match = 0;
3867 ed175427 2019-05-09 stsp
3868 e0233cea 2019-07-25 stsp if (strchr(ct->in_repo_path, '/') == NULL) {
3869 0f63689d 2019-05-10 stsp *match = got_path_is_root_dir(path);
3870 0f63689d 2019-05-10 stsp return NULL;
3871 036813ee 2019-05-09 stsp }
3872 0b5cc0d6 2019-05-09 stsp
3873 e0233cea 2019-07-25 stsp err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
3874 0f63689d 2019-05-10 stsp if (err)
3875 0f63689d 2019-05-10 stsp return err;
3876 036813ee 2019-05-09 stsp *match = (strcmp(path, ct_parent_path) == 0);
3877 036813ee 2019-05-09 stsp free(ct_parent_path);
3878 036813ee 2019-05-09 stsp return err;
3879 036813ee 2019-05-09 stsp }
3880 0b5cc0d6 2019-05-09 stsp
3881 768aea60 2019-05-09 stsp static mode_t
3882 33ad4cbe 2019-05-12 jcs get_ct_file_mode(struct got_commitable *ct)
3883 768aea60 2019-05-09 stsp {
3884 768aea60 2019-05-09 stsp return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
3885 768aea60 2019-05-09 stsp }
3886 768aea60 2019-05-09 stsp
3887 036813ee 2019-05-09 stsp static const struct got_error *
3888 036813ee 2019-05-09 stsp alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
3889 33ad4cbe 2019-05-12 jcs struct got_tree_entry *te, struct got_commitable *ct)
3890 036813ee 2019-05-09 stsp {
3891 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3892 ca2503ea 2019-05-09 stsp
3893 036813ee 2019-05-09 stsp *new_te = NULL;
3894 0b5cc0d6 2019-05-09 stsp
3895 036813ee 2019-05-09 stsp err = got_object_tree_entry_dup(new_te, te);
3896 036813ee 2019-05-09 stsp if (err)
3897 036813ee 2019-05-09 stsp goto done;
3898 0b5cc0d6 2019-05-09 stsp
3899 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
3900 036813ee 2019-05-09 stsp
3901 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_MODIFY)
3902 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
3903 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
3904 5f8a88c6 2019-08-03 stsp else
3905 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
3906 036813ee 2019-05-09 stsp done:
3907 036813ee 2019-05-09 stsp if (err && *new_te) {
3908 56e0773d 2019-11-28 stsp free(*new_te);
3909 036813ee 2019-05-09 stsp *new_te = NULL;
3910 036813ee 2019-05-09 stsp }
3911 036813ee 2019-05-09 stsp return err;
3912 036813ee 2019-05-09 stsp }
3913 036813ee 2019-05-09 stsp
3914 036813ee 2019-05-09 stsp static const struct got_error *
3915 036813ee 2019-05-09 stsp alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
3916 33ad4cbe 2019-05-12 jcs struct got_commitable *ct)
3917 036813ee 2019-05-09 stsp {
3918 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3919 036813ee 2019-05-09 stsp char *ct_name;
3920 036813ee 2019-05-09 stsp
3921 036813ee 2019-05-09 stsp *new_te = NULL;
3922 036813ee 2019-05-09 stsp
3923 4229330b 2019-05-10 stsp *new_te = calloc(1, sizeof(**new_te));
3924 036813ee 2019-05-09 stsp if (*new_te == NULL)
3925 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
3926 036813ee 2019-05-09 stsp
3927 036813ee 2019-05-09 stsp ct_name = basename(ct->path);
3928 036813ee 2019-05-09 stsp if (ct_name == NULL) {
3929 638f9024 2019-05-13 stsp err = got_error_from_errno2("basename", ct->path);
3930 036813ee 2019-05-09 stsp goto done;
3931 036813ee 2019-05-09 stsp }
3932 56e0773d 2019-11-28 stsp if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
3933 56e0773d 2019-11-28 stsp sizeof((*new_te)->name)) {
3934 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
3935 036813ee 2019-05-09 stsp goto done;
3936 036813ee 2019-05-09 stsp }
3937 036813ee 2019-05-09 stsp
3938 768aea60 2019-05-09 stsp (*new_te)->mode = get_ct_file_mode(ct);
3939 036813ee 2019-05-09 stsp
3940 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD)
3941 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->staged_blob_id,
3942 56e0773d 2019-11-28 stsp sizeof((*new_te)->id));
3943 5f8a88c6 2019-08-03 stsp else
3944 56e0773d 2019-11-28 stsp memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
3945 036813ee 2019-05-09 stsp done:
3946 036813ee 2019-05-09 stsp if (err && *new_te) {
3947 56e0773d 2019-11-28 stsp free(*new_te);
3948 036813ee 2019-05-09 stsp *new_te = NULL;
3949 036813ee 2019-05-09 stsp }
3950 036813ee 2019-05-09 stsp return err;
3951 036813ee 2019-05-09 stsp }
3952 036813ee 2019-05-09 stsp
3953 036813ee 2019-05-09 stsp static const struct got_error *
3954 036813ee 2019-05-09 stsp insert_tree_entry(struct got_tree_entry *new_te,
3955 036813ee 2019-05-09 stsp struct got_pathlist_head *paths)
3956 036813ee 2019-05-09 stsp {
3957 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
3958 036813ee 2019-05-09 stsp struct got_pathlist_entry *new_pe;
3959 036813ee 2019-05-09 stsp
3960 036813ee 2019-05-09 stsp err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
3961 036813ee 2019-05-09 stsp if (err)
3962 036813ee 2019-05-09 stsp return err;
3963 036813ee 2019-05-09 stsp if (new_pe == NULL)
3964 036813ee 2019-05-09 stsp return got_error(GOT_ERR_TREE_DUP_ENTRY);
3965 036813ee 2019-05-09 stsp return NULL;
3966 afa376bf 2019-05-09 stsp }
3967 afa376bf 2019-05-09 stsp
3968 afa376bf 2019-05-09 stsp static const struct got_error *
3969 33ad4cbe 2019-05-12 jcs report_ct_status(struct got_commitable *ct,
3970 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg)
3971 afa376bf 2019-05-09 stsp {
3972 afa376bf 2019-05-09 stsp const char *ct_path = ct->path;
3973 5f8a88c6 2019-08-03 stsp unsigned char status;
3974 5f8a88c6 2019-08-03 stsp
3975 afa376bf 2019-05-09 stsp while (ct_path[0] == '/')
3976 afa376bf 2019-05-09 stsp ct_path++;
3977 5f8a88c6 2019-08-03 stsp
3978 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_NO_CHANGE)
3979 5f8a88c6 2019-08-03 stsp status = ct->staged_status;
3980 5f8a88c6 2019-08-03 stsp else
3981 5f8a88c6 2019-08-03 stsp status = ct->status;
3982 5f8a88c6 2019-08-03 stsp
3983 5f8a88c6 2019-08-03 stsp return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
3984 12463d8b 2019-12-13 stsp ct_path, ct->blob_id, NULL, NULL, -1, NULL);
3985 036813ee 2019-05-09 stsp }
3986 036813ee 2019-05-09 stsp
3987 036813ee 2019-05-09 stsp static const struct got_error *
3988 44d03001 2019-05-09 stsp match_modified_subtree(int *modified, struct got_tree_entry *te,
3989 44d03001 2019-05-09 stsp const char *base_tree_path, struct got_pathlist_head *commitable_paths)
3990 44d03001 2019-05-09 stsp {
3991 44d03001 2019-05-09 stsp const struct got_error *err = NULL;
3992 44d03001 2019-05-09 stsp struct got_pathlist_entry *pe;
3993 44d03001 2019-05-09 stsp char *te_path;
3994 44d03001 2019-05-09 stsp
3995 44d03001 2019-05-09 stsp *modified = 0;
3996 44d03001 2019-05-09 stsp
3997 44d03001 2019-05-09 stsp if (asprintf(&te_path, "%s%s%s", base_tree_path,
3998 44d03001 2019-05-09 stsp got_path_is_root_dir(base_tree_path) ? "" : "/",
3999 44d03001 2019-05-09 stsp te->name) == -1)
4000 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
4001 44d03001 2019-05-09 stsp
4002 44d03001 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4003 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4004 44d03001 2019-05-09 stsp *modified = got_path_is_child(ct->in_repo_path, te_path,
4005 44d03001 2019-05-09 stsp strlen(te_path));
4006 44d03001 2019-05-09 stsp if (*modified)
4007 44d03001 2019-05-09 stsp break;
4008 44d03001 2019-05-09 stsp }
4009 44d03001 2019-05-09 stsp
4010 44d03001 2019-05-09 stsp free(te_path);
4011 44d03001 2019-05-09 stsp return err;
4012 44d03001 2019-05-09 stsp }
4013 44d03001 2019-05-09 stsp
4014 44d03001 2019-05-09 stsp static const struct got_error *
4015 33ad4cbe 2019-05-12 jcs match_deleted_or_modified_ct(struct got_commitable **ctp,
4016 036813ee 2019-05-09 stsp struct got_tree_entry *te, const char *base_tree_path,
4017 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths)
4018 036813ee 2019-05-09 stsp {
4019 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4020 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
4021 036813ee 2019-05-09 stsp
4022 036813ee 2019-05-09 stsp *ctp = NULL;
4023 036813ee 2019-05-09 stsp
4024 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4025 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4026 036813ee 2019-05-09 stsp char *ct_name = NULL;
4027 036813ee 2019-05-09 stsp int path_matches;
4028 036813ee 2019-05-09 stsp
4029 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
4030 5f8a88c6 2019-08-03 stsp if (ct->status != GOT_STATUS_MODIFY &&
4031 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE &&
4032 5f8a88c6 2019-08-03 stsp ct->status != GOT_STATUS_DELETE)
4033 5f8a88c6 2019-08-03 stsp continue;
4034 5f8a88c6 2019-08-03 stsp } else {
4035 5f8a88c6 2019-08-03 stsp if (ct->staged_status != GOT_STATUS_MODIFY &&
4036 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_DELETE)
4037 5f8a88c6 2019-08-03 stsp continue;
4038 5f8a88c6 2019-08-03 stsp }
4039 036813ee 2019-05-09 stsp
4040 56e0773d 2019-11-28 stsp if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
4041 036813ee 2019-05-09 stsp continue;
4042 036813ee 2019-05-09 stsp
4043 036813ee 2019-05-09 stsp err = match_ct_parent_path(&path_matches, ct, base_tree_path);
4044 036813ee 2019-05-09 stsp if (err)
4045 036813ee 2019-05-09 stsp return err;
4046 036813ee 2019-05-09 stsp if (!path_matches)
4047 036813ee 2019-05-09 stsp continue;
4048 036813ee 2019-05-09 stsp
4049 036813ee 2019-05-09 stsp ct_name = basename(pe->path);
4050 036813ee 2019-05-09 stsp if (ct_name == NULL)
4051 638f9024 2019-05-13 stsp return got_error_from_errno2("basename", pe->path);
4052 036813ee 2019-05-09 stsp
4053 036813ee 2019-05-09 stsp if (strcmp(te->name, ct_name) != 0)
4054 036813ee 2019-05-09 stsp continue;
4055 036813ee 2019-05-09 stsp
4056 036813ee 2019-05-09 stsp *ctp = ct;
4057 036813ee 2019-05-09 stsp break;
4058 036813ee 2019-05-09 stsp }
4059 2b496619 2019-07-10 stsp
4060 2b496619 2019-07-10 stsp return err;
4061 2b496619 2019-07-10 stsp }
4062 2b496619 2019-07-10 stsp
4063 2b496619 2019-07-10 stsp static const struct got_error *
4064 2b496619 2019-07-10 stsp make_subtree_for_added_blob(struct got_tree_entry **new_tep,
4065 2b496619 2019-07-10 stsp const char *child_path, const char *path_base_tree,
4066 2b496619 2019-07-10 stsp struct got_pathlist_head *commitable_paths,
4067 2b496619 2019-07-10 stsp got_worktree_status_cb status_cb, void *status_arg,
4068 2b496619 2019-07-10 stsp struct got_repository *repo)
4069 2b496619 2019-07-10 stsp {
4070 2b496619 2019-07-10 stsp const struct got_error *err = NULL;
4071 2b496619 2019-07-10 stsp struct got_tree_entry *new_te;
4072 2b496619 2019-07-10 stsp char *subtree_path;
4073 56e0773d 2019-11-28 stsp struct got_object_id *id = NULL;
4074 2b496619 2019-07-10 stsp
4075 2b496619 2019-07-10 stsp *new_tep = NULL;
4076 2b496619 2019-07-10 stsp
4077 2b496619 2019-07-10 stsp if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
4078 2b496619 2019-07-10 stsp got_path_is_root_dir(path_base_tree) ? "" : "/",
4079 2b496619 2019-07-10 stsp child_path) == -1)
4080 2b496619 2019-07-10 stsp return got_error_from_errno("asprintf");
4081 036813ee 2019-05-09 stsp
4082 2b496619 2019-07-10 stsp new_te = calloc(1, sizeof(*new_te));
4083 d6fca0ba 2019-09-15 hiltjo if (new_te == NULL)
4084 d6fca0ba 2019-09-15 hiltjo return got_error_from_errno("calloc");
4085 2b496619 2019-07-10 stsp new_te->mode = S_IFDIR;
4086 56e0773d 2019-11-28 stsp
4087 56e0773d 2019-11-28 stsp if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
4088 56e0773d 2019-11-28 stsp sizeof(new_te->name)) {
4089 56e0773d 2019-11-28 stsp err = got_error(GOT_ERR_NO_SPACE);
4090 2b496619 2019-07-10 stsp goto done;
4091 2b496619 2019-07-10 stsp }
4092 56e0773d 2019-11-28 stsp err = write_tree(&id, NULL, subtree_path,
4093 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg, repo);
4094 2b496619 2019-07-10 stsp if (err) {
4095 56e0773d 2019-11-28 stsp free(new_te);
4096 2b496619 2019-07-10 stsp goto done;
4097 2b496619 2019-07-10 stsp }
4098 56e0773d 2019-11-28 stsp memcpy(&new_te->id, id, sizeof(new_te->id));
4099 2b496619 2019-07-10 stsp done:
4100 56e0773d 2019-11-28 stsp free(id);
4101 2b496619 2019-07-10 stsp free(subtree_path);
4102 2b496619 2019-07-10 stsp if (err == NULL)
4103 2b496619 2019-07-10 stsp *new_tep = new_te;
4104 036813ee 2019-05-09 stsp return err;
4105 036813ee 2019-05-09 stsp }
4106 036813ee 2019-05-09 stsp
4107 036813ee 2019-05-09 stsp static const struct got_error *
4108 036813ee 2019-05-09 stsp write_tree(struct got_object_id **new_tree_id,
4109 036813ee 2019-05-09 stsp struct got_tree_object *base_tree, const char *path_base_tree,
4110 036813ee 2019-05-09 stsp struct got_pathlist_head *commitable_paths,
4111 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4112 036813ee 2019-05-09 stsp struct got_repository *repo)
4113 036813ee 2019-05-09 stsp {
4114 036813ee 2019-05-09 stsp const struct got_error *err = NULL;
4115 036813ee 2019-05-09 stsp struct got_pathlist_head paths;
4116 2f51b5b3 2019-05-09 stsp struct got_tree_entry *te, *new_te = NULL;
4117 036813ee 2019-05-09 stsp struct got_pathlist_entry *pe;
4118 56e0773d 2019-11-28 stsp int nentries = 0;
4119 036813ee 2019-05-09 stsp
4120 036813ee 2019-05-09 stsp TAILQ_INIT(&paths);
4121 036813ee 2019-05-09 stsp
4122 036813ee 2019-05-09 stsp /* Insert, and recurse into, newly added entries first. */
4123 036813ee 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4124 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4125 2f51b5b3 2019-05-09 stsp char *child_path = NULL, *slash;
4126 036813ee 2019-05-09 stsp
4127 5f8a88c6 2019-08-03 stsp if ((ct->status != GOT_STATUS_ADD &&
4128 5f8a88c6 2019-08-03 stsp ct->staged_status != GOT_STATUS_ADD) ||
4129 a3df2849 2019-05-20 stsp (ct->flags & GOT_COMMITABLE_ADDED))
4130 036813ee 2019-05-09 stsp continue;
4131 036813ee 2019-05-09 stsp
4132 036813ee 2019-05-09 stsp if (!got_path_is_child(pe->path, path_base_tree,
4133 2f51b5b3 2019-05-09 stsp strlen(path_base_tree)))
4134 036813ee 2019-05-09 stsp continue;
4135 036813ee 2019-05-09 stsp
4136 036813ee 2019-05-09 stsp err = got_path_skip_common_ancestor(&child_path, path_base_tree,
4137 036813ee 2019-05-09 stsp pe->path);
4138 036813ee 2019-05-09 stsp if (err)
4139 036813ee 2019-05-09 stsp goto done;
4140 036813ee 2019-05-09 stsp
4141 2f51b5b3 2019-05-09 stsp slash = strchr(child_path, '/');
4142 2f51b5b3 2019-05-09 stsp if (slash == NULL) {
4143 036813ee 2019-05-09 stsp err = alloc_added_blob_tree_entry(&new_te, ct);
4144 036813ee 2019-05-09 stsp if (err)
4145 036813ee 2019-05-09 stsp goto done;
4146 afa376bf 2019-05-09 stsp err = report_ct_status(ct, status_cb, status_arg);
4147 afa376bf 2019-05-09 stsp if (err)
4148 afa376bf 2019-05-09 stsp goto done;
4149 a3df2849 2019-05-20 stsp ct->flags |= GOT_COMMITABLE_ADDED;
4150 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
4151 2b496619 2019-07-10 stsp if (err)
4152 2f51b5b3 2019-05-09 stsp goto done;
4153 56e0773d 2019-11-28 stsp nentries++;
4154 2b496619 2019-07-10 stsp } else {
4155 2b496619 2019-07-10 stsp *slash = '\0'; /* trim trailing path components */
4156 2b496619 2019-07-10 stsp if (base_tree == NULL ||
4157 2b496619 2019-07-10 stsp got_object_tree_find_entry(base_tree, child_path)
4158 2b496619 2019-07-10 stsp == NULL) {
4159 2b496619 2019-07-10 stsp err = make_subtree_for_added_blob(&new_te,
4160 2b496619 2019-07-10 stsp child_path, path_base_tree,
4161 2b496619 2019-07-10 stsp commitable_paths, status_cb, status_arg,
4162 2b496619 2019-07-10 stsp repo);
4163 2b496619 2019-07-10 stsp if (err)
4164 2b496619 2019-07-10 stsp goto done;
4165 2b496619 2019-07-10 stsp err = insert_tree_entry(new_te, &paths);
4166 2b496619 2019-07-10 stsp if (err)
4167 2b496619 2019-07-10 stsp goto done;
4168 56e0773d 2019-11-28 stsp nentries++;
4169 9ba0479c 2019-05-10 stsp }
4170 ed175427 2019-05-09 stsp }
4171 2f51b5b3 2019-05-09 stsp }
4172 2f51b5b3 2019-05-09 stsp
4173 2f51b5b3 2019-05-09 stsp if (base_tree) {
4174 56e0773d 2019-11-28 stsp int i, nbase_entries;
4175 2f51b5b3 2019-05-09 stsp /* Handle modified and deleted entries. */
4176 56e0773d 2019-11-28 stsp nbase_entries = got_object_tree_get_nentries(base_tree);
4177 56e0773d 2019-11-28 stsp for (i = 0; i < nbase_entries; i++) {
4178 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = NULL;
4179 63c5ca5d 2019-08-24 stsp
4180 56e0773d 2019-11-28 stsp te = got_object_tree_get_entry(base_tree, i);
4181 63c5ca5d 2019-08-24 stsp if (got_object_tree_entry_is_submodule(te)) {
4182 63c5ca5d 2019-08-24 stsp /* Entry is a submodule; just copy it. */
4183 63c5ca5d 2019-08-24 stsp err = got_object_tree_entry_dup(&new_te, te);
4184 63c5ca5d 2019-08-24 stsp if (err)
4185 63c5ca5d 2019-08-24 stsp goto done;
4186 63c5ca5d 2019-08-24 stsp err = insert_tree_entry(new_te, &paths);
4187 63c5ca5d 2019-08-24 stsp if (err)
4188 63c5ca5d 2019-08-24 stsp goto done;
4189 56e0773d 2019-11-28 stsp nentries++;
4190 63c5ca5d 2019-08-24 stsp continue;
4191 63c5ca5d 2019-08-24 stsp }
4192 2f51b5b3 2019-05-09 stsp
4193 2f51b5b3 2019-05-09 stsp if (S_ISDIR(te->mode)) {
4194 44d03001 2019-05-09 stsp int modified;
4195 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
4196 036813ee 2019-05-09 stsp if (err)
4197 036813ee 2019-05-09 stsp goto done;
4198 44d03001 2019-05-09 stsp err = match_modified_subtree(&modified, te,
4199 44d03001 2019-05-09 stsp path_base_tree, commitable_paths);
4200 2f51b5b3 2019-05-09 stsp if (err)
4201 2f51b5b3 2019-05-09 stsp goto done;
4202 44d03001 2019-05-09 stsp /* Avoid recursion into unmodified subtrees. */
4203 44d03001 2019-05-09 stsp if (modified) {
4204 56e0773d 2019-11-28 stsp struct got_object_id *new_id;
4205 56e0773d 2019-11-28 stsp err = write_subtree(&new_id, te,
4206 44d03001 2019-05-09 stsp path_base_tree, commitable_paths,
4207 44d03001 2019-05-09 stsp status_cb, status_arg, repo);
4208 44d03001 2019-05-09 stsp if (err)
4209 44d03001 2019-05-09 stsp goto done;
4210 56e0773d 2019-11-28 stsp memcpy(&new_te->id, new_id,
4211 56e0773d 2019-11-28 stsp sizeof(new_te->id));
4212 56e0773d 2019-11-28 stsp free(new_id);
4213 44d03001 2019-05-09 stsp }
4214 036813ee 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
4215 036813ee 2019-05-09 stsp if (err)
4216 036813ee 2019-05-09 stsp goto done;
4217 56e0773d 2019-11-28 stsp nentries++;
4218 2f51b5b3 2019-05-09 stsp continue;
4219 036813ee 2019-05-09 stsp }
4220 2f51b5b3 2019-05-09 stsp
4221 2f51b5b3 2019-05-09 stsp err = match_deleted_or_modified_ct(&ct, te,
4222 2f51b5b3 2019-05-09 stsp path_base_tree, commitable_paths);
4223 f66c734c 2019-09-22 stsp if (err)
4224 f66c734c 2019-09-22 stsp goto done;
4225 2f51b5b3 2019-05-09 stsp if (ct) {
4226 2f51b5b3 2019-05-09 stsp /* NB: Deleted entries get dropped here. */
4227 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_MODIFY ||
4228 1ebedb77 2019-10-19 stsp ct->status == GOT_STATUS_MODE_CHANGE ||
4229 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4230 2f51b5b3 2019-05-09 stsp err = alloc_modified_blob_tree_entry(
4231 2f51b5b3 2019-05-09 stsp &new_te, te, ct);
4232 2f51b5b3 2019-05-09 stsp if (err)
4233 2f51b5b3 2019-05-09 stsp goto done;
4234 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
4235 2f51b5b3 2019-05-09 stsp if (err)
4236 2f51b5b3 2019-05-09 stsp goto done;
4237 56e0773d 2019-11-28 stsp nentries++;
4238 2f51b5b3 2019-05-09 stsp }
4239 b416585c 2019-05-13 stsp err = report_ct_status(ct, status_cb,
4240 b416585c 2019-05-13 stsp status_arg);
4241 afa376bf 2019-05-09 stsp if (err)
4242 afa376bf 2019-05-09 stsp goto done;
4243 2f51b5b3 2019-05-09 stsp } else {
4244 2f51b5b3 2019-05-09 stsp /* Entry is unchanged; just copy it. */
4245 2f51b5b3 2019-05-09 stsp err = got_object_tree_entry_dup(&new_te, te);
4246 2f51b5b3 2019-05-09 stsp if (err)
4247 2f51b5b3 2019-05-09 stsp goto done;
4248 2f51b5b3 2019-05-09 stsp err = insert_tree_entry(new_te, &paths);
4249 2f51b5b3 2019-05-09 stsp if (err)
4250 2f51b5b3 2019-05-09 stsp goto done;
4251 56e0773d 2019-11-28 stsp nentries++;
4252 2f51b5b3 2019-05-09 stsp }
4253 ca2503ea 2019-05-09 stsp }
4254 ed175427 2019-05-09 stsp }
4255 0b5cc0d6 2019-05-09 stsp
4256 036813ee 2019-05-09 stsp /* Write new list of entries; deleted entries have been dropped. */
4257 56e0773d 2019-11-28 stsp err = got_object_tree_create(new_tree_id, &paths, nentries, repo);
4258 ed175427 2019-05-09 stsp done:
4259 036813ee 2019-05-09 stsp got_pathlist_free(&paths);
4260 ed175427 2019-05-09 stsp return err;
4261 ed175427 2019-05-09 stsp }
4262 ed175427 2019-05-09 stsp
4263 ebf99748 2019-05-09 stsp static const struct got_error *
4264 ebf99748 2019-05-09 stsp update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
4265 72fd46fa 2019-09-06 stsp struct got_object_id *new_base_commit_id, struct got_fileindex *fileindex,
4266 72fd46fa 2019-09-06 stsp int have_staged_files)
4267 ebf99748 2019-05-09 stsp {
4268 8ec7bf54 2019-07-12 stsp const struct got_error *err = NULL;
4269 ebf99748 2019-05-09 stsp struct got_pathlist_entry *pe;
4270 ebf99748 2019-05-09 stsp
4271 ebf99748 2019-05-09 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4272 ebf99748 2019-05-09 stsp struct got_fileindex_entry *ie;
4273 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4274 ebf99748 2019-05-09 stsp
4275 d6c87207 2019-08-02 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
4276 ebf99748 2019-05-09 stsp if (ie) {
4277 5f8a88c6 2019-08-03 stsp if (ct->status == GOT_STATUS_DELETE ||
4278 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_DELETE) {
4279 ebf99748 2019-05-09 stsp got_fileindex_entry_remove(fileindex, ie);
4280 5f8a88c6 2019-08-03 stsp } else if (ct->staged_status == GOT_STATUS_ADD ||
4281 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY) {
4282 5f8a88c6 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
4283 5f8a88c6 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
4284 5f8a88c6 2019-08-03 stsp err = got_fileindex_entry_update(ie,
4285 5f8a88c6 2019-08-03 stsp ct->ondisk_path, ct->staged_blob_id->sha1,
4286 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
4287 72fd46fa 2019-09-06 stsp !have_staged_files);
4288 ebf99748 2019-05-09 stsp } else
4289 ebf99748 2019-05-09 stsp err = got_fileindex_entry_update(ie,
4290 e75eb4da 2019-05-10 stsp ct->ondisk_path, ct->blob_id->sha1,
4291 72fd46fa 2019-09-06 stsp new_base_commit_id->sha1,
4292 72fd46fa 2019-09-06 stsp !have_staged_files);
4293 ebf99748 2019-05-09 stsp } else {
4294 ebf99748 2019-05-09 stsp err = got_fileindex_entry_alloc(&ie,
4295 e75eb4da 2019-05-10 stsp ct->ondisk_path, pe->path, ct->blob_id->sha1,
4296 ebf99748 2019-05-09 stsp new_base_commit_id->sha1);
4297 ebf99748 2019-05-09 stsp if (err)
4298 af12c6b9 2019-06-04 stsp break;
4299 ebf99748 2019-05-09 stsp err = got_fileindex_entry_add(fileindex, ie);
4300 ebf99748 2019-05-09 stsp if (err)
4301 af12c6b9 2019-06-04 stsp break;
4302 ebf99748 2019-05-09 stsp }
4303 ebf99748 2019-05-09 stsp }
4304 d56d26ce 2019-05-10 stsp return err;
4305 d56d26ce 2019-05-10 stsp }
4306 735ef5ac 2019-08-03 stsp
4307 d56d26ce 2019-05-10 stsp
4308 d56d26ce 2019-05-10 stsp static const struct got_error *
4309 735ef5ac 2019-08-03 stsp check_out_of_date(const char *in_repo_path, unsigned char status,
4310 5f8a88c6 2019-08-03 stsp unsigned char staged_status, struct got_object_id *base_blob_id,
4311 5f8a88c6 2019-08-03 stsp struct got_object_id *base_commit_id,
4312 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id, struct got_repository *repo,
4313 735ef5ac 2019-08-03 stsp int ood_errcode)
4314 d56d26ce 2019-05-10 stsp {
4315 d56d26ce 2019-05-10 stsp const struct got_error *err = NULL;
4316 9bead371 2019-07-28 stsp struct got_object_id *id = NULL;
4317 1a36436d 2019-06-10 stsp
4318 5f8a88c6 2019-08-03 stsp if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
4319 1a36436d 2019-06-10 stsp /* Trivial case: base commit == head commit */
4320 735ef5ac 2019-08-03 stsp if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
4321 1a36436d 2019-06-10 stsp return NULL;
4322 9bead371 2019-07-28 stsp /*
4323 9bead371 2019-07-28 stsp * Ensure file content which local changes were based
4324 9bead371 2019-07-28 stsp * on matches file content in the branch head.
4325 9bead371 2019-07-28 stsp */
4326 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
4327 735ef5ac 2019-08-03 stsp in_repo_path);
4328 9bead371 2019-07-28 stsp if (err) {
4329 aa9f8247 2019-08-05 stsp if (err->code == GOT_ERR_NO_TREE_ENTRY)
4330 aa9f8247 2019-08-05 stsp err = got_error(ood_errcode);
4331 1a36436d 2019-06-10 stsp goto done;
4332 735ef5ac 2019-08-03 stsp } else if (got_object_id_cmp(id, base_blob_id) != 0)
4333 735ef5ac 2019-08-03 stsp err = got_error(ood_errcode);
4334 1a36436d 2019-06-10 stsp } else {
4335 1a36436d 2019-06-10 stsp /* Require that added files don't exist in the branch head. */
4336 735ef5ac 2019-08-03 stsp err = got_object_id_by_path(&id, repo, head_commit_id,
4337 735ef5ac 2019-08-03 stsp in_repo_path);
4338 1a36436d 2019-06-10 stsp if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
4339 1a36436d 2019-06-10 stsp goto done;
4340 735ef5ac 2019-08-03 stsp err = id ? got_error(ood_errcode) : NULL;
4341 1a36436d 2019-06-10 stsp }
4342 1a36436d 2019-06-10 stsp done:
4343 1a36436d 2019-06-10 stsp free(id);
4344 1a36436d 2019-06-10 stsp return err;
4345 ebf99748 2019-05-09 stsp }
4346 ebf99748 2019-05-09 stsp
4347 c4296144 2019-05-09 stsp const struct got_error *
4348 39cd0ff6 2019-07-12 stsp commit_worktree(struct got_object_id **new_commit_id,
4349 39cd0ff6 2019-07-12 stsp struct got_pathlist_head *commitable_paths,
4350 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id, struct got_worktree *worktree,
4351 5c1e53bc 2019-07-28 stsp const char *author, const char *committer,
4352 33ad4cbe 2019-05-12 jcs got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
4353 afa376bf 2019-05-09 stsp got_worktree_status_cb status_cb, void *status_arg,
4354 afa376bf 2019-05-09 stsp struct got_repository *repo)
4355 c4296144 2019-05-09 stsp {
4356 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL;
4357 c4296144 2019-05-09 stsp struct got_pathlist_entry *pe;
4358 bc70eb79 2019-05-09 stsp const char *head_ref_name = NULL;
4359 588edf97 2019-05-10 stsp struct got_commit_object *head_commit = NULL;
4360 09f5bd90 2019-05-09 stsp struct got_reference *head_ref2 = NULL;
4361 09f5bd90 2019-05-09 stsp struct got_object_id *head_commit_id2 = NULL;
4362 588edf97 2019-05-10 stsp struct got_tree_object *head_tree = NULL;
4363 036813ee 2019-05-09 stsp struct got_object_id *new_tree_id = NULL;
4364 de18fc63 2019-05-09 stsp struct got_object_id_queue parent_ids;
4365 de18fc63 2019-05-09 stsp struct got_object_qid *pid = NULL;
4366 33ad4cbe 2019-05-12 jcs char *logmsg = NULL;
4367 c4296144 2019-05-09 stsp
4368 c4296144 2019-05-09 stsp *new_commit_id = NULL;
4369 c4296144 2019-05-09 stsp
4370 de18fc63 2019-05-09 stsp SIMPLEQ_INIT(&parent_ids);
4371 675c7539 2019-05-09 stsp
4372 588edf97 2019-05-10 stsp err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
4373 588edf97 2019-05-10 stsp if (err)
4374 588edf97 2019-05-10 stsp goto done;
4375 de18fc63 2019-05-09 stsp
4376 588edf97 2019-05-10 stsp err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
4377 588edf97 2019-05-10 stsp if (err)
4378 588edf97 2019-05-10 stsp goto done;
4379 588edf97 2019-05-10 stsp
4380 33ad4cbe 2019-05-12 jcs if (commit_msg_cb != NULL) {
4381 39cd0ff6 2019-07-12 stsp err = commit_msg_cb(commitable_paths, &logmsg, commit_arg);
4382 33ad4cbe 2019-05-12 jcs if (err)
4383 33ad4cbe 2019-05-12 jcs goto done;
4384 33ad4cbe 2019-05-12 jcs }
4385 c4296144 2019-05-09 stsp
4386 33ad4cbe 2019-05-12 jcs if (logmsg == NULL || strlen(logmsg) == 0) {
4387 33ad4cbe 2019-05-12 jcs err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
4388 33ad4cbe 2019-05-12 jcs goto done;
4389 33ad4cbe 2019-05-12 jcs }
4390 33ad4cbe 2019-05-12 jcs
4391 cf066bf8 2019-05-09 stsp /* Create blobs from added and modified files and record their IDs. */
4392 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, commitable_paths, entry) {
4393 33ad4cbe 2019-05-12 jcs struct got_commitable *ct = pe->data;
4394 cf066bf8 2019-05-09 stsp char *ondisk_path;
4395 cf066bf8 2019-05-09 stsp
4396 5f8a88c6 2019-08-03 stsp /* Blobs for staged files already exist. */
4397 5f8a88c6 2019-08-03 stsp if (ct->staged_status == GOT_STATUS_ADD ||
4398 5f8a88c6 2019-08-03 stsp ct->staged_status == GOT_STATUS_MODIFY)
4399 5f8a88c6 2019-08-03 stsp continue;
4400 5f8a88c6 2019-08-03 stsp
4401 cf066bf8 2019-05-09 stsp if (ct->status != GOT_STATUS_ADD &&
4402 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODIFY &&
4403 1ebedb77 2019-10-19 stsp ct->status != GOT_STATUS_MODE_CHANGE)
4404 cf066bf8 2019-05-09 stsp continue;
4405 cf066bf8 2019-05-09 stsp
4406 cf066bf8 2019-05-09 stsp if (asprintf(&ondisk_path, "%s/%s",
4407 cf066bf8 2019-05-09 stsp worktree->root_path, pe->path) == -1) {
4408 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
4409 cf066bf8 2019-05-09 stsp goto done;
4410 cf066bf8 2019-05-09 stsp }
4411 e75eb4da 2019-05-10 stsp err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
4412 a7055788 2019-05-09 stsp free(ondisk_path);
4413 cf066bf8 2019-05-09 stsp if (err)
4414 cf066bf8 2019-05-09 stsp goto done;
4415 cf066bf8 2019-05-09 stsp }
4416 036813ee 2019-05-09 stsp
4417 036813ee 2019-05-09 stsp /* Recursively write new tree objects. */
4418 39cd0ff6 2019-07-12 stsp err = write_tree(&new_tree_id, head_tree, "/", commitable_paths,
4419 afa376bf 2019-05-09 stsp status_cb, status_arg, repo);
4420 036813ee 2019-05-09 stsp if (err)
4421 036813ee 2019-05-09 stsp goto done;
4422 036813ee 2019-05-09 stsp
4423 de18fc63 2019-05-09 stsp err = got_object_qid_alloc(&pid, worktree->base_commit_id);
4424 de18fc63 2019-05-09 stsp if (err)
4425 de18fc63 2019-05-09 stsp goto done;
4426 de18fc63 2019-05-09 stsp SIMPLEQ_INSERT_TAIL(&parent_ids, pid, entry);
4427 de18fc63 2019-05-09 stsp err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
4428 de18fc63 2019-05-09 stsp 1, author, time(NULL), committer, time(NULL), logmsg, repo);
4429 de18fc63 2019-05-09 stsp got_object_qid_free(pid);
4430 33ad4cbe 2019-05-12 jcs if (logmsg != NULL)
4431 33ad4cbe 2019-05-12 jcs free(logmsg);
4432 9d40349a 2019-05-09 stsp if (err)
4433 9d40349a 2019-05-09 stsp goto done;
4434 9d40349a 2019-05-09 stsp
4435 09f5bd90 2019-05-09 stsp /* Check if a concurrent commit to our branch has occurred. */
4436 bc70eb79 2019-05-09 stsp head_ref_name = got_worktree_get_head_ref_name(worktree);
4437 bc70eb79 2019-05-09 stsp if (head_ref_name == NULL) {
4438 638f9024 2019-05-13 stsp err = got_error_from_errno("got_worktree_get_head_ref_name");
4439 09f5bd90 2019-05-09 stsp goto done;
4440 09f5bd90 2019-05-09 stsp }
4441 2f17228e 2019-05-12 stsp /* Lock the reference here to prevent concurrent modification. */
4442 2f17228e 2019-05-12 stsp err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
4443 09f5bd90 2019-05-09 stsp if (err)
4444 09f5bd90 2019-05-09 stsp goto done;
4445 09f5bd90 2019-05-09 stsp err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
4446 ebf99748 2019-05-09 stsp if (err)
4447 ebf99748 2019-05-09 stsp goto done;
4448 09f5bd90 2019-05-09 stsp if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
4449 09f5bd90 2019-05-09 stsp err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
4450 09f5bd90 2019-05-09 stsp goto done;
4451 09f5bd90 2019-05-09 stsp }
4452 09f5bd90 2019-05-09 stsp /* Update branch head in repository. */
4453 2f17228e 2019-05-12 stsp err = got_ref_change_ref(head_ref2, *new_commit_id);
4454 f2c16586 2019-05-09 stsp if (err)
4455 f2c16586 2019-05-09 stsp goto done;
4456 2f17228e 2019-05-12 stsp err = got_ref_write(head_ref2, repo);
4457 f2c16586 2019-05-09 stsp if (err)
4458 f2c16586 2019-05-09 stsp goto done;
4459 f2c16586 2019-05-09 stsp
4460 09f5bd90 2019-05-09 stsp err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
4461 09f5bd90 2019-05-09 stsp if (err)
4462 09f5bd90 2019-05-09 stsp goto done;
4463 09f5bd90 2019-05-09 stsp
4464 ebf99748 2019-05-09 stsp err = ref_base_commit(worktree, repo);
4465 ebf99748 2019-05-09 stsp if (err)
4466 ebf99748 2019-05-09 stsp goto done;
4467 c4296144 2019-05-09 stsp done:
4468 588edf97 2019-05-10 stsp if (head_tree)
4469 588edf97 2019-05-10 stsp got_object_tree_close(head_tree);
4470 588edf97 2019-05-10 stsp if (head_commit)
4471 588edf97 2019-05-10 stsp got_object_commit_close(head_commit);
4472 09f5bd90 2019-05-09 stsp free(head_commit_id2);
4473 2f17228e 2019-05-12 stsp if (head_ref2) {
4474 2f17228e 2019-05-12 stsp unlockerr = got_ref_unlock(head_ref2);
4475 2f17228e 2019-05-12 stsp if (unlockerr && err == NULL)
4476 2f17228e 2019-05-12 stsp err = unlockerr;
4477 09f5bd90 2019-05-09 stsp got_ref_close(head_ref2);
4478 39cd0ff6 2019-07-12 stsp }
4479 39cd0ff6 2019-07-12 stsp return err;
4480 39cd0ff6 2019-07-12 stsp }
4481 5c1e53bc 2019-07-28 stsp
4482 5c1e53bc 2019-07-28 stsp static const struct got_error *
4483 5c1e53bc 2019-07-28 stsp check_path_is_commitable(const char *path,
4484 5c1e53bc 2019-07-28 stsp struct got_pathlist_head *commitable_paths)
4485 5c1e53bc 2019-07-28 stsp {
4486 5c1e53bc 2019-07-28 stsp struct got_pathlist_entry *cpe = NULL;
4487 5c1e53bc 2019-07-28 stsp size_t path_len = strlen(path);
4488 39cd0ff6 2019-07-12 stsp
4489 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(cpe, commitable_paths, entry) {
4490 5c1e53bc 2019-07-28 stsp struct got_commitable *ct = cpe->data;
4491 5c1e53bc 2019-07-28 stsp const char *ct_path = ct->path;
4492 5c1e53bc 2019-07-28 stsp
4493 5c1e53bc 2019-07-28 stsp while (ct_path[0] == '/')
4494 5c1e53bc 2019-07-28 stsp ct_path++;
4495 5c1e53bc 2019-07-28 stsp
4496 5c1e53bc 2019-07-28 stsp if (strcmp(path, ct_path) == 0 ||
4497 5c1e53bc 2019-07-28 stsp got_path_is_child(ct_path, path, path_len))
4498 5c1e53bc 2019-07-28 stsp break;
4499 5c1e53bc 2019-07-28 stsp }
4500 5c1e53bc 2019-07-28 stsp
4501 5c1e53bc 2019-07-28 stsp if (cpe == NULL)
4502 5c1e53bc 2019-07-28 stsp return got_error_path(path, GOT_ERR_BAD_PATH);
4503 5c1e53bc 2019-07-28 stsp
4504 5c1e53bc 2019-07-28 stsp return NULL;
4505 5c1e53bc 2019-07-28 stsp }
4506 5c1e53bc 2019-07-28 stsp
4507 f0b75401 2019-08-03 stsp static const struct got_error *
4508 f0b75401 2019-08-03 stsp check_staged_file(void *arg, struct got_fileindex_entry *ie)
4509 f0b75401 2019-08-03 stsp {
4510 f0b75401 2019-08-03 stsp int *have_staged_files = arg;
4511 f0b75401 2019-08-03 stsp
4512 f0b75401 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
4513 f0b75401 2019-08-03 stsp *have_staged_files = 1;
4514 f0b75401 2019-08-03 stsp return got_error(GOT_ERR_CANCELLED);
4515 f0b75401 2019-08-03 stsp }
4516 f0b75401 2019-08-03 stsp
4517 f0b75401 2019-08-03 stsp return NULL;
4518 f0b75401 2019-08-03 stsp }
4519 f0b75401 2019-08-03 stsp
4520 5f8a88c6 2019-08-03 stsp static const struct got_error *
4521 5f8a88c6 2019-08-03 stsp check_non_staged_files(struct got_fileindex *fileindex,
4522 5f8a88c6 2019-08-03 stsp struct got_pathlist_head *paths)
4523 5f8a88c6 2019-08-03 stsp {
4524 5f8a88c6 2019-08-03 stsp struct got_pathlist_entry *pe;
4525 5f8a88c6 2019-08-03 stsp struct got_fileindex_entry *ie;
4526 5f8a88c6 2019-08-03 stsp
4527 5f8a88c6 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
4528 5f8a88c6 2019-08-03 stsp if (pe->path[0] == '\0')
4529 5f8a88c6 2019-08-03 stsp continue;
4530 5f8a88c6 2019-08-03 stsp ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
4531 5f8a88c6 2019-08-03 stsp if (ie == NULL)
4532 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path, GOT_ERR_BAD_PATH);
4533 5f8a88c6 2019-08-03 stsp if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
4534 5f8a88c6 2019-08-03 stsp return got_error_path(pe->path,
4535 5f8a88c6 2019-08-03 stsp GOT_ERR_FILE_NOT_STAGED);
4536 5f8a88c6 2019-08-03 stsp }
4537 5f8a88c6 2019-08-03 stsp
4538 5f8a88c6 2019-08-03 stsp return NULL;
4539 5f8a88c6 2019-08-03 stsp }
4540 5f8a88c6 2019-08-03 stsp
4541 39cd0ff6 2019-07-12 stsp const struct got_error *
4542 39cd0ff6 2019-07-12 stsp got_worktree_commit(struct got_object_id **new_commit_id,
4543 5c1e53bc 2019-07-28 stsp struct got_worktree *worktree, struct got_pathlist_head *paths,
4544 39cd0ff6 2019-07-12 stsp const char *author, const char *committer,
4545 39cd0ff6 2019-07-12 stsp got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
4546 39cd0ff6 2019-07-12 stsp got_worktree_status_cb status_cb, void *status_arg,
4547 39cd0ff6 2019-07-12 stsp struct got_repository *repo)
4548 39cd0ff6 2019-07-12 stsp {
4549 39cd0ff6 2019-07-12 stsp const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
4550 39cd0ff6 2019-07-12 stsp struct got_fileindex *fileindex = NULL;
4551 5c1e53bc 2019-07-28 stsp char *fileindex_path = NULL;
4552 39cd0ff6 2019-07-12 stsp struct got_pathlist_head commitable_paths;
4553 39cd0ff6 2019-07-12 stsp struct collect_commitables_arg cc_arg;
4554 39cd0ff6 2019-07-12 stsp struct got_pathlist_entry *pe;
4555 39cd0ff6 2019-07-12 stsp struct got_reference *head_ref = NULL;
4556 39cd0ff6 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
4557 f0b75401 2019-08-03 stsp int have_staged_files = 0;
4558 39cd0ff6 2019-07-12 stsp
4559 39cd0ff6 2019-07-12 stsp *new_commit_id = NULL;
4560 39cd0ff6 2019-07-12 stsp
4561 39cd0ff6 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
4562 39cd0ff6 2019-07-12 stsp
4563 39cd0ff6 2019-07-12 stsp err = lock_worktree(worktree, LOCK_EX);
4564 39cd0ff6 2019-07-12 stsp if (err)
4565 39cd0ff6 2019-07-12 stsp goto done;
4566 39cd0ff6 2019-07-12 stsp
4567 39cd0ff6 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
4568 39cd0ff6 2019-07-12 stsp if (err)
4569 39cd0ff6 2019-07-12 stsp goto done;
4570 39cd0ff6 2019-07-12 stsp
4571 39cd0ff6 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
4572 39cd0ff6 2019-07-12 stsp if (err)
4573 39cd0ff6 2019-07-12 stsp goto done;
4574 39cd0ff6 2019-07-12 stsp
4575 39cd0ff6 2019-07-12 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
4576 39cd0ff6 2019-07-12 stsp if (err)
4577 39cd0ff6 2019-07-12 stsp goto done;
4578 39cd0ff6 2019-07-12 stsp
4579 5f8a88c6 2019-08-03 stsp err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
4580 5f8a88c6 2019-08-03 stsp &have_staged_files);
4581 5f8a88c6 2019-08-03 stsp if (err && err->code != GOT_ERR_CANCELLED)
4582 5f8a88c6 2019-08-03 stsp goto done;
4583 5f8a88c6 2019-08-03 stsp if (have_staged_files) {
4584 5f8a88c6 2019-08-03 stsp err = check_non_staged_files(fileindex, paths);
4585 5f8a88c6 2019-08-03 stsp if (err)
4586 5f8a88c6 2019-08-03 stsp goto done;
4587 5f8a88c6 2019-08-03 stsp }
4588 5f8a88c6 2019-08-03 stsp
4589 39cd0ff6 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
4590 39cd0ff6 2019-07-12 stsp cc_arg.worktree = worktree;
4591 39cd0ff6 2019-07-12 stsp cc_arg.repo = repo;
4592 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = have_staged_files;
4593 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
4594 5c1e53bc 2019-07-28 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
4595 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
4596 5c1e53bc 2019-07-28 stsp if (err)
4597 5c1e53bc 2019-07-28 stsp goto done;
4598 5c1e53bc 2019-07-28 stsp }
4599 39cd0ff6 2019-07-12 stsp
4600 39cd0ff6 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
4601 39cd0ff6 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
4602 39cd0ff6 2019-07-12 stsp goto done;
4603 5c1e53bc 2019-07-28 stsp }
4604 5c1e53bc 2019-07-28 stsp
4605 5c1e53bc 2019-07-28 stsp TAILQ_FOREACH(pe, paths, entry) {
4606 5c1e53bc 2019-07-28 stsp err = check_path_is_commitable(pe->path, &commitable_paths);
4607 5c1e53bc 2019-07-28 stsp if (err)
4608 5c1e53bc 2019-07-28 stsp goto done;
4609 39cd0ff6 2019-07-12 stsp }
4610 f0b75401 2019-08-03 stsp
4611 b50cabdf 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
4612 b50cabdf 2019-07-12 stsp struct got_commitable *ct = pe->data;
4613 f0b75401 2019-08-03 stsp const char *ct_path = ct->in_repo_path;
4614 f0b75401 2019-08-03 stsp
4615 f0b75401 2019-08-03 stsp while (ct_path[0] == '/')
4616 f0b75401 2019-08-03 stsp ct_path++;
4617 f0b75401 2019-08-03 stsp err = check_out_of_date(ct_path, ct->status,
4618 5f8a88c6 2019-08-03 stsp ct->staged_status, ct->base_blob_id, ct->base_commit_id,
4619 5f8a88c6 2019-08-03 stsp head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
4620 b50cabdf 2019-07-12 stsp if (err)
4621 b50cabdf 2019-07-12 stsp goto done;
4622 f0b75401 2019-08-03 stsp
4623 b50cabdf 2019-07-12 stsp }
4624 b50cabdf 2019-07-12 stsp
4625 39cd0ff6 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths,
4626 5c1e53bc 2019-07-28 stsp head_commit_id, worktree, author, committer,
4627 39cd0ff6 2019-07-12 stsp commit_msg_cb, commit_arg, status_cb, status_arg, repo);
4628 39cd0ff6 2019-07-12 stsp if (err)
4629 39cd0ff6 2019-07-12 stsp goto done;
4630 39cd0ff6 2019-07-12 stsp
4631 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
4632 72fd46fa 2019-09-06 stsp fileindex, have_staged_files);
4633 39cd0ff6 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
4634 39cd0ff6 2019-07-12 stsp if (sync_err && err == NULL)
4635 39cd0ff6 2019-07-12 stsp err = sync_err;
4636 39cd0ff6 2019-07-12 stsp done:
4637 39cd0ff6 2019-07-12 stsp if (fileindex)
4638 39cd0ff6 2019-07-12 stsp got_fileindex_free(fileindex);
4639 39cd0ff6 2019-07-12 stsp free(fileindex_path);
4640 39cd0ff6 2019-07-12 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
4641 39cd0ff6 2019-07-12 stsp if (unlockerr && err == NULL)
4642 39cd0ff6 2019-07-12 stsp err = unlockerr;
4643 39cd0ff6 2019-07-12 stsp TAILQ_FOREACH(pe, &commitable_paths, entry) {
4644 39cd0ff6 2019-07-12 stsp struct got_commitable *ct = pe->data;
4645 39cd0ff6 2019-07-12 stsp free_commitable(ct);
4646 39cd0ff6 2019-07-12 stsp }
4647 39cd0ff6 2019-07-12 stsp got_pathlist_free(&commitable_paths);
4648 c4296144 2019-05-09 stsp return err;
4649 8656d6c4 2019-05-20 stsp }
4650 8656d6c4 2019-05-20 stsp
4651 8656d6c4 2019-05-20 stsp const char *
4652 8656d6c4 2019-05-20 stsp got_commitable_get_path(struct got_commitable *ct)
4653 8656d6c4 2019-05-20 stsp {
4654 8656d6c4 2019-05-20 stsp return ct->path;
4655 8656d6c4 2019-05-20 stsp }
4656 8656d6c4 2019-05-20 stsp
4657 8656d6c4 2019-05-20 stsp unsigned int
4658 8656d6c4 2019-05-20 stsp got_commitable_get_status(struct got_commitable *ct)
4659 8656d6c4 2019-05-20 stsp {
4660 8656d6c4 2019-05-20 stsp return ct->status;
4661 818c7501 2019-07-11 stsp }
4662 818c7501 2019-07-11 stsp
4663 818c7501 2019-07-11 stsp struct check_rebase_ok_arg {
4664 818c7501 2019-07-11 stsp struct got_worktree *worktree;
4665 818c7501 2019-07-11 stsp struct got_repository *repo;
4666 818c7501 2019-07-11 stsp };
4667 818c7501 2019-07-11 stsp
4668 818c7501 2019-07-11 stsp static const struct got_error *
4669 818c7501 2019-07-11 stsp check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
4670 818c7501 2019-07-11 stsp {
4671 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
4672 818c7501 2019-07-11 stsp struct check_rebase_ok_arg *a = arg;
4673 818c7501 2019-07-11 stsp unsigned char status;
4674 818c7501 2019-07-11 stsp struct stat sb;
4675 818c7501 2019-07-11 stsp char *ondisk_path;
4676 818c7501 2019-07-11 stsp
4677 6a263307 2019-07-27 stsp /* Reject rebase of a work tree with mixed base commits. */
4678 6a263307 2019-07-27 stsp if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
4679 6a263307 2019-07-27 stsp SHA1_DIGEST_LENGTH))
4680 6a263307 2019-07-27 stsp return got_error(GOT_ERR_MIXED_COMMITS);
4681 818c7501 2019-07-11 stsp
4682 818c7501 2019-07-11 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
4683 818c7501 2019-07-11 stsp == -1)
4684 818c7501 2019-07-11 stsp return got_error_from_errno("asprintf");
4685 818c7501 2019-07-11 stsp
4686 b9622844 2019-08-03 stsp /* Reject rebase of a work tree with modified or staged files. */
4687 7f91a133 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
4688 818c7501 2019-07-11 stsp free(ondisk_path);
4689 818c7501 2019-07-11 stsp if (err)
4690 818c7501 2019-07-11 stsp return err;
4691 818c7501 2019-07-11 stsp
4692 6a263307 2019-07-27 stsp if (status != GOT_STATUS_NO_CHANGE)
4693 818c7501 2019-07-11 stsp return got_error(GOT_ERR_MODIFIED);
4694 b9622844 2019-08-03 stsp if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
4695 b9622844 2019-08-03 stsp return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
4696 818c7501 2019-07-11 stsp
4697 818c7501 2019-07-11 stsp return NULL;
4698 818c7501 2019-07-11 stsp }
4699 818c7501 2019-07-11 stsp
4700 818c7501 2019-07-11 stsp const struct got_error *
4701 818c7501 2019-07-11 stsp got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
4702 3e3a69f1 2019-07-25 stsp struct got_reference **tmp_branch, struct got_fileindex **fileindex,
4703 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_reference *branch,
4704 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
4705 818c7501 2019-07-11 stsp {
4706 818c7501 2019-07-11 stsp const struct got_error *err = NULL;
4707 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
4708 818c7501 2019-07-11 stsp char *branch_ref_name = NULL;
4709 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
4710 818c7501 2019-07-11 stsp struct check_rebase_ok_arg ok_arg;
4711 818c7501 2019-07-11 stsp struct got_reference *wt_branch = NULL, *branch_ref = NULL;
4712 e51d7b55 2020-01-04 stsp struct got_object_id *wt_branch_tip = NULL;
4713 818c7501 2019-07-11 stsp
4714 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
4715 818c7501 2019-07-11 stsp *tmp_branch = NULL;
4716 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4717 818c7501 2019-07-11 stsp
4718 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
4719 818c7501 2019-07-11 stsp if (err)
4720 818c7501 2019-07-11 stsp return err;
4721 818c7501 2019-07-11 stsp
4722 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
4723 818c7501 2019-07-11 stsp if (err)
4724 818c7501 2019-07-11 stsp goto done;
4725 818c7501 2019-07-11 stsp
4726 818c7501 2019-07-11 stsp ok_arg.worktree = worktree;
4727 818c7501 2019-07-11 stsp ok_arg.repo = repo;
4728 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
4729 818c7501 2019-07-11 stsp &ok_arg);
4730 818c7501 2019-07-11 stsp if (err)
4731 818c7501 2019-07-11 stsp goto done;
4732 818c7501 2019-07-11 stsp
4733 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4734 818c7501 2019-07-11 stsp if (err)
4735 818c7501 2019-07-11 stsp goto done;
4736 818c7501 2019-07-11 stsp
4737 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4738 818c7501 2019-07-11 stsp if (err)
4739 818c7501 2019-07-11 stsp goto done;
4740 818c7501 2019-07-11 stsp
4741 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4742 818c7501 2019-07-11 stsp if (err)
4743 818c7501 2019-07-11 stsp goto done;
4744 818c7501 2019-07-11 stsp
4745 818c7501 2019-07-11 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
4746 818c7501 2019-07-11 stsp 0);
4747 e51d7b55 2020-01-04 stsp if (err)
4748 e51d7b55 2020-01-04 stsp goto done;
4749 e51d7b55 2020-01-04 stsp
4750 e51d7b55 2020-01-04 stsp err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
4751 818c7501 2019-07-11 stsp if (err)
4752 818c7501 2019-07-11 stsp goto done;
4753 e51d7b55 2020-01-04 stsp if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
4754 e51d7b55 2020-01-04 stsp err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
4755 e51d7b55 2020-01-04 stsp goto done;
4756 e51d7b55 2020-01-04 stsp }
4757 818c7501 2019-07-11 stsp
4758 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(new_base_branch_ref,
4759 818c7501 2019-07-11 stsp new_base_branch_ref_name, wt_branch);
4760 818c7501 2019-07-11 stsp if (err)
4761 818c7501 2019-07-11 stsp goto done;
4762 818c7501 2019-07-11 stsp err = got_ref_write(*new_base_branch_ref, repo);
4763 818c7501 2019-07-11 stsp if (err)
4764 818c7501 2019-07-11 stsp goto done;
4765 818c7501 2019-07-11 stsp
4766 818c7501 2019-07-11 stsp /* TODO Lock original branch's ref while rebasing? */
4767 818c7501 2019-07-11 stsp
4768 818c7501 2019-07-11 stsp err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
4769 818c7501 2019-07-11 stsp if (err)
4770 818c7501 2019-07-11 stsp goto done;
4771 818c7501 2019-07-11 stsp
4772 818c7501 2019-07-11 stsp err = got_ref_write(branch_ref, repo);
4773 818c7501 2019-07-11 stsp if (err)
4774 818c7501 2019-07-11 stsp goto done;
4775 818c7501 2019-07-11 stsp
4776 818c7501 2019-07-11 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
4777 818c7501 2019-07-11 stsp worktree->base_commit_id);
4778 818c7501 2019-07-11 stsp if (err)
4779 818c7501 2019-07-11 stsp goto done;
4780 818c7501 2019-07-11 stsp err = got_ref_write(*tmp_branch, repo);
4781 818c7501 2019-07-11 stsp if (err)
4782 818c7501 2019-07-11 stsp goto done;
4783 818c7501 2019-07-11 stsp
4784 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
4785 818c7501 2019-07-11 stsp if (err)
4786 818c7501 2019-07-11 stsp goto done;
4787 818c7501 2019-07-11 stsp done:
4788 818c7501 2019-07-11 stsp free(fileindex_path);
4789 818c7501 2019-07-11 stsp free(tmp_branch_name);
4790 818c7501 2019-07-11 stsp free(new_base_branch_ref_name);
4791 818c7501 2019-07-11 stsp free(branch_ref_name);
4792 818c7501 2019-07-11 stsp if (branch_ref)
4793 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
4794 818c7501 2019-07-11 stsp if (wt_branch)
4795 818c7501 2019-07-11 stsp got_ref_close(wt_branch);
4796 e51d7b55 2020-01-04 stsp free(wt_branch_tip);
4797 818c7501 2019-07-11 stsp if (err) {
4798 818c7501 2019-07-11 stsp if (*new_base_branch_ref) {
4799 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch_ref);
4800 818c7501 2019-07-11 stsp *new_base_branch_ref = NULL;
4801 818c7501 2019-07-11 stsp }
4802 818c7501 2019-07-11 stsp if (*tmp_branch) {
4803 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
4804 818c7501 2019-07-11 stsp *tmp_branch = NULL;
4805 818c7501 2019-07-11 stsp }
4806 3e3a69f1 2019-07-25 stsp if (*fileindex) {
4807 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
4808 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4809 3e3a69f1 2019-07-25 stsp }
4810 818c7501 2019-07-11 stsp lock_worktree(worktree, LOCK_SH);
4811 818c7501 2019-07-11 stsp }
4812 818c7501 2019-07-11 stsp return err;
4813 818c7501 2019-07-11 stsp }
4814 818c7501 2019-07-11 stsp
4815 818c7501 2019-07-11 stsp const struct got_error *
4816 818c7501 2019-07-11 stsp got_worktree_rebase_continue(struct got_object_id **commit_id,
4817 818c7501 2019-07-11 stsp struct got_reference **new_base_branch, struct got_reference **tmp_branch,
4818 3e3a69f1 2019-07-25 stsp struct got_reference **branch, struct got_fileindex **fileindex,
4819 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_repository *repo)
4820 818c7501 2019-07-11 stsp {
4821 818c7501 2019-07-11 stsp const struct got_error *err;
4822 818c7501 2019-07-11 stsp char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
4823 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
4824 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL, *branch_ref = NULL;
4825 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
4826 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
4827 818c7501 2019-07-11 stsp
4828 818c7501 2019-07-11 stsp *commit_id = NULL;
4829 3e3a69f1 2019-07-25 stsp *new_base_branch = NULL;
4830 3e3a69f1 2019-07-25 stsp *tmp_branch = NULL;
4831 3e3a69f1 2019-07-25 stsp *branch = NULL;
4832 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4833 3e3a69f1 2019-07-25 stsp
4834 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
4835 3e3a69f1 2019-07-25 stsp if (err)
4836 3e3a69f1 2019-07-25 stsp return err;
4837 818c7501 2019-07-11 stsp
4838 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
4839 3e3a69f1 2019-07-25 stsp if (err)
4840 f032f1f7 2019-08-04 stsp goto done;
4841 f032f1f7 2019-08-04 stsp
4842 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
4843 f032f1f7 2019-08-04 stsp &have_staged_files);
4844 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
4845 f032f1f7 2019-08-04 stsp goto done;
4846 f032f1f7 2019-08-04 stsp if (have_staged_files) {
4847 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
4848 3e3a69f1 2019-07-25 stsp goto done;
4849 f032f1f7 2019-08-04 stsp }
4850 3e3a69f1 2019-07-25 stsp
4851 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4852 818c7501 2019-07-11 stsp if (err)
4853 f032f1f7 2019-08-04 stsp goto done;
4854 818c7501 2019-07-11 stsp
4855 818c7501 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
4856 818c7501 2019-07-11 stsp if (err)
4857 818c7501 2019-07-11 stsp goto done;
4858 818c7501 2019-07-11 stsp
4859 818c7501 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
4860 818c7501 2019-07-11 stsp if (err)
4861 818c7501 2019-07-11 stsp goto done;
4862 818c7501 2019-07-11 stsp
4863 818c7501 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
4864 818c7501 2019-07-11 stsp if (err)
4865 818c7501 2019-07-11 stsp goto done;
4866 818c7501 2019-07-11 stsp
4867 818c7501 2019-07-11 stsp err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
4868 818c7501 2019-07-11 stsp if (err)
4869 818c7501 2019-07-11 stsp goto done;
4870 818c7501 2019-07-11 stsp
4871 818c7501 2019-07-11 stsp err = got_ref_open(branch, repo,
4872 818c7501 2019-07-11 stsp got_ref_get_symref_target(branch_ref), 0);
4873 818c7501 2019-07-11 stsp if (err)
4874 818c7501 2019-07-11 stsp goto done;
4875 818c7501 2019-07-11 stsp
4876 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
4877 818c7501 2019-07-11 stsp if (err)
4878 818c7501 2019-07-11 stsp goto done;
4879 818c7501 2019-07-11 stsp
4880 818c7501 2019-07-11 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
4881 818c7501 2019-07-11 stsp if (err)
4882 818c7501 2019-07-11 stsp goto done;
4883 818c7501 2019-07-11 stsp
4884 818c7501 2019-07-11 stsp err = got_ref_open(new_base_branch, repo,
4885 818c7501 2019-07-11 stsp new_base_branch_ref_name, 0);
4886 818c7501 2019-07-11 stsp if (err)
4887 818c7501 2019-07-11 stsp goto done;
4888 818c7501 2019-07-11 stsp
4889 818c7501 2019-07-11 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
4890 818c7501 2019-07-11 stsp if (err)
4891 818c7501 2019-07-11 stsp goto done;
4892 818c7501 2019-07-11 stsp done:
4893 818c7501 2019-07-11 stsp free(commit_ref_name);
4894 818c7501 2019-07-11 stsp free(branch_ref_name);
4895 3e3a69f1 2019-07-25 stsp free(fileindex_path);
4896 818c7501 2019-07-11 stsp if (commit_ref)
4897 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
4898 818c7501 2019-07-11 stsp if (branch_ref)
4899 818c7501 2019-07-11 stsp got_ref_close(branch_ref);
4900 818c7501 2019-07-11 stsp if (err) {
4901 818c7501 2019-07-11 stsp free(*commit_id);
4902 818c7501 2019-07-11 stsp *commit_id = NULL;
4903 818c7501 2019-07-11 stsp if (*tmp_branch) {
4904 818c7501 2019-07-11 stsp got_ref_close(*tmp_branch);
4905 818c7501 2019-07-11 stsp *tmp_branch = NULL;
4906 818c7501 2019-07-11 stsp }
4907 818c7501 2019-07-11 stsp if (*new_base_branch) {
4908 818c7501 2019-07-11 stsp got_ref_close(*new_base_branch);
4909 818c7501 2019-07-11 stsp *new_base_branch = NULL;
4910 818c7501 2019-07-11 stsp }
4911 818c7501 2019-07-11 stsp if (*branch) {
4912 818c7501 2019-07-11 stsp got_ref_close(*branch);
4913 818c7501 2019-07-11 stsp *branch = NULL;
4914 818c7501 2019-07-11 stsp }
4915 3e3a69f1 2019-07-25 stsp if (*fileindex) {
4916 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
4917 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
4918 3e3a69f1 2019-07-25 stsp }
4919 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_SH);
4920 818c7501 2019-07-11 stsp }
4921 818c7501 2019-07-11 stsp return err;
4922 c4296144 2019-05-09 stsp }
4923 818c7501 2019-07-11 stsp
4924 818c7501 2019-07-11 stsp const struct got_error *
4925 818c7501 2019-07-11 stsp got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
4926 818c7501 2019-07-11 stsp {
4927 818c7501 2019-07-11 stsp const struct got_error *err;
4928 818c7501 2019-07-11 stsp char *tmp_branch_name = NULL;
4929 818c7501 2019-07-11 stsp
4930 818c7501 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
4931 818c7501 2019-07-11 stsp if (err)
4932 818c7501 2019-07-11 stsp return err;
4933 818c7501 2019-07-11 stsp
4934 818c7501 2019-07-11 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
4935 818c7501 2019-07-11 stsp free(tmp_branch_name);
4936 818c7501 2019-07-11 stsp return NULL;
4937 818c7501 2019-07-11 stsp }
4938 818c7501 2019-07-11 stsp
4939 818c7501 2019-07-11 stsp static const struct got_error *
4940 818c7501 2019-07-11 stsp collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
4941 818c7501 2019-07-11 stsp char **logmsg, void *arg)
4942 818c7501 2019-07-11 stsp {
4943 0ebf8283 2019-07-24 stsp *logmsg = arg;
4944 818c7501 2019-07-11 stsp return NULL;
4945 818c7501 2019-07-11 stsp }
4946 818c7501 2019-07-11 stsp
4947 818c7501 2019-07-11 stsp static const struct got_error *
4948 88d0e355 2019-08-03 stsp rebase_status(void *arg, unsigned char status, unsigned char staged_status,
4949 88d0e355 2019-08-03 stsp const char *path, struct got_object_id *blob_id,
4950 12463d8b 2019-12-13 stsp struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4951 12463d8b 2019-12-13 stsp int dirfd, const char *de_name)
4952 818c7501 2019-07-11 stsp {
4953 818c7501 2019-07-11 stsp return NULL;
4954 01757395 2019-07-12 stsp }
4955 01757395 2019-07-12 stsp
4956 01757395 2019-07-12 stsp struct collect_merged_paths_arg {
4957 01757395 2019-07-12 stsp got_worktree_checkout_cb progress_cb;
4958 01757395 2019-07-12 stsp void *progress_arg;
4959 01757395 2019-07-12 stsp struct got_pathlist_head *merged_paths;
4960 01757395 2019-07-12 stsp };
4961 01757395 2019-07-12 stsp
4962 01757395 2019-07-12 stsp static const struct got_error *
4963 01757395 2019-07-12 stsp collect_merged_paths(void *arg, unsigned char status, const char *path)
4964 01757395 2019-07-12 stsp {
4965 01757395 2019-07-12 stsp const struct got_error *err;
4966 01757395 2019-07-12 stsp struct collect_merged_paths_arg *a = arg;
4967 01757395 2019-07-12 stsp char *p;
4968 01757395 2019-07-12 stsp struct got_pathlist_entry *new;
4969 01757395 2019-07-12 stsp
4970 01757395 2019-07-12 stsp err = (*a->progress_cb)(a->progress_arg, status, path);
4971 01757395 2019-07-12 stsp if (err)
4972 01757395 2019-07-12 stsp return err;
4973 01757395 2019-07-12 stsp
4974 01757395 2019-07-12 stsp if (status != GOT_STATUS_MERGE &&
4975 01757395 2019-07-12 stsp status != GOT_STATUS_ADD &&
4976 01757395 2019-07-12 stsp status != GOT_STATUS_DELETE &&
4977 01757395 2019-07-12 stsp status != GOT_STATUS_CONFLICT)
4978 01757395 2019-07-12 stsp return NULL;
4979 01757395 2019-07-12 stsp
4980 01757395 2019-07-12 stsp p = strdup(path);
4981 01757395 2019-07-12 stsp if (p == NULL)
4982 01757395 2019-07-12 stsp return got_error_from_errno("strdup");
4983 01757395 2019-07-12 stsp
4984 01757395 2019-07-12 stsp err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
4985 01757395 2019-07-12 stsp if (err || new == NULL)
4986 01757395 2019-07-12 stsp free(p);
4987 01757395 2019-07-12 stsp return err;
4988 01757395 2019-07-12 stsp }
4989 01757395 2019-07-12 stsp
4990 01757395 2019-07-12 stsp void
4991 01757395 2019-07-12 stsp got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
4992 01757395 2019-07-12 stsp {
4993 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
4994 01757395 2019-07-12 stsp
4995 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry)
4996 01757395 2019-07-12 stsp free((char *)pe->path);
4997 01757395 2019-07-12 stsp
4998 01757395 2019-07-12 stsp got_pathlist_free(merged_paths);
4999 818c7501 2019-07-11 stsp }
5000 818c7501 2019-07-11 stsp
5001 0ebf8283 2019-07-24 stsp static const struct got_error *
5002 0ebf8283 2019-07-24 stsp store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
5003 de05890f 2020-03-05 stsp int is_rebase, struct got_repository *repo)
5004 818c7501 2019-07-11 stsp {
5005 818c7501 2019-07-11 stsp const struct got_error *err;
5006 818c7501 2019-07-11 stsp struct got_reference *commit_ref = NULL;
5007 818c7501 2019-07-11 stsp
5008 818c7501 2019-07-11 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5009 818c7501 2019-07-11 stsp if (err) {
5010 818c7501 2019-07-11 stsp if (err->code != GOT_ERR_NOT_REF)
5011 818c7501 2019-07-11 stsp goto done;
5012 818c7501 2019-07-11 stsp err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
5013 818c7501 2019-07-11 stsp if (err)
5014 818c7501 2019-07-11 stsp goto done;
5015 818c7501 2019-07-11 stsp err = got_ref_write(commit_ref, repo);
5016 818c7501 2019-07-11 stsp if (err)
5017 818c7501 2019-07-11 stsp goto done;
5018 de05890f 2020-03-05 stsp } else if (is_rebase) {
5019 818c7501 2019-07-11 stsp struct got_object_id *stored_id;
5020 818c7501 2019-07-11 stsp int cmp;
5021 818c7501 2019-07-11 stsp
5022 818c7501 2019-07-11 stsp err = got_ref_resolve(&stored_id, repo, commit_ref);
5023 818c7501 2019-07-11 stsp if (err)
5024 818c7501 2019-07-11 stsp goto done;
5025 818c7501 2019-07-11 stsp cmp = got_object_id_cmp(commit_id, stored_id);
5026 818c7501 2019-07-11 stsp free(stored_id);
5027 818c7501 2019-07-11 stsp if (cmp != 0) {
5028 818c7501 2019-07-11 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
5029 818c7501 2019-07-11 stsp goto done;
5030 818c7501 2019-07-11 stsp }
5031 818c7501 2019-07-11 stsp }
5032 0ebf8283 2019-07-24 stsp done:
5033 0ebf8283 2019-07-24 stsp if (commit_ref)
5034 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
5035 0ebf8283 2019-07-24 stsp return err;
5036 0ebf8283 2019-07-24 stsp }
5037 0ebf8283 2019-07-24 stsp
5038 0ebf8283 2019-07-24 stsp static const struct got_error *
5039 0ebf8283 2019-07-24 stsp rebase_merge_files(struct got_pathlist_head *merged_paths,
5040 0ebf8283 2019-07-24 stsp const char *commit_ref_name, struct got_worktree *worktree,
5041 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
5042 3e3a69f1 2019-07-25 stsp struct got_object_id *commit_id, struct got_repository *repo,
5043 3e3a69f1 2019-07-25 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
5044 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
5045 0ebf8283 2019-07-24 stsp {
5046 0ebf8283 2019-07-24 stsp const struct got_error *err;
5047 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
5048 0ebf8283 2019-07-24 stsp struct collect_merged_paths_arg cmp_arg;
5049 3e3a69f1 2019-07-25 stsp char *fileindex_path;
5050 818c7501 2019-07-11 stsp
5051 0ebf8283 2019-07-24 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
5052 0ebf8283 2019-07-24 stsp
5053 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5054 0ebf8283 2019-07-24 stsp if (err)
5055 0ebf8283 2019-07-24 stsp return err;
5056 0ebf8283 2019-07-24 stsp
5057 01757395 2019-07-12 stsp cmp_arg.progress_cb = progress_cb;
5058 01757395 2019-07-12 stsp cmp_arg.progress_arg = progress_arg;
5059 01757395 2019-07-12 stsp cmp_arg.merged_paths = merged_paths;
5060 818c7501 2019-07-11 stsp err = merge_files(worktree, fileindex, fileindex_path,
5061 01757395 2019-07-12 stsp parent_commit_id, commit_id, repo, collect_merged_paths,
5062 01757395 2019-07-12 stsp &cmp_arg, cancel_cb, cancel_arg);
5063 818c7501 2019-07-11 stsp if (commit_ref)
5064 818c7501 2019-07-11 stsp got_ref_close(commit_ref);
5065 818c7501 2019-07-11 stsp return err;
5066 818c7501 2019-07-11 stsp }
5067 818c7501 2019-07-11 stsp
5068 818c7501 2019-07-11 stsp const struct got_error *
5069 0ebf8283 2019-07-24 stsp got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
5070 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5071 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
5072 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
5073 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
5074 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
5075 818c7501 2019-07-11 stsp {
5076 0ebf8283 2019-07-24 stsp const struct got_error *err;
5077 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5078 0ebf8283 2019-07-24 stsp
5079 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5080 0ebf8283 2019-07-24 stsp if (err)
5081 0ebf8283 2019-07-24 stsp return err;
5082 0ebf8283 2019-07-24 stsp
5083 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 1, repo);
5084 0ebf8283 2019-07-24 stsp if (err)
5085 0ebf8283 2019-07-24 stsp goto done;
5086 0ebf8283 2019-07-24 stsp
5087 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
5088 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
5089 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
5090 0ebf8283 2019-07-24 stsp done:
5091 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5092 0ebf8283 2019-07-24 stsp return err;
5093 0ebf8283 2019-07-24 stsp }
5094 0ebf8283 2019-07-24 stsp
5095 0ebf8283 2019-07-24 stsp const struct got_error *
5096 0ebf8283 2019-07-24 stsp got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
5097 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5098 3e3a69f1 2019-07-25 stsp struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
5099 3e3a69f1 2019-07-25 stsp struct got_repository *repo,
5100 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
5101 e6209546 2019-08-22 stsp got_cancel_cb cancel_cb, void *cancel_arg)
5102 0ebf8283 2019-07-24 stsp {
5103 0ebf8283 2019-07-24 stsp const struct got_error *err;
5104 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5105 0ebf8283 2019-07-24 stsp
5106 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5107 0ebf8283 2019-07-24 stsp if (err)
5108 0ebf8283 2019-07-24 stsp return err;
5109 0ebf8283 2019-07-24 stsp
5110 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
5111 0ebf8283 2019-07-24 stsp if (err)
5112 0ebf8283 2019-07-24 stsp goto done;
5113 0ebf8283 2019-07-24 stsp
5114 0ebf8283 2019-07-24 stsp err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
5115 3e3a69f1 2019-07-25 stsp fileindex, parent_commit_id, commit_id, repo, progress_cb,
5116 3e3a69f1 2019-07-25 stsp progress_arg, cancel_cb, cancel_arg);
5117 0ebf8283 2019-07-24 stsp done:
5118 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5119 0ebf8283 2019-07-24 stsp return err;
5120 0ebf8283 2019-07-24 stsp }
5121 0ebf8283 2019-07-24 stsp
5122 0ebf8283 2019-07-24 stsp static const struct got_error *
5123 0ebf8283 2019-07-24 stsp rebase_commit(struct got_object_id **new_commit_id,
5124 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
5125 3e3a69f1 2019-07-25 stsp struct got_worktree *worktree, struct got_fileindex *fileindex,
5126 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_commit_object *orig_commit,
5127 3e3a69f1 2019-07-25 stsp const char *new_logmsg, struct got_repository *repo)
5128 0ebf8283 2019-07-24 stsp {
5129 a0e95631 2019-07-12 stsp const struct got_error *err, *sync_err;
5130 a0e95631 2019-07-12 stsp struct got_pathlist_head commitable_paths;
5131 a0e95631 2019-07-12 stsp struct collect_commitables_arg cc_arg;
5132 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
5133 a0e95631 2019-07-12 stsp struct got_reference *head_ref = NULL;
5134 a0e95631 2019-07-12 stsp struct got_object_id *head_commit_id = NULL;
5135 0ebf8283 2019-07-24 stsp char *logmsg = NULL;
5136 818c7501 2019-07-11 stsp
5137 a0e95631 2019-07-12 stsp TAILQ_INIT(&commitable_paths);
5138 eb3df2c4 2019-07-12 stsp *new_commit_id = NULL;
5139 a0e95631 2019-07-12 stsp
5140 877a927c 2019-07-12 stsp /* Work tree is locked/unlocked during rebase preparation/teardown. */
5141 818c7501 2019-07-11 stsp
5142 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5143 a0e95631 2019-07-12 stsp if (err)
5144 3e3a69f1 2019-07-25 stsp return err;
5145 a0e95631 2019-07-12 stsp
5146 a0e95631 2019-07-12 stsp cc_arg.commitable_paths = &commitable_paths;
5147 a0e95631 2019-07-12 stsp cc_arg.worktree = worktree;
5148 a0e95631 2019-07-12 stsp cc_arg.repo = repo;
5149 5f8a88c6 2019-08-03 stsp cc_arg.have_staged_files = 0;
5150 01757395 2019-07-12 stsp /*
5151 01757395 2019-07-12 stsp * If possible get the status of individual files directly to
5152 01757395 2019-07-12 stsp * avoid crawling the entire work tree once per rebased commit.
5153 01757395 2019-07-12 stsp * TODO: Ideally, merged_paths would contain a list of commitables
5154 01757395 2019-07-12 stsp * we could use so we could skip worktree_status() entirely.
5155 01757395 2019-07-12 stsp */
5156 01757395 2019-07-12 stsp if (merged_paths) {
5157 01757395 2019-07-12 stsp struct got_pathlist_entry *pe;
5158 8f8646e5 2019-07-25 stsp if (TAILQ_EMPTY(merged_paths)) {
5159 8f8646e5 2019-07-25 stsp err = got_error(GOT_ERR_NO_MERGED_PATHS);
5160 8f8646e5 2019-07-25 stsp goto done;
5161 8f8646e5 2019-07-25 stsp }
5162 01757395 2019-07-12 stsp TAILQ_FOREACH(pe, merged_paths, entry) {
5163 01757395 2019-07-12 stsp err = worktree_status(worktree, pe->path, fileindex,
5164 f2a9dc41 2019-12-13 tracey repo, collect_commitables, &cc_arg, NULL, NULL, 0,
5165 f2a9dc41 2019-12-13 tracey 0);
5166 01757395 2019-07-12 stsp if (err)
5167 01757395 2019-07-12 stsp goto done;
5168 01757395 2019-07-12 stsp }
5169 01757395 2019-07-12 stsp } else {
5170 01757395 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
5171 f2a9dc41 2019-12-13 tracey collect_commitables, &cc_arg, NULL, NULL, 0, 0);
5172 01757395 2019-07-12 stsp if (err)
5173 01757395 2019-07-12 stsp goto done;
5174 01757395 2019-07-12 stsp }
5175 a0e95631 2019-07-12 stsp
5176 a0e95631 2019-07-12 stsp if (TAILQ_EMPTY(&commitable_paths)) {
5177 a0e95631 2019-07-12 stsp /* No-op change; commit will be elided. */
5178 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
5179 a0e95631 2019-07-12 stsp if (err)
5180 a0e95631 2019-07-12 stsp goto done;
5181 a0e95631 2019-07-12 stsp err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
5182 a0e95631 2019-07-12 stsp goto done;
5183 ff0d2220 2019-07-11 stsp }
5184 818c7501 2019-07-11 stsp
5185 a0e95631 2019-07-12 stsp err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
5186 edd02c5e 2019-07-11 stsp if (err)
5187 edd02c5e 2019-07-11 stsp goto done;
5188 edd02c5e 2019-07-11 stsp
5189 a0e95631 2019-07-12 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
5190 818c7501 2019-07-11 stsp if (err)
5191 818c7501 2019-07-11 stsp goto done;
5192 818c7501 2019-07-11 stsp
5193 5943eee2 2019-08-13 stsp if (new_logmsg) {
5194 0ebf8283 2019-07-24 stsp logmsg = strdup(new_logmsg);
5195 5943eee2 2019-08-13 stsp if (logmsg == NULL) {
5196 5943eee2 2019-08-13 stsp err = got_error_from_errno("strdup");
5197 5943eee2 2019-08-13 stsp goto done;
5198 5943eee2 2019-08-13 stsp }
5199 5943eee2 2019-08-13 stsp } else {
5200 5943eee2 2019-08-13 stsp err = got_object_commit_get_logmsg(&logmsg, orig_commit);
5201 5943eee2 2019-08-13 stsp if (err)
5202 5943eee2 2019-08-13 stsp goto done;
5203 5943eee2 2019-08-13 stsp }
5204 0ebf8283 2019-07-24 stsp
5205 5943eee2 2019-08-13 stsp /* NB: commit_worktree will call free(logmsg) */
5206 a0e95631 2019-07-12 stsp err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
5207 5c1e53bc 2019-07-28 stsp worktree, got_object_commit_get_author(orig_commit),
5208 a0e95631 2019-07-12 stsp got_object_commit_get_committer(orig_commit),
5209 0ebf8283 2019-07-24 stsp collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
5210 a0e95631 2019-07-12 stsp if (err)
5211 a0e95631 2019-07-12 stsp goto done;
5212 a0e95631 2019-07-12 stsp
5213 818c7501 2019-07-11 stsp err = got_ref_change_ref(tmp_branch, *new_commit_id);
5214 a0e95631 2019-07-12 stsp if (err)
5215 a0e95631 2019-07-12 stsp goto done;
5216 a0e95631 2019-07-12 stsp
5217 a0e95631 2019-07-12 stsp err = got_ref_delete(commit_ref, repo);
5218 a0e95631 2019-07-12 stsp if (err)
5219 a0e95631 2019-07-12 stsp goto done;
5220 a0e95631 2019-07-12 stsp
5221 93ec1b5f 2019-07-12 stsp err = update_fileindex_after_commit(&commitable_paths, *new_commit_id,
5222 72fd46fa 2019-09-06 stsp fileindex, 0);
5223 a0e95631 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5224 a0e95631 2019-07-12 stsp if (sync_err && err == NULL)
5225 a0e95631 2019-07-12 stsp err = sync_err;
5226 818c7501 2019-07-11 stsp done:
5227 a0e95631 2019-07-12 stsp free(fileindex_path);
5228 a0e95631 2019-07-12 stsp free(head_commit_id);
5229 a0e95631 2019-07-12 stsp if (head_ref)
5230 a0e95631 2019-07-12 stsp got_ref_close(head_ref);
5231 818c7501 2019-07-11 stsp if (err) {
5232 818c7501 2019-07-11 stsp free(*new_commit_id);
5233 818c7501 2019-07-11 stsp *new_commit_id = NULL;
5234 818c7501 2019-07-11 stsp }
5235 818c7501 2019-07-11 stsp return err;
5236 818c7501 2019-07-11 stsp }
5237 818c7501 2019-07-11 stsp
5238 818c7501 2019-07-11 stsp const struct got_error *
5239 0ebf8283 2019-07-24 stsp got_worktree_rebase_commit(struct got_object_id **new_commit_id,
5240 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
5241 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5242 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
5243 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, struct got_repository *repo)
5244 0ebf8283 2019-07-24 stsp {
5245 0ebf8283 2019-07-24 stsp const struct got_error *err;
5246 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5247 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
5248 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id = NULL;
5249 0ebf8283 2019-07-24 stsp
5250 0ebf8283 2019-07-24 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5251 0ebf8283 2019-07-24 stsp if (err)
5252 0ebf8283 2019-07-24 stsp return err;
5253 0ebf8283 2019-07-24 stsp
5254 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5255 0ebf8283 2019-07-24 stsp if (err)
5256 0ebf8283 2019-07-24 stsp goto done;
5257 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&commit_id, repo, commit_ref);
5258 0ebf8283 2019-07-24 stsp if (err)
5259 0ebf8283 2019-07-24 stsp goto done;
5260 0ebf8283 2019-07-24 stsp if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
5261 0ebf8283 2019-07-24 stsp err = got_error(GOT_ERR_REBASE_COMMITID);
5262 0ebf8283 2019-07-24 stsp goto done;
5263 0ebf8283 2019-07-24 stsp }
5264 0ebf8283 2019-07-24 stsp
5265 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
5266 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, NULL, repo);
5267 0ebf8283 2019-07-24 stsp done:
5268 0ebf8283 2019-07-24 stsp if (commit_ref)
5269 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
5270 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5271 0ebf8283 2019-07-24 stsp free(commit_id);
5272 0ebf8283 2019-07-24 stsp return err;
5273 0ebf8283 2019-07-24 stsp }
5274 0ebf8283 2019-07-24 stsp
5275 0ebf8283 2019-07-24 stsp const struct got_error *
5276 0ebf8283 2019-07-24 stsp got_worktree_histedit_commit(struct got_object_id **new_commit_id,
5277 0ebf8283 2019-07-24 stsp struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
5278 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5279 3e3a69f1 2019-07-25 stsp struct got_commit_object *orig_commit,
5280 0ebf8283 2019-07-24 stsp struct got_object_id *orig_commit_id, const char *new_logmsg,
5281 0ebf8283 2019-07-24 stsp struct got_repository *repo)
5282 0ebf8283 2019-07-24 stsp {
5283 0ebf8283 2019-07-24 stsp const struct got_error *err;
5284 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5285 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
5286 0ebf8283 2019-07-24 stsp
5287 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5288 0ebf8283 2019-07-24 stsp if (err)
5289 0ebf8283 2019-07-24 stsp return err;
5290 0ebf8283 2019-07-24 stsp
5291 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5292 0ebf8283 2019-07-24 stsp if (err)
5293 0ebf8283 2019-07-24 stsp goto done;
5294 0ebf8283 2019-07-24 stsp
5295 0ebf8283 2019-07-24 stsp err = rebase_commit(new_commit_id, merged_paths, commit_ref,
5296 3e3a69f1 2019-07-25 stsp worktree, fileindex, tmp_branch, orig_commit, new_logmsg, repo);
5297 0ebf8283 2019-07-24 stsp done:
5298 0ebf8283 2019-07-24 stsp if (commit_ref)
5299 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
5300 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5301 0ebf8283 2019-07-24 stsp return err;
5302 0ebf8283 2019-07-24 stsp }
5303 0ebf8283 2019-07-24 stsp
5304 0ebf8283 2019-07-24 stsp const struct got_error *
5305 3e3a69f1 2019-07-25 stsp got_worktree_rebase_postpone(struct got_worktree *worktree,
5306 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
5307 818c7501 2019-07-11 stsp {
5308 3e3a69f1 2019-07-25 stsp if (fileindex)
5309 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5310 818c7501 2019-07-11 stsp return lock_worktree(worktree, LOCK_SH);
5311 69844fba 2019-07-11 stsp }
5312 69844fba 2019-07-11 stsp
5313 69844fba 2019-07-11 stsp static const struct got_error *
5314 69844fba 2019-07-11 stsp delete_ref(const char *name, struct got_repository *repo)
5315 69844fba 2019-07-11 stsp {
5316 69844fba 2019-07-11 stsp const struct got_error *err;
5317 69844fba 2019-07-11 stsp struct got_reference *ref;
5318 69844fba 2019-07-11 stsp
5319 69844fba 2019-07-11 stsp err = got_ref_open(&ref, repo, name, 0);
5320 69844fba 2019-07-11 stsp if (err) {
5321 69844fba 2019-07-11 stsp if (err->code == GOT_ERR_NOT_REF)
5322 69844fba 2019-07-11 stsp return NULL;
5323 69844fba 2019-07-11 stsp return err;
5324 69844fba 2019-07-11 stsp }
5325 69844fba 2019-07-11 stsp
5326 69844fba 2019-07-11 stsp err = got_ref_delete(ref, repo);
5327 69844fba 2019-07-11 stsp got_ref_close(ref);
5328 69844fba 2019-07-11 stsp return err;
5329 818c7501 2019-07-11 stsp }
5330 818c7501 2019-07-11 stsp
5331 69844fba 2019-07-11 stsp static const struct got_error *
5332 69844fba 2019-07-11 stsp delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
5333 69844fba 2019-07-11 stsp {
5334 69844fba 2019-07-11 stsp const struct got_error *err;
5335 69844fba 2019-07-11 stsp char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
5336 69844fba 2019-07-11 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
5337 69844fba 2019-07-11 stsp
5338 69844fba 2019-07-11 stsp err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
5339 69844fba 2019-07-11 stsp if (err)
5340 69844fba 2019-07-11 stsp goto done;
5341 69844fba 2019-07-11 stsp err = delete_ref(tmp_branch_name, repo);
5342 69844fba 2019-07-11 stsp if (err)
5343 69844fba 2019-07-11 stsp goto done;
5344 69844fba 2019-07-11 stsp
5345 69844fba 2019-07-11 stsp err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
5346 69844fba 2019-07-11 stsp if (err)
5347 69844fba 2019-07-11 stsp goto done;
5348 69844fba 2019-07-11 stsp err = delete_ref(new_base_branch_ref_name, repo);
5349 69844fba 2019-07-11 stsp if (err)
5350 69844fba 2019-07-11 stsp goto done;
5351 69844fba 2019-07-11 stsp
5352 69844fba 2019-07-11 stsp err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
5353 69844fba 2019-07-11 stsp if (err)
5354 69844fba 2019-07-11 stsp goto done;
5355 69844fba 2019-07-11 stsp err = delete_ref(branch_ref_name, repo);
5356 69844fba 2019-07-11 stsp if (err)
5357 69844fba 2019-07-11 stsp goto done;
5358 69844fba 2019-07-11 stsp
5359 69844fba 2019-07-11 stsp err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
5360 69844fba 2019-07-11 stsp if (err)
5361 69844fba 2019-07-11 stsp goto done;
5362 69844fba 2019-07-11 stsp err = delete_ref(commit_ref_name, repo);
5363 69844fba 2019-07-11 stsp if (err)
5364 69844fba 2019-07-11 stsp goto done;
5365 69844fba 2019-07-11 stsp
5366 69844fba 2019-07-11 stsp done:
5367 69844fba 2019-07-11 stsp free(tmp_branch_name);
5368 69844fba 2019-07-11 stsp free(new_base_branch_ref_name);
5369 69844fba 2019-07-11 stsp free(branch_ref_name);
5370 69844fba 2019-07-11 stsp free(commit_ref_name);
5371 69844fba 2019-07-11 stsp return err;
5372 69844fba 2019-07-11 stsp }
5373 69844fba 2019-07-11 stsp
5374 818c7501 2019-07-11 stsp const struct got_error *
5375 818c7501 2019-07-11 stsp got_worktree_rebase_complete(struct got_worktree *worktree,
5376 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *new_base_branch,
5377 3e3a69f1 2019-07-25 stsp struct got_reference *tmp_branch, struct got_reference *rebased_branch,
5378 818c7501 2019-07-11 stsp struct got_repository *repo)
5379 818c7501 2019-07-11 stsp {
5380 818c7501 2019-07-11 stsp const struct got_error *err, *unlockerr;
5381 818c7501 2019-07-11 stsp struct got_object_id *new_head_commit_id = NULL;
5382 818c7501 2019-07-11 stsp
5383 818c7501 2019-07-11 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
5384 818c7501 2019-07-11 stsp if (err)
5385 818c7501 2019-07-11 stsp return err;
5386 818c7501 2019-07-11 stsp
5387 818c7501 2019-07-11 stsp err = got_ref_change_ref(rebased_branch, new_head_commit_id);
5388 818c7501 2019-07-11 stsp if (err)
5389 818c7501 2019-07-11 stsp goto done;
5390 818c7501 2019-07-11 stsp
5391 818c7501 2019-07-11 stsp err = got_ref_write(rebased_branch, repo);
5392 818c7501 2019-07-11 stsp if (err)
5393 818c7501 2019-07-11 stsp goto done;
5394 818c7501 2019-07-11 stsp
5395 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, rebased_branch);
5396 818c7501 2019-07-11 stsp if (err)
5397 818c7501 2019-07-11 stsp goto done;
5398 818c7501 2019-07-11 stsp
5399 69844fba 2019-07-11 stsp err = delete_rebase_refs(worktree, repo);
5400 818c7501 2019-07-11 stsp done:
5401 3e3a69f1 2019-07-25 stsp if (fileindex)
5402 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5403 818c7501 2019-07-11 stsp free(new_head_commit_id);
5404 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5405 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
5406 818c7501 2019-07-11 stsp err = unlockerr;
5407 818c7501 2019-07-11 stsp return err;
5408 818c7501 2019-07-11 stsp }
5409 818c7501 2019-07-11 stsp
5410 818c7501 2019-07-11 stsp const struct got_error *
5411 818c7501 2019-07-11 stsp got_worktree_rebase_abort(struct got_worktree *worktree,
5412 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
5413 3e3a69f1 2019-07-25 stsp struct got_reference *new_base_branch,
5414 818c7501 2019-07-11 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
5415 818c7501 2019-07-11 stsp {
5416 ca355955 2019-07-12 stsp const struct got_error *err, *unlockerr, *sync_err;
5417 818c7501 2019-07-11 stsp struct got_reference *resolved = NULL;
5418 818c7501 2019-07-11 stsp struct got_object_id *commit_id = NULL;
5419 818c7501 2019-07-11 stsp char *fileindex_path = NULL;
5420 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
5421 a3a2faf2 2019-07-12 stsp struct got_object_id *tree_id = NULL;
5422 818c7501 2019-07-11 stsp
5423 818c7501 2019-07-11 stsp err = lock_worktree(worktree, LOCK_EX);
5424 818c7501 2019-07-11 stsp if (err)
5425 818c7501 2019-07-11 stsp return err;
5426 818c7501 2019-07-11 stsp
5427 818c7501 2019-07-11 stsp err = got_ref_open(&resolved, repo,
5428 818c7501 2019-07-11 stsp got_ref_get_symref_target(new_base_branch), 0);
5429 818c7501 2019-07-11 stsp if (err)
5430 818c7501 2019-07-11 stsp goto done;
5431 818c7501 2019-07-11 stsp
5432 818c7501 2019-07-11 stsp err = got_worktree_set_head_ref(worktree, resolved);
5433 818c7501 2019-07-11 stsp if (err)
5434 818c7501 2019-07-11 stsp goto done;
5435 818c7501 2019-07-11 stsp
5436 818c7501 2019-07-11 stsp /*
5437 818c7501 2019-07-11 stsp * XXX commits to the base branch could have happened while
5438 818c7501 2019-07-11 stsp * we were busy rebasing; should we store the original commit ID
5439 818c7501 2019-07-11 stsp * when rebase begins and read it back here?
5440 818c7501 2019-07-11 stsp */
5441 818c7501 2019-07-11 stsp err = got_ref_resolve(&commit_id, repo, resolved);
5442 818c7501 2019-07-11 stsp if (err)
5443 818c7501 2019-07-11 stsp goto done;
5444 818c7501 2019-07-11 stsp
5445 818c7501 2019-07-11 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
5446 818c7501 2019-07-11 stsp if (err)
5447 818c7501 2019-07-11 stsp goto done;
5448 818c7501 2019-07-11 stsp
5449 ca355955 2019-07-12 stsp err = got_object_id_by_path(&tree_id, repo,
5450 ca355955 2019-07-12 stsp worktree->base_commit_id, worktree->path_prefix);
5451 ca355955 2019-07-12 stsp if (err)
5452 ca355955 2019-07-12 stsp goto done;
5453 ca355955 2019-07-12 stsp
5454 ca355955 2019-07-12 stsp err = delete_rebase_refs(worktree, repo);
5455 ca355955 2019-07-12 stsp if (err)
5456 ca355955 2019-07-12 stsp goto done;
5457 ca355955 2019-07-12 stsp
5458 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5459 818c7501 2019-07-11 stsp if (err)
5460 818c7501 2019-07-11 stsp goto done;
5461 818c7501 2019-07-11 stsp
5462 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
5463 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
5464 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
5465 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
5466 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
5467 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
5468 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
5469 347d1d3e 2019-07-12 stsp err = worktree_status(worktree, "", fileindex, repo,
5470 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
5471 55bd499d 2019-07-12 stsp if (err)
5472 1f1abb7e 2019-08-08 stsp goto sync;
5473 55bd499d 2019-07-12 stsp
5474 267fb255 2019-07-12 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
5475 267fb255 2019-07-12 stsp repo, progress_cb, progress_arg, NULL, NULL);
5476 ca355955 2019-07-12 stsp sync:
5477 ca355955 2019-07-12 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5478 ca355955 2019-07-12 stsp if (sync_err && err == NULL)
5479 ca355955 2019-07-12 stsp err = sync_err;
5480 818c7501 2019-07-11 stsp done:
5481 818c7501 2019-07-11 stsp got_ref_close(resolved);
5482 a3a2faf2 2019-07-12 stsp free(tree_id);
5483 818c7501 2019-07-11 stsp free(commit_id);
5484 0ebf8283 2019-07-24 stsp if (fileindex)
5485 0ebf8283 2019-07-24 stsp got_fileindex_free(fileindex);
5486 0ebf8283 2019-07-24 stsp free(fileindex_path);
5487 0ebf8283 2019-07-24 stsp
5488 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5489 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
5490 0ebf8283 2019-07-24 stsp err = unlockerr;
5491 0ebf8283 2019-07-24 stsp return err;
5492 0ebf8283 2019-07-24 stsp }
5493 0ebf8283 2019-07-24 stsp
5494 0ebf8283 2019-07-24 stsp const struct got_error *
5495 0ebf8283 2019-07-24 stsp got_worktree_histedit_prepare(struct got_reference **tmp_branch,
5496 0ebf8283 2019-07-24 stsp struct got_reference **branch_ref, struct got_object_id **base_commit_id,
5497 3e3a69f1 2019-07-25 stsp struct got_fileindex **fileindex, struct got_worktree *worktree,
5498 3e3a69f1 2019-07-25 stsp struct got_repository *repo)
5499 0ebf8283 2019-07-24 stsp {
5500 0ebf8283 2019-07-24 stsp const struct got_error *err = NULL;
5501 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
5502 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL;
5503 0ebf8283 2019-07-24 stsp char *base_commit_ref_name = NULL;
5504 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
5505 0ebf8283 2019-07-24 stsp struct check_rebase_ok_arg ok_arg;
5506 0ebf8283 2019-07-24 stsp struct got_reference *wt_branch = NULL;
5507 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
5508 0ebf8283 2019-07-24 stsp
5509 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5510 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
5511 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
5512 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5513 0ebf8283 2019-07-24 stsp
5514 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
5515 0ebf8283 2019-07-24 stsp if (err)
5516 0ebf8283 2019-07-24 stsp return err;
5517 0ebf8283 2019-07-24 stsp
5518 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5519 0ebf8283 2019-07-24 stsp if (err)
5520 0ebf8283 2019-07-24 stsp goto done;
5521 0ebf8283 2019-07-24 stsp
5522 0ebf8283 2019-07-24 stsp ok_arg.worktree = worktree;
5523 0ebf8283 2019-07-24 stsp ok_arg.repo = repo;
5524 3e3a69f1 2019-07-25 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5525 0ebf8283 2019-07-24 stsp &ok_arg);
5526 0ebf8283 2019-07-24 stsp if (err)
5527 0ebf8283 2019-07-24 stsp goto done;
5528 0ebf8283 2019-07-24 stsp
5529 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5530 0ebf8283 2019-07-24 stsp if (err)
5531 0ebf8283 2019-07-24 stsp goto done;
5532 0ebf8283 2019-07-24 stsp
5533 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5534 0ebf8283 2019-07-24 stsp if (err)
5535 0ebf8283 2019-07-24 stsp goto done;
5536 0ebf8283 2019-07-24 stsp
5537 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5538 0ebf8283 2019-07-24 stsp worktree);
5539 0ebf8283 2019-07-24 stsp if (err)
5540 0ebf8283 2019-07-24 stsp goto done;
5541 0ebf8283 2019-07-24 stsp
5542 0ebf8283 2019-07-24 stsp err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
5543 0ebf8283 2019-07-24 stsp 0);
5544 0ebf8283 2019-07-24 stsp if (err)
5545 0ebf8283 2019-07-24 stsp goto done;
5546 0ebf8283 2019-07-24 stsp
5547 0ebf8283 2019-07-24 stsp err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
5548 0ebf8283 2019-07-24 stsp if (err)
5549 0ebf8283 2019-07-24 stsp goto done;
5550 0ebf8283 2019-07-24 stsp
5551 0ebf8283 2019-07-24 stsp err = got_ref_write(*branch_ref, repo);
5552 0ebf8283 2019-07-24 stsp if (err)
5553 0ebf8283 2019-07-24 stsp goto done;
5554 0ebf8283 2019-07-24 stsp
5555 0ebf8283 2019-07-24 stsp err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
5556 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
5557 0ebf8283 2019-07-24 stsp if (err)
5558 0ebf8283 2019-07-24 stsp goto done;
5559 0ebf8283 2019-07-24 stsp err = got_ref_write(base_commit_ref, repo);
5560 0ebf8283 2019-07-24 stsp if (err)
5561 0ebf8283 2019-07-24 stsp goto done;
5562 0ebf8283 2019-07-24 stsp *base_commit_id = got_object_id_dup(worktree->base_commit_id);
5563 0ebf8283 2019-07-24 stsp if (*base_commit_id == NULL) {
5564 0ebf8283 2019-07-24 stsp err = got_error_from_errno("got_object_id_dup");
5565 0ebf8283 2019-07-24 stsp goto done;
5566 0ebf8283 2019-07-24 stsp }
5567 0ebf8283 2019-07-24 stsp
5568 0ebf8283 2019-07-24 stsp err = got_ref_alloc(tmp_branch, tmp_branch_name,
5569 0ebf8283 2019-07-24 stsp worktree->base_commit_id);
5570 0ebf8283 2019-07-24 stsp if (err)
5571 0ebf8283 2019-07-24 stsp goto done;
5572 0ebf8283 2019-07-24 stsp err = got_ref_write(*tmp_branch, repo);
5573 0ebf8283 2019-07-24 stsp if (err)
5574 0ebf8283 2019-07-24 stsp goto done;
5575 0ebf8283 2019-07-24 stsp
5576 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, *tmp_branch);
5577 0ebf8283 2019-07-24 stsp if (err)
5578 0ebf8283 2019-07-24 stsp goto done;
5579 0ebf8283 2019-07-24 stsp done:
5580 0ebf8283 2019-07-24 stsp free(fileindex_path);
5581 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
5582 0ebf8283 2019-07-24 stsp free(branch_ref_name);
5583 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
5584 0ebf8283 2019-07-24 stsp if (wt_branch)
5585 0ebf8283 2019-07-24 stsp got_ref_close(wt_branch);
5586 0ebf8283 2019-07-24 stsp if (err) {
5587 0ebf8283 2019-07-24 stsp if (*branch_ref) {
5588 0ebf8283 2019-07-24 stsp got_ref_close(*branch_ref);
5589 0ebf8283 2019-07-24 stsp *branch_ref = NULL;
5590 0ebf8283 2019-07-24 stsp }
5591 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
5592 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
5593 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5594 0ebf8283 2019-07-24 stsp }
5595 0ebf8283 2019-07-24 stsp free(*base_commit_id);
5596 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5597 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5598 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5599 3e3a69f1 2019-07-25 stsp }
5600 0ebf8283 2019-07-24 stsp lock_worktree(worktree, LOCK_SH);
5601 0ebf8283 2019-07-24 stsp }
5602 0ebf8283 2019-07-24 stsp return err;
5603 0ebf8283 2019-07-24 stsp }
5604 0ebf8283 2019-07-24 stsp
5605 0ebf8283 2019-07-24 stsp const struct got_error *
5606 3e3a69f1 2019-07-25 stsp got_worktree_histedit_postpone(struct got_worktree *worktree,
5607 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex)
5608 0ebf8283 2019-07-24 stsp {
5609 3e3a69f1 2019-07-25 stsp if (fileindex)
5610 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5611 0ebf8283 2019-07-24 stsp return lock_worktree(worktree, LOCK_SH);
5612 0ebf8283 2019-07-24 stsp }
5613 0ebf8283 2019-07-24 stsp
5614 0ebf8283 2019-07-24 stsp const struct got_error *
5615 0ebf8283 2019-07-24 stsp got_worktree_histedit_in_progress(int *in_progress,
5616 0ebf8283 2019-07-24 stsp struct got_worktree *worktree)
5617 0ebf8283 2019-07-24 stsp {
5618 0ebf8283 2019-07-24 stsp const struct got_error *err;
5619 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL;
5620 0ebf8283 2019-07-24 stsp
5621 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5622 0ebf8283 2019-07-24 stsp if (err)
5623 0ebf8283 2019-07-24 stsp return err;
5624 0ebf8283 2019-07-24 stsp
5625 0ebf8283 2019-07-24 stsp *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
5626 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
5627 0ebf8283 2019-07-24 stsp return NULL;
5628 0ebf8283 2019-07-24 stsp }
5629 0ebf8283 2019-07-24 stsp
5630 0ebf8283 2019-07-24 stsp const struct got_error *
5631 0ebf8283 2019-07-24 stsp got_worktree_histedit_continue(struct got_object_id **commit_id,
5632 0ebf8283 2019-07-24 stsp struct got_reference **tmp_branch, struct got_reference **branch_ref,
5633 3e3a69f1 2019-07-25 stsp struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
5634 0ebf8283 2019-07-24 stsp struct got_worktree *worktree, struct got_repository *repo)
5635 0ebf8283 2019-07-24 stsp {
5636 0ebf8283 2019-07-24 stsp const struct got_error *err;
5637 0ebf8283 2019-07-24 stsp char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
5638 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *branch_ref_name = NULL;
5639 0ebf8283 2019-07-24 stsp struct got_reference *commit_ref = NULL;
5640 0ebf8283 2019-07-24 stsp struct got_reference *base_commit_ref = NULL;
5641 3e3a69f1 2019-07-25 stsp char *fileindex_path = NULL;
5642 f032f1f7 2019-08-04 stsp int have_staged_files = 0;
5643 0ebf8283 2019-07-24 stsp
5644 0ebf8283 2019-07-24 stsp *commit_id = NULL;
5645 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5646 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
5647 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5648 0ebf8283 2019-07-24 stsp
5649 3e3a69f1 2019-07-25 stsp err = lock_worktree(worktree, LOCK_EX);
5650 3e3a69f1 2019-07-25 stsp if (err)
5651 3e3a69f1 2019-07-25 stsp return err;
5652 3e3a69f1 2019-07-25 stsp
5653 3e3a69f1 2019-07-25 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5654 3e3a69f1 2019-07-25 stsp if (err)
5655 f032f1f7 2019-08-04 stsp goto done;
5656 f032f1f7 2019-08-04 stsp
5657 f032f1f7 2019-08-04 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
5658 f032f1f7 2019-08-04 stsp &have_staged_files);
5659 f032f1f7 2019-08-04 stsp if (err && err->code != GOT_ERR_CANCELLED)
5660 f032f1f7 2019-08-04 stsp goto done;
5661 f032f1f7 2019-08-04 stsp if (have_staged_files) {
5662 f032f1f7 2019-08-04 stsp err = got_error(GOT_ERR_STAGED_PATHS);
5663 3e3a69f1 2019-07-25 stsp goto done;
5664 f032f1f7 2019-08-04 stsp }
5665 3e3a69f1 2019-07-25 stsp
5666 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5667 0ebf8283 2019-07-24 stsp if (err)
5668 f032f1f7 2019-08-04 stsp goto done;
5669 0ebf8283 2019-07-24 stsp
5670 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5671 0ebf8283 2019-07-24 stsp if (err)
5672 0ebf8283 2019-07-24 stsp goto done;
5673 0ebf8283 2019-07-24 stsp
5674 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5675 0ebf8283 2019-07-24 stsp if (err)
5676 0ebf8283 2019-07-24 stsp goto done;
5677 0ebf8283 2019-07-24 stsp
5678 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5679 0ebf8283 2019-07-24 stsp worktree);
5680 0ebf8283 2019-07-24 stsp if (err)
5681 0ebf8283 2019-07-24 stsp goto done;
5682 0ebf8283 2019-07-24 stsp
5683 0ebf8283 2019-07-24 stsp err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
5684 0ebf8283 2019-07-24 stsp if (err)
5685 0ebf8283 2019-07-24 stsp goto done;
5686 0ebf8283 2019-07-24 stsp
5687 0ebf8283 2019-07-24 stsp err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
5688 0ebf8283 2019-07-24 stsp if (err)
5689 0ebf8283 2019-07-24 stsp goto done;
5690 0ebf8283 2019-07-24 stsp err = got_ref_resolve(commit_id, repo, commit_ref);
5691 0ebf8283 2019-07-24 stsp if (err)
5692 0ebf8283 2019-07-24 stsp goto done;
5693 0ebf8283 2019-07-24 stsp
5694 0ebf8283 2019-07-24 stsp err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
5695 0ebf8283 2019-07-24 stsp if (err)
5696 0ebf8283 2019-07-24 stsp goto done;
5697 0ebf8283 2019-07-24 stsp err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
5698 0ebf8283 2019-07-24 stsp if (err)
5699 0ebf8283 2019-07-24 stsp goto done;
5700 0ebf8283 2019-07-24 stsp
5701 0ebf8283 2019-07-24 stsp err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
5702 0ebf8283 2019-07-24 stsp if (err)
5703 0ebf8283 2019-07-24 stsp goto done;
5704 0ebf8283 2019-07-24 stsp done:
5705 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5706 0ebf8283 2019-07-24 stsp free(branch_ref_name);
5707 3e3a69f1 2019-07-25 stsp free(fileindex_path);
5708 0ebf8283 2019-07-24 stsp if (commit_ref)
5709 0ebf8283 2019-07-24 stsp got_ref_close(commit_ref);
5710 0ebf8283 2019-07-24 stsp if (base_commit_ref)
5711 0ebf8283 2019-07-24 stsp got_ref_close(base_commit_ref);
5712 0ebf8283 2019-07-24 stsp if (err) {
5713 0ebf8283 2019-07-24 stsp free(*commit_id);
5714 0ebf8283 2019-07-24 stsp *commit_id = NULL;
5715 0ebf8283 2019-07-24 stsp free(*base_commit_id);
5716 0ebf8283 2019-07-24 stsp *base_commit_id = NULL;
5717 0ebf8283 2019-07-24 stsp if (*tmp_branch) {
5718 0ebf8283 2019-07-24 stsp got_ref_close(*tmp_branch);
5719 0ebf8283 2019-07-24 stsp *tmp_branch = NULL;
5720 0ebf8283 2019-07-24 stsp }
5721 3e3a69f1 2019-07-25 stsp if (*fileindex) {
5722 3e3a69f1 2019-07-25 stsp got_fileindex_free(*fileindex);
5723 3e3a69f1 2019-07-25 stsp *fileindex = NULL;
5724 3e3a69f1 2019-07-25 stsp }
5725 3e3a69f1 2019-07-25 stsp lock_worktree(worktree, LOCK_EX);
5726 0ebf8283 2019-07-24 stsp }
5727 0ebf8283 2019-07-24 stsp return err;
5728 0ebf8283 2019-07-24 stsp }
5729 0ebf8283 2019-07-24 stsp
5730 0ebf8283 2019-07-24 stsp static const struct got_error *
5731 0ebf8283 2019-07-24 stsp delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
5732 0ebf8283 2019-07-24 stsp {
5733 0ebf8283 2019-07-24 stsp const struct got_error *err;
5734 0ebf8283 2019-07-24 stsp char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
5735 0ebf8283 2019-07-24 stsp char *branch_ref_name = NULL, *commit_ref_name = NULL;
5736 0ebf8283 2019-07-24 stsp
5737 0ebf8283 2019-07-24 stsp err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
5738 0ebf8283 2019-07-24 stsp if (err)
5739 0ebf8283 2019-07-24 stsp goto done;
5740 0ebf8283 2019-07-24 stsp err = delete_ref(tmp_branch_name, repo);
5741 0ebf8283 2019-07-24 stsp if (err)
5742 0ebf8283 2019-07-24 stsp goto done;
5743 0ebf8283 2019-07-24 stsp
5744 0ebf8283 2019-07-24 stsp err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
5745 0ebf8283 2019-07-24 stsp worktree);
5746 0ebf8283 2019-07-24 stsp if (err)
5747 0ebf8283 2019-07-24 stsp goto done;
5748 0ebf8283 2019-07-24 stsp err = delete_ref(base_commit_ref_name, repo);
5749 0ebf8283 2019-07-24 stsp if (err)
5750 0ebf8283 2019-07-24 stsp goto done;
5751 0ebf8283 2019-07-24 stsp
5752 0ebf8283 2019-07-24 stsp err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
5753 0ebf8283 2019-07-24 stsp if (err)
5754 0ebf8283 2019-07-24 stsp goto done;
5755 0ebf8283 2019-07-24 stsp err = delete_ref(branch_ref_name, repo);
5756 0ebf8283 2019-07-24 stsp if (err)
5757 0ebf8283 2019-07-24 stsp goto done;
5758 0ebf8283 2019-07-24 stsp
5759 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5760 0ebf8283 2019-07-24 stsp if (err)
5761 0ebf8283 2019-07-24 stsp goto done;
5762 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
5763 0ebf8283 2019-07-24 stsp if (err)
5764 0ebf8283 2019-07-24 stsp goto done;
5765 0ebf8283 2019-07-24 stsp done:
5766 0ebf8283 2019-07-24 stsp free(tmp_branch_name);
5767 0ebf8283 2019-07-24 stsp free(base_commit_ref_name);
5768 0ebf8283 2019-07-24 stsp free(branch_ref_name);
5769 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5770 0ebf8283 2019-07-24 stsp return err;
5771 0ebf8283 2019-07-24 stsp }
5772 0ebf8283 2019-07-24 stsp
5773 0ebf8283 2019-07-24 stsp const struct got_error *
5774 0ebf8283 2019-07-24 stsp got_worktree_histedit_abort(struct got_worktree *worktree,
5775 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_repository *repo,
5776 3e3a69f1 2019-07-25 stsp struct got_reference *branch, struct got_object_id *base_commit_id,
5777 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb progress_cb, void *progress_arg)
5778 0ebf8283 2019-07-24 stsp {
5779 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr, *sync_err;
5780 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
5781 0ebf8283 2019-07-24 stsp char *fileindex_path = NULL;
5782 0ebf8283 2019-07-24 stsp struct got_object_id *tree_id = NULL;
5783 1f1abb7e 2019-08-08 stsp struct revert_file_args rfa;
5784 0ebf8283 2019-07-24 stsp
5785 0ebf8283 2019-07-24 stsp err = lock_worktree(worktree, LOCK_EX);
5786 0ebf8283 2019-07-24 stsp if (err)
5787 0ebf8283 2019-07-24 stsp return err;
5788 0ebf8283 2019-07-24 stsp
5789 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
5790 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(branch), 0);
5791 0ebf8283 2019-07-24 stsp if (err)
5792 0ebf8283 2019-07-24 stsp goto done;
5793 0ebf8283 2019-07-24 stsp
5794 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
5795 0ebf8283 2019-07-24 stsp if (err)
5796 0ebf8283 2019-07-24 stsp goto done;
5797 0ebf8283 2019-07-24 stsp
5798 0ebf8283 2019-07-24 stsp err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
5799 0ebf8283 2019-07-24 stsp if (err)
5800 0ebf8283 2019-07-24 stsp goto done;
5801 0ebf8283 2019-07-24 stsp
5802 0ebf8283 2019-07-24 stsp err = got_object_id_by_path(&tree_id, repo, base_commit_id,
5803 0ebf8283 2019-07-24 stsp worktree->path_prefix);
5804 0ebf8283 2019-07-24 stsp if (err)
5805 0ebf8283 2019-07-24 stsp goto done;
5806 0ebf8283 2019-07-24 stsp
5807 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
5808 0ebf8283 2019-07-24 stsp if (err)
5809 0ebf8283 2019-07-24 stsp goto done;
5810 0ebf8283 2019-07-24 stsp
5811 3e3a69f1 2019-07-25 stsp err = get_fileindex_path(&fileindex_path, worktree);
5812 0ebf8283 2019-07-24 stsp if (err)
5813 0ebf8283 2019-07-24 stsp goto done;
5814 0ebf8283 2019-07-24 stsp
5815 1f1abb7e 2019-08-08 stsp rfa.worktree = worktree;
5816 1f1abb7e 2019-08-08 stsp rfa.fileindex = fileindex;
5817 1f1abb7e 2019-08-08 stsp rfa.progress_cb = progress_cb;
5818 1f1abb7e 2019-08-08 stsp rfa.progress_arg = progress_arg;
5819 33aa809d 2019-08-08 stsp rfa.patch_cb = NULL;
5820 33aa809d 2019-08-08 stsp rfa.patch_arg = NULL;
5821 1f1abb7e 2019-08-08 stsp rfa.repo = repo;
5822 0ebf8283 2019-07-24 stsp err = worktree_status(worktree, "", fileindex, repo,
5823 f2a9dc41 2019-12-13 tracey revert_file, &rfa, NULL, NULL, 0, 0);
5824 0ebf8283 2019-07-24 stsp if (err)
5825 1f1abb7e 2019-08-08 stsp goto sync;
5826 0ebf8283 2019-07-24 stsp
5827 0ebf8283 2019-07-24 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL,
5828 0ebf8283 2019-07-24 stsp repo, progress_cb, progress_arg, NULL, NULL);
5829 0ebf8283 2019-07-24 stsp sync:
5830 0ebf8283 2019-07-24 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
5831 0ebf8283 2019-07-24 stsp if (sync_err && err == NULL)
5832 0ebf8283 2019-07-24 stsp err = sync_err;
5833 0ebf8283 2019-07-24 stsp done:
5834 0ebf8283 2019-07-24 stsp got_ref_close(resolved);
5835 0ebf8283 2019-07-24 stsp free(tree_id);
5836 818c7501 2019-07-11 stsp free(fileindex_path);
5837 818c7501 2019-07-11 stsp
5838 818c7501 2019-07-11 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5839 818c7501 2019-07-11 stsp if (unlockerr && err == NULL)
5840 818c7501 2019-07-11 stsp err = unlockerr;
5841 818c7501 2019-07-11 stsp return err;
5842 818c7501 2019-07-11 stsp }
5843 0ebf8283 2019-07-24 stsp
5844 0ebf8283 2019-07-24 stsp const struct got_error *
5845 0ebf8283 2019-07-24 stsp got_worktree_histedit_complete(struct got_worktree *worktree,
5846 3e3a69f1 2019-07-25 stsp struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5847 3e3a69f1 2019-07-25 stsp struct got_reference *edited_branch, struct got_repository *repo)
5848 0ebf8283 2019-07-24 stsp {
5849 0ebf8283 2019-07-24 stsp const struct got_error *err, *unlockerr;
5850 0ebf8283 2019-07-24 stsp struct got_object_id *new_head_commit_id = NULL;
5851 0ebf8283 2019-07-24 stsp struct got_reference *resolved = NULL;
5852 0ebf8283 2019-07-24 stsp
5853 0ebf8283 2019-07-24 stsp err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
5854 0ebf8283 2019-07-24 stsp if (err)
5855 0ebf8283 2019-07-24 stsp return err;
5856 0ebf8283 2019-07-24 stsp
5857 0ebf8283 2019-07-24 stsp err = got_ref_open(&resolved, repo,
5858 0ebf8283 2019-07-24 stsp got_ref_get_symref_target(edited_branch), 0);
5859 0ebf8283 2019-07-24 stsp if (err)
5860 0ebf8283 2019-07-24 stsp goto done;
5861 0ebf8283 2019-07-24 stsp
5862 0ebf8283 2019-07-24 stsp err = got_ref_change_ref(resolved, new_head_commit_id);
5863 0ebf8283 2019-07-24 stsp if (err)
5864 0ebf8283 2019-07-24 stsp goto done;
5865 0ebf8283 2019-07-24 stsp
5866 0ebf8283 2019-07-24 stsp err = got_ref_write(resolved, repo);
5867 0ebf8283 2019-07-24 stsp if (err)
5868 0ebf8283 2019-07-24 stsp goto done;
5869 0ebf8283 2019-07-24 stsp
5870 0ebf8283 2019-07-24 stsp err = got_worktree_set_head_ref(worktree, resolved);
5871 0ebf8283 2019-07-24 stsp if (err)
5872 0ebf8283 2019-07-24 stsp goto done;
5873 0ebf8283 2019-07-24 stsp
5874 0ebf8283 2019-07-24 stsp err = delete_histedit_refs(worktree, repo);
5875 0ebf8283 2019-07-24 stsp done:
5876 3e3a69f1 2019-07-25 stsp if (fileindex)
5877 3e3a69f1 2019-07-25 stsp got_fileindex_free(fileindex);
5878 0ebf8283 2019-07-24 stsp free(new_head_commit_id);
5879 0ebf8283 2019-07-24 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
5880 0ebf8283 2019-07-24 stsp if (unlockerr && err == NULL)
5881 0ebf8283 2019-07-24 stsp err = unlockerr;
5882 0ebf8283 2019-07-24 stsp return err;
5883 0ebf8283 2019-07-24 stsp }
5884 0ebf8283 2019-07-24 stsp
5885 0ebf8283 2019-07-24 stsp const struct got_error *
5886 0ebf8283 2019-07-24 stsp got_worktree_histedit_skip_commit(struct got_worktree *worktree,
5887 0ebf8283 2019-07-24 stsp struct got_object_id *commit_id, struct got_repository *repo)
5888 0ebf8283 2019-07-24 stsp {
5889 0ebf8283 2019-07-24 stsp const struct got_error *err;
5890 0ebf8283 2019-07-24 stsp char *commit_ref_name;
5891 0ebf8283 2019-07-24 stsp
5892 0ebf8283 2019-07-24 stsp err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
5893 0ebf8283 2019-07-24 stsp if (err)
5894 0ebf8283 2019-07-24 stsp return err;
5895 0ebf8283 2019-07-24 stsp
5896 de05890f 2020-03-05 stsp err = store_commit_id(commit_ref_name, commit_id, 0, repo);
5897 0ebf8283 2019-07-24 stsp if (err)
5898 0ebf8283 2019-07-24 stsp goto done;
5899 0ebf8283 2019-07-24 stsp
5900 0ebf8283 2019-07-24 stsp err = delete_ref(commit_ref_name, repo);
5901 0ebf8283 2019-07-24 stsp done:
5902 0ebf8283 2019-07-24 stsp free(commit_ref_name);
5903 2822a352 2019-10-15 stsp return err;
5904 2822a352 2019-10-15 stsp }
5905 2822a352 2019-10-15 stsp
5906 2822a352 2019-10-15 stsp const struct got_error *
5907 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **fileindex,
5908 2822a352 2019-10-15 stsp struct got_reference **branch_ref, struct got_reference **base_branch_ref,
5909 2822a352 2019-10-15 stsp struct got_worktree *worktree, const char *refname,
5910 2822a352 2019-10-15 stsp struct got_repository *repo)
5911 2822a352 2019-10-15 stsp {
5912 2822a352 2019-10-15 stsp const struct got_error *err = NULL;
5913 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
5914 2822a352 2019-10-15 stsp struct check_rebase_ok_arg ok_arg;
5915 2822a352 2019-10-15 stsp
5916 2822a352 2019-10-15 stsp *fileindex = NULL;
5917 2822a352 2019-10-15 stsp *branch_ref = NULL;
5918 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
5919 2822a352 2019-10-15 stsp
5920 2822a352 2019-10-15 stsp err = lock_worktree(worktree, LOCK_EX);
5921 2822a352 2019-10-15 stsp if (err)
5922 2822a352 2019-10-15 stsp return err;
5923 2822a352 2019-10-15 stsp
5924 2822a352 2019-10-15 stsp if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
5925 2822a352 2019-10-15 stsp err = got_error_msg(GOT_ERR_SAME_BRANCH,
5926 2822a352 2019-10-15 stsp "cannot integrate a branch into itself; "
5927 2822a352 2019-10-15 stsp "update -b or different branch name required");
5928 2822a352 2019-10-15 stsp goto done;
5929 2822a352 2019-10-15 stsp }
5930 2822a352 2019-10-15 stsp
5931 2822a352 2019-10-15 stsp err = open_fileindex(fileindex, &fileindex_path, worktree);
5932 2822a352 2019-10-15 stsp if (err)
5933 2822a352 2019-10-15 stsp goto done;
5934 2822a352 2019-10-15 stsp
5935 2822a352 2019-10-15 stsp /* Preconditions are the same as for rebase. */
5936 2822a352 2019-10-15 stsp ok_arg.worktree = worktree;
5937 2822a352 2019-10-15 stsp ok_arg.repo = repo;
5938 2822a352 2019-10-15 stsp err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
5939 2822a352 2019-10-15 stsp &ok_arg);
5940 2822a352 2019-10-15 stsp if (err)
5941 2822a352 2019-10-15 stsp goto done;
5942 2822a352 2019-10-15 stsp
5943 2822a352 2019-10-15 stsp err = got_ref_open(branch_ref, repo, refname, 1);
5944 2822a352 2019-10-15 stsp if (err)
5945 2822a352 2019-10-15 stsp goto done;
5946 2822a352 2019-10-15 stsp
5947 2822a352 2019-10-15 stsp err = got_ref_open(base_branch_ref, repo,
5948 2822a352 2019-10-15 stsp got_worktree_get_head_ref_name(worktree), 1);
5949 2822a352 2019-10-15 stsp done:
5950 2822a352 2019-10-15 stsp if (err) {
5951 2822a352 2019-10-15 stsp if (*branch_ref) {
5952 2822a352 2019-10-15 stsp got_ref_close(*branch_ref);
5953 2822a352 2019-10-15 stsp *branch_ref = NULL;
5954 2822a352 2019-10-15 stsp }
5955 2822a352 2019-10-15 stsp if (*base_branch_ref) {
5956 2822a352 2019-10-15 stsp got_ref_close(*base_branch_ref);
5957 2822a352 2019-10-15 stsp *base_branch_ref = NULL;
5958 2822a352 2019-10-15 stsp }
5959 2822a352 2019-10-15 stsp if (*fileindex) {
5960 2822a352 2019-10-15 stsp got_fileindex_free(*fileindex);
5961 2822a352 2019-10-15 stsp *fileindex = NULL;
5962 2822a352 2019-10-15 stsp }
5963 2822a352 2019-10-15 stsp lock_worktree(worktree, LOCK_SH);
5964 2822a352 2019-10-15 stsp }
5965 0cb83759 2019-08-03 stsp return err;
5966 0cb83759 2019-08-03 stsp }
5967 0cb83759 2019-08-03 stsp
5968 2822a352 2019-10-15 stsp const struct got_error *
5969 2822a352 2019-10-15 stsp got_worktree_integrate_continue(struct got_worktree *worktree,
5970 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
5971 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref,
5972 2822a352 2019-10-15 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
5973 2822a352 2019-10-15 stsp got_cancel_cb cancel_cb, void *cancel_arg)
5974 2822a352 2019-10-15 stsp {
5975 2822a352 2019-10-15 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
5976 2822a352 2019-10-15 stsp char *fileindex_path = NULL;
5977 2822a352 2019-10-15 stsp struct got_object_id *tree_id = NULL, *commit_id = NULL;
5978 2822a352 2019-10-15 stsp
5979 2822a352 2019-10-15 stsp err = get_fileindex_path(&fileindex_path, worktree);
5980 2822a352 2019-10-15 stsp if (err)
5981 2822a352 2019-10-15 stsp goto done;
5982 2822a352 2019-10-15 stsp
5983 2822a352 2019-10-15 stsp err = got_ref_resolve(&commit_id, repo, branch_ref);
5984 2822a352 2019-10-15 stsp if (err)
5985 2822a352 2019-10-15 stsp goto done;
5986 2822a352 2019-10-15 stsp
5987 2822a352 2019-10-15 stsp err = got_object_id_by_path(&tree_id, repo, commit_id,
5988 2822a352 2019-10-15 stsp worktree->path_prefix);
5989 2822a352 2019-10-15 stsp if (err)
5990 2822a352 2019-10-15 stsp goto done;
5991 2822a352 2019-10-15 stsp
5992 2822a352 2019-10-15 stsp err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
5993 2822a352 2019-10-15 stsp if (err)
5994 2822a352 2019-10-15 stsp goto done;
5995 2822a352 2019-10-15 stsp
5996 2822a352 2019-10-15 stsp err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
5997 2822a352 2019-10-15 stsp progress_cb, progress_arg, cancel_cb, cancel_arg);
5998 2822a352 2019-10-15 stsp if (err)
5999 2822a352 2019-10-15 stsp goto sync;
6000 2822a352 2019-10-15 stsp
6001 2822a352 2019-10-15 stsp err = got_ref_change_ref(base_branch_ref, commit_id);
6002 2822a352 2019-10-15 stsp if (err)
6003 2822a352 2019-10-15 stsp goto sync;
6004 2822a352 2019-10-15 stsp
6005 2822a352 2019-10-15 stsp err = got_ref_write(base_branch_ref, repo);
6006 2822a352 2019-10-15 stsp sync:
6007 2822a352 2019-10-15 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6008 2822a352 2019-10-15 stsp if (sync_err && err == NULL)
6009 2822a352 2019-10-15 stsp err = sync_err;
6010 2822a352 2019-10-15 stsp
6011 2822a352 2019-10-15 stsp done:
6012 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(branch_ref);
6013 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
6014 2822a352 2019-10-15 stsp err = unlockerr;
6015 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
6016 2822a352 2019-10-15 stsp
6017 2822a352 2019-10-15 stsp unlockerr = got_ref_unlock(base_branch_ref);
6018 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
6019 2822a352 2019-10-15 stsp err = unlockerr;
6020 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
6021 2822a352 2019-10-15 stsp
6022 2822a352 2019-10-15 stsp got_fileindex_free(fileindex);
6023 2822a352 2019-10-15 stsp free(fileindex_path);
6024 2822a352 2019-10-15 stsp free(tree_id);
6025 2822a352 2019-10-15 stsp
6026 2822a352 2019-10-15 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6027 2822a352 2019-10-15 stsp if (unlockerr && err == NULL)
6028 2822a352 2019-10-15 stsp err = unlockerr;
6029 2822a352 2019-10-15 stsp return err;
6030 2822a352 2019-10-15 stsp }
6031 2822a352 2019-10-15 stsp
6032 2822a352 2019-10-15 stsp const struct got_error *
6033 2822a352 2019-10-15 stsp got_worktree_integrate_abort(struct got_worktree *worktree,
6034 2822a352 2019-10-15 stsp struct got_fileindex *fileindex, struct got_repository *repo,
6035 2822a352 2019-10-15 stsp struct got_reference *branch_ref, struct got_reference *base_branch_ref)
6036 2822a352 2019-10-15 stsp {
6037 8b692cd0 2019-10-21 stsp const struct got_error *err = NULL, *unlockerr = NULL;
6038 8b692cd0 2019-10-21 stsp
6039 8b692cd0 2019-10-21 stsp got_fileindex_free(fileindex);
6040 8b692cd0 2019-10-21 stsp
6041 8b692cd0 2019-10-21 stsp err = lock_worktree(worktree, LOCK_SH);
6042 8b692cd0 2019-10-21 stsp
6043 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(branch_ref);
6044 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
6045 8b692cd0 2019-10-21 stsp err = unlockerr;
6046 2822a352 2019-10-15 stsp got_ref_close(branch_ref);
6047 8b692cd0 2019-10-21 stsp
6048 8b692cd0 2019-10-21 stsp unlockerr = got_ref_unlock(base_branch_ref);
6049 8b692cd0 2019-10-21 stsp if (unlockerr && err == NULL)
6050 8b692cd0 2019-10-21 stsp err = unlockerr;
6051 2822a352 2019-10-15 stsp got_ref_close(base_branch_ref);
6052 8b692cd0 2019-10-21 stsp
6053 8b692cd0 2019-10-21 stsp return err;
6054 2822a352 2019-10-15 stsp }
6055 2822a352 2019-10-15 stsp
6056 2db2652d 2019-08-07 stsp struct check_stage_ok_arg {
6057 2db2652d 2019-08-07 stsp struct got_object_id *head_commit_id;
6058 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
6059 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
6060 2db2652d 2019-08-07 stsp struct got_repository *repo;
6061 2db2652d 2019-08-07 stsp int have_changes;
6062 2db2652d 2019-08-07 stsp };
6063 2db2652d 2019-08-07 stsp
6064 2db2652d 2019-08-07 stsp const struct got_error *
6065 2db2652d 2019-08-07 stsp check_stage_ok(void *arg, unsigned char status,
6066 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
6067 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6068 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
6069 735ef5ac 2019-08-03 stsp {
6070 2db2652d 2019-08-07 stsp struct check_stage_ok_arg *a = arg;
6071 735ef5ac 2019-08-03 stsp const struct got_error *err = NULL;
6072 735ef5ac 2019-08-03 stsp struct got_fileindex_entry *ie;
6073 2db2652d 2019-08-07 stsp struct got_object_id base_commit_id;
6074 2db2652d 2019-08-07 stsp struct got_object_id *base_commit_idp = NULL;
6075 735ef5ac 2019-08-03 stsp char *in_repo_path = NULL, *p;
6076 8b13ce36 2019-08-08 stsp
6077 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_UNVERSIONED ||
6078 7b5dc508 2019-10-28 stsp status == GOT_STATUS_NO_CHANGE)
6079 8b13ce36 2019-08-08 stsp return NULL;
6080 2a06fe5f 2019-08-24 stsp if (status == GOT_STATUS_NONEXISTENT)
6081 2a06fe5f 2019-08-24 stsp return got_error_set_errno(ENOENT, relpath);
6082 735ef5ac 2019-08-03 stsp
6083 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
6084 735ef5ac 2019-08-03 stsp if (ie == NULL)
6085 735ef5ac 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
6086 735ef5ac 2019-08-03 stsp
6087 2db2652d 2019-08-07 stsp if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
6088 2db2652d 2019-08-07 stsp got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
6089 735ef5ac 2019-08-03 stsp relpath) == -1)
6090 735ef5ac 2019-08-03 stsp return got_error_from_errno("asprintf");
6091 735ef5ac 2019-08-03 stsp
6092 735ef5ac 2019-08-03 stsp if (got_fileindex_entry_has_commit(ie)) {
6093 735ef5ac 2019-08-03 stsp memcpy(base_commit_id.sha1, ie->commit_sha1,
6094 735ef5ac 2019-08-03 stsp SHA1_DIGEST_LENGTH);
6095 735ef5ac 2019-08-03 stsp base_commit_idp = &base_commit_id;
6096 735ef5ac 2019-08-03 stsp }
6097 735ef5ac 2019-08-03 stsp
6098 7b5dc508 2019-10-28 stsp if (status == GOT_STATUS_CONFLICT) {
6099 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
6100 3aa5969e 2019-08-06 stsp goto done;
6101 3aa5969e 2019-08-06 stsp } else if (status != GOT_STATUS_ADD &&
6102 3aa5969e 2019-08-06 stsp status != GOT_STATUS_MODIFY &&
6103 3aa5969e 2019-08-06 stsp status != GOT_STATUS_DELETE) {
6104 3aa5969e 2019-08-06 stsp err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
6105 735ef5ac 2019-08-03 stsp goto done;
6106 3aa5969e 2019-08-06 stsp }
6107 735ef5ac 2019-08-03 stsp
6108 2db2652d 2019-08-07 stsp a->have_changes = 1;
6109 2db2652d 2019-08-07 stsp
6110 735ef5ac 2019-08-03 stsp p = in_repo_path;
6111 735ef5ac 2019-08-03 stsp while (p[0] == '/')
6112 735ef5ac 2019-08-03 stsp p++;
6113 2db2652d 2019-08-07 stsp err = check_out_of_date(p, status, staged_status,
6114 2db2652d 2019-08-07 stsp blob_id, base_commit_idp, a->head_commit_id, a->repo,
6115 5f8a88c6 2019-08-03 stsp GOT_ERR_STAGE_OUT_OF_DATE);
6116 735ef5ac 2019-08-03 stsp done:
6117 735ef5ac 2019-08-03 stsp free(in_repo_path);
6118 dc424a06 2019-08-07 stsp return err;
6119 dc424a06 2019-08-07 stsp }
6120 dc424a06 2019-08-07 stsp
6121 2db2652d 2019-08-07 stsp struct stage_path_arg {
6122 2db2652d 2019-08-07 stsp struct got_worktree *worktree;
6123 2db2652d 2019-08-07 stsp struct got_fileindex *fileindex;
6124 2db2652d 2019-08-07 stsp struct got_repository *repo;
6125 2db2652d 2019-08-07 stsp got_worktree_status_cb status_cb;
6126 2db2652d 2019-08-07 stsp void *status_arg;
6127 2db2652d 2019-08-07 stsp got_worktree_patch_cb patch_cb;
6128 2db2652d 2019-08-07 stsp void *patch_arg;
6129 7b5dc508 2019-10-28 stsp int staged_something;
6130 2db2652d 2019-08-07 stsp };
6131 2db2652d 2019-08-07 stsp
6132 2db2652d 2019-08-07 stsp static const struct got_error *
6133 2db2652d 2019-08-07 stsp stage_path(void *arg, unsigned char status,
6134 2db2652d 2019-08-07 stsp unsigned char staged_status, const char *relpath,
6135 2db2652d 2019-08-07 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6136 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
6137 0cb83759 2019-08-03 stsp {
6138 2db2652d 2019-08-07 stsp struct stage_path_arg *a = arg;
6139 0cb83759 2019-08-03 stsp const struct got_error *err = NULL;
6140 0cb83759 2019-08-03 stsp struct got_fileindex_entry *ie;
6141 2db2652d 2019-08-07 stsp char *ondisk_path = NULL, *path_content = NULL;
6142 0cb83759 2019-08-03 stsp uint32_t stage;
6143 af5a81b2 2019-08-08 stsp struct got_object_id *new_staged_blob_id = NULL;
6144 8b13ce36 2019-08-08 stsp
6145 8b13ce36 2019-08-08 stsp if (status == GOT_STATUS_UNVERSIONED)
6146 8b13ce36 2019-08-08 stsp return NULL;
6147 0cb83759 2019-08-03 stsp
6148 2db2652d 2019-08-07 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
6149 d3e7c587 2019-08-03 stsp if (ie == NULL)
6150 d3e7c587 2019-08-03 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
6151 0cb83759 2019-08-03 stsp
6152 2db2652d 2019-08-07 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
6153 2db2652d 2019-08-07 stsp relpath)== -1)
6154 2db2652d 2019-08-07 stsp return got_error_from_errno("asprintf");
6155 0cb83759 2019-08-03 stsp
6156 0cb83759 2019-08-03 stsp switch (status) {
6157 0cb83759 2019-08-03 stsp case GOT_STATUS_ADD:
6158 0cb83759 2019-08-03 stsp case GOT_STATUS_MODIFY:
6159 2db2652d 2019-08-07 stsp if (a->patch_cb) {
6160 dc424a06 2019-08-07 stsp if (status == GOT_STATUS_ADD) {
6161 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
6162 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
6163 a7c9878d 2019-08-08 stsp status, ie->path, NULL, 1, 1);
6164 dc424a06 2019-08-07 stsp if (err)
6165 dc424a06 2019-08-07 stsp break;
6166 dc424a06 2019-08-07 stsp if (choice != GOT_PATCH_CHOICE_YES)
6167 dc424a06 2019-08-07 stsp break;
6168 dc424a06 2019-08-07 stsp } else {
6169 e635744c 2019-08-08 stsp err = create_patched_content(&path_content, 0,
6170 af5a81b2 2019-08-08 stsp staged_blob_id ? staged_blob_id : blob_id,
6171 12463d8b 2019-12-13 stsp ondisk_path, dirfd, de_name, ie->path,
6172 12463d8b 2019-12-13 stsp a->repo, a->patch_cb, a->patch_arg);
6173 dc424a06 2019-08-07 stsp if (err || path_content == NULL)
6174 dc424a06 2019-08-07 stsp break;
6175 dc424a06 2019-08-07 stsp }
6176 dc424a06 2019-08-07 stsp }
6177 af5a81b2 2019-08-08 stsp err = got_object_blob_create(&new_staged_blob_id,
6178 2db2652d 2019-08-07 stsp path_content ? path_content : ondisk_path, a->repo);
6179 0cb83759 2019-08-03 stsp if (err)
6180 dc424a06 2019-08-07 stsp break;
6181 af5a81b2 2019-08-08 stsp memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
6182 0cb83759 2019-08-03 stsp SHA1_DIGEST_LENGTH);
6183 d3e7c587 2019-08-03 stsp if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
6184 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_ADD;
6185 0cb83759 2019-08-03 stsp else
6186 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_MODIFY;
6187 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
6188 7b5dc508 2019-10-28 stsp a->staged_something = 1;
6189 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
6190 dc424a06 2019-08-07 stsp break;
6191 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
6192 2db2652d 2019-08-07 stsp get_staged_status(ie), relpath, blob_id,
6193 12463d8b 2019-12-13 stsp new_staged_blob_id, NULL, dirfd, de_name);
6194 0cb83759 2019-08-03 stsp break;
6195 0cb83759 2019-08-03 stsp case GOT_STATUS_DELETE:
6196 d3e7c587 2019-08-03 stsp if (staged_status == GOT_STATUS_DELETE)
6197 d3e7c587 2019-08-03 stsp break;
6198 2db2652d 2019-08-07 stsp if (a->patch_cb) {
6199 dc424a06 2019-08-07 stsp int choice = GOT_PATCH_CHOICE_NONE;
6200 2db2652d 2019-08-07 stsp err = (*a->patch_cb)(&choice, a->patch_arg, status,
6201 a7c9878d 2019-08-08 stsp ie->path, NULL, 1, 1);
6202 dc424a06 2019-08-07 stsp if (err)
6203 dc424a06 2019-08-07 stsp break;
6204 88f33a19 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
6205 88f33a19 2019-08-08 stsp break;
6206 88f33a19 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
6207 88f33a19 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
6208 dc424a06 2019-08-07 stsp break;
6209 88f33a19 2019-08-08 stsp }
6210 dc424a06 2019-08-07 stsp }
6211 0cb83759 2019-08-03 stsp stage = GOT_FILEIDX_STAGE_DELETE;
6212 537ac44b 2019-08-03 stsp got_fileindex_entry_stage_set(ie, stage);
6213 7b5dc508 2019-10-28 stsp a->staged_something = 1;
6214 2db2652d 2019-08-07 stsp if (a->status_cb == NULL)
6215 dc424a06 2019-08-07 stsp break;
6216 2db2652d 2019-08-07 stsp err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
6217 12463d8b 2019-12-13 stsp get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
6218 12463d8b 2019-12-13 stsp de_name);
6219 0cb83759 2019-08-03 stsp break;
6220 d3e7c587 2019-08-03 stsp case GOT_STATUS_NO_CHANGE:
6221 d3e7c587 2019-08-03 stsp break;
6222 ebf48fd5 2019-08-03 stsp case GOT_STATUS_CONFLICT:
6223 ebf48fd5 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
6224 ebf48fd5 2019-08-03 stsp break;
6225 2a06fe5f 2019-08-24 stsp case GOT_STATUS_NONEXISTENT:
6226 2a06fe5f 2019-08-24 stsp err = got_error_set_errno(ENOENT, relpath);
6227 2a06fe5f 2019-08-24 stsp break;
6228 0cb83759 2019-08-03 stsp default:
6229 42005733 2019-08-03 stsp err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
6230 537ac44b 2019-08-03 stsp break;
6231 0cb83759 2019-08-03 stsp }
6232 dc424a06 2019-08-07 stsp
6233 dc424a06 2019-08-07 stsp if (path_content && unlink(path_content) == -1 && err == NULL)
6234 dc424a06 2019-08-07 stsp err = got_error_from_errno2("unlink", path_content);
6235 dc424a06 2019-08-07 stsp free(path_content);
6236 2db2652d 2019-08-07 stsp free(ondisk_path);
6237 af5a81b2 2019-08-08 stsp free(new_staged_blob_id);
6238 0ebf8283 2019-07-24 stsp return err;
6239 0ebf8283 2019-07-24 stsp }
6240 0cb83759 2019-08-03 stsp
6241 0cb83759 2019-08-03 stsp const struct got_error *
6242 1e71573e 2019-08-03 stsp got_worktree_stage(struct got_worktree *worktree,
6243 1e71573e 2019-08-03 stsp struct got_pathlist_head *paths,
6244 0cb83759 2019-08-03 stsp got_worktree_status_cb status_cb, void *status_arg,
6245 dc424a06 2019-08-07 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
6246 1e71573e 2019-08-03 stsp struct got_repository *repo)
6247 0cb83759 2019-08-03 stsp {
6248 0cb83759 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
6249 0cb83759 2019-08-03 stsp struct got_pathlist_entry *pe;
6250 0cb83759 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
6251 0cb83759 2019-08-03 stsp char *fileindex_path = NULL;
6252 735ef5ac 2019-08-03 stsp struct got_reference *head_ref = NULL;
6253 735ef5ac 2019-08-03 stsp struct got_object_id *head_commit_id = NULL;
6254 2db2652d 2019-08-07 stsp struct check_stage_ok_arg oka;
6255 2db2652d 2019-08-07 stsp struct stage_path_arg spa;
6256 0cb83759 2019-08-03 stsp
6257 0cb83759 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
6258 0cb83759 2019-08-03 stsp if (err)
6259 0cb83759 2019-08-03 stsp return err;
6260 0cb83759 2019-08-03 stsp
6261 735ef5ac 2019-08-03 stsp err = got_ref_open(&head_ref, repo,
6262 735ef5ac 2019-08-03 stsp got_worktree_get_head_ref_name(worktree), 0);
6263 735ef5ac 2019-08-03 stsp if (err)
6264 735ef5ac 2019-08-03 stsp goto done;
6265 735ef5ac 2019-08-03 stsp err = got_ref_resolve(&head_commit_id, repo, head_ref);
6266 735ef5ac 2019-08-03 stsp if (err)
6267 735ef5ac 2019-08-03 stsp goto done;
6268 0cb83759 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
6269 0cb83759 2019-08-03 stsp if (err)
6270 0cb83759 2019-08-03 stsp goto done;
6271 0cb83759 2019-08-03 stsp
6272 3aa5969e 2019-08-06 stsp /* Check pre-conditions before staging anything. */
6273 2db2652d 2019-08-07 stsp oka.head_commit_id = head_commit_id;
6274 2db2652d 2019-08-07 stsp oka.worktree = worktree;
6275 2db2652d 2019-08-07 stsp oka.fileindex = fileindex;
6276 2db2652d 2019-08-07 stsp oka.repo = repo;
6277 2db2652d 2019-08-07 stsp oka.have_changes = 0;
6278 0cb83759 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
6279 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
6280 f2a9dc41 2019-12-13 tracey check_stage_ok, &oka, NULL, NULL, 0, 0);
6281 735ef5ac 2019-08-03 stsp if (err)
6282 735ef5ac 2019-08-03 stsp goto done;
6283 735ef5ac 2019-08-03 stsp }
6284 2db2652d 2019-08-07 stsp if (!oka.have_changes) {
6285 2db2652d 2019-08-07 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
6286 2db2652d 2019-08-07 stsp goto done;
6287 2db2652d 2019-08-07 stsp }
6288 735ef5ac 2019-08-03 stsp
6289 2db2652d 2019-08-07 stsp spa.worktree = worktree;
6290 2db2652d 2019-08-07 stsp spa.fileindex = fileindex;
6291 2db2652d 2019-08-07 stsp spa.repo = repo;
6292 2db2652d 2019-08-07 stsp spa.patch_cb = patch_cb;
6293 2db2652d 2019-08-07 stsp spa.patch_arg = patch_arg;
6294 2db2652d 2019-08-07 stsp spa.status_cb = status_cb;
6295 2db2652d 2019-08-07 stsp spa.status_arg = status_arg;
6296 7b5dc508 2019-10-28 stsp spa.staged_something = 0;
6297 735ef5ac 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
6298 2db2652d 2019-08-07 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
6299 f2a9dc41 2019-12-13 tracey stage_path, &spa, NULL, NULL, 0, 0);
6300 42005733 2019-08-03 stsp if (err)
6301 2db2652d 2019-08-07 stsp goto done;
6302 7b5dc508 2019-10-28 stsp }
6303 7b5dc508 2019-10-28 stsp if (!spa.staged_something) {
6304 7b5dc508 2019-10-28 stsp err = got_error(GOT_ERR_STAGE_NO_CHANGE);
6305 7b5dc508 2019-10-28 stsp goto done;
6306 0cb83759 2019-08-03 stsp }
6307 0cb83759 2019-08-03 stsp
6308 0cb83759 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6309 0cb83759 2019-08-03 stsp if (sync_err && err == NULL)
6310 0cb83759 2019-08-03 stsp err = sync_err;
6311 0cb83759 2019-08-03 stsp done:
6312 735ef5ac 2019-08-03 stsp if (head_ref)
6313 735ef5ac 2019-08-03 stsp got_ref_close(head_ref);
6314 735ef5ac 2019-08-03 stsp free(head_commit_id);
6315 0cb83759 2019-08-03 stsp free(fileindex_path);
6316 0cb83759 2019-08-03 stsp if (fileindex)
6317 0cb83759 2019-08-03 stsp got_fileindex_free(fileindex);
6318 0cb83759 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6319 0cb83759 2019-08-03 stsp if (unlockerr && err == NULL)
6320 0cb83759 2019-08-03 stsp err = unlockerr;
6321 0cb83759 2019-08-03 stsp return err;
6322 0cb83759 2019-08-03 stsp }
6323 ad493afc 2019-08-03 stsp
6324 ad493afc 2019-08-03 stsp struct unstage_path_arg {
6325 ad493afc 2019-08-03 stsp struct got_worktree *worktree;
6326 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex;
6327 ad493afc 2019-08-03 stsp struct got_repository *repo;
6328 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb;
6329 ad493afc 2019-08-03 stsp void *progress_arg;
6330 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb;
6331 2e1f37b0 2019-08-08 stsp void *patch_arg;
6332 ad493afc 2019-08-03 stsp };
6333 2e1f37b0 2019-08-08 stsp
6334 2e1f37b0 2019-08-08 stsp static const struct got_error *
6335 2e1f37b0 2019-08-08 stsp create_unstaged_content(char **path_unstaged_content,
6336 2e1f37b0 2019-08-08 stsp char **path_new_staged_content, struct got_object_id *blob_id,
6337 2e1f37b0 2019-08-08 stsp struct got_object_id *staged_blob_id, const char *relpath,
6338 2e1f37b0 2019-08-08 stsp struct got_repository *repo,
6339 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg)
6340 2e1f37b0 2019-08-08 stsp {
6341 2e1f37b0 2019-08-08 stsp const struct got_error *err;
6342 2e1f37b0 2019-08-08 stsp struct got_blob_object *blob = NULL, *staged_blob = NULL;
6343 2e1f37b0 2019-08-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
6344 2e1f37b0 2019-08-08 stsp char *path1 = NULL, *path2 = NULL, *label1 = NULL;
6345 2e1f37b0 2019-08-08 stsp struct stat sb1, sb2;
6346 2e1f37b0 2019-08-08 stsp struct got_diff_changes *changes = NULL;
6347 2e1f37b0 2019-08-08 stsp struct got_diff_state *ds = NULL;
6348 2e1f37b0 2019-08-08 stsp struct got_diff_args *args = NULL;
6349 2e1f37b0 2019-08-08 stsp struct got_diff_change *change;
6350 2e1f37b0 2019-08-08 stsp int diff_flags = 0, line_cur1 = 1, line_cur2 = 1, n = 0;
6351 2e1f37b0 2019-08-08 stsp int have_content = 0, have_rejected_content = 0;
6352 2e1f37b0 2019-08-08 stsp
6353 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
6354 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
6355 2e1f37b0 2019-08-08 stsp
6356 2e1f37b0 2019-08-08 stsp err = got_object_id_str(&label1, blob_id);
6357 2e1f37b0 2019-08-08 stsp if (err)
6358 2e1f37b0 2019-08-08 stsp return err;
6359 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&blob, repo, blob_id, 8192);
6360 2e1f37b0 2019-08-08 stsp if (err)
6361 2e1f37b0 2019-08-08 stsp goto done;
6362 2e1f37b0 2019-08-08 stsp
6363 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base");
6364 2e1f37b0 2019-08-08 stsp if (err)
6365 2e1f37b0 2019-08-08 stsp goto done;
6366 2e1f37b0 2019-08-08 stsp
6367 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
6368 2e1f37b0 2019-08-08 stsp if (err)
6369 2e1f37b0 2019-08-08 stsp goto done;
6370 2e1f37b0 2019-08-08 stsp
6371 2e1f37b0 2019-08-08 stsp err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192);
6372 2e1f37b0 2019-08-08 stsp if (err)
6373 2e1f37b0 2019-08-08 stsp goto done;
6374 2e1f37b0 2019-08-08 stsp
6375 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged");
6376 2e1f37b0 2019-08-08 stsp if (err)
6377 2e1f37b0 2019-08-08 stsp goto done;
6378 ad493afc 2019-08-03 stsp
6379 2e1f37b0 2019-08-08 stsp err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
6380 2e1f37b0 2019-08-08 stsp if (err)
6381 2e1f37b0 2019-08-08 stsp goto done;
6382 2e1f37b0 2019-08-08 stsp
6383 2e1f37b0 2019-08-08 stsp if (stat(path1, &sb1) == -1) {
6384 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path1);
6385 2e1f37b0 2019-08-08 stsp goto done;
6386 2e1f37b0 2019-08-08 stsp }
6387 2e1f37b0 2019-08-08 stsp
6388 2e1f37b0 2019-08-08 stsp if (stat(path2, &sb2) == -1) {
6389 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("stat", path2);
6390 2e1f37b0 2019-08-08 stsp goto done;
6391 2e1f37b0 2019-08-08 stsp }
6392 2e1f37b0 2019-08-08 stsp
6393 2e1f37b0 2019-08-08 stsp err = got_diff_files(&changes, &ds, &args, &diff_flags,
6394 2e1f37b0 2019-08-08 stsp f1, sb1.st_size, label1, f2, sb2.st_size, path2, 3, NULL);
6395 2e1f37b0 2019-08-08 stsp if (err)
6396 2e1f37b0 2019-08-08 stsp goto done;
6397 2e1f37b0 2019-08-08 stsp
6398 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_unstaged_content, &outfile,
6399 2e1f37b0 2019-08-08 stsp "got-unstaged-content");
6400 2e1f37b0 2019-08-08 stsp if (err)
6401 2e1f37b0 2019-08-08 stsp goto done;
6402 2e1f37b0 2019-08-08 stsp err = got_opentemp_named(path_new_staged_content, &rejectfile,
6403 2e1f37b0 2019-08-08 stsp "got-new-staged-content");
6404 2e1f37b0 2019-08-08 stsp if (err)
6405 2e1f37b0 2019-08-08 stsp goto done;
6406 2e1f37b0 2019-08-08 stsp
6407 2e1f37b0 2019-08-08 stsp if (fseek(f1, 0L, SEEK_SET) == -1) {
6408 2e1f37b0 2019-08-08 stsp err = got_ferror(f1, GOT_ERR_IO);
6409 2e1f37b0 2019-08-08 stsp goto done;
6410 2e1f37b0 2019-08-08 stsp }
6411 2e1f37b0 2019-08-08 stsp if (fseek(f2, 0L, SEEK_SET) == -1) {
6412 2e1f37b0 2019-08-08 stsp err = got_ferror(f2, GOT_ERR_IO);
6413 2e1f37b0 2019-08-08 stsp goto done;
6414 2e1f37b0 2019-08-08 stsp }
6415 2e1f37b0 2019-08-08 stsp SIMPLEQ_FOREACH(change, &changes->entries, entry) {
6416 2e1f37b0 2019-08-08 stsp int choice;
6417 2e1f37b0 2019-08-08 stsp err = apply_or_reject_change(&choice, change, ++n,
6418 2e1f37b0 2019-08-08 stsp changes->nchanges, ds, args, diff_flags, relpath,
6419 2e1f37b0 2019-08-08 stsp f1, f2, &line_cur1, &line_cur2,
6420 2e1f37b0 2019-08-08 stsp outfile, rejectfile, patch_cb, patch_arg);
6421 2e1f37b0 2019-08-08 stsp if (err)
6422 2e1f37b0 2019-08-08 stsp goto done;
6423 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_YES)
6424 2e1f37b0 2019-08-08 stsp have_content = 1;
6425 19e4b907 2019-08-08 stsp else
6426 2e1f37b0 2019-08-08 stsp have_rejected_content = 1;
6427 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_QUIT)
6428 2e1f37b0 2019-08-08 stsp break;
6429 2e1f37b0 2019-08-08 stsp }
6430 f1e81a05 2019-08-10 stsp if (have_content || have_rejected_content)
6431 f1e81a05 2019-08-10 stsp err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
6432 f1e81a05 2019-08-10 stsp outfile, rejectfile);
6433 2e1f37b0 2019-08-08 stsp done:
6434 2e1f37b0 2019-08-08 stsp free(label1);
6435 2e1f37b0 2019-08-08 stsp if (blob)
6436 2e1f37b0 2019-08-08 stsp got_object_blob_close(blob);
6437 2e1f37b0 2019-08-08 stsp if (staged_blob)
6438 2e1f37b0 2019-08-08 stsp got_object_blob_close(staged_blob);
6439 2e1f37b0 2019-08-08 stsp if (f1 && fclose(f1) == EOF && err == NULL)
6440 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path1);
6441 2e1f37b0 2019-08-08 stsp if (f2 && fclose(f2) == EOF && err == NULL)
6442 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", path2);
6443 2e1f37b0 2019-08-08 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
6444 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_unstaged_content);
6445 2e1f37b0 2019-08-08 stsp if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
6446 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("fclose", *path_new_staged_content);
6447 2e1f37b0 2019-08-08 stsp if (path1 && unlink(path1) == -1 && err == NULL)
6448 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path1);
6449 2e1f37b0 2019-08-08 stsp if (path2 && unlink(path2) == -1 && err == NULL)
6450 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path2);
6451 2e1f37b0 2019-08-08 stsp if (err || !have_content) {
6452 2e1f37b0 2019-08-08 stsp if (*path_unstaged_content &&
6453 2e1f37b0 2019-08-08 stsp unlink(*path_unstaged_content) == -1 && err == NULL)
6454 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
6455 2e1f37b0 2019-08-08 stsp *path_unstaged_content);
6456 2e1f37b0 2019-08-08 stsp free(*path_unstaged_content);
6457 2e1f37b0 2019-08-08 stsp *path_unstaged_content = NULL;
6458 2e1f37b0 2019-08-08 stsp }
6459 2e1f37b0 2019-08-08 stsp if (err || !have_rejected_content) {
6460 2e1f37b0 2019-08-08 stsp if (*path_new_staged_content &&
6461 2e1f37b0 2019-08-08 stsp unlink(*path_new_staged_content) == -1 && err == NULL)
6462 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink",
6463 2e1f37b0 2019-08-08 stsp *path_new_staged_content);
6464 2e1f37b0 2019-08-08 stsp free(*path_new_staged_content);
6465 2e1f37b0 2019-08-08 stsp *path_new_staged_content = NULL;
6466 2e1f37b0 2019-08-08 stsp }
6467 2e1f37b0 2019-08-08 stsp free(args);
6468 2e1f37b0 2019-08-08 stsp if (ds) {
6469 2e1f37b0 2019-08-08 stsp got_diff_state_free(ds);
6470 2e1f37b0 2019-08-08 stsp free(ds);
6471 2e1f37b0 2019-08-08 stsp }
6472 2e1f37b0 2019-08-08 stsp if (changes)
6473 2e1f37b0 2019-08-08 stsp got_diff_free_changes(changes);
6474 2e1f37b0 2019-08-08 stsp free(path1);
6475 2e1f37b0 2019-08-08 stsp free(path2);
6476 2e1f37b0 2019-08-08 stsp return err;
6477 2e1f37b0 2019-08-08 stsp }
6478 2e1f37b0 2019-08-08 stsp
6479 ad493afc 2019-08-03 stsp static const struct got_error *
6480 ad493afc 2019-08-03 stsp unstage_path(void *arg, unsigned char status,
6481 ad493afc 2019-08-03 stsp unsigned char staged_status, const char *relpath,
6482 ad493afc 2019-08-03 stsp struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6483 12463d8b 2019-12-13 stsp struct got_object_id *commit_id, int dirfd, const char *de_name)
6484 ad493afc 2019-08-03 stsp {
6485 ad493afc 2019-08-03 stsp const struct got_error *err = NULL;
6486 ad493afc 2019-08-03 stsp struct unstage_path_arg *a = arg;
6487 ad493afc 2019-08-03 stsp struct got_fileindex_entry *ie;
6488 ad493afc 2019-08-03 stsp struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
6489 2e1f37b0 2019-08-08 stsp char *ondisk_path = NULL, *path_unstaged_content = NULL;
6490 2e1f37b0 2019-08-08 stsp char *path_new_staged_content = NULL;
6491 f69721c3 2019-10-21 stsp char *id_str = NULL, *label_orig = NULL;
6492 ad493afc 2019-08-03 stsp int local_changes_subsumed;
6493 9bc94a15 2019-08-03 stsp struct stat sb;
6494 ad493afc 2019-08-03 stsp
6495 2e1f37b0 2019-08-08 stsp if (staged_status != GOT_STATUS_ADD &&
6496 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_MODIFY &&
6497 2e1f37b0 2019-08-08 stsp staged_status != GOT_STATUS_DELETE)
6498 2e1f37b0 2019-08-08 stsp return NULL;
6499 2e1f37b0 2019-08-08 stsp
6500 ad493afc 2019-08-03 stsp ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
6501 ad493afc 2019-08-03 stsp if (ie == NULL)
6502 8b13ce36 2019-08-08 stsp return got_error_path(relpath, GOT_ERR_FILE_STATUS);
6503 9bc94a15 2019-08-03 stsp
6504 9bc94a15 2019-08-03 stsp if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
6505 9bc94a15 2019-08-03 stsp == -1)
6506 9bc94a15 2019-08-03 stsp return got_error_from_errno("asprintf");
6507 ad493afc 2019-08-03 stsp
6508 f69721c3 2019-10-21 stsp err = got_object_id_str(&id_str,
6509 f69721c3 2019-10-21 stsp commit_id ? commit_id : a->worktree->base_commit_id);
6510 f69721c3 2019-10-21 stsp if (err)
6511 f69721c3 2019-10-21 stsp goto done;
6512 f69721c3 2019-10-21 stsp if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
6513 f69721c3 2019-10-21 stsp id_str) == -1) {
6514 f69721c3 2019-10-21 stsp err = got_error_from_errno("asprintf");
6515 f69721c3 2019-10-21 stsp goto done;
6516 f69721c3 2019-10-21 stsp }
6517 f69721c3 2019-10-21 stsp
6518 ad493afc 2019-08-03 stsp switch (staged_status) {
6519 ad493afc 2019-08-03 stsp case GOT_STATUS_MODIFY:
6520 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_base, a->repo,
6521 ad493afc 2019-08-03 stsp blob_id, 8192);
6522 ad493afc 2019-08-03 stsp if (err)
6523 ad493afc 2019-08-03 stsp break;
6524 ad493afc 2019-08-03 stsp /* fall through */
6525 ad493afc 2019-08-03 stsp case GOT_STATUS_ADD:
6526 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
6527 2e1f37b0 2019-08-08 stsp if (staged_status == GOT_STATUS_ADD) {
6528 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
6529 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
6530 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
6531 2e1f37b0 2019-08-08 stsp if (err)
6532 2e1f37b0 2019-08-08 stsp break;
6533 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES)
6534 2e1f37b0 2019-08-08 stsp break;
6535 2e1f37b0 2019-08-08 stsp } else {
6536 2e1f37b0 2019-08-08 stsp err = create_unstaged_content(
6537 2e1f37b0 2019-08-08 stsp &path_unstaged_content,
6538 2e1f37b0 2019-08-08 stsp &path_new_staged_content, blob_id,
6539 2e1f37b0 2019-08-08 stsp staged_blob_id, ie->path, a->repo,
6540 2e1f37b0 2019-08-08 stsp a->patch_cb, a->patch_arg);
6541 2e1f37b0 2019-08-08 stsp if (err || path_unstaged_content == NULL)
6542 2e1f37b0 2019-08-08 stsp break;
6543 2e1f37b0 2019-08-08 stsp if (path_new_staged_content) {
6544 2e1f37b0 2019-08-08 stsp err = got_object_blob_create(
6545 2e1f37b0 2019-08-08 stsp &staged_blob_id,
6546 2e1f37b0 2019-08-08 stsp path_new_staged_content,
6547 2e1f37b0 2019-08-08 stsp a->repo);
6548 2e1f37b0 2019-08-08 stsp if (err)
6549 2e1f37b0 2019-08-08 stsp break;
6550 2e1f37b0 2019-08-08 stsp memcpy(ie->staged_blob_sha1,
6551 2e1f37b0 2019-08-08 stsp staged_blob_id->sha1,
6552 2e1f37b0 2019-08-08 stsp SHA1_DIGEST_LENGTH);
6553 2e1f37b0 2019-08-08 stsp }
6554 2e1f37b0 2019-08-08 stsp err = merge_file(&local_changes_subsumed,
6555 2e1f37b0 2019-08-08 stsp a->worktree, blob_base, ondisk_path,
6556 2e1f37b0 2019-08-08 stsp relpath, got_fileindex_perms_to_st(ie),
6557 f69721c3 2019-10-21 stsp path_unstaged_content, label_orig,
6558 f69721c3 2019-10-21 stsp "unstaged", a->repo, a->progress_cb,
6559 f69721c3 2019-10-21 stsp a->progress_arg);
6560 2e1f37b0 2019-08-08 stsp if (err == NULL &&
6561 2e1f37b0 2019-08-08 stsp path_new_staged_content == NULL)
6562 2e1f37b0 2019-08-08 stsp got_fileindex_entry_stage_set(ie,
6563 2e1f37b0 2019-08-08 stsp GOT_FILEIDX_STAGE_NONE);
6564 2e1f37b0 2019-08-08 stsp break; /* Done with this file. */
6565 2e1f37b0 2019-08-08 stsp }
6566 2e1f37b0 2019-08-08 stsp }
6567 ad493afc 2019-08-03 stsp err = got_object_open_as_blob(&blob_staged, a->repo,
6568 ad493afc 2019-08-03 stsp staged_blob_id, 8192);
6569 ad493afc 2019-08-03 stsp if (err)
6570 ad493afc 2019-08-03 stsp break;
6571 ad493afc 2019-08-03 stsp err = merge_blob(&local_changes_subsumed, a->worktree,
6572 ad493afc 2019-08-03 stsp blob_base, ondisk_path, relpath,
6573 f69721c3 2019-10-21 stsp got_fileindex_perms_to_st(ie), label_orig, blob_staged,
6574 ad493afc 2019-08-03 stsp commit_id ? commit_id : a->worktree->base_commit_id,
6575 ad493afc 2019-08-03 stsp a->repo, a->progress_cb, a->progress_arg);
6576 ad493afc 2019-08-03 stsp if (err == NULL)
6577 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie,
6578 ad493afc 2019-08-03 stsp GOT_FILEIDX_STAGE_NONE);
6579 ad493afc 2019-08-03 stsp break;
6580 ad493afc 2019-08-03 stsp case GOT_STATUS_DELETE:
6581 2e1f37b0 2019-08-08 stsp if (a->patch_cb) {
6582 2e1f37b0 2019-08-08 stsp int choice = GOT_PATCH_CHOICE_NONE;
6583 2e1f37b0 2019-08-08 stsp err = (*a->patch_cb)(&choice, a->patch_arg,
6584 2e1f37b0 2019-08-08 stsp staged_status, ie->path, NULL, 1, 1);
6585 2e1f37b0 2019-08-08 stsp if (err)
6586 2e1f37b0 2019-08-08 stsp break;
6587 2e1f37b0 2019-08-08 stsp if (choice == GOT_PATCH_CHOICE_NO)
6588 2e1f37b0 2019-08-08 stsp break;
6589 2e1f37b0 2019-08-08 stsp if (choice != GOT_PATCH_CHOICE_YES) {
6590 2e1f37b0 2019-08-08 stsp err = got_error(GOT_ERR_PATCH_CHOICE);
6591 2e1f37b0 2019-08-08 stsp break;
6592 2e1f37b0 2019-08-08 stsp }
6593 2e1f37b0 2019-08-08 stsp }
6594 ad493afc 2019-08-03 stsp got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
6595 12463d8b 2019-12-13 stsp err = get_file_status(&status, &sb, ie, ondisk_path,
6596 12463d8b 2019-12-13 stsp dirfd, de_name, a->repo);
6597 9bc94a15 2019-08-03 stsp if (err)
6598 9bc94a15 2019-08-03 stsp break;
6599 9bc94a15 2019-08-03 stsp err = (*a->progress_cb)(a->progress_arg, status, relpath);
6600 ad493afc 2019-08-03 stsp break;
6601 ad493afc 2019-08-03 stsp }
6602 f69721c3 2019-10-21 stsp done:
6603 ad493afc 2019-08-03 stsp free(ondisk_path);
6604 2e1f37b0 2019-08-08 stsp if (path_unstaged_content &&
6605 2e1f37b0 2019-08-08 stsp unlink(path_unstaged_content) == -1 && err == NULL)
6606 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path_unstaged_content);
6607 2e1f37b0 2019-08-08 stsp if (path_new_staged_content &&
6608 2e1f37b0 2019-08-08 stsp unlink(path_new_staged_content) == -1 && err == NULL)
6609 2e1f37b0 2019-08-08 stsp err = got_error_from_errno2("unlink", path_new_staged_content);
6610 2e1f37b0 2019-08-08 stsp free(path_unstaged_content);
6611 2e1f37b0 2019-08-08 stsp free(path_new_staged_content);
6612 ad493afc 2019-08-03 stsp if (blob_base)
6613 ad493afc 2019-08-03 stsp got_object_blob_close(blob_base);
6614 ad493afc 2019-08-03 stsp if (blob_staged)
6615 ad493afc 2019-08-03 stsp got_object_blob_close(blob_staged);
6616 f69721c3 2019-10-21 stsp free(id_str);
6617 f69721c3 2019-10-21 stsp free(label_orig);
6618 ad493afc 2019-08-03 stsp return err;
6619 ad493afc 2019-08-03 stsp }
6620 ad493afc 2019-08-03 stsp
6621 ad493afc 2019-08-03 stsp const struct got_error *
6622 ad493afc 2019-08-03 stsp got_worktree_unstage(struct got_worktree *worktree,
6623 ad493afc 2019-08-03 stsp struct got_pathlist_head *paths,
6624 ad493afc 2019-08-03 stsp got_worktree_checkout_cb progress_cb, void *progress_arg,
6625 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
6626 ad493afc 2019-08-03 stsp struct got_repository *repo)
6627 ad493afc 2019-08-03 stsp {
6628 ad493afc 2019-08-03 stsp const struct got_error *err = NULL, *sync_err, *unlockerr;
6629 ad493afc 2019-08-03 stsp struct got_pathlist_entry *pe;
6630 ad493afc 2019-08-03 stsp struct got_fileindex *fileindex = NULL;
6631 ad493afc 2019-08-03 stsp char *fileindex_path = NULL;
6632 ad493afc 2019-08-03 stsp struct unstage_path_arg upa;
6633 ad493afc 2019-08-03 stsp
6634 ad493afc 2019-08-03 stsp err = lock_worktree(worktree, LOCK_EX);
6635 ad493afc 2019-08-03 stsp if (err)
6636 ad493afc 2019-08-03 stsp return err;
6637 ad493afc 2019-08-03 stsp
6638 ad493afc 2019-08-03 stsp err = open_fileindex(&fileindex, &fileindex_path, worktree);
6639 ad493afc 2019-08-03 stsp if (err)
6640 ad493afc 2019-08-03 stsp goto done;
6641 ad493afc 2019-08-03 stsp
6642 ad493afc 2019-08-03 stsp upa.worktree = worktree;
6643 ad493afc 2019-08-03 stsp upa.fileindex = fileindex;
6644 ad493afc 2019-08-03 stsp upa.repo = repo;
6645 ad493afc 2019-08-03 stsp upa.progress_cb = progress_cb;
6646 ad493afc 2019-08-03 stsp upa.progress_arg = progress_arg;
6647 2e1f37b0 2019-08-08 stsp upa.patch_cb = patch_cb;
6648 2e1f37b0 2019-08-08 stsp upa.patch_arg = patch_arg;
6649 ad493afc 2019-08-03 stsp TAILQ_FOREACH(pe, paths, entry) {
6650 ad493afc 2019-08-03 stsp err = worktree_status(worktree, pe->path, fileindex, repo,
6651 f2a9dc41 2019-12-13 tracey unstage_path, &upa, NULL, NULL, 0, 0);
6652 ad493afc 2019-08-03 stsp if (err)
6653 ad493afc 2019-08-03 stsp goto done;
6654 ad493afc 2019-08-03 stsp }
6655 ad493afc 2019-08-03 stsp
6656 ad493afc 2019-08-03 stsp sync_err = sync_fileindex(fileindex, fileindex_path);
6657 ad493afc 2019-08-03 stsp if (sync_err && err == NULL)
6658 ad493afc 2019-08-03 stsp err = sync_err;
6659 ad493afc 2019-08-03 stsp done:
6660 ad493afc 2019-08-03 stsp free(fileindex_path);
6661 ad493afc 2019-08-03 stsp if (fileindex)
6662 ad493afc 2019-08-03 stsp got_fileindex_free(fileindex);
6663 ad493afc 2019-08-03 stsp unlockerr = lock_worktree(worktree, LOCK_SH);
6664 ad493afc 2019-08-03 stsp if (unlockerr && err == NULL)
6665 ad493afc 2019-08-03 stsp err = unlockerr;
6666 ad493afc 2019-08-03 stsp return err;
6667 ad493afc 2019-08-03 stsp }