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 069bbb86 2022-03-07 thomas static const struct got_error *
378 8ebb3daa 2022-06-23 thomas locate_hunk(FILE *orig, struct got_patch_hunk *h, off_t *pos, int *lineno)
380 069bbb86 2022-03-07 thomas const struct got_error *err = NULL;
381 069bbb86 2022-03-07 thomas char *line = NULL;
382 069bbb86 2022-03-07 thomas char mode = *h->lines[0];
383 069bbb86 2022-03-07 thomas size_t linesize = 0;
384 069bbb86 2022-03-07 thomas ssize_t linelen;
385 069bbb86 2022-03-07 thomas off_t match = -1;
386 8ebb3daa 2022-06-23 thomas int match_lineno = -1;
388 069bbb86 2022-03-07 thomas for (;;) {
389 069bbb86 2022-03-07 thomas linelen = getline(&line, &linesize, orig);
390 069bbb86 2022-03-07 thomas if (linelen == -1) {
391 069bbb86 2022-03-07 thomas if (ferror(orig))
392 069bbb86 2022-03-07 thomas err = got_error_from_errno("getline");
393 069bbb86 2022-03-07 thomas else if (match == -1)
394 49114f01 2022-03-22 thomas err = got_error(GOT_ERR_HUNK_FAILED);
397 ff7f34d3 2022-03-22 thomas if (line[linelen - 1] == '\n')
398 ff7f34d3 2022-03-22 thomas line[linelen - 1] = '\0';
399 069bbb86 2022-03-07 thomas (*lineno)++;
401 17d6446a 2022-03-22 thomas if ((mode == ' ' && !strcmp(h->lines[0] + 1, line)) ||
402 17d6446a 2022-03-22 thomas (mode == '-' && !strcmp(h->lines[0] + 1, line)) ||
403 069bbb86 2022-03-07 thomas (mode == '+' && *lineno == h->old_from)) {
404 069bbb86 2022-03-07 thomas match = ftello(orig);
405 069bbb86 2022-03-07 thomas if (match == -1) {
406 069bbb86 2022-03-07 thomas err = got_error_from_errno("ftello");
409 069bbb86 2022-03-07 thomas match -= linelen;
410 069bbb86 2022-03-07 thomas match_lineno = (*lineno)-1;
413 069bbb86 2022-03-07 thomas if (*lineno >= h->old_from && match != -1)
417 069bbb86 2022-03-07 thomas if (err == NULL) {
418 122e1611 2022-03-22 thomas *pos = match;
419 069bbb86 2022-03-07 thomas *lineno = match_lineno;
420 bafaf650 2022-05-14 thomas if (fseeko(orig, match, SEEK_SET) == -1)
421 bafaf650 2022-05-14 thomas err = got_error_from_errno("fseeko");
424 069bbb86 2022-03-07 thomas free(line);
425 069bbb86 2022-03-07 thomas return err;
428 bb90ca7b 2022-07-03 thomas static int
429 bb90ca7b 2022-07-03 thomas linecmp(const char *a, const char *b, int *mangled)
433 bb90ca7b 2022-07-03 thomas *mangled = 0;
434 bb90ca7b 2022-07-03 thomas c = strcmp(a, b);
435 bb90ca7b 2022-07-03 thomas if (c == 0)
436 bb90ca7b 2022-07-03 thomas return c;
438 bb90ca7b 2022-07-03 thomas *mangled = 1;
439 bb90ca7b 2022-07-03 thomas for (;;) {
440 2140c6ec 2022-07-04 thomas while (*a == '\t' || *a == ' ' || *a == '\f')
442 2140c6ec 2022-07-04 thomas while (*b == '\t' || *b == ' ' || *b == '\f')
444 2140c6ec 2022-07-04 thomas if (*a == '\0' || *a != *b)
446 bb90ca7b 2022-07-03 thomas a++, b++;
449 bb90ca7b 2022-07-03 thomas return *a - *b;
452 069bbb86 2022-03-07 thomas static const struct got_error *
453 069bbb86 2022-03-07 thomas test_hunk(FILE *orig, struct got_patch_hunk *h)
455 069bbb86 2022-03-07 thomas const struct got_error *err = NULL;
456 069bbb86 2022-03-07 thomas char *line = NULL;
457 069bbb86 2022-03-07 thomas size_t linesize = 0, i = 0;
458 069bbb86 2022-03-07 thomas ssize_t linelen;
459 bb90ca7b 2022-07-03 thomas int mangled;
461 069bbb86 2022-03-07 thomas for (i = 0; i < h->len; ++i) {
462 069bbb86 2022-03-07 thomas switch (*h->lines[i]) {
463 069bbb86 2022-03-07 thomas case '+':
464 069bbb86 2022-03-07 thomas continue;
465 069bbb86 2022-03-07 thomas case ' ':
466 069bbb86 2022-03-07 thomas case '-':
467 069bbb86 2022-03-07 thomas linelen = getline(&line, &linesize, orig);
468 069bbb86 2022-03-07 thomas if (linelen == -1) {
469 069bbb86 2022-03-07 thomas if (ferror(orig))
470 069bbb86 2022-03-07 thomas err = got_error_from_errno("getline");
472 069bbb86 2022-03-07 thomas err = got_error(
473 49114f01 2022-03-22 thomas GOT_ERR_HUNK_FAILED);
474 069bbb86 2022-03-07 thomas goto done;
476 ff7f34d3 2022-03-22 thomas if (line[linelen - 1] == '\n')
477 ff7f34d3 2022-03-22 thomas line[linelen - 1] = '\0';
478 bb90ca7b 2022-07-03 thomas if (linecmp(h->lines[i] + 1, line, &mangled)) {
479 49114f01 2022-03-22 thomas err = got_error(GOT_ERR_HUNK_FAILED);
480 069bbb86 2022-03-07 thomas goto done;
482 bb90ca7b 2022-07-03 thomas if (mangled)
483 bb90ca7b 2022-07-03 thomas h->ws_mangled = 1;
489 069bbb86 2022-03-07 thomas free(line);
490 069bbb86 2022-03-07 thomas return err;
493 069bbb86 2022-03-07 thomas static const struct got_error *
494 bb90ca7b 2022-07-03 thomas apply_hunk(FILE *orig, FILE *tmp, struct got_patch_hunk *h, int *lineno,
495 bb90ca7b 2022-07-03 thomas off_t from)
497 bb90ca7b 2022-07-03 thomas const struct got_error *err = NULL;
498 bb90ca7b 2022-07-03 thomas const char *t;
499 bb90ca7b 2022-07-03 thomas size_t linesize = 0, i, new = 0;
500 bb90ca7b 2022-07-03 thomas char *line = NULL;
501 bb90ca7b 2022-07-03 thomas char mode;
502 bb90ca7b 2022-07-03 thomas ssize_t linelen;
504 bb90ca7b 2022-07-03 thomas if (orig != NULL && fseeko(orig, from, SEEK_SET) == -1)
505 bb90ca7b 2022-07-03 thomas return got_error_from_errno("fseeko");
507 069bbb86 2022-03-07 thomas for (i = 0; i < h->len; ++i) {
508 bb90ca7b 2022-07-03 thomas switch (mode = *h->lines[i]) {
509 069bbb86 2022-03-07 thomas case '-':
510 bb90ca7b 2022-07-03 thomas case ' ':
511 069bbb86 2022-03-07 thomas (*lineno)++;
512 bb90ca7b 2022-07-03 thomas if (orig != NULL) {
513 bb90ca7b 2022-07-03 thomas linelen = getline(&line, &linesize, orig);
514 bb90ca7b 2022-07-03 thomas if (linelen == -1) {
515 bb90ca7b 2022-07-03 thomas err = got_error_from_errno("getline");
516 bb90ca7b 2022-07-03 thomas goto done;
518 bb90ca7b 2022-07-03 thomas if (line[linelen - 1] == '\n')
519 bb90ca7b 2022-07-03 thomas line[linelen - 1] = '\0';
520 bb90ca7b 2022-07-03 thomas t = line;
522 bb90ca7b 2022-07-03 thomas t = h->lines[i] + 1;
523 bb90ca7b 2022-07-03 thomas if (mode == '-')
524 bb90ca7b 2022-07-03 thomas continue;
525 bb90ca7b 2022-07-03 thomas if (fprintf(tmp, "%s\n", t) < 0) {
526 bb90ca7b 2022-07-03 thomas err = got_error_from_errno("fprintf");
527 bb90ca7b 2022-07-03 thomas goto done;
530 069bbb86 2022-03-07 thomas case '+':
532 bb90ca7b 2022-07-03 thomas if (fprintf(tmp, "%s", h->lines[i] + 1) < 0) {
533 bb90ca7b 2022-07-03 thomas err = got_error_from_errno("fprintf");
534 bb90ca7b 2022-07-03 thomas goto done;
536 656c2baa 2022-04-23 thomas if (new != h->new_lines || !h->new_nonl) {
537 bb90ca7b 2022-07-03 thomas if (fprintf(tmp, "\n") < 0) {
538 bb90ca7b 2022-07-03 thomas err = got_error_from_errno("fprintf");
539 bb90ca7b 2022-07-03 thomas goto done;
547 bb90ca7b 2022-07-03 thomas free(line);
548 bb90ca7b 2022-07-03 thomas return err;
551 46e6bdd4 2022-03-22 thomas static const struct got_error *
552 25a880e1 2022-07-03 thomas patch_file(struct got_patch *p, FILE *orig, FILE *tmp)
554 bb2ad8ff 2022-03-13 thomas const struct got_error *err = NULL;
555 bb2ad8ff 2022-03-13 thomas struct got_patch_hunk *h;
556 da09d8ed 2022-03-22 thomas struct stat sb;
557 8ebb3daa 2022-06-23 thomas int lineno = 0;
558 bb2ad8ff 2022-03-13 thomas off_t copypos, pos;
559 bb2ad8ff 2022-03-13 thomas char *line = NULL;
560 bb2ad8ff 2022-03-13 thomas size_t linesize = 0;
561 bb2ad8ff 2022-03-13 thomas ssize_t linelen;
563 069bbb86 2022-03-07 thomas if (p->old == NULL) { /* create */
564 069bbb86 2022-03-07 thomas h = STAILQ_FIRST(&p->head);
565 bb2ad8ff 2022-03-13 thomas if (h == NULL || STAILQ_NEXT(h, entries) != NULL)
566 bb2ad8ff 2022-03-13 thomas return got_error(GOT_ERR_PATCH_MALFORMED);
567 bb90ca7b 2022-07-03 thomas return apply_hunk(orig, tmp, h, &lineno, 0);
570 2249fadd 2022-06-23 thomas if (fstat(fileno(orig), &sb) == -1)
571 2249fadd 2022-06-23 thomas return got_error_from_errno("fstat");
573 069bbb86 2022-03-07 thomas copypos = 0;
574 069bbb86 2022-03-07 thomas STAILQ_FOREACH(h, &p->head, entries) {
575 069bbb86 2022-03-07 thomas tryagain:
576 122e1611 2022-03-22 thomas err = locate_hunk(orig, h, &pos, &lineno);
577 49114f01 2022-03-22 thomas if (err != NULL && err->code == GOT_ERR_HUNK_FAILED)
578 49114f01 2022-03-22 thomas h->err = err;
579 069bbb86 2022-03-07 thomas if (err != NULL)
580 2249fadd 2022-06-23 thomas return err;
581 2d9b6837 2022-06-23 thomas err = copy(tmp, orig, copypos, pos);
582 069bbb86 2022-03-07 thomas if (err != NULL)
583 2249fadd 2022-06-23 thomas return err;
584 069bbb86 2022-03-07 thomas copypos = pos;
586 069bbb86 2022-03-07 thomas err = test_hunk(orig, h);
587 49114f01 2022-03-22 thomas if (err != NULL && err->code == GOT_ERR_HUNK_FAILED) {
589 069bbb86 2022-03-07 thomas * try to apply the hunk again starting the search
590 069bbb86 2022-03-07 thomas * after the previous partial match.
592 2249fadd 2022-06-23 thomas if (fseeko(orig, pos, SEEK_SET) == -1)
593 2249fadd 2022-06-23 thomas return got_error_from_errno("fseeko");
594 069bbb86 2022-03-07 thomas linelen = getline(&line, &linesize, orig);
595 2249fadd 2022-06-23 thomas if (linelen == -1)
596 2249fadd 2022-06-23 thomas return got_error_from_errno("getline");
597 069bbb86 2022-03-07 thomas lineno++;
598 069bbb86 2022-03-07 thomas goto tryagain;
600 069bbb86 2022-03-07 thomas if (err != NULL)
601 2249fadd 2022-06-23 thomas return err;
603 49114f01 2022-03-22 thomas if (lineno + 1 != h->old_from)
604 49114f01 2022-03-22 thomas h->offset = lineno + 1 - h->old_from;
606 bb90ca7b 2022-07-03 thomas err = apply_hunk(orig, tmp, h, &lineno, pos);
607 069bbb86 2022-03-07 thomas if (err != NULL)
608 2249fadd 2022-06-23 thomas return err;
610 069bbb86 2022-03-07 thomas copypos = ftello(orig);
611 2249fadd 2022-06-23 thomas if (copypos == -1)
612 2249fadd 2022-06-23 thomas return got_error_from_errno("ftello");
615 49114f01 2022-03-22 thomas if (p->new == NULL && sb.st_size != copypos) {
616 49114f01 2022-03-22 thomas h = STAILQ_FIRST(&p->head);
617 49114f01 2022-03-22 thomas h->err = got_error(GOT_ERR_HUNK_FAILED);
618 49114f01 2022-03-22 thomas err = h->err;
619 2d9b6837 2022-06-23 thomas } else if (!feof(orig))
620 069bbb86 2022-03-07 thomas err = copy(tmp, orig, copypos, -1);
622 10e55613 2022-03-22 thomas return err;
625 10e55613 2022-03-22 thomas static const struct got_error *
626 49114f01 2022-03-22 thomas report_progress(struct patch_args *pa, const char *old, const char *new,
627 49114f01 2022-03-22 thomas unsigned char status, const struct got_error *orig_error)
629 49114f01 2022-03-22 thomas const struct got_error *err;
630 49114f01 2022-03-22 thomas struct got_patch_hunk *h;
632 49114f01 2022-03-22 thomas err = pa->progress_cb(pa->progress_arg, old, new, status,
633 bb90ca7b 2022-07-03 thomas orig_error, 0, 0, 0, 0, 0, 0, NULL);
635 49114f01 2022-03-22 thomas return err;
637 49114f01 2022-03-22 thomas STAILQ_FOREACH(h, pa->head, entries) {
638 bb90ca7b 2022-07-03 thomas if (h->offset == 0 && !h->ws_mangled && h->err == NULL)
639 49114f01 2022-03-22 thomas continue;
641 49114f01 2022-03-22 thomas err = pa->progress_cb(pa->progress_arg, old, new, 0, NULL,
642 49114f01 2022-03-22 thomas h->old_from, h->old_lines, h->new_from, h->new_lines,
643 bb90ca7b 2022-07-03 thomas h->offset, h->ws_mangled, h->err);
645 49114f01 2022-03-22 thomas return err;
648 49114f01 2022-03-22 thomas return NULL;
651 49114f01 2022-03-22 thomas static const struct got_error *
652 c71da4f7 2022-03-22 thomas patch_delete(void *arg, unsigned char status, unsigned char staged_status,
653 c71da4f7 2022-03-22 thomas const char *path)
655 49114f01 2022-03-22 thomas return report_progress(arg, path, NULL, status, NULL);
658 c71da4f7 2022-03-22 thomas static const struct got_error *
659 c71da4f7 2022-03-22 thomas patch_add(void *arg, unsigned char status, const char *path)
661 49114f01 2022-03-22 thomas return report_progress(arg, NULL, path, status, NULL);
664 c71da4f7 2022-03-22 thomas static const struct got_error *
665 0f76ab83 2022-06-23 thomas open_blob(char **path, FILE **fp, const char *blobid,
666 0f76ab83 2022-06-23 thomas struct got_repository *repo)
668 bb2ad8ff 2022-03-13 thomas const struct got_error *err = NULL;
669 0f76ab83 2022-06-23 thomas struct got_blob_object *blob = NULL;
670 19dd85cb 2022-07-01 thomas struct got_object_id id, *idptr, *matched_id = NULL;
671 f4ae6ddb 2022-07-01 thomas int fd = -1;
673 0f76ab83 2022-06-23 thomas *fp = NULL;
674 0f76ab83 2022-06-23 thomas *path = NULL;
676 19dd85cb 2022-07-01 thomas if (strlen(blobid) != SHA1_DIGEST_STRING_LENGTH - 1) {
677 19dd85cb 2022-07-01 thomas err = got_repo_match_object_id(&matched_id, NULL, blobid,
678 19dd85cb 2022-07-01 thomas GOT_OBJ_TYPE_BLOB, NULL /* do not resolve tags */,
681 19dd85cb 2022-07-01 thomas return err;
682 19dd85cb 2022-07-01 thomas idptr = matched_id;
684 19dd85cb 2022-07-01 thomas if (!got_parse_sha1_digest(id.sha1, blobid))
685 19dd85cb 2022-07-01 thomas return got_error(GOT_ERR_BAD_OBJ_ID_STR);
686 19dd85cb 2022-07-01 thomas idptr = &id;
689 f4ae6ddb 2022-07-01 thomas fd = got_opentempfd();
690 f4ae6ddb 2022-07-01 thomas if (fd == -1) {
691 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
692 f4ae6ddb 2022-07-01 thomas goto done;
695 f4ae6ddb 2022-07-01 thomas err = got_object_open_as_blob(&blob, repo, idptr, 8192, fd);
697 0f76ab83 2022-06-23 thomas goto done;
699 0f76ab83 2022-06-23 thomas err = got_opentemp_named(path, fp, GOT_TMPDIR_STR "/got-patch-blob");
701 0f76ab83 2022-06-23 thomas goto done;
703 0f76ab83 2022-06-23 thomas err = got_object_blob_dump_to_file(NULL, NULL, NULL, *fp, blob);
705 0f76ab83 2022-06-23 thomas goto done;
708 f4ae6ddb 2022-07-01 thomas if (fd != -1 && close(fd) == -1 && err == NULL)
709 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
710 0f76ab83 2022-06-23 thomas if (blob)
711 0f76ab83 2022-06-23 thomas got_object_blob_close(blob);
712 19dd85cb 2022-07-01 thomas if (matched_id != NULL)
713 19dd85cb 2022-07-01 thomas free(matched_id);
714 0f76ab83 2022-06-23 thomas if (err) {
715 0f76ab83 2022-06-23 thomas if (*fp != NULL)
716 0f76ab83 2022-06-23 thomas fclose(*fp);
717 0f76ab83 2022-06-23 thomas if (*path != NULL)
718 0f76ab83 2022-06-23 thomas unlink(*path);
719 0f76ab83 2022-06-23 thomas free(*path);
720 0f76ab83 2022-06-23 thomas *fp = NULL;
721 0f76ab83 2022-06-23 thomas *path = NULL;
723 0f76ab83 2022-06-23 thomas return err;
726 0f76ab83 2022-06-23 thomas static const struct got_error *
727 7d8bcb99 2022-07-28 thomas prepare_merge(int *do_merge, char **apath, FILE **afile,
728 7d8bcb99 2022-07-28 thomas struct got_worktree *worktree, struct got_repository *repo,
729 7d8bcb99 2022-07-28 thomas struct got_patch *p, struct got_object_id *commit_id,
730 7d8bcb99 2022-07-28 thomas struct got_tree_object *tree, const char *path)
732 7d8bcb99 2022-07-28 thomas const struct got_error *err = NULL;
734 7d8bcb99 2022-07-28 thomas *do_merge = 0;
735 7d8bcb99 2022-07-28 thomas *apath = NULL;
736 7d8bcb99 2022-07-28 thomas *afile = NULL;
738 7d8bcb99 2022-07-28 thomas /* don't run the diff3 merge on creations/deletions */
739 7d8bcb99 2022-07-28 thomas if (p->old == NULL || p->new == NULL)
740 7d8bcb99 2022-07-28 thomas return NULL;
742 7d8bcb99 2022-07-28 thomas if (commit_id) {
743 7d8bcb99 2022-07-28 thomas struct got_object_id *id;
745 7d8bcb99 2022-07-28 thomas err = got_object_tree_find_path(&id, NULL, repo, tree, path);
747 7d8bcb99 2022-07-28 thomas return err;
748 7d8bcb99 2022-07-28 thomas got_sha1_digest_to_str(id->sha1, p->blob, sizeof(p->blob));
749 7d8bcb99 2022-07-28 thomas got_sha1_digest_to_str(commit_id->sha1, p->cid, sizeof(p->cid));
750 7d8bcb99 2022-07-28 thomas free(id);
751 7d8bcb99 2022-07-28 thomas err = open_blob(apath, afile, p->blob, repo);
752 7d8bcb99 2022-07-28 thomas *do_merge = err == NULL;
753 7d8bcb99 2022-07-28 thomas } else if (*p->blob != '\0') {
754 7d8bcb99 2022-07-28 thomas err = open_blob(apath, afile, p->blob, repo);
756 7d8bcb99 2022-07-28 thomas * ignore failures to open this blob, we might have
757 7d8bcb99 2022-07-28 thomas * parsed gibberish.
759 7d8bcb99 2022-07-28 thomas if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT) &&
760 7d8bcb99 2022-07-28 thomas err->code != GOT_ERR_NO_OBJ)
761 7d8bcb99 2022-07-28 thomas return err;
762 7d8bcb99 2022-07-28 thomas *do_merge = err == NULL;
763 7d8bcb99 2022-07-28 thomas err = NULL;
766 7d8bcb99 2022-07-28 thomas return err;
769 7d8bcb99 2022-07-28 thomas static const struct got_error *
770 0f76ab83 2022-06-23 thomas apply_patch(int *overlapcnt, struct got_worktree *worktree,
771 0f76ab83 2022-06-23 thomas struct got_repository *repo, struct got_fileindex *fileindex,
772 0f76ab83 2022-06-23 thomas const char *old, const char *new, struct got_patch *p, int nop,
773 7d8bcb99 2022-07-28 thomas int reverse, struct got_object_id *commit_id,
774 7d8bcb99 2022-07-28 thomas struct got_tree_object *tree, struct patch_args *pa,
775 f4602cbd 2022-07-23 thomas got_cancel_cb cancel_cb, void *cancel_arg)
777 0f76ab83 2022-06-23 thomas const struct got_error *err = NULL;
778 25a880e1 2022-07-03 thomas struct stat sb;
779 0f76ab83 2022-06-23 thomas int do_merge = 0, file_renamed = 0;
780 016bfe4b 2022-06-23 thomas char *oldlabel = NULL, *newlabel = NULL, *anclabel = NULL;
781 72f46891 2022-04-23 thomas char *oldpath = NULL, *newpath = NULL;
782 3b5e1554 2022-06-23 thomas char *tmppath = NULL, *template = NULL, *parent = NULL;
783 0f76ab83 2022-06-23 thomas char *apath = NULL, *mergepath = NULL;
784 0f76ab83 2022-06-23 thomas FILE *oldfile = NULL, *tmpfile = NULL, *afile = NULL, *mergefile = NULL;
785 0f76ab83 2022-06-23 thomas int outfd;
786 0f76ab83 2022-06-23 thomas const char *outpath;
787 da09d8ed 2022-03-22 thomas mode_t mode = GOT_DEFAULT_FILE_MODE;
789 0f76ab83 2022-06-23 thomas *overlapcnt = 0;
791 7d8bcb99 2022-07-28 thomas err = prepare_merge(&do_merge, &apath, &afile, worktree, repo, p,
792 7d8bcb99 2022-07-28 thomas commit_id, tree, old);
794 7d8bcb99 2022-07-28 thomas return err;
796 21948212 2022-07-27 thomas if (reverse && !do_merge)
797 21948212 2022-07-27 thomas reverse_patch(p);
799 72f46891 2022-04-23 thomas if (asprintf(&oldpath, "%s/%s", got_worktree_get_root_path(worktree),
800 72f46891 2022-04-23 thomas old) == -1) {
801 72f46891 2022-04-23 thomas err = got_error_from_errno("asprintf");
802 814624e7 2022-03-22 thomas goto done;
805 72f46891 2022-04-23 thomas if (asprintf(&newpath, "%s/%s", got_worktree_get_root_path(worktree),
806 72f46891 2022-04-23 thomas new) == -1) {
807 72f46891 2022-04-23 thomas err = got_error_from_errno("asprintf");
808 72f46891 2022-04-23 thomas goto done;
811 814624e7 2022-03-22 thomas file_renamed = strcmp(oldpath, newpath);
813 bb2ad8ff 2022-03-13 thomas if (asprintf(&template, "%s/got-patch",
814 bb2ad8ff 2022-03-13 thomas got_worktree_get_root_path(worktree)) == -1) {
815 bb2ad8ff 2022-03-13 thomas err = got_error_from_errno(template);
816 069bbb86 2022-03-07 thomas goto done;
819 25a880e1 2022-07-03 thomas if (p->old != NULL) {
820 25a880e1 2022-07-03 thomas if ((oldfile = fopen(oldpath, "r")) == NULL) {
821 25a880e1 2022-07-03 thomas err = got_error_from_errno2("open", oldpath);
822 25a880e1 2022-07-03 thomas goto done;
824 25a880e1 2022-07-03 thomas if (fstat(fileno(oldfile), &sb) == -1) {
825 25a880e1 2022-07-03 thomas err = got_error_from_errno2("fstat", oldpath);
826 25a880e1 2022-07-03 thomas goto done;
828 25a880e1 2022-07-03 thomas mode = sb.st_mode;
831 0f76ab83 2022-06-23 thomas err = got_opentemp_named(&tmppath, &tmpfile, template);
833 bb2ad8ff 2022-03-13 thomas goto done;
834 0f76ab83 2022-06-23 thomas outpath = tmppath;
835 0f76ab83 2022-06-23 thomas outfd = fileno(tmpfile);
836 25a880e1 2022-07-03 thomas err = patch_file(p, afile != NULL ? afile : oldfile, tmpfile);
838 bb2ad8ff 2022-03-13 thomas goto done;
840 0f76ab83 2022-06-23 thomas if (do_merge) {
841 8afec5d5 2022-07-01 thomas const char *type, *id;
843 0f76ab83 2022-06-23 thomas if (fseeko(afile, 0, SEEK_SET) == -1 ||
844 0f76ab83 2022-06-23 thomas fseeko(oldfile, 0, SEEK_SET) == -1 ||
845 0f76ab83 2022-06-23 thomas fseeko(tmpfile, 0, SEEK_SET) == -1) {
846 0f76ab83 2022-06-23 thomas err = got_error_from_errno("fseeko");
847 0f76ab83 2022-06-23 thomas goto done;
850 0f76ab83 2022-06-23 thomas if (asprintf(&oldlabel, "--- %s", p->old) == -1) {
851 0f76ab83 2022-06-23 thomas err = got_error_from_errno("asprintf");
852 0f76ab83 2022-06-23 thomas oldlabel = NULL;
853 0f76ab83 2022-06-23 thomas goto done;
856 0f76ab83 2022-06-23 thomas if (asprintf(&newlabel, "+++ %s", p->new) == -1) {
857 0f76ab83 2022-06-23 thomas err = got_error_from_errno("asprintf");
858 0f76ab83 2022-06-23 thomas newlabel = NULL;
859 0f76ab83 2022-06-23 thomas goto done;
862 8afec5d5 2022-07-01 thomas if (*p->cid != '\0') {
863 8afec5d5 2022-07-01 thomas type = "commit";
864 8afec5d5 2022-07-01 thomas id = p->cid;
866 8afec5d5 2022-07-01 thomas type = "blob";
867 8afec5d5 2022-07-01 thomas id = p->blob;
870 8afec5d5 2022-07-01 thomas if (asprintf(&anclabel, "%s %s", type, id) == -1) {
871 016bfe4b 2022-06-23 thomas err = got_error_from_errno("asprintf");
872 016bfe4b 2022-06-23 thomas anclabel = NULL;
873 016bfe4b 2022-06-23 thomas goto done;
876 f4602cbd 2022-07-23 thomas if (reverse) {
880 f4602cbd 2022-07-23 thomas s = anclabel;
881 f4602cbd 2022-07-23 thomas anclabel = newlabel;
882 f4602cbd 2022-07-23 thomas newlabel = s;
884 f4602cbd 2022-07-23 thomas t = afile;
885 f4602cbd 2022-07-23 thomas afile = tmpfile;
886 f4602cbd 2022-07-23 thomas tmpfile = t;
889 0f76ab83 2022-06-23 thomas err = got_opentemp_named(&mergepath, &mergefile, template);
891 0f76ab83 2022-06-23 thomas goto done;
892 0f76ab83 2022-06-23 thomas outpath = mergepath;
893 0f76ab83 2022-06-23 thomas outfd = fileno(mergefile);
895 0f76ab83 2022-06-23 thomas err = got_merge_diff3(overlapcnt, outfd, tmpfile, afile,
896 016bfe4b 2022-06-23 thomas oldfile, oldlabel, anclabel, newlabel,
897 0f76ab83 2022-06-23 thomas GOT_DIFF_ALGORITHM_PATIENCE);
899 0f76ab83 2022-06-23 thomas goto done;
903 eaf99875 2022-03-22 thomas goto done;
905 eaf99875 2022-03-22 thomas if (p->old != NULL && p->new == NULL) {
906 5e22b737 2022-05-31 thomas err = got_worktree_patch_schedule_rm(old, repo, worktree,
907 5e22b737 2022-05-31 thomas fileindex, patch_delete, pa);
908 eaf99875 2022-03-22 thomas goto done;
911 0f76ab83 2022-06-23 thomas if (fchmod(outfd, mode) == -1) {
912 8260acc8 2022-05-01 thomas err = got_error_from_errno2("chmod", tmppath);
913 da09d8ed 2022-03-22 thomas goto done;
916 0f76ab83 2022-06-23 thomas if (rename(outpath, newpath) == -1) {
917 e0c1f81c 2022-03-22 thomas if (errno != ENOENT) {
918 0f76ab83 2022-06-23 thomas err = got_error_from_errno3("rename", outpath,
919 e0c1f81c 2022-03-22 thomas newpath);
920 e0c1f81c 2022-03-22 thomas goto done;
923 e0c1f81c 2022-03-22 thomas err = got_path_dirname(&parent, newpath);
924 e0c1f81c 2022-03-22 thomas if (err != NULL)
925 e0c1f81c 2022-03-22 thomas goto done;
926 e0c1f81c 2022-03-22 thomas err = got_path_mkdir(parent);
927 e0c1f81c 2022-03-22 thomas if (err != NULL)
928 e0c1f81c 2022-03-22 thomas goto done;
929 0f76ab83 2022-06-23 thomas if (rename(outpath, newpath) == -1) {
930 0f76ab83 2022-06-23 thomas err = got_error_from_errno3("rename", outpath,
931 e0c1f81c 2022-03-22 thomas newpath);
932 e0c1f81c 2022-03-22 thomas goto done;
936 bb2ad8ff 2022-03-13 thomas if (file_renamed) {
937 5e22b737 2022-05-31 thomas err = got_worktree_patch_schedule_rm(old, repo, worktree,
938 5e22b737 2022-05-31 thomas fileindex, patch_delete, pa);
939 bb2ad8ff 2022-03-13 thomas if (err == NULL)
940 5e22b737 2022-05-31 thomas err = got_worktree_patch_schedule_add(new, repo,
941 5e22b737 2022-05-31 thomas worktree, fileindex, patch_add,
944 814624e7 2022-03-22 thomas unlink(newpath);
945 814624e7 2022-03-22 thomas } else if (p->old == NULL) {
946 5e22b737 2022-05-31 thomas err = got_worktree_patch_schedule_add(new, repo, worktree,
947 5e22b737 2022-05-31 thomas fileindex, patch_add, pa);
949 814624e7 2022-03-22 thomas unlink(newpath);
950 0f76ab83 2022-06-23 thomas } else if (*overlapcnt != 0)
951 0f76ab83 2022-06-23 thomas err = report_progress(pa, old, new, GOT_STATUS_CONFLICT, NULL);
952 762b8e82 2022-06-23 thomas else if (do_merge)
953 762b8e82 2022-06-23 thomas err = report_progress(pa, old, new, GOT_STATUS_MERGE, NULL);
955 72f46891 2022-04-23 thomas err = report_progress(pa, old, new, GOT_STATUS_MODIFY, NULL);
958 e0c1f81c 2022-03-22 thomas free(parent);
959 94af5a06 2022-03-08 thomas free(template);
961 069bbb86 2022-03-07 thomas if (tmppath != NULL)
962 069bbb86 2022-03-07 thomas unlink(tmppath);
963 0f76ab83 2022-06-23 thomas if (tmpfile != NULL && fclose(tmpfile) == EOF && err == NULL)
964 04cdf6ac 2022-06-23 thomas err = got_error_from_errno("fclose");
965 069bbb86 2022-03-07 thomas free(tmppath);
967 72f46891 2022-04-23 thomas free(oldpath);
968 2249fadd 2022-06-23 thomas if (oldfile != NULL && fclose(oldfile) == EOF && err == NULL)
969 2249fadd 2022-06-23 thomas err = got_error_from_errno("fclose");
971 0f76ab83 2022-06-23 thomas if (apath != NULL)
972 0f76ab83 2022-06-23 thomas unlink(apath);
973 0f76ab83 2022-06-23 thomas if (afile != NULL && fclose(afile) == EOF && err == NULL)
974 0f76ab83 2022-06-23 thomas err = got_error_from_errno("fclose");
975 0f76ab83 2022-06-23 thomas free(apath);
977 0f76ab83 2022-06-23 thomas if (mergepath != NULL)
978 0f76ab83 2022-06-23 thomas unlink(mergepath);
979 0f76ab83 2022-06-23 thomas if (mergefile != NULL && fclose(mergefile) == EOF && err == NULL)
980 0f76ab83 2022-06-23 thomas err = got_error_from_errno("fclose");
981 0f76ab83 2022-06-23 thomas free(mergepath);
983 72f46891 2022-04-23 thomas free(newpath);
984 0f76ab83 2022-06-23 thomas free(oldlabel);
985 0f76ab83 2022-06-23 thomas free(newlabel);
986 016bfe4b 2022-06-23 thomas free(anclabel);
987 069bbb86 2022-03-07 thomas return err;
990 069bbb86 2022-03-07 thomas const struct got_error *
991 069bbb86 2022-03-07 thomas got_patch(int fd, struct got_worktree *worktree, struct got_repository *repo,
992 7d8bcb99 2022-07-28 thomas int nop, int strip, int reverse, struct got_object_id *commit_id,
993 7d8bcb99 2022-07-28 thomas got_patch_progress_cb progress_cb, void *progress_arg,
994 7d8bcb99 2022-07-28 thomas got_cancel_cb cancel_cb, void *cancel_arg)
996 36832a8e 2022-05-31 thomas const struct got_error *err = NULL, *complete_err = NULL;
997 814624e7 2022-03-22 thomas struct got_fileindex *fileindex = NULL;
998 7d8bcb99 2022-07-28 thomas struct got_commit_object *commit = NULL;
999 7d8bcb99 2022-07-28 thomas struct got_tree_object *tree = NULL;
1000 5e22b737 2022-05-31 thomas char *fileindex_path = NULL;
1001 49114f01 2022-03-22 thomas char *oldpath, *newpath;
1002 069bbb86 2022-03-07 thomas struct imsgbuf *ibuf;
1003 069bbb86 2022-03-07 thomas int imsg_fds[2] = {-1, -1};
1004 0f76ab83 2022-06-23 thomas int overlapcnt, done = 0, failed = 0;
1005 069bbb86 2022-03-07 thomas pid_t pid;
1007 069bbb86 2022-03-07 thomas ibuf = calloc(1, sizeof(*ibuf));
1008 069bbb86 2022-03-07 thomas if (ibuf == NULL) {
1009 069bbb86 2022-03-07 thomas err = got_error_from_errno("calloc");
1010 069bbb86 2022-03-07 thomas goto done;
1013 069bbb86 2022-03-07 thomas if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1) {
1014 069bbb86 2022-03-07 thomas err = got_error_from_errno("socketpair");
1015 069bbb86 2022-03-07 thomas goto done;
1018 069bbb86 2022-03-07 thomas pid = fork();
1019 069bbb86 2022-03-07 thomas if (pid == -1) {
1020 069bbb86 2022-03-07 thomas err = got_error_from_errno("fork");
1021 069bbb86 2022-03-07 thomas goto done;
1022 069bbb86 2022-03-07 thomas } else if (pid == 0) {
1023 069bbb86 2022-03-07 thomas got_privsep_exec_child(imsg_fds, GOT_PATH_PROG_READ_PATCH,
1025 069bbb86 2022-03-07 thomas /* not reached */
1028 069bbb86 2022-03-07 thomas if (close(imsg_fds[1]) == -1) {
1029 069bbb86 2022-03-07 thomas err = got_error_from_errno("close");
1030 069bbb86 2022-03-07 thomas goto done;
1032 069bbb86 2022-03-07 thomas imsg_fds[1] = -1;
1033 069bbb86 2022-03-07 thomas imsg_init(ibuf, imsg_fds[0]);
1035 069bbb86 2022-03-07 thomas err = send_patch(ibuf, fd);
1036 069bbb86 2022-03-07 thomas fd = -1;
1037 069bbb86 2022-03-07 thomas if (err)
1038 069bbb86 2022-03-07 thomas goto done;
1040 5e22b737 2022-05-31 thomas err = got_worktree_patch_prepare(&fileindex, &fileindex_path,
1041 5e22b737 2022-05-31 thomas worktree);
1042 814624e7 2022-03-22 thomas if (err)
1043 814624e7 2022-03-22 thomas goto done;
1045 7d8bcb99 2022-07-28 thomas if (commit_id) {
1046 7d8bcb99 2022-07-28 thomas err = got_object_open_as_commit(&commit, repo, commit_id);
1047 7d8bcb99 2022-07-28 thomas if (err)
1048 7d8bcb99 2022-07-28 thomas goto done;
1050 7d8bcb99 2022-07-28 thomas err = got_object_open_as_tree(&tree, repo, commit->tree_id);
1051 7d8bcb99 2022-07-28 thomas if (err)
1052 7d8bcb99 2022-07-28 thomas goto done;
1055 069bbb86 2022-03-07 thomas while (!done && err == NULL) {
1056 069bbb86 2022-03-07 thomas struct got_patch p;
1057 49114f01 2022-03-22 thomas struct patch_args pa;
1059 49114f01 2022-03-22 thomas pa.progress_cb = progress_cb;
1060 49114f01 2022-03-22 thomas pa.progress_arg = progress_arg;
1061 49114f01 2022-03-22 thomas pa.head = &p.head;
1063 d9db2ff9 2022-04-16 thomas err = recv_patch(ibuf, &done, &p, strip);
1064 069bbb86 2022-03-07 thomas if (err || done)
1067 814624e7 2022-03-22 thomas err = got_worktree_patch_check_path(p.old, p.new, &oldpath,
1068 814624e7 2022-03-22 thomas &newpath, worktree, repo, fileindex);
1069 814624e7 2022-03-22 thomas if (err == NULL)
1070 0f76ab83 2022-06-23 thomas err = apply_patch(&overlapcnt, worktree, repo,
1071 f4602cbd 2022-07-23 thomas fileindex, oldpath, newpath, &p, nop, reverse,
1072 7d8bcb99 2022-07-28 thomas commit_id, tree, &pa, cancel_cb, cancel_arg);
1073 49114f01 2022-03-22 thomas if (err != NULL) {
1074 49114f01 2022-03-22 thomas failed = 1;
1075 49114f01 2022-03-22 thomas /* recoverable errors */
1076 49114f01 2022-03-22 thomas if (err->code == GOT_ERR_FILE_STATUS ||
1077 49114f01 2022-03-22 thomas (err->code == GOT_ERR_ERRNO && errno == ENOENT))
1078 49114f01 2022-03-22 thomas err = report_progress(&pa, p.old, p.new,
1079 49114f01 2022-03-22 thomas GOT_STATUS_CANNOT_UPDATE, err);
1080 49114f01 2022-03-22 thomas else if (err->code == GOT_ERR_HUNK_FAILED)
1081 49114f01 2022-03-22 thomas err = report_progress(&pa, p.old, p.new,
1082 49114f01 2022-03-22 thomas GOT_STATUS_CANNOT_UPDATE, NULL);
1084 0f76ab83 2022-06-23 thomas if (overlapcnt != 0)
1085 0f76ab83 2022-06-23 thomas failed = 1;
1087 49114f01 2022-03-22 thomas free(oldpath);
1088 49114f01 2022-03-22 thomas free(newpath);
1089 069bbb86 2022-03-07 thomas patch_free(&p);
1091 069bbb86 2022-03-07 thomas if (err)
1096 36832a8e 2022-05-31 thomas if (fileindex != NULL)
1097 36832a8e 2022-05-31 thomas complete_err = got_worktree_patch_complete(fileindex,
1098 36832a8e 2022-05-31 thomas fileindex_path);
1099 5e22b737 2022-05-31 thomas if (complete_err && err == NULL)
1100 5e22b737 2022-05-31 thomas err = complete_err;
1101 36832a8e 2022-05-31 thomas free(fileindex_path);
1102 7d8bcb99 2022-07-28 thomas if (tree)
1103 7d8bcb99 2022-07-28 thomas got_object_tree_close(tree);
1104 7d8bcb99 2022-07-28 thomas if (commit)
1105 7d8bcb99 2022-07-28 thomas got_object_commit_close(commit);
1106 069bbb86 2022-03-07 thomas if (fd != -1 && close(fd) == -1 && err == NULL)
1107 069bbb86 2022-03-07 thomas err = got_error_from_errno("close");
1108 069bbb86 2022-03-07 thomas if (ibuf != NULL)
1109 069bbb86 2022-03-07 thomas imsg_clear(ibuf);
1110 069bbb86 2022-03-07 thomas if (imsg_fds[0] != -1 && close(imsg_fds[0]) == -1 && err == NULL)
1111 069bbb86 2022-03-07 thomas err = got_error_from_errno("close");
1112 069bbb86 2022-03-07 thomas if (imsg_fds[1] != -1 && close(imsg_fds[1]) == -1 && err == NULL)
1113 069bbb86 2022-03-07 thomas err = got_error_from_errno("close");
1114 49114f01 2022-03-22 thomas if (err == NULL && failed)
1115 49114f01 2022-03-22 thomas err = got_error(GOT_ERR_PATCH_FAILED);
1116 069bbb86 2022-03-07 thomas return err;
