?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
yet another gotwebd TODO
[got-portable.git] / lib / worktree.c
blob0cbb33afa5333deceb3bf3b9bad3c0ad78e992c0
1 /*
2 * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
3 *
4 * Permission to use, copy, modify, and distribute this software for any
5 * purpose with or without fee is hereby granted, provided that the above
6 * copyright notice and this permission notice appear in all copies.
7 *
8 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15 */
16
17 #include <sys/stat.h>
18 #include <sys/queue.h>
19
20 #include <dirent.h>
21 #include <limits.h>
22 #include <stddef.h>
23 #include <string.h>
24 #include <stdio.h>
25 #include <stdlib.h>
26 #include <time.h>
27 #include <fcntl.h>
28 #include <errno.h>
29 #include <unistd.h>
30 #include <zlib.h>
31 #include <fnmatch.h>
32 #include <libgen.h>
33
34 #include "got_compat.h"
35
36 #include "got_error.h"
37 #include "got_repository.h"
38 #include "got_reference.h"
39 #include "got_object.h"
40 #include "got_path.h"
41 #include "got_cancel.h"
42 #include "got_worktree.h"
43 #include "got_opentemp.h"
44 #include "got_diff.h"
45
46 #include "got_lib_worktree.h"
47 #include "got_lib_sha1.h"
48 #include "got_lib_fileindex.h"
49 #include "got_lib_inflate.h"
50 #include "got_lib_delta.h"
51 #include "got_lib_object.h"
52 #include "got_lib_object_parse.h"
53 #include "got_lib_object_create.h"
54 #include "got_lib_object_idset.h"
55 #include "got_lib_diff.h"
56 #include "got_lib_gotconfig.h"
57
58 #ifndef MIN
59 #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
60 #endif
61
62 #define GOT_MERGE_LABEL_MERGED "merged change"
63 #define GOT_MERGE_LABEL_BASE "3-way merge base"
64
65 static mode_t apply_umask(mode_t);
66
67 static const struct got_error *
68 create_meta_file(const char *path_got, const char *name, const char *content)
69 {
70 const struct got_error *err = NULL;
71 char *path;
72
73 if (asprintf(&path, "%s/%s", path_got, name) == -1)
74 return got_error_from_errno("asprintf");
75
76 err = got_path_create_file(path, content);
77 free(path);
78 return err;
79 }
80
81 static const struct got_error *
82 update_meta_file(const char *path_got, const char *name, const char *content)
83 {
84 const struct got_error *err = NULL;
85 FILE *tmpfile = NULL;
86 char *tmppath = NULL;
87 char *path = NULL;
88
89 if (asprintf(&path, "%s/%s", path_got, name) == -1) {
90 err = got_error_from_errno("asprintf");
91 path = NULL;
92 goto done;
93 }
94
95 err = got_opentemp_named(&tmppath, &tmpfile, path, "");
96 if (err)
97 goto done;
98
99 if (content) {
100 int len = fprintf(tmpfile, "%s\n", content);
101 if (len != strlen(content) + 1) {
102 err = got_error_from_errno2("fprintf", tmppath);
103 goto done;
104 }
105 }
106
107 if (rename(tmppath, path) != 0) {
108 err = got_error_from_errno3("rename", tmppath, path);
109 unlink(tmppath);
110 goto done;
111 }
112
113 done:
114 if (fclose(tmpfile) == EOF && err == NULL)
115 err = got_error_from_errno2("fclose", tmppath);
116 free(tmppath);
117 return err;
118 }
119
120 static const struct got_error *
121 write_head_ref(const char *path_got, struct got_reference *head_ref)
122 {
123 const struct got_error *err = NULL;
124 char *refstr = NULL;
125
126 if (got_ref_is_symbolic(head_ref)) {
127 refstr = got_ref_to_str(head_ref);
128 if (refstr == NULL)
129 return got_error_from_errno("got_ref_to_str");
130 } else {
131 refstr = strdup(got_ref_get_name(head_ref));
132 if (refstr == NULL)
133 return got_error_from_errno("strdup");
134 }
135 err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
136 free(refstr);
137 return err;
138 }
139
140 const struct got_error *
141 got_worktree_init(const char *path, struct got_reference *head_ref,
142 const char *prefix, struct got_repository *repo)
143 {
144 const struct got_error *err = NULL;
145 struct got_object_id *commit_id = NULL;
146 uuid_t uuid;
147 uint32_t uuid_status;
148 int obj_type;
149 char *path_got = NULL;
150 char *formatstr = NULL;
151 char *absprefix = NULL;
152 char *basestr = NULL;
153 char *uuidstr = NULL;
154
155 if (strcmp(path, got_repo_get_path(repo)) == 0) {
156 err = got_error(GOT_ERR_WORKTREE_REPO);
157 goto done;
158 }
159
160 err = got_ref_resolve(&commit_id, repo, head_ref);
161 if (err)
162 return err;
163 err = got_object_get_type(&obj_type, repo, commit_id);
164 if (err)
165 return err;
166 if (obj_type != GOT_OBJ_TYPE_COMMIT)
167 return got_error(GOT_ERR_OBJ_TYPE);
168
169 if (!got_path_is_absolute(prefix)) {
170 if (asprintf(&absprefix, "/%s", prefix) == -1)
171 return got_error_from_errno("asprintf");
172 }
173
174 /* Create top-level directory (may already exist). */
175 if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
176 err = got_error_from_errno2("mkdir", path);
177 goto done;
178 }
179
180 /* Create .got directory (may already exist). */
181 if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
182 err = got_error_from_errno("asprintf");
183 goto done;
184 }
185 if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
186 err = got_error_from_errno2("mkdir", path_got);
187 goto done;
188 }
189
190 /* Create an empty lock file. */
191 err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
192 if (err)
193 goto done;
194
195 /* Create an empty file index. */
196 err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
197 if (err)
198 goto done;
199
200 /* Write the HEAD reference. */
201 err = write_head_ref(path_got, head_ref);
202 if (err)
203 goto done;
204
205 /* Record our base commit. */
206 err = got_object_id_str(&basestr, commit_id);
207 if (err)
208 goto done;
209 err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
210 if (err)
211 goto done;
212
213 /* Store path to repository. */
214 err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
215 got_repo_get_path(repo));
216 if (err)
217 goto done;
218
219 /* Store in-repository path prefix. */
220 err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
221 absprefix ? absprefix : prefix);
222 if (err)
223 goto done;
224
225 /* Generate UUID. */
226 uuid_create(&uuid, &uuid_status);
227 if (uuid_status != uuid_s_ok) {
228 err = got_error_uuid(uuid_status, "uuid_create");
229 goto done;
230 }
231 uuid_to_string(&uuid, &uuidstr, &uuid_status);
232 if (uuid_status != uuid_s_ok) {
233 err = got_error_uuid(uuid_status, "uuid_to_string");
234 goto done;
235 }
236 err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
237 if (err)
238 goto done;
239
240 /* Stamp work tree with format file. */
241 if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
242 err = got_error_from_errno("asprintf");
243 goto done;
244 }
245 err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
246 if (err)
247 goto done;
248
249 done:
250 free(commit_id);
251 free(path_got);
252 free(formatstr);
253 free(absprefix);
254 free(basestr);
255 free(uuidstr);
256 return err;
257 }
258
259 const struct got_error *
260 got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
261 const char *path_prefix)
262 {
263 char *absprefix = NULL;
264
265 if (!got_path_is_absolute(path_prefix)) {
266 if (asprintf(&absprefix, "/%s", path_prefix) == -1)
267 return got_error_from_errno("asprintf");
268 }
269 *match = (strcmp(absprefix ? absprefix : path_prefix,
270 worktree->path_prefix) == 0);
271 free(absprefix);
272 return NULL;
273 }
274
275 const char *
276 got_worktree_get_head_ref_name(struct got_worktree *worktree)
277 {
278 return worktree->head_ref_name;
279 }
280
281 const struct got_error *
282 got_worktree_set_head_ref(struct got_worktree *worktree,
283 struct got_reference *head_ref)
284 {
285 const struct got_error *err = NULL;
286 char *path_got = NULL, *head_ref_name = NULL;
287
288 if (asprintf(&path_got, "%s/%s", worktree->root_path,
289 GOT_WORKTREE_GOT_DIR) == -1) {
290 err = got_error_from_errno("asprintf");
291 path_got = NULL;
292 goto done;
293 }
294
295 head_ref_name = strdup(got_ref_get_name(head_ref));
296 if (head_ref_name == NULL) {
297 err = got_error_from_errno("strdup");
298 goto done;
299 }
300
301 err = write_head_ref(path_got, head_ref);
302 if (err)
303 goto done;
304
305 free(worktree->head_ref_name);
306 worktree->head_ref_name = head_ref_name;
307 done:
308 free(path_got);
309 if (err)
310 free(head_ref_name);
311 return err;
312 }
313
314 struct got_object_id *
315 got_worktree_get_base_commit_id(struct got_worktree *worktree)
316 {
317 return worktree->base_commit_id;
318 }
319
320 const struct got_error *
321 got_worktree_set_base_commit_id(struct got_worktree *worktree,
322 struct got_repository *repo, struct got_object_id *commit_id)
323 {
324 const struct got_error *err;
325 struct got_object *obj = NULL;
326 char *id_str = NULL;
327 char *path_got = NULL;
328
329 if (asprintf(&path_got, "%s/%s", worktree->root_path,
330 GOT_WORKTREE_GOT_DIR) == -1) {
331 err = got_error_from_errno("asprintf");
332 path_got = NULL;
333 goto done;
334 }
335
336 err = got_object_open(&obj, repo, commit_id);
337 if (err)
338 return err;
339
340 if (obj->type != GOT_OBJ_TYPE_COMMIT) {
341 err = got_error(GOT_ERR_OBJ_TYPE);
342 goto done;
343 }
344
345 /* Record our base commit. */
346 err = got_object_id_str(&id_str, commit_id);
347 if (err)
348 goto done;
349 err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
350 if (err)
351 goto done;
352
353 free(worktree->base_commit_id);
354 worktree->base_commit_id = got_object_id_dup(commit_id);
355 if (worktree->base_commit_id == NULL) {
356 err = got_error_from_errno("got_object_id_dup");
357 goto done;
358 }
359 done:
360 if (obj)
361 got_object_close(obj);
362 free(id_str);
363 free(path_got);
364 return err;
365 }
366
367 const struct got_gotconfig *
368 got_worktree_get_gotconfig(struct got_worktree *worktree)
369 {
370 return worktree->gotconfig;
371 }
372
373 static const struct got_error *
374 lock_worktree(struct got_worktree *worktree, int operation)
375 {
376 if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
377 return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
378 : got_error_from_errno2("flock",
379 got_worktree_get_root_path(worktree)));
380 return NULL;
381 }
382
383 static const struct got_error *
384 add_dir_on_disk(struct got_worktree *worktree, const char *path)
385 {
386 const struct got_error *err = NULL;
387 char *abspath;
388
389 if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
390 return got_error_from_errno("asprintf");
391
392 err = got_path_mkdir(abspath);
393 if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
394 struct stat sb;
395 err = NULL;
396 if (lstat(abspath, &sb) == -1) {
397 err = got_error_from_errno2("lstat", abspath);
398 } else if (!S_ISDIR(sb.st_mode)) {
399 /* TODO directory is obstructed; do something */
400 err = got_error_path(abspath, GOT_ERR_FILE_OBSTRUCTED);
401 }
402 }
403 free(abspath);
404 return err;
405 }
406
407 static const struct got_error *
408 check_file_contents_equal(int *same, FILE *f1, FILE *f2)
409 {
410 const struct got_error *err = NULL;
411 uint8_t fbuf1[8192];
412 uint8_t fbuf2[8192];
413 size_t flen1 = 0, flen2 = 0;
414
415 *same = 1;
416
417 for (;;) {
418 flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
419 if (flen1 == 0 && ferror(f1)) {
420 err = got_error_from_errno("fread");
421 break;
422 }
423 flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
424 if (flen2 == 0 && ferror(f2)) {
425 err = got_error_from_errno("fread");
426 break;
427 }
428 if (flen1 == 0) {
429 if (flen2 != 0)
430 *same = 0;
431 break;
432 } else if (flen2 == 0) {
433 if (flen1 != 0)
434 *same = 0;
435 break;
436 } else if (flen1 == flen2) {
437 if (memcmp(fbuf1, fbuf2, flen2) != 0) {
438 *same = 0;
439 break;
440 }
441 } else {
442 *same = 0;
443 break;
444 }
445 }
446
447 return err;
448 }
449
450 static const struct got_error *
451 check_files_equal(int *same, FILE *f1, FILE *f2)
452 {
453 struct stat sb;
454 size_t size1, size2;
455
456 *same = 1;
457
458 if (fstat(fileno(f1), &sb) != 0)
459 return got_error_from_errno("fstat");
460 size1 = sb.st_size;
461
462 if (fstat(fileno(f2), &sb) != 0)
463 return got_error_from_errno("fstat");
464 size2 = sb.st_size;
465
466 if (size1 != size2) {
467 *same = 0;
468 return NULL;
469 }
470
471 if (fseek(f1, 0L, SEEK_SET) == -1)
472 return got_ferror(f1, GOT_ERR_IO);
473 if (fseek(f2, 0L, SEEK_SET) == -1)
474 return got_ferror(f2, GOT_ERR_IO);
475
476 return check_file_contents_equal(same, f1, f2);
477 }
478
479 static const struct got_error *
480 copy_file_to_fd(off_t *outsize, FILE *f, int outfd)
481 {
482 uint8_t fbuf[65536];
483 size_t flen;
484 ssize_t outlen;
485
486 *outsize = 0;
487
488 if (fseek(f, 0L, SEEK_SET) == -1)
489 return got_ferror(f, GOT_ERR_IO);
490
491 for (;;) {
492 flen = fread(fbuf, 1, sizeof(fbuf), f);
493 if (flen == 0) {
494 if (ferror(f))
495 return got_error_from_errno("fread");
496 if (feof(f))
497 break;
498 }
499 outlen = write(outfd, fbuf, flen);
500 if (outlen == -1)
501 return got_error_from_errno("write");
502 if (outlen != flen)
503 return got_error(GOT_ERR_IO);
504 *outsize += outlen;
505 }
506
507 return NULL;
508 }
509
510 static const struct got_error *
511 merge_binary_file(int *overlapcnt, int merged_fd,
512 FILE *f_deriv, FILE *f_orig, FILE *f_deriv2,
513 const char *label_deriv, const char *label_orig, const char *label_deriv2,
514 const char *ondisk_path)
515 {
516 const struct got_error *err = NULL;
517 int same_content, changed_deriv, changed_deriv2;
518 int fd_orig = -1, fd_deriv = -1, fd_deriv2 = -1;
519 off_t size_orig = 0, size_deriv = 0, size_deriv2 = 0;
520 char *path_orig = NULL, *path_deriv = NULL, *path_deriv2 = NULL;
521 char *base_path_orig = NULL, *base_path_deriv = NULL;
522 char *base_path_deriv2 = NULL;
523
524 *overlapcnt = 0;
525
526 err = check_files_equal(&same_content, f_deriv, f_deriv2);
527 if (err)
528 return err;
529
530 if (same_content)
531 return copy_file_to_fd(&size_deriv, f_deriv, merged_fd);
532
533 err = check_files_equal(&same_content, f_deriv, f_orig);
534 if (err)
535 return err;
536 changed_deriv = !same_content;
537 err = check_files_equal(&same_content, f_deriv2, f_orig);
538 if (err)
539 return err;
540 changed_deriv2 = !same_content;
541
542 if (changed_deriv && changed_deriv2) {
543 *overlapcnt = 1;
544 if (asprintf(&base_path_orig, "%s-orig", ondisk_path) == -1) {
545 err = got_error_from_errno("asprintf");
546 goto done;
547 }
548 if (asprintf(&base_path_deriv, "%s-1", ondisk_path) == -1) {
549 err = got_error_from_errno("asprintf");
550 goto done;
551 }
552 if (asprintf(&base_path_deriv2, "%s-2", ondisk_path) == -1) {
553 err = got_error_from_errno("asprintf");
554 goto done;
555 }
556 err = got_opentemp_named_fd(&path_orig, &fd_orig,
557 base_path_orig, "");
558 if (err)
559 goto done;
560 err = got_opentemp_named_fd(&path_deriv, &fd_deriv,
561 base_path_deriv, "");
562 if (err)
563 goto done;
564 err = got_opentemp_named_fd(&path_deriv2, &fd_deriv2,
565 base_path_deriv2, "");
566 if (err)
567 goto done;
568 err = copy_file_to_fd(&size_orig, f_orig, fd_orig);
569 if (err)
570 goto done;
571 err = copy_file_to_fd(&size_deriv, f_deriv, fd_deriv);
572 if (err)
573 goto done;
574 err = copy_file_to_fd(&size_deriv2, f_deriv2, fd_deriv2);
575 if (err)
576 goto done;
577 if (dprintf(merged_fd, "Binary files differ and cannot be "
578 "merged automatically:\n") < 0) {
579 err = got_error_from_errno("dprintf");
580 goto done;
581 }
582 if (dprintf(merged_fd, "%s%s%s\nfile %s\n",
583 GOT_DIFF_CONFLICT_MARKER_BEGIN,
584 label_deriv ? " " : "",
585 label_deriv ? label_deriv : "",
586 path_deriv) < 0) {
587 err = got_error_from_errno("dprintf");
588 goto done;
589 }
590 if (size_orig > 0) {
591 if (dprintf(merged_fd, "%s%s%s\nfile %s\n",
592 GOT_DIFF_CONFLICT_MARKER_ORIG,
593 label_orig ? " " : "",
594 label_orig ? label_orig : "",
595 path_orig) < 0) {
596 err = got_error_from_errno("dprintf");
597 goto done;
598 }
599 }
600 if (dprintf(merged_fd, "%s\nfile %s\n%s%s%s\n",
601 GOT_DIFF_CONFLICT_MARKER_SEP,
602 path_deriv2,
603 GOT_DIFF_CONFLICT_MARKER_END,
604 label_deriv2 ? " " : "",
605 label_deriv2 ? label_deriv2 : "") < 0) {
606 err = got_error_from_errno("dprintf");
607 goto done;
608 }
609 } else if (changed_deriv)
610 err = copy_file_to_fd(&size_deriv, f_deriv, merged_fd);
611 else if (changed_deriv2)
612 err = copy_file_to_fd(&size_deriv2, f_deriv2, merged_fd);
613 done:
614 if (size_orig == 0 && path_orig && unlink(path_orig) == -1 &&
615 err == NULL)
616 err = got_error_from_errno2("unlink", path_orig);
617 if (fd_orig != -1 && close(fd_orig) == -1 && err == NULL)
618 err = got_error_from_errno2("close", path_orig);
619 if (fd_deriv != -1 && close(fd_deriv) == -1 && err == NULL)
620 err = got_error_from_errno2("close", path_deriv);
621 if (fd_deriv2 != -1 && close(fd_deriv2) == -1 && err == NULL)
622 err = got_error_from_errno2("close", path_deriv2);
623 free(path_orig);
624 free(path_deriv);
625 free(path_deriv2);
626 free(base_path_orig);
627 free(base_path_deriv);
628 free(base_path_deriv2);
629 return err;
630 }
631
632 /*
633 * Perform a 3-way merge where the file f_orig acts as the common
634 * ancestor, the file f_deriv acts as the first derived version,
635 * and the file f_deriv2 acts as the second derived version.
636 * The merge result will be written to a new file at ondisk_path; any
637 * existing file at this path will be replaced.
638 */
639 static const struct got_error *
640 merge_file(int *local_changes_subsumed, struct got_worktree *worktree,
641 FILE *f_orig, FILE *f_deriv, FILE *f_deriv2, const char *ondisk_path,
642 const char *path, uint16_t st_mode,
643 const char *label_orig, const char *label_deriv, const char *label_deriv2,
644 enum got_diff_algorithm diff_algo, struct got_repository *repo,
645 got_worktree_checkout_cb progress_cb, void *progress_arg)
646 {
647 const struct got_error *err = NULL;
648 int merged_fd = -1;
649 FILE *f_merged = NULL;
650 char *merged_path = NULL, *base_path = NULL;
651 int overlapcnt = 0;
652 char *parent = NULL;
653
654 *local_changes_subsumed = 0;
655
656 err = got_path_dirname(&parent, ondisk_path);
657 if (err)
658 return err;
659
660 if (asprintf(&base_path, "%s/got-merged", parent) == -1) {
661 err = got_error_from_errno("asprintf");
662 goto done;
663 }
664
665 err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path, "");
666 if (err)
667 goto done;
668
669 err = got_merge_diff3(&overlapcnt, merged_fd, f_deriv, f_orig,
670 f_deriv2, label_deriv, label_orig, label_deriv2, diff_algo);
671 if (err) {
672 if (err->code != GOT_ERR_FILE_BINARY)
673 goto done;
674 err = merge_binary_file(&overlapcnt, merged_fd, f_deriv,
675 f_orig, f_deriv2, label_deriv, label_orig, label_deriv2,
676 ondisk_path);
677 if (err)
678 goto done;
679 }
680
681 err = (*progress_cb)(progress_arg,
682 overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
683 if (err)
684 goto done;
685
686 if (fsync(merged_fd) != 0) {
687 err = got_error_from_errno("fsync");
688 goto done;
689 }
690
691 f_merged = fdopen(merged_fd, "r");
692 if (f_merged == NULL) {
693 err = got_error_from_errno("fdopen");
694 goto done;
695 }
696 merged_fd = -1;
697
698 /* Check if a clean merge has subsumed all local changes. */
699 if (overlapcnt == 0) {
700 err = check_files_equal(local_changes_subsumed, f_deriv,
701 f_merged);
702 if (err)
703 goto done;
704 }
705
706 if (fchmod(fileno(f_merged), apply_umask(st_mode)) != 0) {
707 err = got_error_from_errno2("fchmod", merged_path);
708 goto done;
709 }
710
711 if (rename(merged_path, ondisk_path) != 0) {
712 err = got_error_from_errno3("rename", merged_path,
713 ondisk_path);
714 goto done;
715 }
716 done:
717 if (err) {
718 if (merged_path)
719 unlink(merged_path);
720 }
721 if (merged_fd != -1 && close(merged_fd) == -1 && err == NULL)
722 err = got_error_from_errno("close");
723 if (f_merged && fclose(f_merged) == EOF && err == NULL)
724 err = got_error_from_errno("fclose");
725 free(merged_path);
726 free(base_path);
727 free(parent);
728 return err;
729 }
730
731 static const struct got_error *
732 update_symlink(const char *ondisk_path, const char *target_path,
733 size_t target_len)
734 {
735 /* This is not atomic but matches what 'ln -sf' does. */
736 if (unlink(ondisk_path) == -1)
737 return got_error_from_errno2("unlink", ondisk_path);
738 if (symlink(target_path, ondisk_path) == -1)
739 return got_error_from_errno3("symlink", target_path,
740 ondisk_path);
741 return NULL;
742 }
743
744 /*
745 * Overwrite a symlink (or a regular file in case there was a "bad" symlink)
746 * in the work tree with a file that contains conflict markers and the
747 * conflicting target paths of the original version, a "derived version"
748 * of a symlink from an incoming change, and a local version of the symlink.
749 *
750 * The original versions's target path can be NULL if it is not available,
751 * such as if both derived versions added a new symlink at the same path.
752 *
753 * The incoming derived symlink target is NULL in case the incoming change
754 * has deleted this symlink.
755 */
756 static const struct got_error *
757 install_symlink_conflict(const char *deriv_target,
758 struct got_object_id *deriv_base_commit_id, const char *orig_target,
759 const char *label_orig, const char *local_target, const char *ondisk_path)
760 {
761 const struct got_error *err;
762 char *id_str = NULL, *label_deriv = NULL, *path = NULL;
763 FILE *f = NULL;
764
765 err = got_object_id_str(&id_str, deriv_base_commit_id);
766 if (err)
767 return got_error_from_errno("asprintf");
768
769 if (asprintf(&label_deriv, "%s: commit %s",
770 GOT_MERGE_LABEL_MERGED, id_str) == -1) {
771 err = got_error_from_errno("asprintf");
772 goto done;
773 }
774
775 err = got_opentemp_named(&path, &f, "got-symlink-conflict", "");
776 if (err)
777 goto done;
778
779 if (fchmod(fileno(f), apply_umask(GOT_DEFAULT_FILE_MODE)) == -1) {
780 err = got_error_from_errno2("fchmod", path);
781 goto done;
782 }
783
784 if (fprintf(f, "%s %s\n%s\n%s%s%s%s%s\n%s\n%s\n",
785 GOT_DIFF_CONFLICT_MARKER_BEGIN, label_deriv,
786 deriv_target ? deriv_target : "(symlink was deleted)",
787 orig_target ? label_orig : "",
788 orig_target ? "\n" : "",
789 orig_target ? orig_target : "",
790 orig_target ? "\n" : "",
791 GOT_DIFF_CONFLICT_MARKER_SEP,
792 local_target, GOT_DIFF_CONFLICT_MARKER_END) < 0) {
793 err = got_error_from_errno2("fprintf", path);
794 goto done;
795 }
796
797 if (unlink(ondisk_path) == -1) {
798 err = got_error_from_errno2("unlink", ondisk_path);
799 goto done;
800 }
801 if (rename(path, ondisk_path) == -1) {
802 err = got_error_from_errno3("rename", path, ondisk_path);
803 goto done;
804 }
805 done:
806 if (f != NULL && fclose(f) == EOF && err == NULL)
807 err = got_error_from_errno2("fclose", path);
808 free(path);
809 free(id_str);
810 free(label_deriv);
811 return err;
812 }
813
814 /* forward declaration */
815 static const struct got_error *
816 merge_blob(int *, struct got_worktree *, struct got_blob_object *,
817 const char *, const char *, uint16_t, const char *,
818 struct got_blob_object *, struct got_object_id *,
819 struct got_repository *, got_worktree_checkout_cb, void *);
820
821 /*
822 * Merge a symlink into the work tree, where blob_orig acts as the common
823 * ancestor, deriv_target is the link target of the first derived version,
824 * and the symlink on disk acts as the second derived version.
825 * Assume that contents of both blobs represent symlinks.
826 */
827 static const struct got_error *
828 merge_symlink(struct got_worktree *worktree,
829 struct got_blob_object *blob_orig, const char *ondisk_path,
830 const char *path, const char *label_orig, const char *deriv_target,
831 struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
832 got_worktree_checkout_cb progress_cb, void *progress_arg)
833 {
834 const struct got_error *err = NULL;
835 char *ancestor_target = NULL;
836 struct stat sb;
837 ssize_t ondisk_len, deriv_len;
838 char ondisk_target[PATH_MAX];
839 int have_local_change = 0;
840 int have_incoming_change = 0;
841
842 if (lstat(ondisk_path, &sb) == -1)
843 return got_error_from_errno2("lstat", ondisk_path);
844
845 ondisk_len = readlink(ondisk_path, ondisk_target,
846 sizeof(ondisk_target));
847 if (ondisk_len == -1) {
848 err = got_error_from_errno2("readlink",
849 ondisk_path);
850 goto done;
851 }
852 ondisk_target[ondisk_len] = '\0';
853
854 if (blob_orig) {
855 err = got_object_blob_read_to_str(&ancestor_target, blob_orig);
856 if (err)
857 goto done;
858 }
859
860 if (ancestor_target == NULL ||
861 (ondisk_len != strlen(ancestor_target) ||
862 memcmp(ondisk_target, ancestor_target, ondisk_len) != 0))
863 have_local_change = 1;
864
865 deriv_len = strlen(deriv_target);
866 if (ancestor_target == NULL ||
867 (deriv_len != strlen(ancestor_target) ||
868 memcmp(deriv_target, ancestor_target, deriv_len) != 0))
869 have_incoming_change = 1;
870
871 if (!have_local_change && !have_incoming_change) {
872 if (ancestor_target) {
873 /* Both sides made the same change. */
874 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
875 path);
876 } else if (deriv_len == ondisk_len &&
877 memcmp(ondisk_target, deriv_target, deriv_len) == 0) {
878 /* Both sides added the same symlink. */
879 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
880 path);
881 } else {
882 /* Both sides added symlinks which don't match. */
883 err = install_symlink_conflict(deriv_target,
884 deriv_base_commit_id, ancestor_target,
885 label_orig, ondisk_target, ondisk_path);
886 if (err)
887 goto done;
888 err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
889 path);
890 }
891 } else if (!have_local_change && have_incoming_change) {
892 /* Apply the incoming change. */
893 err = update_symlink(ondisk_path, deriv_target,
894 strlen(deriv_target));
895 if (err)
896 goto done;
897 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
898 } else if (have_local_change && have_incoming_change) {
899 if (deriv_len == ondisk_len &&
900 memcmp(deriv_target, ondisk_target, deriv_len) == 0) {
901 /* Both sides made the same change. */
902 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
903 path);
904 } else {
905 err = install_symlink_conflict(deriv_target,
906 deriv_base_commit_id, ancestor_target, label_orig,
907 ondisk_target, ondisk_path);
908 if (err)
909 goto done;
910 err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
911 path);
912 }
913 }
914
915 done:
916 free(ancestor_target);
917 return err;
918 }
919
920 static const struct got_error *
921 dump_symlink_target_path_to_file(FILE **outfile, const char *ondisk_path)
922 {
923 const struct got_error *err = NULL;
924 char target_path[PATH_MAX];
925 ssize_t target_len;
926 size_t n;
927 FILE *f;
928
929 *outfile = NULL;
930
931 f = got_opentemp();
932 if (f == NULL)
933 return got_error_from_errno("got_opentemp");
934 target_len = readlink(ondisk_path, target_path, sizeof(target_path));
935 if (target_len == -1) {
936 err = got_error_from_errno2("readlink", ondisk_path);
937 goto done;
938 }
939 n = fwrite(target_path, 1, target_len, f);
940 if (n != target_len) {
941 err = got_ferror(f, GOT_ERR_IO);
942 goto done;
943 }
944 if (fflush(f) == EOF) {
945 err = got_error_from_errno("fflush");
946 goto done;
947 }
948 if (fseek(f, 0L, SEEK_SET) == -1) {
949 err = got_ferror(f, GOT_ERR_IO);
950 goto done;
951 }
952 done:
953 if (err)
954 fclose(f);
955 else
956 *outfile = f;
957 return err;
958 }
959
960 /*
961 * Perform a 3-way merge where blob_orig acts as the common ancestor,
962 * blob_deriv acts as the first derived version, and the file on disk
963 * acts as the second derived version.
964 */
965 static const struct got_error *
966 merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
967 struct got_blob_object *blob_orig, const char *ondisk_path,
968 const char *path, uint16_t st_mode, const char *label_orig,
969 struct got_blob_object *blob_deriv,
970 struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
971 got_worktree_checkout_cb progress_cb, void *progress_arg)
972 {
973 const struct got_error *err = NULL;
974 FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
975 char *blob_orig_path = NULL;
976 char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
977 char *label_deriv = NULL, *parent = NULL;
978
979 *local_changes_subsumed = 0;
980
981 err = got_path_dirname(&parent, ondisk_path);
982 if (err)
983 return err;
984
985 if (blob_orig) {
986 if (asprintf(&base_path, "%s/got-merge-blob-orig",
987 parent) == -1) {
988 err = got_error_from_errno("asprintf");
989 base_path = NULL;
990 goto done;
991 }
992
993 err = got_opentemp_named(&blob_orig_path, &f_orig,
994 base_path, "");
995 if (err)
996 goto done;
997 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
998 blob_orig);
999 if (err)
1000 goto done;
1001 free(base_path);
1002 } else {
1003 /*
1004 * No common ancestor exists. This is an "add vs add" conflict
1005 * and we simply use an empty ancestor file to make both files
1006 * appear in the merged result in their entirety.
1007 */
1008 f_orig = got_opentemp();
1009 if (f_orig == NULL) {
1010 err = got_error_from_errno("got_opentemp");
1011 goto done;
1012 }
1013 }
1014
1015 if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
1016 err = got_error_from_errno("asprintf");
1017 base_path = NULL;
1018 goto done;
1019 }
1020
1021 err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path, "");
1022 if (err)
1023 goto done;
1024 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
1025 blob_deriv);
1026 if (err)
1027 goto done;
1028
1029 err = got_object_id_str(&id_str, deriv_base_commit_id);
1030 if (err)
1031 goto done;
1032 if (asprintf(&label_deriv, "%s: commit %s",
1033 GOT_MERGE_LABEL_MERGED, id_str) == -1) {
1034 err = got_error_from_errno("asprintf");
1035 goto done;
1036 }
1037
1038 /*
1039 * In order the run a 3-way merge with a symlink we copy the symlink's
1040 * target path into a temporary file and use that file with diff3.
1041 */
1042 if (S_ISLNK(st_mode)) {
1043 err = dump_symlink_target_path_to_file(&f_deriv2, ondisk_path);
1044 if (err)
1045 goto done;
1046 } else {
1047 int fd;
1048 fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1049 if (fd == -1) {
1050 err = got_error_from_errno2("open", ondisk_path);
1051 goto done;
1052 }
1053 f_deriv2 = fdopen(fd, "r");
1054 if (f_deriv2 == NULL) {
1055 err = got_error_from_errno2("fdopen", ondisk_path);
1056 close(fd);
1057 goto done;
1058 }
1059 }
1060
1061 err = merge_file(local_changes_subsumed, worktree, f_orig, f_deriv,
1062 f_deriv2, ondisk_path, path, st_mode, label_orig, label_deriv,
1063 NULL, GOT_DIFF_ALGORITHM_MYERS, repo, progress_cb, progress_arg);
1064 done:
1065 if (f_orig && fclose(f_orig) == EOF && err == NULL)
1066 err = got_error_from_errno("fclose");
1067 if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
1068 err = got_error_from_errno("fclose");
1069 if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
1070 err = got_error_from_errno("fclose");
1071 free(base_path);
1072 if (blob_orig_path) {
1073 unlink(blob_orig_path);
1074 free(blob_orig_path);
1075 }
1076 if (blob_deriv_path) {
1077 unlink(blob_deriv_path);
1078 free(blob_deriv_path);
1079 }
1080 free(id_str);
1081 free(label_deriv);
1082 free(parent);
1083 return err;
1084 }
1085
1086 static const struct got_error *
1087 create_fileindex_entry(struct got_fileindex_entry **new_iep,
1088 struct got_fileindex *fileindex, struct got_object_id *base_commit_id,
1089 int wt_fd, const char *path, struct got_object_id *blob_id)
1090 {
1091 const struct got_error *err = NULL;
1092 struct got_fileindex_entry *new_ie;
1093
1094 *new_iep = NULL;
1095
1096 err = got_fileindex_entry_alloc(&new_ie, path);
1097 if (err)
1098 return err;
1099
1100 err = got_fileindex_entry_update(new_ie, wt_fd, path,
1101 blob_id->sha1, base_commit_id->sha1, 1);
1102 if (err)
1103 goto done;
1104
1105 err = got_fileindex_entry_add(fileindex, new_ie);
1106 done:
1107 if (err)
1108 got_fileindex_entry_free(new_ie);
1109 else
1110 *new_iep = new_ie;
1111 return err;
1112 }
1113
1114 static mode_t
1115 get_ondisk_perms(int executable, mode_t st_mode)
1116 {
1117 mode_t xbits = S_IXUSR;
1118
1119 if (executable) {
1120 /* Map read bits to execute bits. */
1121 if (st_mode & S_IRGRP)
1122 xbits |= S_IXGRP;
1123 if (st_mode & S_IROTH)
1124 xbits |= S_IXOTH;
1125 return st_mode | xbits;
1126 }
1127
1128 return st_mode;
1129 }
1130
1131 static mode_t
1132 apply_umask(mode_t mode)
1133 {
1134 mode_t um;
1135
1136 um = umask(000);
1137 umask(um);
1138 return mode & ~um;
1139 }
1140
1141 /* forward declaration */
1142 static const struct got_error *
1143 install_blob(struct got_worktree *worktree, const char *ondisk_path,
1144 const char *path, mode_t te_mode, mode_t st_mode,
1145 struct got_blob_object *blob, int restoring_missing_file,
1146 int reverting_versioned_file, int installing_bad_symlink,
1147 int path_is_unversioned, struct got_repository *repo,
1148 got_worktree_checkout_cb progress_cb, void *progress_arg);
1149
1150 /*
1151 * This function assumes that the provided symlink target points at a
1152 * safe location in the work tree!
1153 */
1154 static const struct got_error *
1155 replace_existing_symlink(int *did_something, const char *ondisk_path,
1156 const char *target_path, size_t target_len)
1157 {
1158 const struct got_error *err = NULL;
1159 ssize_t elen;
1160 char etarget[PATH_MAX];
1161 int fd;
1162
1163 *did_something = 0;
1164
1165 /*
1166 * "Bad" symlinks (those pointing outside the work tree or into the
1167 * .got directory) are installed in the work tree as a regular file
1168 * which contains the bad symlink target path.
1169 * The new symlink target has already been checked for safety by our
1170 * caller. If we can successfully open a regular file then we simply
1171 * replace this file with a symlink below.
1172 */
1173 fd = open(ondisk_path, O_RDWR | O_EXCL | O_NOFOLLOW | O_CLOEXEC);
1174 if (fd == -1) {
1175 if (!got_err_open_nofollow_on_symlink())
1176 return got_error_from_errno2("open", ondisk_path);
1177
1178 /* We are updating an existing on-disk symlink. */
1179 elen = readlink(ondisk_path, etarget, sizeof(etarget));
1180 if (elen == -1)
1181 return got_error_from_errno2("readlink", ondisk_path);
1182
1183 if (elen == target_len &&
1184 memcmp(etarget, target_path, target_len) == 0)
1185 return NULL; /* nothing to do */
1186 }
1187
1188 *did_something = 1;
1189 err = update_symlink(ondisk_path, target_path, target_len);
1190 if (fd != -1 && close(fd) == -1 && err == NULL)
1191 err = got_error_from_errno2("close", ondisk_path);
1192 return err;
1193 }
1194
1195 static const struct got_error *
1196 is_bad_symlink_target(int *is_bad_symlink, const char *target_path,
1197 size_t target_len, const char *ondisk_path, const char *wtroot_path)
1198 {
1199 const struct got_error *err = NULL;
1200 char canonpath[PATH_MAX];
1201 char *path_got = NULL;
1202
1203 *is_bad_symlink = 0;
1204
1205 if (target_len >= sizeof(canonpath)) {
1206 *is_bad_symlink = 1;
1207 return NULL;
1208 }
1209
1210 /*
1211 * We do not use realpath(3) to resolve the symlink's target
1212 * path because we don't want to resolve symlinks recursively.
1213 * Instead we make the path absolute and then canonicalize it.
1214 * Relative symlink target lookup should begin at the directory
1215 * in which the blob object is being installed.
1216 */
1217 if (!got_path_is_absolute(target_path)) {
1218 char *abspath, *parent;
1219 err = got_path_dirname(&parent, ondisk_path);
1220 if (err)
1221 return err;
1222 if (asprintf(&abspath, "%s/%s", parent, target_path) == -1) {
1223 free(parent);
1224 return got_error_from_errno("asprintf");
1225 }
1226 free(parent);
1227 if (strlen(abspath) >= sizeof(canonpath)) {
1228 err = got_error_path(abspath, GOT_ERR_BAD_PATH);
1229 free(abspath);
1230 return err;
1231 }
1232 err = got_canonpath(abspath, canonpath, sizeof(canonpath));
1233 free(abspath);
1234 if (err)
1235 return err;
1236 } else {
1237 err = got_canonpath(target_path, canonpath, sizeof(canonpath));
1238 if (err)
1239 return err;
1240 }
1241
1242 /* Only allow symlinks pointing at paths within the work tree. */
1243 if (!got_path_is_child(canonpath, wtroot_path, strlen(wtroot_path))) {
1244 *is_bad_symlink = 1;
1245 return NULL;
1246 }
1247
1248 /* Do not allow symlinks pointing into the .got directory. */
1249 if (asprintf(&path_got, "%s/%s", wtroot_path,
1250 GOT_WORKTREE_GOT_DIR) == -1)
1251 return got_error_from_errno("asprintf");
1252 if (got_path_is_child(canonpath, path_got, strlen(path_got)))
1253 *is_bad_symlink = 1;
1254
1255 free(path_got);
1256 return NULL;
1257 }
1258
1259 static const struct got_error *
1260 install_symlink(int *is_bad_symlink, struct got_worktree *worktree,
1261 const char *ondisk_path, const char *path, struct got_blob_object *blob,
1262 int restoring_missing_file, int reverting_versioned_file,
1263 int path_is_unversioned, int allow_bad_symlinks,
1264 struct got_repository *repo,
1265 got_worktree_checkout_cb progress_cb, void *progress_arg)
1266 {
1267 const struct got_error *err = NULL;
1268 char target_path[PATH_MAX];
1269 size_t len, target_len = 0;
1270 const uint8_t *buf = got_object_blob_get_read_buf(blob);
1271 size_t hdrlen = got_object_blob_get_hdrlen(blob);
1272
1273 *is_bad_symlink = 0;
1274
1275 /*
1276 * Blob object content specifies the target path of the link.
1277 * If a symbolic link cannot be installed we instead create
1278 * a regular file which contains the link target path stored
1279 * in the blob object.
1280 */
1281 do {
1282 err = got_object_blob_read_block(&len, blob);
1283 if (err)
1284 return err;
1285
1286 if (len + target_len >= sizeof(target_path)) {
1287 /* Path too long; install as a regular file. */
1288 *is_bad_symlink = 1;
1289 got_object_blob_rewind(blob);
1290 return install_blob(worktree, ondisk_path, path,
1291 GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1292 restoring_missing_file, reverting_versioned_file,
1293 1, path_is_unversioned, repo, progress_cb,
1294 progress_arg);
1295 }
1296 if (len > 0) {
1297 /* Skip blob object header first time around. */
1298 memcpy(target_path + target_len, buf + hdrlen,
1299 len - hdrlen);
1300 target_len += len - hdrlen;
1301 hdrlen = 0;
1302 }
1303 } while (len != 0);
1304 target_path[target_len] = '\0';
1305
1306 err = is_bad_symlink_target(is_bad_symlink, target_path, target_len,
1307 ondisk_path, worktree->root_path);
1308 if (err)
1309 return err;
1310
1311 if (*is_bad_symlink && !allow_bad_symlinks) {
1312 /* install as a regular file */
1313 got_object_blob_rewind(blob);
1314 err = install_blob(worktree, ondisk_path, path,
1315 GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1316 restoring_missing_file, reverting_versioned_file, 1,
1317 path_is_unversioned, repo, progress_cb, progress_arg);
1318 return err;
1319 }
1320
1321 if (symlink(target_path, ondisk_path) == -1) {
1322 if (errno == EEXIST) {
1323 int symlink_replaced;
1324 if (path_is_unversioned) {
1325 err = (*progress_cb)(progress_arg,
1326 GOT_STATUS_UNVERSIONED, path);
1327 return err;
1328 }
1329 err = replace_existing_symlink(&symlink_replaced,
1330 ondisk_path, target_path, target_len);
1331 if (err)
1332 return err;
1333 if (progress_cb) {
1334 if (symlink_replaced) {
1335 err = (*progress_cb)(progress_arg,
1336 reverting_versioned_file ?
1337 GOT_STATUS_REVERT :
1338 GOT_STATUS_UPDATE, path);
1339 } else {
1340 err = (*progress_cb)(progress_arg,
1341 GOT_STATUS_EXISTS, path);
1342 }
1343 }
1344 return err; /* Nothing else to do. */
1345 }
1346
1347 if (errno == ENOENT) {
1348 char *parent;
1349 err = got_path_dirname(&parent, ondisk_path);
1350 if (err)
1351 return err;
1352 err = add_dir_on_disk(worktree, parent);
1353 free(parent);
1354 if (err)
1355 return err;
1356 /*
1357 * Retry, and fall through to error handling
1358 * below if this second attempt fails.
1359 */
1360 if (symlink(target_path, ondisk_path) != -1) {
1361 err = NULL; /* success */
1362 return err;
1363 }
1364 }
1365
1366 /* Handle errors from first or second creation attempt. */
1367 if (errno == ENAMETOOLONG) {
1368 /* bad target path; install as a regular file */
1369 *is_bad_symlink = 1;
1370 got_object_blob_rewind(blob);
1371 err = install_blob(worktree, ondisk_path, path,
1372 GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1373 restoring_missing_file, reverting_versioned_file, 1,
1374 path_is_unversioned, repo,
1375 progress_cb, progress_arg);
1376 } else if (errno == ENOTDIR) {
1377 err = got_error_path(ondisk_path,
1378 GOT_ERR_FILE_OBSTRUCTED);
1379 } else {
1380 err = got_error_from_errno3("symlink",
1381 target_path, ondisk_path);
1382 }
1383 } else if (progress_cb)
1384 err = (*progress_cb)(progress_arg, reverting_versioned_file ?
1385 GOT_STATUS_REVERT : GOT_STATUS_ADD, path);
1386 return err;
1387 }
1388
1389 static const struct got_error *
1390 install_blob(struct got_worktree *worktree, const char *ondisk_path,
1391 const char *path, mode_t te_mode, mode_t st_mode,
1392 struct got_blob_object *blob, int restoring_missing_file,
1393 int reverting_versioned_file, int installing_bad_symlink,
1394 int path_is_unversioned, struct got_repository *repo,
1395 got_worktree_checkout_cb progress_cb, void *progress_arg)
1396 {
1397 const struct got_error *err = NULL;
1398 int fd = -1;
1399 size_t len, hdrlen;
1400 int update = 0;
1401 char *tmppath = NULL;
1402 mode_t mode;
1403
1404 mode = get_ondisk_perms(te_mode & S_IXUSR, GOT_DEFAULT_FILE_MODE);
1405 fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW |
1406 O_CLOEXEC, mode);
1407 if (fd == -1) {
1408 if (errno == ENOENT) {
1409 char *parent;
1410 err = got_path_dirname(&parent, path);
1411 if (err)
1412 return err;
1413 err = add_dir_on_disk(worktree, parent);
1414 free(parent);
1415 if (err)
1416 return err;
1417 fd = open(ondisk_path,
1418 O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW | O_CLOEXEC,
1419 mode);
1420 if (fd == -1)
1421 return got_error_from_errno2("open",
1422 ondisk_path);
1423 } else if (errno == EEXIST) {
1424 if (path_is_unversioned) {
1425 err = (*progress_cb)(progress_arg,
1426 GOT_STATUS_UNVERSIONED, path);
1427 goto done;
1428 }
1429 if (!(S_ISLNK(st_mode) && S_ISREG(te_mode)) &&
1430 !S_ISREG(st_mode) && !installing_bad_symlink) {
1431 /* TODO file is obstructed; do something */
1432 err = got_error_path(ondisk_path,
1433 GOT_ERR_FILE_OBSTRUCTED);
1434 goto done;
1435 } else {
1436 err = got_opentemp_named_fd(&tmppath, &fd,
1437 ondisk_path, "");
1438 if (err)
1439 goto done;
1440 update = 1;
1441
1442 if (fchmod(fd, apply_umask(mode)) == -1) {
1443 err = got_error_from_errno2("fchmod",
1444 tmppath);
1445 goto done;
1446 }
1447 }
1448 } else
1449 return got_error_from_errno2("open", ondisk_path);
1450 }
1451
1452 if (progress_cb) {
1453 if (restoring_missing_file)
1454 err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING,
1455 path);
1456 else if (reverting_versioned_file)
1457 err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT,
1458 path);
1459 else
1460 err = (*progress_cb)(progress_arg,
1461 update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
1462 if (err)
1463 goto done;
1464 }
1465
1466 hdrlen = got_object_blob_get_hdrlen(blob);
1467 do {
1468 const uint8_t *buf = got_object_blob_get_read_buf(blob);
1469 err = got_object_blob_read_block(&len, blob);
1470 if (err)
1471 break;
1472 if (len > 0) {
1473 /* Skip blob object header first time around. */
1474 ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1475 if (outlen == -1) {
1476 err = got_error_from_errno("write");
1477 goto done;
1478 } else if (outlen != len - hdrlen) {
1479 err = got_error(GOT_ERR_IO);
1480 goto done;
1481 }
1482 hdrlen = 0;
1483 }
1484 } while (len != 0);
1485
1486 if (fsync(fd) != 0) {
1487 err = got_error_from_errno("fsync");
1488 goto done;
1489 }
1490
1491 if (update) {
1492 if (S_ISLNK(st_mode) && unlink(ondisk_path) == -1) {
1493 err = got_error_from_errno2("unlink", ondisk_path);
1494 goto done;
1495 }
1496 if (rename(tmppath, ondisk_path) != 0) {
1497 err = got_error_from_errno3("rename", tmppath,
1498 ondisk_path);
1499 goto done;
1500 }
1501 free(tmppath);
1502 tmppath = NULL;
1503 }
1504
1505 done:
1506 if (fd != -1 && close(fd) == -1 && err == NULL)
1507 err = got_error_from_errno("close");
1508 if (tmppath != NULL && unlink(tmppath) == -1 && err == NULL)
1509 err = got_error_from_errno2("unlink", tmppath);
1510 free(tmppath);
1511 return err;
1512 }
1513
1514 /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1515 static const struct got_error *
1516 get_modified_file_content_status(unsigned char *status, FILE *f)
1517 {
1518 const struct got_error *err = NULL;
1519 const char *markers[3] = {
1520 GOT_DIFF_CONFLICT_MARKER_BEGIN,
1521 GOT_DIFF_CONFLICT_MARKER_SEP,
1522 GOT_DIFF_CONFLICT_MARKER_END
1523 };
1524 int i = 0;
1525 char *line = NULL;
1526 size_t linesize = 0;
1527 ssize_t linelen;
1528
1529 while (*status == GOT_STATUS_MODIFY) {
1530 linelen = getline(&line, &linesize, f);
1531 if (linelen == -1) {
1532 if (feof(f))
1533 break;
1534 err = got_ferror(f, GOT_ERR_IO);
1535 break;
1536 }
1537
1538 if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1539 if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1540 == 0)
1541 *status = GOT_STATUS_CONFLICT;
1542 else
1543 i++;
1544 }
1545 }
1546 free(line);
1547
1548 return err;
1549 }
1550
1551 static int
1552 xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1553 {
1554 mode_t ie_mode = got_fileindex_perms_to_st(ie);
1555 return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1556 }
1557
1558 static int
1559 stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1560 {
1561 return !(ie->ctime_sec == sb->st_ctim.tv_sec &&
1562 ie->ctime_nsec == sb->st_ctim.tv_nsec &&
1563 ie->mtime_sec == sb->st_mtim.tv_sec &&
1564 ie->mtime_nsec == sb->st_mtim.tv_nsec &&
1565 ie->size == (sb->st_size & 0xffffffff) &&
1566 !xbit_differs(ie, sb->st_mode));
1567 }
1568
1569 static unsigned char
1570 get_staged_status(struct got_fileindex_entry *ie)
1571 {
1572 switch (got_fileindex_entry_stage_get(ie)) {
1573 case GOT_FILEIDX_STAGE_ADD:
1574 return GOT_STATUS_ADD;
1575 case GOT_FILEIDX_STAGE_DELETE:
1576 return GOT_STATUS_DELETE;
1577 case GOT_FILEIDX_STAGE_MODIFY:
1578 return GOT_STATUS_MODIFY;
1579 default:
1580 return GOT_STATUS_NO_CHANGE;
1581 }
1582 }
1583
1584 static const struct got_error *
1585 get_symlink_modification_status(unsigned char *status,
1586 struct got_fileindex_entry *ie, const char *abspath,
1587 int dirfd, const char *de_name, struct got_blob_object *blob)
1588 {
1589 const struct got_error *err = NULL;
1590 char target_path[PATH_MAX];
1591 char etarget[PATH_MAX];
1592 ssize_t elen;
1593 size_t len, target_len = 0;
1594 const uint8_t *buf = got_object_blob_get_read_buf(blob);
1595 size_t hdrlen = got_object_blob_get_hdrlen(blob);
1596
1597 *status = GOT_STATUS_NO_CHANGE;
1598
1599 /* Blob object content specifies the target path of the link. */
1600 do {
1601 err = got_object_blob_read_block(&len, blob);
1602 if (err)
1603 return err;
1604 if (len + target_len >= sizeof(target_path)) {
1605 /*
1606 * Should not happen. The blob contents were OK
1607 * when this symlink was installed.
1608 */
1609 return got_error(GOT_ERR_NO_SPACE);
1610 }
1611 if (len > 0) {
1612 /* Skip blob object header first time around. */
1613 memcpy(target_path + target_len, buf + hdrlen,
1614 len - hdrlen);
1615 target_len += len - hdrlen;
1616 hdrlen = 0;
1617 }
1618 } while (len != 0);
1619 target_path[target_len] = '\0';
1620
1621 if (dirfd != -1) {
1622 elen = readlinkat(dirfd, de_name, etarget, sizeof(etarget));
1623 if (elen == -1)
1624 return got_error_from_errno2("readlinkat", abspath);
1625 } else {
1626 elen = readlink(abspath, etarget, sizeof(etarget));
1627 if (elen == -1)
1628 return got_error_from_errno2("readlink", abspath);
1629 }
1630
1631 if (elen != target_len || memcmp(etarget, target_path, target_len) != 0)
1632 *status = GOT_STATUS_MODIFY;
1633
1634 return NULL;
1635 }
1636
1637 static const struct got_error *
1638 get_file_status(unsigned char *status, struct stat *sb,
1639 struct got_fileindex_entry *ie, const char *abspath,
1640 int dirfd, const char *de_name, struct got_repository *repo)
1641 {
1642 const struct got_error *err = NULL;
1643 struct got_object_id id;
1644 size_t hdrlen;
1645 int fd = -1, fd1 = -1;
1646 FILE *f = NULL;
1647 uint8_t fbuf[8192];
1648 struct got_blob_object *blob = NULL;
1649 size_t flen, blen;
1650 unsigned char staged_status = get_staged_status(ie);
1651
1652 *status = GOT_STATUS_NO_CHANGE;
1653 memset(sb, 0, sizeof(*sb));
1654
1655 /*
1656 * Whenever the caller provides a directory descriptor and a
1657 * directory entry name for the file, use them! This prevents
1658 * race conditions if filesystem paths change beneath our feet.
1659 */
1660 if (dirfd != -1) {
1661 if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1662 if (errno == ENOENT) {
1663 if (got_fileindex_entry_has_file_on_disk(ie))
1664 *status = GOT_STATUS_MISSING;
1665 else
1666 *status = GOT_STATUS_DELETE;
1667 goto done;
1668 }
1669 err = got_error_from_errno2("fstatat", abspath);
1670 goto done;
1671 }
1672 } else {
1673 fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1674 if (fd == -1 && errno != ENOENT &&
1675 !got_err_open_nofollow_on_symlink())
1676 return got_error_from_errno2("open", abspath);
1677 else if (fd == -1 && got_err_open_nofollow_on_symlink()) {
1678 if (lstat(abspath, sb) == -1)
1679 return got_error_from_errno2("lstat", abspath);
1680 } else if (fd == -1 || fstat(fd, sb) == -1) {
1681 if (errno == ENOENT) {
1682 if (got_fileindex_entry_has_file_on_disk(ie))
1683 *status = GOT_STATUS_MISSING;
1684 else
1685 *status = GOT_STATUS_DELETE;
1686 goto done;
1687 }
1688 err = got_error_from_errno2("fstat", abspath);
1689 goto done;
1690 }
1691 }
1692
1693 if (!S_ISREG(sb->st_mode) && !S_ISLNK(sb->st_mode)) {
1694 *status = GOT_STATUS_OBSTRUCTED;
1695 goto done;
1696 }
1697
1698 if (!got_fileindex_entry_has_file_on_disk(ie)) {
1699 *status = GOT_STATUS_DELETE;
1700 goto done;
1701 } else if (!got_fileindex_entry_has_blob(ie) &&
1702 staged_status != GOT_STATUS_ADD) {
1703 *status = GOT_STATUS_ADD;
1704 goto done;
1705 }
1706
1707 if (!stat_info_differs(ie, sb))
1708 goto done;
1709
1710 if (S_ISLNK(sb->st_mode) &&
1711 got_fileindex_entry_filetype_get(ie) != GOT_FILEIDX_MODE_SYMLINK) {
1712 *status = GOT_STATUS_MODIFY;
1713 goto done;
1714 }
1715
1716 if (staged_status == GOT_STATUS_MODIFY ||
1717 staged_status == GOT_STATUS_ADD)
1718 memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1719 else
1720 memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1721
1722 fd1 = got_opentempfd();
1723 if (fd1 == -1) {
1724 err = got_error_from_errno("got_opentempfd");
1725 goto done;
1726 }
1727 err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf), fd1);
1728 if (err)
1729 goto done;
1730
1731 if (S_ISLNK(sb->st_mode)) {
1732 err = get_symlink_modification_status(status, ie,
1733 abspath, dirfd, de_name, blob);
1734 goto done;
1735 }
1736
1737 if (dirfd != -1) {
1738 fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1739 if (fd == -1) {
1740 err = got_error_from_errno2("openat", abspath);
1741 goto done;
1742 }
1743 }
1744
1745 f = fdopen(fd, "r");
1746 if (f == NULL) {
1747 err = got_error_from_errno2("fdopen", abspath);
1748 goto done;
1749 }
1750 fd = -1;
1751 hdrlen = got_object_blob_get_hdrlen(blob);
1752 for (;;) {
1753 const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1754 err = got_object_blob_read_block(&blen, blob);
1755 if (err)
1756 goto done;
1757 /* Skip length of blob object header first time around. */
1758 flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1759 if (flen == 0 && ferror(f)) {
1760 err = got_error_from_errno("fread");
1761 goto done;
1762 }
1763 if (blen - hdrlen == 0) {
1764 if (flen != 0)
1765 *status = GOT_STATUS_MODIFY;
1766 break;
1767 } else if (flen == 0) {
1768 if (blen - hdrlen != 0)
1769 *status = GOT_STATUS_MODIFY;
1770 break;
1771 } else if (blen - hdrlen == flen) {
1772 /* Skip blob object header first time around. */
1773 if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1774 *status = GOT_STATUS_MODIFY;
1775 break;
1776 }
1777 } else {
1778 *status = GOT_STATUS_MODIFY;
1779 break;
1780 }
1781 hdrlen = 0;
1782 }
1783
1784 if (*status == GOT_STATUS_MODIFY) {
1785 rewind(f);
1786 err = get_modified_file_content_status(status, f);
1787 } else if (xbit_differs(ie, sb->st_mode))
1788 *status = GOT_STATUS_MODE_CHANGE;
1789 done:
1790 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
1791 err = got_error_from_errno("close");
1792 if (blob)
1793 got_object_blob_close(blob);
1794 if (f != NULL && fclose(f) == EOF && err == NULL)
1795 err = got_error_from_errno2("fclose", abspath);
1796 if (fd != -1 && close(fd) == -1 && err == NULL)
1797 err = got_error_from_errno2("close", abspath);
1798 return err;
1799 }
1800
1801 /*
1802 * Update timestamps in the file index if a file is unmodified and
1803 * we had to run a full content comparison to find out.
1804 */
1805 static const struct got_error *
1806 sync_timestamps(int wt_fd, const char *path, unsigned char status,
1807 struct got_fileindex_entry *ie, struct stat *sb)
1808 {
1809 if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1810 return got_fileindex_entry_update(ie, wt_fd, path,
1811 ie->blob_sha1, ie->commit_sha1, 1);
1812
1813 return NULL;
1814 }
1815
1816 static const struct got_error *
1817 update_blob(struct got_worktree *worktree,
1818 struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1819 struct got_tree_entry *te, const char *path,
1820 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1821 void *progress_arg)
1822 {
1823 const struct got_error *err = NULL;
1824 struct got_blob_object *blob = NULL;
1825 char *ondisk_path = NULL;
1826 unsigned char status = GOT_STATUS_NO_CHANGE;
1827 struct stat sb;
1828 int fd1 = -1, fd2 = -1;
1829
1830 if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1831 return got_error_from_errno("asprintf");
1832
1833 if (ie) {
1834 if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1835 err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1836 goto done;
1837 }
1838 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1839 repo);
1840 if (err)
1841 goto done;
1842 if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1843 sb.st_mode = got_fileindex_perms_to_st(ie);
1844 } else {
1845 if (stat(ondisk_path, &sb) == -1) {
1846 if (errno != ENOENT) {
1847 err = got_error_from_errno2("stat",
1848 ondisk_path);
1849 goto done;
1850 }
1851 sb.st_mode = GOT_DEFAULT_FILE_MODE;
1852 status = GOT_STATUS_UNVERSIONED;
1853 } else {
1854 if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
1855 status = GOT_STATUS_UNVERSIONED;
1856 else
1857 status = GOT_STATUS_OBSTRUCTED;
1858 }
1859 }
1860
1861 if (status == GOT_STATUS_OBSTRUCTED) {
1862 if (ie)
1863 got_fileindex_entry_mark_skipped(ie);
1864 err = (*progress_cb)(progress_arg, status, path);
1865 goto done;
1866 }
1867 if (status == GOT_STATUS_CONFLICT) {
1868 if (ie)
1869 got_fileindex_entry_mark_skipped(ie);
1870 err = (*progress_cb)(progress_arg, GOT_STATUS_CANNOT_UPDATE,
1871 path);
1872 goto done;
1873 }
1874
1875 if (ie && status != GOT_STATUS_MISSING && S_ISREG(sb.st_mode) &&
1876 (S_ISLNK(te->mode) ||
1877 (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR))) {
1878 /*
1879 * This is a regular file or an installed bad symlink.
1880 * If the file index indicates that this file is already
1881 * up-to-date with respect to the repository we can skip
1882 * updating contents of this file.
1883 */
1884 if (got_fileindex_entry_has_commit(ie) &&
1885 memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1886 SHA1_DIGEST_LENGTH) == 0) {
1887 /* Same commit. */
1888 err = sync_timestamps(worktree->root_fd,
1889 path, status, ie, &sb);
1890 if (err)
1891 goto done;
1892 err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1893 path);
1894 goto done;
1895 }
1896 if (got_fileindex_entry_has_blob(ie) &&
1897 memcmp(ie->blob_sha1, te->id.sha1,
1898 SHA1_DIGEST_LENGTH) == 0) {
1899 /* Different commit but the same blob. */
1900 err = sync_timestamps(worktree->root_fd,
1901 path, status, ie, &sb);
1902 if (err)
1903 goto done;
1904 err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1905 path);
1906 goto done;
1907 }
1908 }
1909
1910 fd1 = got_opentempfd();
1911 if (fd1 == -1) {
1912 err = got_error_from_errno("got_opentempfd");
1913 goto done;
1914 }
1915 err = got_object_open_as_blob(&blob, repo, &te->id, 8192, fd1);
1916 if (err)
1917 goto done;
1918
1919 if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1920 int update_timestamps;
1921 struct got_blob_object *blob2 = NULL;
1922 char *label_orig = NULL;
1923 if (got_fileindex_entry_has_blob(ie)) {
1924 fd2 = got_opentempfd();
1925 if (fd2 == -1) {
1926 err = got_error_from_errno("got_opentempfd");
1927 goto done;
1928 }
1929 struct got_object_id id2;
1930 memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1931 err = got_object_open_as_blob(&blob2, repo, &id2, 8192,
1932 fd2);
1933 if (err)
1934 goto done;
1935 }
1936 if (got_fileindex_entry_has_commit(ie)) {
1937 char id_str[SHA1_DIGEST_STRING_LENGTH];
1938 if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
1939 sizeof(id_str)) == NULL) {
1940 err = got_error_path(id_str,
1941 GOT_ERR_BAD_OBJ_ID_STR);
1942 goto done;
1943 }
1944 if (asprintf(&label_orig, "%s: commit %s",
1945 GOT_MERGE_LABEL_BASE, id_str) == -1) {
1946 err = got_error_from_errno("asprintf");
1947 goto done;
1948 }
1949 }
1950 if (S_ISLNK(te->mode) && S_ISLNK(sb.st_mode)) {
1951 char *link_target;
1952 err = got_object_blob_read_to_str(&link_target, blob);
1953 if (err)
1954 goto done;
1955 err = merge_symlink(worktree, blob2, ondisk_path, path,
1956 label_orig, link_target, worktree->base_commit_id,
1957 repo, progress_cb, progress_arg);
1958 free(link_target);
1959 } else {
1960 err = merge_blob(&update_timestamps, worktree, blob2,
1961 ondisk_path, path, sb.st_mode, label_orig, blob,
1962 worktree->base_commit_id, repo,
1963 progress_cb, progress_arg);
1964 }
1965 free(label_orig);
1966 if (fd2 != -1 && close(fd2) == -1 && err == NULL) {
1967 err = got_error_from_errno("close");
1968 goto done;
1969 }
1970 if (blob2)
1971 got_object_blob_close(blob2);
1972 if (err)
1973 goto done;
1974 /*
1975 * Do not update timestamps of files with local changes.
1976 * Otherwise, a future status walk would treat them as
1977 * unmodified files again.
1978 */
1979 err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1980 blob->id.sha1, worktree->base_commit_id->sha1,
1981 update_timestamps);
1982 } else if (status == GOT_STATUS_MODE_CHANGE) {
1983 err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1984 blob->id.sha1, worktree->base_commit_id->sha1, 0);
1985 } else if (status == GOT_STATUS_DELETE) {
1986 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1987 if (err)
1988 goto done;
1989 err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1990 blob->id.sha1, worktree->base_commit_id->sha1, 0);
1991 if (err)
1992 goto done;
1993 } else {
1994 int is_bad_symlink = 0;
1995 if (S_ISLNK(te->mode)) {
1996 err = install_symlink(&is_bad_symlink, worktree,
1997 ondisk_path, path, blob,
1998 status == GOT_STATUS_MISSING, 0,
1999 status == GOT_STATUS_UNVERSIONED, 0,
2000 repo, progress_cb, progress_arg);
2001 } else {
2002 err = install_blob(worktree, ondisk_path, path,
2003 te->mode, sb.st_mode, blob,
2004 status == GOT_STATUS_MISSING, 0, 0,
2005 status == GOT_STATUS_UNVERSIONED, repo,
2006 progress_cb, progress_arg);
2007 }
2008 if (err)
2009 goto done;
2010
2011 if (ie) {
2012 err = got_fileindex_entry_update(ie,
2013 worktree->root_fd, path, blob->id.sha1,
2014 worktree->base_commit_id->sha1, 1);
2015 } else {
2016 err = create_fileindex_entry(&ie, fileindex,
2017 worktree->base_commit_id, worktree->root_fd, path,
2018 &blob->id);
2019 }
2020 if (err)
2021 goto done;
2022
2023 if (is_bad_symlink) {
2024 got_fileindex_entry_filetype_set(ie,
2025 GOT_FILEIDX_MODE_BAD_SYMLINK);
2026 }
2027 }
2028
2029 if (fd1 != -1 && close(fd1) == -1 && err == NULL) {
2030 err = got_error_from_errno("close");
2031 goto done;
2032 }
2033 got_object_blob_close(blob);
2034 done:
2035 free(ondisk_path);
2036 return err;
2037 }
2038
2039 static const struct got_error *
2040 remove_ondisk_file(const char *root_path, const char *path)
2041 {
2042 const struct got_error *err = NULL;
2043 char *ondisk_path = NULL, *parent = NULL;
2044
2045 if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
2046 return got_error_from_errno("asprintf");
2047
2048 if (unlink(ondisk_path) == -1) {
2049 if (errno != ENOENT)
2050 err = got_error_from_errno2("unlink", ondisk_path);
2051 } else {
2052 size_t root_len = strlen(root_path);
2053 err = got_path_dirname(&parent, ondisk_path);
2054 if (err)
2055 goto done;
2056 while (got_path_cmp(parent, root_path,
2057 strlen(parent), root_len) != 0) {
2058 free(ondisk_path);
2059 ondisk_path = parent;
2060 parent = NULL;
2061 if (rmdir(ondisk_path) == -1) {
2062 if (errno != ENOTEMPTY)
2063 err = got_error_from_errno2("rmdir",
2064 ondisk_path);
2065 break;
2066 }
2067 err = got_path_dirname(&parent, ondisk_path);
2068 if (err)
2069 break;
2070 }
2071 }
2072 done:
2073 free(ondisk_path);
2074 free(parent);
2075 return err;
2076 }
2077
2078 static const struct got_error *
2079 delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
2080 struct got_fileindex_entry *ie, struct got_repository *repo,
2081 got_worktree_checkout_cb progress_cb, void *progress_arg)
2082 {
2083 const struct got_error *err = NULL;
2084 unsigned char status;
2085 struct stat sb;
2086 char *ondisk_path;
2087
2088 if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
2089 return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
2090
2091 if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
2092 == -1)
2093 return got_error_from_errno("asprintf");
2094
2095 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
2096 if (err)
2097 goto done;
2098
2099 if (S_ISLNK(sb.st_mode) && status != GOT_STATUS_NO_CHANGE) {
2100 char ondisk_target[PATH_MAX];
2101 ssize_t ondisk_len = readlink(ondisk_path, ondisk_target,
2102 sizeof(ondisk_target));
2103 if (ondisk_len == -1) {
2104 err = got_error_from_errno2("readlink", ondisk_path);
2105 goto done;
2106 }
2107 ondisk_target[ondisk_len] = '\0';
2108 err = install_symlink_conflict(NULL, worktree->base_commit_id,
2109 NULL, NULL, /* XXX pass common ancestor info? */
2110 ondisk_target, ondisk_path);
2111 if (err)
2112 goto done;
2113 err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
2114 ie->path);
2115 goto done;
2116 }
2117
2118 if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
2119 status == GOT_STATUS_ADD) {
2120 err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
2121 if (err)
2122 goto done;
2123 /*
2124 * Preserve the working file and change the deleted blob's
2125 * entry into a schedule-add entry.
2126 */
2127 err = got_fileindex_entry_update(ie, worktree->root_fd,
2128 ie->path, NULL, NULL, 0);
2129 } else {
2130 err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
2131 if (err)
2132 goto done;
2133 if (status == GOT_STATUS_NO_CHANGE) {
2134 err = remove_ondisk_file(worktree->root_path, ie->path);
2135 if (err)
2136 goto done;
2137 }
2138 got_fileindex_entry_remove(fileindex, ie);
2139 }
2140 done:
2141 free(ondisk_path);
2142 return err;
2143 }
2144
2145 struct diff_cb_arg {
2146 struct got_fileindex *fileindex;
2147 struct got_worktree *worktree;
2148 struct got_repository *repo;
2149 got_worktree_checkout_cb progress_cb;
2150 void *progress_arg;
2151 got_cancel_cb cancel_cb;
2152 void *cancel_arg;
2153 };
2154
2155 static const struct got_error *
2156 diff_old_new(void *arg, struct got_fileindex_entry *ie,
2157 struct got_tree_entry *te, const char *parent_path)
2158 {
2159 struct diff_cb_arg *a = arg;
2160
2161 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2162 return got_error(GOT_ERR_CANCELLED);
2163
2164 return update_blob(a->worktree, a->fileindex, ie, te,
2165 ie->path, a->repo, a->progress_cb, a->progress_arg);
2166 }
2167
2168 static const struct got_error *
2169 diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2170 {
2171 struct diff_cb_arg *a = arg;
2172
2173 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2174 return got_error(GOT_ERR_CANCELLED);
2175
2176 return delete_blob(a->worktree, a->fileindex, ie,
2177 a->repo, a->progress_cb, a->progress_arg);
2178 }
2179
2180 static const struct got_error *
2181 diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
2182 {
2183 struct diff_cb_arg *a = arg;
2184 const struct got_error *err;
2185 char *path;
2186
2187 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2188 return got_error(GOT_ERR_CANCELLED);
2189
2190 if (got_object_tree_entry_is_submodule(te))
2191 return NULL;
2192
2193 if (asprintf(&path, "%s%s%s", parent_path,
2194 parent_path[0] ? "/" : "", te->name)
2195 == -1)
2196 return got_error_from_errno("asprintf");
2197
2198 if (S_ISDIR(te->mode))
2199 err = add_dir_on_disk(a->worktree, path);
2200 else
2201 err = update_blob(a->worktree, a->fileindex, NULL, te, path,
2202 a->repo, a->progress_cb, a->progress_arg);
2203
2204 free(path);
2205 return err;
2206 }
2207
2208 const struct got_error *
2209 got_worktree_get_uuid(char **uuidstr, struct got_worktree *worktree)
2210 {
2211 uint32_t uuid_status;
2212
2213 uuid_to_string(&worktree->uuid, uuidstr, &uuid_status);
2214 if (uuid_status != uuid_s_ok) {
2215 *uuidstr = NULL;
2216 return got_error_uuid(uuid_status, "uuid_to_string");
2217 }
2218
2219 return NULL;
2220 }
2221
2222 static const struct got_error *
2223 get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
2224 {
2225 const struct got_error *err = NULL;
2226 char *uuidstr = NULL;
2227
2228 *refname = NULL;
2229
2230 err = got_worktree_get_uuid(&uuidstr, worktree);
2231 if (err)
2232 return err;
2233
2234 if (asprintf(refname, "%s-%s", prefix, uuidstr) == -1) {
2235 err = got_error_from_errno("asprintf");
2236 *refname = NULL;
2237 }
2238 free(uuidstr);
2239 return err;
2240 }
2241
2242 const struct got_error *
2243 got_worktree_get_logmsg_ref_name(char **refname, struct got_worktree *worktree,
2244 const char *prefix)
2245 {
2246 return get_ref_name(refname, worktree, prefix);
2247 }
2248
2249 const struct got_error *
2250 got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
2251 {
2252 return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
2253 }
2254
2255 static const struct got_error *
2256 get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
2257 {
2258 return get_ref_name(refname, worktree,
2259 GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
2260 }
2261
2262 static const struct got_error *
2263 get_newbase_symref_name(char **refname, struct got_worktree *worktree)
2264 {
2265 return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
2266 }
2267
2268 static const struct got_error *
2269 get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
2270 {
2271 return get_ref_name(refname, worktree,
2272 GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
2273 }
2274
2275 static const struct got_error *
2276 get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
2277 {
2278 return get_ref_name(refname, worktree,
2279 GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
2280 }
2281
2282 static const struct got_error *
2283 get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
2284 {
2285 return get_ref_name(refname, worktree,
2286 GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
2287 }
2288
2289 static const struct got_error *
2290 get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
2291 {
2292 return get_ref_name(refname, worktree,
2293 GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
2294 }
2295
2296 static const struct got_error *
2297 get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
2298 {
2299 return get_ref_name(refname, worktree,
2300 GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
2301 }
2302
2303 static const struct got_error *
2304 get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
2305 {
2306 return get_ref_name(refname, worktree,
2307 GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
2308 }
2309
2310 const struct got_error *
2311 got_worktree_get_histedit_script_path(char **path,
2312 struct got_worktree *worktree)
2313 {
2314 if (asprintf(path, "%s/%s/%s", worktree->root_path,
2315 GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
2316 *path = NULL;
2317 return got_error_from_errno("asprintf");
2318 }
2319 return NULL;
2320 }
2321
2322 static const struct got_error *
2323 get_merge_branch_ref_name(char **refname, struct got_worktree *worktree)
2324 {
2325 return get_ref_name(refname, worktree,
2326 GOT_WORKTREE_MERGE_BRANCH_REF_PREFIX);
2327 }
2328
2329 static const struct got_error *
2330 get_merge_commit_ref_name(char **refname, struct got_worktree *worktree)
2331 {
2332 return get_ref_name(refname, worktree,
2333 GOT_WORKTREE_MERGE_COMMIT_REF_PREFIX);
2334 }
2335
2336 /*
2337 * Prevent Git's garbage collector from deleting our base commit by
2338 * setting a reference to our base commit's ID.
2339 */
2340 static const struct got_error *
2341 ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2342 {
2343 const struct got_error *err = NULL;
2344 struct got_reference *ref = NULL;
2345 char *refname;
2346
2347 err = got_worktree_get_base_ref_name(&refname, worktree);
2348 if (err)
2349 return err;
2350
2351 err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2352 if (err)
2353 goto done;
2354
2355 err = got_ref_write(ref, repo);
2356 done:
2357 free(refname);
2358 if (ref)
2359 got_ref_close(ref);
2360 return err;
2361 }
2362
2363 static const struct got_error *
2364 get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2365 {
2366 const struct got_error *err = NULL;
2367
2368 if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2369 GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2370 err = got_error_from_errno("asprintf");
2371 *fileindex_path = NULL;
2372 }
2373 return err;
2374 }
2375
2376
2377 static const struct got_error *
2378 open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2379 struct got_worktree *worktree)
2380 {
2381 const struct got_error *err = NULL;
2382 FILE *index = NULL;
2383
2384 *fileindex_path = NULL;
2385 *fileindex = got_fileindex_alloc();
2386 if (*fileindex == NULL)
2387 return got_error_from_errno("got_fileindex_alloc");
2388
2389 err = get_fileindex_path(fileindex_path, worktree);
2390 if (err)
2391 goto done;
2392
2393 index = fopen(*fileindex_path, "rbe");
2394 if (index == NULL) {
2395 if (errno != ENOENT)
2396 err = got_error_from_errno2("fopen", *fileindex_path);
2397 } else {
2398 err = got_fileindex_read(*fileindex, index);
2399 if (fclose(index) == EOF && err == NULL)
2400 err = got_error_from_errno("fclose");
2401 }
2402 done:
2403 if (err) {
2404 free(*fileindex_path);
2405 *fileindex_path = NULL;
2406 got_fileindex_free(*fileindex);
2407 *fileindex = NULL;
2408 }
2409 return err;
2410 }
2411
2412 struct bump_base_commit_id_arg {
2413 struct got_object_id *base_commit_id;
2414 const char *path;
2415 size_t path_len;
2416 const char *entry_name;
2417 got_worktree_checkout_cb progress_cb;
2418 void *progress_arg;
2419 };
2420
2421 /* Bump base commit ID of all files within an updated part of the work tree. */
2422 static const struct got_error *
2423 bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2424 {
2425 const struct got_error *err;
2426 struct bump_base_commit_id_arg *a = arg;
2427
2428 if (a->entry_name) {
2429 if (strcmp(ie->path, a->path) != 0)
2430 return NULL;
2431 } else if (!got_path_is_child(ie->path, a->path, a->path_len))
2432 return NULL;
2433
2434 if (got_fileindex_entry_was_skipped(ie))
2435 return NULL;
2436
2437 if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2438 SHA1_DIGEST_LENGTH) == 0)
2439 return NULL;
2440
2441 if (a->progress_cb) {
2442 err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2443 ie->path);
2444 if (err)
2445 return err;
2446 }
2447 memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2448 return NULL;
2449 }
2450
2451 static const struct got_error *
2452 bump_base_commit_id_everywhere(struct got_worktree *worktree,
2453 struct got_fileindex *fileindex,
2454 got_worktree_checkout_cb progress_cb, void *progress_arg)
2455 {
2456 struct bump_base_commit_id_arg bbc_arg;
2457
2458 bbc_arg.base_commit_id = worktree->base_commit_id;
2459 bbc_arg.entry_name = NULL;
2460 bbc_arg.path = "";
2461 bbc_arg.path_len = 0;
2462 bbc_arg.progress_cb = progress_cb;
2463 bbc_arg.progress_arg = progress_arg;
2464
2465 return got_fileindex_for_each_entry_safe(fileindex,
2466 bump_base_commit_id, &bbc_arg);
2467 }
2468
2469 static const struct got_error *
2470 sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2471 {
2472 const struct got_error *err = NULL;
2473 char *new_fileindex_path = NULL;
2474 FILE *new_index = NULL;
2475 struct timespec timeout;
2476
2477 err = got_opentemp_named(&new_fileindex_path, &new_index,
2478 fileindex_path, "");
2479 if (err)
2480 goto done;
2481
2482 err = got_fileindex_write(fileindex, new_index);
2483 if (err)
2484 goto done;
2485
2486 if (rename(new_fileindex_path, fileindex_path) != 0) {
2487 err = got_error_from_errno3("rename", new_fileindex_path,
2488 fileindex_path);
2489 unlink(new_fileindex_path);
2490 }
2491
2492 /*
2493 * Sleep for a short amount of time to ensure that files modified after
2494 * this program exits have a different time stamp from the one which
2495 * was recorded in the file index.
2496 */
2497 timeout.tv_sec = 0;
2498 timeout.tv_nsec = 1;
2499 nanosleep(&timeout, NULL);
2500 done:
2501 if (new_index)
2502 fclose(new_index);
2503 free(new_fileindex_path);
2504 return err;
2505 }
2506
2507 static const struct got_error *
2508 find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2509 struct got_object_id **tree_id, const char *wt_relpath,
2510 struct got_commit_object *base_commit, struct got_worktree *worktree,
2511 struct got_repository *repo)
2512 {
2513 const struct got_error *err = NULL;
2514 struct got_object_id *id = NULL;
2515 char *in_repo_path = NULL;
2516 int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2517
2518 *entry_type = GOT_OBJ_TYPE_ANY;
2519 *tree_relpath = NULL;
2520 *tree_id = NULL;
2521
2522 if (wt_relpath[0] == '\0') {
2523 /* Check out all files within the work tree. */
2524 *entry_type = GOT_OBJ_TYPE_TREE;
2525 *tree_relpath = strdup("");
2526 if (*tree_relpath == NULL) {
2527 err = got_error_from_errno("strdup");
2528 goto done;
2529 }
2530 err = got_object_id_by_path(tree_id, repo, base_commit,
2531 worktree->path_prefix);
2532 if (err)
2533 goto done;
2534 return NULL;
2535 }
2536
2537 /* Check out a subset of files in the work tree. */
2538
2539 if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2540 is_root_wt ? "" : "/", wt_relpath) == -1) {
2541 err = got_error_from_errno("asprintf");
2542 goto done;
2543 }
2544
2545 err = got_object_id_by_path(&id, repo, base_commit, in_repo_path);
2546 if (err)
2547 goto done;
2548
2549 free(in_repo_path);
2550 in_repo_path = NULL;
2551
2552 err = got_object_get_type(entry_type, repo, id);
2553 if (err)
2554 goto done;
2555
2556 if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2557 /* Check out a single file. */
2558 if (strchr(wt_relpath, '/') == NULL) {
2559 /* Check out a single file in work tree's root dir. */
2560 in_repo_path = strdup(worktree->path_prefix);
2561 if (in_repo_path == NULL) {
2562 err = got_error_from_errno("strdup");
2563 goto done;
2564 }
2565 *tree_relpath = strdup("");
2566 if (*tree_relpath == NULL) {
2567 err = got_error_from_errno("strdup");
2568 goto done;
2569 }
2570 } else {
2571 /* Check out a single file in a subdirectory. */
2572 err = got_path_dirname(tree_relpath, wt_relpath);
2573 if (err)
2574 return err;
2575 if (asprintf(&in_repo_path, "%s%s%s",
2576 worktree->path_prefix, is_root_wt ? "" : "/",
2577 *tree_relpath) == -1) {
2578 err = got_error_from_errno("asprintf");
2579 goto done;
2580 }
2581 }
2582 err = got_object_id_by_path(tree_id, repo,
2583 base_commit, in_repo_path);
2584 } else {
2585 /* Check out all files within a subdirectory. */
2586 *tree_id = got_object_id_dup(id);
2587 if (*tree_id == NULL) {
2588 err = got_error_from_errno("got_object_id_dup");
2589 goto done;
2590 }
2591 *tree_relpath = strdup(wt_relpath);
2592 if (*tree_relpath == NULL) {
2593 err = got_error_from_errno("strdup");
2594 goto done;
2595 }
2596 }
2597 done:
2598 free(id);
2599 free(in_repo_path);
2600 if (err) {
2601 *entry_type = GOT_OBJ_TYPE_ANY;
2602 free(*tree_relpath);
2603 *tree_relpath = NULL;
2604 free(*tree_id);
2605 *tree_id = NULL;
2606 }
2607 return err;
2608 }
2609
2610 static const struct got_error *
2611 checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2612 const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2613 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2614 void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2615 {
2616 const struct got_error *err = NULL;
2617 struct got_commit_object *commit = NULL;
2618 struct got_tree_object *tree = NULL;
2619 struct got_fileindex_diff_tree_cb diff_cb;
2620 struct diff_cb_arg arg;
2621
2622 err = ref_base_commit(worktree, repo);
2623 if (err) {
2624 if (!(err->code == GOT_ERR_ERRNO &&
2625 (errno == EACCES || errno == EROFS)))
2626 goto done;
2627 err = (*progress_cb)(progress_arg,
2628 GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2629 if (err)
2630 return err;
2631 }
2632
2633 err = got_object_open_as_commit(&commit, repo,
2634 worktree->base_commit_id);
2635 if (err)
2636 goto done;
2637
2638 err = got_object_open_as_tree(&tree, repo, tree_id);
2639 if (err)
2640 goto done;
2641
2642 if (entry_name &&
2643 got_object_tree_find_entry(tree, entry_name) == NULL) {
2644 err = got_error_path(entry_name, GOT_ERR_NO_TREE_ENTRY);
2645 goto done;
2646 }
2647
2648 diff_cb.diff_old_new = diff_old_new;
2649 diff_cb.diff_old = diff_old;
2650 diff_cb.diff_new = diff_new;
2651 arg.fileindex = fileindex;
2652 arg.worktree = worktree;
2653 arg.repo = repo;
2654 arg.progress_cb = progress_cb;
2655 arg.progress_arg = progress_arg;
2656 arg.cancel_cb = cancel_cb;
2657 arg.cancel_arg = cancel_arg;
2658 err = got_fileindex_diff_tree(fileindex, tree, relpath,
2659 entry_name, repo, &diff_cb, &arg);
2660 done:
2661 if (tree)
2662 got_object_tree_close(tree);
2663 if (commit)
2664 got_object_commit_close(commit);
2665 return err;
2666 }
2667
2668 const struct got_error *
2669 got_worktree_checkout_files(struct got_worktree *worktree,
2670 struct got_pathlist_head *paths, struct got_repository *repo,
2671 got_worktree_checkout_cb progress_cb, void *progress_arg,
2672 got_cancel_cb cancel_cb, void *cancel_arg)
2673 {
2674 const struct got_error *err = NULL, *sync_err, *unlockerr;
2675 struct got_commit_object *commit = NULL;
2676 struct got_tree_object *tree = NULL;
2677 struct got_fileindex *fileindex = NULL;
2678 char *fileindex_path = NULL;
2679 struct got_pathlist_entry *pe;
2680 struct tree_path_data {
2681 STAILQ_ENTRY(tree_path_data) entry;
2682 struct got_object_id *tree_id;
2683 int entry_type;
2684 char *relpath;
2685 char *entry_name;
2686 } *tpd = NULL;
2687 STAILQ_HEAD(tree_paths, tree_path_data) tree_paths;
2688
2689 STAILQ_INIT(&tree_paths);
2690
2691 err = lock_worktree(worktree, LOCK_EX);
2692 if (err)
2693 return err;
2694
2695 err = got_object_open_as_commit(&commit, repo,
2696 worktree->base_commit_id);
2697 if (err)
2698 goto done;
2699
2700 /* Map all specified paths to in-repository trees. */
2701 TAILQ_FOREACH(pe, paths, entry) {
2702 tpd = malloc(sizeof(*tpd));
2703 if (tpd == NULL) {
2704 err = got_error_from_errno("malloc");
2705 goto done;
2706 }
2707
2708 err = find_tree_entry_for_checkout(&tpd->entry_type,
2709 &tpd->relpath, &tpd->tree_id, pe->path, commit,
2710 worktree, repo);
2711 if (err) {
2712 free(tpd);
2713 goto done;
2714 }
2715
2716 if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2717 err = got_path_basename(&tpd->entry_name, pe->path);
2718 if (err) {
2719 free(tpd->relpath);
2720 free(tpd->tree_id);
2721 free(tpd);
2722 goto done;
2723 }
2724 } else
2725 tpd->entry_name = NULL;
2726
2727 STAILQ_INSERT_TAIL(&tree_paths, tpd, entry);
2728 }
2729
2730 /*
2731 * Read the file index.
2732 * Checking out files is supposed to be an idempotent operation.
2733 * If the on-disk file index is incomplete we will try to complete it.
2734 */
2735 err = open_fileindex(&fileindex, &fileindex_path, worktree);
2736 if (err)
2737 goto done;
2738
2739 tpd = STAILQ_FIRST(&tree_paths);
2740 TAILQ_FOREACH(pe, paths, entry) {
2741 struct bump_base_commit_id_arg bbc_arg;
2742
2743 err = checkout_files(worktree, fileindex, tpd->relpath,
2744 tpd->tree_id, tpd->entry_name, repo,
2745 progress_cb, progress_arg, cancel_cb, cancel_arg);
2746 if (err)
2747 break;
2748
2749 bbc_arg.base_commit_id = worktree->base_commit_id;
2750 bbc_arg.entry_name = tpd->entry_name;
2751 bbc_arg.path = pe->path;
2752 bbc_arg.path_len = pe->path_len;
2753 bbc_arg.progress_cb = progress_cb;
2754 bbc_arg.progress_arg = progress_arg;
2755 err = got_fileindex_for_each_entry_safe(fileindex,
2756 bump_base_commit_id, &bbc_arg);
2757 if (err)
2758 break;
2759
2760 tpd = STAILQ_NEXT(tpd, entry);
2761 }
2762 sync_err = sync_fileindex(fileindex, fileindex_path);
2763 if (sync_err && err == NULL)
2764 err = sync_err;
2765 done:
2766 free(fileindex_path);
2767 if (tree)
2768 got_object_tree_close(tree);
2769 if (commit)
2770 got_object_commit_close(commit);
2771 if (fileindex)
2772 got_fileindex_free(fileindex);
2773 while (!STAILQ_EMPTY(&tree_paths)) {
2774 tpd = STAILQ_FIRST(&tree_paths);
2775 STAILQ_REMOVE_HEAD(&tree_paths, entry);
2776 free(tpd->relpath);
2777 free(tpd->tree_id);
2778 free(tpd);
2779 }
2780 unlockerr = lock_worktree(worktree, LOCK_SH);
2781 if (unlockerr && err == NULL)
2782 err = unlockerr;
2783 return err;
2784 }
2785
2786 struct merge_file_cb_arg {
2787 struct got_worktree *worktree;
2788 struct got_fileindex *fileindex;
2789 got_worktree_checkout_cb progress_cb;
2790 void *progress_arg;
2791 got_cancel_cb cancel_cb;
2792 void *cancel_arg;
2793 const char *label_orig;
2794 struct got_object_id *commit_id2;
2795 int allow_bad_symlinks;
2796 };
2797
2798 static const struct got_error *
2799 merge_file_cb(void *arg, struct got_blob_object *blob1,
2800 struct got_blob_object *blob2, FILE *f1, FILE *f2,
2801 struct got_object_id *id1, struct got_object_id *id2,
2802 const char *path1, const char *path2,
2803 mode_t mode1, mode_t mode2, struct got_repository *repo)
2804 {
2805 static const struct got_error *err = NULL;
2806 struct merge_file_cb_arg *a = arg;
2807 struct got_fileindex_entry *ie;
2808 char *ondisk_path = NULL;
2809 struct stat sb;
2810 unsigned char status;
2811 int local_changes_subsumed;
2812 FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
2813 char *id_str = NULL, *label_deriv2 = NULL;
2814
2815 if (blob1 && blob2) {
2816 ie = got_fileindex_entry_get(a->fileindex, path2,
2817 strlen(path2));
2818 if (ie == NULL)
2819 return (*a->progress_cb)(a->progress_arg,
2820 GOT_STATUS_MISSING, path2);
2821
2822 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2823 path2) == -1)
2824 return got_error_from_errno("asprintf");
2825
2826 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2827 repo);
2828 if (err)
2829 goto done;
2830
2831 if (status == GOT_STATUS_DELETE) {
2832 err = (*a->progress_cb)(a->progress_arg,
2833 GOT_STATUS_MERGE, path2);
2834 goto done;
2835 }
2836 if (status != GOT_STATUS_NO_CHANGE &&
2837 status != GOT_STATUS_MODIFY &&
2838 status != GOT_STATUS_CONFLICT &&
2839 status != GOT_STATUS_ADD) {
2840 err = (*a->progress_cb)(a->progress_arg, status, path2);
2841 goto done;
2842 }
2843
2844 if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
2845 char *link_target2;
2846 err = got_object_blob_read_to_str(&link_target2, blob2);
2847 if (err)
2848 goto done;
2849 err = merge_symlink(a->worktree, blob1, ondisk_path,
2850 path2, a->label_orig, link_target2, a->commit_id2,
2851 repo, a->progress_cb, a->progress_arg);
2852 free(link_target2);
2853 } else {
2854 int fd;
2855
2856 f_orig = got_opentemp();
2857 if (f_orig == NULL) {
2858 err = got_error_from_errno("got_opentemp");
2859 goto done;
2860 }
2861 err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2862 f_orig, blob1);
2863 if (err)
2864 goto done;
2865
2866 f_deriv2 = got_opentemp();
2867 if (f_deriv2 == NULL)
2868 goto done;
2869 err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2870 f_deriv2, blob2);
2871 if (err)
2872 goto done;
2873
2874 fd = open(ondisk_path,
2875 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
2876 if (fd == -1) {
2877 err = got_error_from_errno2("open",
2878 ondisk_path);
2879 goto done;
2880 }
2881 f_deriv = fdopen(fd, "r");
2882 if (f_deriv == NULL) {
2883 err = got_error_from_errno2("fdopen",
2884 ondisk_path);
2885 close(fd);
2886 goto done;
2887 }
2888 err = got_object_id_str(&id_str, a->commit_id2);
2889 if (err)
2890 goto done;
2891 if (asprintf(&label_deriv2, "%s: commit %s",
2892 GOT_MERGE_LABEL_MERGED, id_str) == -1) {
2893 err = got_error_from_errno("asprintf");
2894 goto done;
2895 }
2896 err = merge_file(&local_changes_subsumed, a->worktree,
2897 f_orig, f_deriv, f_deriv2, ondisk_path, path2,
2898 mode2, a->label_orig, NULL, label_deriv2,
2899 GOT_DIFF_ALGORITHM_PATIENCE, repo,
2900 a->progress_cb, a->progress_arg);
2901 }
2902 } else if (blob1) {
2903 ie = got_fileindex_entry_get(a->fileindex, path1,
2904 strlen(path1));
2905 if (ie == NULL)
2906 return (*a->progress_cb)(a->progress_arg,
2907 GOT_STATUS_MISSING, path1);
2908
2909 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2910 path1) == -1)
2911 return got_error_from_errno("asprintf");
2912
2913 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2914 repo);
2915 if (err)
2916 goto done;
2917
2918 switch (status) {
2919 case GOT_STATUS_NO_CHANGE:
2920 err = (*a->progress_cb)(a->progress_arg,
2921 GOT_STATUS_DELETE, path1);
2922 if (err)
2923 goto done;
2924 err = remove_ondisk_file(a->worktree->root_path, path1);
2925 if (err)
2926 goto done;
2927 if (ie)
2928 got_fileindex_entry_mark_deleted_from_disk(ie);
2929 break;
2930 case GOT_STATUS_DELETE:
2931 case GOT_STATUS_MISSING:
2932 err = (*a->progress_cb)(a->progress_arg,
2933 GOT_STATUS_DELETE, path1);
2934 if (err)
2935 goto done;
2936 if (ie)
2937 got_fileindex_entry_mark_deleted_from_disk(ie);
2938 break;
2939 case GOT_STATUS_ADD: {
2940 struct got_object_id *id;
2941 FILE *blob1_f;
2942 off_t blob1_size;
2943 /*
2944 * Delete the added file only if its content already
2945 * exists in the repository.
2946 */
2947 err = got_object_blob_file_create(&id, &blob1_f,
2948 &blob1_size, path1);
2949 if (err)
2950 goto done;
2951 if (got_object_id_cmp(id, id1) == 0) {
2952 err = (*a->progress_cb)(a->progress_arg,
2953 GOT_STATUS_DELETE, path1);
2954 if (err)
2955 goto done;
2956 err = remove_ondisk_file(a->worktree->root_path,
2957 path1);
2958 if (err)
2959 goto done;
2960 if (ie)
2961 got_fileindex_entry_remove(a->fileindex,
2962 ie);
2963 } else {
2964 err = (*a->progress_cb)(a->progress_arg,
2965 GOT_STATUS_CANNOT_DELETE, path1);
2966 }
2967 if (fclose(blob1_f) == EOF && err == NULL)
2968 err = got_error_from_errno("fclose");
2969 free(id);
2970 if (err)
2971 goto done;
2972 break;
2973 }
2974 case GOT_STATUS_MODIFY:
2975 case GOT_STATUS_CONFLICT:
2976 err = (*a->progress_cb)(a->progress_arg,
2977 GOT_STATUS_CANNOT_DELETE, path1);
2978 if (err)
2979 goto done;
2980 break;
2981 case GOT_STATUS_OBSTRUCTED:
2982 err = (*a->progress_cb)(a->progress_arg, status, path1);
2983 if (err)
2984 goto done;
2985 break;
2986 default:
2987 break;
2988 }
2989 } else if (blob2) {
2990 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2991 path2) == -1)
2992 return got_error_from_errno("asprintf");
2993 ie = got_fileindex_entry_get(a->fileindex, path2,
2994 strlen(path2));
2995 if (ie) {
2996 err = get_file_status(&status, &sb, ie, ondisk_path,
2997 -1, NULL, repo);
2998 if (err)
2999 goto done;
3000 if (status != GOT_STATUS_NO_CHANGE &&
3001 status != GOT_STATUS_MODIFY &&
3002 status != GOT_STATUS_CONFLICT &&
3003 status != GOT_STATUS_ADD) {
3004 err = (*a->progress_cb)(a->progress_arg,
3005 status, path2);
3006 goto done;
3007 }
3008 if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
3009 char *link_target2;
3010 err = got_object_blob_read_to_str(&link_target2,
3011 blob2);
3012 if (err)
3013 goto done;
3014 err = merge_symlink(a->worktree, NULL,
3015 ondisk_path, path2, a->label_orig,
3016 link_target2, a->commit_id2, repo,
3017 a->progress_cb, a->progress_arg);
3018 free(link_target2);
3019 } else if (S_ISREG(sb.st_mode)) {
3020 err = merge_blob(&local_changes_subsumed,
3021 a->worktree, NULL, ondisk_path, path2,
3022 sb.st_mode, a->label_orig, blob2,
3023 a->commit_id2, repo, a->progress_cb,
3024 a->progress_arg);
3025 } else {
3026 err = got_error_path(ondisk_path,
3027 GOT_ERR_FILE_OBSTRUCTED);
3028 }
3029 if (err)
3030 goto done;
3031 if (status == GOT_STATUS_DELETE) {
3032 err = got_fileindex_entry_update(ie,
3033 a->worktree->root_fd, path2, blob2->id.sha1,
3034 a->worktree->base_commit_id->sha1, 0);
3035 if (err)
3036 goto done;
3037 }
3038 } else {
3039 int is_bad_symlink = 0;
3040 sb.st_mode = GOT_DEFAULT_FILE_MODE;
3041 if (S_ISLNK(mode2)) {
3042 err = install_symlink(&is_bad_symlink,
3043 a->worktree, ondisk_path, path2, blob2, 0,
3044 0, 1, a->allow_bad_symlinks, repo,
3045 a->progress_cb, a->progress_arg);
3046 } else {
3047 err = install_blob(a->worktree, ondisk_path, path2,
3048 mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
3049 a->progress_cb, a->progress_arg);
3050 }
3051 if (err)
3052 goto done;
3053 err = got_fileindex_entry_alloc(&ie, path2);
3054 if (err)
3055 goto done;
3056 err = got_fileindex_entry_update(ie,
3057 a->worktree->root_fd, path2, NULL, NULL, 1);
3058 if (err) {
3059 got_fileindex_entry_free(ie);
3060 goto done;
3061 }
3062 err = got_fileindex_entry_add(a->fileindex, ie);
3063 if (err) {
3064 got_fileindex_entry_free(ie);
3065 goto done;
3066 }
3067 if (is_bad_symlink) {
3068 got_fileindex_entry_filetype_set(ie,
3069 GOT_FILEIDX_MODE_BAD_SYMLINK);
3070 }
3071 }
3072 }
3073 done:
3074 if (f_orig && fclose(f_orig) == EOF && err == NULL)
3075 err = got_error_from_errno("fclose");
3076 if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
3077 err = got_error_from_errno("fclose");
3078 if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
3079 err = got_error_from_errno("fclose");
3080 free(id_str);
3081 free(label_deriv2);
3082 free(ondisk_path);
3083 return err;
3084 }
3085
3086 static const struct got_error *
3087 check_mixed_commits(void *arg, struct got_fileindex_entry *ie)
3088 {
3089 struct got_worktree *worktree = arg;
3090
3091 /* Reject merges into a work tree with mixed base commits. */
3092 if (got_fileindex_entry_has_commit(ie) &&
3093 memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
3094 SHA1_DIGEST_LENGTH) != 0)
3095 return got_error(GOT_ERR_MIXED_COMMITS);
3096
3097 return NULL;
3098 }
3099
3100 struct check_merge_conflicts_arg {
3101 struct got_worktree *worktree;
3102 struct got_fileindex *fileindex;
3103 struct got_repository *repo;
3104 };
3105
3106 static const struct got_error *
3107 check_merge_conflicts(void *arg, struct got_blob_object *blob1,
3108 struct got_blob_object *blob2, FILE *f1, FILE *f2,
3109 struct got_object_id *id1, struct got_object_id *id2,
3110 const char *path1, const char *path2,
3111 mode_t mode1, mode_t mode2, struct got_repository *repo)
3112 {
3113 const struct got_error *err = NULL;
3114 struct check_merge_conflicts_arg *a = arg;
3115 unsigned char status;
3116 struct stat sb;
3117 struct got_fileindex_entry *ie;
3118 const char *path = path2 ? path2 : path1;
3119 struct got_object_id *id = id2 ? id2 : id1;
3120 char *ondisk_path;
3121
3122 if (id == NULL)
3123 return NULL;
3124
3125 ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
3126 if (ie == NULL)
3127 return NULL;
3128
3129 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3130 == -1)
3131 return got_error_from_errno("asprintf");
3132
3133 /* Reject merges into a work tree with conflicted files. */
3134 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
3135 free(ondisk_path);
3136 if (err)
3137 return err;
3138 if (status == GOT_STATUS_CONFLICT)
3139 return got_error(GOT_ERR_CONFLICTS);
3140
3141 return NULL;
3142 }
3143
3144 static const struct got_error *
3145 merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
3146 const char *fileindex_path, struct got_object_id *commit_id1,
3147 struct got_object_id *commit_id2, struct got_repository *repo,
3148 got_worktree_checkout_cb progress_cb, void *progress_arg,
3149 got_cancel_cb cancel_cb, void *cancel_arg)
3150 {
3151 const struct got_error *err = NULL, *sync_err;
3152 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3153 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3154 struct got_commit_object *commit1 = NULL, *commit2 = NULL;
3155 struct check_merge_conflicts_arg cmc_arg;
3156 struct merge_file_cb_arg arg;
3157 char *label_orig = NULL;
3158 FILE *f1 = NULL, *f2 = NULL;
3159 int fd1 = -1, fd2 = -1;
3160
3161 if (commit_id1) {
3162 err = got_object_open_as_commit(&commit1, repo, commit_id1);
3163 if (err)
3164 goto done;
3165 err = got_object_id_by_path(&tree_id1, repo, commit1,
3166 worktree->path_prefix);
3167 if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3168 goto done;
3169 }
3170 if (tree_id1) {
3171 char *id_str;
3172
3173 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3174 if (err)
3175 goto done;
3176
3177 err = got_object_id_str(&id_str, commit_id1);
3178 if (err)
3179 goto done;
3180
3181 if (asprintf(&label_orig, "%s: commit %s",
3182 GOT_MERGE_LABEL_BASE, id_str) == -1) {
3183 err = got_error_from_errno("asprintf");
3184 free(id_str);
3185 goto done;
3186 }
3187 free(id_str);
3188
3189 f1 = got_opentemp();
3190 if (f1 == NULL) {
3191 err = got_error_from_errno("got_opentemp");
3192 goto done;
3193 }
3194 }
3195
3196 err = got_object_open_as_commit(&commit2, repo, commit_id2);
3197 if (err)
3198 goto done;
3199
3200 err = got_object_id_by_path(&tree_id2, repo, commit2,
3201 worktree->path_prefix);
3202 if (err)
3203 goto done;
3204
3205 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3206 if (err)
3207 goto done;
3208
3209 f2 = got_opentemp();
3210 if (f2 == NULL) {
3211 err = got_error_from_errno("got_opentemp");
3212 goto done;
3213 }
3214
3215 fd1 = got_opentempfd();
3216 if (fd1 == -1) {
3217 err = got_error_from_errno("got_opentempfd");
3218 goto done;
3219 }
3220
3221 fd2 = got_opentempfd();
3222 if (fd2 == -1) {
3223 err = got_error_from_errno("got_opentempfd");
3224 goto done;
3225 }
3226
3227 cmc_arg.worktree = worktree;
3228 cmc_arg.fileindex = fileindex;
3229 cmc_arg.repo = repo;
3230 err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3231 check_merge_conflicts, &cmc_arg, 0);
3232 if (err)
3233 goto done;
3234
3235 arg.worktree = worktree;
3236 arg.fileindex = fileindex;
3237 arg.progress_cb = progress_cb;
3238 arg.progress_arg = progress_arg;
3239 arg.cancel_cb = cancel_cb;
3240 arg.cancel_arg = cancel_arg;
3241 arg.label_orig = label_orig;
3242 arg.commit_id2 = commit_id2;
3243 arg.allow_bad_symlinks = 1; /* preserve bad symlinks across merges */
3244 err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3245 merge_file_cb, &arg, 1);
3246 sync_err = sync_fileindex(fileindex, fileindex_path);
3247 if (sync_err && err == NULL)
3248 err = sync_err;
3249 done:
3250 if (commit1)
3251 got_object_commit_close(commit1);
3252 if (commit2)
3253 got_object_commit_close(commit2);
3254 if (tree1)
3255 got_object_tree_close(tree1);
3256 if (tree2)
3257 got_object_tree_close(tree2);
3258 if (f1 && fclose(f1) == EOF && err == NULL)
3259 err = got_error_from_errno("fclose");
3260 if (f2 && fclose(f2) == EOF && err == NULL)
3261 err = got_error_from_errno("fclose");
3262 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3263 err = got_error_from_errno("close");
3264 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3265 err = got_error_from_errno("close");
3266 free(label_orig);
3267 return err;
3268 }
3269
3270 const struct got_error *
3271 got_worktree_merge_files(struct got_worktree *worktree,
3272 struct got_object_id *commit_id1, struct got_object_id *commit_id2,
3273 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3274 void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
3275 {
3276 const struct got_error *err, *unlockerr;
3277 char *fileindex_path = NULL;
3278 struct got_fileindex *fileindex = NULL;
3279
3280 err = lock_worktree(worktree, LOCK_EX);
3281 if (err)
3282 return err;
3283
3284 err = open_fileindex(&fileindex, &fileindex_path, worktree);
3285 if (err)
3286 goto done;
3287
3288 err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
3289 worktree);
3290 if (err)
3291 goto done;
3292
3293 err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3294 commit_id2, repo, progress_cb, progress_arg,
3295 cancel_cb, cancel_arg);
3296 done:
3297 if (fileindex)
3298 got_fileindex_free(fileindex);
3299 free(fileindex_path);
3300 unlockerr = lock_worktree(worktree, LOCK_SH);
3301 if (unlockerr && err == NULL)
3302 err = unlockerr;
3303 return err;
3304 }
3305
3306 struct diff_dir_cb_arg {
3307 struct got_fileindex *fileindex;
3308 struct got_worktree *worktree;
3309 const char *status_path;
3310 size_t status_path_len;
3311 struct got_repository *repo;
3312 got_worktree_status_cb status_cb;
3313 void *status_arg;
3314 got_cancel_cb cancel_cb;
3315 void *cancel_arg;
3316 /* A pathlist containing per-directory pathlists of ignore patterns. */
3317 struct got_pathlist_head *ignores;
3318 int report_unchanged;
3319 int no_ignores;
3320 };
3321
3322 static const struct got_error *
3323 report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3324 int dirfd, const char *de_name,
3325 got_worktree_status_cb status_cb, void *status_arg,
3326 struct got_repository *repo, int report_unchanged)
3327 {
3328 const struct got_error *err = NULL;
3329 unsigned char status = GOT_STATUS_NO_CHANGE;
3330 unsigned char staged_status = get_staged_status(ie);
3331 struct stat sb;
3332 struct got_object_id blob_id, commit_id, staged_blob_id;
3333 struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3334 struct got_object_id *staged_blob_idp = NULL;
3335
3336 err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3337 if (err)
3338 return err;
3339
3340 if (status == GOT_STATUS_NO_CHANGE &&
3341 staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3342 return NULL;
3343
3344 if (got_fileindex_entry_has_blob(ie)) {
3345 memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3346 blob_idp = &blob_id;
3347 }
3348 if (got_fileindex_entry_has_commit(ie)) {
3349 memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3350 commit_idp = &commit_id;
3351 }
3352 if (staged_status == GOT_STATUS_ADD ||
3353 staged_status == GOT_STATUS_MODIFY) {
3354 memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
3355 SHA1_DIGEST_LENGTH);
3356 staged_blob_idp = &staged_blob_id;
3357 }
3358
3359 return (*status_cb)(status_arg, status, staged_status,
3360 ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3361 }
3362
3363 static const struct got_error *
3364 status_old_new(void *arg, struct got_fileindex_entry *ie,
3365 struct dirent *de, const char *parent_path, int dirfd)
3366 {
3367 const struct got_error *err = NULL;
3368 struct diff_dir_cb_arg *a = arg;
3369 char *abspath;
3370
3371 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3372 return got_error(GOT_ERR_CANCELLED);
3373
3374 if (got_path_cmp(parent_path, a->status_path,
3375 strlen(parent_path), a->status_path_len) != 0 &&
3376 !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3377 return NULL;
3378
3379 if (parent_path[0]) {
3380 if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3381 parent_path, de->d_name) == -1)
3382 return got_error_from_errno("asprintf");
3383 } else {
3384 if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3385 de->d_name) == -1)
3386 return got_error_from_errno("asprintf");
3387 }
3388
3389 err = report_file_status(ie, abspath, dirfd, de->d_name,
3390 a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3391 free(abspath);
3392 return err;
3393 }
3394
3395 static const struct got_error *
3396 status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3397 {
3398 struct diff_dir_cb_arg *a = arg;
3399 struct got_object_id blob_id, commit_id;
3400 unsigned char status;
3401
3402 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3403 return got_error(GOT_ERR_CANCELLED);
3404
3405 if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3406 return NULL;
3407
3408 memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3409 memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3410 if (got_fileindex_entry_has_file_on_disk(ie))
3411 status = GOT_STATUS_MISSING;
3412 else
3413 status = GOT_STATUS_DELETE;
3414 return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3415 ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3416 }
3417
3418 static void
3419 free_ignores(struct got_pathlist_head *ignores)
3420 {
3421 struct got_pathlist_entry *pe;
3422
3423 TAILQ_FOREACH(pe, ignores, entry) {
3424 struct got_pathlist_head *ignorelist = pe->data;
3425
3426 got_pathlist_free(ignorelist, GOT_PATHLIST_FREE_PATH);
3427 }
3428 got_pathlist_free(ignores, GOT_PATHLIST_FREE_PATH);
3429 }
3430
3431 static const struct got_error *
3432 read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3433 {
3434 const struct got_error *err = NULL;
3435 struct got_pathlist_entry *pe = NULL;
3436 struct got_pathlist_head *ignorelist;
3437 char *line = NULL, *pattern, *dirpath = NULL;
3438 size_t linesize = 0;
3439 ssize_t linelen;
3440
3441 ignorelist = calloc(1, sizeof(*ignorelist));
3442 if (ignorelist == NULL)
3443 return got_error_from_errno("calloc");
3444 TAILQ_INIT(ignorelist);
3445
3446 while ((linelen = getline(&line, &linesize, f)) != -1) {
3447 if (linelen > 0 && line[linelen - 1] == '\n')
3448 line[linelen - 1] = '\0';
3449
3450 /* Git's ignores may contain comments. */
3451 if (line[0] == '#')
3452 continue;
3453
3454 /* Git's negated patterns are not (yet?) supported. */
3455 if (line[0] == '!')
3456 continue;
3457
3458 if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3459 line) == -1) {
3460 err = got_error_from_errno("asprintf");
3461 goto done;
3462 }
3463 err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3464 if (err)
3465 goto done;
3466 }
3467 if (ferror(f)) {
3468 err = got_error_from_errno("getline");
3469 goto done;
3470 }
3471
3472 dirpath = strdup(path);
3473 if (dirpath == NULL) {
3474 err = got_error_from_errno("strdup");
3475 goto done;
3476 }
3477 err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3478 done:
3479 free(line);
3480 if (err || pe == NULL) {
3481 free(dirpath);
3482 got_pathlist_free(ignorelist, GOT_PATHLIST_FREE_PATH);
3483 }
3484 return err;
3485 }
3486
3487 static int
3488 match_ignores(struct got_pathlist_head *ignores, const char *path)
3489 {
3490 struct got_pathlist_entry *pe;
3491
3492 /* Handle patterns which match in all directories. */
3493 TAILQ_FOREACH(pe, ignores, entry) {
3494 struct got_pathlist_head *ignorelist = pe->data;
3495 struct got_pathlist_entry *pi;
3496
3497 TAILQ_FOREACH(pi, ignorelist, entry) {
3498 const char *p, *pattern = pi->path;
3499
3500 if (strncmp(pattern, "**/", 3) != 0)
3501 continue;
3502 pattern += 3;
3503 p = path;
3504 while (*p) {
3505 if (fnmatch(pattern, p,
3506 FNM_PATHNAME | FNM_LEADING_DIR)) {
3507 /* Retry in next directory. */
3508 while (*p && *p != '/')
3509 p++;
3510 while (*p == '/')
3511 p++;
3512 continue;
3513 }
3514 return 1;
3515 }
3516 }
3517 }
3518
3519 /*
3520 * The ignores pathlist contains ignore lists from children before
3521 * parents, so we can find the most specific ignorelist by walking
3522 * ignores backwards.
3523 */
3524 pe = TAILQ_LAST(ignores, got_pathlist_head);
3525 while (pe) {
3526 if (got_path_is_child(path, pe->path, pe->path_len)) {
3527 struct got_pathlist_head *ignorelist = pe->data;
3528 struct got_pathlist_entry *pi;
3529 TAILQ_FOREACH(pi, ignorelist, entry) {
3530 const char *pattern = pi->path;
3531 int flags = FNM_LEADING_DIR;
3532 if (strstr(pattern, "/**/") == NULL)
3533 flags |= FNM_PATHNAME;
3534 if (fnmatch(pattern, path, flags))
3535 continue;
3536 return 1;
3537 }
3538 }
3539 pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3540 }
3541
3542 return 0;
3543 }
3544
3545 static const struct got_error *
3546 add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3547 const char *path, int dirfd, const char *ignores_filename)
3548 {
3549 const struct got_error *err = NULL;
3550 char *ignorespath;
3551 int fd = -1;
3552 FILE *ignoresfile = NULL;
3553
3554 if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3555 path[0] ? "/" : "", ignores_filename) == -1)
3556 return got_error_from_errno("asprintf");
3557
3558 if (dirfd != -1) {
3559 fd = openat(dirfd, ignores_filename,
3560 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
3561 if (fd == -1) {
3562 if (errno != ENOENT && errno != EACCES)
3563 err = got_error_from_errno2("openat",
3564 ignorespath);
3565 } else {
3566 ignoresfile = fdopen(fd, "r");
3567 if (ignoresfile == NULL)
3568 err = got_error_from_errno2("fdopen",
3569 ignorespath);
3570 else {
3571 fd = -1;
3572 err = read_ignores(ignores, path, ignoresfile);
3573 }
3574 }
3575 } else {
3576 ignoresfile = fopen(ignorespath, "re");
3577 if (ignoresfile == NULL) {
3578 if (errno != ENOENT && errno != EACCES)
3579 err = got_error_from_errno2("fopen",
3580 ignorespath);
3581 } else
3582 err = read_ignores(ignores, path, ignoresfile);
3583 }
3584
3585 if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3586 err = got_error_from_errno2("fclose", path);
3587 if (fd != -1 && close(fd) == -1 && err == NULL)
3588 err = got_error_from_errno2("close", path);
3589 free(ignorespath);
3590 return err;
3591 }
3592
3593 static const struct got_error *
3594 status_new(int *ignore, void *arg, struct dirent *de, const char *parent_path,
3595 int dirfd)
3596 {
3597 const struct got_error *err = NULL;
3598 struct diff_dir_cb_arg *a = arg;
3599 char *path = NULL;
3600
3601 if (ignore != NULL)
3602 *ignore = 0;
3603
3604 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3605 return got_error(GOT_ERR_CANCELLED);
3606
3607 if (parent_path[0]) {
3608 if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3609 return got_error_from_errno("asprintf");
3610 } else {
3611 path = de->d_name;
3612 }
3613
3614 if (de->d_type == DT_DIR) {
3615 if (!a->no_ignores && ignore != NULL &&
3616 match_ignores(a->ignores, path))
3617 *ignore = 1;
3618 } else if (!match_ignores(a->ignores, path) &&
3619 got_path_is_child(path, a->status_path, a->status_path_len))
3620 err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3621 GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3622 if (parent_path[0])
3623 free(path);
3624 return err;
3625 }
3626
3627 static const struct got_error *
3628 status_traverse(void *arg, const char *path, int dirfd)
3629 {
3630 const struct got_error *err = NULL;
3631 struct diff_dir_cb_arg *a = arg;
3632
3633 if (a->no_ignores)
3634 return NULL;
3635
3636 err = add_ignores(a->ignores, a->worktree->root_path,
3637 path, dirfd, ".cvsignore");
3638 if (err)
3639 return err;
3640
3641 err = add_ignores(a->ignores, a->worktree->root_path, path,
3642 dirfd, ".gitignore");
3643
3644 return err;
3645 }
3646
3647 static const struct got_error *
3648 report_single_file_status(const char *path, const char *ondisk_path,
3649 struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3650 void *status_arg, struct got_repository *repo, int report_unchanged,
3651 struct got_pathlist_head *ignores, int no_ignores)
3652 {
3653 struct got_fileindex_entry *ie;
3654 struct stat sb;
3655
3656 ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3657 if (ie)
3658 return report_file_status(ie, ondisk_path, -1, NULL,
3659 status_cb, status_arg, repo, report_unchanged);
3660
3661 if (lstat(ondisk_path, &sb) == -1) {
3662 if (errno != ENOENT)
3663 return got_error_from_errno2("lstat", ondisk_path);
3664 return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3665 GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3666 }
3667
3668 if (!no_ignores && match_ignores(ignores, path))
3669 return NULL;
3670
3671 if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3672 return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3673 GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3674
3675 return NULL;
3676 }
3677
3678 static const struct got_error *
3679 add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3680 const char *root_path, const char *path)
3681 {
3682 const struct got_error *err;
3683 char *parent_path, *next_parent_path = NULL;
3684
3685 err = add_ignores(ignores, root_path, "", -1,
3686 ".cvsignore");
3687 if (err)
3688 return err;
3689
3690 err = add_ignores(ignores, root_path, "", -1,
3691 ".gitignore");
3692 if (err)
3693 return err;
3694
3695 err = got_path_dirname(&parent_path, path);
3696 if (err) {
3697 if (err->code == GOT_ERR_BAD_PATH)
3698 return NULL; /* cannot traverse parent */
3699 return err;
3700 }
3701 for (;;) {
3702 err = add_ignores(ignores, root_path, parent_path, -1,
3703 ".cvsignore");
3704 if (err)
3705 break;
3706 err = add_ignores(ignores, root_path, parent_path, -1,
3707 ".gitignore");
3708 if (err)
3709 break;
3710 err = got_path_dirname(&next_parent_path, parent_path);
3711 if (err) {
3712 if (err->code == GOT_ERR_BAD_PATH)
3713 err = NULL; /* traversed everything */
3714 break;
3715 }
3716 if (got_path_is_root_dir(parent_path))
3717 break;
3718 free(parent_path);
3719 parent_path = next_parent_path;
3720 next_parent_path = NULL;
3721 }
3722
3723 free(parent_path);
3724 free(next_parent_path);
3725 return err;
3726 }
3727
3728 static const struct got_error *
3729 worktree_status(struct got_worktree *worktree, const char *path,
3730 struct got_fileindex *fileindex, struct got_repository *repo,
3731 got_worktree_status_cb status_cb, void *status_arg,
3732 got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3733 int report_unchanged)
3734 {
3735 const struct got_error *err = NULL;
3736 int fd = -1;
3737 struct got_fileindex_diff_dir_cb fdiff_cb;
3738 struct diff_dir_cb_arg arg;
3739 char *ondisk_path = NULL;
3740 struct got_pathlist_head ignores;
3741 struct got_fileindex_entry *ie;
3742
3743 TAILQ_INIT(&ignores);
3744
3745 if (asprintf(&ondisk_path, "%s%s%s",
3746 worktree->root_path, path[0] ? "/" : "", path) == -1)
3747 return got_error_from_errno("asprintf");
3748
3749 ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3750 if (ie) {
3751 err = report_single_file_status(path, ondisk_path,
3752 fileindex, status_cb, status_arg, repo,
3753 report_unchanged, &ignores, no_ignores);
3754 goto done;
3755 }
3756
3757 fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY | O_CLOEXEC);
3758 if (fd == -1) {
3759 if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3760 !got_err_open_nofollow_on_symlink())
3761 err = got_error_from_errno2("open", ondisk_path);
3762 else {
3763 if (!no_ignores) {
3764 err = add_ignores_from_parent_paths(&ignores,
3765 worktree->root_path, ondisk_path);
3766 if (err)
3767 goto done;
3768 }
3769 err = report_single_file_status(path, ondisk_path,
3770 fileindex, status_cb, status_arg, repo,
3771 report_unchanged, &ignores, no_ignores);
3772 }
3773 } else {
3774 fdiff_cb.diff_old_new = status_old_new;
3775 fdiff_cb.diff_old = status_old;
3776 fdiff_cb.diff_new = status_new;
3777 fdiff_cb.diff_traverse = status_traverse;
3778 arg.fileindex = fileindex;
3779 arg.worktree = worktree;
3780 arg.status_path = path;
3781 arg.status_path_len = strlen(path);
3782 arg.repo = repo;
3783 arg.status_cb = status_cb;
3784 arg.status_arg = status_arg;
3785 arg.cancel_cb = cancel_cb;
3786 arg.cancel_arg = cancel_arg;
3787 arg.report_unchanged = report_unchanged;
3788 arg.no_ignores = no_ignores;
3789 if (!no_ignores) {
3790 err = add_ignores_from_parent_paths(&ignores,
3791 worktree->root_path, path);
3792 if (err)
3793 goto done;
3794 }
3795 arg.ignores = &ignores;
3796 err = got_fileindex_diff_dir(fileindex, fd,
3797 worktree->root_path, path, repo, &fdiff_cb, &arg);
3798 }
3799 done:
3800 free_ignores(&ignores);
3801 if (fd != -1 && close(fd) == -1 && err == NULL)
3802 err = got_error_from_errno("close");
3803 free(ondisk_path);
3804 return err;
3805 }
3806
3807 const struct got_error *
3808 got_worktree_status(struct got_worktree *worktree,
3809 struct got_pathlist_head *paths, struct got_repository *repo,
3810 int no_ignores, got_worktree_status_cb status_cb, void *status_arg,
3811 got_cancel_cb cancel_cb, void *cancel_arg)
3812 {
3813 const struct got_error *err = NULL;
3814 char *fileindex_path = NULL;
3815 struct got_fileindex *fileindex = NULL;
3816 struct got_pathlist_entry *pe;
3817
3818 err = open_fileindex(&fileindex, &fileindex_path, worktree);
3819 if (err)
3820 return err;
3821
3822 TAILQ_FOREACH(pe, paths, entry) {
3823 err = worktree_status(worktree, pe->path, fileindex, repo,
3824 status_cb, status_arg, cancel_cb, cancel_arg,
3825 no_ignores, 0);
3826 if (err)
3827 break;
3828 }
3829 free(fileindex_path);
3830 got_fileindex_free(fileindex);
3831 return err;
3832 }
3833
3834 const struct got_error *
3835 got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3836 const char *arg)
3837 {
3838 const struct got_error *err = NULL;
3839 char *resolved = NULL, *cwd = NULL, *path = NULL;
3840 size_t len;
3841 struct stat sb;
3842 char *abspath = NULL;
3843 char canonpath[PATH_MAX];
3844
3845 *wt_path = NULL;
3846
3847 cwd = getcwd(NULL, 0);
3848 if (cwd == NULL)
3849 return got_error_from_errno("getcwd");
3850
3851 if (lstat(arg, &sb) == -1) {
3852 if (errno != ENOENT) {
3853 err = got_error_from_errno2("lstat", arg);
3854 goto done;
3855 }
3856 sb.st_mode = 0;
3857 }
3858 if (S_ISLNK(sb.st_mode)) {
3859 /*
3860 * We cannot use realpath(3) with symlinks since we want to
3861 * operate on the symlink itself.
3862 * But we can make the path absolute, assuming it is relative
3863 * to the current working directory, and then canonicalize it.
3864 */
3865 if (!got_path_is_absolute(arg)) {
3866 if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3867 err = got_error_from_errno("asprintf");
3868 goto done;
3869 }
3870
3871 }
3872 err = got_canonpath(abspath ? abspath : arg, canonpath,
3873 sizeof(canonpath));
3874 if (err)
3875 goto done;
3876 resolved = strdup(canonpath);
3877 if (resolved == NULL) {
3878 err = got_error_from_errno("strdup");
3879 goto done;
3880 }
3881 } else {
3882 resolved = realpath(arg, NULL);
3883 if (resolved == NULL) {
3884 if (errno != ENOENT) {
3885 err = got_error_from_errno2("realpath", arg);
3886 goto done;
3887 }
3888 if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3889 err = got_error_from_errno("asprintf");
3890 goto done;
3891 }
3892 err = got_canonpath(abspath, canonpath,
3893 sizeof(canonpath));
3894 if (err)
3895 goto done;
3896 resolved = strdup(canonpath);
3897 if (resolved == NULL) {
3898 err = got_error_from_errno("strdup");
3899 goto done;
3900 }
3901 }
3902 }
3903
3904 if (strncmp(got_worktree_get_root_path(worktree), resolved,
3905 strlen(got_worktree_get_root_path(worktree)))) {
3906 err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3907 goto done;
3908 }
3909
3910 if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3911 err = got_path_skip_common_ancestor(&path,
3912 got_worktree_get_root_path(worktree), resolved);
3913 if (err)
3914 goto done;
3915 } else {
3916 path = strdup("");
3917 if (path == NULL) {
3918 err = got_error_from_errno("strdup");
3919 goto done;
3920 }
3921 }
3922
3923 /* XXX status walk can't deal with trailing slash! */
3924 len = strlen(path);
3925 while (len > 0 && path[len - 1] == '/') {
3926 path[len - 1] = '\0';
3927 len--;
3928 }
3929 done:
3930 free(abspath);
3931 free(resolved);
3932 free(cwd);
3933 if (err == NULL)
3934 *wt_path = path;
3935 else
3936 free(path);
3937 return err;
3938 }
3939
3940 struct schedule_addition_args {
3941 struct got_worktree *worktree;
3942 struct got_fileindex *fileindex;
3943 got_worktree_checkout_cb progress_cb;
3944 void *progress_arg;
3945 struct got_repository *repo;
3946 };
3947
3948 static const struct got_error *
3949 schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3950 const char *relpath, struct got_object_id *blob_id,
3951 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3952 int dirfd, const char *de_name)
3953 {
3954 struct schedule_addition_args *a = arg;
3955 const struct got_error *err = NULL;
3956 struct got_fileindex_entry *ie;
3957 struct stat sb;
3958 char *ondisk_path;
3959
3960 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3961 relpath) == -1)
3962 return got_error_from_errno("asprintf");
3963
3964 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3965 if (ie) {
3966 err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3967 de_name, a->repo);
3968 if (err)
3969 goto done;
3970 /* Re-adding an existing entry is a no-op. */
3971 if (status == GOT_STATUS_ADD)
3972 goto done;
3973 err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3974 if (err)
3975 goto done;
3976 }
3977
3978 if (status != GOT_STATUS_UNVERSIONED) {
3979 if (status == GOT_STATUS_NONEXISTENT)
3980 err = got_error_set_errno(ENOENT, ondisk_path);
3981 else
3982 err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3983 goto done;
3984 }
3985
3986 err = got_fileindex_entry_alloc(&ie, relpath);
3987 if (err)
3988 goto done;
3989 err = got_fileindex_entry_update(ie, a->worktree->root_fd,
3990 relpath, NULL, NULL, 1);
3991 if (err) {
3992 got_fileindex_entry_free(ie);
3993 goto done;
3994 }
3995 err = got_fileindex_entry_add(a->fileindex, ie);
3996 if (err) {
3997 got_fileindex_entry_free(ie);
3998 goto done;
3999 }
4000 done:
4001 free(ondisk_path);
4002 if (err)
4003 return err;
4004 if (status == GOT_STATUS_ADD)
4005 return NULL;
4006 return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
4007 }
4008
4009 const struct got_error *
4010 got_worktree_schedule_add(struct got_worktree *worktree,
4011 struct got_pathlist_head *paths,
4012 got_worktree_checkout_cb progress_cb, void *progress_arg,
4013 struct got_repository *repo, int no_ignores)
4014 {
4015 struct got_fileindex *fileindex = NULL;
4016 char *fileindex_path = NULL;
4017 const struct got_error *err = NULL, *sync_err, *unlockerr;
4018 struct got_pathlist_entry *pe;
4019 struct schedule_addition_args saa;
4020
4021 err = lock_worktree(worktree, LOCK_EX);
4022 if (err)
4023 return err;
4024
4025 err = open_fileindex(&fileindex, &fileindex_path, worktree);
4026 if (err)
4027 goto done;
4028
4029 saa.worktree = worktree;
4030 saa.fileindex = fileindex;
4031 saa.progress_cb = progress_cb;
4032 saa.progress_arg = progress_arg;
4033 saa.repo = repo;
4034
4035 TAILQ_FOREACH(pe, paths, entry) {
4036 err = worktree_status(worktree, pe->path, fileindex, repo,
4037 schedule_addition, &saa, NULL, NULL, no_ignores, 0);
4038 if (err)
4039 break;
4040 }
4041 sync_err = sync_fileindex(fileindex, fileindex_path);
4042 if (sync_err && err == NULL)
4043 err = sync_err;
4044 done:
4045 free(fileindex_path);
4046 if (fileindex)
4047 got_fileindex_free(fileindex);
4048 unlockerr = lock_worktree(worktree, LOCK_SH);
4049 if (unlockerr && err == NULL)
4050 err = unlockerr;
4051 return err;
4052 }
4053
4054 struct schedule_deletion_args {
4055 struct got_worktree *worktree;
4056 struct got_fileindex *fileindex;
4057 got_worktree_delete_cb progress_cb;
4058 void *progress_arg;
4059 struct got_repository *repo;
4060 int delete_local_mods;
4061 int keep_on_disk;
4062 int ignore_missing_paths;
4063 const char *status_codes;
4064 };
4065
4066 static const struct got_error *
4067 schedule_for_deletion(void *arg, unsigned char status,
4068 unsigned char staged_status, const char *relpath,
4069 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4070 struct got_object_id *commit_id, int dirfd, const char *de_name)
4071 {
4072 struct schedule_deletion_args *a = arg;
4073 const struct got_error *err = NULL;
4074 struct got_fileindex_entry *ie = NULL;
4075 struct stat sb;
4076 char *ondisk_path;
4077
4078 if (status == GOT_STATUS_NONEXISTENT) {
4079 if (a->ignore_missing_paths)
4080 return NULL;
4081 return got_error_set_errno(ENOENT, relpath);
4082 }
4083
4084 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4085 if (ie == NULL)
4086 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
4087
4088 staged_status = get_staged_status(ie);
4089 if (staged_status != GOT_STATUS_NO_CHANGE) {
4090 if (staged_status == GOT_STATUS_DELETE)
4091 return NULL;
4092 return got_error_path(relpath, GOT_ERR_FILE_STAGED);
4093 }
4094
4095 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
4096 relpath) == -1)
4097 return got_error_from_errno("asprintf");
4098
4099 err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
4100 a->repo);
4101 if (err)
4102 goto done;
4103
4104 if (a->status_codes) {
4105 size_t ncodes = strlen(a->status_codes);
4106 int i;
4107 for (i = 0; i < ncodes ; i++) {
4108 if (status == a->status_codes[i])
4109 break;
4110 }
4111 if (i == ncodes) {
4112 /* Do not delete files in non-matching status. */
4113 free(ondisk_path);
4114 return NULL;
4115 }
4116 if (a->status_codes[i] != GOT_STATUS_MODIFY &&
4117 a->status_codes[i] != GOT_STATUS_MISSING) {
4118 static char msg[64];
4119 snprintf(msg, sizeof(msg),
4120 "invalid status code '%c'", a->status_codes[i]);
4121 err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
4122 goto done;
4123 }
4124 }
4125
4126 if (status != GOT_STATUS_NO_CHANGE) {
4127 if (status == GOT_STATUS_DELETE)
4128 goto done;
4129 if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
4130 err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
4131 goto done;
4132 }
4133 if (status == GOT_STATUS_MISSING && !a->ignore_missing_paths) {
4134 err = got_error_set_errno(ENOENT, relpath);
4135 goto done;
4136 }
4137 if (status != GOT_STATUS_MODIFY &&
4138 status != GOT_STATUS_MISSING) {
4139 err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4140 goto done;
4141 }
4142 }
4143
4144 if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
4145 size_t root_len;
4146
4147 if (dirfd != -1) {
4148 if (unlinkat(dirfd, de_name, 0) == -1) {
4149 err = got_error_from_errno2("unlinkat",
4150 ondisk_path);
4151 goto done;
4152 }
4153 } else if (unlink(ondisk_path) == -1) {
4154 err = got_error_from_errno2("unlink", ondisk_path);
4155 goto done;
4156 }
4157
4158 root_len = strlen(a->worktree->root_path);
4159 do {
4160 char *parent;
4161 err = got_path_dirname(&parent, ondisk_path);
4162 if (err)
4163 goto done;
4164 free(ondisk_path);
4165 ondisk_path = parent;
4166 if (rmdir(ondisk_path) == -1) {
4167 if (errno != ENOTEMPTY)
4168 err = got_error_from_errno2("rmdir",
4169 ondisk_path);
4170 break;
4171 }
4172 } while (got_path_cmp(ondisk_path, a->worktree->root_path,
4173 strlen(ondisk_path), root_len) != 0);
4174 }
4175
4176 got_fileindex_entry_mark_deleted_from_disk(ie);
4177 done:
4178 free(ondisk_path);
4179 if (err)
4180 return err;
4181 if (status == GOT_STATUS_DELETE)
4182 return NULL;
4183 return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
4184 staged_status, relpath);
4185 }
4186
4187 const struct got_error *
4188 got_worktree_schedule_delete(struct got_worktree *worktree,
4189 struct got_pathlist_head *paths, int delete_local_mods,
4190 const char *status_codes,
4191 got_worktree_delete_cb progress_cb, void *progress_arg,
4192 struct got_repository *repo, int keep_on_disk, int ignore_missing_paths)
4193 {
4194 struct got_fileindex *fileindex = NULL;
4195 char *fileindex_path = NULL;
4196 const struct got_error *err = NULL, *sync_err, *unlockerr;
4197 struct got_pathlist_entry *pe;
4198 struct schedule_deletion_args sda;
4199
4200 err = lock_worktree(worktree, LOCK_EX);
4201 if (err)
4202 return err;
4203
4204 err = open_fileindex(&fileindex, &fileindex_path, worktree);
4205 if (err)
4206 goto done;
4207
4208 sda.worktree = worktree;
4209 sda.fileindex = fileindex;
4210 sda.progress_cb = progress_cb;
4211 sda.progress_arg = progress_arg;
4212 sda.repo = repo;
4213 sda.delete_local_mods = delete_local_mods;
4214 sda.keep_on_disk = keep_on_disk;
4215 sda.ignore_missing_paths = ignore_missing_paths;
4216 sda.status_codes = status_codes;
4217
4218 TAILQ_FOREACH(pe, paths, entry) {
4219 err = worktree_status(worktree, pe->path, fileindex, repo,
4220 schedule_for_deletion, &sda, NULL, NULL, 1, 1);
4221 if (err)
4222 break;
4223 }
4224 sync_err = sync_fileindex(fileindex, fileindex_path);
4225 if (sync_err && err == NULL)
4226 err = sync_err;
4227 done:
4228 free(fileindex_path);
4229 if (fileindex)
4230 got_fileindex_free(fileindex);
4231 unlockerr = lock_worktree(worktree, LOCK_SH);
4232 if (unlockerr && err == NULL)
4233 err = unlockerr;
4234 return err;
4235 }
4236
4237 static const struct got_error *
4238 copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
4239 {
4240 const struct got_error *err = NULL;
4241 char *line = NULL;
4242 size_t linesize = 0, n;
4243 ssize_t linelen;
4244
4245 linelen = getline(&line, &linesize, infile);
4246 if (linelen == -1) {
4247 if (ferror(infile)) {
4248 err = got_error_from_errno("getline");
4249 goto done;
4250 }
4251 return NULL;
4252 }
4253 if (outfile) {
4254 n = fwrite(line, 1, linelen, outfile);
4255 if (n != linelen) {
4256 err = got_ferror(outfile, GOT_ERR_IO);
4257 goto done;
4258 }
4259 }
4260 if (rejectfile) {
4261 n = fwrite(line, 1, linelen, rejectfile);
4262 if (n != linelen)
4263 err = got_ferror(rejectfile, GOT_ERR_IO);
4264 }
4265 done:
4266 free(line);
4267 return err;
4268 }
4269
4270 static const struct got_error *
4271 skip_one_line(FILE *f)
4272 {
4273 char *line = NULL;
4274 size_t linesize = 0;
4275 ssize_t linelen;
4276
4277 linelen = getline(&line, &linesize, f);
4278 if (linelen == -1) {
4279 if (ferror(f))
4280 return got_error_from_errno("getline");
4281 return NULL;
4282 }
4283 free(line);
4284 return NULL;
4285 }
4286
4287 static const struct got_error *
4288 copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4289 int start_old, int end_old, int start_new, int end_new,
4290 FILE *outfile, FILE *rejectfile)
4291 {
4292 const struct got_error *err;
4293
4294 /* Copy old file's lines leading up to patch. */
4295 while (!feof(f1) && *line_cur1 < start_old) {
4296 err = copy_one_line(f1, outfile, NULL);
4297 if (err)
4298 return err;
4299 (*line_cur1)++;
4300 }
4301 /* Skip new file's lines leading up to patch. */
4302 while (!feof(f2) && *line_cur2 < start_new) {
4303 if (rejectfile)
4304 err = copy_one_line(f2, NULL, rejectfile);
4305 else
4306 err = skip_one_line(f2);
4307 if (err)
4308 return err;
4309 (*line_cur2)++;
4310 }
4311 /* Copy patched lines. */
4312 while (!feof(f2) && *line_cur2 <= end_new) {
4313 err = copy_one_line(f2, outfile, NULL);
4314 if (err)
4315 return err;
4316 (*line_cur2)++;
4317 }
4318 /* Skip over old file's replaced lines. */
4319 while (!feof(f1) && *line_cur1 <= end_old) {
4320 if (rejectfile)
4321 err = copy_one_line(f1, NULL, rejectfile);
4322 else
4323 err = skip_one_line(f1);
4324 if (err)
4325 return err;
4326 (*line_cur1)++;
4327 }
4328
4329 return NULL;
4330 }
4331
4332 static const struct got_error *
4333 copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4334 FILE *outfile, FILE *rejectfile)
4335 {
4336 const struct got_error *err;
4337
4338 if (outfile) {
4339 /* Copy old file's lines until EOF. */
4340 while (!feof(f1)) {
4341 err = copy_one_line(f1, outfile, NULL);
4342 if (err)
4343 return err;
4344 (*line_cur1)++;
4345 }
4346 }
4347 if (rejectfile) {
4348 /* Copy new file's lines until EOF. */
4349 while (!feof(f2)) {
4350 err = copy_one_line(f2, NULL, rejectfile);
4351 if (err)
4352 return err;
4353 (*line_cur2)++;
4354 }
4355 }
4356
4357 return NULL;
4358 }
4359
4360 static const struct got_error *
4361 apply_or_reject_change(int *choice, int *nchunks_used,
4362 struct diff_result *diff_result, int n,
4363 const char *relpath, FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4364 FILE *outfile, FILE *rejectfile, int changeno, int nchanges,
4365 got_worktree_patch_cb patch_cb, void *patch_arg)
4366 {
4367 const struct got_error *err = NULL;
4368 struct diff_chunk_context cc = {};
4369 int start_old, end_old, start_new, end_new;
4370 FILE *hunkfile;
4371 struct diff_output_unidiff_state *diff_state;
4372 struct diff_input_info diff_info;
4373 int rc;
4374
4375 *choice = GOT_PATCH_CHOICE_NONE;
4376
4377 /* Get changed line numbers without context lines for copy_change(). */
4378 diff_chunk_context_load_change(&cc, NULL, diff_result, n, 0);
4379 start_old = cc.left.start;
4380 end_old = cc.left.end;
4381 start_new = cc.right.start;
4382 end_new = cc.right.end;
4383
4384 /* Get the same change with context lines for display. */
4385 memset(&cc, 0, sizeof(cc));
4386 diff_chunk_context_load_change(&cc, nchunks_used, diff_result, n, 3);
4387
4388 memset(&diff_info, 0, sizeof(diff_info));
4389 diff_info.left_path = relpath;
4390 diff_info.right_path = relpath;
4391
4392 diff_state = diff_output_unidiff_state_alloc();
4393 if (diff_state == NULL)
4394 return got_error_set_errno(ENOMEM,
4395 "diff_output_unidiff_state_alloc");
4396
4397 hunkfile = got_opentemp();
4398 if (hunkfile == NULL) {
4399 err = got_error_from_errno("got_opentemp");
4400 goto done;
4401 }
4402
4403 rc = diff_output_unidiff_chunk(NULL, hunkfile, diff_state, &diff_info,
4404 diff_result, &cc);
4405 if (rc != DIFF_RC_OK) {
4406 err = got_error_set_errno(rc, "diff_output_unidiff_chunk");
4407 goto done;
4408 }
4409
4410 if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4411 err = got_ferror(hunkfile, GOT_ERR_IO);
4412 goto done;
4413 }
4414
4415 err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4416 hunkfile, changeno, nchanges);
4417 if (err)
4418 goto done;
4419
4420 switch (*choice) {
4421 case GOT_PATCH_CHOICE_YES:
4422 err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4423 end_old, start_new, end_new, outfile, rejectfile);
4424 break;
4425 case GOT_PATCH_CHOICE_NO:
4426 err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4427 end_old, start_new, end_new, rejectfile, outfile);
4428 break;
4429 case GOT_PATCH_CHOICE_QUIT:
4430 break;
4431 default:
4432 err = got_error(GOT_ERR_PATCH_CHOICE);
4433 break;
4434 }
4435 done:
4436 diff_output_unidiff_state_free(diff_state);
4437 if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4438 err = got_error_from_errno("fclose");
4439 return err;
4440 }
4441
4442 struct revert_file_args {
4443 struct got_worktree *worktree;
4444 struct got_fileindex *fileindex;
4445 got_worktree_checkout_cb progress_cb;
4446 void *progress_arg;
4447 got_worktree_patch_cb patch_cb;
4448 void *patch_arg;
4449 struct got_repository *repo;
4450 int unlink_added_files;
4451 };
4452
4453 static const struct got_error *
4454 create_patched_content(char **path_outfile, int reverse_patch,
4455 struct got_object_id *blob_id, const char *path2,
4456 int dirfd2, const char *de_name2,
4457 const char *relpath, struct got_repository *repo,
4458 got_worktree_patch_cb patch_cb, void *patch_arg)
4459 {
4460 const struct got_error *err, *free_err;
4461 struct got_blob_object *blob = NULL;
4462 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4463 int fd = -1, fd2 = -1;
4464 char link_target[PATH_MAX];
4465 ssize_t link_len = 0;
4466 char *path1 = NULL, *id_str = NULL;
4467 struct stat sb2;
4468 struct got_diffreg_result *diffreg_result = NULL;
4469 int line_cur1 = 1, line_cur2 = 1, have_content = 0;
4470 int i = 0, n = 0, nchunks_used = 0, nchanges = 0;
4471
4472 *path_outfile = NULL;
4473
4474 err = got_object_id_str(&id_str, blob_id);
4475 if (err)
4476 return err;
4477
4478 if (dirfd2 != -1) {
4479 fd2 = openat(dirfd2, de_name2,
4480 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4481 if (fd2 == -1) {
4482 if (!got_err_open_nofollow_on_symlink()) {
4483 err = got_error_from_errno2("openat", path2);
4484 goto done;
4485 }
4486 link_len = readlinkat(dirfd2, de_name2,
4487 link_target, sizeof(link_target));
4488 if (link_len == -1) {
4489 return got_error_from_errno2("readlinkat",
4490 path2);
4491 }
4492 sb2.st_mode = S_IFLNK;
4493 sb2.st_size = link_len;
4494 }
4495 } else {
4496 fd2 = open(path2, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4497 if (fd2 == -1) {
4498 if (!got_err_open_nofollow_on_symlink()) {
4499 err = got_error_from_errno2("open", path2);
4500 goto done;
4501 }
4502 link_len = readlink(path2, link_target,
4503 sizeof(link_target));
4504 if (link_len == -1)
4505 return got_error_from_errno2("readlink", path2);
4506 sb2.st_mode = S_IFLNK;
4507 sb2.st_size = link_len;
4508 }
4509 }
4510 if (fd2 != -1) {
4511 if (fstat(fd2, &sb2) == -1) {
4512 err = got_error_from_errno2("fstat", path2);
4513 goto done;
4514 }
4515
4516 f2 = fdopen(fd2, "r");
4517 if (f2 == NULL) {
4518 err = got_error_from_errno2("fdopen", path2);
4519 goto done;
4520 }
4521 fd2 = -1;
4522 } else {
4523 size_t n;
4524 f2 = got_opentemp();
4525 if (f2 == NULL) {
4526 err = got_error_from_errno2("got_opentemp", path2);
4527 goto done;
4528 }
4529 n = fwrite(link_target, 1, link_len, f2);
4530 if (n != link_len) {
4531 err = got_ferror(f2, GOT_ERR_IO);
4532 goto done;
4533 }
4534 if (fflush(f2) == EOF) {
4535 err = got_error_from_errno("fflush");
4536 goto done;
4537 }
4538 rewind(f2);
4539 }
4540
4541 fd = got_opentempfd();
4542 if (fd == -1) {
4543 err = got_error_from_errno("got_opentempfd");
4544 goto done;
4545 }
4546
4547 err = got_object_open_as_blob(&blob, repo, blob_id, 8192, fd);
4548 if (err)
4549 goto done;
4550
4551 err = got_opentemp_named(&path1, &f1, "got-patched-blob", "");
4552 if (err)
4553 goto done;
4554
4555 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4556 if (err)
4557 goto done;
4558
4559 err = got_diff_files(&diffreg_result, f1, 1, id_str, f2, 1, path2,
4560 3, 0, 1, NULL, GOT_DIFF_ALGORITHM_MYERS);
4561 if (err)
4562 goto done;
4563
4564 err = got_opentemp_named(path_outfile, &outfile, "got-patched-content",
4565 "");
4566 if (err)
4567 goto done;
4568
4569 if (fseek(f1, 0L, SEEK_SET) == -1)
4570 return got_ferror(f1, GOT_ERR_IO);
4571 if (fseek(f2, 0L, SEEK_SET) == -1)
4572 return got_ferror(f2, GOT_ERR_IO);
4573
4574 /* Count the number of actual changes in the diff result. */
4575 for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4576 struct diff_chunk_context cc = {};
4577 diff_chunk_context_load_change(&cc, &nchunks_used,
4578 diffreg_result->result, n, 0);
4579 nchanges++;
4580 }
4581 for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4582 int choice;
4583 err = apply_or_reject_change(&choice, &nchunks_used,
4584 diffreg_result->result, n, relpath, f1, f2,
4585 &line_cur1, &line_cur2,
4586 reverse_patch ? NULL : outfile,
4587 reverse_patch ? outfile : NULL,
4588 ++i, nchanges, patch_cb, patch_arg);
4589 if (err)
4590 goto done;
4591 if (choice == GOT_PATCH_CHOICE_YES)
4592 have_content = 1;
4593 else if (choice == GOT_PATCH_CHOICE_QUIT)
4594 break;
4595 }
4596 if (have_content) {
4597 err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4598 reverse_patch ? NULL : outfile,
4599 reverse_patch ? outfile : NULL);
4600 if (err)
4601 goto done;
4602
4603 if (!S_ISLNK(sb2.st_mode)) {
4604 mode_t mode;
4605
4606 mode = apply_umask(sb2.st_mode);
4607 if (fchmod(fileno(outfile), mode) == -1) {
4608 err = got_error_from_errno2("fchmod", path2);
4609 goto done;
4610 }
4611 }
4612 }
4613 done:
4614 free(id_str);
4615 if (fd != -1 && close(fd) == -1 && err == NULL)
4616 err = got_error_from_errno("close");
4617 if (blob)
4618 got_object_blob_close(blob);
4619 free_err = got_diffreg_result_free(diffreg_result);
4620 if (err == NULL)
4621 err = free_err;
4622 if (f1 && fclose(f1) == EOF && err == NULL)
4623 err = got_error_from_errno2("fclose", path1);
4624 if (f2 && fclose(f2) == EOF && err == NULL)
4625 err = got_error_from_errno2("fclose", path2);
4626 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4627 err = got_error_from_errno2("close", path2);
4628 if (outfile && fclose(outfile) == EOF && err == NULL)
4629 err = got_error_from_errno2("fclose", *path_outfile);
4630 if (path1 && unlink(path1) == -1 && err == NULL)
4631 err = got_error_from_errno2("unlink", path1);
4632 if (err || !have_content) {
4633 if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4634 err = got_error_from_errno2("unlink", *path_outfile);
4635 free(*path_outfile);
4636 *path_outfile = NULL;
4637 }
4638 free(path1);
4639 return err;
4640 }
4641
4642 static const struct got_error *
4643 revert_file(void *arg, unsigned char status, unsigned char staged_status,
4644 const char *relpath, struct got_object_id *blob_id,
4645 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4646 int dirfd, const char *de_name)
4647 {
4648 struct revert_file_args *a = arg;
4649 const struct got_error *err = NULL;
4650 char *parent_path = NULL;
4651 struct got_fileindex_entry *ie;
4652 struct got_commit_object *base_commit = NULL;
4653 struct got_tree_object *tree = NULL;
4654 struct got_object_id *tree_id = NULL;
4655 const struct got_tree_entry *te = NULL;
4656 char *tree_path = NULL, *te_name;
4657 char *ondisk_path = NULL, *path_content = NULL;
4658 struct got_blob_object *blob = NULL;
4659 int fd = -1;
4660
4661 /* Reverting a staged deletion is a no-op. */
4662 if (status == GOT_STATUS_DELETE &&
4663 staged_status != GOT_STATUS_NO_CHANGE)
4664 return NULL;
4665
4666 if (status == GOT_STATUS_UNVERSIONED)
4667 return (*a->progress_cb)(a->progress_arg,
4668 GOT_STATUS_UNVERSIONED, relpath);
4669
4670 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4671 if (ie == NULL)
4672 return got_error_path(relpath, GOT_ERR_BAD_PATH);
4673
4674 /* Construct in-repository path of tree which contains this blob. */
4675 err = got_path_dirname(&parent_path, ie->path);
4676 if (err) {
4677 if (err->code != GOT_ERR_BAD_PATH)
4678 goto done;
4679 parent_path = strdup("/");
4680 if (parent_path == NULL) {
4681 err = got_error_from_errno("strdup");
4682 goto done;
4683 }
4684 }
4685 if (got_path_is_root_dir(a->worktree->path_prefix)) {
4686 tree_path = strdup(parent_path);
4687 if (tree_path == NULL) {
4688 err = got_error_from_errno("strdup");
4689 goto done;
4690 }
4691 } else {
4692 if (got_path_is_root_dir(parent_path)) {
4693 tree_path = strdup(a->worktree->path_prefix);
4694 if (tree_path == NULL) {
4695 err = got_error_from_errno("strdup");
4696 goto done;
4697 }
4698 } else {
4699 if (asprintf(&tree_path, "%s/%s",
4700 a->worktree->path_prefix, parent_path) == -1) {
4701 err = got_error_from_errno("asprintf");
4702 goto done;
4703 }
4704 }
4705 }
4706
4707 err = got_object_open_as_commit(&base_commit, a->repo,
4708 a->worktree->base_commit_id);
4709 if (err)
4710 goto done;
4711
4712 err = got_object_id_by_path(&tree_id, a->repo, base_commit, tree_path);
4713 if (err) {
4714 if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4715 (status == GOT_STATUS_ADD ||
4716 staged_status == GOT_STATUS_ADD)))
4717 goto done;
4718 } else {
4719 err = got_object_open_as_tree(&tree, a->repo, tree_id);
4720 if (err)
4721 goto done;
4722
4723 err = got_path_basename(&te_name, ie->path);
4724 if (err)
4725 goto done;
4726
4727 te = got_object_tree_find_entry(tree, te_name);
4728 free(te_name);
4729 if (te == NULL && status != GOT_STATUS_ADD &&
4730 staged_status != GOT_STATUS_ADD) {
4731 err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
4732 goto done;
4733 }
4734 }
4735
4736 switch (status) {
4737 case GOT_STATUS_ADD:
4738 if (a->patch_cb) {
4739 int choice = GOT_PATCH_CHOICE_NONE;
4740 err = (*a->patch_cb)(&choice, a->patch_arg,
4741 status, ie->path, NULL, 1, 1);
4742 if (err)
4743 goto done;
4744 if (choice != GOT_PATCH_CHOICE_YES)
4745 break;
4746 }
4747 err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4748 ie->path);
4749 if (err)
4750 goto done;
4751 got_fileindex_entry_remove(a->fileindex, ie);
4752 if (a->unlink_added_files) {
4753 if (asprintf(&ondisk_path, "%s/%s",
4754 got_worktree_get_root_path(a->worktree),
4755 relpath) == -1) {
4756 err = got_error_from_errno("asprintf");
4757 goto done;
4758 }
4759 if (unlink(ondisk_path) == -1) {
4760 err = got_error_from_errno2("unlink",
4761 ondisk_path);
4762 break;
4763 }
4764 }
4765 break;
4766 case GOT_STATUS_DELETE:
4767 if (a->patch_cb) {
4768 int choice = GOT_PATCH_CHOICE_NONE;
4769 err = (*a->patch_cb)(&choice, a->patch_arg,
4770 status, ie->path, NULL, 1, 1);
4771 if (err)
4772 goto done;
4773 if (choice != GOT_PATCH_CHOICE_YES)
4774 break;
4775 }
4776 /* fall through */
4777 case GOT_STATUS_MODIFY:
4778 case GOT_STATUS_MODE_CHANGE:
4779 case GOT_STATUS_CONFLICT:
4780 case GOT_STATUS_MISSING: {
4781 struct got_object_id id;
4782 if (staged_status == GOT_STATUS_ADD ||
4783 staged_status == GOT_STATUS_MODIFY) {
4784 memcpy(id.sha1, ie->staged_blob_sha1,
4785 SHA1_DIGEST_LENGTH);
4786 } else
4787 memcpy(id.sha1, ie->blob_sha1,
4788 SHA1_DIGEST_LENGTH);
4789 fd = got_opentempfd();
4790 if (fd == -1) {
4791 err = got_error_from_errno("got_opentempfd");
4792 goto done;
4793 }
4794
4795 err = got_object_open_as_blob(&blob, a->repo, &id, 8192, fd);
4796 if (err)
4797 goto done;
4798
4799 if (asprintf(&ondisk_path, "%s/%s",
4800 got_worktree_get_root_path(a->worktree), relpath) == -1) {
4801 err = got_error_from_errno("asprintf");
4802 goto done;
4803 }
4804
4805 if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4806 status == GOT_STATUS_CONFLICT)) {
4807 int is_bad_symlink = 0;
4808 err = create_patched_content(&path_content, 1, &id,
4809 ondisk_path, dirfd, de_name, ie->path, a->repo,
4810 a->patch_cb, a->patch_arg);
4811 if (err || path_content == NULL)
4812 break;
4813 if (te && S_ISLNK(te->mode)) {
4814 if (unlink(path_content) == -1) {
4815 err = got_error_from_errno2("unlink",
4816 path_content);
4817 break;
4818 }
4819 err = install_symlink(&is_bad_symlink,
4820 a->worktree, ondisk_path, ie->path,
4821 blob, 0, 1, 0, 0, a->repo,
4822 a->progress_cb, a->progress_arg);
4823 } else {
4824 if (rename(path_content, ondisk_path) == -1) {
4825 err = got_error_from_errno3("rename",
4826 path_content, ondisk_path);
4827 goto done;
4828 }
4829 }
4830 } else {
4831 int is_bad_symlink = 0;
4832 if (te && S_ISLNK(te->mode)) {
4833 err = install_symlink(&is_bad_symlink,
4834 a->worktree, ondisk_path, ie->path,
4835 blob, 0, 1, 0, 0, a->repo,
4836 a->progress_cb, a->progress_arg);
4837 } else {
4838 err = install_blob(a->worktree, ondisk_path,
4839 ie->path,
4840 te ? te->mode : GOT_DEFAULT_FILE_MODE,
4841 got_fileindex_perms_to_st(ie), blob,
4842 0, 1, 0, 0, a->repo,
4843 a->progress_cb, a->progress_arg);
4844 }
4845 if (err)
4846 goto done;
4847 if (status == GOT_STATUS_DELETE ||
4848 status == GOT_STATUS_MODE_CHANGE) {
4849 err = got_fileindex_entry_update(ie,
4850 a->worktree->root_fd, relpath,
4851 blob->id.sha1,
4852 a->worktree->base_commit_id->sha1, 1);
4853 if (err)
4854 goto done;
4855 }
4856 if (is_bad_symlink) {
4857 got_fileindex_entry_filetype_set(ie,
4858 GOT_FILEIDX_MODE_BAD_SYMLINK);
4859 }
4860 }
4861 break;
4862 }
4863 default:
4864 break;
4865 }
4866 done:
4867 free(ondisk_path);
4868 free(path_content);
4869 free(parent_path);
4870 free(tree_path);
4871 if (fd != -1 && close(fd) == -1 && err == NULL)
4872 err = got_error_from_errno("close");
4873 if (blob)
4874 got_object_blob_close(blob);
4875 if (tree)
4876 got_object_tree_close(tree);
4877 free(tree_id);
4878 if (base_commit)
4879 got_object_commit_close(base_commit);
4880 return err;
4881 }
4882
4883 const struct got_error *
4884 got_worktree_revert(struct got_worktree *worktree,
4885 struct got_pathlist_head *paths,
4886 got_worktree_checkout_cb progress_cb, void *progress_arg,
4887 got_worktree_patch_cb patch_cb, void *patch_arg,
4888 struct got_repository *repo)
4889 {
4890 struct got_fileindex *fileindex = NULL;
4891 char *fileindex_path = NULL;
4892 const struct got_error *err = NULL, *unlockerr = NULL;
4893 const struct got_error *sync_err = NULL;
4894 struct got_pathlist_entry *pe;
4895 struct revert_file_args rfa;
4896
4897 err = lock_worktree(worktree, LOCK_EX);
4898 if (err)
4899 return err;
4900
4901 err = open_fileindex(&fileindex, &fileindex_path, worktree);
4902 if (err)
4903 goto done;
4904
4905 rfa.worktree = worktree;
4906 rfa.fileindex = fileindex;
4907 rfa.progress_cb = progress_cb;
4908 rfa.progress_arg = progress_arg;
4909 rfa.patch_cb = patch_cb;
4910 rfa.patch_arg = patch_arg;
4911 rfa.repo = repo;
4912 rfa.unlink_added_files = 0;
4913 TAILQ_FOREACH(pe, paths, entry) {
4914 err = worktree_status(worktree, pe->path, fileindex, repo,
4915 revert_file, &rfa, NULL, NULL, 1, 0);
4916 if (err)
4917 break;
4918 }
4919 sync_err = sync_fileindex(fileindex, fileindex_path);
4920 if (sync_err && err == NULL)
4921 err = sync_err;
4922 done:
4923 free(fileindex_path);
4924 if (fileindex)
4925 got_fileindex_free(fileindex);
4926 unlockerr = lock_worktree(worktree, LOCK_SH);
4927 if (unlockerr && err == NULL)
4928 err = unlockerr;
4929 return err;
4930 }
4931
4932 static void
4933 free_commitable(struct got_commitable *ct)
4934 {
4935 free(ct->path);
4936 free(ct->in_repo_path);
4937 free(ct->ondisk_path);
4938 free(ct->blob_id);
4939 free(ct->base_blob_id);
4940 free(ct->staged_blob_id);
4941 free(ct->base_commit_id);
4942 free(ct);
4943 }
4944
4945 struct collect_commitables_arg {
4946 struct got_pathlist_head *commitable_paths;
4947 struct got_repository *repo;
4948 struct got_worktree *worktree;
4949 struct got_fileindex *fileindex;
4950 int have_staged_files;
4951 int allow_bad_symlinks;
4952 int diff_header_shown;
4953 FILE *diff_outfile;
4954 FILE *f1;
4955 FILE *f2;
4956 };
4957
4958 /*
4959 * Create a file which contains the target path of a symlink so we can feed
4960 * it as content to the diff engine.
4961 */
4962 static const struct got_error *
4963 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4964 const char *abspath)
4965 {
4966 const struct got_error *err = NULL;
4967 char target_path[PATH_MAX];
4968 ssize_t target_len, outlen;
4969
4970 *fd = -1;
4971
4972 if (dirfd != -1) {
4973 target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4974 if (target_len == -1)
4975 return got_error_from_errno2("readlinkat", abspath);
4976 } else {
4977 target_len = readlink(abspath, target_path, PATH_MAX);
4978 if (target_len == -1)
4979 return got_error_from_errno2("readlink", abspath);
4980 }
4981
4982 *fd = got_opentempfd();
4983 if (*fd == -1)
4984 return got_error_from_errno("got_opentempfd");
4985
4986 outlen = write(*fd, target_path, target_len);
4987 if (outlen == -1) {
4988 err = got_error_from_errno("got_opentempfd");
4989 goto done;
4990 }
4991
4992 if (lseek(*fd, 0, SEEK_SET) == -1) {
4993 err = got_error_from_errno2("lseek", abspath);
4994 goto done;
4995 }
4996 done:
4997 if (err) {
4998 close(*fd);
4999 *fd = -1;
5000 }
5001 return err;
5002 }
5003
5004 static const struct got_error *
5005 append_ct_diff(struct got_commitable *ct, int *diff_header_shown,
5006 FILE *diff_outfile, FILE *f1, FILE *f2, int dirfd, const char *de_name,
5007 int diff_staged, struct got_repository *repo, struct got_worktree *worktree)
5008 {
5009 const struct got_error *err = NULL;
5010 struct got_blob_object *blob1 = NULL;
5011 int fd = -1, fd1 = -1, fd2 = -1;
5012 FILE *ondisk_file = NULL;
5013 char *label1 = NULL;
5014 struct stat sb;
5015 off_t size1 = 0;
5016 int f2_exists = 0;
5017 char *id_str = NULL;
5018
5019 memset(&sb, 0, sizeof(sb));
5020
5021 if (diff_staged) {
5022 if (ct->staged_status != GOT_STATUS_MODIFY &&
5023 ct->staged_status != GOT_STATUS_ADD &&
5024 ct->staged_status != GOT_STATUS_DELETE)
5025 return NULL;
5026 } else {
5027 if (ct->status != GOT_STATUS_MODIFY &&
5028 ct->status != GOT_STATUS_ADD &&
5029 ct->status != GOT_STATUS_DELETE)
5030 return NULL;
5031 }
5032
5033 err = got_opentemp_truncate(f1);
5034 if (err)
5035 return got_error_from_errno("got_opentemp_truncate");
5036 err = got_opentemp_truncate(f2);
5037 if (err)
5038 return got_error_from_errno("got_opentemp_truncate");
5039
5040 if (!*diff_header_shown) {
5041 err = got_object_id_str(&id_str, worktree->base_commit_id);
5042 if (err)
5043 return err;
5044 fprintf(diff_outfile, "diff %s%s\n", diff_staged ? "-s " : "",
5045 got_worktree_get_root_path(worktree));
5046 fprintf(diff_outfile, "commit - %s\n", id_str);
5047 fprintf(diff_outfile, "path + %s%s\n",
5048 got_worktree_get_root_path(worktree),
5049 diff_staged ? " (staged changes)" : "");
5050 *diff_header_shown = 1;
5051 }
5052
5053 if (diff_staged) {
5054 const char *label1 = NULL, *label2 = NULL;
5055 switch (ct->staged_status) {
5056 case GOT_STATUS_MODIFY:
5057 label1 = ct->path;
5058 label2 = ct->path;
5059 break;
5060 case GOT_STATUS_ADD:
5061 label2 = ct->path;
5062 break;
5063 case GOT_STATUS_DELETE:
5064 label1 = ct->path;
5065 break;
5066 default:
5067 return got_error(GOT_ERR_FILE_STATUS);
5068 }
5069 fd1 = got_opentempfd();
5070 if (fd1 == -1) {
5071 err = got_error_from_errno("got_opentempfd");
5072 goto done;
5073 }
5074 fd2 = got_opentempfd();
5075 if (fd2 == -1) {
5076 err = got_error_from_errno("got_opentempfd");
5077 goto done;
5078 }
5079 err = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
5080 fd1, fd2, ct->base_blob_id, ct->staged_blob_id,
5081 label1, label2, GOT_DIFF_ALGORITHM_PATIENCE, 3, 0, 0,
5082 NULL, repo, diff_outfile);
5083 goto done;
5084 }
5085
5086 fd1 = got_opentempfd();
5087 if (fd1 == -1) {
5088 err = got_error_from_errno("got_opentempfd");
5089 goto done;
5090 }
5091
5092 if (ct->status != GOT_STATUS_ADD) {
5093 err = got_object_open_as_blob(&blob1, repo, ct->base_blob_id,
5094 8192, fd1);
5095 if (err)
5096 goto done;
5097 }
5098
5099 if (ct->status != GOT_STATUS_DELETE) {
5100 if (dirfd != -1) {
5101 fd = openat(dirfd, de_name,
5102 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5103 if (fd == -1) {
5104 if (!got_err_open_nofollow_on_symlink()) {
5105 err = got_error_from_errno2("openat",
5106 ct->ondisk_path);
5107 goto done;
5108 }
5109 err = get_symlink_target_file(&fd, dirfd,
5110 de_name, ct->ondisk_path);
5111 if (err)
5112 goto done;
5113 }
5114 } else {
5115 fd = open(ct->ondisk_path,
5116 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5117 if (fd == -1) {
5118 if (!got_err_open_nofollow_on_symlink()) {
5119 err = got_error_from_errno2("open",
5120 ct->ondisk_path);
5121 goto done;
5122 }
5123 err = get_symlink_target_file(&fd, dirfd,
5124 de_name, ct->ondisk_path);
5125 if (err)
5126 goto done;
5127 }
5128 }
5129 if (fstatat(fd, ct->ondisk_path, &sb,
5130 AT_SYMLINK_NOFOLLOW) == -1) {
5131 err = got_error_from_errno2("fstatat", ct->ondisk_path);
5132 goto done;
5133 }
5134 ondisk_file = fdopen(fd, "r");
5135 if (ondisk_file == NULL) {
5136 err = got_error_from_errno2("fdopen", ct->ondisk_path);
5137 goto done;
5138 }
5139 fd = -1;
5140 f2_exists = 1;
5141 }
5142
5143 if (blob1) {
5144 err = got_object_blob_dump_to_file(&size1, NULL, NULL,
5145 f1, blob1);
5146 if (err)
5147 goto done;
5148 }
5149
5150 err = got_diff_blob_file(blob1, f1, size1, label1,
5151 ondisk_file ? ondisk_file : f2, f2_exists, &sb, ct->path,
5152 GOT_DIFF_ALGORITHM_PATIENCE, 3, 0, 0, NULL, diff_outfile);
5153 done:
5154 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
5155 err = got_error_from_errno("close");
5156 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
5157 err = got_error_from_errno("close");
5158 if (blob1)
5159 got_object_blob_close(blob1);
5160 if (fd != -1 && close(fd) == -1 && err == NULL)
5161 err = got_error_from_errno("close");
5162 if (ondisk_file && fclose(ondisk_file) == EOF && err == NULL)
5163 err = got_error_from_errno("fclose");
5164 return err;
5165 }
5166
5167 static const struct got_error *
5168 collect_commitables(void *arg, unsigned char status,
5169 unsigned char staged_status, const char *relpath,
5170 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5171 struct got_object_id *commit_id, int dirfd, const char *de_name)
5172 {
5173 struct collect_commitables_arg *a = arg;
5174 const struct got_error *err = NULL;
5175 struct got_commitable *ct = NULL;
5176 struct got_pathlist_entry *new = NULL;
5177 char *parent_path = NULL, *path = NULL;
5178 struct stat sb;
5179
5180 if (a->have_staged_files) {
5181 if (staged_status != GOT_STATUS_MODIFY &&
5182 staged_status != GOT_STATUS_ADD &&
5183 staged_status != GOT_STATUS_DELETE)
5184 return NULL;
5185 } else {
5186 if (status == GOT_STATUS_CONFLICT)
5187 return got_error(GOT_ERR_COMMIT_CONFLICT);
5188
5189 if (status != GOT_STATUS_MODIFY &&
5190 status != GOT_STATUS_MODE_CHANGE &&
5191 status != GOT_STATUS_ADD &&
5192 status != GOT_STATUS_DELETE)
5193 return NULL;
5194 }
5195
5196 if (asprintf(&path, "/%s", relpath) == -1) {
5197 err = got_error_from_errno("asprintf");
5198 goto done;
5199 }
5200 if (strcmp(path, "/") == 0) {
5201 parent_path = strdup("");
5202 if (parent_path == NULL)
5203 return got_error_from_errno("strdup");
5204 } else {
5205 err = got_path_dirname(&parent_path, path);
5206 if (err)
5207 return err;
5208 }
5209
5210 ct = calloc(1, sizeof(*ct));
5211 if (ct == NULL) {
5212 err = got_error_from_errno("calloc");
5213 goto done;
5214 }
5215
5216 if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
5217 relpath) == -1) {
5218 err = got_error_from_errno("asprintf");
5219 goto done;
5220 }
5221
5222 if (staged_status == GOT_STATUS_ADD ||
5223 staged_status == GOT_STATUS_MODIFY) {
5224 struct got_fileindex_entry *ie;
5225 ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
5226 switch (got_fileindex_entry_staged_filetype_get(ie)) {
5227 case GOT_FILEIDX_MODE_REGULAR_FILE:
5228 case GOT_FILEIDX_MODE_BAD_SYMLINK:
5229 ct->mode = S_IFREG;
5230 break;
5231 case GOT_FILEIDX_MODE_SYMLINK:
5232 ct->mode = S_IFLNK;
5233 break;
5234 default:
5235 err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
5236 goto done;
5237 }
5238 ct->mode |= got_fileindex_entry_perms_get(ie);
5239 } else if (status != GOT_STATUS_DELETE &&
5240 staged_status != GOT_STATUS_DELETE) {
5241 if (dirfd != -1) {
5242 if (fstatat(dirfd, de_name, &sb,
5243 AT_SYMLINK_NOFOLLOW) == -1) {
5244 err = got_error_from_errno2("fstatat",
5245 ct->ondisk_path);
5246 goto done;
5247 }
5248 } else if (lstat(ct->ondisk_path, &sb) == -1) {
5249 err = got_error_from_errno2("lstat", ct->ondisk_path);
5250 goto done;
5251 }
5252 ct->mode = sb.st_mode;
5253 }
5254
5255 if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
5256 got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
5257 relpath) == -1) {
5258 err = got_error_from_errno("asprintf");
5259 goto done;
5260 }
5261
5262 if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
5263 status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
5264 int is_bad_symlink;
5265 char target_path[PATH_MAX];
5266 ssize_t target_len;
5267 target_len = readlink(ct->ondisk_path, target_path,
5268 sizeof(target_path));
5269 if (target_len == -1) {
5270 err = got_error_from_errno2("readlink",
5271 ct->ondisk_path);
5272 goto done;
5273 }
5274 err = is_bad_symlink_target(&is_bad_symlink, target_path,
5275 target_len, ct->ondisk_path, a->worktree->root_path);
5276 if (err)
5277 goto done;
5278 if (is_bad_symlink) {
5279 err = got_error_path(ct->ondisk_path,
5280 GOT_ERR_BAD_SYMLINK);
5281 goto done;
5282 }
5283 }
5284
5285
5286 ct->status = status;
5287 ct->staged_status = staged_status;
5288 ct->blob_id = NULL; /* will be filled in when blob gets created */
5289 if (ct->status != GOT_STATUS_ADD &&
5290 ct->staged_status != GOT_STATUS_ADD) {
5291 ct->base_blob_id = got_object_id_dup(blob_id);
5292 if (ct->base_blob_id == NULL) {
5293 err = got_error_from_errno("got_object_id_dup");
5294 goto done;
5295 }
5296 ct->base_commit_id = got_object_id_dup(commit_id);
5297 if (ct->base_commit_id == NULL) {
5298 err = got_error_from_errno("got_object_id_dup");
5299 goto done;
5300 }
5301 }
5302 if (ct->staged_status == GOT_STATUS_ADD ||
5303 ct->staged_status == GOT_STATUS_MODIFY) {
5304 ct->staged_blob_id = got_object_id_dup(staged_blob_id);
5305 if (ct->staged_blob_id == NULL) {
5306 err = got_error_from_errno("got_object_id_dup");
5307 goto done;
5308 }
5309 }
5310 ct->path = strdup(path);
5311 if (ct->path == NULL) {
5312 err = got_error_from_errno("strdup");
5313 goto done;
5314 }
5315 err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
5316 if (err)
5317 goto done;
5318
5319 if (a->diff_outfile && ct && new != NULL) {
5320 err = append_ct_diff(ct, &a->diff_header_shown,
5321 a->diff_outfile, a->f1, a->f2, dirfd, de_name,
5322 a->have_staged_files, a->repo, a->worktree);
5323 if (err)
5324 goto done;
5325 }
5326 done:
5327 if (ct && (err || new == NULL))
5328 free_commitable(ct);
5329 free(parent_path);
5330 free(path);
5331 return err;
5332 }
5333
5334 static const struct got_error *write_tree(struct got_object_id **, int *,
5335 struct got_tree_object *, const char *, struct got_pathlist_head *,
5336 got_worktree_status_cb status_cb, void *status_arg,
5337 struct got_repository *);
5338
5339 static const struct got_error *
5340 write_subtree(struct got_object_id **new_subtree_id, int *nentries,
5341 struct got_tree_entry *te, const char *parent_path,
5342 struct got_pathlist_head *commitable_paths,
5343 got_worktree_status_cb status_cb, void *status_arg,
5344 struct got_repository *repo)
5345 {
5346 const struct got_error *err = NULL;
5347 struct got_tree_object *subtree;
5348 char *subpath;
5349
5350 if (asprintf(&subpath, "%s%s%s", parent_path,
5351 got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
5352 return got_error_from_errno("asprintf");
5353
5354 err = got_object_open_as_tree(&subtree, repo, &te->id);
5355 if (err)
5356 return err;
5357
5358 err = write_tree(new_subtree_id, nentries, subtree, subpath,
5359 commitable_paths, status_cb, status_arg, repo);
5360 got_object_tree_close(subtree);
5361 free(subpath);
5362 return err;
5363 }
5364
5365 static const struct got_error *
5366 match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
5367 {
5368 const struct got_error *err = NULL;
5369 char *ct_parent_path = NULL;
5370
5371 *match = 0;
5372
5373 if (strchr(ct->in_repo_path, '/') == NULL) {
5374 *match = got_path_is_root_dir(path);
5375 return NULL;
5376 }
5377
5378 err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
5379 if (err)
5380 return err;
5381 *match = (strcmp(path, ct_parent_path) == 0);
5382 free(ct_parent_path);
5383 return err;
5384 }
5385
5386 static mode_t
5387 get_ct_file_mode(struct got_commitable *ct)
5388 {
5389 if (S_ISLNK(ct->mode))
5390 return S_IFLNK;
5391
5392 return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
5393 }
5394
5395 static const struct got_error *
5396 alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
5397 struct got_tree_entry *te, struct got_commitable *ct)
5398 {
5399 const struct got_error *err = NULL;
5400
5401 *new_te = NULL;
5402
5403 err = got_object_tree_entry_dup(new_te, te);
5404 if (err)
5405 goto done;
5406
5407 (*new_te)->mode = get_ct_file_mode(ct);
5408
5409 if (ct->staged_status == GOT_STATUS_MODIFY)
5410 memcpy(&(*new_te)->id, ct->staged_blob_id,
5411 sizeof((*new_te)->id));
5412 else
5413 memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5414 done:
5415 if (err && *new_te) {
5416 free(*new_te);
5417 *new_te = NULL;
5418 }
5419 return err;
5420 }
5421
5422 static const struct got_error *
5423 alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
5424 struct got_commitable *ct)
5425 {
5426 const struct got_error *err = NULL;
5427 char *ct_name = NULL;
5428
5429 *new_te = NULL;
5430
5431 *new_te = calloc(1, sizeof(**new_te));
5432 if (*new_te == NULL)
5433 return got_error_from_errno("calloc");
5434
5435 err = got_path_basename(&ct_name, ct->path);
5436 if (err)
5437 goto done;
5438 if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
5439 sizeof((*new_te)->name)) {
5440 err = got_error(GOT_ERR_NO_SPACE);
5441 goto done;
5442 }
5443
5444 (*new_te)->mode = get_ct_file_mode(ct);
5445
5446 if (ct->staged_status == GOT_STATUS_ADD)
5447 memcpy(&(*new_te)->id, ct->staged_blob_id,
5448 sizeof((*new_te)->id));
5449 else
5450 memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5451 done:
5452 free(ct_name);
5453 if (err && *new_te) {
5454 free(*new_te);
5455 *new_te = NULL;
5456 }
5457 return err;
5458 }
5459
5460 static const struct got_error *
5461 insert_tree_entry(struct got_tree_entry *new_te,
5462 struct got_pathlist_head *paths)
5463 {
5464 const struct got_error *err = NULL;
5465 struct got_pathlist_entry *new_pe;
5466
5467 err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
5468 if (err)
5469 return err;
5470 if (new_pe == NULL)
5471 return got_error(GOT_ERR_TREE_DUP_ENTRY);
5472 return NULL;
5473 }
5474
5475 static const struct got_error *
5476 report_ct_status(struct got_commitable *ct,
5477 got_worktree_status_cb status_cb, void *status_arg)
5478 {
5479 const char *ct_path = ct->path;
5480 unsigned char status;
5481
5482 if (status_cb == NULL) /* no commit progress output desired */
5483 return NULL;
5484
5485 while (ct_path[0] == '/')
5486 ct_path++;
5487
5488 if (ct->staged_status != GOT_STATUS_NO_CHANGE)
5489 status = ct->staged_status;
5490 else
5491 status = ct->status;
5492
5493 return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
5494 ct_path, ct->blob_id, NULL, NULL, -1, NULL);
5495 }
5496
5497 static const struct got_error *
5498 match_modified_subtree(int *modified, struct got_tree_entry *te,
5499 const char *base_tree_path, struct got_pathlist_head *commitable_paths)
5500 {
5501 const struct got_error *err = NULL;
5502 struct got_pathlist_entry *pe;
5503 char *te_path;
5504
5505 *modified = 0;
5506
5507 if (asprintf(&te_path, "%s%s%s", base_tree_path,
5508 got_path_is_root_dir(base_tree_path) ? "" : "/",
5509 te->name) == -1)
5510 return got_error_from_errno("asprintf");
5511
5512 TAILQ_FOREACH(pe, commitable_paths, entry) {
5513 struct got_commitable *ct = pe->data;
5514 *modified = got_path_is_child(ct->in_repo_path, te_path,
5515 strlen(te_path));
5516 if (*modified)
5517 break;
5518 }
5519
5520 free(te_path);
5521 return err;
5522 }
5523
5524 static const struct got_error *
5525 match_deleted_or_modified_ct(struct got_commitable **ctp,
5526 struct got_tree_entry *te, const char *base_tree_path,
5527 struct got_pathlist_head *commitable_paths)
5528 {
5529 const struct got_error *err = NULL;
5530 struct got_pathlist_entry *pe;
5531
5532 *ctp = NULL;
5533
5534 TAILQ_FOREACH(pe, commitable_paths, entry) {
5535 struct got_commitable *ct = pe->data;
5536 char *ct_name = NULL;
5537 int path_matches;
5538
5539 if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
5540 if (ct->status != GOT_STATUS_MODIFY &&
5541 ct->status != GOT_STATUS_MODE_CHANGE &&
5542 ct->status != GOT_STATUS_DELETE)
5543 continue;
5544 } else {
5545 if (ct->staged_status != GOT_STATUS_MODIFY &&
5546 ct->staged_status != GOT_STATUS_DELETE)
5547 continue;
5548 }
5549
5550 if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
5551 continue;
5552
5553 err = match_ct_parent_path(&path_matches, ct, base_tree_path);
5554 if (err)
5555 return err;
5556 if (!path_matches)
5557 continue;
5558
5559 err = got_path_basename(&ct_name, pe->path);
5560 if (err)
5561 return err;
5562
5563 if (strcmp(te->name, ct_name) != 0) {
5564 free(ct_name);
5565 continue;
5566 }
5567 free(ct_name);
5568
5569 *ctp = ct;
5570 break;
5571 }
5572
5573 return err;
5574 }
5575
5576 static const struct got_error *
5577 make_subtree_for_added_blob(struct got_tree_entry **new_tep,
5578 const char *child_path, const char *path_base_tree,
5579 struct got_pathlist_head *commitable_paths,
5580 got_worktree_status_cb status_cb, void *status_arg,
5581 struct got_repository *repo)
5582 {
5583 const struct got_error *err = NULL;
5584 struct got_tree_entry *new_te;
5585 char *subtree_path;
5586 struct got_object_id *id = NULL;
5587 int nentries;
5588
5589 *new_tep = NULL;
5590
5591 if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
5592 got_path_is_root_dir(path_base_tree) ? "" : "/",
5593 child_path) == -1)
5594 return got_error_from_errno("asprintf");
5595
5596 new_te = calloc(1, sizeof(*new_te));
5597 if (new_te == NULL)
5598 return got_error_from_errno("calloc");
5599 new_te->mode = S_IFDIR;
5600
5601 if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
5602 sizeof(new_te->name)) {
5603 err = got_error(GOT_ERR_NO_SPACE);
5604 goto done;
5605 }
5606 err = write_tree(&id, &nentries, NULL, subtree_path,
5607 commitable_paths, status_cb, status_arg, repo);
5608 if (err) {
5609 free(new_te);
5610 goto done;
5611 }
5612 memcpy(&new_te->id, id, sizeof(new_te->id));
5613 done:
5614 free(id);
5615 free(subtree_path);
5616 if (err == NULL)
5617 *new_tep = new_te;
5618 return err;
5619 }
5620
5621 static const struct got_error *
5622 write_tree(struct got_object_id **new_tree_id, int *nentries,
5623 struct got_tree_object *base_tree, const char *path_base_tree,
5624 struct got_pathlist_head *commitable_paths,
5625 got_worktree_status_cb status_cb, void *status_arg,
5626 struct got_repository *repo)
5627 {
5628 const struct got_error *err = NULL;
5629 struct got_pathlist_head paths;
5630 struct got_tree_entry *te, *new_te = NULL;
5631 struct got_pathlist_entry *pe;
5632
5633 TAILQ_INIT(&paths);
5634 *nentries = 0;
5635
5636 /* Insert, and recurse into, newly added entries first. */
5637 TAILQ_FOREACH(pe, commitable_paths, entry) {
5638 struct got_commitable *ct = pe->data;
5639 char *child_path = NULL, *slash;
5640
5641 if ((ct->status != GOT_STATUS_ADD &&
5642 ct->staged_status != GOT_STATUS_ADD) ||
5643 (ct->flags & GOT_COMMITABLE_ADDED))
5644 continue;
5645
5646 if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5647 strlen(path_base_tree)))
5648 continue;
5649
5650 err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5651 ct->in_repo_path);
5652 if (err)
5653 goto done;
5654
5655 slash = strchr(child_path, '/');
5656 if (slash == NULL) {
5657 err = alloc_added_blob_tree_entry(&new_te, ct);
5658 if (err)
5659 goto done;
5660 err = report_ct_status(ct, status_cb, status_arg);
5661 if (err)
5662 goto done;
5663 ct->flags |= GOT_COMMITABLE_ADDED;
5664 err = insert_tree_entry(new_te, &paths);
5665 if (err)
5666 goto done;
5667 (*nentries)++;
5668 } else {
5669 *slash = '\0'; /* trim trailing path components */
5670 if (base_tree == NULL ||
5671 got_object_tree_find_entry(base_tree, child_path)
5672 == NULL) {
5673 err = make_subtree_for_added_blob(&new_te,
5674 child_path, path_base_tree,
5675 commitable_paths, status_cb, status_arg,
5676 repo);
5677 if (err)
5678 goto done;
5679 err = insert_tree_entry(new_te, &paths);
5680 if (err)
5681 goto done;
5682 (*nentries)++;
5683 }
5684 }
5685 }
5686
5687 if (base_tree) {
5688 int i, nbase_entries;
5689 /* Handle modified and deleted entries. */
5690 nbase_entries = got_object_tree_get_nentries(base_tree);
5691 for (i = 0; i < nbase_entries; i++) {
5692 struct got_commitable *ct = NULL;
5693
5694 te = got_object_tree_get_entry(base_tree, i);
5695 if (got_object_tree_entry_is_submodule(te)) {
5696 /* Entry is a submodule; just copy it. */
5697 err = got_object_tree_entry_dup(&new_te, te);
5698 if (err)
5699 goto done;
5700 err = insert_tree_entry(new_te, &paths);
5701 if (err)
5702 goto done;
5703 (*nentries)++;
5704 continue;
5705 }
5706
5707 if (S_ISDIR(te->mode)) {
5708 int modified;
5709 err = got_object_tree_entry_dup(&new_te, te);
5710 if (err)
5711 goto done;
5712 err = match_modified_subtree(&modified, te,
5713 path_base_tree, commitable_paths);
5714 if (err)
5715 goto done;
5716 /* Avoid recursion into unmodified subtrees. */
5717 if (modified) {
5718 struct got_object_id *new_id;
5719 int nsubentries;
5720 err = write_subtree(&new_id,
5721 &nsubentries, te,
5722 path_base_tree, commitable_paths,
5723 status_cb, status_arg, repo);
5724 if (err)
5725 goto done;
5726 if (nsubentries == 0) {
5727 /* All entries were deleted. */
5728 free(new_id);
5729 continue;
5730 }
5731 memcpy(&new_te->id, new_id,
5732 sizeof(new_te->id));
5733 free(new_id);
5734 }
5735 err = insert_tree_entry(new_te, &paths);
5736 if (err)
5737 goto done;
5738 (*nentries)++;
5739 continue;
5740 }
5741
5742 err = match_deleted_or_modified_ct(&ct, te,
5743 path_base_tree, commitable_paths);
5744 if (err)
5745 goto done;
5746 if (ct) {
5747 /* NB: Deleted entries get dropped here. */
5748 if (ct->status == GOT_STATUS_MODIFY ||
5749 ct->status == GOT_STATUS_MODE_CHANGE ||
5750 ct->staged_status == GOT_STATUS_MODIFY) {
5751 err = alloc_modified_blob_tree_entry(
5752 &new_te, te, ct);
5753 if (err)
5754 goto done;
5755 err = insert_tree_entry(new_te, &paths);
5756 if (err)
5757 goto done;
5758 (*nentries)++;
5759 }
5760 err = report_ct_status(ct, status_cb,
5761 status_arg);
5762 if (err)
5763 goto done;
5764 } else {
5765 /* Entry is unchanged; just copy it. */
5766 err = got_object_tree_entry_dup(&new_te, te);
5767 if (err)
5768 goto done;
5769 err = insert_tree_entry(new_te, &paths);
5770 if (err)
5771 goto done;
5772 (*nentries)++;
5773 }
5774 }
5775 }
5776
5777 /* Write new list of entries; deleted entries have been dropped. */
5778 err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
5779 done:
5780 got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
5781 return err;
5782 }
5783
5784 static const struct got_error *
5785 update_fileindex_after_commit(struct got_worktree *worktree,
5786 struct got_pathlist_head *commitable_paths,
5787 struct got_object_id *new_base_commit_id,
5788 struct got_fileindex *fileindex, int have_staged_files)
5789 {
5790 const struct got_error *err = NULL;
5791 struct got_pathlist_entry *pe;
5792 char *relpath = NULL;
5793
5794 TAILQ_FOREACH(pe, commitable_paths, entry) {
5795 struct got_fileindex_entry *ie;
5796 struct got_commitable *ct = pe->data;
5797
5798 ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5799
5800 err = got_path_skip_common_ancestor(&relpath,
5801 worktree->root_path, ct->ondisk_path);
5802 if (err)
5803 goto done;
5804
5805 if (ie) {
5806 if (ct->status == GOT_STATUS_DELETE ||
5807 ct->staged_status == GOT_STATUS_DELETE) {
5808 got_fileindex_entry_remove(fileindex, ie);
5809 } else if (ct->staged_status == GOT_STATUS_ADD ||
5810 ct->staged_status == GOT_STATUS_MODIFY) {
5811 got_fileindex_entry_stage_set(ie,
5812 GOT_FILEIDX_STAGE_NONE);
5813 got_fileindex_entry_staged_filetype_set(ie, 0);
5814
5815 err = got_fileindex_entry_update(ie,
5816 worktree->root_fd, relpath,
5817 ct->staged_blob_id->sha1,
5818 new_base_commit_id->sha1,
5819 !have_staged_files);
5820 } else
5821 err = got_fileindex_entry_update(ie,
5822 worktree->root_fd, relpath,
5823 ct->blob_id->sha1,
5824 new_base_commit_id->sha1,
5825 !have_staged_files);
5826 } else {
5827 err = got_fileindex_entry_alloc(&ie, pe->path);
5828 if (err)
5829 goto done;
5830 err = got_fileindex_entry_update(ie,
5831 worktree->root_fd, relpath, ct->blob_id->sha1,
5832 new_base_commit_id->sha1, 1);
5833 if (err) {
5834 got_fileindex_entry_free(ie);
5835 goto done;
5836 }
5837 err = got_fileindex_entry_add(fileindex, ie);
5838 if (err) {
5839 got_fileindex_entry_free(ie);
5840 goto done;
5841 }
5842 }
5843 free(relpath);
5844 relpath = NULL;
5845 }
5846 done:
5847 free(relpath);
5848 return err;
5849 }
5850
5851
5852 static const struct got_error *
5853 check_out_of_date(const char *in_repo_path, unsigned char status,
5854 unsigned char staged_status, struct got_object_id *base_blob_id,
5855 struct got_object_id *base_commit_id,
5856 struct got_object_id *head_commit_id, struct got_repository *repo,
5857 int ood_errcode)
5858 {
5859 const struct got_error *err = NULL;
5860 struct got_commit_object *commit = NULL;
5861 struct got_object_id *id = NULL;
5862
5863 if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
5864 /* Trivial case: base commit == head commit */
5865 if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
5866 return NULL;
5867 /*
5868 * Ensure file content which local changes were based
5869 * on matches file content in the branch head.
5870 */
5871 err = got_object_open_as_commit(&commit, repo, head_commit_id);
5872 if (err)
5873 goto done;
5874 err = got_object_id_by_path(&id, repo, commit, in_repo_path);
5875 if (err) {
5876 if (err->code == GOT_ERR_NO_TREE_ENTRY)
5877 err = got_error(ood_errcode);
5878 goto done;
5879 } else if (got_object_id_cmp(id, base_blob_id) != 0)
5880 err = got_error(ood_errcode);
5881 } else {
5882 /* Require that added files don't exist in the branch head. */
5883 err = got_object_open_as_commit(&commit, repo, head_commit_id);
5884 if (err)
5885 goto done;
5886 err = got_object_id_by_path(&id, repo, commit, in_repo_path);
5887 if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
5888 goto done;
5889 err = id ? got_error(ood_errcode) : NULL;
5890 }
5891 done:
5892 free(id);
5893 if (commit)
5894 got_object_commit_close(commit);
5895 return err;
5896 }
5897
5898 static const struct got_error *
5899 commit_worktree(struct got_object_id **new_commit_id,
5900 struct got_pathlist_head *commitable_paths,
5901 struct got_object_id *head_commit_id,
5902 struct got_object_id *parent_id2,
5903 struct got_worktree *worktree,
5904 const char *author, const char *committer, char *diff_path,
5905 got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5906 got_worktree_status_cb status_cb, void *status_arg,
5907 struct got_repository *repo)
5908 {
5909 const struct got_error *err = NULL, *unlockerr = NULL;
5910 struct got_pathlist_entry *pe;
5911 const char *head_ref_name = NULL;
5912 struct got_commit_object *head_commit = NULL;
5913 struct got_reference *head_ref2 = NULL;
5914 struct got_object_id *head_commit_id2 = NULL;
5915 struct got_tree_object *head_tree = NULL;
5916 struct got_object_id *new_tree_id = NULL;
5917 int nentries, nparents = 0;
5918 struct got_object_id_queue parent_ids;
5919 struct got_object_qid *pid = NULL;
5920 char *logmsg = NULL;
5921 time_t timestamp;
5922
5923 *new_commit_id = NULL;
5924
5925 STAILQ_INIT(&parent_ids);
5926
5927 err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
5928 if (err)
5929 goto done;
5930
5931 err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
5932 if (err)
5933 goto done;
5934
5935 if (commit_msg_cb != NULL) {
5936 err = commit_msg_cb(commitable_paths, diff_path,
5937 &logmsg, commit_arg);
5938 if (err)
5939 goto done;
5940 }
5941
5942 if (logmsg == NULL || strlen(logmsg) == 0) {
5943 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
5944 goto done;
5945 }
5946
5947 /* Create blobs from added and modified files and record their IDs. */
5948 TAILQ_FOREACH(pe, commitable_paths, entry) {
5949 struct got_commitable *ct = pe->data;
5950 char *ondisk_path;
5951
5952 /* Blobs for staged files already exist. */
5953 if (ct->staged_status == GOT_STATUS_ADD ||
5954 ct->staged_status == GOT_STATUS_MODIFY)
5955 continue;
5956
5957 if (ct->status != GOT_STATUS_ADD &&
5958 ct->status != GOT_STATUS_MODIFY &&
5959 ct->status != GOT_STATUS_MODE_CHANGE)
5960 continue;
5961
5962 if (asprintf(&ondisk_path, "%s/%s",
5963 worktree->root_path, pe->path) == -1) {
5964 err = got_error_from_errno("asprintf");
5965 goto done;
5966 }
5967 err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
5968 free(ondisk_path);
5969 if (err)
5970 goto done;
5971 }
5972
5973 /* Recursively write new tree objects. */
5974 err = write_tree(&new_tree_id, &nentries, head_tree, "/",
5975 commitable_paths, status_cb, status_arg, repo);
5976 if (err)
5977 goto done;
5978
5979 err = got_object_qid_alloc(&pid, worktree->base_commit_id);
5980 if (err)
5981 goto done;
5982 STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5983 nparents++;
5984 if (parent_id2) {
5985 err = got_object_qid_alloc(&pid, parent_id2);
5986 if (err)
5987 goto done;
5988 STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5989 nparents++;
5990 }
5991 timestamp = time(NULL);
5992 err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
5993 nparents, author, timestamp, committer, timestamp, logmsg, repo);
5994 if (logmsg != NULL)
5995 free(logmsg);
5996 if (err)
5997 goto done;
5998
5999 /* Check if a concurrent commit to our branch has occurred. */
6000 head_ref_name = got_worktree_get_head_ref_name(worktree);
6001 if (head_ref_name == NULL) {
6002 err = got_error_from_errno("got_worktree_get_head_ref_name");
6003 goto done;
6004 }
6005 /* Lock the reference here to prevent concurrent modification. */
6006 err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
6007 if (err)
6008 goto done;
6009 err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
6010 if (err)
6011 goto done;
6012 if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
6013 err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
6014 goto done;
6015 }
6016 /* Update branch head in repository. */
6017 err = got_ref_change_ref(head_ref2, *new_commit_id);
6018 if (err)
6019 goto done;
6020 err = got_ref_write(head_ref2, repo);
6021 if (err)
6022 goto done;
6023
6024 err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
6025 if (err)
6026 goto done;
6027
6028 err = ref_base_commit(worktree, repo);
6029 if (err)
6030 goto done;
6031 done:
6032 got_object_id_queue_free(&parent_ids);
6033 if (head_tree)
6034 got_object_tree_close(head_tree);
6035 if (head_commit)
6036 got_object_commit_close(head_commit);
6037 free(head_commit_id2);
6038 if (head_ref2) {
6039 unlockerr = got_ref_unlock(head_ref2);
6040 if (unlockerr && err == NULL)
6041 err = unlockerr;
6042 got_ref_close(head_ref2);
6043 }
6044 return err;
6045 }
6046
6047 static const struct got_error *
6048 check_path_is_commitable(const char *path,
6049 struct got_pathlist_head *commitable_paths)
6050 {
6051 struct got_pathlist_entry *cpe = NULL;
6052 size_t path_len = strlen(path);
6053
6054 TAILQ_FOREACH(cpe, commitable_paths, entry) {
6055 struct got_commitable *ct = cpe->data;
6056 const char *ct_path = ct->path;
6057
6058 while (ct_path[0] == '/')
6059 ct_path++;
6060
6061 if (strcmp(path, ct_path) == 0 ||
6062 got_path_is_child(ct_path, path, path_len))
6063 break;
6064 }
6065
6066 if (cpe == NULL)
6067 return got_error_path(path, GOT_ERR_BAD_PATH);
6068
6069 return NULL;
6070 }
6071
6072 static const struct got_error *
6073 check_staged_file(void *arg, struct got_fileindex_entry *ie)
6074 {
6075 int *have_staged_files = arg;
6076
6077 if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
6078 *have_staged_files = 1;
6079 return got_error(GOT_ERR_CANCELLED);
6080 }
6081
6082 return NULL;
6083 }
6084
6085 static const struct got_error *
6086 check_non_staged_files(struct got_fileindex *fileindex,
6087 struct got_pathlist_head *paths)
6088 {
6089 struct got_pathlist_entry *pe;
6090 struct got_fileindex_entry *ie;
6091
6092 TAILQ_FOREACH(pe, paths, entry) {
6093 if (pe->path[0] == '\0')
6094 continue;
6095 ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
6096 if (ie == NULL)
6097 return got_error_path(pe->path, GOT_ERR_BAD_PATH);
6098 if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
6099 return got_error_path(pe->path,
6100 GOT_ERR_FILE_NOT_STAGED);
6101 }
6102
6103 return NULL;
6104 }
6105
6106 const struct got_error *
6107 got_worktree_commit(struct got_object_id **new_commit_id,
6108 struct got_worktree *worktree, struct got_pathlist_head *paths,
6109 const char *author, const char *committer, int allow_bad_symlinks,
6110 int show_diff, got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
6111 got_worktree_status_cb status_cb, void *status_arg,
6112 struct got_repository *repo)
6113 {
6114 const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
6115 struct got_fileindex *fileindex = NULL;
6116 char *fileindex_path = NULL;
6117 struct got_pathlist_head commitable_paths;
6118 struct collect_commitables_arg cc_arg;
6119 struct got_pathlist_entry *pe;
6120 struct got_reference *head_ref = NULL;
6121 struct got_object_id *head_commit_id = NULL;
6122 char *diff_path = NULL;
6123 int have_staged_files = 0;
6124
6125 *new_commit_id = NULL;
6126
6127 memset(&cc_arg, 0, sizeof(cc_arg));
6128 TAILQ_INIT(&commitable_paths);
6129
6130 err = lock_worktree(worktree, LOCK_EX);
6131 if (err)
6132 goto done;
6133
6134 err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6135 if (err)
6136 goto done;
6137
6138 err = got_ref_resolve(&head_commit_id, repo, head_ref);
6139 if (err)
6140 goto done;
6141
6142 err = open_fileindex(&fileindex, &fileindex_path, worktree);
6143 if (err)
6144 goto done;
6145
6146 err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
6147 &have_staged_files);
6148 if (err && err->code != GOT_ERR_CANCELLED)
6149 goto done;
6150 if (have_staged_files) {
6151 err = check_non_staged_files(fileindex, paths);
6152 if (err)
6153 goto done;
6154 }
6155
6156 cc_arg.commitable_paths = &commitable_paths;
6157 cc_arg.worktree = worktree;
6158 cc_arg.fileindex = fileindex;
6159 cc_arg.repo = repo;
6160 cc_arg.have_staged_files = have_staged_files;
6161 cc_arg.allow_bad_symlinks = allow_bad_symlinks;
6162 cc_arg.diff_header_shown = 0;
6163 if (show_diff) {
6164 err = got_opentemp_named(&diff_path, &cc_arg.diff_outfile,
6165 GOT_TMPDIR_STR "/got", ".diff");
6166 if (err)
6167 goto done;
6168 cc_arg.f1 = got_opentemp();
6169 if (cc_arg.f1 == NULL) {
6170 err = got_error_from_errno("got_opentemp");
6171 goto done;
6172 }
6173 cc_arg.f2 = got_opentemp();
6174 if (cc_arg.f2 == NULL) {
6175 err = got_error_from_errno("got_opentemp");
6176 goto done;
6177 }
6178 }
6179
6180 TAILQ_FOREACH(pe, paths, entry) {
6181 err = worktree_status(worktree, pe->path, fileindex, repo,
6182 collect_commitables, &cc_arg, NULL, NULL, 0, 0);
6183 if (err)
6184 goto done;
6185 }
6186
6187 if (show_diff) {
6188 if (fflush(cc_arg.diff_outfile) == EOF) {
6189 err = got_error_from_errno("fflush");
6190 goto done;
6191 }
6192 }
6193
6194 if (TAILQ_EMPTY(&commitable_paths)) {
6195 err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6196 goto done;
6197 }
6198
6199 TAILQ_FOREACH(pe, paths, entry) {
6200 err = check_path_is_commitable(pe->path, &commitable_paths);
6201 if (err)
6202 goto done;
6203 }
6204
6205 TAILQ_FOREACH(pe, &commitable_paths, entry) {
6206 struct got_commitable *ct = pe->data;
6207 const char *ct_path = ct->in_repo_path;
6208
6209 while (ct_path[0] == '/')
6210 ct_path++;
6211 err = check_out_of_date(ct_path, ct->status,
6212 ct->staged_status, ct->base_blob_id, ct->base_commit_id,
6213 head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
6214 if (err)
6215 goto done;
6216
6217 }
6218
6219 err = commit_worktree(new_commit_id, &commitable_paths,
6220 head_commit_id, NULL, worktree, author, committer,
6221 (diff_path && cc_arg.diff_header_shown) ? diff_path : NULL,
6222 commit_msg_cb, commit_arg, status_cb, status_arg, repo);
6223 if (err)
6224 goto done;
6225
6226 err = update_fileindex_after_commit(worktree, &commitable_paths,
6227 *new_commit_id, fileindex, have_staged_files);
6228 sync_err = sync_fileindex(fileindex, fileindex_path);
6229 if (sync_err && err == NULL)
6230 err = sync_err;
6231 done:
6232 if (fileindex)
6233 got_fileindex_free(fileindex);
6234 free(fileindex_path);
6235 unlockerr = lock_worktree(worktree, LOCK_SH);
6236 if (unlockerr && err == NULL)
6237 err = unlockerr;
6238 TAILQ_FOREACH(pe, &commitable_paths, entry) {
6239 struct got_commitable *ct = pe->data;
6240
6241 free_commitable(ct);
6242 }
6243 got_pathlist_free(&commitable_paths, GOT_PATHLIST_FREE_NONE);
6244 if (diff_path && unlink(diff_path) == -1 && err == NULL)
6245 err = got_error_from_errno2("unlink", diff_path);
6246 free(diff_path);
6247 if (cc_arg.diff_outfile && fclose(cc_arg.diff_outfile) == EOF &&
6248 err == NULL)
6249 err = got_error_from_errno("fclose");
6250 return err;
6251 }
6252
6253 const char *
6254 got_commitable_get_path(struct got_commitable *ct)
6255 {
6256 return ct->path;
6257 }
6258
6259 unsigned int
6260 got_commitable_get_status(struct got_commitable *ct)
6261 {
6262 return ct->status;
6263 }
6264
6265 struct check_rebase_ok_arg {
6266 struct got_worktree *worktree;
6267 struct got_repository *repo;
6268 };
6269
6270 static const struct got_error *
6271 check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
6272 {
6273 const struct got_error *err = NULL;
6274 struct check_rebase_ok_arg *a = arg;
6275 unsigned char status;
6276 struct stat sb;
6277 char *ondisk_path;
6278
6279 /* Reject rebase of a work tree with mixed base commits. */
6280 if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
6281 SHA1_DIGEST_LENGTH))
6282 return got_error(GOT_ERR_MIXED_COMMITS);
6283
6284 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
6285 == -1)
6286 return got_error_from_errno("asprintf");
6287
6288 /* Reject rebase of a work tree with modified or staged files. */
6289 err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
6290 free(ondisk_path);
6291 if (err)
6292 return err;
6293
6294 if (status != GOT_STATUS_NO_CHANGE)
6295 return got_error(GOT_ERR_MODIFIED);
6296 if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
6297 return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
6298
6299 return NULL;
6300 }
6301
6302 const struct got_error *
6303 got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
6304 struct got_reference **tmp_branch, struct got_fileindex **fileindex,
6305 struct got_worktree *worktree, struct got_reference *branch,
6306 struct got_repository *repo)
6307 {
6308 const struct got_error *err = NULL;
6309 char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6310 char *branch_ref_name = NULL;
6311 char *fileindex_path = NULL;
6312 struct check_rebase_ok_arg ok_arg;
6313 struct got_reference *wt_branch = NULL, *branch_ref = NULL;
6314 struct got_object_id *wt_branch_tip = NULL;
6315
6316 *new_base_branch_ref = NULL;
6317 *tmp_branch = NULL;
6318 *fileindex = NULL;
6319
6320 err = lock_worktree(worktree, LOCK_EX);
6321 if (err)
6322 return err;
6323
6324 err = open_fileindex(fileindex, &fileindex_path, worktree);
6325 if (err)
6326 goto done;
6327
6328 ok_arg.worktree = worktree;
6329 ok_arg.repo = repo;
6330 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6331 &ok_arg);
6332 if (err)
6333 goto done;
6334
6335 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6336 if (err)
6337 goto done;
6338
6339 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6340 if (err)
6341 goto done;
6342
6343 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6344 if (err)
6345 goto done;
6346
6347 err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6348 0);
6349 if (err)
6350 goto done;
6351
6352 err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
6353 if (err)
6354 goto done;
6355 if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
6356 err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
6357 goto done;
6358 }
6359
6360 err = got_ref_alloc_symref(new_base_branch_ref,
6361 new_base_branch_ref_name, wt_branch);
6362 if (err)
6363 goto done;
6364 err = got_ref_write(*new_base_branch_ref, repo);
6365 if (err)
6366 goto done;
6367
6368 /* TODO Lock original branch's ref while rebasing? */
6369
6370 err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
6371 if (err)
6372 goto done;
6373
6374 err = got_ref_write(branch_ref, repo);
6375 if (err)
6376 goto done;
6377
6378 err = got_ref_alloc(tmp_branch, tmp_branch_name,
6379 worktree->base_commit_id);
6380 if (err)
6381 goto done;
6382 err = got_ref_write(*tmp_branch, repo);
6383 if (err)
6384 goto done;
6385
6386 err = got_worktree_set_head_ref(worktree, *tmp_branch);
6387 if (err)
6388 goto done;
6389 done:
6390 free(fileindex_path);
6391 free(tmp_branch_name);
6392 free(new_base_branch_ref_name);
6393 free(branch_ref_name);
6394 if (branch_ref)
6395 got_ref_close(branch_ref);
6396 if (wt_branch)
6397 got_ref_close(wt_branch);
6398 free(wt_branch_tip);
6399 if (err) {
6400 if (*new_base_branch_ref) {
6401 got_ref_close(*new_base_branch_ref);
6402 *new_base_branch_ref = NULL;
6403 }
6404 if (*tmp_branch) {
6405 got_ref_close(*tmp_branch);
6406 *tmp_branch = NULL;
6407 }
6408 if (*fileindex) {
6409 got_fileindex_free(*fileindex);
6410 *fileindex = NULL;
6411 }
6412 lock_worktree(worktree, LOCK_SH);
6413 }
6414 return err;
6415 }
6416
6417 const struct got_error *
6418 got_worktree_rebase_continue(struct got_object_id **commit_id,
6419 struct got_reference **new_base_branch, struct got_reference **tmp_branch,
6420 struct got_reference **branch, struct got_fileindex **fileindex,
6421 struct got_worktree *worktree, struct got_repository *repo)
6422 {
6423 const struct got_error *err;
6424 char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
6425 char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6426 struct got_reference *commit_ref = NULL, *branch_ref = NULL;
6427 char *fileindex_path = NULL;
6428 int have_staged_files = 0;
6429
6430 *commit_id = NULL;
6431 *new_base_branch = NULL;
6432 *tmp_branch = NULL;
6433 *branch = NULL;
6434 *fileindex = NULL;
6435
6436 err = lock_worktree(worktree, LOCK_EX);
6437 if (err)
6438 return err;
6439
6440 err = open_fileindex(fileindex, &fileindex_path, worktree);
6441 if (err)
6442 goto done;
6443
6444 err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6445 &have_staged_files);
6446 if (err && err->code != GOT_ERR_CANCELLED)
6447 goto done;
6448 if (have_staged_files) {
6449 err = got_error(GOT_ERR_STAGED_PATHS);
6450 goto done;
6451 }
6452
6453 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6454 if (err)
6455 goto done;
6456
6457 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6458 if (err)
6459 goto done;
6460
6461 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6462 if (err)
6463 goto done;
6464
6465 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6466 if (err)
6467 goto done;
6468
6469 err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
6470 if (err)
6471 goto done;
6472
6473 err = got_ref_open(branch, repo,
6474 got_ref_get_symref_target(branch_ref), 0);
6475 if (err)
6476 goto done;
6477
6478 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6479 if (err)
6480 goto done;
6481
6482 err = got_ref_resolve(commit_id, repo, commit_ref);
6483 if (err)
6484 goto done;
6485
6486 err = got_ref_open(new_base_branch, repo,
6487 new_base_branch_ref_name, 0);
6488 if (err)
6489 goto done;
6490
6491 err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6492 if (err)
6493 goto done;
6494 done:
6495 free(commit_ref_name);
6496 free(branch_ref_name);
6497 free(fileindex_path);
6498 if (commit_ref)
6499 got_ref_close(commit_ref);
6500 if (branch_ref)
6501 got_ref_close(branch_ref);
6502 if (err) {
6503 free(*commit_id);
6504 *commit_id = NULL;
6505 if (*tmp_branch) {
6506 got_ref_close(*tmp_branch);
6507 *tmp_branch = NULL;
6508 }
6509 if (*new_base_branch) {
6510 got_ref_close(*new_base_branch);
6511 *new_base_branch = NULL;
6512 }
6513 if (*branch) {
6514 got_ref_close(*branch);
6515 *branch = NULL;
6516 }
6517 if (*fileindex) {
6518 got_fileindex_free(*fileindex);
6519 *fileindex = NULL;
6520 }
6521 lock_worktree(worktree, LOCK_SH);
6522 }
6523 return err;
6524 }
6525
6526 const struct got_error *
6527 got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
6528 {
6529 const struct got_error *err;
6530 char *tmp_branch_name = NULL;
6531
6532 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6533 if (err)
6534 return err;
6535
6536 *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6537 free(tmp_branch_name);
6538 return NULL;
6539 }
6540
6541 static const struct got_error *
6542 collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
6543 const char *diff_path, char **logmsg, void *arg)
6544 {
6545 *logmsg = arg;
6546 return NULL;
6547 }
6548
6549 static const struct got_error *
6550 rebase_status(void *arg, unsigned char status, unsigned char staged_status,
6551 const char *path, struct got_object_id *blob_id,
6552 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6553 int dirfd, const char *de_name)
6554 {
6555 return NULL;
6556 }
6557
6558 struct collect_merged_paths_arg {
6559 got_worktree_checkout_cb progress_cb;
6560 void *progress_arg;
6561 struct got_pathlist_head *merged_paths;
6562 };
6563
6564 static const struct got_error *
6565 collect_merged_paths(void *arg, unsigned char status, const char *path)
6566 {
6567 const struct got_error *err;
6568 struct collect_merged_paths_arg *a = arg;
6569 char *p;
6570 struct got_pathlist_entry *new;
6571
6572 err = (*a->progress_cb)(a->progress_arg, status, path);
6573 if (err)
6574 return err;
6575
6576 if (status != GOT_STATUS_MERGE &&
6577 status != GOT_STATUS_ADD &&
6578 status != GOT_STATUS_DELETE &&
6579 status != GOT_STATUS_CONFLICT)
6580 return NULL;
6581
6582 p = strdup(path);
6583 if (p == NULL)
6584 return got_error_from_errno("strdup");
6585
6586 err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
6587 if (err || new == NULL)
6588 free(p);
6589 return err;
6590 }
6591
6592 static const struct got_error *
6593 store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
6594 int is_rebase, struct got_repository *repo)
6595 {
6596 const struct got_error *err;
6597 struct got_reference *commit_ref = NULL;
6598
6599 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6600 if (err) {
6601 if (err->code != GOT_ERR_NOT_REF)
6602 goto done;
6603 err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
6604 if (err)
6605 goto done;
6606 err = got_ref_write(commit_ref, repo);
6607 if (err)
6608 goto done;
6609 } else if (is_rebase) {
6610 struct got_object_id *stored_id;
6611 int cmp;
6612
6613 err = got_ref_resolve(&stored_id, repo, commit_ref);
6614 if (err)
6615 goto done;
6616 cmp = got_object_id_cmp(commit_id, stored_id);
6617 free(stored_id);
6618 if (cmp != 0) {
6619 err = got_error(GOT_ERR_REBASE_COMMITID);
6620 goto done;
6621 }
6622 }
6623 done:
6624 if (commit_ref)
6625 got_ref_close(commit_ref);
6626 return err;
6627 }
6628
6629 static const struct got_error *
6630 rebase_merge_files(struct got_pathlist_head *merged_paths,
6631 const char *commit_ref_name, struct got_worktree *worktree,
6632 struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
6633 struct got_object_id *commit_id, struct got_repository *repo,
6634 got_worktree_checkout_cb progress_cb, void *progress_arg,
6635 got_cancel_cb cancel_cb, void *cancel_arg)
6636 {
6637 const struct got_error *err;
6638 struct got_reference *commit_ref = NULL;
6639 struct collect_merged_paths_arg cmp_arg;
6640 char *fileindex_path;
6641
6642 /* Work tree is locked/unlocked during rebase preparation/teardown. */
6643
6644 err = get_fileindex_path(&fileindex_path, worktree);
6645 if (err)
6646 return err;
6647
6648 cmp_arg.progress_cb = progress_cb;
6649 cmp_arg.progress_arg = progress_arg;
6650 cmp_arg.merged_paths = merged_paths;
6651 err = merge_files(worktree, fileindex, fileindex_path,
6652 parent_commit_id, commit_id, repo, collect_merged_paths,
6653 &cmp_arg, cancel_cb, cancel_arg);
6654 if (commit_ref)
6655 got_ref_close(commit_ref);
6656 return err;
6657 }
6658
6659 const struct got_error *
6660 got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
6661 struct got_worktree *worktree, struct got_fileindex *fileindex,
6662 struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6663 struct got_repository *repo,
6664 got_worktree_checkout_cb progress_cb, void *progress_arg,
6665 got_cancel_cb cancel_cb, void *cancel_arg)
6666 {
6667 const struct got_error *err;
6668 char *commit_ref_name;
6669
6670 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6671 if (err)
6672 return err;
6673
6674 err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6675 if (err)
6676 goto done;
6677
6678 err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6679 fileindex, parent_commit_id, commit_id, repo, progress_cb,
6680 progress_arg, cancel_cb, cancel_arg);
6681 done:
6682 free(commit_ref_name);
6683 return err;
6684 }
6685
6686 const struct got_error *
6687 got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
6688 struct got_worktree *worktree, struct got_fileindex *fileindex,
6689 struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6690 struct got_repository *repo,
6691 got_worktree_checkout_cb progress_cb, void *progress_arg,
6692 got_cancel_cb cancel_cb, void *cancel_arg)
6693 {
6694 const struct got_error *err;
6695 char *commit_ref_name;
6696
6697 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6698 if (err)
6699 return err;
6700
6701 err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6702 if (err)
6703 goto done;
6704
6705 err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6706 fileindex, parent_commit_id, commit_id, repo, progress_cb,
6707 progress_arg, cancel_cb, cancel_arg);
6708 done:
6709 free(commit_ref_name);
6710 return err;
6711 }
6712
6713 static const struct got_error *
6714 rebase_commit(struct got_object_id **new_commit_id,
6715 struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
6716 struct got_worktree *worktree, struct got_fileindex *fileindex,
6717 struct got_reference *tmp_branch, const char *committer,
6718 struct got_commit_object *orig_commit, const char *new_logmsg,
6719 struct got_repository *repo)
6720 {
6721 const struct got_error *err, *sync_err;
6722 struct got_pathlist_head commitable_paths;
6723 struct collect_commitables_arg cc_arg;
6724 char *fileindex_path = NULL;
6725 struct got_reference *head_ref = NULL;
6726 struct got_object_id *head_commit_id = NULL;
6727 char *logmsg = NULL;
6728
6729 memset(&cc_arg, 0, sizeof(cc_arg));
6730 TAILQ_INIT(&commitable_paths);
6731 *new_commit_id = NULL;
6732
6733 /* Work tree is locked/unlocked during rebase preparation/teardown. */
6734
6735 err = get_fileindex_path(&fileindex_path, worktree);
6736 if (err)
6737 return err;
6738
6739 cc_arg.commitable_paths = &commitable_paths;
6740 cc_arg.worktree = worktree;
6741 cc_arg.repo = repo;
6742 cc_arg.have_staged_files = 0;
6743 /*
6744 * If possible get the status of individual files directly to
6745 * avoid crawling the entire work tree once per rebased commit.
6746 *
6747 * Ideally, merged_paths would contain a list of commitables
6748 * we could use so we could skip worktree_status() entirely.
6749 * However, we would then need carefully keep track of cumulative
6750 * effects of operations such as file additions and deletions
6751 * in 'got histedit -f' (folding multiple commits into one),
6752 * and this extra complexity is not really worth it.
6753 */
6754 if (merged_paths) {
6755 struct got_pathlist_entry *pe;
6756 TAILQ_FOREACH(pe, merged_paths, entry) {
6757 err = worktree_status(worktree, pe->path, fileindex,
6758 repo, collect_commitables, &cc_arg, NULL, NULL, 1,
6759 0);
6760 if (err)
6761 goto done;
6762 }
6763 } else {
6764 err = worktree_status(worktree, "", fileindex, repo,
6765 collect_commitables, &cc_arg, NULL, NULL, 1, 0);
6766 if (err)
6767 goto done;
6768 }
6769
6770 if (TAILQ_EMPTY(&commitable_paths)) {
6771 /* No-op change; commit will be elided. */
6772 err = got_ref_delete(commit_ref, repo);
6773 if (err)
6774 goto done;
6775 err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6776 goto done;
6777 }
6778
6779 err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6780 if (err)
6781 goto done;
6782
6783 err = got_ref_resolve(&head_commit_id, repo, head_ref);
6784 if (err)
6785 goto done;
6786
6787 if (new_logmsg) {
6788 logmsg = strdup(new_logmsg);
6789 if (logmsg == NULL) {
6790 err = got_error_from_errno("strdup");
6791 goto done;
6792 }
6793 } else {
6794 err = got_object_commit_get_logmsg(&logmsg, orig_commit);
6795 if (err)
6796 goto done;
6797 }
6798
6799 /* NB: commit_worktree will call free(logmsg) */
6800 err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
6801 NULL, worktree, got_object_commit_get_author(orig_commit),
6802 committer ? committer :
6803 got_object_commit_get_committer(orig_commit), NULL,
6804 collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
6805 if (err)
6806 goto done;
6807
6808 err = got_ref_change_ref(tmp_branch, *new_commit_id);
6809 if (err)
6810 goto done;
6811
6812 err = got_ref_delete(commit_ref, repo);
6813 if (err)
6814 goto done;
6815
6816 err = update_fileindex_after_commit(worktree, &commitable_paths,
6817 *new_commit_id, fileindex, 0);
6818 sync_err = sync_fileindex(fileindex, fileindex_path);
6819 if (sync_err && err == NULL)
6820 err = sync_err;
6821 done:
6822 free(fileindex_path);
6823 free(head_commit_id);
6824 if (head_ref)
6825 got_ref_close(head_ref);
6826 if (err) {
6827 free(*new_commit_id);
6828 *new_commit_id = NULL;
6829 }
6830 return err;
6831 }
6832
6833 const struct got_error *
6834 got_worktree_rebase_commit(struct got_object_id **new_commit_id,
6835 struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6836 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6837 const char *committer, struct got_commit_object *orig_commit,
6838 struct got_object_id *orig_commit_id, struct got_repository *repo)
6839 {
6840 const struct got_error *err;
6841 char *commit_ref_name;
6842 struct got_reference *commit_ref = NULL;
6843 struct got_object_id *commit_id = NULL;
6844
6845 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6846 if (err)
6847 return err;
6848
6849 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6850 if (err)
6851 goto done;
6852 err = got_ref_resolve(&commit_id, repo, commit_ref);
6853 if (err)
6854 goto done;
6855 if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
6856 err = got_error(GOT_ERR_REBASE_COMMITID);
6857 goto done;
6858 }
6859
6860 err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6861 worktree, fileindex, tmp_branch, committer, orig_commit,
6862 NULL, repo);
6863 done:
6864 if (commit_ref)
6865 got_ref_close(commit_ref);
6866 free(commit_ref_name);
6867 free(commit_id);
6868 return err;
6869 }
6870
6871 const struct got_error *
6872 got_worktree_histedit_commit(struct got_object_id **new_commit_id,
6873 struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6874 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6875 const char *committer, struct got_commit_object *orig_commit,
6876 struct got_object_id *orig_commit_id, const char *new_logmsg,
6877 struct got_repository *repo)
6878 {
6879 const struct got_error *err;
6880 char *commit_ref_name;
6881 struct got_reference *commit_ref = NULL;
6882
6883 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6884 if (err)
6885 return err;
6886
6887 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6888 if (err)
6889 goto done;
6890
6891 err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6892 worktree, fileindex, tmp_branch, committer, orig_commit,
6893 new_logmsg, repo);
6894 done:
6895 if (commit_ref)
6896 got_ref_close(commit_ref);
6897 free(commit_ref_name);
6898 return err;
6899 }
6900
6901 const struct got_error *
6902 got_worktree_rebase_postpone(struct got_worktree *worktree,
6903 struct got_fileindex *fileindex)
6904 {
6905 if (fileindex)
6906 got_fileindex_free(fileindex);
6907 return lock_worktree(worktree, LOCK_SH);
6908 }
6909
6910 static const struct got_error *
6911 delete_ref(const char *name, struct got_repository *repo)
6912 {
6913 const struct got_error *err;
6914 struct got_reference *ref;
6915
6916 err = got_ref_open(&ref, repo, name, 0);
6917 if (err) {
6918 if (err->code == GOT_ERR_NOT_REF)
6919 return NULL;
6920 return err;
6921 }
6922
6923 err = got_ref_delete(ref, repo);
6924 got_ref_close(ref);
6925 return err;
6926 }
6927
6928 static const struct got_error *
6929 delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
6930 {
6931 const struct got_error *err;
6932 char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6933 char *branch_ref_name = NULL, *commit_ref_name = NULL;
6934
6935 err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6936 if (err)
6937 goto done;
6938 err = delete_ref(tmp_branch_name, repo);
6939 if (err)
6940 goto done;
6941
6942 err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6943 if (err)
6944 goto done;
6945 err = delete_ref(new_base_branch_ref_name, repo);
6946 if (err)
6947 goto done;
6948
6949 err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6950 if (err)
6951 goto done;
6952 err = delete_ref(branch_ref_name, repo);
6953 if (err)
6954 goto done;
6955
6956 err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6957 if (err)
6958 goto done;
6959 err = delete_ref(commit_ref_name, repo);
6960 if (err)
6961 goto done;
6962
6963 done:
6964 free(tmp_branch_name);
6965 free(new_base_branch_ref_name);
6966 free(branch_ref_name);
6967 free(commit_ref_name);
6968 return err;
6969 }
6970
6971 static const struct got_error *
6972 create_backup_ref(const char *backup_ref_prefix, struct got_reference *branch,
6973 struct got_object_id *new_commit_id, struct got_repository *repo)
6974 {
6975 const struct got_error *err;
6976 struct got_reference *ref = NULL;
6977 struct got_object_id *old_commit_id = NULL;
6978 const char *branch_name = NULL;
6979 char *new_id_str = NULL;
6980 char *refname = NULL;
6981
6982 branch_name = got_ref_get_name(branch);
6983 if (strncmp(branch_name, "refs/heads/", 11) != 0)
6984 return got_error(GOT_ERR_BAD_REF_NAME); /* should not happen */
6985 branch_name += 11;
6986
6987 err = got_object_id_str(&new_id_str, new_commit_id);
6988 if (err)
6989 return err;
6990
6991 if (asprintf(&refname, "%s/%s/%s", backup_ref_prefix, branch_name,
6992 new_id_str) == -1) {
6993 err = got_error_from_errno("asprintf");
6994 goto done;
6995 }
6996
6997 err = got_ref_resolve(&old_commit_id, repo, branch);
6998 if (err)
6999 goto done;
7000
7001 err = got_ref_alloc(&ref, refname, old_commit_id);
7002 if (err)
7003 goto done;
7004
7005 err = got_ref_write(ref, repo);
7006 done:
7007 free(new_id_str);
7008 free(refname);
7009 free(old_commit_id);
7010 if (ref)
7011 got_ref_close(ref);
7012 return err;
7013 }
7014
7015 const struct got_error *
7016 got_worktree_rebase_complete(struct got_worktree *worktree,
7017 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7018 struct got_reference *rebased_branch, struct got_repository *repo,
7019 int create_backup)
7020 {
7021 const struct got_error *err, *unlockerr, *sync_err;
7022 struct got_object_id *new_head_commit_id = NULL;
7023 char *fileindex_path = NULL;
7024
7025 err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7026 if (err)
7027 return err;
7028
7029 if (create_backup) {
7030 err = create_backup_ref(GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
7031 rebased_branch, new_head_commit_id, repo);
7032 if (err)
7033 goto done;
7034 }
7035
7036 err = got_ref_change_ref(rebased_branch, new_head_commit_id);
7037 if (err)
7038 goto done;
7039
7040 err = got_ref_write(rebased_branch, repo);
7041 if (err)
7042 goto done;
7043
7044 err = got_worktree_set_head_ref(worktree, rebased_branch);
7045 if (err)
7046 goto done;
7047
7048 err = delete_rebase_refs(worktree, repo);
7049 if (err)
7050 goto done;
7051
7052 err = get_fileindex_path(&fileindex_path, worktree);
7053 if (err)
7054 goto done;
7055 err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7056 sync_err = sync_fileindex(fileindex, fileindex_path);
7057 if (sync_err && err == NULL)
7058 err = sync_err;
7059 done:
7060 got_fileindex_free(fileindex);
7061 free(fileindex_path);
7062 free(new_head_commit_id);
7063 unlockerr = lock_worktree(worktree, LOCK_SH);
7064 if (unlockerr && err == NULL)
7065 err = unlockerr;
7066 return err;
7067 }
7068
7069 const struct got_error *
7070 got_worktree_rebase_abort(struct got_worktree *worktree,
7071 struct got_fileindex *fileindex, struct got_repository *repo,
7072 struct got_reference *new_base_branch,
7073 got_worktree_checkout_cb progress_cb, void *progress_arg)
7074 {
7075 const struct got_error *err, *unlockerr, *sync_err;
7076 struct got_reference *resolved = NULL;
7077 struct got_object_id *commit_id = NULL;
7078 struct got_commit_object *commit = NULL;
7079 char *fileindex_path = NULL;
7080 struct revert_file_args rfa;
7081 struct got_object_id *tree_id = NULL;
7082
7083 err = lock_worktree(worktree, LOCK_EX);
7084 if (err)
7085 return err;
7086
7087 err = got_object_open_as_commit(&commit, repo,
7088 worktree->base_commit_id);
7089 if (err)
7090 goto done;
7091
7092 err = got_ref_open(&resolved, repo,
7093 got_ref_get_symref_target(new_base_branch), 0);
7094 if (err)
7095 goto done;
7096
7097 err = got_worktree_set_head_ref(worktree, resolved);
7098 if (err)
7099 goto done;
7100
7101 /*
7102 * XXX commits to the base branch could have happened while
7103 * we were busy rebasing; should we store the original commit ID
7104 * when rebase begins and read it back here?
7105 */
7106 err = got_ref_resolve(&commit_id, repo, resolved);
7107 if (err)
7108 goto done;
7109
7110 err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7111 if (err)
7112 goto done;
7113
7114 err = got_object_id_by_path(&tree_id, repo, commit,
7115 worktree->path_prefix);
7116 if (err)
7117 goto done;
7118
7119 err = delete_rebase_refs(worktree, repo);
7120 if (err)
7121 goto done;
7122
7123 err = get_fileindex_path(&fileindex_path, worktree);
7124 if (err)
7125 goto done;
7126
7127 rfa.worktree = worktree;
7128 rfa.fileindex = fileindex;
7129 rfa.progress_cb = progress_cb;
7130 rfa.progress_arg = progress_arg;
7131 rfa.patch_cb = NULL;
7132 rfa.patch_arg = NULL;
7133 rfa.repo = repo;
7134 rfa.unlink_added_files = 0;
7135 err = worktree_status(worktree, "", fileindex, repo,
7136 revert_file, &rfa, NULL, NULL, 1, 0);
7137 if (err)
7138 goto sync;
7139
7140 err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7141 repo, progress_cb, progress_arg, NULL, NULL);
7142 sync:
7143 sync_err = sync_fileindex(fileindex, fileindex_path);
7144 if (sync_err && err == NULL)
7145 err = sync_err;
7146 done:
7147 got_ref_close(resolved);
7148 free(tree_id);
7149 free(commit_id);
7150 if (commit)
7151 got_object_commit_close(commit);
7152 if (fileindex)
7153 got_fileindex_free(fileindex);
7154 free(fileindex_path);
7155
7156 unlockerr = lock_worktree(worktree, LOCK_SH);
7157 if (unlockerr && err == NULL)
7158 err = unlockerr;
7159 return err;
7160 }
7161
7162 const struct got_error *
7163 got_worktree_histedit_prepare(struct got_reference **tmp_branch,
7164 struct got_reference **branch_ref, struct got_object_id **base_commit_id,
7165 struct got_fileindex **fileindex, struct got_worktree *worktree,
7166 struct got_repository *repo)
7167 {
7168 const struct got_error *err = NULL;
7169 char *tmp_branch_name = NULL;
7170 char *branch_ref_name = NULL;
7171 char *base_commit_ref_name = NULL;
7172 char *fileindex_path = NULL;
7173 struct check_rebase_ok_arg ok_arg;
7174 struct got_reference *wt_branch = NULL;
7175 struct got_reference *base_commit_ref = NULL;
7176
7177 *tmp_branch = NULL;
7178 *branch_ref = NULL;
7179 *base_commit_id = NULL;
7180 *fileindex = NULL;
7181
7182 err = lock_worktree(worktree, LOCK_EX);
7183 if (err)
7184 return err;
7185
7186 err = open_fileindex(fileindex, &fileindex_path, worktree);
7187 if (err)
7188 goto done;
7189
7190 ok_arg.worktree = worktree;
7191 ok_arg.repo = repo;
7192 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7193 &ok_arg);
7194 if (err)
7195 goto done;
7196
7197 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7198 if (err)
7199 goto done;
7200
7201 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7202 if (err)
7203 goto done;
7204
7205 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7206 worktree);
7207 if (err)
7208 goto done;
7209
7210 err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
7211 0);
7212 if (err)
7213 goto done;
7214
7215 err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
7216 if (err)
7217 goto done;
7218
7219 err = got_ref_write(*branch_ref, repo);
7220 if (err)
7221 goto done;
7222
7223 err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
7224 worktree->base_commit_id);
7225 if (err)
7226 goto done;
7227 err = got_ref_write(base_commit_ref, repo);
7228 if (err)
7229 goto done;
7230 *base_commit_id = got_object_id_dup(worktree->base_commit_id);
7231 if (*base_commit_id == NULL) {
7232 err = got_error_from_errno("got_object_id_dup");
7233 goto done;
7234 }
7235
7236 err = got_ref_alloc(tmp_branch, tmp_branch_name,
7237 worktree->base_commit_id);
7238 if (err)
7239 goto done;
7240 err = got_ref_write(*tmp_branch, repo);
7241 if (err)
7242 goto done;
7243
7244 err = got_worktree_set_head_ref(worktree, *tmp_branch);
7245 if (err)
7246 goto done;
7247 done:
7248 free(fileindex_path);
7249 free(tmp_branch_name);
7250 free(branch_ref_name);
7251 free(base_commit_ref_name);
7252 if (wt_branch)
7253 got_ref_close(wt_branch);
7254 if (err) {
7255 if (*branch_ref) {
7256 got_ref_close(*branch_ref);
7257 *branch_ref = NULL;
7258 }
7259 if (*tmp_branch) {
7260 got_ref_close(*tmp_branch);
7261 *tmp_branch = NULL;
7262 }
7263 free(*base_commit_id);
7264 if (*fileindex) {
7265 got_fileindex_free(*fileindex);
7266 *fileindex = NULL;
7267 }
7268 lock_worktree(worktree, LOCK_SH);
7269 }
7270 return err;
7271 }
7272
7273 const struct got_error *
7274 got_worktree_histedit_postpone(struct got_worktree *worktree,
7275 struct got_fileindex *fileindex)
7276 {
7277 if (fileindex)
7278 got_fileindex_free(fileindex);
7279 return lock_worktree(worktree, LOCK_SH);
7280 }
7281
7282 const struct got_error *
7283 got_worktree_histedit_in_progress(int *in_progress,
7284 struct got_worktree *worktree)
7285 {
7286 const struct got_error *err;
7287 char *tmp_branch_name = NULL;
7288
7289 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7290 if (err)
7291 return err;
7292
7293 *in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
7294 free(tmp_branch_name);
7295 return NULL;
7296 }
7297
7298 const struct got_error *
7299 got_worktree_histedit_continue(struct got_object_id **commit_id,
7300 struct got_reference **tmp_branch, struct got_reference **branch_ref,
7301 struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
7302 struct got_worktree *worktree, struct got_repository *repo)
7303 {
7304 const struct got_error *err;
7305 char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
7306 char *tmp_branch_name = NULL, *branch_ref_name = NULL;
7307 struct got_reference *commit_ref = NULL;
7308 struct got_reference *base_commit_ref = NULL;
7309 char *fileindex_path = NULL;
7310 int have_staged_files = 0;
7311
7312 *commit_id = NULL;
7313 *tmp_branch = NULL;
7314 *base_commit_id = NULL;
7315 *fileindex = NULL;
7316
7317 err = lock_worktree(worktree, LOCK_EX);
7318 if (err)
7319 return err;
7320
7321 err = open_fileindex(fileindex, &fileindex_path, worktree);
7322 if (err)
7323 goto done;
7324
7325 err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
7326 &have_staged_files);
7327 if (err && err->code != GOT_ERR_CANCELLED)
7328 goto done;
7329 if (have_staged_files) {
7330 err = got_error(GOT_ERR_STAGED_PATHS);
7331 goto done;
7332 }
7333
7334 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7335 if (err)
7336 goto done;
7337
7338 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7339 if (err)
7340 goto done;
7341
7342 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7343 if (err)
7344 goto done;
7345
7346 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7347 worktree);
7348 if (err)
7349 goto done;
7350
7351 err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
7352 if (err)
7353 goto done;
7354
7355 err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
7356 if (err)
7357 goto done;
7358 err = got_ref_resolve(commit_id, repo, commit_ref);
7359 if (err)
7360 goto done;
7361
7362 err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
7363 if (err)
7364 goto done;
7365 err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
7366 if (err)
7367 goto done;
7368
7369 err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
7370 if (err)
7371 goto done;
7372 done:
7373 free(commit_ref_name);
7374 free(branch_ref_name);
7375 free(fileindex_path);
7376 if (commit_ref)
7377 got_ref_close(commit_ref);
7378 if (base_commit_ref)
7379 got_ref_close(base_commit_ref);
7380 if (err) {
7381 free(*commit_id);
7382 *commit_id = NULL;
7383 free(*base_commit_id);
7384 *base_commit_id = NULL;
7385 if (*tmp_branch) {
7386 got_ref_close(*tmp_branch);
7387 *tmp_branch = NULL;
7388 }
7389 if (*fileindex) {
7390 got_fileindex_free(*fileindex);
7391 *fileindex = NULL;
7392 }
7393 lock_worktree(worktree, LOCK_EX);
7394 }
7395 return err;
7396 }
7397
7398 static const struct got_error *
7399 delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
7400 {
7401 const struct got_error *err;
7402 char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
7403 char *branch_ref_name = NULL, *commit_ref_name = NULL;
7404
7405 err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7406 if (err)
7407 goto done;
7408 err = delete_ref(tmp_branch_name, repo);
7409 if (err)
7410 goto done;
7411
7412 err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7413 worktree);
7414 if (err)
7415 goto done;
7416 err = delete_ref(base_commit_ref_name, repo);
7417 if (err)
7418 goto done;
7419
7420 err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7421 if (err)
7422 goto done;
7423 err = delete_ref(branch_ref_name, repo);
7424 if (err)
7425 goto done;
7426
7427 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7428 if (err)
7429 goto done;
7430 err = delete_ref(commit_ref_name, repo);
7431 if (err)
7432 goto done;
7433 done:
7434 free(tmp_branch_name);
7435 free(base_commit_ref_name);
7436 free(branch_ref_name);
7437 free(commit_ref_name);
7438 return err;
7439 }
7440
7441 const struct got_error *
7442 got_worktree_histedit_abort(struct got_worktree *worktree,
7443 struct got_fileindex *fileindex, struct got_repository *repo,
7444 struct got_reference *branch, struct got_object_id *base_commit_id,
7445 got_worktree_checkout_cb progress_cb, void *progress_arg)
7446 {
7447 const struct got_error *err, *unlockerr, *sync_err;
7448 struct got_reference *resolved = NULL;
7449 char *fileindex_path = NULL;
7450 struct got_commit_object *commit = NULL;
7451 struct got_object_id *tree_id = NULL;
7452 struct revert_file_args rfa;
7453
7454 err = lock_worktree(worktree, LOCK_EX);
7455 if (err)
7456 return err;
7457
7458 err = got_object_open_as_commit(&commit, repo,
7459 worktree->base_commit_id);
7460 if (err)
7461 goto done;
7462
7463 err = got_ref_open(&resolved, repo,
7464 got_ref_get_symref_target(branch), 0);
7465 if (err)
7466 goto done;
7467
7468 err = got_worktree_set_head_ref(worktree, resolved);
7469 if (err)
7470 goto done;
7471
7472 err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
7473 if (err)
7474 goto done;
7475
7476 err = got_object_id_by_path(&tree_id, repo, commit,
7477 worktree->path_prefix);
7478 if (err)
7479 goto done;
7480
7481 err = delete_histedit_refs(worktree, repo);
7482 if (err)
7483 goto done;
7484
7485 err = get_fileindex_path(&fileindex_path, worktree);
7486 if (err)
7487 goto done;
7488
7489 rfa.worktree = worktree;
7490 rfa.fileindex = fileindex;
7491 rfa.progress_cb = progress_cb;
7492 rfa.progress_arg = progress_arg;
7493 rfa.patch_cb = NULL;
7494 rfa.patch_arg = NULL;
7495 rfa.repo = repo;
7496 rfa.unlink_added_files = 0;
7497 err = worktree_status(worktree, "", fileindex, repo,
7498 revert_file, &rfa, NULL, NULL, 1, 0);
7499 if (err)
7500 goto sync;
7501
7502 err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7503 repo, progress_cb, progress_arg, NULL, NULL);
7504 sync:
7505 sync_err = sync_fileindex(fileindex, fileindex_path);
7506 if (sync_err && err == NULL)
7507 err = sync_err;
7508 done:
7509 got_ref_close(resolved);
7510 free(tree_id);
7511 free(fileindex_path);
7512
7513 unlockerr = lock_worktree(worktree, LOCK_SH);
7514 if (unlockerr && err == NULL)
7515 err = unlockerr;
7516 return err;
7517 }
7518
7519 const struct got_error *
7520 got_worktree_histedit_complete(struct got_worktree *worktree,
7521 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7522 struct got_reference *edited_branch, struct got_repository *repo)
7523 {
7524 const struct got_error *err, *unlockerr, *sync_err;
7525 struct got_object_id *new_head_commit_id = NULL;
7526 struct got_reference *resolved = NULL;
7527 char *fileindex_path = NULL;
7528
7529 err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7530 if (err)
7531 return err;
7532
7533 err = got_ref_open(&resolved, repo,
7534 got_ref_get_symref_target(edited_branch), 0);
7535 if (err)
7536 goto done;
7537
7538 err = create_backup_ref(GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
7539 resolved, new_head_commit_id, repo);
7540 if (err)
7541 goto done;
7542
7543 err = got_ref_change_ref(resolved, new_head_commit_id);
7544 if (err)
7545 goto done;
7546
7547 err = got_ref_write(resolved, repo);
7548 if (err)
7549 goto done;
7550
7551 err = got_worktree_set_head_ref(worktree, resolved);
7552 if (err)
7553 goto done;
7554
7555 err = delete_histedit_refs(worktree, repo);
7556 if (err)
7557 goto done;
7558
7559 err = get_fileindex_path(&fileindex_path, worktree);
7560 if (err)
7561 goto done;
7562 err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7563 sync_err = sync_fileindex(fileindex, fileindex_path);
7564 if (sync_err && err == NULL)
7565 err = sync_err;
7566 done:
7567 got_fileindex_free(fileindex);
7568 free(fileindex_path);
7569 free(new_head_commit_id);
7570 unlockerr = lock_worktree(worktree, LOCK_SH);
7571 if (unlockerr && err == NULL)
7572 err = unlockerr;
7573 return err;
7574 }
7575
7576 const struct got_error *
7577 got_worktree_histedit_skip_commit(struct got_worktree *worktree,
7578 struct got_object_id *commit_id, struct got_repository *repo)
7579 {
7580 const struct got_error *err;
7581 char *commit_ref_name;
7582
7583 err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7584 if (err)
7585 return err;
7586
7587 err = store_commit_id(commit_ref_name, commit_id, 0, repo);
7588 if (err)
7589 goto done;
7590
7591 err = delete_ref(commit_ref_name, repo);
7592 done:
7593 free(commit_ref_name);
7594 return err;
7595 }
7596
7597 const struct got_error *
7598 got_worktree_integrate_prepare(struct got_fileindex **fileindex,
7599 struct got_reference **branch_ref, struct got_reference **base_branch_ref,
7600 struct got_worktree *worktree, const char *refname,
7601 struct got_repository *repo)
7602 {
7603 const struct got_error *err = NULL;
7604 char *fileindex_path = NULL;
7605 struct check_rebase_ok_arg ok_arg;
7606
7607 *fileindex = NULL;
7608 *branch_ref = NULL;
7609 *base_branch_ref = NULL;
7610
7611 err = lock_worktree(worktree, LOCK_EX);
7612 if (err)
7613 return err;
7614
7615 if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
7616 err = got_error_msg(GOT_ERR_SAME_BRANCH,
7617 "cannot integrate a branch into itself; "
7618 "update -b or different branch name required");
7619 goto done;
7620 }
7621
7622 err = open_fileindex(fileindex, &fileindex_path, worktree);
7623 if (err)
7624 goto done;
7625
7626 /* Preconditions are the same as for rebase. */
7627 ok_arg.worktree = worktree;
7628 ok_arg.repo = repo;
7629 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7630 &ok_arg);
7631 if (err)
7632 goto done;
7633
7634 err = got_ref_open(branch_ref, repo, refname, 1);
7635 if (err)
7636 goto done;
7637
7638 err = got_ref_open(base_branch_ref, repo,
7639 got_worktree_get_head_ref_name(worktree), 1);
7640 done:
7641 if (err) {
7642 if (*branch_ref) {
7643 got_ref_close(*branch_ref);
7644 *branch_ref = NULL;
7645 }
7646 if (*base_branch_ref) {
7647 got_ref_close(*base_branch_ref);
7648 *base_branch_ref = NULL;
7649 }
7650 if (*fileindex) {
7651 got_fileindex_free(*fileindex);
7652 *fileindex = NULL;
7653 }
7654 lock_worktree(worktree, LOCK_SH);
7655 }
7656 return err;
7657 }
7658
7659 const struct got_error *
7660 got_worktree_integrate_continue(struct got_worktree *worktree,
7661 struct got_fileindex *fileindex, struct got_repository *repo,
7662 struct got_reference *branch_ref, struct got_reference *base_branch_ref,
7663 got_worktree_checkout_cb progress_cb, void *progress_arg,
7664 got_cancel_cb cancel_cb, void *cancel_arg)
7665 {
7666 const struct got_error *err = NULL, *sync_err, *unlockerr;
7667 char *fileindex_path = NULL;
7668 struct got_object_id *tree_id = NULL, *commit_id = NULL;
7669 struct got_commit_object *commit = NULL;
7670
7671 err = get_fileindex_path(&fileindex_path, worktree);
7672 if (err)
7673 goto done;
7674
7675 err = got_ref_resolve(&commit_id, repo, branch_ref);
7676 if (err)
7677 goto done;
7678
7679 err = got_object_open_as_commit(&commit, repo, commit_id);
7680 if (err)
7681 goto done;
7682
7683 err = got_object_id_by_path(&tree_id, repo, commit,
7684 worktree->path_prefix);
7685 if (err)
7686 goto done;
7687
7688 err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7689 if (err)
7690 goto done;
7691
7692 err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
7693 progress_cb, progress_arg, cancel_cb, cancel_arg);
7694 if (err)
7695 goto sync;
7696
7697 err = got_ref_change_ref(base_branch_ref, commit_id);
7698 if (err)
7699 goto sync;
7700
7701 err = got_ref_write(base_branch_ref, repo);
7702 if (err)
7703 goto sync;
7704
7705 err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7706 sync:
7707 sync_err = sync_fileindex(fileindex, fileindex_path);
7708 if (sync_err && err == NULL)
7709 err = sync_err;
7710
7711 done:
7712 unlockerr = got_ref_unlock(branch_ref);
7713 if (unlockerr && err == NULL)
7714 err = unlockerr;
7715 got_ref_close(branch_ref);
7716
7717 unlockerr = got_ref_unlock(base_branch_ref);
7718 if (unlockerr && err == NULL)
7719 err = unlockerr;
7720 got_ref_close(base_branch_ref);
7721
7722 got_fileindex_free(fileindex);
7723 free(fileindex_path);
7724 free(tree_id);
7725 if (commit)
7726 got_object_commit_close(commit);
7727
7728 unlockerr = lock_worktree(worktree, LOCK_SH);
7729 if (unlockerr && err == NULL)
7730 err = unlockerr;
7731 return err;
7732 }
7733
7734 const struct got_error *
7735 got_worktree_integrate_abort(struct got_worktree *worktree,
7736 struct got_fileindex *fileindex, struct got_repository *repo,
7737 struct got_reference *branch_ref, struct got_reference *base_branch_ref)
7738 {
7739 const struct got_error *err = NULL, *unlockerr = NULL;
7740
7741 got_fileindex_free(fileindex);
7742
7743 err = lock_worktree(worktree, LOCK_SH);
7744
7745 unlockerr = got_ref_unlock(branch_ref);
7746 if (unlockerr && err == NULL)
7747 err = unlockerr;
7748 got_ref_close(branch_ref);
7749
7750 unlockerr = got_ref_unlock(base_branch_ref);
7751 if (unlockerr && err == NULL)
7752 err = unlockerr;
7753 got_ref_close(base_branch_ref);
7754
7755 return err;
7756 }
7757
7758 const struct got_error *
7759 got_worktree_merge_postpone(struct got_worktree *worktree,
7760 struct got_fileindex *fileindex)
7761 {
7762 const struct got_error *err, *sync_err;
7763 char *fileindex_path = NULL;
7764
7765 err = get_fileindex_path(&fileindex_path, worktree);
7766 if (err)
7767 goto done;
7768
7769 sync_err = sync_fileindex(fileindex, fileindex_path);
7770
7771 err = lock_worktree(worktree, LOCK_SH);
7772 if (sync_err && err == NULL)
7773 err = sync_err;
7774 done:
7775 got_fileindex_free(fileindex);
7776 free(fileindex_path);
7777 return err;
7778 }
7779
7780 static const struct got_error *
7781 delete_merge_refs(struct got_worktree *worktree, struct got_repository *repo)
7782 {
7783 const struct got_error *err;
7784 char *branch_refname = NULL, *commit_refname = NULL;
7785
7786 err = get_merge_branch_ref_name(&branch_refname, worktree);
7787 if (err)
7788 goto done;
7789 err = delete_ref(branch_refname, repo);
7790 if (err)
7791 goto done;
7792
7793 err = get_merge_commit_ref_name(&commit_refname, worktree);
7794 if (err)
7795 goto done;
7796 err = delete_ref(commit_refname, repo);
7797 if (err)
7798 goto done;
7799
7800 done:
7801 free(branch_refname);
7802 free(commit_refname);
7803 return err;
7804 }
7805
7806 struct merge_commit_msg_arg {
7807 struct got_worktree *worktree;
7808 const char *branch_name;
7809 };
7810
7811 static const struct got_error *
7812 merge_commit_msg_cb(struct got_pathlist_head *commitable_paths,
7813 const char *diff_path, char **logmsg, void *arg)
7814 {
7815 struct merge_commit_msg_arg *a = arg;
7816
7817 if (asprintf(logmsg, "merge %s into %s\n", a->branch_name,
7818 got_worktree_get_head_ref_name(a->worktree)) == -1)
7819 return got_error_from_errno("asprintf");
7820
7821 return NULL;
7822 }
7823
7824
7825 const struct got_error *
7826 got_worktree_merge_branch(struct got_worktree *worktree,
7827 struct got_fileindex *fileindex,
7828 struct got_object_id *yca_commit_id,
7829 struct got_object_id *branch_tip,
7830 struct got_repository *repo, got_worktree_checkout_cb progress_cb,
7831 void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
7832 {
7833 const struct got_error *err;
7834 char *fileindex_path = NULL;
7835
7836 err = get_fileindex_path(&fileindex_path, worktree);
7837 if (err)
7838 goto done;
7839
7840 err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
7841 worktree);
7842 if (err)
7843 goto done;
7844
7845 err = merge_files(worktree, fileindex, fileindex_path, yca_commit_id,
7846 branch_tip, repo, progress_cb, progress_arg,
7847 cancel_cb, cancel_arg);
7848 done:
7849 free(fileindex_path);
7850 return err;
7851 }
7852
7853 const struct got_error *
7854 got_worktree_merge_commit(struct got_object_id **new_commit_id,
7855 struct got_worktree *worktree, struct got_fileindex *fileindex,
7856 const char *author, const char *committer, int allow_bad_symlinks,
7857 struct got_object_id *branch_tip, const char *branch_name,
7858 struct got_repository *repo,
7859 got_worktree_status_cb status_cb, void *status_arg)
7860
7861 {
7862 const struct got_error *err = NULL, *sync_err;
7863 struct got_pathlist_head commitable_paths;
7864 struct collect_commitables_arg cc_arg;
7865 struct got_pathlist_entry *pe;
7866 struct got_reference *head_ref = NULL;
7867 struct got_object_id *head_commit_id = NULL;
7868 int have_staged_files = 0;
7869 struct merge_commit_msg_arg mcm_arg;
7870 char *fileindex_path = NULL;
7871
7872 memset(&cc_arg, 0, sizeof(cc_arg));
7873 *new_commit_id = NULL;
7874
7875 TAILQ_INIT(&commitable_paths);
7876
7877 err = get_fileindex_path(&fileindex_path, worktree);
7878 if (err)
7879 goto done;
7880
7881 err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
7882 if (err)
7883 goto done;
7884
7885 err = got_ref_resolve(&head_commit_id, repo, head_ref);
7886 if (err)
7887 goto done;
7888
7889 err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
7890 &have_staged_files);
7891 if (err && err->code != GOT_ERR_CANCELLED)
7892 goto done;
7893 if (have_staged_files) {
7894 err = got_error(GOT_ERR_MERGE_STAGED_PATHS);
7895 goto done;
7896 }
7897
7898 cc_arg.commitable_paths = &commitable_paths;
7899 cc_arg.worktree = worktree;
7900 cc_arg.fileindex = fileindex;
7901 cc_arg.repo = repo;
7902 cc_arg.have_staged_files = have_staged_files;
7903 cc_arg.allow_bad_symlinks = allow_bad_symlinks;
7904 err = worktree_status(worktree, "", fileindex, repo,
7905 collect_commitables, &cc_arg, NULL, NULL, 1, 0);
7906 if (err)
7907 goto done;
7908
7909 if (TAILQ_EMPTY(&commitable_paths)) {
7910 err = got_error_fmt(GOT_ERR_COMMIT_NO_CHANGES,
7911 "merge of %s cannot proceed", branch_name);
7912 goto done;
7913 }
7914
7915 TAILQ_FOREACH(pe, &commitable_paths, entry) {
7916 struct got_commitable *ct = pe->data;
7917 const char *ct_path = ct->in_repo_path;
7918
7919 while (ct_path[0] == '/')
7920 ct_path++;
7921 err = check_out_of_date(ct_path, ct->status,
7922 ct->staged_status, ct->base_blob_id, ct->base_commit_id,
7923 head_commit_id, repo, GOT_ERR_MERGE_COMMIT_OUT_OF_DATE);
7924 if (err)
7925 goto done;
7926
7927 }
7928
7929 mcm_arg.worktree = worktree;
7930 mcm_arg.branch_name = branch_name;
7931 err = commit_worktree(new_commit_id, &commitable_paths,
7932 head_commit_id, branch_tip, worktree, author, committer, NULL,
7933 merge_commit_msg_cb, &mcm_arg, status_cb, status_arg, repo);
7934 if (err)
7935 goto done;
7936
7937 err = update_fileindex_after_commit(worktree, &commitable_paths,
7938 *new_commit_id, fileindex, have_staged_files);
7939 sync_err = sync_fileindex(fileindex, fileindex_path);
7940 if (sync_err && err == NULL)
7941 err = sync_err;
7942 done:
7943 TAILQ_FOREACH(pe, &commitable_paths, entry) {
7944 struct got_commitable *ct = pe->data;
7945
7946 free_commitable(ct);
7947 }
7948 got_pathlist_free(&commitable_paths, GOT_PATHLIST_FREE_NONE);
7949 free(fileindex_path);
7950 return err;
7951 }
7952
7953 const struct got_error *
7954 got_worktree_merge_complete(struct got_worktree *worktree,
7955 struct got_fileindex *fileindex, struct got_repository *repo)
7956 {
7957 const struct got_error *err, *unlockerr, *sync_err;
7958 char *fileindex_path = NULL;
7959
7960 err = delete_merge_refs(worktree, repo);
7961 if (err)
7962 goto done;
7963
7964 err = get_fileindex_path(&fileindex_path, worktree);
7965 if (err)
7966 goto done;
7967 err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7968 sync_err = sync_fileindex(fileindex, fileindex_path);
7969 if (sync_err && err == NULL)
7970 err = sync_err;
7971 done:
7972 got_fileindex_free(fileindex);
7973 free(fileindex_path);
7974 unlockerr = lock_worktree(worktree, LOCK_SH);
7975 if (unlockerr && err == NULL)
7976 err = unlockerr;
7977 return err;
7978 }
7979
7980 const struct got_error *
7981 got_worktree_merge_in_progress(int *in_progress, struct got_worktree *worktree,
7982 struct got_repository *repo)
7983 {
7984 const struct got_error *err;
7985 char *branch_refname = NULL;
7986 struct got_reference *branch_ref = NULL;
7987
7988 *in_progress = 0;
7989
7990 err = get_merge_branch_ref_name(&branch_refname, worktree);
7991 if (err)
7992 return err;
7993 err = got_ref_open(&branch_ref, repo, branch_refname, 0);
7994 free(branch_refname);
7995 if (err) {
7996 if (err->code != GOT_ERR_NOT_REF)
7997 return err;
7998 } else
7999 *in_progress = 1;
8000
8001 return NULL;
8002 }
8003
8004 const struct got_error *got_worktree_merge_prepare(
8005 struct got_fileindex **fileindex, struct got_worktree *worktree,
8006 struct got_reference *branch, struct got_repository *repo)
8007 {
8008 const struct got_error *err = NULL;
8009 char *fileindex_path = NULL;
8010 char *branch_refname = NULL, *commit_refname = NULL;
8011 struct got_reference *wt_branch = NULL, *branch_ref = NULL;
8012 struct got_reference *commit_ref = NULL;
8013 struct got_object_id *branch_tip = NULL, *wt_branch_tip = NULL;
8014 struct check_rebase_ok_arg ok_arg;
8015
8016 *fileindex = NULL;
8017
8018 err = lock_worktree(worktree, LOCK_EX);
8019 if (err)
8020 return err;
8021
8022 err = open_fileindex(fileindex, &fileindex_path, worktree);
8023 if (err)
8024 goto done;
8025
8026 /* Preconditions are the same as for rebase. */
8027 ok_arg.worktree = worktree;
8028 ok_arg.repo = repo;
8029 err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
8030 &ok_arg);
8031 if (err)
8032 goto done;
8033
8034 err = get_merge_branch_ref_name(&branch_refname, worktree);
8035 if (err)
8036 return err;
8037
8038 err = get_merge_commit_ref_name(&commit_refname, worktree);
8039 if (err)
8040 return err;
8041
8042 err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
8043 0);
8044 if (err)
8045 goto done;
8046
8047 err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
8048 if (err)
8049 goto done;
8050
8051 if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
8052 err = got_error(GOT_ERR_MERGE_OUT_OF_DATE);
8053 goto done;
8054 }
8055
8056 err = got_ref_resolve(&branch_tip, repo, branch);
8057 if (err)
8058 goto done;
8059
8060 err = got_ref_alloc_symref(&branch_ref, branch_refname, branch);
8061 if (err)
8062 goto done;
8063 err = got_ref_write(branch_ref, repo);
8064 if (err)
8065 goto done;
8066
8067 err = got_ref_alloc(&commit_ref, commit_refname, branch_tip);
8068 if (err)
8069 goto done;
8070 err = got_ref_write(commit_ref, repo);
8071 if (err)
8072 goto done;
8073
8074 done:
8075 free(branch_refname);
8076 free(commit_refname);
8077 free(fileindex_path);
8078 if (branch_ref)
8079 got_ref_close(branch_ref);
8080 if (commit_ref)
8081 got_ref_close(commit_ref);
8082 if (wt_branch)
8083 got_ref_close(wt_branch);
8084 free(wt_branch_tip);
8085 if (err) {
8086 if (*fileindex) {
8087 got_fileindex_free(*fileindex);
8088 *fileindex = NULL;
8089 }
8090 lock_worktree(worktree, LOCK_SH);
8091 }
8092 return err;
8093 }
8094
8095 const struct got_error *
8096 got_worktree_merge_continue(char **branch_name,
8097 struct got_object_id **branch_tip, struct got_fileindex **fileindex,
8098 struct got_worktree *worktree, struct got_repository *repo)
8099 {
8100 const struct got_error *err;
8101 char *commit_refname = NULL, *branch_refname = NULL;
8102 struct got_reference *commit_ref = NULL, *branch_ref = NULL;
8103 char *fileindex_path = NULL;
8104 int have_staged_files = 0;
8105
8106 *branch_name = NULL;
8107 *branch_tip = NULL;
8108 *fileindex = NULL;
8109
8110 err = lock_worktree(worktree, LOCK_EX);
8111 if (err)
8112 return err;
8113
8114 err = open_fileindex(fileindex, &fileindex_path, worktree);
8115 if (err)
8116 goto done;
8117
8118 err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
8119 &have_staged_files);
8120 if (err && err->code != GOT_ERR_CANCELLED)
8121 goto done;
8122 if (have_staged_files) {
8123 err = got_error(GOT_ERR_STAGED_PATHS);
8124 goto done;
8125 }
8126
8127 err = get_merge_branch_ref_name(&branch_refname, worktree);
8128 if (err)
8129 goto done;
8130
8131 err = get_merge_commit_ref_name(&commit_refname, worktree);
8132 if (err)
8133 goto done;
8134
8135 err = got_ref_open(&branch_ref, repo, branch_refname, 0);
8136 if (err)
8137 goto done;
8138
8139 if (!got_ref_is_symbolic(branch_ref)) {
8140 err = got_error_fmt(GOT_ERR_BAD_REF_TYPE,
8141 "%s is not a symbolic reference",
8142 got_ref_get_name(branch_ref));
8143 goto done;
8144 }
8145 *branch_name = strdup(got_ref_get_symref_target(branch_ref));
8146 if (*branch_name == NULL) {
8147 err = got_error_from_errno("strdup");
8148 goto done;
8149 }
8150
8151 err = got_ref_open(&commit_ref, repo, commit_refname, 0);
8152 if (err)
8153 goto done;
8154
8155 err = got_ref_resolve(branch_tip, repo, commit_ref);
8156 if (err)
8157 goto done;
8158 done:
8159 free(commit_refname);
8160 free(branch_refname);
8161 free(fileindex_path);
8162 if (commit_ref)
8163 got_ref_close(commit_ref);
8164 if (branch_ref)
8165 got_ref_close(branch_ref);
8166 if (err) {
8167 if (*branch_name) {
8168 free(*branch_name);
8169 *branch_name = NULL;
8170 }
8171 free(*branch_tip);
8172 *branch_tip = NULL;
8173 if (*fileindex) {
8174 got_fileindex_free(*fileindex);
8175 *fileindex = NULL;
8176 }
8177 lock_worktree(worktree, LOCK_SH);
8178 }
8179 return err;
8180 }
8181
8182 const struct got_error *
8183 got_worktree_merge_abort(struct got_worktree *worktree,
8184 struct got_fileindex *fileindex, struct got_repository *repo,
8185 got_worktree_checkout_cb progress_cb, void *progress_arg)
8186 {
8187 const struct got_error *err, *unlockerr, *sync_err;
8188 struct got_object_id *commit_id = NULL;
8189 struct got_commit_object *commit = NULL;
8190 char *fileindex_path = NULL;
8191 struct revert_file_args rfa;
8192 struct got_object_id *tree_id = NULL;
8193
8194 err = got_object_open_as_commit(&commit, repo,
8195 worktree->base_commit_id);
8196 if (err)
8197 goto done;
8198
8199 err = got_object_id_by_path(&tree_id, repo, commit,
8200 worktree->path_prefix);
8201 if (err)
8202 goto done;
8203
8204 err = delete_merge_refs(worktree, repo);
8205 if (err)
8206 goto done;
8207
8208 err = get_fileindex_path(&fileindex_path, worktree);
8209 if (err)
8210 goto done;
8211
8212 rfa.worktree = worktree;
8213 rfa.fileindex = fileindex;
8214 rfa.progress_cb = progress_cb;
8215 rfa.progress_arg = progress_arg;
8216 rfa.patch_cb = NULL;
8217 rfa.patch_arg = NULL;
8218 rfa.repo = repo;
8219 rfa.unlink_added_files = 1;
8220 err = worktree_status(worktree, "", fileindex, repo,
8221 revert_file, &rfa, NULL, NULL, 1, 0);
8222 if (err)
8223 goto sync;
8224
8225 err = checkout_files(worktree, fileindex, "", tree_id, NULL,
8226 repo, progress_cb, progress_arg, NULL, NULL);
8227 sync:
8228 sync_err = sync_fileindex(fileindex, fileindex_path);
8229 if (sync_err && err == NULL)
8230 err = sync_err;
8231 done:
8232 free(tree_id);
8233 free(commit_id);
8234 if (commit)
8235 got_object_commit_close(commit);
8236 if (fileindex)
8237 got_fileindex_free(fileindex);
8238 free(fileindex_path);
8239
8240 unlockerr = lock_worktree(worktree, LOCK_SH);
8241 if (unlockerr && err == NULL)
8242 err = unlockerr;
8243 return err;
8244 }
8245
8246 struct check_stage_ok_arg {
8247 struct got_object_id *head_commit_id;
8248 struct got_worktree *worktree;
8249 struct got_fileindex *fileindex;
8250 struct got_repository *repo;
8251 int have_changes;
8252 };
8253
8254 static const struct got_error *
8255 check_stage_ok(void *arg, unsigned char status,
8256 unsigned char staged_status, const char *relpath,
8257 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8258 struct got_object_id *commit_id, int dirfd, const char *de_name)
8259 {
8260 struct check_stage_ok_arg *a = arg;
8261 const struct got_error *err = NULL;
8262 struct got_fileindex_entry *ie;
8263 struct got_object_id base_commit_id;
8264 struct got_object_id *base_commit_idp = NULL;
8265 char *in_repo_path = NULL, *p;
8266
8267 if (status == GOT_STATUS_UNVERSIONED ||
8268 status == GOT_STATUS_NO_CHANGE)
8269 return NULL;
8270 if (status == GOT_STATUS_NONEXISTENT)
8271 return got_error_set_errno(ENOENT, relpath);
8272
8273 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8274 if (ie == NULL)
8275 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8276
8277 if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
8278 got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
8279 relpath) == -1)
8280 return got_error_from_errno("asprintf");
8281
8282 if (got_fileindex_entry_has_commit(ie)) {
8283 memcpy(base_commit_id.sha1, ie->commit_sha1,
8284 SHA1_DIGEST_LENGTH);
8285 base_commit_idp = &base_commit_id;
8286 }
8287
8288 if (status == GOT_STATUS_CONFLICT) {
8289 err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
8290 goto done;
8291 } else if (status != GOT_STATUS_ADD &&
8292 status != GOT_STATUS_MODIFY &&
8293 status != GOT_STATUS_DELETE) {
8294 err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
8295 goto done;
8296 }
8297
8298 a->have_changes = 1;
8299
8300 p = in_repo_path;
8301 while (p[0] == '/')
8302 p++;
8303 err = check_out_of_date(p, status, staged_status,
8304 blob_id, base_commit_idp, a->head_commit_id, a->repo,
8305 GOT_ERR_STAGE_OUT_OF_DATE);
8306 done:
8307 free(in_repo_path);
8308 return err;
8309 }
8310
8311 struct stage_path_arg {
8312 struct got_worktree *worktree;
8313 struct got_fileindex *fileindex;
8314 struct got_repository *repo;
8315 got_worktree_status_cb status_cb;
8316 void *status_arg;
8317 got_worktree_patch_cb patch_cb;
8318 void *patch_arg;
8319 int staged_something;
8320 int allow_bad_symlinks;
8321 };
8322
8323 static const struct got_error *
8324 stage_path(void *arg, unsigned char status,
8325 unsigned char staged_status, const char *relpath,
8326 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8327 struct got_object_id *commit_id, int dirfd, const char *de_name)
8328 {
8329 struct stage_path_arg *a = arg;
8330 const struct got_error *err = NULL;
8331 struct got_fileindex_entry *ie;
8332 char *ondisk_path = NULL, *path_content = NULL;
8333 uint32_t stage;
8334 struct got_object_id *new_staged_blob_id = NULL;
8335 struct stat sb;
8336
8337 if (status == GOT_STATUS_UNVERSIONED)
8338 return NULL;
8339
8340 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8341 if (ie == NULL)
8342 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8343
8344 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
8345 relpath)== -1)
8346 return got_error_from_errno("asprintf");
8347
8348 switch (status) {
8349 case GOT_STATUS_ADD:
8350 case GOT_STATUS_MODIFY:
8351 /* XXX could sb.st_mode be passed in by our caller? */
8352 if (lstat(ondisk_path, &sb) == -1) {
8353 err = got_error_from_errno2("lstat", ondisk_path);
8354 break;
8355 }
8356 if (a->patch_cb) {
8357 if (status == GOT_STATUS_ADD) {
8358 int choice = GOT_PATCH_CHOICE_NONE;
8359 err = (*a->patch_cb)(&choice, a->patch_arg,
8360 status, ie->path, NULL, 1, 1);
8361 if (err)
8362 break;
8363 if (choice != GOT_PATCH_CHOICE_YES)
8364 break;
8365 } else {
8366 err = create_patched_content(&path_content, 0,
8367 staged_blob_id ? staged_blob_id : blob_id,
8368 ondisk_path, dirfd, de_name, ie->path,
8369 a->repo, a->patch_cb, a->patch_arg);
8370 if (err || path_content == NULL)
8371 break;
8372 }
8373 }
8374 err = got_object_blob_create(&new_staged_blob_id,
8375 path_content ? path_content : ondisk_path, a->repo);
8376 if (err)
8377 break;
8378 memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8379 SHA1_DIGEST_LENGTH);
8380 if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
8381 stage = GOT_FILEIDX_STAGE_ADD;
8382 else
8383 stage = GOT_FILEIDX_STAGE_MODIFY;
8384 got_fileindex_entry_stage_set(ie, stage);
8385 if (S_ISLNK(sb.st_mode)) {
8386 int is_bad_symlink = 0;
8387 if (!a->allow_bad_symlinks) {
8388 char target_path[PATH_MAX];
8389 ssize_t target_len;
8390 target_len = readlink(ondisk_path, target_path,
8391 sizeof(target_path));
8392 if (target_len == -1) {
8393 err = got_error_from_errno2("readlink",
8394 ondisk_path);
8395 break;
8396 }
8397 err = is_bad_symlink_target(&is_bad_symlink,
8398 target_path, target_len, ondisk_path,
8399 a->worktree->root_path);
8400 if (err)
8401 break;
8402 if (is_bad_symlink) {
8403 err = got_error_path(ondisk_path,
8404 GOT_ERR_BAD_SYMLINK);
8405 break;
8406 }
8407 }
8408 if (is_bad_symlink)
8409 got_fileindex_entry_staged_filetype_set(ie,
8410 GOT_FILEIDX_MODE_BAD_SYMLINK);
8411 else
8412 got_fileindex_entry_staged_filetype_set(ie,
8413 GOT_FILEIDX_MODE_SYMLINK);
8414 } else {
8415 got_fileindex_entry_staged_filetype_set(ie,
8416 GOT_FILEIDX_MODE_REGULAR_FILE);
8417 }
8418 a->staged_something = 1;
8419 if (a->status_cb == NULL)
8420 break;
8421 err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8422 get_staged_status(ie), relpath, blob_id,
8423 new_staged_blob_id, NULL, dirfd, de_name);
8424 if (err)
8425 break;
8426 /*
8427 * When staging the reverse of the staged diff,
8428 * implicitly unstage the file.
8429 */
8430 if (memcmp(ie->staged_blob_sha1, ie->blob_sha1,
8431 sizeof(ie->blob_sha1)) == 0) {
8432 got_fileindex_entry_stage_set(ie,
8433 GOT_FILEIDX_STAGE_NONE);
8434 }
8435 break;
8436 case GOT_STATUS_DELETE:
8437 if (staged_status == GOT_STATUS_DELETE)
8438 break;
8439 if (a->patch_cb) {
8440 int choice = GOT_PATCH_CHOICE_NONE;
8441 err = (*a->patch_cb)(&choice, a->patch_arg, status,
8442 ie->path, NULL, 1, 1);
8443 if (err)
8444 break;
8445 if (choice == GOT_PATCH_CHOICE_NO)
8446 break;
8447 if (choice != GOT_PATCH_CHOICE_YES) {
8448 err = got_error(GOT_ERR_PATCH_CHOICE);
8449 break;
8450 }
8451 }
8452 stage = GOT_FILEIDX_STAGE_DELETE;
8453 got_fileindex_entry_stage_set(ie, stage);
8454 a->staged_something = 1;
8455 if (a->status_cb == NULL)
8456 break;
8457 err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8458 get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
8459 de_name);
8460 break;
8461 case GOT_STATUS_NO_CHANGE:
8462 break;
8463 case GOT_STATUS_CONFLICT:
8464 err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
8465 break;
8466 case GOT_STATUS_NONEXISTENT:
8467 err = got_error_set_errno(ENOENT, relpath);
8468 break;
8469 default:
8470 err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
8471 break;
8472 }
8473
8474 if (path_content && unlink(path_content) == -1 && err == NULL)
8475 err = got_error_from_errno2("unlink", path_content);
8476 free(path_content);
8477 free(ondisk_path);
8478 free(new_staged_blob_id);
8479 return err;
8480 }
8481
8482 const struct got_error *
8483 got_worktree_stage(struct got_worktree *worktree,
8484 struct got_pathlist_head *paths,
8485 got_worktree_status_cb status_cb, void *status_arg,
8486 got_worktree_patch_cb patch_cb, void *patch_arg,
8487 int allow_bad_symlinks, struct got_repository *repo)
8488 {
8489 const struct got_error *err = NULL, *sync_err, *unlockerr;
8490 struct got_pathlist_entry *pe;
8491 struct got_fileindex *fileindex = NULL;
8492 char *fileindex_path = NULL;
8493 struct got_reference *head_ref = NULL;
8494 struct got_object_id *head_commit_id = NULL;
8495 struct check_stage_ok_arg oka;
8496 struct stage_path_arg spa;
8497
8498 err = lock_worktree(worktree, LOCK_EX);
8499 if (err)
8500 return err;
8501
8502 err = got_ref_open(&head_ref, repo,
8503 got_worktree_get_head_ref_name(worktree), 0);
8504 if (err)
8505 goto done;
8506 err = got_ref_resolve(&head_commit_id, repo, head_ref);
8507 if (err)
8508 goto done;
8509 err = open_fileindex(&fileindex, &fileindex_path, worktree);
8510 if (err)
8511 goto done;
8512
8513 /* Check pre-conditions before staging anything. */
8514 oka.head_commit_id = head_commit_id;
8515 oka.worktree = worktree;
8516 oka.fileindex = fileindex;
8517 oka.repo = repo;
8518 oka.have_changes = 0;
8519 TAILQ_FOREACH(pe, paths, entry) {
8520 err = worktree_status(worktree, pe->path, fileindex, repo,
8521 check_stage_ok, &oka, NULL, NULL, 1, 0);
8522 if (err)
8523 goto done;
8524 }
8525 if (!oka.have_changes) {
8526 err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8527 goto done;
8528 }
8529
8530 spa.worktree = worktree;
8531 spa.fileindex = fileindex;
8532 spa.repo = repo;
8533 spa.patch_cb = patch_cb;
8534 spa.patch_arg = patch_arg;
8535 spa.status_cb = status_cb;
8536 spa.status_arg = status_arg;
8537 spa.staged_something = 0;
8538 spa.allow_bad_symlinks = allow_bad_symlinks;
8539 TAILQ_FOREACH(pe, paths, entry) {
8540 err = worktree_status(worktree, pe->path, fileindex, repo,
8541 stage_path, &spa, NULL, NULL, 1, 0);
8542 if (err)
8543 goto done;
8544 }
8545 if (!spa.staged_something) {
8546 err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8547 goto done;
8548 }
8549
8550 sync_err = sync_fileindex(fileindex, fileindex_path);
8551 if (sync_err && err == NULL)
8552 err = sync_err;
8553 done:
8554 if (head_ref)
8555 got_ref_close(head_ref);
8556 free(head_commit_id);
8557 free(fileindex_path);
8558 if (fileindex)
8559 got_fileindex_free(fileindex);
8560 unlockerr = lock_worktree(worktree, LOCK_SH);
8561 if (unlockerr && err == NULL)
8562 err = unlockerr;
8563 return err;
8564 }
8565
8566 struct unstage_path_arg {
8567 struct got_worktree *worktree;
8568 struct got_fileindex *fileindex;
8569 struct got_repository *repo;
8570 got_worktree_checkout_cb progress_cb;
8571 void *progress_arg;
8572 got_worktree_patch_cb patch_cb;
8573 void *patch_arg;
8574 };
8575
8576 static const struct got_error *
8577 create_unstaged_content(char **path_unstaged_content,
8578 char **path_new_staged_content, struct got_object_id *blob_id,
8579 struct got_object_id *staged_blob_id, const char *relpath,
8580 struct got_repository *repo,
8581 got_worktree_patch_cb patch_cb, void *patch_arg)
8582 {
8583 const struct got_error *err, *free_err;
8584 struct got_blob_object *blob = NULL, *staged_blob = NULL;
8585 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
8586 char *path1 = NULL, *path2 = NULL, *label1 = NULL;
8587 struct got_diffreg_result *diffreg_result = NULL;
8588 int line_cur1 = 1, line_cur2 = 1, n = 0, nchunks_used = 0;
8589 int have_content = 0, have_rejected_content = 0, i = 0, nchanges = 0;
8590 int fd1 = -1, fd2 = -1;
8591
8592 *path_unstaged_content = NULL;
8593 *path_new_staged_content = NULL;
8594
8595 err = got_object_id_str(&label1, blob_id);
8596 if (err)
8597 return err;
8598
8599 fd1 = got_opentempfd();
8600 if (fd1 == -1) {
8601 err = got_error_from_errno("got_opentempfd");
8602 goto done;
8603 }
8604 fd2 = got_opentempfd();
8605 if (fd2 == -1) {
8606 err = got_error_from_errno("got_opentempfd");
8607 goto done;
8608 }
8609
8610 err = got_object_open_as_blob(&blob, repo, blob_id, 8192, fd1);
8611 if (err)
8612 goto done;
8613
8614 err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base", "");
8615 if (err)
8616 goto done;
8617
8618 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
8619 if (err)
8620 goto done;
8621
8622 err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192,
8623 fd2);
8624 if (err)
8625 goto done;
8626
8627 err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged", "");
8628 if (err)
8629 goto done;
8630
8631 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
8632 if (err)
8633 goto done;
8634
8635 err = got_diff_files(&diffreg_result, f1, 1, label1, f2, 1,
8636 path2, 3, 0, 1, NULL, GOT_DIFF_ALGORITHM_MYERS);
8637 if (err)
8638 goto done;
8639
8640 err = got_opentemp_named(path_unstaged_content, &outfile,
8641 "got-unstaged-content", "");
8642 if (err)
8643 goto done;
8644 err = got_opentemp_named(path_new_staged_content, &rejectfile,
8645 "got-new-staged-content", "");
8646 if (err)
8647 goto done;
8648
8649 if (fseek(f1, 0L, SEEK_SET) == -1) {
8650 err = got_ferror(f1, GOT_ERR_IO);
8651 goto done;
8652 }
8653 if (fseek(f2, 0L, SEEK_SET) == -1) {
8654 err = got_ferror(f2, GOT_ERR_IO);
8655 goto done;
8656 }
8657 /* Count the number of actual changes in the diff result. */
8658 for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8659 struct diff_chunk_context cc = {};
8660 diff_chunk_context_load_change(&cc, &nchunks_used,
8661 diffreg_result->result, n, 0);
8662 nchanges++;
8663 }
8664 for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8665 int choice;
8666 err = apply_or_reject_change(&choice, &nchunks_used,
8667 diffreg_result->result, n, relpath, f1, f2,
8668 &line_cur1, &line_cur2,
8669 outfile, rejectfile, ++i, nchanges, patch_cb, patch_arg);
8670 if (err)
8671 goto done;
8672 if (choice == GOT_PATCH_CHOICE_YES)
8673 have_content = 1;
8674 else
8675 have_rejected_content = 1;
8676 if (choice == GOT_PATCH_CHOICE_QUIT)
8677 break;
8678 }
8679 if (have_content || have_rejected_content)
8680 err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
8681 outfile, rejectfile);
8682 done:
8683 free(label1);
8684 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
8685 err = got_error_from_errno("close");
8686 if (blob)
8687 got_object_blob_close(blob);
8688 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
8689 err = got_error_from_errno("close");
8690 if (staged_blob)
8691 got_object_blob_close(staged_blob);
8692 free_err = got_diffreg_result_free(diffreg_result);
8693 if (free_err && err == NULL)
8694 err = free_err;
8695 if (f1 && fclose(f1) == EOF && err == NULL)
8696 err = got_error_from_errno2("fclose", path1);
8697 if (f2 && fclose(f2) == EOF && err == NULL)
8698 err = got_error_from_errno2("fclose", path2);
8699 if (outfile && fclose(outfile) == EOF && err == NULL)
8700 err = got_error_from_errno2("fclose", *path_unstaged_content);
8701 if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
8702 err = got_error_from_errno2("fclose", *path_new_staged_content);
8703 if (path1 && unlink(path1) == -1 && err == NULL)
8704 err = got_error_from_errno2("unlink", path1);
8705 if (path2 && unlink(path2) == -1 && err == NULL)
8706 err = got_error_from_errno2("unlink", path2);
8707 if (err || !have_content) {
8708 if (*path_unstaged_content &&
8709 unlink(*path_unstaged_content) == -1 && err == NULL)
8710 err = got_error_from_errno2("unlink",
8711 *path_unstaged_content);
8712 free(*path_unstaged_content);
8713 *path_unstaged_content = NULL;
8714 }
8715 if (err || !have_content || !have_rejected_content) {
8716 if (*path_new_staged_content &&
8717 unlink(*path_new_staged_content) == -1 && err == NULL)
8718 err = got_error_from_errno2("unlink",
8719 *path_new_staged_content);
8720 free(*path_new_staged_content);
8721 *path_new_staged_content = NULL;
8722 }
8723 free(path1);
8724 free(path2);
8725 return err;
8726 }
8727
8728 static const struct got_error *
8729 unstage_hunks(struct got_object_id *staged_blob_id,
8730 struct got_blob_object *blob_base,
8731 struct got_object_id *blob_id, struct got_fileindex_entry *ie,
8732 const char *ondisk_path, const char *label_orig,
8733 struct got_worktree *worktree, struct got_repository *repo,
8734 got_worktree_patch_cb patch_cb, void *patch_arg,
8735 got_worktree_checkout_cb progress_cb, void *progress_arg)
8736 {
8737 const struct got_error *err = NULL;
8738 char *path_unstaged_content = NULL;
8739 char *path_new_staged_content = NULL;
8740 char *parent = NULL, *base_path = NULL;
8741 char *blob_base_path = NULL;
8742 struct got_object_id *new_staged_blob_id = NULL;
8743 FILE *f = NULL, *f_base = NULL, *f_deriv2 = NULL;
8744 struct stat sb;
8745
8746 err = create_unstaged_content(&path_unstaged_content,
8747 &path_new_staged_content, blob_id, staged_blob_id,
8748 ie->path, repo, patch_cb, patch_arg);
8749 if (err)
8750 return err;
8751
8752 if (path_unstaged_content == NULL)
8753 return NULL;
8754
8755 if (path_new_staged_content) {
8756 err = got_object_blob_create(&new_staged_blob_id,
8757 path_new_staged_content, repo);
8758 if (err)
8759 goto done;
8760 }
8761
8762 f = fopen(path_unstaged_content, "re");
8763 if (f == NULL) {
8764 err = got_error_from_errno2("fopen",
8765 path_unstaged_content);
8766 goto done;
8767 }
8768 if (fstat(fileno(f), &sb) == -1) {
8769 err = got_error_from_errno2("fstat", path_unstaged_content);
8770 goto done;
8771 }
8772 if (got_fileindex_entry_staged_filetype_get(ie) ==
8773 GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
8774 char link_target[PATH_MAX];
8775 size_t r;
8776 r = fread(link_target, 1, sizeof(link_target), f);
8777 if (r == 0 && ferror(f)) {
8778 err = got_error_from_errno("fread");
8779 goto done;
8780 }
8781 if (r >= sizeof(link_target)) { /* should not happen */
8782 err = got_error(GOT_ERR_NO_SPACE);
8783 goto done;
8784 }
8785 link_target[r] = '\0';
8786 err = merge_symlink(worktree, blob_base,
8787 ondisk_path, ie->path, label_orig, link_target,
8788 worktree->base_commit_id, repo, progress_cb,
8789 progress_arg);
8790 } else {
8791 int local_changes_subsumed;
8792
8793 err = got_path_dirname(&parent, ondisk_path);
8794 if (err)
8795 return err;
8796
8797 if (asprintf(&base_path, "%s/got-unstage-blob-orig",
8798 parent) == -1) {
8799 err = got_error_from_errno("asprintf");
8800 base_path = NULL;
8801 goto done;
8802 }
8803
8804 err = got_opentemp_named(&blob_base_path, &f_base,
8805 base_path, "");
8806 if (err)
8807 goto done;
8808 err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_base,
8809 blob_base);
8810 if (err)
8811 goto done;
8812
8813 /*
8814 * In order the run a 3-way merge with a symlink we copy the symlink's
8815 * target path into a temporary file and use that file with diff3.
8816 */
8817 if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8818 err = dump_symlink_target_path_to_file(&f_deriv2,
8819 ondisk_path);
8820 if (err)
8821 goto done;
8822 } else {
8823 int fd;
8824 fd = open(ondisk_path,
8825 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
8826 if (fd == -1) {
8827 err = got_error_from_errno2("open", ondisk_path);
8828 goto done;
8829 }
8830 f_deriv2 = fdopen(fd, "r");
8831 if (f_deriv2 == NULL) {
8832 err = got_error_from_errno2("fdopen", ondisk_path);
8833 close(fd);
8834 goto done;
8835 }
8836 }
8837
8838 err = merge_file(&local_changes_subsumed, worktree,
8839 f_base, f, f_deriv2, ondisk_path, ie->path,
8840 got_fileindex_perms_to_st(ie),
8841 label_orig, "unstaged", NULL, GOT_DIFF_ALGORITHM_MYERS,
8842 repo, progress_cb, progress_arg);
8843 }
8844 if (err)
8845 goto done;
8846
8847 if (new_staged_blob_id) {
8848 memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8849 SHA1_DIGEST_LENGTH);
8850 } else {
8851 got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8852 got_fileindex_entry_staged_filetype_set(ie, 0);
8853 }
8854 done:
8855 free(new_staged_blob_id);
8856 if (path_unstaged_content &&
8857 unlink(path_unstaged_content) == -1 && err == NULL)
8858 err = got_error_from_errno2("unlink", path_unstaged_content);
8859 if (path_new_staged_content &&
8860 unlink(path_new_staged_content) == -1 && err == NULL)
8861 err = got_error_from_errno2("unlink", path_new_staged_content);
8862 if (blob_base_path && unlink(blob_base_path) == -1 && err == NULL)
8863 err = got_error_from_errno2("unlink", blob_base_path);
8864 if (f_base && fclose(f_base) == EOF && err == NULL)
8865 err = got_error_from_errno2("fclose", path_unstaged_content);
8866 if (f && fclose(f) == EOF && err == NULL)
8867 err = got_error_from_errno2("fclose", path_unstaged_content);
8868 if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
8869 err = got_error_from_errno2("fclose", ondisk_path);
8870 free(path_unstaged_content);
8871 free(path_new_staged_content);
8872 free(blob_base_path);
8873 free(parent);
8874 free(base_path);
8875 return err;
8876 }
8877
8878 static const struct got_error *
8879 unstage_path(void *arg, unsigned char status,
8880 unsigned char staged_status, const char *relpath,
8881 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8882 struct got_object_id *commit_id, int dirfd, const char *de_name)
8883 {
8884 const struct got_error *err = NULL;
8885 struct unstage_path_arg *a = arg;
8886 struct got_fileindex_entry *ie;
8887 struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
8888 char *ondisk_path = NULL;
8889 char *id_str = NULL, *label_orig = NULL;
8890 int local_changes_subsumed;
8891 struct stat sb;
8892 int fd1 = -1, fd2 = -1;
8893
8894 if (staged_status != GOT_STATUS_ADD &&
8895 staged_status != GOT_STATUS_MODIFY &&
8896 staged_status != GOT_STATUS_DELETE)
8897 return NULL;
8898
8899 ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8900 if (ie == NULL)
8901 return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8902
8903 if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
8904 == -1)
8905 return got_error_from_errno("asprintf");
8906
8907 err = got_object_id_str(&id_str,
8908 commit_id ? commit_id : a->worktree->base_commit_id);
8909 if (err)
8910 goto done;
8911 if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
8912 id_str) == -1) {
8913 err = got_error_from_errno("asprintf");
8914 goto done;
8915 }
8916
8917 fd1 = got_opentempfd();
8918 if (fd1 == -1) {
8919 err = got_error_from_errno("got_opentempfd");
8920 goto done;
8921 }
8922 fd2 = got_opentempfd();
8923 if (fd2 == -1) {
8924 err = got_error_from_errno("got_opentempfd");
8925 goto done;
8926 }
8927
8928 switch (staged_status) {
8929 case GOT_STATUS_MODIFY:
8930 err = got_object_open_as_blob(&blob_base, a->repo,
8931 blob_id, 8192, fd1);
8932 if (err)
8933 break;
8934 /* fall through */
8935 case GOT_STATUS_ADD:
8936 if (a->patch_cb) {
8937 if (staged_status == GOT_STATUS_ADD) {
8938 int choice = GOT_PATCH_CHOICE_NONE;
8939 err = (*a->patch_cb)(&choice, a->patch_arg,
8940 staged_status, ie->path, NULL, 1, 1);
8941 if (err)
8942 break;
8943 if (choice != GOT_PATCH_CHOICE_YES)
8944 break;
8945 } else {
8946 err = unstage_hunks(staged_blob_id,
8947 blob_base, blob_id, ie, ondisk_path,
8948 label_orig, a->worktree, a->repo,
8949 a->patch_cb, a->patch_arg,
8950 a->progress_cb, a->progress_arg);
8951 break; /* Done with this file. */
8952 }
8953 }
8954 err = got_object_open_as_blob(&blob_staged, a->repo,
8955 staged_blob_id, 8192, fd2);
8956 if (err)
8957 break;
8958 switch (got_fileindex_entry_staged_filetype_get(ie)) {
8959 case GOT_FILEIDX_MODE_BAD_SYMLINK:
8960 case GOT_FILEIDX_MODE_REGULAR_FILE:
8961 err = merge_blob(&local_changes_subsumed, a->worktree,
8962 blob_base, ondisk_path, relpath,
8963 got_fileindex_perms_to_st(ie), label_orig,
8964 blob_staged, commit_id ? commit_id :
8965 a->worktree->base_commit_id, a->repo,
8966 a->progress_cb, a->progress_arg);
8967 break;
8968 case GOT_FILEIDX_MODE_SYMLINK:
8969 if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8970 char *staged_target;
8971 err = got_object_blob_read_to_str(
8972 &staged_target, blob_staged);
8973 if (err)
8974 goto done;
8975 err = merge_symlink(a->worktree, blob_base,
8976 ondisk_path, relpath, label_orig,
8977 staged_target, commit_id ? commit_id :
8978 a->worktree->base_commit_id,
8979 a->repo, a->progress_cb, a->progress_arg);
8980 free(staged_target);
8981 } else {
8982 err = merge_blob(&local_changes_subsumed,
8983 a->worktree, blob_base, ondisk_path,
8984 relpath, got_fileindex_perms_to_st(ie),
8985 label_orig, blob_staged,
8986 commit_id ? commit_id :
8987 a->worktree->base_commit_id, a->repo,
8988 a->progress_cb, a->progress_arg);
8989 }
8990 break;
8991 default:
8992 err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
8993 break;
8994 }
8995 if (err == NULL) {
8996 got_fileindex_entry_stage_set(ie,
8997 GOT_FILEIDX_STAGE_NONE);
8998 got_fileindex_entry_staged_filetype_set(ie, 0);
8999 }
9000 break;
9001 case GOT_STATUS_DELETE:
9002 if (a->patch_cb) {
9003 int choice = GOT_PATCH_CHOICE_NONE;
9004 err = (*a->patch_cb)(&choice, a->patch_arg,
9005 staged_status, ie->path, NULL, 1, 1);
9006 if (err)
9007 break;
9008 if (choice == GOT_PATCH_CHOICE_NO)
9009 break;
9010 if (choice != GOT_PATCH_CHOICE_YES) {
9011 err = got_error(GOT_ERR_PATCH_CHOICE);
9012 break;
9013 }
9014 }
9015 got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
9016 got_fileindex_entry_staged_filetype_set(ie, 0);
9017 err = get_file_status(&status, &sb, ie, ondisk_path,
9018 dirfd, de_name, a->repo);
9019 if (err)
9020 break;
9021 err = (*a->progress_cb)(a->progress_arg, status, relpath);
9022 break;
9023 }
9024 done:
9025 free(ondisk_path);
9026 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
9027 err = got_error_from_errno("close");
9028 if (blob_base)
9029 got_object_blob_close(blob_base);
9030 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
9031 err = got_error_from_errno("close");
9032 if (blob_staged)
9033 got_object_blob_close(blob_staged);
9034 free(id_str);
9035 free(label_orig);
9036 return err;
9037 }
9038
9039 const struct got_error *
9040 got_worktree_unstage(struct got_worktree *worktree,
9041 struct got_pathlist_head *paths,
9042 got_worktree_checkout_cb progress_cb, void *progress_arg,
9043 got_worktree_patch_cb patch_cb, void *patch_arg,
9044 struct got_repository *repo)
9045 {
9046 const struct got_error *err = NULL, *sync_err, *unlockerr;
9047 struct got_pathlist_entry *pe;
9048 struct got_fileindex *fileindex = NULL;
9049 char *fileindex_path = NULL;
9050 struct unstage_path_arg upa;
9051
9052 err = lock_worktree(worktree, LOCK_EX);
9053 if (err)
9054 return err;
9055
9056 err = open_fileindex(&fileindex, &fileindex_path, worktree);
9057 if (err)
9058 goto done;
9059
9060 upa.worktree = worktree;
9061 upa.fileindex = fileindex;
9062 upa.repo = repo;
9063 upa.progress_cb = progress_cb;
9064 upa.progress_arg = progress_arg;
9065 upa.patch_cb = patch_cb;
9066 upa.patch_arg = patch_arg;
9067 TAILQ_FOREACH(pe, paths, entry) {
9068 err = worktree_status(worktree, pe->path, fileindex, repo,
9069 unstage_path, &upa, NULL, NULL, 1, 0);
9070 if (err)
9071 goto done;
9072 }
9073
9074 sync_err = sync_fileindex(fileindex, fileindex_path);
9075 if (sync_err && err == NULL)
9076 err = sync_err;
9077 done:
9078 free(fileindex_path);
9079 if (fileindex)
9080 got_fileindex_free(fileindex);
9081 unlockerr = lock_worktree(worktree, LOCK_SH);
9082 if (unlockerr && err == NULL)
9083 err = unlockerr;
9084 return err;
9085 }
9086
9087 struct report_file_info_arg {
9088 struct got_worktree *worktree;
9089 got_worktree_path_info_cb info_cb;
9090 void *info_arg;
9091 struct got_pathlist_head *paths;
9092 got_cancel_cb cancel_cb;
9093 void *cancel_arg;
9094 };
9095
9096 static const struct got_error *
9097 report_file_info(void *arg, struct got_fileindex_entry *ie)
9098 {
9099 struct report_file_info_arg *a = arg;
9100 struct got_pathlist_entry *pe;
9101 struct got_object_id blob_id, staged_blob_id, commit_id;
9102 struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
9103 struct got_object_id *commit_idp = NULL;
9104 int stage;
9105
9106 if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
9107 return got_error(GOT_ERR_CANCELLED);
9108
9109 TAILQ_FOREACH(pe, a->paths, entry) {
9110 if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
9111 got_path_is_child(ie->path, pe->path, pe->path_len))
9112 break;
9113 }
9114 if (pe == NULL) /* not found */
9115 return NULL;
9116
9117 if (got_fileindex_entry_has_blob(ie)) {
9118 memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
9119 blob_idp = &blob_id;
9120 }
9121 stage = got_fileindex_entry_stage_get(ie);
9122 if (stage == GOT_FILEIDX_STAGE_MODIFY ||
9123 stage == GOT_FILEIDX_STAGE_ADD) {
9124 memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
9125 SHA1_DIGEST_LENGTH);
9126 staged_blob_idp = &staged_blob_id;
9127 }
9128
9129 if (got_fileindex_entry_has_commit(ie)) {
9130 memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
9131 commit_idp = &commit_id;
9132 }
9133
9134 return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
9135 (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
9136 }
9137
9138 const struct got_error *
9139 got_worktree_path_info(struct got_worktree *worktree,
9140 struct got_pathlist_head *paths,
9141 got_worktree_path_info_cb info_cb, void *info_arg,
9142 got_cancel_cb cancel_cb, void *cancel_arg)
9143
9144 {
9145 const struct got_error *err = NULL, *unlockerr;
9146 struct got_fileindex *fileindex = NULL;
9147 char *fileindex_path = NULL;
9148 struct report_file_info_arg arg;
9149
9150 err = lock_worktree(worktree, LOCK_SH);
9151 if (err)
9152 return err;
9153
9154 err = open_fileindex(&fileindex, &fileindex_path, worktree);
9155 if (err)
9156 goto done;
9157
9158 arg.worktree = worktree;
9159 arg.info_cb = info_cb;
9160 arg.info_arg = info_arg;
9161 arg.paths = paths;
9162 arg.cancel_cb = cancel_cb;
9163 arg.cancel_arg = cancel_arg;
9164 err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
9165 &arg);
9166 done:
9167 free(fileindex_path);
9168 if (fileindex)
9169 got_fileindex_free(fileindex);
9170 unlockerr = lock_worktree(worktree, LOCK_UN);
9171 if (unlockerr && err == NULL)
9172 err = unlockerr;
9173 return err;
9174 }
9175
9176 static const struct got_error *
9177 patch_check_path(const char *p, char **path, unsigned char *status,
9178 unsigned char *staged_status, struct got_fileindex *fileindex,
9179 struct got_worktree *worktree, struct got_repository *repo)
9180 {
9181 const struct got_error *err;
9182 struct got_fileindex_entry *ie;
9183 struct stat sb;
9184 char *ondisk_path = NULL;
9185
9186 err = got_worktree_resolve_path(path, worktree, p);
9187 if (err)
9188 return err;
9189
9190 if (asprintf(&ondisk_path, "%s%s%s", worktree->root_path,
9191 *path[0] ? "/" : "", *path) == -1)
9192 return got_error_from_errno("asprintf");
9193
9194 ie = got_fileindex_entry_get(fileindex, *path, strlen(*path));
9195 if (ie) {
9196 *staged_status = get_staged_status(ie);
9197 err = get_file_status(status, &sb, ie, ondisk_path, -1, NULL,
9198 repo);
9199 if (err)
9200 goto done;
9201 } else {
9202 *staged_status = GOT_STATUS_NO_CHANGE;
9203 *status = GOT_STATUS_UNVERSIONED;
9204 if (lstat(ondisk_path, &sb) == -1) {
9205 if (errno != ENOENT) {
9206 err = got_error_from_errno2("lstat",
9207 ondisk_path);
9208 goto done;
9209 }
9210 *status = GOT_STATUS_NONEXISTENT;
9211 }
9212 }
9213
9214 done:
9215 free(ondisk_path);
9216 return err;
9217 }
9218
9219 static const struct got_error *
9220 patch_can_rm(const char *path, unsigned char status,
9221 unsigned char staged_status)
9222 {
9223 if (status == GOT_STATUS_NONEXISTENT)
9224 return got_error_set_errno(ENOENT, path);
9225 if (status != GOT_STATUS_NO_CHANGE &&
9226 status != GOT_STATUS_ADD &&
9227 status != GOT_STATUS_MODIFY &&
9228 status != GOT_STATUS_MODE_CHANGE)
9229 return got_error_path(path, GOT_ERR_FILE_STATUS);
9230 if (staged_status == GOT_STATUS_DELETE)
9231 return got_error_path(path, GOT_ERR_FILE_STATUS);
9232 return NULL;
9233 }
9234
9235 static const struct got_error *
9236 patch_can_add(const char *path, unsigned char status)
9237 {
9238 if (status != GOT_STATUS_NONEXISTENT)
9239 return got_error_path(path, GOT_ERR_FILE_STATUS);
9240 return NULL;
9241 }
9242
9243 static const struct got_error *
9244 patch_can_edit(const char *path, unsigned char status,
9245 unsigned char staged_status)
9246 {
9247 if (status == GOT_STATUS_NONEXISTENT)
9248 return got_error_set_errno(ENOENT, path);
9249 if (status != GOT_STATUS_NO_CHANGE &&
9250 status != GOT_STATUS_ADD &&
9251 status != GOT_STATUS_MODIFY)
9252 return got_error_path(path, GOT_ERR_FILE_STATUS);
9253 if (staged_status == GOT_STATUS_DELETE)
9254 return got_error_path(path, GOT_ERR_FILE_STATUS);
9255 return NULL;
9256 }
9257
9258 const struct got_error *
9259 got_worktree_patch_prepare(struct got_fileindex **fileindex,
9260 char **fileindex_path, struct got_worktree *worktree)
9261 {
9262 return open_fileindex(fileindex, fileindex_path, worktree);
9263 }
9264
9265 const struct got_error *
9266 got_worktree_patch_check_path(const char *old, const char *new,
9267 char **oldpath, char **newpath, struct got_worktree *worktree,
9268 struct got_repository *repo, struct got_fileindex *fileindex)
9269 {
9270 const struct got_error *err = NULL;
9271 int file_renamed = 0;
9272 unsigned char status_old, staged_status_old;
9273 unsigned char status_new, staged_status_new;
9274
9275 *oldpath = NULL;
9276 *newpath = NULL;
9277
9278 err = patch_check_path(old != NULL ? old : new, oldpath,
9279 &status_old, &staged_status_old, fileindex, worktree, repo);
9280 if (err)
9281 goto done;
9282
9283 err = patch_check_path(new != NULL ? new : old, newpath,
9284 &status_new, &staged_status_new, fileindex, worktree, repo);
9285 if (err)
9286 goto done;
9287
9288 if (old != NULL && new != NULL && strcmp(old, new) != 0)
9289 file_renamed = 1;
9290
9291 if (old != NULL && new == NULL)
9292 err = patch_can_rm(*oldpath, status_old, staged_status_old);
9293 else if (file_renamed) {
9294 err = patch_can_rm(*oldpath, status_old, staged_status_old);
9295 if (err == NULL)
9296 err = patch_can_add(*newpath, status_new);
9297 } else if (old == NULL)
9298 err = patch_can_add(*newpath, status_new);
9299 else
9300 err = patch_can_edit(*newpath, status_new, staged_status_new);
9301
9302 done:
9303 if (err) {
9304 free(*oldpath);
9305 *oldpath = NULL;
9306 free(*newpath);
9307 *newpath = NULL;
9308 }
9309 return err;
9310 }
9311
9312 const struct got_error *
9313 got_worktree_patch_schedule_add(const char *path, struct got_repository *repo,
9314 struct got_worktree *worktree, struct got_fileindex *fileindex,
9315 got_worktree_checkout_cb progress_cb, void *progress_arg)
9316 {
9317 struct schedule_addition_args saa;
9318
9319 memset(&saa, 0, sizeof(saa));
9320 saa.worktree = worktree;
9321 saa.fileindex = fileindex;
9322 saa.progress_cb = progress_cb;
9323 saa.progress_arg = progress_arg;
9324 saa.repo = repo;
9325
9326 return worktree_status(worktree, path, fileindex, repo,
9327 schedule_addition, &saa, NULL, NULL, 1, 0);
9328 }
9329
9330 const struct got_error *
9331 got_worktree_patch_schedule_rm(const char *path, struct got_repository *repo,
9332 struct got_worktree *worktree, struct got_fileindex *fileindex,
9333 got_worktree_delete_cb progress_cb, void *progress_arg)
9334 {
9335 struct schedule_deletion_args sda;
9336
9337 memset(&sda, 0, sizeof(sda));
9338 sda.worktree = worktree;
9339 sda.fileindex = fileindex;
9340 sda.progress_cb = progress_cb;
9341 sda.progress_arg = progress_arg;
9342 sda.repo = repo;
9343 sda.delete_local_mods = 0;
9344 sda.keep_on_disk = 0;
9345 sda.ignore_missing_paths = 0;
9346 sda.status_codes = NULL;
9347
9348 return worktree_status(worktree, path, fileindex, repo,
9349 schedule_for_deletion, &sda, NULL, NULL, 1, 1);
9350 }
9351
9352 const struct got_error *
9353 got_worktree_patch_complete(struct got_fileindex *fileindex,
9354 const char *fileindex_path)
9355 {
9356 const struct got_error *err = NULL;
9357
9358 err = sync_fileindex(fileindex, fileindex_path);
9359 got_fileindex_free(fileindex);
9360
9361 return err;
9362 }
portable version of Game of Trees