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 {
75 069bbb86 2022-03-07 thomas char *old;
76 069bbb86 2022-03-07 thomas char *new;
77 016bfe4b 2022-06-23 thomas char cid[41];
78 0f76ab83 2022-06-23 thomas char blob[41];
79 49114f01 2022-03-22 thomas struct got_patch_hunk_head head;
82 c71da4f7 2022-03-22 thomas struct patch_args {
83 c71da4f7 2022-03-22 thomas got_patch_progress_cb progress_cb;
84 c71da4f7 2022-03-22 thomas void *progress_arg;
85 49114f01 2022-03-22 thomas struct got_patch_hunk_head *head;
88 069bbb86 2022-03-07 thomas static const struct got_error *
89 069bbb86 2022-03-07 thomas send_patch(struct imsgbuf *ibuf, int fd)
91 069bbb86 2022-03-07 thomas const struct got_error *err = NULL;
93 069bbb86 2022-03-07 thomas if (imsg_compose(ibuf, GOT_IMSG_PATCH_FILE, 0, 0, fd,
94 069bbb86 2022-03-07 thomas NULL, 0) == -1) {
95 069bbb86 2022-03-07 thomas err = got_error_from_errno(
96 069bbb86 2022-03-07 thomas "imsg_compose GOT_IMSG_PATCH_FILE");
97 069bbb86 2022-03-07 thomas close(fd);
98 069bbb86 2022-03-07 thomas return err;
101 dab315a5 2022-07-07 thomas return got_privsep_flush_imsg(ibuf);
104 069bbb86 2022-03-07 thomas static void
105 069bbb86 2022-03-07 thomas patch_free(struct got_patch *p)
107 069bbb86 2022-03-07 thomas struct got_patch_hunk *h;
108 069bbb86 2022-03-07 thomas size_t i;
110 069bbb86 2022-03-07 thomas while (!STAILQ_EMPTY(&p->head)) {
111 069bbb86 2022-03-07 thomas h = STAILQ_FIRST(&p->head);
112 069bbb86 2022-03-07 thomas STAILQ_REMOVE_HEAD(&p->head, entries);
114 069bbb86 2022-03-07 thomas for (i = 0; i < h->len; ++i)
115 069bbb86 2022-03-07 thomas free(h->lines[i]);
116 069bbb86 2022-03-07 thomas free(h->lines);
120 069bbb86 2022-03-07 thomas free(p->new);
121 069bbb86 2022-03-07 thomas free(p->old);
123 9880a1dd 2022-06-23 thomas memset(p, 0, sizeof(*p));
124 9880a1dd 2022-06-23 thomas STAILQ_INIT(&p->head);
127 069bbb86 2022-03-07 thomas static const struct got_error *
128 069bbb86 2022-03-07 thomas pushline(struct got_patch_hunk *h, const char *line)
131 069bbb86 2022-03-07 thomas size_t newcap;
133 069bbb86 2022-03-07 thomas if (h->len == h->cap) {
134 069bbb86 2022-03-07 thomas if ((newcap = h->cap * 1.5) == 0)
135 069bbb86 2022-03-07 thomas newcap = 16;
136 069bbb86 2022-03-07 thomas t = recallocarray(h->lines, h->cap, newcap,
137 069bbb86 2022-03-07 thomas sizeof(h->lines[0]));
138 069bbb86 2022-03-07 thomas if (t == NULL)
139 069bbb86 2022-03-07 thomas return got_error_from_errno("recallocarray");
140 069bbb86 2022-03-07 thomas h->lines = t;
141 069bbb86 2022-03-07 thomas h->cap = newcap;
144 069bbb86 2022-03-07 thomas if ((t = strdup(line)) == NULL)
145 069bbb86 2022-03-07 thomas return got_error_from_errno("strdup");
147 069bbb86 2022-03-07 thomas h->lines[h->len++] = t;
148 069bbb86 2022-03-07 thomas return NULL;
151 069bbb86 2022-03-07 thomas static const struct got_error *
152 d9db2ff9 2022-04-16 thomas recv_patch(struct imsgbuf *ibuf, int *done, struct got_patch *p, int strip)
154 069bbb86 2022-03-07 thomas const struct got_error *err = NULL;
155 069bbb86 2022-03-07 thomas struct imsg imsg;
156 069bbb86 2022-03-07 thomas struct got_imsg_patch_hunk hdr;
157 069bbb86 2022-03-07 thomas struct got_imsg_patch patch;
158 069bbb86 2022-03-07 thomas struct got_patch_hunk *h = NULL;
159 069bbb86 2022-03-07 thomas size_t datalen;
160 656c2baa 2022-04-23 thomas int lastmode = -1;
162 069bbb86 2022-03-07 thomas memset(p, 0, sizeof(*p));
163 069bbb86 2022-03-07 thomas STAILQ_INIT(&p->head);
165 069bbb86 2022-03-07 thomas err = got_privsep_recv_imsg(&imsg, ibuf, 0);
167 069bbb86 2022-03-07 thomas return err;
168 069bbb86 2022-03-07 thomas if (imsg.hdr.type == GOT_IMSG_PATCH_EOF) {
169 069bbb86 2022-03-07 thomas *done = 1;
170 069bbb86 2022-03-07 thomas goto done;
172 069bbb86 2022-03-07 thomas if (imsg.hdr.type != GOT_IMSG_PATCH) {
173 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PRIVSEP_MSG);
174 069bbb86 2022-03-07 thomas goto done;
176 069bbb86 2022-03-07 thomas datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
177 069bbb86 2022-03-07 thomas if (datalen != sizeof(patch)) {
178 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PRIVSEP_LEN);
179 069bbb86 2022-03-07 thomas goto done;
181 069bbb86 2022-03-07 thomas memcpy(&patch, imsg.data, sizeof(patch));
183 ca357dd9 2022-06-23 thomas if (patch.old[sizeof(patch.old)-1] != '\0' ||
184 0f76ab83 2022-06-23 thomas patch.new[sizeof(patch.new)-1] != '\0' ||
185 016bfe4b 2022-06-23 thomas patch.cid[sizeof(patch.cid)-1] != '\0' ||
186 0f76ab83 2022-06-23 thomas patch.blob[sizeof(patch.blob)-1] != '\0') {
187 ca357dd9 2022-06-23 thomas err = got_error(GOT_ERR_PRIVSEP_LEN);
188 ca357dd9 2022-06-23 thomas goto done;
191 8afec5d5 2022-07-01 thomas if (*patch.cid != '\0')
192 016bfe4b 2022-06-23 thomas strlcpy(p->cid, patch.cid, sizeof(p->cid));
194 8afec5d5 2022-07-01 thomas if (*patch.blob != '\0')
195 016bfe4b 2022-06-23 thomas strlcpy(p->blob, patch.blob, sizeof(p->blob));
197 d9db2ff9 2022-04-16 thomas /* automatically set strip=1 for git-style diffs */
198 d9db2ff9 2022-04-16 thomas if (strip == -1 && patch.git &&
199 d9db2ff9 2022-04-16 thomas (*patch.old == '\0' || !strncmp(patch.old, "a/", 2)) &&
200 d9db2ff9 2022-04-16 thomas (*patch.new == '\0' || !strncmp(patch.new, "b/", 2)))
201 d9db2ff9 2022-04-16 thomas strip = 1;
203 d9db2ff9 2022-04-16 thomas /* prefer the new name if not /dev/null for not git-style diffs */
204 d9db2ff9 2022-04-16 thomas if (!patch.git && *patch.new != '\0' && *patch.old != '\0') {
205 d9db2ff9 2022-04-16 thomas err = got_path_strip(&p->old, patch.new, strip);
207 d9db2ff9 2022-04-16 thomas goto done;
208 d9db2ff9 2022-04-16 thomas } else if (*patch.old != '\0') {
209 d9db2ff9 2022-04-16 thomas err = got_path_strip(&p->old, patch.old, strip);
211 d9db2ff9 2022-04-16 thomas goto done;
214 d9db2ff9 2022-04-16 thomas if (*patch.new != '\0') {
215 d9db2ff9 2022-04-16 thomas err = got_path_strip(&p->new, patch.new, strip);
217 d9db2ff9 2022-04-16 thomas goto done;
220 64c9e565 2022-03-13 thomas if (p->old == NULL && p->new == NULL) {
221 64c9e565 2022-03-13 thomas err = got_error(GOT_ERR_PATCH_MALFORMED);
222 64c9e565 2022-03-13 thomas goto done;
225 069bbb86 2022-03-07 thomas imsg_free(&imsg);
227 069bbb86 2022-03-07 thomas for (;;) {
230 069bbb86 2022-03-07 thomas err = got_privsep_recv_imsg(&imsg, ibuf, 0);
231 9880a1dd 2022-06-23 thomas if (err) {
232 9880a1dd 2022-06-23 thomas patch_free(p);
233 069bbb86 2022-03-07 thomas return err;
236 047c926f 2022-06-23 thomas datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
237 069bbb86 2022-03-07 thomas switch (imsg.hdr.type) {
238 069bbb86 2022-03-07 thomas case GOT_IMSG_PATCH_DONE:
239 88c260f4 2022-05-14 thomas if (h != NULL && h->len == 0)
240 88c260f4 2022-05-14 thomas err = got_error(GOT_ERR_PATCH_MALFORMED);
241 069bbb86 2022-03-07 thomas goto done;
242 069bbb86 2022-03-07 thomas case GOT_IMSG_PATCH_HUNK:
243 88c260f4 2022-05-14 thomas if (h != NULL &&
244 88c260f4 2022-05-14 thomas (h->len == 0 || h->old_nonl || h->new_nonl)) {
245 ff7f34d3 2022-03-22 thomas err = got_error(GOT_ERR_PATCH_MALFORMED);
246 ff7f34d3 2022-03-22 thomas goto done;
248 656c2baa 2022-04-23 thomas lastmode = -1;
249 069bbb86 2022-03-07 thomas if (datalen != sizeof(hdr)) {
250 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PRIVSEP_LEN);
251 069bbb86 2022-03-07 thomas goto done;
253 069bbb86 2022-03-07 thomas memcpy(&hdr, imsg.data, sizeof(hdr));
254 06227823 2022-06-23 thomas if (hdr.oldfrom < 0 || hdr.newfrom < 0) {
255 06227823 2022-06-23 thomas err = got_error(GOT_ERR_PRIVSEP_LEN);
256 eb35d814 2022-06-23 thomas goto done;
258 06227823 2022-06-23 thomas if ((h = calloc(1, sizeof(*h))) == NULL) {
259 06227823 2022-06-23 thomas err = got_error_from_errno("calloc");
260 069bbb86 2022-03-07 thomas goto done;
262 069bbb86 2022-03-07 thomas h->old_from = hdr.oldfrom;
263 069bbb86 2022-03-07 thomas h->old_lines = hdr.oldlines;
264 069bbb86 2022-03-07 thomas h->new_from = hdr.newfrom;
265 069bbb86 2022-03-07 thomas h->new_lines = hdr.newlines;
266 069bbb86 2022-03-07 thomas STAILQ_INSERT_TAIL(&p->head, h, entries);
268 069bbb86 2022-03-07 thomas case GOT_IMSG_PATCH_LINE:
269 069bbb86 2022-03-07 thomas if (h == NULL) {
270 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PRIVSEP_MSG);
271 069bbb86 2022-03-07 thomas goto done;
273 069bbb86 2022-03-07 thomas t = imsg.data;
274 ff7f34d3 2022-03-22 thomas /* at least one char */
275 069bbb86 2022-03-07 thomas if (datalen < 2 || t[datalen-1] != '\0') {
276 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PRIVSEP_MSG);
277 069bbb86 2022-03-07 thomas goto done;
279 ff7f34d3 2022-03-22 thomas if (*t != ' ' && *t != '-' && *t != '+' &&
280 ff7f34d3 2022-03-22 thomas *t != '\\') {
281 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PRIVSEP_MSG);
282 069bbb86 2022-03-07 thomas goto done;
285 656c2baa 2022-04-23 thomas if (*t != '\\')
286 ff7f34d3 2022-03-22 thomas err = pushline(h, t);
287 656c2baa 2022-04-23 thomas else if (lastmode == '-')
288 656c2baa 2022-04-23 thomas h->old_nonl = 1;
289 656c2baa 2022-04-23 thomas else if (lastmode == '+')
290 656c2baa 2022-04-23 thomas h->new_nonl = 1;
292 656c2baa 2022-04-23 thomas err = got_error(GOT_ERR_PATCH_MALFORMED);
295 069bbb86 2022-03-07 thomas goto done;
297 656c2baa 2022-04-23 thomas lastmode = *t;
300 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PRIVSEP_MSG);
301 069bbb86 2022-03-07 thomas goto done;
304 069bbb86 2022-03-07 thomas imsg_free(&imsg);
309 9880a1dd 2022-06-23 thomas patch_free(p);
311 069bbb86 2022-03-07 thomas imsg_free(&imsg);
312 069bbb86 2022-03-07 thomas return err;
316 069bbb86 2022-03-07 thomas * Copy data from orig starting at copypos until pos into tmp.
317 069bbb86 2022-03-07 thomas * If pos is -1, copy until EOF.
319 069bbb86 2022-03-07 thomas static const struct got_error *
320 069bbb86 2022-03-07 thomas copy(FILE *tmp, FILE *orig, off_t copypos, off_t pos)
322 069bbb86 2022-03-07 thomas char buf[BUFSIZ];
323 069bbb86 2022-03-07 thomas size_t len, r, w;
325 bafaf650 2022-05-14 thomas if (fseeko(orig, copypos, SEEK_SET) == -1)
326 bafaf650 2022-05-14 thomas return got_error_from_errno("fseeko");
328 069bbb86 2022-03-07 thomas while (pos == -1 || copypos < pos) {
329 069bbb86 2022-03-07 thomas len = sizeof(buf);
330 069bbb86 2022-03-07 thomas if (pos > 0)
331 069bbb86 2022-03-07 thomas len = MIN(len, (size_t)pos - copypos);
332 069bbb86 2022-03-07 thomas r = fread(buf, 1, len, orig);
333 069bbb86 2022-03-07 thomas if (r != len && ferror(orig))
334 069bbb86 2022-03-07 thomas return got_error_from_errno("fread");
335 069bbb86 2022-03-07 thomas w = fwrite(buf, 1, r, tmp);
336 069bbb86 2022-03-07 thomas if (w != r)
337 069bbb86 2022-03-07 thomas return got_error_from_errno("fwrite");
338 069bbb86 2022-03-07 thomas copypos += len;
339 069bbb86 2022-03-07 thomas if (r != len && feof(orig)) {
340 069bbb86 2022-03-07 thomas if (pos == -1)
341 069bbb86 2022-03-07 thomas return NULL;
342 49114f01 2022-03-22 thomas return got_error(GOT_ERR_HUNK_FAILED);
345 069bbb86 2022-03-07 thomas return NULL;
348 069bbb86 2022-03-07 thomas static const struct got_error *
349 8ebb3daa 2022-06-23 thomas locate_hunk(FILE *orig, struct got_patch_hunk *h, off_t *pos, int *lineno)
351 069bbb86 2022-03-07 thomas const struct got_error *err = NULL;
352 069bbb86 2022-03-07 thomas char *line = NULL;
353 069bbb86 2022-03-07 thomas char mode = *h->lines[0];
354 069bbb86 2022-03-07 thomas size_t linesize = 0;
355 069bbb86 2022-03-07 thomas ssize_t linelen;
356 069bbb86 2022-03-07 thomas off_t match = -1;
357 8ebb3daa 2022-06-23 thomas int match_lineno = -1;
359 069bbb86 2022-03-07 thomas for (;;) {
360 069bbb86 2022-03-07 thomas linelen = getline(&line, &linesize, orig);
361 069bbb86 2022-03-07 thomas if (linelen == -1) {
362 069bbb86 2022-03-07 thomas if (ferror(orig))
363 069bbb86 2022-03-07 thomas err = got_error_from_errno("getline");
364 069bbb86 2022-03-07 thomas else if (match == -1)
365 49114f01 2022-03-22 thomas err = got_error(GOT_ERR_HUNK_FAILED);
368 ff7f34d3 2022-03-22 thomas if (line[linelen - 1] == '\n')
369 ff7f34d3 2022-03-22 thomas line[linelen - 1] = '\0';
370 069bbb86 2022-03-07 thomas (*lineno)++;
372 17d6446a 2022-03-22 thomas if ((mode == ' ' && !strcmp(h->lines[0] + 1, line)) ||
373 17d6446a 2022-03-22 thomas (mode == '-' && !strcmp(h->lines[0] + 1, line)) ||
374 069bbb86 2022-03-07 thomas (mode == '+' && *lineno == h->old_from)) {
375 069bbb86 2022-03-07 thomas match = ftello(orig);
376 069bbb86 2022-03-07 thomas if (match == -1) {
377 069bbb86 2022-03-07 thomas err = got_error_from_errno("ftello");
380 069bbb86 2022-03-07 thomas match -= linelen;
381 069bbb86 2022-03-07 thomas match_lineno = (*lineno)-1;
384 069bbb86 2022-03-07 thomas if (*lineno >= h->old_from && match != -1)
388 069bbb86 2022-03-07 thomas if (err == NULL) {
389 122e1611 2022-03-22 thomas *pos = match;
390 069bbb86 2022-03-07 thomas *lineno = match_lineno;
391 bafaf650 2022-05-14 thomas if (fseeko(orig, match, SEEK_SET) == -1)
392 bafaf650 2022-05-14 thomas err = got_error_from_errno("fseeko");
395 069bbb86 2022-03-07 thomas free(line);
396 069bbb86 2022-03-07 thomas return err;
399 bb90ca7b 2022-07-03 thomas static int
400 bb90ca7b 2022-07-03 thomas linecmp(const char *a, const char *b, int *mangled)
404 bb90ca7b 2022-07-03 thomas *mangled = 0;
405 bb90ca7b 2022-07-03 thomas c = strcmp(a, b);
406 bb90ca7b 2022-07-03 thomas if (c == 0)
407 bb90ca7b 2022-07-03 thomas return c;
409 bb90ca7b 2022-07-03 thomas *mangled = 1;
410 bb90ca7b 2022-07-03 thomas for (;;) {
411 2140c6ec 2022-07-04 thomas while (*a == '\t' || *a == ' ' || *a == '\f')
413 2140c6ec 2022-07-04 thomas while (*b == '\t' || *b == ' ' || *b == '\f')
415 2140c6ec 2022-07-04 thomas if (*a == '\0' || *a != *b)
417 bb90ca7b 2022-07-03 thomas a++, b++;
420 bb90ca7b 2022-07-03 thomas return *a - *b;
423 069bbb86 2022-03-07 thomas static const struct got_error *
424 069bbb86 2022-03-07 thomas test_hunk(FILE *orig, struct got_patch_hunk *h)
426 069bbb86 2022-03-07 thomas const struct got_error *err = NULL;
427 069bbb86 2022-03-07 thomas char *line = NULL;
428 069bbb86 2022-03-07 thomas size_t linesize = 0, i = 0;
429 069bbb86 2022-03-07 thomas ssize_t linelen;
430 bb90ca7b 2022-07-03 thomas int mangled;
432 069bbb86 2022-03-07 thomas for (i = 0; i < h->len; ++i) {
433 069bbb86 2022-03-07 thomas switch (*h->lines[i]) {
434 069bbb86 2022-03-07 thomas case '+':
435 069bbb86 2022-03-07 thomas continue;
436 069bbb86 2022-03-07 thomas case ' ':
437 069bbb86 2022-03-07 thomas case '-':
438 069bbb86 2022-03-07 thomas linelen = getline(&line, &linesize, orig);
439 069bbb86 2022-03-07 thomas if (linelen == -1) {
440 069bbb86 2022-03-07 thomas if (ferror(orig))
441 069bbb86 2022-03-07 thomas err = got_error_from_errno("getline");
443 069bbb86 2022-03-07 thomas err = got_error(
444 49114f01 2022-03-22 thomas GOT_ERR_HUNK_FAILED);
445 069bbb86 2022-03-07 thomas goto done;
447 ff7f34d3 2022-03-22 thomas if (line[linelen - 1] == '\n')
448 ff7f34d3 2022-03-22 thomas line[linelen - 1] = '\0';
449 bb90ca7b 2022-07-03 thomas if (linecmp(h->lines[i] + 1, line, &mangled)) {
450 49114f01 2022-03-22 thomas err = got_error(GOT_ERR_HUNK_FAILED);
451 069bbb86 2022-03-07 thomas goto done;
453 bb90ca7b 2022-07-03 thomas if (mangled)
454 bb90ca7b 2022-07-03 thomas h->ws_mangled = 1;
460 069bbb86 2022-03-07 thomas free(line);
461 069bbb86 2022-03-07 thomas return err;
464 069bbb86 2022-03-07 thomas static const struct got_error *
465 bb90ca7b 2022-07-03 thomas apply_hunk(FILE *orig, FILE *tmp, struct got_patch_hunk *h, int *lineno,
466 bb90ca7b 2022-07-03 thomas off_t from)
468 bb90ca7b 2022-07-03 thomas const struct got_error *err = NULL;
469 bb90ca7b 2022-07-03 thomas const char *t;
470 bb90ca7b 2022-07-03 thomas size_t linesize = 0, i, new = 0;
471 bb90ca7b 2022-07-03 thomas char *line = NULL;
472 bb90ca7b 2022-07-03 thomas char mode;
473 bb90ca7b 2022-07-03 thomas ssize_t linelen;
475 bb90ca7b 2022-07-03 thomas if (orig != NULL && fseeko(orig, from, SEEK_SET) == -1)
476 bb90ca7b 2022-07-03 thomas return got_error_from_errno("fseeko");
478 069bbb86 2022-03-07 thomas for (i = 0; i < h->len; ++i) {
479 bb90ca7b 2022-07-03 thomas switch (mode = *h->lines[i]) {
480 069bbb86 2022-03-07 thomas case '-':
481 bb90ca7b 2022-07-03 thomas case ' ':
482 069bbb86 2022-03-07 thomas (*lineno)++;
483 bb90ca7b 2022-07-03 thomas if (orig != NULL) {
484 bb90ca7b 2022-07-03 thomas linelen = getline(&line, &linesize, orig);
485 bb90ca7b 2022-07-03 thomas if (linelen == -1) {
486 bb90ca7b 2022-07-03 thomas err = got_error_from_errno("getline");
487 bb90ca7b 2022-07-03 thomas goto done;
489 bb90ca7b 2022-07-03 thomas if (line[linelen - 1] == '\n')
490 bb90ca7b 2022-07-03 thomas line[linelen - 1] = '\0';
491 bb90ca7b 2022-07-03 thomas t = line;
493 bb90ca7b 2022-07-03 thomas t = h->lines[i] + 1;
494 bb90ca7b 2022-07-03 thomas if (mode == '-')
495 bb90ca7b 2022-07-03 thomas continue;
496 bb90ca7b 2022-07-03 thomas if (fprintf(tmp, "%s\n", t) < 0) {
497 bb90ca7b 2022-07-03 thomas err = got_error_from_errno("fprintf");
498 bb90ca7b 2022-07-03 thomas goto done;
501 069bbb86 2022-03-07 thomas case '+':
503 bb90ca7b 2022-07-03 thomas if (fprintf(tmp, "%s", h->lines[i] + 1) < 0) {
504 bb90ca7b 2022-07-03 thomas err = got_error_from_errno("fprintf");
505 bb90ca7b 2022-07-03 thomas goto done;
507 656c2baa 2022-04-23 thomas if (new != h->new_lines || !h->new_nonl) {
508 bb90ca7b 2022-07-03 thomas if (fprintf(tmp, "\n") < 0) {
509 bb90ca7b 2022-07-03 thomas err = got_error_from_errno("fprintf");
510 bb90ca7b 2022-07-03 thomas goto done;
518 bb90ca7b 2022-07-03 thomas free(line);
519 bb90ca7b 2022-07-03 thomas return err;
522 46e6bdd4 2022-03-22 thomas static const struct got_error *
523 25a880e1 2022-07-03 thomas patch_file(struct got_patch *p, FILE *orig, FILE *tmp)
525 bb2ad8ff 2022-03-13 thomas const struct got_error *err = NULL;
526 bb2ad8ff 2022-03-13 thomas struct got_patch_hunk *h;
527 da09d8ed 2022-03-22 thomas struct stat sb;
528 8ebb3daa 2022-06-23 thomas int lineno = 0;
529 bb2ad8ff 2022-03-13 thomas off_t copypos, pos;
530 bb2ad8ff 2022-03-13 thomas char *line = NULL;
531 bb2ad8ff 2022-03-13 thomas size_t linesize = 0;
532 bb2ad8ff 2022-03-13 thomas ssize_t linelen;
534 069bbb86 2022-03-07 thomas if (p->old == NULL) { /* create */
535 069bbb86 2022-03-07 thomas h = STAILQ_FIRST(&p->head);
536 bb2ad8ff 2022-03-13 thomas if (h == NULL || STAILQ_NEXT(h, entries) != NULL)
537 bb2ad8ff 2022-03-13 thomas return got_error(GOT_ERR_PATCH_MALFORMED);
538 bb90ca7b 2022-07-03 thomas return apply_hunk(orig, tmp, h, &lineno, 0);
541 2249fadd 2022-06-23 thomas if (fstat(fileno(orig), &sb) == -1)
542 2249fadd 2022-06-23 thomas return got_error_from_errno("fstat");
544 069bbb86 2022-03-07 thomas copypos = 0;
545 069bbb86 2022-03-07 thomas STAILQ_FOREACH(h, &p->head, entries) {
546 069bbb86 2022-03-07 thomas tryagain:
547 122e1611 2022-03-22 thomas err = locate_hunk(orig, h, &pos, &lineno);
548 49114f01 2022-03-22 thomas if (err != NULL && err->code == GOT_ERR_HUNK_FAILED)
549 49114f01 2022-03-22 thomas h->err = err;
550 069bbb86 2022-03-07 thomas if (err != NULL)
551 2249fadd 2022-06-23 thomas return err;
552 2d9b6837 2022-06-23 thomas err = copy(tmp, orig, copypos, pos);
553 069bbb86 2022-03-07 thomas if (err != NULL)
554 2249fadd 2022-06-23 thomas return err;
555 069bbb86 2022-03-07 thomas copypos = pos;
557 069bbb86 2022-03-07 thomas err = test_hunk(orig, h);
558 49114f01 2022-03-22 thomas if (err != NULL && err->code == GOT_ERR_HUNK_FAILED) {
560 069bbb86 2022-03-07 thomas * try to apply the hunk again starting the search
561 069bbb86 2022-03-07 thomas * after the previous partial match.
563 2249fadd 2022-06-23 thomas if (fseeko(orig, pos, SEEK_SET) == -1)
564 2249fadd 2022-06-23 thomas return got_error_from_errno("fseeko");
565 069bbb86 2022-03-07 thomas linelen = getline(&line, &linesize, orig);
566 2249fadd 2022-06-23 thomas if (linelen == -1)
567 2249fadd 2022-06-23 thomas return got_error_from_errno("getline");
568 069bbb86 2022-03-07 thomas lineno++;
569 069bbb86 2022-03-07 thomas goto tryagain;
571 069bbb86 2022-03-07 thomas if (err != NULL)
572 2249fadd 2022-06-23 thomas return err;
574 49114f01 2022-03-22 thomas if (lineno + 1 != h->old_from)
575 49114f01 2022-03-22 thomas h->offset = lineno + 1 - h->old_from;
577 bb90ca7b 2022-07-03 thomas err = apply_hunk(orig, tmp, h, &lineno, pos);
578 069bbb86 2022-03-07 thomas if (err != NULL)
579 2249fadd 2022-06-23 thomas return err;
581 069bbb86 2022-03-07 thomas copypos = ftello(orig);
582 2249fadd 2022-06-23 thomas if (copypos == -1)
583 2249fadd 2022-06-23 thomas return got_error_from_errno("ftello");
586 49114f01 2022-03-22 thomas if (p->new == NULL && sb.st_size != copypos) {
587 49114f01 2022-03-22 thomas h = STAILQ_FIRST(&p->head);
588 49114f01 2022-03-22 thomas h->err = got_error(GOT_ERR_HUNK_FAILED);
589 49114f01 2022-03-22 thomas err = h->err;
590 2d9b6837 2022-06-23 thomas } else if (!feof(orig))
591 069bbb86 2022-03-07 thomas err = copy(tmp, orig, copypos, -1);
593 10e55613 2022-03-22 thomas return err;
596 10e55613 2022-03-22 thomas static const struct got_error *
597 49114f01 2022-03-22 thomas report_progress(struct patch_args *pa, const char *old, const char *new,
598 49114f01 2022-03-22 thomas unsigned char status, const struct got_error *orig_error)
600 49114f01 2022-03-22 thomas const struct got_error *err;
601 49114f01 2022-03-22 thomas struct got_patch_hunk *h;
603 49114f01 2022-03-22 thomas err = pa->progress_cb(pa->progress_arg, old, new, status,
604 bb90ca7b 2022-07-03 thomas orig_error, 0, 0, 0, 0, 0, 0, NULL);
606 49114f01 2022-03-22 thomas return err;
608 49114f01 2022-03-22 thomas STAILQ_FOREACH(h, pa->head, entries) {
609 bb90ca7b 2022-07-03 thomas if (h->offset == 0 && !h->ws_mangled && h->err == NULL)
610 49114f01 2022-03-22 thomas continue;
612 49114f01 2022-03-22 thomas err = pa->progress_cb(pa->progress_arg, old, new, 0, NULL,
613 49114f01 2022-03-22 thomas h->old_from, h->old_lines, h->new_from, h->new_lines,
614 bb90ca7b 2022-07-03 thomas h->offset, h->ws_mangled, h->err);
616 49114f01 2022-03-22 thomas return err;
619 49114f01 2022-03-22 thomas return NULL;
622 49114f01 2022-03-22 thomas static const struct got_error *
623 c71da4f7 2022-03-22 thomas patch_delete(void *arg, unsigned char status, unsigned char staged_status,
624 c71da4f7 2022-03-22 thomas const char *path)
626 49114f01 2022-03-22 thomas return report_progress(arg, path, NULL, status, NULL);
629 c71da4f7 2022-03-22 thomas static const struct got_error *
630 c71da4f7 2022-03-22 thomas patch_add(void *arg, unsigned char status, const char *path)
632 49114f01 2022-03-22 thomas return report_progress(arg, NULL, path, status, NULL);
635 c71da4f7 2022-03-22 thomas static const struct got_error *
636 0f76ab83 2022-06-23 thomas open_blob(char **path, FILE **fp, const char *blobid,
637 0f76ab83 2022-06-23 thomas struct got_repository *repo)
639 bb2ad8ff 2022-03-13 thomas const struct got_error *err = NULL;
640 0f76ab83 2022-06-23 thomas struct got_blob_object *blob = NULL;
641 19dd85cb 2022-07-01 thomas struct got_object_id id, *idptr, *matched_id = NULL;
642 f4ae6ddb 2022-07-01 thomas int fd = -1;
644 0f76ab83 2022-06-23 thomas *fp = NULL;
645 0f76ab83 2022-06-23 thomas *path = NULL;
647 19dd85cb 2022-07-01 thomas if (strlen(blobid) != SHA1_DIGEST_STRING_LENGTH - 1) {
648 19dd85cb 2022-07-01 thomas err = got_repo_match_object_id(&matched_id, NULL, blobid,
649 19dd85cb 2022-07-01 thomas GOT_OBJ_TYPE_BLOB, NULL /* do not resolve tags */,
652 19dd85cb 2022-07-01 thomas return err;
653 19dd85cb 2022-07-01 thomas idptr = matched_id;
655 19dd85cb 2022-07-01 thomas if (!got_parse_sha1_digest(id.sha1, blobid))
656 19dd85cb 2022-07-01 thomas return got_error(GOT_ERR_BAD_OBJ_ID_STR);
657 19dd85cb 2022-07-01 thomas idptr = &id;
660 f4ae6ddb 2022-07-01 thomas fd = got_opentempfd();
661 f4ae6ddb 2022-07-01 thomas if (fd == -1) {
662 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
663 f4ae6ddb 2022-07-01 thomas goto done;
666 f4ae6ddb 2022-07-01 thomas err = got_object_open_as_blob(&blob, repo, idptr, 8192, fd);
668 0f76ab83 2022-06-23 thomas goto done;
670 0f76ab83 2022-06-23 thomas err = got_opentemp_named(path, fp, GOT_TMPDIR_STR "/got-patch-blob");
672 0f76ab83 2022-06-23 thomas goto done;
674 0f76ab83 2022-06-23 thomas err = got_object_blob_dump_to_file(NULL, NULL, NULL, *fp, blob);
676 0f76ab83 2022-06-23 thomas goto done;
679 f4ae6ddb 2022-07-01 thomas if (fd != -1 && close(fd) == -1 && err == NULL)
680 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
681 0f76ab83 2022-06-23 thomas if (blob)
682 0f76ab83 2022-06-23 thomas got_object_blob_close(blob);
683 19dd85cb 2022-07-01 thomas if (matched_id != NULL)
684 19dd85cb 2022-07-01 thomas free(matched_id);
685 0f76ab83 2022-06-23 thomas if (err) {
686 0f76ab83 2022-06-23 thomas if (*fp != NULL)
687 0f76ab83 2022-06-23 thomas fclose(*fp);
688 0f76ab83 2022-06-23 thomas if (*path != NULL)
689 0f76ab83 2022-06-23 thomas unlink(*path);
690 0f76ab83 2022-06-23 thomas free(*path);
691 0f76ab83 2022-06-23 thomas *fp = NULL;
692 0f76ab83 2022-06-23 thomas *path = NULL;
694 0f76ab83 2022-06-23 thomas return err;
697 0f76ab83 2022-06-23 thomas static const struct got_error *
698 0f76ab83 2022-06-23 thomas apply_patch(int *overlapcnt, struct got_worktree *worktree,
699 0f76ab83 2022-06-23 thomas struct got_repository *repo, struct got_fileindex *fileindex,
700 0f76ab83 2022-06-23 thomas const char *old, const char *new, struct got_patch *p, int nop,
701 0f76ab83 2022-06-23 thomas struct patch_args *pa, got_cancel_cb cancel_cb, void *cancel_arg)
703 0f76ab83 2022-06-23 thomas const struct got_error *err = NULL;
704 25a880e1 2022-07-03 thomas struct stat sb;
705 0f76ab83 2022-06-23 thomas int do_merge = 0, file_renamed = 0;
706 016bfe4b 2022-06-23 thomas char *oldlabel = NULL, *newlabel = NULL, *anclabel = NULL;
707 72f46891 2022-04-23 thomas char *oldpath = NULL, *newpath = NULL;
708 3b5e1554 2022-06-23 thomas char *tmppath = NULL, *template = NULL, *parent = NULL;
709 0f76ab83 2022-06-23 thomas char *apath = NULL, *mergepath = NULL;
710 0f76ab83 2022-06-23 thomas FILE *oldfile = NULL, *tmpfile = NULL, *afile = NULL, *mergefile = NULL;
711 0f76ab83 2022-06-23 thomas int outfd;
712 0f76ab83 2022-06-23 thomas const char *outpath;
713 da09d8ed 2022-03-22 thomas mode_t mode = GOT_DEFAULT_FILE_MODE;
715 0f76ab83 2022-06-23 thomas *overlapcnt = 0;
717 0f76ab83 2022-06-23 thomas /* don't run the diff3 merge on creations/deletions */
718 0f76ab83 2022-06-23 thomas if (*p->blob != '\0' && p->old != NULL && p->new != NULL) {
719 0f76ab83 2022-06-23 thomas err = open_blob(&apath, &afile, p->blob, repo);
721 c9a4f4fa 2022-06-23 thomas * ignore failures to open this blob, we might have
722 c9a4f4fa 2022-06-23 thomas * parsed gibberish.
724 19dd85cb 2022-07-01 thomas if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT) &&
725 19dd85cb 2022-07-01 thomas err->code != GOT_ERR_NO_OBJ)
726 0f76ab83 2022-06-23 thomas return err;
727 0f76ab83 2022-06-23 thomas else if (err == NULL)
728 0f76ab83 2022-06-23 thomas do_merge = 1;
729 0f76ab83 2022-06-23 thomas err = NULL;
732 72f46891 2022-04-23 thomas if (asprintf(&oldpath, "%s/%s", got_worktree_get_root_path(worktree),
733 72f46891 2022-04-23 thomas old) == -1) {
734 72f46891 2022-04-23 thomas err = got_error_from_errno("asprintf");
735 814624e7 2022-03-22 thomas goto done;
738 72f46891 2022-04-23 thomas if (asprintf(&newpath, "%s/%s", got_worktree_get_root_path(worktree),
739 72f46891 2022-04-23 thomas new) == -1) {
740 72f46891 2022-04-23 thomas err = got_error_from_errno("asprintf");
741 72f46891 2022-04-23 thomas goto done;
744 814624e7 2022-03-22 thomas file_renamed = strcmp(oldpath, newpath);
746 bb2ad8ff 2022-03-13 thomas if (asprintf(&template, "%s/got-patch",
747 bb2ad8ff 2022-03-13 thomas got_worktree_get_root_path(worktree)) == -1) {
748 bb2ad8ff 2022-03-13 thomas err = got_error_from_errno(template);
749 069bbb86 2022-03-07 thomas goto done;
752 25a880e1 2022-07-03 thomas if (p->old != NULL) {
753 25a880e1 2022-07-03 thomas if ((oldfile = fopen(oldpath, "r")) == NULL) {
754 25a880e1 2022-07-03 thomas err = got_error_from_errno2("open", oldpath);
755 25a880e1 2022-07-03 thomas goto done;
757 25a880e1 2022-07-03 thomas if (fstat(fileno(oldfile), &sb) == -1) {
758 25a880e1 2022-07-03 thomas err = got_error_from_errno2("fstat", oldpath);
759 25a880e1 2022-07-03 thomas goto done;
761 25a880e1 2022-07-03 thomas mode = sb.st_mode;
764 0f76ab83 2022-06-23 thomas err = got_opentemp_named(&tmppath, &tmpfile, template);
766 bb2ad8ff 2022-03-13 thomas goto done;
767 0f76ab83 2022-06-23 thomas outpath = tmppath;
768 0f76ab83 2022-06-23 thomas outfd = fileno(tmpfile);
769 25a880e1 2022-07-03 thomas err = patch_file(p, afile != NULL ? afile : oldfile, tmpfile);
771 bb2ad8ff 2022-03-13 thomas goto done;
773 0f76ab83 2022-06-23 thomas if (do_merge) {
774 8afec5d5 2022-07-01 thomas const char *type, *id;
776 0f76ab83 2022-06-23 thomas if (fseeko(afile, 0, SEEK_SET) == -1 ||
777 0f76ab83 2022-06-23 thomas fseeko(oldfile, 0, SEEK_SET) == -1 ||
778 0f76ab83 2022-06-23 thomas fseeko(tmpfile, 0, SEEK_SET) == -1) {
779 0f76ab83 2022-06-23 thomas err = got_error_from_errno("fseeko");
780 0f76ab83 2022-06-23 thomas goto done;
783 0f76ab83 2022-06-23 thomas if (asprintf(&oldlabel, "--- %s", p->old) == -1) {
784 0f76ab83 2022-06-23 thomas err = got_error_from_errno("asprintf");
785 0f76ab83 2022-06-23 thomas oldlabel = NULL;
786 0f76ab83 2022-06-23 thomas goto done;
789 0f76ab83 2022-06-23 thomas if (asprintf(&newlabel, "+++ %s", p->new) == -1) {
790 0f76ab83 2022-06-23 thomas err = got_error_from_errno("asprintf");
791 0f76ab83 2022-06-23 thomas newlabel = NULL;
792 0f76ab83 2022-06-23 thomas goto done;
795 8afec5d5 2022-07-01 thomas if (*p->cid != '\0') {
796 8afec5d5 2022-07-01 thomas type = "commit";
797 8afec5d5 2022-07-01 thomas id = p->cid;
799 8afec5d5 2022-07-01 thomas type = "blob";
800 8afec5d5 2022-07-01 thomas id = p->blob;
803 8afec5d5 2022-07-01 thomas if (asprintf(&anclabel, "%s %s", type, id) == -1) {
804 016bfe4b 2022-06-23 thomas err = got_error_from_errno("asprintf");
805 016bfe4b 2022-06-23 thomas anclabel = NULL;
806 016bfe4b 2022-06-23 thomas goto done;
809 0f76ab83 2022-06-23 thomas err = got_opentemp_named(&mergepath, &mergefile, template);
811 0f76ab83 2022-06-23 thomas goto done;
812 0f76ab83 2022-06-23 thomas outpath = mergepath;
813 0f76ab83 2022-06-23 thomas outfd = fileno(mergefile);
815 0f76ab83 2022-06-23 thomas err = got_merge_diff3(overlapcnt, outfd, tmpfile, afile,
816 016bfe4b 2022-06-23 thomas oldfile, oldlabel, anclabel, newlabel,
817 0f76ab83 2022-06-23 thomas GOT_DIFF_ALGORITHM_PATIENCE);
819 0f76ab83 2022-06-23 thomas goto done;
823 eaf99875 2022-03-22 thomas goto done;
825 eaf99875 2022-03-22 thomas if (p->old != NULL && p->new == NULL) {
826 5e22b737 2022-05-31 thomas err = got_worktree_patch_schedule_rm(old, repo, worktree,
827 5e22b737 2022-05-31 thomas fileindex, patch_delete, pa);
828 eaf99875 2022-03-22 thomas goto done;
831 0f76ab83 2022-06-23 thomas if (fchmod(outfd, mode) == -1) {
832 8260acc8 2022-05-01 thomas err = got_error_from_errno2("chmod", tmppath);
833 da09d8ed 2022-03-22 thomas goto done;
836 0f76ab83 2022-06-23 thomas if (rename(outpath, newpath) == -1) {
837 e0c1f81c 2022-03-22 thomas if (errno != ENOENT) {
838 0f76ab83 2022-06-23 thomas err = got_error_from_errno3("rename", outpath,
839 e0c1f81c 2022-03-22 thomas newpath);
840 e0c1f81c 2022-03-22 thomas goto done;
843 e0c1f81c 2022-03-22 thomas err = got_path_dirname(&parent, newpath);
844 e0c1f81c 2022-03-22 thomas if (err != NULL)
845 e0c1f81c 2022-03-22 thomas goto done;
846 e0c1f81c 2022-03-22 thomas err = got_path_mkdir(parent);
847 e0c1f81c 2022-03-22 thomas if (err != NULL)
848 e0c1f81c 2022-03-22 thomas goto done;
849 0f76ab83 2022-06-23 thomas if (rename(outpath, newpath) == -1) {
850 0f76ab83 2022-06-23 thomas err = got_error_from_errno3("rename", outpath,
851 e0c1f81c 2022-03-22 thomas newpath);
852 e0c1f81c 2022-03-22 thomas goto done;
856 bb2ad8ff 2022-03-13 thomas if (file_renamed) {
857 5e22b737 2022-05-31 thomas err = got_worktree_patch_schedule_rm(old, repo, worktree,
858 5e22b737 2022-05-31 thomas fileindex, patch_delete, pa);
859 bb2ad8ff 2022-03-13 thomas if (err == NULL)
860 5e22b737 2022-05-31 thomas err = got_worktree_patch_schedule_add(new, repo,
861 5e22b737 2022-05-31 thomas worktree, fileindex, patch_add,
864 814624e7 2022-03-22 thomas unlink(newpath);
865 814624e7 2022-03-22 thomas } else if (p->old == NULL) {
866 5e22b737 2022-05-31 thomas err = got_worktree_patch_schedule_add(new, repo, worktree,
867 5e22b737 2022-05-31 thomas fileindex, patch_add, pa);
869 814624e7 2022-03-22 thomas unlink(newpath);
870 0f76ab83 2022-06-23 thomas } else if (*overlapcnt != 0)
871 0f76ab83 2022-06-23 thomas err = report_progress(pa, old, new, GOT_STATUS_CONFLICT, NULL);
872 762b8e82 2022-06-23 thomas else if (do_merge)
873 762b8e82 2022-06-23 thomas err = report_progress(pa, old, new, GOT_STATUS_MERGE, NULL);
875 72f46891 2022-04-23 thomas err = report_progress(pa, old, new, GOT_STATUS_MODIFY, NULL);
878 e0c1f81c 2022-03-22 thomas free(parent);
879 94af5a06 2022-03-08 thomas free(template);
881 069bbb86 2022-03-07 thomas if (tmppath != NULL)
882 069bbb86 2022-03-07 thomas unlink(tmppath);
883 0f76ab83 2022-06-23 thomas if (tmpfile != NULL && fclose(tmpfile) == EOF && err == NULL)
884 04cdf6ac 2022-06-23 thomas err = got_error_from_errno("fclose");
885 069bbb86 2022-03-07 thomas free(tmppath);
887 72f46891 2022-04-23 thomas free(oldpath);
888 2249fadd 2022-06-23 thomas if (oldfile != NULL && fclose(oldfile) == EOF && err == NULL)
889 2249fadd 2022-06-23 thomas err = got_error_from_errno("fclose");
891 0f76ab83 2022-06-23 thomas if (apath != NULL)
892 0f76ab83 2022-06-23 thomas unlink(apath);
893 0f76ab83 2022-06-23 thomas if (afile != NULL && fclose(afile) == EOF && err == NULL)
894 0f76ab83 2022-06-23 thomas err = got_error_from_errno("fclose");
895 0f76ab83 2022-06-23 thomas free(apath);
897 0f76ab83 2022-06-23 thomas if (mergepath != NULL)
898 0f76ab83 2022-06-23 thomas unlink(mergepath);
899 0f76ab83 2022-06-23 thomas if (mergefile != NULL && fclose(mergefile) == EOF && err == NULL)
900 0f76ab83 2022-06-23 thomas err = got_error_from_errno("fclose");
901 0f76ab83 2022-06-23 thomas free(mergepath);
903 72f46891 2022-04-23 thomas free(newpath);
904 0f76ab83 2022-06-23 thomas free(oldlabel);
905 0f76ab83 2022-06-23 thomas free(newlabel);
906 016bfe4b 2022-06-23 thomas free(anclabel);
907 069bbb86 2022-03-07 thomas return err;
910 eaef698f 2022-04-23 thomas static void
911 eaef698f 2022-04-23 thomas reverse_patch(struct got_patch *p)
913 eaef698f 2022-04-23 thomas struct got_patch_hunk *h;
914 eaef698f 2022-04-23 thomas size_t i;
917 eaef698f 2022-04-23 thomas STAILQ_FOREACH(h, &p->head, entries) {
918 eaef698f 2022-04-23 thomas tmp = h->old_from;
919 eaef698f 2022-04-23 thomas h->old_from = h->new_from;
920 eaef698f 2022-04-23 thomas h->new_from = tmp;
922 eaef698f 2022-04-23 thomas tmp = h->old_lines;
923 eaef698f 2022-04-23 thomas h->old_lines = h->new_lines;
924 eaef698f 2022-04-23 thomas h->new_lines = tmp;
926 eaef698f 2022-04-23 thomas tmp = h->old_nonl;
927 eaef698f 2022-04-23 thomas h->old_nonl = h->new_nonl;
928 eaef698f 2022-04-23 thomas h->new_nonl = tmp;
930 eaef698f 2022-04-23 thomas for (i = 0; i < h->len; ++i) {
931 eaef698f 2022-04-23 thomas if (*h->lines[i] == '+')
932 eaef698f 2022-04-23 thomas *h->lines[i] = '-';
933 eaef698f 2022-04-23 thomas else if (*h->lines[i] == '-')
934 eaef698f 2022-04-23 thomas *h->lines[i] = '+';
939 069bbb86 2022-03-07 thomas const struct got_error *
940 069bbb86 2022-03-07 thomas got_patch(int fd, struct got_worktree *worktree, struct got_repository *repo,
941 eaef698f 2022-04-23 thomas int nop, int strip, int reverse, got_patch_progress_cb progress_cb,
942 eaef698f 2022-04-23 thomas void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
944 36832a8e 2022-05-31 thomas const struct got_error *err = NULL, *complete_err = NULL;
945 814624e7 2022-03-22 thomas struct got_fileindex *fileindex = NULL;
946 5e22b737 2022-05-31 thomas char *fileindex_path = NULL;
947 49114f01 2022-03-22 thomas char *oldpath, *newpath;
948 069bbb86 2022-03-07 thomas struct imsgbuf *ibuf;
949 069bbb86 2022-03-07 thomas int imsg_fds[2] = {-1, -1};
950 0f76ab83 2022-06-23 thomas int overlapcnt, done = 0, failed = 0;
951 069bbb86 2022-03-07 thomas pid_t pid;
953 069bbb86 2022-03-07 thomas ibuf = calloc(1, sizeof(*ibuf));
954 069bbb86 2022-03-07 thomas if (ibuf == NULL) {
955 069bbb86 2022-03-07 thomas err = got_error_from_errno("calloc");
956 069bbb86 2022-03-07 thomas goto done;
959 069bbb86 2022-03-07 thomas if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1) {
960 069bbb86 2022-03-07 thomas err = got_error_from_errno("socketpair");
961 069bbb86 2022-03-07 thomas goto done;
964 069bbb86 2022-03-07 thomas pid = fork();
965 069bbb86 2022-03-07 thomas if (pid == -1) {
966 069bbb86 2022-03-07 thomas err = got_error_from_errno("fork");
967 069bbb86 2022-03-07 thomas goto done;
968 069bbb86 2022-03-07 thomas } else if (pid == 0) {
969 069bbb86 2022-03-07 thomas got_privsep_exec_child(imsg_fds, GOT_PATH_PROG_READ_PATCH,
971 069bbb86 2022-03-07 thomas /* not reached */
974 069bbb86 2022-03-07 thomas if (close(imsg_fds[1]) == -1) {
975 069bbb86 2022-03-07 thomas err = got_error_from_errno("close");
976 069bbb86 2022-03-07 thomas goto done;
978 069bbb86 2022-03-07 thomas imsg_fds[1] = -1;
979 069bbb86 2022-03-07 thomas imsg_init(ibuf, imsg_fds[0]);
981 069bbb86 2022-03-07 thomas err = send_patch(ibuf, fd);
984 069bbb86 2022-03-07 thomas goto done;
986 5e22b737 2022-05-31 thomas err = got_worktree_patch_prepare(&fileindex, &fileindex_path,
987 5e22b737 2022-05-31 thomas worktree);
989 814624e7 2022-03-22 thomas goto done;
991 069bbb86 2022-03-07 thomas while (!done && err == NULL) {
992 069bbb86 2022-03-07 thomas struct got_patch p;
993 49114f01 2022-03-22 thomas struct patch_args pa;
995 49114f01 2022-03-22 thomas pa.progress_cb = progress_cb;
996 49114f01 2022-03-22 thomas pa.progress_arg = progress_arg;
997 49114f01 2022-03-22 thomas pa.head = &p.head;
999 d9db2ff9 2022-04-16 thomas err = recv_patch(ibuf, &done, &p, strip);
1000 069bbb86 2022-03-07 thomas if (err || done)
1003 eaef698f 2022-04-23 thomas if (reverse)
1004 eaef698f 2022-04-23 thomas reverse_patch(&p);
1006 814624e7 2022-03-22 thomas err = got_worktree_patch_check_path(p.old, p.new, &oldpath,
1007 814624e7 2022-03-22 thomas &newpath, worktree, repo, fileindex);
1008 814624e7 2022-03-22 thomas if (err == NULL)
1009 0f76ab83 2022-06-23 thomas err = apply_patch(&overlapcnt, worktree, repo,
1010 0f76ab83 2022-06-23 thomas fileindex, oldpath, newpath, &p, nop, &pa,
1011 0f76ab83 2022-06-23 thomas cancel_cb, cancel_arg);
1012 49114f01 2022-03-22 thomas if (err != NULL) {
1013 49114f01 2022-03-22 thomas failed = 1;
1014 49114f01 2022-03-22 thomas /* recoverable errors */
1015 49114f01 2022-03-22 thomas if (err->code == GOT_ERR_FILE_STATUS ||
1016 49114f01 2022-03-22 thomas (err->code == GOT_ERR_ERRNO && errno == ENOENT))
1017 49114f01 2022-03-22 thomas err = report_progress(&pa, p.old, p.new,
1018 49114f01 2022-03-22 thomas GOT_STATUS_CANNOT_UPDATE, err);
1019 49114f01 2022-03-22 thomas else if (err->code == GOT_ERR_HUNK_FAILED)
1020 49114f01 2022-03-22 thomas err = report_progress(&pa, p.old, p.new,
1021 49114f01 2022-03-22 thomas GOT_STATUS_CANNOT_UPDATE, NULL);
1023 0f76ab83 2022-06-23 thomas if (overlapcnt != 0)
1024 0f76ab83 2022-06-23 thomas failed = 1;
1026 49114f01 2022-03-22 thomas free(oldpath);
1027 49114f01 2022-03-22 thomas free(newpath);
1028 069bbb86 2022-03-07 thomas patch_free(&p);
1030 069bbb86 2022-03-07 thomas if (err)
1035 36832a8e 2022-05-31 thomas if (fileindex != NULL)
1036 36832a8e 2022-05-31 thomas complete_err = got_worktree_patch_complete(fileindex,
1037 36832a8e 2022-05-31 thomas fileindex_path);
1038 5e22b737 2022-05-31 thomas if (complete_err && err == NULL)
1039 5e22b737 2022-05-31 thomas err = complete_err;
1040 36832a8e 2022-05-31 thomas free(fileindex_path);
1041 069bbb86 2022-03-07 thomas if (fd != -1 && close(fd) == -1 && err == NULL)
1042 069bbb86 2022-03-07 thomas err = got_error_from_errno("close");
1043 069bbb86 2022-03-07 thomas if (ibuf != NULL)
1044 069bbb86 2022-03-07 thomas imsg_clear(ibuf);
1045 069bbb86 2022-03-07 thomas if (imsg_fds[0] != -1 && close(imsg_fds[0]) == -1 && err == NULL)
1046 069bbb86 2022-03-07 thomas err = got_error_from_errno("close");
1047 069bbb86 2022-03-07 thomas if (imsg_fds[1] != -1 && close(imsg_fds[1]) == -1 && err == NULL)
1048 069bbb86 2022-03-07 thomas err = got_error_from_errno("close");
1049 49114f01 2022-03-22 thomas if (err == NULL && failed)
1050 49114f01 2022-03-22 thomas err = got_error(GOT_ERR_PATCH_FAILED);
1051 069bbb86 2022-03-07 thomas return err;
