2 * Copyright (c) 2022 Omar Polo <op@openbsd.org>
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.
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.
18 * Things that we may want to support:
19 * + support indented patches?
20 * + support other kinds of patches?
22 #include "got_compat.h"
24 #include <sys/types.h>
25 #include <sys/queue.h>
26 #include <sys/socket.h>
39 #include "got_error.h"
40 #include "got_object.h"
42 #include "got_reference.h"
43 #include "got_cancel.h"
44 #include "got_worktree.h"
45 #include "got_repository.h"
46 #include "got_opentemp.h"
47 #include "got_patch.h"
50 #include "got_lib_delta.h"
51 #include "got_lib_diff.h"
52 #include "got_lib_object.h"
53 #include "got_lib_privsep.h"
54 #include "got_lib_hash.h"
57 #define MIN(a, b) ((a) < (b) ? (a) : (b))
60 struct got_patch_line {
66 struct got_patch_hunk {
67 STAILQ_ENTRY(got_patch_hunk) entries;
68 const struct got_error *err;
79 struct got_patch_line *lines;
82 STAILQ_HEAD(got_patch_hunk_head, got_patch_hunk);
89 struct got_patch_hunk_head head;
93 got_patch_progress_cb progress_cb;
95 struct got_patch_hunk_head *head;
99 apply_umask(mode_t mode)
108 static const struct got_error *
109 send_patch(struct imsgbuf *ibuf, int fd)
111 const struct got_error *err = NULL;
113 if (imsg_compose(ibuf, GOT_IMSG_PATCH_FILE, 0, 0, fd,
115 err = got_error_from_errno(
116 "imsg_compose GOT_IMSG_PATCH_FILE");
121 return got_privsep_flush_imsg(ibuf);
125 patch_free(struct got_patch *p)
127 struct got_patch_hunk *h;
130 while (!STAILQ_EMPTY(&p->head)) {
131 h = STAILQ_FIRST(&p->head);
132 STAILQ_REMOVE_HEAD(&p->head, entries);
134 for (i = 0; i < h->len; ++i)
135 free(h->lines[i].line);
143 memset(p, 0, sizeof(*p));
144 STAILQ_INIT(&p->head);
147 static const struct got_error *
148 pushline(struct got_patch_hunk *h, const char *line, size_t len)
153 if (h->len == h->cap) {
154 if ((newcap = h->cap * 1.5) == 0)
156 t = recallocarray(h->lines, h->cap, newcap,
157 sizeof(h->lines[0]));
159 return got_error_from_errno("recallocarray");
164 if ((t = malloc(len - 1)) == NULL)
165 return got_error_from_errno("malloc");
166 memcpy(t, line + 1, len - 1); /* skip the line type */
168 h->lines[h->len].mode = *line;
169 h->lines[h->len].line = t;
170 h->lines[h->len].len = len - 2; /* line type and trailing NUL */
175 static const struct got_error *
176 recv_patch(struct imsgbuf *ibuf, int *done, struct got_patch *p, int strip)
178 const struct got_error *err = NULL;
180 struct got_imsg_patch_hunk hdr;
181 struct got_imsg_patch patch;
182 struct got_patch_hunk *h = NULL;
186 memset(p, 0, sizeof(*p));
187 STAILQ_INIT(&p->head);
189 err = got_privsep_recv_imsg(&imsg, ibuf, 0);
192 if (imsg.hdr.type == GOT_IMSG_PATCH_EOF) {
196 if (imsg.hdr.type != GOT_IMSG_PATCH) {
197 err = got_error(GOT_ERR_PRIVSEP_MSG);
200 datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
201 if (datalen != sizeof(patch)) {
202 err = got_error(GOT_ERR_PRIVSEP_LEN);
205 memcpy(&patch, imsg.data, sizeof(patch));
207 if (patch.old[sizeof(patch.old)-1] != '\0' ||
208 patch.new[sizeof(patch.new)-1] != '\0' ||
209 patch.cid[sizeof(patch.cid)-1] != '\0' ||
210 patch.blob[sizeof(patch.blob)-1] != '\0') {
211 err = got_error(GOT_ERR_PRIVSEP_LEN);
215 if (*patch.cid != '\0')
216 strlcpy(p->cid, patch.cid, sizeof(p->cid));
218 if (*patch.blob != '\0')
219 strlcpy(p->blob, patch.blob, sizeof(p->blob));
221 p->xbit = patch.xbit;
223 /* automatically set strip=1 for git-style diffs */
224 if (strip == -1 && patch.git &&
225 (*patch.old == '\0' || !strncmp(patch.old, "a/", 2)) &&
226 (*patch.new == '\0' || !strncmp(patch.new, "b/", 2)))
229 /* prefer the new name if not /dev/null for not git-style diffs */
230 if (!patch.git && *patch.new != '\0' && *patch.old != '\0') {
231 err = got_path_strip(&p->old, patch.new, strip);
234 } else if (*patch.old != '\0') {
235 err = got_path_strip(&p->old, patch.old, strip);
240 if (*patch.new != '\0') {
241 err = got_path_strip(&p->new, patch.new, strip);
246 if (p->old == NULL && p->new == NULL) {
247 err = got_error(GOT_ERR_PATCH_MALFORMED);
256 err = got_privsep_recv_imsg(&imsg, ibuf, 0);
262 datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
263 switch (imsg.hdr.type) {
264 case GOT_IMSG_PATCH_DONE:
265 if (h != NULL && h->len == 0)
266 err = got_error(GOT_ERR_PATCH_MALFORMED);
268 case GOT_IMSG_PATCH_HUNK:
270 (h->len == 0 || h->old_nonl || h->new_nonl)) {
271 err = got_error(GOT_ERR_PATCH_MALFORMED);
275 if (datalen != sizeof(hdr)) {
276 err = got_error(GOT_ERR_PRIVSEP_LEN);
279 memcpy(&hdr, imsg.data, sizeof(hdr));
280 if (hdr.oldfrom < 0 || hdr.newfrom < 0) {
281 err = got_error(GOT_ERR_PRIVSEP_LEN);
284 if ((h = calloc(1, sizeof(*h))) == NULL) {
285 err = got_error_from_errno("calloc");
288 h->old_from = hdr.oldfrom;
289 h->old_lines = hdr.oldlines;
290 h->new_from = hdr.newfrom;
291 h->new_lines = hdr.newlines;
292 STAILQ_INSERT_TAIL(&p->head, h, entries);
294 case GOT_IMSG_PATCH_LINE:
296 err = got_error(GOT_ERR_PRIVSEP_MSG);
300 /* at least one char */
301 if (datalen < 2 || t[datalen-1] != '\0') {
302 err = got_error(GOT_ERR_PRIVSEP_MSG);
305 if (*t != ' ' && *t != '-' && *t != '+' &&
307 err = got_error(GOT_ERR_PRIVSEP_MSG);
312 err = pushline(h, t, datalen);
313 else if (lastmode == '-')
315 else if (lastmode == '+')
318 err = got_error(GOT_ERR_PATCH_MALFORMED);
326 err = got_error(GOT_ERR_PRIVSEP_MSG);
342 reverse_patch(struct got_patch *p)
344 struct got_patch_hunk *h;
348 STAILQ_FOREACH(h, &p->head, entries) {
350 h->old_from = h->new_from;
354 h->old_lines = h->new_lines;
358 h->old_nonl = h->new_nonl;
361 for (i = 0; i < h->len; ++i) {
362 if (h->lines[i].mode == '+')
363 h->lines[i].mode = '-';
364 else if (h->lines[i].mode == '-')
365 h->lines[i].mode = '+';
371 * Copy data from orig starting at copypos until pos into tmp.
372 * If pos is -1, copy until EOF.
374 static const struct got_error *
375 copy(FILE *tmp, FILE *orig, off_t copypos, off_t pos)
380 if (fseeko(orig, copypos, SEEK_SET) == -1)
381 return got_error_from_errno("fseeko");
383 while (pos == -1 || copypos < pos) {
386 len = MIN(len, (size_t)pos - copypos);
387 r = fread(buf, 1, len, orig);
388 if (r != len && ferror(orig))
389 return got_error_from_errno("fread");
390 w = fwrite(buf, 1, r, tmp);
392 return got_error_from_errno("fwrite");
394 if (r != len && feof(orig)) {
397 return got_error(GOT_ERR_HUNK_FAILED);
403 static int lines_eq(struct got_patch_line *, const char *, size_t, int *);
405 static const struct got_error *
406 locate_hunk(FILE *orig, struct got_patch_hunk *h, off_t *pos, int *lineno)
408 const struct got_error *err = NULL;
409 struct got_patch_line *l = &h->lines[0];
415 int mangled = 0, match_lineno = -1;
418 linelen = getline(&line, &linesize, orig);
421 err = got_error_from_errno("getline");
422 else if (match == -1)
423 err = got_error(GOT_ERR_HUNK_FAILED);
428 if ((mode == ' ' && lines_eq(l, line, linelen, &mangled)) ||
429 (mode == '-' && lines_eq(l, line, linelen, &mangled)) ||
430 (mode == '+' && *lineno == h->old_from)) {
431 match = ftello(orig);
433 err = got_error_from_errno("ftello");
437 match_lineno = (*lineno)-1;
440 if (*lineno >= h->old_from && match != -1) {
449 *lineno = match_lineno;
450 if (fseeko(orig, match, SEEK_SET) == -1)
451 err = got_error_from_errno("fseeko");
459 lines_eq(struct got_patch_line *l, const char *b, size_t len, int *mangled)
464 if (len > 00 && b[len - 1] == '\n')
468 if (l->len == len && !memcmp(a, b, len))
476 (a[i] == '\t' || a[i] == ' ' || a[i] == '\f'))
479 (b[j] == '\t' || b[j] == ' ' || b[j] == '\f'))
481 if (i == l->len || j == len || a[i] != b[j])
486 return (i == l->len && j == len);
489 static const struct got_error *
490 test_hunk(FILE *orig, struct got_patch_hunk *h)
492 const struct got_error *err = NULL;
494 size_t linesize = 0, i = 0;
498 for (i = 0; i < h->len; ++i) {
499 switch (h->lines[i].mode) {
504 linelen = getline(&line, &linesize, orig);
507 err = got_error_from_errno("getline");
510 GOT_ERR_HUNK_FAILED);
513 if (!lines_eq(&h->lines[i], line, linelen, &mangled)) {
514 err = got_error(GOT_ERR_HUNK_FAILED);
528 static const struct got_error *
529 apply_hunk(FILE *orig, FILE *tmp, struct got_patch_hunk *h, int *lineno,
532 const struct got_error *err = NULL;
534 size_t linesize = 0, i, new = 0;
540 if (orig != NULL && fseeko(orig, from, SEEK_SET) == -1)
541 return got_error_from_errno("fseeko");
543 for (i = 0; i < h->len; ++i) {
544 switch (mode = h->lines[i].mode) {
549 linelen = getline(&line, &linesize, orig);
551 err = got_error_from_errno("getline");
554 if (line[linelen - 1] == '\n')
555 line[linelen - 1] = '\0';
559 t = h->lines[i].line;
564 if (fwrite(t, 1, l, tmp) != l ||
565 fputc('\n', tmp) == EOF) {
566 err = got_error_from_errno("fprintf");
572 t = h->lines[i].line;
574 if (fwrite(t, 1, l, tmp) != l) {
575 err = got_error_from_errno("fprintf");
578 if (new != h->new_lines || !h->new_nonl) {
579 if (fprintf(tmp, "\n") < 0) {
580 err = got_error_from_errno("fprintf");
593 static const struct got_error *
594 patch_file(struct got_patch *p, FILE *orig, FILE *tmp)
596 const struct got_error *err = NULL;
597 struct got_patch_hunk *h;
605 if (p->old == NULL) { /* create */
606 h = STAILQ_FIRST(&p->head);
607 if (h == NULL || STAILQ_NEXT(h, entries) != NULL)
608 return got_error(GOT_ERR_PATCH_MALFORMED);
609 return apply_hunk(orig, tmp, h, &lineno, 0);
612 /* When deleting binary files there are no hunks to apply. */
613 if (p->new == NULL && STAILQ_EMPTY(&p->head))
616 if (fstat(fileno(orig), &sb) == -1)
617 return got_error_from_errno("fstat");
620 STAILQ_FOREACH(h, &p->head, entries) {
622 err = locate_hunk(orig, h, &pos, &lineno);
623 if (err != NULL && err->code == GOT_ERR_HUNK_FAILED)
627 err = copy(tmp, orig, copypos, pos);
632 err = test_hunk(orig, h);
633 if (err != NULL && err->code == GOT_ERR_HUNK_FAILED) {
635 * try to apply the hunk again starting the search
636 * after the previous partial match.
638 if (fseeko(orig, pos, SEEK_SET) == -1)
639 return got_error_from_errno("fseeko");
640 linelen = getline(&line, &linesize, orig);
642 return got_error_from_errno("getline");
649 if (lineno + 1 != h->old_from)
650 h->offset = lineno + 1 - h->old_from;
652 err = apply_hunk(orig, tmp, h, &lineno, pos);
656 copypos = ftello(orig);
658 return got_error_from_errno("ftello");
661 if (p->new == NULL && sb.st_size != copypos) {
662 h = STAILQ_FIRST(&p->head);
663 h->err = got_error(GOT_ERR_HUNK_FAILED);
665 } else if (!feof(orig))
666 err = copy(tmp, orig, copypos, -1);
671 static const struct got_error *
672 report_progress(struct patch_args *pa, const char *old, const char *new,
673 unsigned char status, const struct got_error *orig_error)
675 const struct got_error *err;
676 struct got_patch_hunk *h;
678 err = pa->progress_cb(pa->progress_arg, old, new, status,
679 orig_error, 0, 0, 0, 0, 0, 0, NULL);
683 STAILQ_FOREACH(h, pa->head, entries) {
684 if (h->offset == 0 && !h->ws_mangled && h->err == NULL)
687 err = pa->progress_cb(pa->progress_arg, old, new, 0, NULL,
688 h->old_from, h->old_lines, h->new_from, h->new_lines,
689 h->offset, h->ws_mangled, h->err);
697 static const struct got_error *
698 patch_delete(void *arg, unsigned char status, unsigned char staged_status,
701 return report_progress(arg, path, NULL, status, NULL);
704 static const struct got_error *
705 patch_add(void *arg, unsigned char status, const char *path)
707 return report_progress(arg, NULL, path, status, NULL);
710 static const struct got_error *
711 open_blob(char **path, FILE **fp, const char *blobid,
712 struct got_repository *repo)
714 const struct got_error *err = NULL;
715 struct got_blob_object *blob = NULL;
716 struct got_object_id id, *idptr, *matched_id = NULL;
722 if (strlen(blobid) != SHA1_DIGEST_STRING_LENGTH - 1) {
723 err = got_repo_match_object_id(&matched_id, NULL, blobid,
724 GOT_OBJ_TYPE_BLOB, NULL /* do not resolve tags */,
730 if (!got_parse_object_id(&id, blobid, GOT_HASH_SHA1))
731 return got_error(GOT_ERR_BAD_OBJ_ID_STR);
735 fd = got_opentempfd();
737 err = got_error_from_errno("got_opentempfd");
741 err = got_object_open_as_blob(&blob, repo, idptr, 8192, fd);
745 err = got_opentemp_named(path, fp, GOT_TMPDIR_STR "/got-patch-blob",
750 err = got_object_blob_dump_to_file(NULL, NULL, NULL, *fp, blob);
755 if (fd != -1 && close(fd) == -1 && err == NULL)
756 err = got_error_from_errno("close");
758 got_object_blob_close(blob);
759 if (matched_id != NULL)
773 static const struct got_error *
774 prepare_merge(int *do_merge, char **apath, FILE **afile,
775 struct got_worktree *worktree, struct got_repository *repo,
776 struct got_patch *p, struct got_object_id *commit_id,
777 struct got_tree_object *tree, const char *path)
779 const struct got_error *err = NULL;
785 /* don't run the diff3 merge on creations/deletions */
786 if (p->old == NULL || p->new == NULL)
790 struct got_object_id *id;
792 err = got_object_tree_find_path(&id, NULL, repo, tree, path);
795 got_sha1_digest_to_str(id->sha1, p->blob, sizeof(p->blob));
796 got_sha1_digest_to_str(commit_id->sha1, p->cid, sizeof(p->cid));
798 err = open_blob(apath, afile, p->blob, repo);
799 *do_merge = err == NULL;
800 } else if (*p->blob != '\0') {
801 err = open_blob(apath, afile, p->blob, repo);
803 * ignore failures to open this blob, we might have
806 if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT) &&
807 err->code != GOT_ERR_NO_OBJ)
809 *do_merge = err == NULL;
816 static const struct got_error *
817 apply_patch(int *overlapcnt, struct got_worktree *worktree,
818 struct got_repository *repo, struct got_fileindex *fileindex,
819 const char *old, const char *new, struct got_patch *p, int nop,
820 int reverse, struct got_object_id *commit_id,
821 struct got_tree_object *tree, struct patch_args *pa,
822 got_cancel_cb cancel_cb, void *cancel_arg)
824 const struct got_error *err = NULL;
826 int do_merge = 0, file_renamed = 0;
827 char *oldlabel = NULL, *newlabel = NULL, *anclabel = NULL;
828 char *oldpath = NULL, *newpath = NULL;
829 char *tmppath = NULL, *template = NULL;
830 char *apath = NULL, *mergepath = NULL;
831 FILE *oldfile = NULL, *tmpfile = NULL, *afile = NULL, *mergefile = NULL;
833 mode_t mode = GOT_DEFAULT_FILE_MODE;
837 err = prepare_merge(&do_merge, &apath, &afile, worktree, repo, p,
838 commit_id, tree, old);
842 if (reverse && !do_merge)
845 if (asprintf(&oldpath, "%s/%s", got_worktree_get_root_path(worktree),
847 err = got_error_from_errno("asprintf");
851 if (asprintf(&newpath, "%s/%s", got_worktree_get_root_path(worktree),
853 err = got_error_from_errno("asprintf");
857 file_renamed = strcmp(oldpath, newpath);
859 if (asprintf(&template, "%s/got-patch",
860 got_worktree_get_root_path(worktree)) == -1) {
861 err = got_error_from_errno(template);
865 if (p->old != NULL) {
866 if ((oldfile = fopen(oldpath, "r")) == NULL) {
867 err = got_error_from_errno2("open", oldpath);
870 if (fstat(fileno(oldfile), &sb) == -1) {
871 err = got_error_from_errno2("fstat", oldpath);
876 mode |= (S_IXUSR | S_IXGRP | S_IXOTH);
878 err = got_opentemp_named(&tmppath, &tmpfile, template, "");
881 outfd = fileno(tmpfile);
882 err = patch_file(p, afile != NULL ? afile : oldfile, tmpfile);
887 const char *type, *id;
889 if (fseeko(afile, 0, SEEK_SET) == -1 ||
890 fseeko(oldfile, 0, SEEK_SET) == -1 ||
891 fseeko(tmpfile, 0, SEEK_SET) == -1) {
892 err = got_error_from_errno("fseeko");
896 if (asprintf(&oldlabel, "--- %s", p->old) == -1) {
897 err = got_error_from_errno("asprintf");
902 if (asprintf(&newlabel, "+++ %s", p->new) == -1) {
903 err = got_error_from_errno("asprintf");
908 if (*p->cid != '\0') {
916 if (asprintf(&anclabel, "%s %s", type, id) == -1) {
917 err = got_error_from_errno("asprintf");
935 err = got_opentemp_named(&mergepath, &mergefile, template, "");
938 outfd = fileno(mergefile);
940 err = got_merge_diff3(overlapcnt, outfd, tmpfile, afile,
941 oldfile, oldlabel, anclabel, newlabel,
942 GOT_DIFF_ALGORITHM_PATIENCE);
950 if (p->old != NULL && p->new == NULL) {
951 err = got_worktree_patch_schedule_rm(old, repo, worktree,
952 fileindex, patch_delete, pa);
956 if (fchmod(outfd, apply_umask(mode)) == -1) {
957 err = got_error_from_errno2("chmod", tmppath);
962 err = got_path_move_file(mergepath, newpath);
968 err = got_path_move_file(tmppath, newpath);
976 err = got_worktree_patch_schedule_rm(old, repo, worktree,
977 fileindex, patch_delete, pa);
979 err = got_worktree_patch_schedule_add(new, repo,
980 worktree, fileindex, patch_add,
984 } else if (p->old == NULL) {
985 err = got_worktree_patch_schedule_add(new, repo, worktree,
986 fileindex, patch_add, pa);
989 } else if (*overlapcnt != 0)
990 err = report_progress(pa, old, new, GOT_STATUS_CONFLICT, NULL);
992 err = report_progress(pa, old, new, GOT_STATUS_MERGE, NULL);
994 err = report_progress(pa, old, new, GOT_STATUS_MODIFY, NULL);
999 if (tmppath != NULL && unlink(tmppath) == -1 && err == NULL)
1000 err = got_error_from_errno("unlink");
1001 if (tmpfile != NULL && fclose(tmpfile) == EOF && err == NULL)
1002 err = got_error_from_errno("fclose");
1006 if (oldfile != NULL && fclose(oldfile) == EOF && err == NULL)
1007 err = got_error_from_errno("fclose");
1009 if (apath != NULL && unlink(apath) == -1 && err == NULL)
1010 err = got_error_from_errno("unlink");
1011 if (afile != NULL && fclose(afile) == EOF && err == NULL)
1012 err = got_error_from_errno("fclose");
1015 if (mergepath != NULL && unlink(mergepath) == -1 && err == NULL)
1016 err = got_error_from_errno("unlink");
1017 if (mergefile != NULL && fclose(mergefile) == EOF && err == NULL)
1018 err = got_error_from_errno("fclose");
1028 const struct got_error *
1029 got_patch(int fd, struct got_worktree *worktree, struct got_repository *repo,
1030 int nop, int strip, int reverse, struct got_object_id *commit_id,
1031 got_patch_progress_cb progress_cb, void *progress_arg,
1032 got_cancel_cb cancel_cb, void *cancel_arg)
1034 const struct got_error *err = NULL, *complete_err = NULL;
1035 struct got_fileindex *fileindex = NULL;
1036 struct got_commit_object *commit = NULL;
1037 struct got_tree_object *tree = NULL;
1038 char *fileindex_path = NULL;
1039 char *oldpath, *newpath;
1040 struct imsgbuf *ibuf;
1041 int imsg_fds[2] = {-1, -1};
1042 int overlapcnt, done = 0, failed = 0;
1045 ibuf = calloc(1, sizeof(*ibuf));
1047 err = got_error_from_errno("calloc");
1051 if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1) {
1052 err = got_error_from_errno("socketpair");
1058 err = got_error_from_errno("fork");
1060 } else if (pid == 0) {
1061 got_privsep_exec_child(imsg_fds, GOT_PATH_PROG_READ_PATCH,
1066 if (close(imsg_fds[1]) == -1) {
1067 err = got_error_from_errno("close");
1071 imsg_init(ibuf, imsg_fds[0]);
1073 err = send_patch(ibuf, fd);
1078 err = got_worktree_patch_prepare(&fileindex, &fileindex_path,
1084 err = got_object_open_as_commit(&commit, repo, commit_id);
1088 err = got_object_open_as_tree(&tree, repo, commit->tree_id);
1093 while (!done && err == NULL) {
1095 struct patch_args pa;
1097 pa.progress_cb = progress_cb;
1098 pa.progress_arg = progress_arg;
1101 err = recv_patch(ibuf, &done, &p, strip);
1105 err = got_worktree_patch_check_path(p.old, p.new, &oldpath,
1106 &newpath, worktree, repo, fileindex);
1108 err = apply_patch(&overlapcnt, worktree, repo,
1109 fileindex, oldpath, newpath, &p, nop, reverse,
1110 commit_id, tree, &pa, cancel_cb, cancel_arg);
1113 /* recoverable errors */
1114 if (err->code == GOT_ERR_FILE_STATUS ||
1115 (err->code == GOT_ERR_ERRNO && errno == ENOENT))
1116 err = report_progress(&pa, p.old, p.new,
1117 GOT_STATUS_CANNOT_UPDATE, err);
1118 else if (err->code == GOT_ERR_HUNK_FAILED)
1119 err = report_progress(&pa, p.old, p.new,
1120 GOT_STATUS_CANNOT_UPDATE, NULL);
1122 if (overlapcnt != 0)
1134 if (fileindex != NULL)
1135 complete_err = got_worktree_patch_complete(fileindex,
1137 if (complete_err && err == NULL)
1139 free(fileindex_path);
1141 got_object_tree_close(tree);
1143 got_object_commit_close(commit);
1144 if (fd != -1 && close(fd) == -1 && err == NULL)
1145 err = got_error_from_errno("close");
1148 if (imsg_fds[0] != -1 && close(imsg_fds[0]) == -1 && err == NULL)
1149 err = got_error_from_errno("close");
1150 if (imsg_fds[1] != -1 && close(imsg_fds[1]) == -1 && err == NULL)
1151 err = got_error_from_errno("close");
1152 if (err == NULL && failed)
1153 err = got_error(GOT_ERR_PATCH_FAILED);