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;
315 f4602cbd 2022-07-23 thomas static void
316 f4602cbd 2022-07-23 thomas reverse_patch(struct got_patch *p)
318 f4602cbd 2022-07-23 thomas struct got_patch_hunk *h;
319 f4602cbd 2022-07-23 thomas size_t i;
322 f4602cbd 2022-07-23 thomas STAILQ_FOREACH(h, &p->head, entries) {
323 f4602cbd 2022-07-23 thomas tmp = h->old_from;
324 f4602cbd 2022-07-23 thomas h->old_from = h->new_from;
325 f4602cbd 2022-07-23 thomas h->new_from = tmp;
327 f4602cbd 2022-07-23 thomas tmp = h->old_lines;
328 f4602cbd 2022-07-23 thomas h->old_lines = h->new_lines;
329 f4602cbd 2022-07-23 thomas h->new_lines = tmp;
331 f4602cbd 2022-07-23 thomas tmp = h->old_nonl;
332 f4602cbd 2022-07-23 thomas h->old_nonl = h->new_nonl;
333 f4602cbd 2022-07-23 thomas h->new_nonl = tmp;
335 f4602cbd 2022-07-23 thomas for (i = 0; i < h->len; ++i) {
336 f4602cbd 2022-07-23 thomas if (*h->lines[i] == '+')
337 f4602cbd 2022-07-23 thomas *h->lines[i] = '-';
338 f4602cbd 2022-07-23 thomas else if (*h->lines[i] == '-')
339 f4602cbd 2022-07-23 thomas *h->lines[i] = '+';
345 069bbb86 2022-03-07 thomas * Copy data from orig starting at copypos until pos into tmp.
346 069bbb86 2022-03-07 thomas * If pos is -1, copy until EOF.
348 069bbb86 2022-03-07 thomas static const struct got_error *
349 069bbb86 2022-03-07 thomas copy(FILE *tmp, FILE *orig, off_t copypos, off_t pos)
351 069bbb86 2022-03-07 thomas char buf[BUFSIZ];
352 069bbb86 2022-03-07 thomas size_t len, r, w;
354 bafaf650 2022-05-14 thomas if (fseeko(orig, copypos, SEEK_SET) == -1)
355 bafaf650 2022-05-14 thomas return got_error_from_errno("fseeko");
357 069bbb86 2022-03-07 thomas while (pos == -1 || copypos < pos) {
358 069bbb86 2022-03-07 thomas len = sizeof(buf);
359 069bbb86 2022-03-07 thomas if (pos > 0)
360 069bbb86 2022-03-07 thomas len = MIN(len, (size_t)pos - copypos);
361 069bbb86 2022-03-07 thomas r = fread(buf, 1, len, orig);
362 069bbb86 2022-03-07 thomas if (r != len && ferror(orig))
363 069bbb86 2022-03-07 thomas return got_error_from_errno("fread");
364 069bbb86 2022-03-07 thomas w = fwrite(buf, 1, r, tmp);
365 069bbb86 2022-03-07 thomas if (w != r)
366 069bbb86 2022-03-07 thomas return got_error_from_errno("fwrite");
367 069bbb86 2022-03-07 thomas copypos += len;
368 069bbb86 2022-03-07 thomas if (r != len && feof(orig)) {
369 069bbb86 2022-03-07 thomas if (pos == -1)
370 069bbb86 2022-03-07 thomas return NULL;
371 49114f01 2022-03-22 thomas return got_error(GOT_ERR_HUNK_FAILED);
374 069bbb86 2022-03-07 thomas return NULL;
377 4f34ed97 2022-08-06 thomas static int linecmp(const char *, const char *, int *);
379 069bbb86 2022-03-07 thomas static const struct got_error *
380 8ebb3daa 2022-06-23 thomas locate_hunk(FILE *orig, struct got_patch_hunk *h, off_t *pos, int *lineno)
382 069bbb86 2022-03-07 thomas const struct got_error *err = NULL;
383 069bbb86 2022-03-07 thomas char *line = NULL;
384 069bbb86 2022-03-07 thomas char mode = *h->lines[0];
385 069bbb86 2022-03-07 thomas size_t linesize = 0;
386 069bbb86 2022-03-07 thomas ssize_t linelen;
387 069bbb86 2022-03-07 thomas off_t match = -1;
388 4f34ed97 2022-08-06 thomas int mangled = 0, match_lineno = -1;
390 069bbb86 2022-03-07 thomas for (;;) {
391 069bbb86 2022-03-07 thomas linelen = getline(&line, &linesize, orig);
392 069bbb86 2022-03-07 thomas if (linelen == -1) {
393 069bbb86 2022-03-07 thomas if (ferror(orig))
394 069bbb86 2022-03-07 thomas err = got_error_from_errno("getline");
395 069bbb86 2022-03-07 thomas else if (match == -1)
396 49114f01 2022-03-22 thomas err = got_error(GOT_ERR_HUNK_FAILED);
399 ff7f34d3 2022-03-22 thomas if (line[linelen - 1] == '\n')
400 ff7f34d3 2022-03-22 thomas line[linelen - 1] = '\0';
401 069bbb86 2022-03-07 thomas (*lineno)++;
403 4f34ed97 2022-08-06 thomas if ((mode == ' ' && !linecmp(h->lines[0] + 1, line, &mangled)) ||
404 4f34ed97 2022-08-06 thomas (mode == '-' && !linecmp(h->lines[0] + 1, line, &mangled)) ||
405 069bbb86 2022-03-07 thomas (mode == '+' && *lineno == h->old_from)) {
406 069bbb86 2022-03-07 thomas match = ftello(orig);
407 069bbb86 2022-03-07 thomas if (match == -1) {
408 069bbb86 2022-03-07 thomas err = got_error_from_errno("ftello");
411 069bbb86 2022-03-07 thomas match -= linelen;
412 069bbb86 2022-03-07 thomas match_lineno = (*lineno)-1;
415 aaabf83f 2022-08-06 thomas if (*lineno >= h->old_from && match != -1) {
416 aaabf83f 2022-08-06 thomas if (mangled)
417 aaabf83f 2022-08-06 thomas h->ws_mangled = 1;
422 069bbb86 2022-03-07 thomas if (err == NULL) {
423 122e1611 2022-03-22 thomas *pos = match;
424 069bbb86 2022-03-07 thomas *lineno = match_lineno;
425 bafaf650 2022-05-14 thomas if (fseeko(orig, match, SEEK_SET) == -1)
426 bafaf650 2022-05-14 thomas err = got_error_from_errno("fseeko");
429 069bbb86 2022-03-07 thomas free(line);
430 069bbb86 2022-03-07 thomas return err;
433 bb90ca7b 2022-07-03 thomas static int
434 bb90ca7b 2022-07-03 thomas linecmp(const char *a, const char *b, int *mangled)
438 bb90ca7b 2022-07-03 thomas *mangled = 0;
439 bb90ca7b 2022-07-03 thomas c = strcmp(a, b);
440 bb90ca7b 2022-07-03 thomas if (c == 0)
441 bb90ca7b 2022-07-03 thomas return c;
443 bb90ca7b 2022-07-03 thomas *mangled = 1;
444 bb90ca7b 2022-07-03 thomas for (;;) {
445 2140c6ec 2022-07-04 thomas while (*a == '\t' || *a == ' ' || *a == '\f')
447 2140c6ec 2022-07-04 thomas while (*b == '\t' || *b == ' ' || *b == '\f')
449 2140c6ec 2022-07-04 thomas if (*a == '\0' || *a != *b)
451 bb90ca7b 2022-07-03 thomas a++, b++;
454 bb90ca7b 2022-07-03 thomas return *a - *b;
457 069bbb86 2022-03-07 thomas static const struct got_error *
458 069bbb86 2022-03-07 thomas test_hunk(FILE *orig, struct got_patch_hunk *h)
460 069bbb86 2022-03-07 thomas const struct got_error *err = NULL;
461 069bbb86 2022-03-07 thomas char *line = NULL;
462 069bbb86 2022-03-07 thomas size_t linesize = 0, i = 0;
463 069bbb86 2022-03-07 thomas ssize_t linelen;
464 bb90ca7b 2022-07-03 thomas int mangled;
466 069bbb86 2022-03-07 thomas for (i = 0; i < h->len; ++i) {
467 069bbb86 2022-03-07 thomas switch (*h->lines[i]) {
468 069bbb86 2022-03-07 thomas case '+':
469 069bbb86 2022-03-07 thomas continue;
470 069bbb86 2022-03-07 thomas case ' ':
471 069bbb86 2022-03-07 thomas case '-':
472 069bbb86 2022-03-07 thomas linelen = getline(&line, &linesize, orig);
473 069bbb86 2022-03-07 thomas if (linelen == -1) {
474 069bbb86 2022-03-07 thomas if (ferror(orig))
475 069bbb86 2022-03-07 thomas err = got_error_from_errno("getline");
477 069bbb86 2022-03-07 thomas err = got_error(
478 49114f01 2022-03-22 thomas GOT_ERR_HUNK_FAILED);
479 069bbb86 2022-03-07 thomas goto done;
481 ff7f34d3 2022-03-22 thomas if (line[linelen - 1] == '\n')
482 ff7f34d3 2022-03-22 thomas line[linelen - 1] = '\0';
483 bb90ca7b 2022-07-03 thomas if (linecmp(h->lines[i] + 1, line, &mangled)) {
484 49114f01 2022-03-22 thomas err = got_error(GOT_ERR_HUNK_FAILED);
485 069bbb86 2022-03-07 thomas goto done;
487 bb90ca7b 2022-07-03 thomas if (mangled)
488 bb90ca7b 2022-07-03 thomas h->ws_mangled = 1;
494 069bbb86 2022-03-07 thomas free(line);
495 069bbb86 2022-03-07 thomas return err;
498 069bbb86 2022-03-07 thomas static const struct got_error *
499 bb90ca7b 2022-07-03 thomas apply_hunk(FILE *orig, FILE *tmp, struct got_patch_hunk *h, int *lineno,
500 bb90ca7b 2022-07-03 thomas off_t from)
502 bb90ca7b 2022-07-03 thomas const struct got_error *err = NULL;
503 bb90ca7b 2022-07-03 thomas const char *t;
504 bb90ca7b 2022-07-03 thomas size_t linesize = 0, i, new = 0;
505 bb90ca7b 2022-07-03 thomas char *line = NULL;
506 bb90ca7b 2022-07-03 thomas char mode;
507 bb90ca7b 2022-07-03 thomas ssize_t linelen;
509 bb90ca7b 2022-07-03 thomas if (orig != NULL && fseeko(orig, from, SEEK_SET) == -1)
510 bb90ca7b 2022-07-03 thomas return got_error_from_errno("fseeko");
512 069bbb86 2022-03-07 thomas for (i = 0; i < h->len; ++i) {
513 bb90ca7b 2022-07-03 thomas switch (mode = *h->lines[i]) {
514 069bbb86 2022-03-07 thomas case '-':
515 bb90ca7b 2022-07-03 thomas case ' ':
516 069bbb86 2022-03-07 thomas (*lineno)++;
517 bb90ca7b 2022-07-03 thomas if (orig != NULL) {
518 bb90ca7b 2022-07-03 thomas linelen = getline(&line, &linesize, orig);
519 bb90ca7b 2022-07-03 thomas if (linelen == -1) {
520 bb90ca7b 2022-07-03 thomas err = got_error_from_errno("getline");
521 bb90ca7b 2022-07-03 thomas goto done;
523 bb90ca7b 2022-07-03 thomas if (line[linelen - 1] == '\n')
524 bb90ca7b 2022-07-03 thomas line[linelen - 1] = '\0';
525 bb90ca7b 2022-07-03 thomas t = line;
527 bb90ca7b 2022-07-03 thomas t = h->lines[i] + 1;
528 bb90ca7b 2022-07-03 thomas if (mode == '-')
529 bb90ca7b 2022-07-03 thomas continue;
530 bb90ca7b 2022-07-03 thomas if (fprintf(tmp, "%s\n", t) < 0) {
531 bb90ca7b 2022-07-03 thomas err = got_error_from_errno("fprintf");
532 bb90ca7b 2022-07-03 thomas goto done;
535 069bbb86 2022-03-07 thomas case '+':
537 bb90ca7b 2022-07-03 thomas if (fprintf(tmp, "%s", h->lines[i] + 1) < 0) {
538 bb90ca7b 2022-07-03 thomas err = got_error_from_errno("fprintf");
539 bb90ca7b 2022-07-03 thomas goto done;
541 656c2baa 2022-04-23 thomas if (new != h->new_lines || !h->new_nonl) {
542 bb90ca7b 2022-07-03 thomas if (fprintf(tmp, "\n") < 0) {
543 bb90ca7b 2022-07-03 thomas err = got_error_from_errno("fprintf");
544 bb90ca7b 2022-07-03 thomas goto done;
552 bb90ca7b 2022-07-03 thomas free(line);
553 bb90ca7b 2022-07-03 thomas return err;
556 46e6bdd4 2022-03-22 thomas static const struct got_error *
557 25a880e1 2022-07-03 thomas patch_file(struct got_patch *p, FILE *orig, FILE *tmp)
559 bb2ad8ff 2022-03-13 thomas const struct got_error *err = NULL;
560 bb2ad8ff 2022-03-13 thomas struct got_patch_hunk *h;
561 da09d8ed 2022-03-22 thomas struct stat sb;
562 8ebb3daa 2022-06-23 thomas int lineno = 0;
563 bb2ad8ff 2022-03-13 thomas off_t copypos, pos;
564 bb2ad8ff 2022-03-13 thomas char *line = NULL;
565 bb2ad8ff 2022-03-13 thomas size_t linesize = 0;
566 bb2ad8ff 2022-03-13 thomas ssize_t linelen;
568 069bbb86 2022-03-07 thomas if (p->old == NULL) { /* create */
569 069bbb86 2022-03-07 thomas h = STAILQ_FIRST(&p->head);
570 bb2ad8ff 2022-03-13 thomas if (h == NULL || STAILQ_NEXT(h, entries) != NULL)
571 bb2ad8ff 2022-03-13 thomas return got_error(GOT_ERR_PATCH_MALFORMED);
572 bb90ca7b 2022-07-03 thomas return apply_hunk(orig, tmp, h, &lineno, 0);
575 2249fadd 2022-06-23 thomas if (fstat(fileno(orig), &sb) == -1)
576 2249fadd 2022-06-23 thomas return got_error_from_errno("fstat");
578 069bbb86 2022-03-07 thomas copypos = 0;
579 069bbb86 2022-03-07 thomas STAILQ_FOREACH(h, &p->head, entries) {
580 069bbb86 2022-03-07 thomas tryagain:
581 122e1611 2022-03-22 thomas err = locate_hunk(orig, h, &pos, &lineno);
582 49114f01 2022-03-22 thomas if (err != NULL && err->code == GOT_ERR_HUNK_FAILED)
583 49114f01 2022-03-22 thomas h->err = err;
584 069bbb86 2022-03-07 thomas if (err != NULL)
585 2249fadd 2022-06-23 thomas return err;
586 2d9b6837 2022-06-23 thomas err = copy(tmp, orig, copypos, pos);
587 069bbb86 2022-03-07 thomas if (err != NULL)
588 2249fadd 2022-06-23 thomas return err;
589 069bbb86 2022-03-07 thomas copypos = pos;
591 069bbb86 2022-03-07 thomas err = test_hunk(orig, h);
592 49114f01 2022-03-22 thomas if (err != NULL && err->code == GOT_ERR_HUNK_FAILED) {
594 069bbb86 2022-03-07 thomas * try to apply the hunk again starting the search
595 069bbb86 2022-03-07 thomas * after the previous partial match.
597 2249fadd 2022-06-23 thomas if (fseeko(orig, pos, SEEK_SET) == -1)
598 2249fadd 2022-06-23 thomas return got_error_from_errno("fseeko");
599 069bbb86 2022-03-07 thomas linelen = getline(&line, &linesize, orig);
600 2249fadd 2022-06-23 thomas if (linelen == -1)
601 2249fadd 2022-06-23 thomas return got_error_from_errno("getline");
602 069bbb86 2022-03-07 thomas lineno++;
603 069bbb86 2022-03-07 thomas goto tryagain;
605 069bbb86 2022-03-07 thomas if (err != NULL)
606 2249fadd 2022-06-23 thomas return err;
608 49114f01 2022-03-22 thomas if (lineno + 1 != h->old_from)
609 49114f01 2022-03-22 thomas h->offset = lineno + 1 - h->old_from;
611 bb90ca7b 2022-07-03 thomas err = apply_hunk(orig, tmp, h, &lineno, pos);
612 069bbb86 2022-03-07 thomas if (err != NULL)
613 2249fadd 2022-06-23 thomas return err;
615 069bbb86 2022-03-07 thomas copypos = ftello(orig);
616 2249fadd 2022-06-23 thomas if (copypos == -1)
617 2249fadd 2022-06-23 thomas return got_error_from_errno("ftello");
620 49114f01 2022-03-22 thomas if (p->new == NULL && sb.st_size != copypos) {
621 49114f01 2022-03-22 thomas h = STAILQ_FIRST(&p->head);
622 49114f01 2022-03-22 thomas h->err = got_error(GOT_ERR_HUNK_FAILED);
623 49114f01 2022-03-22 thomas err = h->err;
624 2d9b6837 2022-06-23 thomas } else if (!feof(orig))
625 069bbb86 2022-03-07 thomas err = copy(tmp, orig, copypos, -1);
627 10e55613 2022-03-22 thomas return err;
630 10e55613 2022-03-22 thomas static const struct got_error *
631 49114f01 2022-03-22 thomas report_progress(struct patch_args *pa, const char *old, const char *new,
632 49114f01 2022-03-22 thomas unsigned char status, const struct got_error *orig_error)
634 49114f01 2022-03-22 thomas const struct got_error *err;
635 49114f01 2022-03-22 thomas struct got_patch_hunk *h;
637 49114f01 2022-03-22 thomas err = pa->progress_cb(pa->progress_arg, old, new, status,
638 bb90ca7b 2022-07-03 thomas orig_error, 0, 0, 0, 0, 0, 0, NULL);
640 49114f01 2022-03-22 thomas return err;
642 49114f01 2022-03-22 thomas STAILQ_FOREACH(h, pa->head, entries) {
643 bb90ca7b 2022-07-03 thomas if (h->offset == 0 && !h->ws_mangled && h->err == NULL)
644 49114f01 2022-03-22 thomas continue;
646 49114f01 2022-03-22 thomas err = pa->progress_cb(pa->progress_arg, old, new, 0, NULL,
647 49114f01 2022-03-22 thomas h->old_from, h->old_lines, h->new_from, h->new_lines,
648 bb90ca7b 2022-07-03 thomas h->offset, h->ws_mangled, h->err);
650 49114f01 2022-03-22 thomas return err;
653 49114f01 2022-03-22 thomas return NULL;
656 49114f01 2022-03-22 thomas static const struct got_error *
657 c71da4f7 2022-03-22 thomas patch_delete(void *arg, unsigned char status, unsigned char staged_status,
658 c71da4f7 2022-03-22 thomas const char *path)
660 49114f01 2022-03-22 thomas return report_progress(arg, path, NULL, status, NULL);
663 c71da4f7 2022-03-22 thomas static const struct got_error *
664 c71da4f7 2022-03-22 thomas patch_add(void *arg, unsigned char status, const char *path)
666 49114f01 2022-03-22 thomas return report_progress(arg, NULL, path, status, NULL);
669 c71da4f7 2022-03-22 thomas static const struct got_error *
670 0f76ab83 2022-06-23 thomas open_blob(char **path, FILE **fp, const char *blobid,
671 0f76ab83 2022-06-23 thomas struct got_repository *repo)
673 bb2ad8ff 2022-03-13 thomas const struct got_error *err = NULL;
674 0f76ab83 2022-06-23 thomas struct got_blob_object *blob = NULL;
675 19dd85cb 2022-07-01 thomas struct got_object_id id, *idptr, *matched_id = NULL;
676 f4ae6ddb 2022-07-01 thomas int fd = -1;
678 0f76ab83 2022-06-23 thomas *fp = NULL;
679 0f76ab83 2022-06-23 thomas *path = NULL;
681 19dd85cb 2022-07-01 thomas if (strlen(blobid) != SHA1_DIGEST_STRING_LENGTH - 1) {
682 19dd85cb 2022-07-01 thomas err = got_repo_match_object_id(&matched_id, NULL, blobid,
683 19dd85cb 2022-07-01 thomas GOT_OBJ_TYPE_BLOB, NULL /* do not resolve tags */,
686 19dd85cb 2022-07-01 thomas return err;
687 19dd85cb 2022-07-01 thomas idptr = matched_id;
689 19dd85cb 2022-07-01 thomas if (!got_parse_sha1_digest(id.sha1, blobid))
690 19dd85cb 2022-07-01 thomas return got_error(GOT_ERR_BAD_OBJ_ID_STR);
691 19dd85cb 2022-07-01 thomas idptr = &id;
694 f4ae6ddb 2022-07-01 thomas fd = got_opentempfd();
695 f4ae6ddb 2022-07-01 thomas if (fd == -1) {
696 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
697 f4ae6ddb 2022-07-01 thomas goto done;
700 f4ae6ddb 2022-07-01 thomas err = got_object_open_as_blob(&blob, repo, idptr, 8192, fd);
702 0f76ab83 2022-06-23 thomas goto done;
704 0f76ab83 2022-06-23 thomas err = got_opentemp_named(path, fp, GOT_TMPDIR_STR "/got-patch-blob");
706 0f76ab83 2022-06-23 thomas goto done;
708 0f76ab83 2022-06-23 thomas err = got_object_blob_dump_to_file(NULL, NULL, NULL, *fp, blob);
710 0f76ab83 2022-06-23 thomas goto done;
713 f4ae6ddb 2022-07-01 thomas if (fd != -1 && close(fd) == -1 && err == NULL)
714 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
715 0f76ab83 2022-06-23 thomas if (blob)
716 0f76ab83 2022-06-23 thomas got_object_blob_close(blob);
717 19dd85cb 2022-07-01 thomas if (matched_id != NULL)
718 19dd85cb 2022-07-01 thomas free(matched_id);
719 0f76ab83 2022-06-23 thomas if (err) {
720 0f76ab83 2022-06-23 thomas if (*fp != NULL)
721 0f76ab83 2022-06-23 thomas fclose(*fp);
722 0f76ab83 2022-06-23 thomas if (*path != NULL)
723 0f76ab83 2022-06-23 thomas unlink(*path);
724 0f76ab83 2022-06-23 thomas free(*path);
725 0f76ab83 2022-06-23 thomas *fp = NULL;
726 0f76ab83 2022-06-23 thomas *path = NULL;
728 0f76ab83 2022-06-23 thomas return err;
731 0f76ab83 2022-06-23 thomas static const struct got_error *
732 7d8bcb99 2022-07-28 thomas prepare_merge(int *do_merge, char **apath, FILE **afile,
733 7d8bcb99 2022-07-28 thomas struct got_worktree *worktree, struct got_repository *repo,
734 7d8bcb99 2022-07-28 thomas struct got_patch *p, struct got_object_id *commit_id,
735 7d8bcb99 2022-07-28 thomas struct got_tree_object *tree, const char *path)
737 7d8bcb99 2022-07-28 thomas const struct got_error *err = NULL;
739 7d8bcb99 2022-07-28 thomas *do_merge = 0;
740 7d8bcb99 2022-07-28 thomas *apath = NULL;
741 7d8bcb99 2022-07-28 thomas *afile = NULL;
743 7d8bcb99 2022-07-28 thomas /* don't run the diff3 merge on creations/deletions */
744 7d8bcb99 2022-07-28 thomas if (p->old == NULL || p->new == NULL)
745 7d8bcb99 2022-07-28 thomas return NULL;
747 7d8bcb99 2022-07-28 thomas if (commit_id) {
748 7d8bcb99 2022-07-28 thomas struct got_object_id *id;
750 7d8bcb99 2022-07-28 thomas err = got_object_tree_find_path(&id, NULL, repo, tree, path);
752 7d8bcb99 2022-07-28 thomas return err;
753 7d8bcb99 2022-07-28 thomas got_sha1_digest_to_str(id->sha1, p->blob, sizeof(p->blob));
754 7d8bcb99 2022-07-28 thomas got_sha1_digest_to_str(commit_id->sha1, p->cid, sizeof(p->cid));
755 7d8bcb99 2022-07-28 thomas free(id);
756 7d8bcb99 2022-07-28 thomas err = open_blob(apath, afile, p->blob, repo);
757 7d8bcb99 2022-07-28 thomas *do_merge = err == NULL;
758 7d8bcb99 2022-07-28 thomas } else if (*p->blob != '\0') {
759 7d8bcb99 2022-07-28 thomas err = open_blob(apath, afile, p->blob, repo);
761 7d8bcb99 2022-07-28 thomas * ignore failures to open this blob, we might have
762 7d8bcb99 2022-07-28 thomas * parsed gibberish.
764 7d8bcb99 2022-07-28 thomas if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT) &&
765 7d8bcb99 2022-07-28 thomas err->code != GOT_ERR_NO_OBJ)
766 7d8bcb99 2022-07-28 thomas return err;
767 7d8bcb99 2022-07-28 thomas *do_merge = err == NULL;
768 7d8bcb99 2022-07-28 thomas err = NULL;
771 7d8bcb99 2022-07-28 thomas return err;
774 7d8bcb99 2022-07-28 thomas static const struct got_error *
775 0f76ab83 2022-06-23 thomas apply_patch(int *overlapcnt, struct got_worktree *worktree,
776 0f76ab83 2022-06-23 thomas struct got_repository *repo, struct got_fileindex *fileindex,
777 0f76ab83 2022-06-23 thomas const char *old, const char *new, struct got_patch *p, int nop,
778 7d8bcb99 2022-07-28 thomas int reverse, struct got_object_id *commit_id,
779 7d8bcb99 2022-07-28 thomas struct got_tree_object *tree, struct patch_args *pa,
780 f4602cbd 2022-07-23 thomas got_cancel_cb cancel_cb, void *cancel_arg)
782 0f76ab83 2022-06-23 thomas const struct got_error *err = NULL;
783 25a880e1 2022-07-03 thomas struct stat sb;
784 0f76ab83 2022-06-23 thomas int do_merge = 0, file_renamed = 0;
785 016bfe4b 2022-06-23 thomas char *oldlabel = NULL, *newlabel = NULL, *anclabel = NULL;
786 72f46891 2022-04-23 thomas char *oldpath = NULL, *newpath = NULL;
787 3b5e1554 2022-06-23 thomas char *tmppath = NULL, *template = NULL, *parent = NULL;
788 0f76ab83 2022-06-23 thomas char *apath = NULL, *mergepath = NULL;
789 0f76ab83 2022-06-23 thomas FILE *oldfile = NULL, *tmpfile = NULL, *afile = NULL, *mergefile = NULL;
790 0f76ab83 2022-06-23 thomas int outfd;
791 0f76ab83 2022-06-23 thomas const char *outpath;
792 da09d8ed 2022-03-22 thomas mode_t mode = GOT_DEFAULT_FILE_MODE;
794 0f76ab83 2022-06-23 thomas *overlapcnt = 0;
796 7d8bcb99 2022-07-28 thomas err = prepare_merge(&do_merge, &apath, &afile, worktree, repo, p,
797 7d8bcb99 2022-07-28 thomas commit_id, tree, old);
799 7d8bcb99 2022-07-28 thomas return err;
801 21948212 2022-07-27 thomas if (reverse && !do_merge)
802 21948212 2022-07-27 thomas reverse_patch(p);
804 72f46891 2022-04-23 thomas if (asprintf(&oldpath, "%s/%s", got_worktree_get_root_path(worktree),
805 72f46891 2022-04-23 thomas old) == -1) {
806 72f46891 2022-04-23 thomas err = got_error_from_errno("asprintf");
807 814624e7 2022-03-22 thomas goto done;
810 72f46891 2022-04-23 thomas if (asprintf(&newpath, "%s/%s", got_worktree_get_root_path(worktree),
811 72f46891 2022-04-23 thomas new) == -1) {
812 72f46891 2022-04-23 thomas err = got_error_from_errno("asprintf");
813 72f46891 2022-04-23 thomas goto done;
816 814624e7 2022-03-22 thomas file_renamed = strcmp(oldpath, newpath);
818 bb2ad8ff 2022-03-13 thomas if (asprintf(&template, "%s/got-patch",
819 bb2ad8ff 2022-03-13 thomas got_worktree_get_root_path(worktree)) == -1) {
820 bb2ad8ff 2022-03-13 thomas err = got_error_from_errno(template);
821 069bbb86 2022-03-07 thomas goto done;
824 25a880e1 2022-07-03 thomas if (p->old != NULL) {
825 25a880e1 2022-07-03 thomas if ((oldfile = fopen(oldpath, "r")) == NULL) {
826 25a880e1 2022-07-03 thomas err = got_error_from_errno2("open", oldpath);
827 25a880e1 2022-07-03 thomas goto done;
829 25a880e1 2022-07-03 thomas if (fstat(fileno(oldfile), &sb) == -1) {
830 25a880e1 2022-07-03 thomas err = got_error_from_errno2("fstat", oldpath);
831 25a880e1 2022-07-03 thomas goto done;
833 25a880e1 2022-07-03 thomas mode = sb.st_mode;
836 0f76ab83 2022-06-23 thomas err = got_opentemp_named(&tmppath, &tmpfile, template);
838 bb2ad8ff 2022-03-13 thomas goto done;
839 0f76ab83 2022-06-23 thomas outpath = tmppath;
840 0f76ab83 2022-06-23 thomas outfd = fileno(tmpfile);
841 25a880e1 2022-07-03 thomas err = patch_file(p, afile != NULL ? afile : oldfile, tmpfile);
843 bb2ad8ff 2022-03-13 thomas goto done;
845 0f76ab83 2022-06-23 thomas if (do_merge) {
846 8afec5d5 2022-07-01 thomas const char *type, *id;
848 0f76ab83 2022-06-23 thomas if (fseeko(afile, 0, SEEK_SET) == -1 ||
849 0f76ab83 2022-06-23 thomas fseeko(oldfile, 0, SEEK_SET) == -1 ||
850 0f76ab83 2022-06-23 thomas fseeko(tmpfile, 0, SEEK_SET) == -1) {
851 0f76ab83 2022-06-23 thomas err = got_error_from_errno("fseeko");
852 0f76ab83 2022-06-23 thomas goto done;
855 0f76ab83 2022-06-23 thomas if (asprintf(&oldlabel, "--- %s", p->old) == -1) {
856 0f76ab83 2022-06-23 thomas err = got_error_from_errno("asprintf");
857 0f76ab83 2022-06-23 thomas oldlabel = NULL;
858 0f76ab83 2022-06-23 thomas goto done;
861 0f76ab83 2022-06-23 thomas if (asprintf(&newlabel, "+++ %s", p->new) == -1) {
862 0f76ab83 2022-06-23 thomas err = got_error_from_errno("asprintf");
863 0f76ab83 2022-06-23 thomas newlabel = NULL;
864 0f76ab83 2022-06-23 thomas goto done;
867 8afec5d5 2022-07-01 thomas if (*p->cid != '\0') {
868 8afec5d5 2022-07-01 thomas type = "commit";
869 8afec5d5 2022-07-01 thomas id = p->cid;
871 8afec5d5 2022-07-01 thomas type = "blob";
872 8afec5d5 2022-07-01 thomas id = p->blob;
875 8afec5d5 2022-07-01 thomas if (asprintf(&anclabel, "%s %s", type, id) == -1) {
876 016bfe4b 2022-06-23 thomas err = got_error_from_errno("asprintf");
877 016bfe4b 2022-06-23 thomas anclabel = NULL;
878 016bfe4b 2022-06-23 thomas goto done;
881 f4602cbd 2022-07-23 thomas if (reverse) {
885 f4602cbd 2022-07-23 thomas s = anclabel;
886 f4602cbd 2022-07-23 thomas anclabel = newlabel;
887 f4602cbd 2022-07-23 thomas newlabel = s;
889 f4602cbd 2022-07-23 thomas t = afile;
890 f4602cbd 2022-07-23 thomas afile = tmpfile;
891 f4602cbd 2022-07-23 thomas tmpfile = t;
894 0f76ab83 2022-06-23 thomas err = got_opentemp_named(&mergepath, &mergefile, template);
896 0f76ab83 2022-06-23 thomas goto done;
897 0f76ab83 2022-06-23 thomas outpath = mergepath;
898 0f76ab83 2022-06-23 thomas outfd = fileno(mergefile);
900 0f76ab83 2022-06-23 thomas err = got_merge_diff3(overlapcnt, outfd, tmpfile, afile,
901 016bfe4b 2022-06-23 thomas oldfile, oldlabel, anclabel, newlabel,
902 0f76ab83 2022-06-23 thomas GOT_DIFF_ALGORITHM_PATIENCE);
904 0f76ab83 2022-06-23 thomas goto done;
908 eaf99875 2022-03-22 thomas goto done;
910 eaf99875 2022-03-22 thomas if (p->old != NULL && p->new == NULL) {
911 5e22b737 2022-05-31 thomas err = got_worktree_patch_schedule_rm(old, repo, worktree,
912 5e22b737 2022-05-31 thomas fileindex, patch_delete, pa);
913 eaf99875 2022-03-22 thomas goto done;
916 0f76ab83 2022-06-23 thomas if (fchmod(outfd, mode) == -1) {
917 8260acc8 2022-05-01 thomas err = got_error_from_errno2("chmod", tmppath);
918 da09d8ed 2022-03-22 thomas goto done;
921 0f76ab83 2022-06-23 thomas if (rename(outpath, newpath) == -1) {
922 e0c1f81c 2022-03-22 thomas if (errno != ENOENT) {
923 0f76ab83 2022-06-23 thomas err = got_error_from_errno3("rename", outpath,
924 e0c1f81c 2022-03-22 thomas newpath);
925 e0c1f81c 2022-03-22 thomas goto done;
928 e0c1f81c 2022-03-22 thomas err = got_path_dirname(&parent, newpath);
929 e0c1f81c 2022-03-22 thomas if (err != NULL)
930 e0c1f81c 2022-03-22 thomas goto done;
931 e0c1f81c 2022-03-22 thomas err = got_path_mkdir(parent);
932 e0c1f81c 2022-03-22 thomas if (err != NULL)
933 e0c1f81c 2022-03-22 thomas goto done;
934 0f76ab83 2022-06-23 thomas if (rename(outpath, newpath) == -1) {
935 0f76ab83 2022-06-23 thomas err = got_error_from_errno3("rename", outpath,
936 e0c1f81c 2022-03-22 thomas newpath);
937 e0c1f81c 2022-03-22 thomas goto done;
941 bb2ad8ff 2022-03-13 thomas if (file_renamed) {
942 5e22b737 2022-05-31 thomas err = got_worktree_patch_schedule_rm(old, repo, worktree,
943 5e22b737 2022-05-31 thomas fileindex, patch_delete, pa);
944 bb2ad8ff 2022-03-13 thomas if (err == NULL)
945 5e22b737 2022-05-31 thomas err = got_worktree_patch_schedule_add(new, repo,
946 5e22b737 2022-05-31 thomas worktree, fileindex, patch_add,
949 814624e7 2022-03-22 thomas unlink(newpath);
950 814624e7 2022-03-22 thomas } else if (p->old == NULL) {
951 5e22b737 2022-05-31 thomas err = got_worktree_patch_schedule_add(new, repo, worktree,
952 5e22b737 2022-05-31 thomas fileindex, patch_add, pa);
954 814624e7 2022-03-22 thomas unlink(newpath);
955 0f76ab83 2022-06-23 thomas } else if (*overlapcnt != 0)
956 0f76ab83 2022-06-23 thomas err = report_progress(pa, old, new, GOT_STATUS_CONFLICT, NULL);
957 762b8e82 2022-06-23 thomas else if (do_merge)
958 762b8e82 2022-06-23 thomas err = report_progress(pa, old, new, GOT_STATUS_MERGE, NULL);
960 72f46891 2022-04-23 thomas err = report_progress(pa, old, new, GOT_STATUS_MODIFY, NULL);
963 e0c1f81c 2022-03-22 thomas free(parent);
964 94af5a06 2022-03-08 thomas free(template);
966 069bbb86 2022-03-07 thomas if (tmppath != NULL)
967 069bbb86 2022-03-07 thomas unlink(tmppath);
968 0f76ab83 2022-06-23 thomas if (tmpfile != NULL && fclose(tmpfile) == EOF && err == NULL)
969 04cdf6ac 2022-06-23 thomas err = got_error_from_errno("fclose");
970 069bbb86 2022-03-07 thomas free(tmppath);
972 72f46891 2022-04-23 thomas free(oldpath);
973 2249fadd 2022-06-23 thomas if (oldfile != NULL && fclose(oldfile) == EOF && err == NULL)
974 2249fadd 2022-06-23 thomas err = got_error_from_errno("fclose");
976 0f76ab83 2022-06-23 thomas if (apath != NULL)
977 0f76ab83 2022-06-23 thomas unlink(apath);
978 0f76ab83 2022-06-23 thomas if (afile != NULL && fclose(afile) == EOF && err == NULL)
979 0f76ab83 2022-06-23 thomas err = got_error_from_errno("fclose");
980 0f76ab83 2022-06-23 thomas free(apath);
982 0f76ab83 2022-06-23 thomas if (mergepath != NULL)
983 0f76ab83 2022-06-23 thomas unlink(mergepath);
984 0f76ab83 2022-06-23 thomas if (mergefile != NULL && fclose(mergefile) == EOF && err == NULL)
985 0f76ab83 2022-06-23 thomas err = got_error_from_errno("fclose");
986 0f76ab83 2022-06-23 thomas free(mergepath);
988 72f46891 2022-04-23 thomas free(newpath);
989 0f76ab83 2022-06-23 thomas free(oldlabel);
990 0f76ab83 2022-06-23 thomas free(newlabel);
991 016bfe4b 2022-06-23 thomas free(anclabel);
992 069bbb86 2022-03-07 thomas return err;
995 069bbb86 2022-03-07 thomas const struct got_error *
996 069bbb86 2022-03-07 thomas got_patch(int fd, struct got_worktree *worktree, struct got_repository *repo,
997 7d8bcb99 2022-07-28 thomas int nop, int strip, int reverse, struct got_object_id *commit_id,
998 7d8bcb99 2022-07-28 thomas got_patch_progress_cb progress_cb, void *progress_arg,
999 7d8bcb99 2022-07-28 thomas got_cancel_cb cancel_cb, void *cancel_arg)
1001 36832a8e 2022-05-31 thomas const struct got_error *err = NULL, *complete_err = NULL;
1002 814624e7 2022-03-22 thomas struct got_fileindex *fileindex = NULL;
1003 7d8bcb99 2022-07-28 thomas struct got_commit_object *commit = NULL;
1004 7d8bcb99 2022-07-28 thomas struct got_tree_object *tree = NULL;
1005 5e22b737 2022-05-31 thomas char *fileindex_path = NULL;
1006 49114f01 2022-03-22 thomas char *oldpath, *newpath;
1007 069bbb86 2022-03-07 thomas struct imsgbuf *ibuf;
1008 069bbb86 2022-03-07 thomas int imsg_fds[2] = {-1, -1};
1009 0f76ab83 2022-06-23 thomas int overlapcnt, done = 0, failed = 0;
1010 069bbb86 2022-03-07 thomas pid_t pid;
1012 069bbb86 2022-03-07 thomas ibuf = calloc(1, sizeof(*ibuf));
1013 069bbb86 2022-03-07 thomas if (ibuf == NULL) {
1014 069bbb86 2022-03-07 thomas err = got_error_from_errno("calloc");
1015 069bbb86 2022-03-07 thomas goto done;
1018 069bbb86 2022-03-07 thomas if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1) {
1019 069bbb86 2022-03-07 thomas err = got_error_from_errno("socketpair");
1020 069bbb86 2022-03-07 thomas goto done;
1023 069bbb86 2022-03-07 thomas pid = fork();
1024 069bbb86 2022-03-07 thomas if (pid == -1) {
1025 069bbb86 2022-03-07 thomas err = got_error_from_errno("fork");
1026 069bbb86 2022-03-07 thomas goto done;
1027 069bbb86 2022-03-07 thomas } else if (pid == 0) {
1028 069bbb86 2022-03-07 thomas got_privsep_exec_child(imsg_fds, GOT_PATH_PROG_READ_PATCH,
1030 069bbb86 2022-03-07 thomas /* not reached */
1033 069bbb86 2022-03-07 thomas if (close(imsg_fds[1]) == -1) {
1034 069bbb86 2022-03-07 thomas err = got_error_from_errno("close");
1035 069bbb86 2022-03-07 thomas goto done;
1037 069bbb86 2022-03-07 thomas imsg_fds[1] = -1;
1038 069bbb86 2022-03-07 thomas imsg_init(ibuf, imsg_fds[0]);
1040 069bbb86 2022-03-07 thomas err = send_patch(ibuf, fd);
1041 069bbb86 2022-03-07 thomas fd = -1;
1042 069bbb86 2022-03-07 thomas if (err)
1043 069bbb86 2022-03-07 thomas goto done;
1045 5e22b737 2022-05-31 thomas err = got_worktree_patch_prepare(&fileindex, &fileindex_path,
1046 5e22b737 2022-05-31 thomas worktree);
1047 814624e7 2022-03-22 thomas if (err)
1048 814624e7 2022-03-22 thomas goto done;
1050 7d8bcb99 2022-07-28 thomas if (commit_id) {
1051 7d8bcb99 2022-07-28 thomas err = got_object_open_as_commit(&commit, repo, commit_id);
1052 7d8bcb99 2022-07-28 thomas if (err)
1053 7d8bcb99 2022-07-28 thomas goto done;
1055 7d8bcb99 2022-07-28 thomas err = got_object_open_as_tree(&tree, repo, commit->tree_id);
1056 7d8bcb99 2022-07-28 thomas if (err)
1057 7d8bcb99 2022-07-28 thomas goto done;
1060 069bbb86 2022-03-07 thomas while (!done && err == NULL) {
1061 069bbb86 2022-03-07 thomas struct got_patch p;
1062 49114f01 2022-03-22 thomas struct patch_args pa;
1064 49114f01 2022-03-22 thomas pa.progress_cb = progress_cb;
1065 49114f01 2022-03-22 thomas pa.progress_arg = progress_arg;
1066 49114f01 2022-03-22 thomas pa.head = &p.head;
1068 d9db2ff9 2022-04-16 thomas err = recv_patch(ibuf, &done, &p, strip);
1069 069bbb86 2022-03-07 thomas if (err || done)
1072 814624e7 2022-03-22 thomas err = got_worktree_patch_check_path(p.old, p.new, &oldpath,
1073 814624e7 2022-03-22 thomas &newpath, worktree, repo, fileindex);
1074 814624e7 2022-03-22 thomas if (err == NULL)
1075 0f76ab83 2022-06-23 thomas err = apply_patch(&overlapcnt, worktree, repo,
1076 f4602cbd 2022-07-23 thomas fileindex, oldpath, newpath, &p, nop, reverse,
1077 7d8bcb99 2022-07-28 thomas commit_id, tree, &pa, cancel_cb, cancel_arg);
1078 49114f01 2022-03-22 thomas if (err != NULL) {
1079 49114f01 2022-03-22 thomas failed = 1;
1080 49114f01 2022-03-22 thomas /* recoverable errors */
1081 49114f01 2022-03-22 thomas if (err->code == GOT_ERR_FILE_STATUS ||
1082 49114f01 2022-03-22 thomas (err->code == GOT_ERR_ERRNO && errno == ENOENT))
1083 49114f01 2022-03-22 thomas err = report_progress(&pa, p.old, p.new,
1084 49114f01 2022-03-22 thomas GOT_STATUS_CANNOT_UPDATE, err);
1085 49114f01 2022-03-22 thomas else if (err->code == GOT_ERR_HUNK_FAILED)
1086 49114f01 2022-03-22 thomas err = report_progress(&pa, p.old, p.new,
1087 49114f01 2022-03-22 thomas GOT_STATUS_CANNOT_UPDATE, NULL);
1089 0f76ab83 2022-06-23 thomas if (overlapcnt != 0)
1090 0f76ab83 2022-06-23 thomas failed = 1;
1092 49114f01 2022-03-22 thomas free(oldpath);
1093 49114f01 2022-03-22 thomas free(newpath);
1094 069bbb86 2022-03-07 thomas patch_free(&p);
1096 069bbb86 2022-03-07 thomas if (err)
1101 36832a8e 2022-05-31 thomas if (fileindex != NULL)
1102 36832a8e 2022-05-31 thomas complete_err = got_worktree_patch_complete(fileindex,
1103 36832a8e 2022-05-31 thomas fileindex_path);
1104 5e22b737 2022-05-31 thomas if (complete_err && err == NULL)
1105 5e22b737 2022-05-31 thomas err = complete_err;
1106 36832a8e 2022-05-31 thomas free(fileindex_path);
1107 7d8bcb99 2022-07-28 thomas if (tree)
1108 7d8bcb99 2022-07-28 thomas got_object_tree_close(tree);
1109 7d8bcb99 2022-07-28 thomas if (commit)
1110 7d8bcb99 2022-07-28 thomas got_object_commit_close(commit);
1111 069bbb86 2022-03-07 thomas if (fd != -1 && close(fd) == -1 && err == NULL)
1112 069bbb86 2022-03-07 thomas err = got_error_from_errno("close");
1113 069bbb86 2022-03-07 thomas if (ibuf != NULL)
1114 069bbb86 2022-03-07 thomas imsg_clear(ibuf);
1115 069bbb86 2022-03-07 thomas if (imsg_fds[0] != -1 && close(imsg_fds[0]) == -1 && err == NULL)
1116 069bbb86 2022-03-07 thomas err = got_error_from_errno("close");
1117 069bbb86 2022-03-07 thomas if (imsg_fds[1] != -1 && close(imsg_fds[1]) == -1 && err == NULL)
1118 069bbb86 2022-03-07 thomas err = got_error_from_errno("close");
1119 49114f01 2022-03-22 thomas if (err == NULL && failed)
1120 49114f01 2022-03-22 thomas err = got_error(GOT_ERR_PATCH_FAILED);
1121 069bbb86 2022-03-07 thomas return err;
