2 069bbb86 2022-03-07 thomas * Copyright (c) 2022 Omar Polo <op@openbsd.org>
4 069bbb86 2022-03-07 thomas * Permission to use, copy, modify, and distribute this software for any
5 069bbb86 2022-03-07 thomas * purpose with or without fee is hereby granted, provided that the above
6 069bbb86 2022-03-07 thomas * copyright notice and this permission notice appear in all copies.
8 069bbb86 2022-03-07 thomas * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 069bbb86 2022-03-07 thomas * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 069bbb86 2022-03-07 thomas * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 069bbb86 2022-03-07 thomas * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 069bbb86 2022-03-07 thomas * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 069bbb86 2022-03-07 thomas * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 069bbb86 2022-03-07 thomas * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 069bbb86 2022-03-07 thomas * Apply patches.
18 069bbb86 2022-03-07 thomas * Things that we may want to support:
19 069bbb86 2022-03-07 thomas * + support indented patches?
20 069bbb86 2022-03-07 thomas * + support other kinds of patches?
23 069bbb86 2022-03-07 thomas #include <sys/types.h>
24 8b925c6c 2022-07-16 thomas #include <sys/queue.h>
25 069bbb86 2022-03-07 thomas #include <sys/socket.h>
26 7dd42450 2022-03-13 thomas #include <sys/stat.h>
27 069bbb86 2022-03-07 thomas #include <sys/uio.h>
29 bb90ca7b 2022-07-03 thomas #include <ctype.h>
30 42d9d68e 2022-03-13 thomas #include <errno.h>
31 069bbb86 2022-03-07 thomas #include <limits.h>
32 069bbb86 2022-03-07 thomas #include <stdint.h>
33 069bbb86 2022-03-07 thomas #include <stdio.h>
34 069bbb86 2022-03-07 thomas #include <stdlib.h>
35 069bbb86 2022-03-07 thomas #include <string.h>
36 069bbb86 2022-03-07 thomas #include <unistd.h>
38 069bbb86 2022-03-07 thomas #include "got_error.h"
39 069bbb86 2022-03-07 thomas #include "got_object.h"
40 069bbb86 2022-03-07 thomas #include "got_path.h"
41 069bbb86 2022-03-07 thomas #include "got_reference.h"
42 069bbb86 2022-03-07 thomas #include "got_cancel.h"
43 069bbb86 2022-03-07 thomas #include "got_worktree.h"
44 0f76ab83 2022-06-23 thomas #include "got_repository.h"
45 069bbb86 2022-03-07 thomas #include "got_opentemp.h"
46 069bbb86 2022-03-07 thomas #include "got_patch.h"
47 25ec7006 2022-07-01 thomas #include "got_diff.h"
49 069bbb86 2022-03-07 thomas #include "got_lib_delta.h"
50 0f76ab83 2022-06-23 thomas #include "got_lib_diff.h"
51 069bbb86 2022-03-07 thomas #include "got_lib_object.h"
52 069bbb86 2022-03-07 thomas #include "got_lib_privsep.h"
53 0f76ab83 2022-06-23 thomas #include "got_lib_sha1.h"
55 069bbb86 2022-03-07 thomas #define MIN(a, b) ((a) < (b) ? (a) : (b))
57 069bbb86 2022-03-07 thomas struct got_patch_hunk {
58 069bbb86 2022-03-07 thomas STAILQ_ENTRY(got_patch_hunk) entries;
59 49114f01 2022-03-22 thomas const struct got_error *err;
60 bb90ca7b 2022-07-03 thomas int ws_mangled;
61 8ebb3daa 2022-06-23 thomas int offset;
62 656c2baa 2022-04-23 thomas int old_nonl;
63 656c2baa 2022-04-23 thomas int new_nonl;
64 8ebb3daa 2022-06-23 thomas int old_from;
65 8ebb3daa 2022-06-23 thomas int old_lines;
66 8ebb3daa 2022-06-23 thomas int new_from;
67 8ebb3daa 2022-06-23 thomas int new_lines;
68 069bbb86 2022-03-07 thomas size_t len;
69 069bbb86 2022-03-07 thomas size_t cap;
70 069bbb86 2022-03-07 thomas char **lines;
73 49114f01 2022-03-22 thomas STAILQ_HEAD(got_patch_hunk_head, got_patch_hunk);
74 069bbb86 2022-03-07 thomas struct got_patch {
76 069bbb86 2022-03-07 thomas char *old;
77 069bbb86 2022-03-07 thomas char *new;
78 016bfe4b 2022-06-23 thomas char cid[41];
79 0f76ab83 2022-06-23 thomas char blob[41];
80 49114f01 2022-03-22 thomas struct got_patch_hunk_head head;
83 c71da4f7 2022-03-22 thomas struct patch_args {
84 c71da4f7 2022-03-22 thomas got_patch_progress_cb progress_cb;
85 c71da4f7 2022-03-22 thomas void *progress_arg;
86 49114f01 2022-03-22 thomas struct got_patch_hunk_head *head;
89 a2c162eb 2022-10-30 thomas static mode_t
90 a2c162eb 2022-10-30 thomas apply_umask(mode_t mode)
92 a2c162eb 2022-10-30 thomas mode_t um;
94 a2c162eb 2022-10-30 thomas um = umask(000);
95 a2c162eb 2022-10-30 thomas umask(um);
96 a2c162eb 2022-10-30 thomas return mode & ~um;
99 069bbb86 2022-03-07 thomas static const struct got_error *
100 069bbb86 2022-03-07 thomas send_patch(struct imsgbuf *ibuf, int fd)
102 069bbb86 2022-03-07 thomas const struct got_error *err = NULL;
104 069bbb86 2022-03-07 thomas if (imsg_compose(ibuf, GOT_IMSG_PATCH_FILE, 0, 0, fd,
105 069bbb86 2022-03-07 thomas NULL, 0) == -1) {
106 069bbb86 2022-03-07 thomas err = got_error_from_errno(
107 069bbb86 2022-03-07 thomas "imsg_compose GOT_IMSG_PATCH_FILE");
108 069bbb86 2022-03-07 thomas close(fd);
109 069bbb86 2022-03-07 thomas return err;
112 dab315a5 2022-07-07 thomas return got_privsep_flush_imsg(ibuf);
115 069bbb86 2022-03-07 thomas static void
116 069bbb86 2022-03-07 thomas patch_free(struct got_patch *p)
118 069bbb86 2022-03-07 thomas struct got_patch_hunk *h;
119 069bbb86 2022-03-07 thomas size_t i;
121 069bbb86 2022-03-07 thomas while (!STAILQ_EMPTY(&p->head)) {
122 069bbb86 2022-03-07 thomas h = STAILQ_FIRST(&p->head);
123 069bbb86 2022-03-07 thomas STAILQ_REMOVE_HEAD(&p->head, entries);
125 069bbb86 2022-03-07 thomas for (i = 0; i < h->len; ++i)
126 069bbb86 2022-03-07 thomas free(h->lines[i]);
127 069bbb86 2022-03-07 thomas free(h->lines);
131 069bbb86 2022-03-07 thomas free(p->new);
132 069bbb86 2022-03-07 thomas free(p->old);
134 9880a1dd 2022-06-23 thomas memset(p, 0, sizeof(*p));
135 9880a1dd 2022-06-23 thomas STAILQ_INIT(&p->head);
138 069bbb86 2022-03-07 thomas static const struct got_error *
139 069bbb86 2022-03-07 thomas pushline(struct got_patch_hunk *h, const char *line)
142 069bbb86 2022-03-07 thomas size_t newcap;
144 069bbb86 2022-03-07 thomas if (h->len == h->cap) {
145 069bbb86 2022-03-07 thomas if ((newcap = h->cap * 1.5) == 0)
146 069bbb86 2022-03-07 thomas newcap = 16;
147 069bbb86 2022-03-07 thomas t = recallocarray(h->lines, h->cap, newcap,
148 069bbb86 2022-03-07 thomas sizeof(h->lines[0]));
149 069bbb86 2022-03-07 thomas if (t == NULL)
150 069bbb86 2022-03-07 thomas return got_error_from_errno("recallocarray");
151 069bbb86 2022-03-07 thomas h->lines = t;
152 069bbb86 2022-03-07 thomas h->cap = newcap;
155 069bbb86 2022-03-07 thomas if ((t = strdup(line)) == NULL)
156 069bbb86 2022-03-07 thomas return got_error_from_errno("strdup");
158 069bbb86 2022-03-07 thomas h->lines[h->len++] = t;
159 069bbb86 2022-03-07 thomas return NULL;
162 069bbb86 2022-03-07 thomas static const struct got_error *
163 d9db2ff9 2022-04-16 thomas recv_patch(struct imsgbuf *ibuf, int *done, struct got_patch *p, int strip)
165 069bbb86 2022-03-07 thomas const struct got_error *err = NULL;
166 069bbb86 2022-03-07 thomas struct imsg imsg;
167 069bbb86 2022-03-07 thomas struct got_imsg_patch_hunk hdr;
168 069bbb86 2022-03-07 thomas struct got_imsg_patch patch;
169 069bbb86 2022-03-07 thomas struct got_patch_hunk *h = NULL;
170 069bbb86 2022-03-07 thomas size_t datalen;
171 656c2baa 2022-04-23 thomas int lastmode = -1;
173 069bbb86 2022-03-07 thomas memset(p, 0, sizeof(*p));
174 069bbb86 2022-03-07 thomas STAILQ_INIT(&p->head);
176 069bbb86 2022-03-07 thomas err = got_privsep_recv_imsg(&imsg, ibuf, 0);
178 069bbb86 2022-03-07 thomas return err;
179 069bbb86 2022-03-07 thomas if (imsg.hdr.type == GOT_IMSG_PATCH_EOF) {
180 069bbb86 2022-03-07 thomas *done = 1;
181 069bbb86 2022-03-07 thomas goto done;
183 069bbb86 2022-03-07 thomas if (imsg.hdr.type != GOT_IMSG_PATCH) {
184 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PRIVSEP_MSG);
185 069bbb86 2022-03-07 thomas goto done;
187 069bbb86 2022-03-07 thomas datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
188 069bbb86 2022-03-07 thomas if (datalen != sizeof(patch)) {
189 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PRIVSEP_LEN);
190 069bbb86 2022-03-07 thomas goto done;
192 069bbb86 2022-03-07 thomas memcpy(&patch, imsg.data, sizeof(patch));
194 ca357dd9 2022-06-23 thomas if (patch.old[sizeof(patch.old)-1] != '\0' ||
195 0f76ab83 2022-06-23 thomas patch.new[sizeof(patch.new)-1] != '\0' ||
196 016bfe4b 2022-06-23 thomas patch.cid[sizeof(patch.cid)-1] != '\0' ||
197 0f76ab83 2022-06-23 thomas patch.blob[sizeof(patch.blob)-1] != '\0') {
198 ca357dd9 2022-06-23 thomas err = got_error(GOT_ERR_PRIVSEP_LEN);
199 ca357dd9 2022-06-23 thomas goto done;
202 8afec5d5 2022-07-01 thomas if (*patch.cid != '\0')
203 016bfe4b 2022-06-23 thomas strlcpy(p->cid, patch.cid, sizeof(p->cid));
205 8afec5d5 2022-07-01 thomas if (*patch.blob != '\0')
206 016bfe4b 2022-06-23 thomas strlcpy(p->blob, patch.blob, sizeof(p->blob));
208 37e766f4 2022-09-21 thomas p->xbit = patch.xbit;
210 d9db2ff9 2022-04-16 thomas /* automatically set strip=1 for git-style diffs */
211 d9db2ff9 2022-04-16 thomas if (strip == -1 && patch.git &&
212 d9db2ff9 2022-04-16 thomas (*patch.old == '\0' || !strncmp(patch.old, "a/", 2)) &&
213 d9db2ff9 2022-04-16 thomas (*patch.new == '\0' || !strncmp(patch.new, "b/", 2)))
214 d9db2ff9 2022-04-16 thomas strip = 1;
216 d9db2ff9 2022-04-16 thomas /* prefer the new name if not /dev/null for not git-style diffs */
217 d9db2ff9 2022-04-16 thomas if (!patch.git && *patch.new != '\0' && *patch.old != '\0') {
218 d9db2ff9 2022-04-16 thomas err = got_path_strip(&p->old, patch.new, strip);
220 d9db2ff9 2022-04-16 thomas goto done;
221 d9db2ff9 2022-04-16 thomas } else if (*patch.old != '\0') {
222 d9db2ff9 2022-04-16 thomas err = got_path_strip(&p->old, patch.old, strip);
224 d9db2ff9 2022-04-16 thomas goto done;
227 d9db2ff9 2022-04-16 thomas if (*patch.new != '\0') {
228 d9db2ff9 2022-04-16 thomas err = got_path_strip(&p->new, patch.new, strip);
230 d9db2ff9 2022-04-16 thomas goto done;
233 64c9e565 2022-03-13 thomas if (p->old == NULL && p->new == NULL) {
234 64c9e565 2022-03-13 thomas err = got_error(GOT_ERR_PATCH_MALFORMED);
235 64c9e565 2022-03-13 thomas goto done;
238 069bbb86 2022-03-07 thomas imsg_free(&imsg);
240 069bbb86 2022-03-07 thomas for (;;) {
243 069bbb86 2022-03-07 thomas err = got_privsep_recv_imsg(&imsg, ibuf, 0);
244 9880a1dd 2022-06-23 thomas if (err) {
245 9880a1dd 2022-06-23 thomas patch_free(p);
246 069bbb86 2022-03-07 thomas return err;
249 047c926f 2022-06-23 thomas datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
250 069bbb86 2022-03-07 thomas switch (imsg.hdr.type) {
251 069bbb86 2022-03-07 thomas case GOT_IMSG_PATCH_DONE:
252 88c260f4 2022-05-14 thomas if (h != NULL && h->len == 0)
253 88c260f4 2022-05-14 thomas err = got_error(GOT_ERR_PATCH_MALFORMED);
254 069bbb86 2022-03-07 thomas goto done;
255 069bbb86 2022-03-07 thomas case GOT_IMSG_PATCH_HUNK:
256 88c260f4 2022-05-14 thomas if (h != NULL &&
257 88c260f4 2022-05-14 thomas (h->len == 0 || h->old_nonl || h->new_nonl)) {
258 ff7f34d3 2022-03-22 thomas err = got_error(GOT_ERR_PATCH_MALFORMED);
259 ff7f34d3 2022-03-22 thomas goto done;
261 656c2baa 2022-04-23 thomas lastmode = -1;
262 069bbb86 2022-03-07 thomas if (datalen != sizeof(hdr)) {
263 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PRIVSEP_LEN);
264 069bbb86 2022-03-07 thomas goto done;
266 069bbb86 2022-03-07 thomas memcpy(&hdr, imsg.data, sizeof(hdr));
267 06227823 2022-06-23 thomas if (hdr.oldfrom < 0 || hdr.newfrom < 0) {
268 06227823 2022-06-23 thomas err = got_error(GOT_ERR_PRIVSEP_LEN);
269 eb35d814 2022-06-23 thomas goto done;
271 06227823 2022-06-23 thomas if ((h = calloc(1, sizeof(*h))) == NULL) {
272 06227823 2022-06-23 thomas err = got_error_from_errno("calloc");
273 069bbb86 2022-03-07 thomas goto done;
275 069bbb86 2022-03-07 thomas h->old_from = hdr.oldfrom;
276 069bbb86 2022-03-07 thomas h->old_lines = hdr.oldlines;
277 069bbb86 2022-03-07 thomas h->new_from = hdr.newfrom;
278 069bbb86 2022-03-07 thomas h->new_lines = hdr.newlines;
279 069bbb86 2022-03-07 thomas STAILQ_INSERT_TAIL(&p->head, h, entries);
281 069bbb86 2022-03-07 thomas case GOT_IMSG_PATCH_LINE:
282 069bbb86 2022-03-07 thomas if (h == NULL) {
283 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PRIVSEP_MSG);
284 069bbb86 2022-03-07 thomas goto done;
286 069bbb86 2022-03-07 thomas t = imsg.data;
287 ff7f34d3 2022-03-22 thomas /* at least one char */
288 069bbb86 2022-03-07 thomas if (datalen < 2 || t[datalen-1] != '\0') {
289 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PRIVSEP_MSG);
290 069bbb86 2022-03-07 thomas goto done;
292 ff7f34d3 2022-03-22 thomas if (*t != ' ' && *t != '-' && *t != '+' &&
293 ff7f34d3 2022-03-22 thomas *t != '\\') {
294 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PRIVSEP_MSG);
295 069bbb86 2022-03-07 thomas goto done;
298 656c2baa 2022-04-23 thomas if (*t != '\\')
299 ff7f34d3 2022-03-22 thomas err = pushline(h, t);
300 656c2baa 2022-04-23 thomas else if (lastmode == '-')
301 656c2baa 2022-04-23 thomas h->old_nonl = 1;
302 656c2baa 2022-04-23 thomas else if (lastmode == '+')
303 656c2baa 2022-04-23 thomas h->new_nonl = 1;
305 656c2baa 2022-04-23 thomas err = got_error(GOT_ERR_PATCH_MALFORMED);
308 069bbb86 2022-03-07 thomas goto done;
310 656c2baa 2022-04-23 thomas lastmode = *t;
313 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PRIVSEP_MSG);
314 069bbb86 2022-03-07 thomas goto done;
317 069bbb86 2022-03-07 thomas imsg_free(&imsg);
322 9880a1dd 2022-06-23 thomas patch_free(p);
324 069bbb86 2022-03-07 thomas imsg_free(&imsg);
325 069bbb86 2022-03-07 thomas return err;
328 f4602cbd 2022-07-23 thomas static void
329 f4602cbd 2022-07-23 thomas reverse_patch(struct got_patch *p)
331 f4602cbd 2022-07-23 thomas struct got_patch_hunk *h;
332 f4602cbd 2022-07-23 thomas size_t i;
335 f4602cbd 2022-07-23 thomas STAILQ_FOREACH(h, &p->head, entries) {
336 f4602cbd 2022-07-23 thomas tmp = h->old_from;
337 f4602cbd 2022-07-23 thomas h->old_from = h->new_from;
338 f4602cbd 2022-07-23 thomas h->new_from = tmp;
340 f4602cbd 2022-07-23 thomas tmp = h->old_lines;
341 f4602cbd 2022-07-23 thomas h->old_lines = h->new_lines;
342 f4602cbd 2022-07-23 thomas h->new_lines = tmp;
344 f4602cbd 2022-07-23 thomas tmp = h->old_nonl;
345 f4602cbd 2022-07-23 thomas h->old_nonl = h->new_nonl;
346 f4602cbd 2022-07-23 thomas h->new_nonl = tmp;
348 f4602cbd 2022-07-23 thomas for (i = 0; i < h->len; ++i) {
349 f4602cbd 2022-07-23 thomas if (*h->lines[i] == '+')
350 f4602cbd 2022-07-23 thomas *h->lines[i] = '-';
351 f4602cbd 2022-07-23 thomas else if (*h->lines[i] == '-')
352 f4602cbd 2022-07-23 thomas *h->lines[i] = '+';
358 069bbb86 2022-03-07 thomas * Copy data from orig starting at copypos until pos into tmp.
359 069bbb86 2022-03-07 thomas * If pos is -1, copy until EOF.
361 069bbb86 2022-03-07 thomas static const struct got_error *
362 069bbb86 2022-03-07 thomas copy(FILE *tmp, FILE *orig, off_t copypos, off_t pos)
364 069bbb86 2022-03-07 thomas char buf[BUFSIZ];
365 069bbb86 2022-03-07 thomas size_t len, r, w;
367 bafaf650 2022-05-14 thomas if (fseeko(orig, copypos, SEEK_SET) == -1)
368 bafaf650 2022-05-14 thomas return got_error_from_errno("fseeko");
370 069bbb86 2022-03-07 thomas while (pos == -1 || copypos < pos) {
371 069bbb86 2022-03-07 thomas len = sizeof(buf);
372 069bbb86 2022-03-07 thomas if (pos > 0)
373 069bbb86 2022-03-07 thomas len = MIN(len, (size_t)pos - copypos);
374 069bbb86 2022-03-07 thomas r = fread(buf, 1, len, orig);
375 069bbb86 2022-03-07 thomas if (r != len && ferror(orig))
376 069bbb86 2022-03-07 thomas return got_error_from_errno("fread");
377 069bbb86 2022-03-07 thomas w = fwrite(buf, 1, r, tmp);
378 069bbb86 2022-03-07 thomas if (w != r)
379 069bbb86 2022-03-07 thomas return got_error_from_errno("fwrite");
380 069bbb86 2022-03-07 thomas copypos += len;
381 069bbb86 2022-03-07 thomas if (r != len && feof(orig)) {
382 069bbb86 2022-03-07 thomas if (pos == -1)
383 069bbb86 2022-03-07 thomas return NULL;
384 49114f01 2022-03-22 thomas return got_error(GOT_ERR_HUNK_FAILED);
387 069bbb86 2022-03-07 thomas return NULL;
390 4f34ed97 2022-08-06 thomas static int linecmp(const char *, const char *, int *);
392 069bbb86 2022-03-07 thomas static const struct got_error *
393 8ebb3daa 2022-06-23 thomas locate_hunk(FILE *orig, struct got_patch_hunk *h, off_t *pos, int *lineno)
395 069bbb86 2022-03-07 thomas const struct got_error *err = NULL;
396 069bbb86 2022-03-07 thomas char *line = NULL;
397 069bbb86 2022-03-07 thomas char mode = *h->lines[0];
398 069bbb86 2022-03-07 thomas size_t linesize = 0;
399 069bbb86 2022-03-07 thomas ssize_t linelen;
400 069bbb86 2022-03-07 thomas off_t match = -1;
401 4f34ed97 2022-08-06 thomas int mangled = 0, match_lineno = -1;
403 069bbb86 2022-03-07 thomas for (;;) {
404 069bbb86 2022-03-07 thomas linelen = getline(&line, &linesize, orig);
405 069bbb86 2022-03-07 thomas if (linelen == -1) {
406 069bbb86 2022-03-07 thomas if (ferror(orig))
407 069bbb86 2022-03-07 thomas err = got_error_from_errno("getline");
408 069bbb86 2022-03-07 thomas else if (match == -1)
409 49114f01 2022-03-22 thomas err = got_error(GOT_ERR_HUNK_FAILED);
412 ff7f34d3 2022-03-22 thomas if (line[linelen - 1] == '\n')
413 ff7f34d3 2022-03-22 thomas line[linelen - 1] = '\0';
414 069bbb86 2022-03-07 thomas (*lineno)++;
416 4f34ed97 2022-08-06 thomas if ((mode == ' ' && !linecmp(h->lines[0] + 1, line, &mangled)) ||
417 4f34ed97 2022-08-06 thomas (mode == '-' && !linecmp(h->lines[0] + 1, line, &mangled)) ||
418 069bbb86 2022-03-07 thomas (mode == '+' && *lineno == h->old_from)) {
419 069bbb86 2022-03-07 thomas match = ftello(orig);
420 069bbb86 2022-03-07 thomas if (match == -1) {
421 069bbb86 2022-03-07 thomas err = got_error_from_errno("ftello");
424 069bbb86 2022-03-07 thomas match -= linelen;
425 069bbb86 2022-03-07 thomas match_lineno = (*lineno)-1;
428 aaabf83f 2022-08-06 thomas if (*lineno >= h->old_from && match != -1) {
429 aaabf83f 2022-08-06 thomas if (mangled)
430 aaabf83f 2022-08-06 thomas h->ws_mangled = 1;
435 069bbb86 2022-03-07 thomas if (err == NULL) {
436 122e1611 2022-03-22 thomas *pos = match;
437 069bbb86 2022-03-07 thomas *lineno = match_lineno;
438 bafaf650 2022-05-14 thomas if (fseeko(orig, match, SEEK_SET) == -1)
439 bafaf650 2022-05-14 thomas err = got_error_from_errno("fseeko");
442 069bbb86 2022-03-07 thomas free(line);
443 069bbb86 2022-03-07 thomas return err;
446 bb90ca7b 2022-07-03 thomas static int
447 bb90ca7b 2022-07-03 thomas linecmp(const char *a, const char *b, int *mangled)
451 bb90ca7b 2022-07-03 thomas *mangled = 0;
452 bb90ca7b 2022-07-03 thomas c = strcmp(a, b);
453 bb90ca7b 2022-07-03 thomas if (c == 0)
454 bb90ca7b 2022-07-03 thomas return c;
456 bb90ca7b 2022-07-03 thomas *mangled = 1;
457 bb90ca7b 2022-07-03 thomas for (;;) {
458 2140c6ec 2022-07-04 thomas while (*a == '\t' || *a == ' ' || *a == '\f')
460 2140c6ec 2022-07-04 thomas while (*b == '\t' || *b == ' ' || *b == '\f')
462 2140c6ec 2022-07-04 thomas if (*a == '\0' || *a != *b)
464 bb90ca7b 2022-07-03 thomas a++, b++;
467 bb90ca7b 2022-07-03 thomas return *a - *b;
470 069bbb86 2022-03-07 thomas static const struct got_error *
471 069bbb86 2022-03-07 thomas test_hunk(FILE *orig, struct got_patch_hunk *h)
473 069bbb86 2022-03-07 thomas const struct got_error *err = NULL;
474 069bbb86 2022-03-07 thomas char *line = NULL;
475 069bbb86 2022-03-07 thomas size_t linesize = 0, i = 0;
476 069bbb86 2022-03-07 thomas ssize_t linelen;
477 bb90ca7b 2022-07-03 thomas int mangled;
479 069bbb86 2022-03-07 thomas for (i = 0; i < h->len; ++i) {
480 069bbb86 2022-03-07 thomas switch (*h->lines[i]) {
481 069bbb86 2022-03-07 thomas case '+':
482 069bbb86 2022-03-07 thomas continue;
483 069bbb86 2022-03-07 thomas case ' ':
484 069bbb86 2022-03-07 thomas case '-':
485 069bbb86 2022-03-07 thomas linelen = getline(&line, &linesize, orig);
486 069bbb86 2022-03-07 thomas if (linelen == -1) {
487 069bbb86 2022-03-07 thomas if (ferror(orig))
488 069bbb86 2022-03-07 thomas err = got_error_from_errno("getline");
490 069bbb86 2022-03-07 thomas err = got_error(
491 49114f01 2022-03-22 thomas GOT_ERR_HUNK_FAILED);
492 069bbb86 2022-03-07 thomas goto done;
494 ff7f34d3 2022-03-22 thomas if (line[linelen - 1] == '\n')
495 ff7f34d3 2022-03-22 thomas line[linelen - 1] = '\0';
496 bb90ca7b 2022-07-03 thomas if (linecmp(h->lines[i] + 1, line, &mangled)) {
497 49114f01 2022-03-22 thomas err = got_error(GOT_ERR_HUNK_FAILED);
498 069bbb86 2022-03-07 thomas goto done;
500 bb90ca7b 2022-07-03 thomas if (mangled)
501 bb90ca7b 2022-07-03 thomas h->ws_mangled = 1;
507 069bbb86 2022-03-07 thomas free(line);
508 069bbb86 2022-03-07 thomas return err;
511 069bbb86 2022-03-07 thomas static const struct got_error *
512 bb90ca7b 2022-07-03 thomas apply_hunk(FILE *orig, FILE *tmp, struct got_patch_hunk *h, int *lineno,
513 bb90ca7b 2022-07-03 thomas off_t from)
515 bb90ca7b 2022-07-03 thomas const struct got_error *err = NULL;
516 bb90ca7b 2022-07-03 thomas const char *t;
517 bb90ca7b 2022-07-03 thomas size_t linesize = 0, i, new = 0;
518 bb90ca7b 2022-07-03 thomas char *line = NULL;
519 bb90ca7b 2022-07-03 thomas char mode;
520 bb90ca7b 2022-07-03 thomas ssize_t linelen;
522 bb90ca7b 2022-07-03 thomas if (orig != NULL && fseeko(orig, from, SEEK_SET) == -1)
523 bb90ca7b 2022-07-03 thomas return got_error_from_errno("fseeko");
525 069bbb86 2022-03-07 thomas for (i = 0; i < h->len; ++i) {
526 bb90ca7b 2022-07-03 thomas switch (mode = *h->lines[i]) {
527 069bbb86 2022-03-07 thomas case '-':
528 bb90ca7b 2022-07-03 thomas case ' ':
529 069bbb86 2022-03-07 thomas (*lineno)++;
530 bb90ca7b 2022-07-03 thomas if (orig != NULL) {
531 bb90ca7b 2022-07-03 thomas linelen = getline(&line, &linesize, orig);
532 bb90ca7b 2022-07-03 thomas if (linelen == -1) {
533 bb90ca7b 2022-07-03 thomas err = got_error_from_errno("getline");
534 bb90ca7b 2022-07-03 thomas goto done;
536 bb90ca7b 2022-07-03 thomas if (line[linelen - 1] == '\n')
537 bb90ca7b 2022-07-03 thomas line[linelen - 1] = '\0';
538 bb90ca7b 2022-07-03 thomas t = line;
540 bb90ca7b 2022-07-03 thomas t = h->lines[i] + 1;
541 bb90ca7b 2022-07-03 thomas if (mode == '-')
542 bb90ca7b 2022-07-03 thomas continue;
543 bb90ca7b 2022-07-03 thomas if (fprintf(tmp, "%s\n", t) < 0) {
544 bb90ca7b 2022-07-03 thomas err = got_error_from_errno("fprintf");
545 bb90ca7b 2022-07-03 thomas goto done;
548 069bbb86 2022-03-07 thomas case '+':
550 bb90ca7b 2022-07-03 thomas if (fprintf(tmp, "%s", h->lines[i] + 1) < 0) {
551 bb90ca7b 2022-07-03 thomas err = got_error_from_errno("fprintf");
552 bb90ca7b 2022-07-03 thomas goto done;
554 656c2baa 2022-04-23 thomas if (new != h->new_lines || !h->new_nonl) {
555 bb90ca7b 2022-07-03 thomas if (fprintf(tmp, "\n") < 0) {
556 bb90ca7b 2022-07-03 thomas err = got_error_from_errno("fprintf");
557 bb90ca7b 2022-07-03 thomas goto done;
565 bb90ca7b 2022-07-03 thomas free(line);
566 bb90ca7b 2022-07-03 thomas return err;
569 46e6bdd4 2022-03-22 thomas static const struct got_error *
570 25a880e1 2022-07-03 thomas patch_file(struct got_patch *p, FILE *orig, FILE *tmp)
572 bb2ad8ff 2022-03-13 thomas const struct got_error *err = NULL;
573 bb2ad8ff 2022-03-13 thomas struct got_patch_hunk *h;
574 da09d8ed 2022-03-22 thomas struct stat sb;
575 8ebb3daa 2022-06-23 thomas int lineno = 0;
576 bb2ad8ff 2022-03-13 thomas off_t copypos, pos;
577 bb2ad8ff 2022-03-13 thomas char *line = NULL;
578 bb2ad8ff 2022-03-13 thomas size_t linesize = 0;
579 bb2ad8ff 2022-03-13 thomas ssize_t linelen;
581 069bbb86 2022-03-07 thomas if (p->old == NULL) { /* create */
582 069bbb86 2022-03-07 thomas h = STAILQ_FIRST(&p->head);
583 bb2ad8ff 2022-03-13 thomas if (h == NULL || STAILQ_NEXT(h, entries) != NULL)
584 bb2ad8ff 2022-03-13 thomas return got_error(GOT_ERR_PATCH_MALFORMED);
585 bb90ca7b 2022-07-03 thomas return apply_hunk(orig, tmp, h, &lineno, 0);
588 650a3405 2023-01-02 thomas /* When deleting binary files there are no hunks to apply. */
589 650a3405 2023-01-02 thomas if (p->new == NULL && STAILQ_EMPTY(&p->head))
590 650a3405 2023-01-02 thomas return NULL;
592 2249fadd 2022-06-23 thomas if (fstat(fileno(orig), &sb) == -1)
593 2249fadd 2022-06-23 thomas return got_error_from_errno("fstat");
595 069bbb86 2022-03-07 thomas copypos = 0;
596 069bbb86 2022-03-07 thomas STAILQ_FOREACH(h, &p->head, entries) {
597 069bbb86 2022-03-07 thomas tryagain:
598 122e1611 2022-03-22 thomas err = locate_hunk(orig, h, &pos, &lineno);
599 49114f01 2022-03-22 thomas if (err != NULL && err->code == GOT_ERR_HUNK_FAILED)
600 49114f01 2022-03-22 thomas h->err = err;
601 069bbb86 2022-03-07 thomas if (err != NULL)
602 2249fadd 2022-06-23 thomas return err;
603 2d9b6837 2022-06-23 thomas err = copy(tmp, orig, copypos, pos);
604 069bbb86 2022-03-07 thomas if (err != NULL)
605 2249fadd 2022-06-23 thomas return err;
606 069bbb86 2022-03-07 thomas copypos = pos;
608 069bbb86 2022-03-07 thomas err = test_hunk(orig, h);
609 49114f01 2022-03-22 thomas if (err != NULL && err->code == GOT_ERR_HUNK_FAILED) {
611 069bbb86 2022-03-07 thomas * try to apply the hunk again starting the search
612 069bbb86 2022-03-07 thomas * after the previous partial match.
614 2249fadd 2022-06-23 thomas if (fseeko(orig, pos, SEEK_SET) == -1)
615 2249fadd 2022-06-23 thomas return got_error_from_errno("fseeko");
616 069bbb86 2022-03-07 thomas linelen = getline(&line, &linesize, orig);
617 2249fadd 2022-06-23 thomas if (linelen == -1)
618 2249fadd 2022-06-23 thomas return got_error_from_errno("getline");
619 069bbb86 2022-03-07 thomas lineno++;
620 069bbb86 2022-03-07 thomas goto tryagain;
622 069bbb86 2022-03-07 thomas if (err != NULL)
623 2249fadd 2022-06-23 thomas return err;
625 49114f01 2022-03-22 thomas if (lineno + 1 != h->old_from)
626 49114f01 2022-03-22 thomas h->offset = lineno + 1 - h->old_from;
628 bb90ca7b 2022-07-03 thomas err = apply_hunk(orig, tmp, h, &lineno, pos);
629 069bbb86 2022-03-07 thomas if (err != NULL)
630 2249fadd 2022-06-23 thomas return err;
632 069bbb86 2022-03-07 thomas copypos = ftello(orig);
633 2249fadd 2022-06-23 thomas if (copypos == -1)
634 2249fadd 2022-06-23 thomas return got_error_from_errno("ftello");
637 49114f01 2022-03-22 thomas if (p->new == NULL && sb.st_size != copypos) {
638 49114f01 2022-03-22 thomas h = STAILQ_FIRST(&p->head);
639 49114f01 2022-03-22 thomas h->err = got_error(GOT_ERR_HUNK_FAILED);
640 49114f01 2022-03-22 thomas err = h->err;
641 2d9b6837 2022-06-23 thomas } else if (!feof(orig))
642 069bbb86 2022-03-07 thomas err = copy(tmp, orig, copypos, -1);
644 10e55613 2022-03-22 thomas return err;
647 10e55613 2022-03-22 thomas static const struct got_error *
648 49114f01 2022-03-22 thomas report_progress(struct patch_args *pa, const char *old, const char *new,
649 49114f01 2022-03-22 thomas unsigned char status, const struct got_error *orig_error)
651 49114f01 2022-03-22 thomas const struct got_error *err;
652 49114f01 2022-03-22 thomas struct got_patch_hunk *h;
654 49114f01 2022-03-22 thomas err = pa->progress_cb(pa->progress_arg, old, new, status,
655 bb90ca7b 2022-07-03 thomas orig_error, 0, 0, 0, 0, 0, 0, NULL);
657 49114f01 2022-03-22 thomas return err;
659 49114f01 2022-03-22 thomas STAILQ_FOREACH(h, pa->head, entries) {
660 bb90ca7b 2022-07-03 thomas if (h->offset == 0 && !h->ws_mangled && h->err == NULL)
661 49114f01 2022-03-22 thomas continue;
663 49114f01 2022-03-22 thomas err = pa->progress_cb(pa->progress_arg, old, new, 0, NULL,
664 49114f01 2022-03-22 thomas h->old_from, h->old_lines, h->new_from, h->new_lines,
665 bb90ca7b 2022-07-03 thomas h->offset, h->ws_mangled, h->err);
667 49114f01 2022-03-22 thomas return err;
670 49114f01 2022-03-22 thomas return NULL;
673 49114f01 2022-03-22 thomas static const struct got_error *
674 c71da4f7 2022-03-22 thomas patch_delete(void *arg, unsigned char status, unsigned char staged_status,
675 c71da4f7 2022-03-22 thomas const char *path)
677 49114f01 2022-03-22 thomas return report_progress(arg, path, NULL, status, NULL);
680 c71da4f7 2022-03-22 thomas static const struct got_error *
681 c71da4f7 2022-03-22 thomas patch_add(void *arg, unsigned char status, const char *path)
683 49114f01 2022-03-22 thomas return report_progress(arg, NULL, path, status, NULL);
686 c71da4f7 2022-03-22 thomas static const struct got_error *
687 0f76ab83 2022-06-23 thomas open_blob(char **path, FILE **fp, const char *blobid,
688 0f76ab83 2022-06-23 thomas struct got_repository *repo)
690 bb2ad8ff 2022-03-13 thomas const struct got_error *err = NULL;
691 0f76ab83 2022-06-23 thomas struct got_blob_object *blob = NULL;
692 19dd85cb 2022-07-01 thomas struct got_object_id id, *idptr, *matched_id = NULL;
693 f4ae6ddb 2022-07-01 thomas int fd = -1;
695 0f76ab83 2022-06-23 thomas *fp = NULL;
696 0f76ab83 2022-06-23 thomas *path = NULL;
698 19dd85cb 2022-07-01 thomas if (strlen(blobid) != SHA1_DIGEST_STRING_LENGTH - 1) {
699 19dd85cb 2022-07-01 thomas err = got_repo_match_object_id(&matched_id, NULL, blobid,
700 19dd85cb 2022-07-01 thomas GOT_OBJ_TYPE_BLOB, NULL /* do not resolve tags */,
703 19dd85cb 2022-07-01 thomas return err;
704 19dd85cb 2022-07-01 thomas idptr = matched_id;
706 19dd85cb 2022-07-01 thomas if (!got_parse_sha1_digest(id.sha1, blobid))
707 19dd85cb 2022-07-01 thomas return got_error(GOT_ERR_BAD_OBJ_ID_STR);
708 19dd85cb 2022-07-01 thomas idptr = &id;
711 f4ae6ddb 2022-07-01 thomas fd = got_opentempfd();
712 f4ae6ddb 2022-07-01 thomas if (fd == -1) {
713 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
714 f4ae6ddb 2022-07-01 thomas goto done;
717 f4ae6ddb 2022-07-01 thomas err = got_object_open_as_blob(&blob, repo, idptr, 8192, fd);
719 0f76ab83 2022-06-23 thomas goto done;
721 fc2a50f2 2022-11-01 thomas err = got_opentemp_named(path, fp, GOT_TMPDIR_STR "/got-patch-blob",
724 0f76ab83 2022-06-23 thomas goto done;
726 0f76ab83 2022-06-23 thomas err = got_object_blob_dump_to_file(NULL, NULL, NULL, *fp, blob);
728 0f76ab83 2022-06-23 thomas goto done;
731 f4ae6ddb 2022-07-01 thomas if (fd != -1 && close(fd) == -1 && err == NULL)
732 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
733 0f76ab83 2022-06-23 thomas if (blob)
734 0f76ab83 2022-06-23 thomas got_object_blob_close(blob);
735 19dd85cb 2022-07-01 thomas if (matched_id != NULL)
736 19dd85cb 2022-07-01 thomas free(matched_id);
737 0f76ab83 2022-06-23 thomas if (err) {
738 0f76ab83 2022-06-23 thomas if (*fp != NULL)
739 0f76ab83 2022-06-23 thomas fclose(*fp);
740 0f76ab83 2022-06-23 thomas if (*path != NULL)
741 0f76ab83 2022-06-23 thomas unlink(*path);
742 0f76ab83 2022-06-23 thomas free(*path);
743 0f76ab83 2022-06-23 thomas *fp = NULL;
744 0f76ab83 2022-06-23 thomas *path = NULL;
746 0f76ab83 2022-06-23 thomas return err;
749 0f76ab83 2022-06-23 thomas static const struct got_error *
750 7d8bcb99 2022-07-28 thomas prepare_merge(int *do_merge, char **apath, FILE **afile,
751 7d8bcb99 2022-07-28 thomas struct got_worktree *worktree, struct got_repository *repo,
752 7d8bcb99 2022-07-28 thomas struct got_patch *p, struct got_object_id *commit_id,
753 7d8bcb99 2022-07-28 thomas struct got_tree_object *tree, const char *path)
755 7d8bcb99 2022-07-28 thomas const struct got_error *err = NULL;
757 7d8bcb99 2022-07-28 thomas *do_merge = 0;
758 7d8bcb99 2022-07-28 thomas *apath = NULL;
759 7d8bcb99 2022-07-28 thomas *afile = NULL;
761 7d8bcb99 2022-07-28 thomas /* don't run the diff3 merge on creations/deletions */
762 7d8bcb99 2022-07-28 thomas if (p->old == NULL || p->new == NULL)
763 7d8bcb99 2022-07-28 thomas return NULL;
765 7d8bcb99 2022-07-28 thomas if (commit_id) {
766 7d8bcb99 2022-07-28 thomas struct got_object_id *id;
768 7d8bcb99 2022-07-28 thomas err = got_object_tree_find_path(&id, NULL, repo, tree, path);
770 7d8bcb99 2022-07-28 thomas return err;
771 7d8bcb99 2022-07-28 thomas got_sha1_digest_to_str(id->sha1, p->blob, sizeof(p->blob));
772 7d8bcb99 2022-07-28 thomas got_sha1_digest_to_str(commit_id->sha1, p->cid, sizeof(p->cid));
773 7d8bcb99 2022-07-28 thomas free(id);
774 7d8bcb99 2022-07-28 thomas err = open_blob(apath, afile, p->blob, repo);
775 7d8bcb99 2022-07-28 thomas *do_merge = err == NULL;
776 7d8bcb99 2022-07-28 thomas } else if (*p->blob != '\0') {
777 7d8bcb99 2022-07-28 thomas err = open_blob(apath, afile, p->blob, repo);
779 7d8bcb99 2022-07-28 thomas * ignore failures to open this blob, we might have
780 7d8bcb99 2022-07-28 thomas * parsed gibberish.
782 7d8bcb99 2022-07-28 thomas if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT) &&
783 7d8bcb99 2022-07-28 thomas err->code != GOT_ERR_NO_OBJ)
784 7d8bcb99 2022-07-28 thomas return err;
785 7d8bcb99 2022-07-28 thomas *do_merge = err == NULL;
786 7d8bcb99 2022-07-28 thomas err = NULL;
789 7d8bcb99 2022-07-28 thomas return err;
792 7d8bcb99 2022-07-28 thomas static const struct got_error *
793 0f76ab83 2022-06-23 thomas apply_patch(int *overlapcnt, struct got_worktree *worktree,
794 0f76ab83 2022-06-23 thomas struct got_repository *repo, struct got_fileindex *fileindex,
795 0f76ab83 2022-06-23 thomas const char *old, const char *new, struct got_patch *p, int nop,
796 7d8bcb99 2022-07-28 thomas int reverse, struct got_object_id *commit_id,
797 7d8bcb99 2022-07-28 thomas struct got_tree_object *tree, struct patch_args *pa,
798 f4602cbd 2022-07-23 thomas got_cancel_cb cancel_cb, void *cancel_arg)
800 0f76ab83 2022-06-23 thomas const struct got_error *err = NULL;
801 25a880e1 2022-07-03 thomas struct stat sb;
802 0f76ab83 2022-06-23 thomas int do_merge = 0, file_renamed = 0;
803 016bfe4b 2022-06-23 thomas char *oldlabel = NULL, *newlabel = NULL, *anclabel = NULL;
804 72f46891 2022-04-23 thomas char *oldpath = NULL, *newpath = NULL;
805 dd73a53d 2022-10-16 thomas char *tmppath = NULL, *template = NULL;
806 0f76ab83 2022-06-23 thomas char *apath = NULL, *mergepath = NULL;
807 0f76ab83 2022-06-23 thomas FILE *oldfile = NULL, *tmpfile = NULL, *afile = NULL, *mergefile = NULL;
808 0f76ab83 2022-06-23 thomas int outfd;
809 da09d8ed 2022-03-22 thomas mode_t mode = GOT_DEFAULT_FILE_MODE;
811 0f76ab83 2022-06-23 thomas *overlapcnt = 0;
813 7d8bcb99 2022-07-28 thomas err = prepare_merge(&do_merge, &apath, &afile, worktree, repo, p,
814 7d8bcb99 2022-07-28 thomas commit_id, tree, old);
816 7d8bcb99 2022-07-28 thomas return err;
818 21948212 2022-07-27 thomas if (reverse && !do_merge)
819 21948212 2022-07-27 thomas reverse_patch(p);
821 72f46891 2022-04-23 thomas if (asprintf(&oldpath, "%s/%s", got_worktree_get_root_path(worktree),
822 72f46891 2022-04-23 thomas old) == -1) {
823 72f46891 2022-04-23 thomas err = got_error_from_errno("asprintf");
824 814624e7 2022-03-22 thomas goto done;
827 72f46891 2022-04-23 thomas if (asprintf(&newpath, "%s/%s", got_worktree_get_root_path(worktree),
828 72f46891 2022-04-23 thomas new) == -1) {
829 72f46891 2022-04-23 thomas err = got_error_from_errno("asprintf");
830 72f46891 2022-04-23 thomas goto done;
833 814624e7 2022-03-22 thomas file_renamed = strcmp(oldpath, newpath);
835 bb2ad8ff 2022-03-13 thomas if (asprintf(&template, "%s/got-patch",
836 bb2ad8ff 2022-03-13 thomas got_worktree_get_root_path(worktree)) == -1) {
837 bb2ad8ff 2022-03-13 thomas err = got_error_from_errno(template);
838 069bbb86 2022-03-07 thomas goto done;
841 25a880e1 2022-07-03 thomas if (p->old != NULL) {
842 25a880e1 2022-07-03 thomas if ((oldfile = fopen(oldpath, "r")) == NULL) {
843 25a880e1 2022-07-03 thomas err = got_error_from_errno2("open", oldpath);
844 25a880e1 2022-07-03 thomas goto done;
846 25a880e1 2022-07-03 thomas if (fstat(fileno(oldfile), &sb) == -1) {
847 25a880e1 2022-07-03 thomas err = got_error_from_errno2("fstat", oldpath);
848 25a880e1 2022-07-03 thomas goto done;
850 25a880e1 2022-07-03 thomas mode = sb.st_mode;
851 37e766f4 2022-09-21 thomas } else if (p->xbit)
852 37e766f4 2022-09-21 thomas mode |= (S_IXUSR | S_IXGRP | S_IXOTH);
854 fc2a50f2 2022-11-01 thomas err = got_opentemp_named(&tmppath, &tmpfile, template, "");
856 bb2ad8ff 2022-03-13 thomas goto done;
857 0f76ab83 2022-06-23 thomas outfd = fileno(tmpfile);
858 25a880e1 2022-07-03 thomas err = patch_file(p, afile != NULL ? afile : oldfile, tmpfile);
860 bb2ad8ff 2022-03-13 thomas goto done;
862 0f76ab83 2022-06-23 thomas if (do_merge) {
863 8afec5d5 2022-07-01 thomas const char *type, *id;
865 0f76ab83 2022-06-23 thomas if (fseeko(afile, 0, SEEK_SET) == -1 ||
866 0f76ab83 2022-06-23 thomas fseeko(oldfile, 0, SEEK_SET) == -1 ||
867 0f76ab83 2022-06-23 thomas fseeko(tmpfile, 0, SEEK_SET) == -1) {
868 0f76ab83 2022-06-23 thomas err = got_error_from_errno("fseeko");
869 0f76ab83 2022-06-23 thomas goto done;
872 0f76ab83 2022-06-23 thomas if (asprintf(&oldlabel, "--- %s", p->old) == -1) {
873 0f76ab83 2022-06-23 thomas err = got_error_from_errno("asprintf");
874 0f76ab83 2022-06-23 thomas oldlabel = NULL;
875 0f76ab83 2022-06-23 thomas goto done;
878 0f76ab83 2022-06-23 thomas if (asprintf(&newlabel, "+++ %s", p->new) == -1) {
879 0f76ab83 2022-06-23 thomas err = got_error_from_errno("asprintf");
880 0f76ab83 2022-06-23 thomas newlabel = NULL;
881 0f76ab83 2022-06-23 thomas goto done;
884 8afec5d5 2022-07-01 thomas if (*p->cid != '\0') {
885 8afec5d5 2022-07-01 thomas type = "commit";
886 8afec5d5 2022-07-01 thomas id = p->cid;
888 8afec5d5 2022-07-01 thomas type = "blob";
889 8afec5d5 2022-07-01 thomas id = p->blob;
892 8afec5d5 2022-07-01 thomas if (asprintf(&anclabel, "%s %s", type, id) == -1) {
893 016bfe4b 2022-06-23 thomas err = got_error_from_errno("asprintf");
894 016bfe4b 2022-06-23 thomas anclabel = NULL;
895 016bfe4b 2022-06-23 thomas goto done;
898 f4602cbd 2022-07-23 thomas if (reverse) {
902 f4602cbd 2022-07-23 thomas s = anclabel;
903 f4602cbd 2022-07-23 thomas anclabel = newlabel;
904 f4602cbd 2022-07-23 thomas newlabel = s;
906 f4602cbd 2022-07-23 thomas t = afile;
907 f4602cbd 2022-07-23 thomas afile = tmpfile;
908 f4602cbd 2022-07-23 thomas tmpfile = t;
911 fc2a50f2 2022-11-01 thomas err = got_opentemp_named(&mergepath, &mergefile, template, "");
913 0f76ab83 2022-06-23 thomas goto done;
914 0f76ab83 2022-06-23 thomas outfd = fileno(mergefile);
916 0f76ab83 2022-06-23 thomas err = got_merge_diff3(overlapcnt, outfd, tmpfile, afile,
917 016bfe4b 2022-06-23 thomas oldfile, oldlabel, anclabel, newlabel,
918 0f76ab83 2022-06-23 thomas GOT_DIFF_ALGORITHM_PATIENCE);
920 0f76ab83 2022-06-23 thomas goto done;
924 eaf99875 2022-03-22 thomas goto done;
926 eaf99875 2022-03-22 thomas if (p->old != NULL && p->new == NULL) {
927 5e22b737 2022-05-31 thomas err = got_worktree_patch_schedule_rm(old, repo, worktree,
928 5e22b737 2022-05-31 thomas fileindex, patch_delete, pa);
929 eaf99875 2022-03-22 thomas goto done;
932 a2c162eb 2022-10-30 thomas if (fchmod(outfd, apply_umask(mode)) == -1) {
933 8260acc8 2022-05-01 thomas err = got_error_from_errno2("chmod", tmppath);
934 da09d8ed 2022-03-22 thomas goto done;
937 dd73a53d 2022-10-16 thomas if (mergepath) {
938 dd73a53d 2022-10-16 thomas err = got_path_move_file(mergepath, newpath);
940 e0c1f81c 2022-03-22 thomas goto done;
941 dd73a53d 2022-10-16 thomas free(mergepath);
942 dd73a53d 2022-10-16 thomas mergepath = NULL;
944 dd73a53d 2022-10-16 thomas err = got_path_move_file(tmppath, newpath);
946 e0c1f81c 2022-03-22 thomas goto done;
947 dd73a53d 2022-10-16 thomas free(tmppath);
948 dd73a53d 2022-10-16 thomas tmppath = NULL;
951 bb2ad8ff 2022-03-13 thomas if (file_renamed) {
952 5e22b737 2022-05-31 thomas err = got_worktree_patch_schedule_rm(old, repo, worktree,
953 5e22b737 2022-05-31 thomas fileindex, patch_delete, pa);
954 bb2ad8ff 2022-03-13 thomas if (err == NULL)
955 5e22b737 2022-05-31 thomas err = got_worktree_patch_schedule_add(new, repo,
956 5e22b737 2022-05-31 thomas worktree, fileindex, patch_add,
959 814624e7 2022-03-22 thomas unlink(newpath);
960 814624e7 2022-03-22 thomas } else if (p->old == NULL) {
961 5e22b737 2022-05-31 thomas err = got_worktree_patch_schedule_add(new, repo, worktree,
962 5e22b737 2022-05-31 thomas fileindex, patch_add, pa);
964 814624e7 2022-03-22 thomas unlink(newpath);
965 0f76ab83 2022-06-23 thomas } else if (*overlapcnt != 0)
966 0f76ab83 2022-06-23 thomas err = report_progress(pa, old, new, GOT_STATUS_CONFLICT, NULL);
967 762b8e82 2022-06-23 thomas else if (do_merge)
968 762b8e82 2022-06-23 thomas err = report_progress(pa, old, new, GOT_STATUS_MERGE, NULL);
970 72f46891 2022-04-23 thomas err = report_progress(pa, old, new, GOT_STATUS_MODIFY, NULL);
973 94af5a06 2022-03-08 thomas free(template);
975 dd73a53d 2022-10-16 thomas if (tmppath != NULL && unlink(tmppath) == -1 && err == NULL)
976 dd73a53d 2022-10-16 thomas err = got_error_from_errno("unlink");
977 0f76ab83 2022-06-23 thomas if (tmpfile != NULL && fclose(tmpfile) == EOF && err == NULL)
978 04cdf6ac 2022-06-23 thomas err = got_error_from_errno("fclose");
979 069bbb86 2022-03-07 thomas free(tmppath);
981 72f46891 2022-04-23 thomas free(oldpath);
982 2249fadd 2022-06-23 thomas if (oldfile != NULL && fclose(oldfile) == EOF && err == NULL)
983 2249fadd 2022-06-23 thomas err = got_error_from_errno("fclose");
985 dd73a53d 2022-10-16 thomas if (apath != NULL && unlink(apath) == -1 && err == NULL)
986 dd73a53d 2022-10-16 thomas err = got_error_from_errno("unlink");
987 0f76ab83 2022-06-23 thomas if (afile != NULL && fclose(afile) == EOF && err == NULL)
988 0f76ab83 2022-06-23 thomas err = got_error_from_errno("fclose");
989 0f76ab83 2022-06-23 thomas free(apath);
991 dd73a53d 2022-10-16 thomas if (mergepath != NULL && unlink(mergepath) == -1 && err == NULL)
992 dd73a53d 2022-10-16 thomas err = got_error_from_errno("unlink");
993 0f76ab83 2022-06-23 thomas if (mergefile != NULL && fclose(mergefile) == EOF && err == NULL)
994 0f76ab83 2022-06-23 thomas err = got_error_from_errno("fclose");
995 0f76ab83 2022-06-23 thomas free(mergepath);
997 72f46891 2022-04-23 thomas free(newpath);
998 0f76ab83 2022-06-23 thomas free(oldlabel);
999 0f76ab83 2022-06-23 thomas free(newlabel);
1000 016bfe4b 2022-06-23 thomas free(anclabel);
1001 069bbb86 2022-03-07 thomas return err;
1004 069bbb86 2022-03-07 thomas const struct got_error *
1005 069bbb86 2022-03-07 thomas got_patch(int fd, struct got_worktree *worktree, struct got_repository *repo,
1006 7d8bcb99 2022-07-28 thomas int nop, int strip, int reverse, struct got_object_id *commit_id,
1007 7d8bcb99 2022-07-28 thomas got_patch_progress_cb progress_cb, void *progress_arg,
1008 7d8bcb99 2022-07-28 thomas got_cancel_cb cancel_cb, void *cancel_arg)
1010 36832a8e 2022-05-31 thomas const struct got_error *err = NULL, *complete_err = NULL;
1011 814624e7 2022-03-22 thomas struct got_fileindex *fileindex = NULL;
1012 7d8bcb99 2022-07-28 thomas struct got_commit_object *commit = NULL;
1013 7d8bcb99 2022-07-28 thomas struct got_tree_object *tree = NULL;
1014 5e22b737 2022-05-31 thomas char *fileindex_path = NULL;
1015 49114f01 2022-03-22 thomas char *oldpath, *newpath;
1016 069bbb86 2022-03-07 thomas struct imsgbuf *ibuf;
1017 069bbb86 2022-03-07 thomas int imsg_fds[2] = {-1, -1};
1018 0f76ab83 2022-06-23 thomas int overlapcnt, done = 0, failed = 0;
1019 069bbb86 2022-03-07 thomas pid_t pid;
1021 069bbb86 2022-03-07 thomas ibuf = calloc(1, sizeof(*ibuf));
1022 069bbb86 2022-03-07 thomas if (ibuf == NULL) {
1023 069bbb86 2022-03-07 thomas err = got_error_from_errno("calloc");
1024 069bbb86 2022-03-07 thomas goto done;
1027 069bbb86 2022-03-07 thomas if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1) {
1028 069bbb86 2022-03-07 thomas err = got_error_from_errno("socketpair");
1029 069bbb86 2022-03-07 thomas goto done;
1032 069bbb86 2022-03-07 thomas pid = fork();
1033 069bbb86 2022-03-07 thomas if (pid == -1) {
1034 069bbb86 2022-03-07 thomas err = got_error_from_errno("fork");
1035 069bbb86 2022-03-07 thomas goto done;
1036 069bbb86 2022-03-07 thomas } else if (pid == 0) {
1037 069bbb86 2022-03-07 thomas got_privsep_exec_child(imsg_fds, GOT_PATH_PROG_READ_PATCH,
1039 069bbb86 2022-03-07 thomas /* not reached */
1042 069bbb86 2022-03-07 thomas if (close(imsg_fds[1]) == -1) {
1043 069bbb86 2022-03-07 thomas err = got_error_from_errno("close");
1044 069bbb86 2022-03-07 thomas goto done;
1046 069bbb86 2022-03-07 thomas imsg_fds[1] = -1;
1047 069bbb86 2022-03-07 thomas imsg_init(ibuf, imsg_fds[0]);
1049 069bbb86 2022-03-07 thomas err = send_patch(ibuf, fd);
1050 069bbb86 2022-03-07 thomas fd = -1;
1051 069bbb86 2022-03-07 thomas if (err)
1052 069bbb86 2022-03-07 thomas goto done;
1054 5e22b737 2022-05-31 thomas err = got_worktree_patch_prepare(&fileindex, &fileindex_path,
1055 5e22b737 2022-05-31 thomas worktree);
1056 814624e7 2022-03-22 thomas if (err)
1057 814624e7 2022-03-22 thomas goto done;
1059 7d8bcb99 2022-07-28 thomas if (commit_id) {
1060 7d8bcb99 2022-07-28 thomas err = got_object_open_as_commit(&commit, repo, commit_id);
1061 7d8bcb99 2022-07-28 thomas if (err)
1062 7d8bcb99 2022-07-28 thomas goto done;
1064 7d8bcb99 2022-07-28 thomas err = got_object_open_as_tree(&tree, repo, commit->tree_id);
1065 7d8bcb99 2022-07-28 thomas if (err)
1066 7d8bcb99 2022-07-28 thomas goto done;
1069 069bbb86 2022-03-07 thomas while (!done && err == NULL) {
1070 069bbb86 2022-03-07 thomas struct got_patch p;
1071 49114f01 2022-03-22 thomas struct patch_args pa;
1073 49114f01 2022-03-22 thomas pa.progress_cb = progress_cb;
1074 49114f01 2022-03-22 thomas pa.progress_arg = progress_arg;
1075 49114f01 2022-03-22 thomas pa.head = &p.head;
1077 d9db2ff9 2022-04-16 thomas err = recv_patch(ibuf, &done, &p, strip);
1078 069bbb86 2022-03-07 thomas if (err || done)
1081 814624e7 2022-03-22 thomas err = got_worktree_patch_check_path(p.old, p.new, &oldpath,
1082 814624e7 2022-03-22 thomas &newpath, worktree, repo, fileindex);
1083 814624e7 2022-03-22 thomas if (err == NULL)
1084 0f76ab83 2022-06-23 thomas err = apply_patch(&overlapcnt, worktree, repo,
1085 f4602cbd 2022-07-23 thomas fileindex, oldpath, newpath, &p, nop, reverse,
1086 7d8bcb99 2022-07-28 thomas commit_id, tree, &pa, cancel_cb, cancel_arg);
1087 49114f01 2022-03-22 thomas if (err != NULL) {
1088 49114f01 2022-03-22 thomas failed = 1;
1089 49114f01 2022-03-22 thomas /* recoverable errors */
1090 49114f01 2022-03-22 thomas if (err->code == GOT_ERR_FILE_STATUS ||
1091 49114f01 2022-03-22 thomas (err->code == GOT_ERR_ERRNO && errno == ENOENT))
1092 49114f01 2022-03-22 thomas err = report_progress(&pa, p.old, p.new,
1093 49114f01 2022-03-22 thomas GOT_STATUS_CANNOT_UPDATE, err);
1094 49114f01 2022-03-22 thomas else if (err->code == GOT_ERR_HUNK_FAILED)
1095 49114f01 2022-03-22 thomas err = report_progress(&pa, p.old, p.new,
1096 49114f01 2022-03-22 thomas GOT_STATUS_CANNOT_UPDATE, NULL);
1098 0f76ab83 2022-06-23 thomas if (overlapcnt != 0)
1099 0f76ab83 2022-06-23 thomas failed = 1;
1101 49114f01 2022-03-22 thomas free(oldpath);
1102 49114f01 2022-03-22 thomas free(newpath);
1103 069bbb86 2022-03-07 thomas patch_free(&p);
1105 069bbb86 2022-03-07 thomas if (err)
1110 36832a8e 2022-05-31 thomas if (fileindex != NULL)
1111 36832a8e 2022-05-31 thomas complete_err = got_worktree_patch_complete(fileindex,
1112 36832a8e 2022-05-31 thomas fileindex_path);
1113 5e22b737 2022-05-31 thomas if (complete_err && err == NULL)
1114 5e22b737 2022-05-31 thomas err = complete_err;
1115 36832a8e 2022-05-31 thomas free(fileindex_path);
1116 7d8bcb99 2022-07-28 thomas if (tree)
1117 7d8bcb99 2022-07-28 thomas got_object_tree_close(tree);
1118 7d8bcb99 2022-07-28 thomas if (commit)
1119 7d8bcb99 2022-07-28 thomas got_object_commit_close(commit);
1120 069bbb86 2022-03-07 thomas if (fd != -1 && close(fd) == -1 && err == NULL)
1121 069bbb86 2022-03-07 thomas err = got_error_from_errno("close");
1122 069bbb86 2022-03-07 thomas if (ibuf != NULL)
1123 069bbb86 2022-03-07 thomas imsg_clear(ibuf);
1124 069bbb86 2022-03-07 thomas if (imsg_fds[0] != -1 && close(imsg_fds[0]) == -1 && err == NULL)
1125 069bbb86 2022-03-07 thomas err = got_error_from_errno("close");
1126 069bbb86 2022-03-07 thomas if (imsg_fds[1] != -1 && close(imsg_fds[1]) == -1 && err == NULL)
1127 069bbb86 2022-03-07 thomas err = got_error_from_errno("close");
1128 49114f01 2022-03-22 thomas if (err == NULL && failed)
1129 49114f01 2022-03-22 thomas err = got_error(GOT_ERR_PATCH_FAILED);
1130 069bbb86 2022-03-07 thomas return err;
