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 588a8092 2023-02-23 thomas #include <sha2.h>
33 069bbb86 2022-03-07 thomas #include <stdint.h>
34 069bbb86 2022-03-07 thomas #include <stdio.h>
35 069bbb86 2022-03-07 thomas #include <stdlib.h>
36 069bbb86 2022-03-07 thomas #include <string.h>
37 069bbb86 2022-03-07 thomas #include <unistd.h>
39 069bbb86 2022-03-07 thomas #include "got_error.h"
40 069bbb86 2022-03-07 thomas #include "got_object.h"
41 069bbb86 2022-03-07 thomas #include "got_path.h"
42 069bbb86 2022-03-07 thomas #include "got_reference.h"
43 069bbb86 2022-03-07 thomas #include "got_cancel.h"
44 069bbb86 2022-03-07 thomas #include "got_worktree.h"
45 0f76ab83 2022-06-23 thomas #include "got_repository.h"
46 069bbb86 2022-03-07 thomas #include "got_opentemp.h"
47 069bbb86 2022-03-07 thomas #include "got_patch.h"
48 25ec7006 2022-07-01 thomas #include "got_diff.h"
50 069bbb86 2022-03-07 thomas #include "got_lib_delta.h"
51 0f76ab83 2022-06-23 thomas #include "got_lib_diff.h"
52 069bbb86 2022-03-07 thomas #include "got_lib_object.h"
53 069bbb86 2022-03-07 thomas #include "got_lib_privsep.h"
54 be288a59 2023-02-23 thomas #include "got_lib_hash.h"
56 069bbb86 2022-03-07 thomas #define MIN(a, b) ((a) < (b) ? (a) : (b))
58 069bbb86 2022-03-07 thomas struct got_patch_hunk {
59 069bbb86 2022-03-07 thomas STAILQ_ENTRY(got_patch_hunk) entries;
60 49114f01 2022-03-22 thomas const struct got_error *err;
61 bb90ca7b 2022-07-03 thomas int ws_mangled;
62 8ebb3daa 2022-06-23 thomas int offset;
63 656c2baa 2022-04-23 thomas int old_nonl;
64 656c2baa 2022-04-23 thomas int new_nonl;
65 8ebb3daa 2022-06-23 thomas int old_from;
66 8ebb3daa 2022-06-23 thomas int old_lines;
67 8ebb3daa 2022-06-23 thomas int new_from;
68 8ebb3daa 2022-06-23 thomas int new_lines;
69 069bbb86 2022-03-07 thomas size_t len;
70 069bbb86 2022-03-07 thomas size_t cap;
71 069bbb86 2022-03-07 thomas char **lines;
74 49114f01 2022-03-22 thomas STAILQ_HEAD(got_patch_hunk_head, got_patch_hunk);
75 069bbb86 2022-03-07 thomas struct got_patch {
77 069bbb86 2022-03-07 thomas char *old;
78 069bbb86 2022-03-07 thomas char *new;
79 016bfe4b 2022-06-23 thomas char cid[41];
80 0f76ab83 2022-06-23 thomas char blob[41];
81 49114f01 2022-03-22 thomas struct got_patch_hunk_head head;
84 c71da4f7 2022-03-22 thomas struct patch_args {
85 c71da4f7 2022-03-22 thomas got_patch_progress_cb progress_cb;
86 c71da4f7 2022-03-22 thomas void *progress_arg;
87 49114f01 2022-03-22 thomas struct got_patch_hunk_head *head;
90 a2c162eb 2022-10-30 thomas static mode_t
91 a2c162eb 2022-10-30 thomas apply_umask(mode_t mode)
93 a2c162eb 2022-10-30 thomas mode_t um;
95 a2c162eb 2022-10-30 thomas um = umask(000);
96 a2c162eb 2022-10-30 thomas umask(um);
97 a2c162eb 2022-10-30 thomas return mode & ~um;
100 069bbb86 2022-03-07 thomas static const struct got_error *
101 069bbb86 2022-03-07 thomas send_patch(struct imsgbuf *ibuf, int fd)
103 069bbb86 2022-03-07 thomas const struct got_error *err = NULL;
105 069bbb86 2022-03-07 thomas if (imsg_compose(ibuf, GOT_IMSG_PATCH_FILE, 0, 0, fd,
106 069bbb86 2022-03-07 thomas NULL, 0) == -1) {
107 069bbb86 2022-03-07 thomas err = got_error_from_errno(
108 069bbb86 2022-03-07 thomas "imsg_compose GOT_IMSG_PATCH_FILE");
109 069bbb86 2022-03-07 thomas close(fd);
110 069bbb86 2022-03-07 thomas return err;
113 dab315a5 2022-07-07 thomas return got_privsep_flush_imsg(ibuf);
116 069bbb86 2022-03-07 thomas static void
117 069bbb86 2022-03-07 thomas patch_free(struct got_patch *p)
119 069bbb86 2022-03-07 thomas struct got_patch_hunk *h;
120 069bbb86 2022-03-07 thomas size_t i;
122 069bbb86 2022-03-07 thomas while (!STAILQ_EMPTY(&p->head)) {
123 069bbb86 2022-03-07 thomas h = STAILQ_FIRST(&p->head);
124 069bbb86 2022-03-07 thomas STAILQ_REMOVE_HEAD(&p->head, entries);
126 069bbb86 2022-03-07 thomas for (i = 0; i < h->len; ++i)
127 069bbb86 2022-03-07 thomas free(h->lines[i]);
128 069bbb86 2022-03-07 thomas free(h->lines);
132 069bbb86 2022-03-07 thomas free(p->new);
133 069bbb86 2022-03-07 thomas free(p->old);
135 9880a1dd 2022-06-23 thomas memset(p, 0, sizeof(*p));
136 9880a1dd 2022-06-23 thomas STAILQ_INIT(&p->head);
139 069bbb86 2022-03-07 thomas static const struct got_error *
140 069bbb86 2022-03-07 thomas pushline(struct got_patch_hunk *h, const char *line)
143 069bbb86 2022-03-07 thomas size_t newcap;
145 069bbb86 2022-03-07 thomas if (h->len == h->cap) {
146 069bbb86 2022-03-07 thomas if ((newcap = h->cap * 1.5) == 0)
147 069bbb86 2022-03-07 thomas newcap = 16;
148 069bbb86 2022-03-07 thomas t = recallocarray(h->lines, h->cap, newcap,
149 069bbb86 2022-03-07 thomas sizeof(h->lines[0]));
150 069bbb86 2022-03-07 thomas if (t == NULL)
151 069bbb86 2022-03-07 thomas return got_error_from_errno("recallocarray");
152 069bbb86 2022-03-07 thomas h->lines = t;
153 069bbb86 2022-03-07 thomas h->cap = newcap;
156 069bbb86 2022-03-07 thomas if ((t = strdup(line)) == NULL)
157 069bbb86 2022-03-07 thomas return got_error_from_errno("strdup");
159 069bbb86 2022-03-07 thomas h->lines[h->len++] = t;
160 069bbb86 2022-03-07 thomas return NULL;
163 069bbb86 2022-03-07 thomas static const struct got_error *
164 d9db2ff9 2022-04-16 thomas recv_patch(struct imsgbuf *ibuf, int *done, struct got_patch *p, int strip)
166 069bbb86 2022-03-07 thomas const struct got_error *err = NULL;
167 069bbb86 2022-03-07 thomas struct imsg imsg;
168 069bbb86 2022-03-07 thomas struct got_imsg_patch_hunk hdr;
169 069bbb86 2022-03-07 thomas struct got_imsg_patch patch;
170 069bbb86 2022-03-07 thomas struct got_patch_hunk *h = NULL;
171 069bbb86 2022-03-07 thomas size_t datalen;
172 656c2baa 2022-04-23 thomas int lastmode = -1;
174 069bbb86 2022-03-07 thomas memset(p, 0, sizeof(*p));
175 069bbb86 2022-03-07 thomas STAILQ_INIT(&p->head);
177 069bbb86 2022-03-07 thomas err = got_privsep_recv_imsg(&imsg, ibuf, 0);
179 069bbb86 2022-03-07 thomas return err;
180 069bbb86 2022-03-07 thomas if (imsg.hdr.type == GOT_IMSG_PATCH_EOF) {
181 069bbb86 2022-03-07 thomas *done = 1;
182 069bbb86 2022-03-07 thomas goto done;
184 069bbb86 2022-03-07 thomas if (imsg.hdr.type != GOT_IMSG_PATCH) {
185 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PRIVSEP_MSG);
186 069bbb86 2022-03-07 thomas goto done;
188 069bbb86 2022-03-07 thomas datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
189 069bbb86 2022-03-07 thomas if (datalen != sizeof(patch)) {
190 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PRIVSEP_LEN);
191 069bbb86 2022-03-07 thomas goto done;
193 069bbb86 2022-03-07 thomas memcpy(&patch, imsg.data, sizeof(patch));
195 ca357dd9 2022-06-23 thomas if (patch.old[sizeof(patch.old)-1] != '\0' ||
196 0f76ab83 2022-06-23 thomas patch.new[sizeof(patch.new)-1] != '\0' ||
197 016bfe4b 2022-06-23 thomas patch.cid[sizeof(patch.cid)-1] != '\0' ||
198 0f76ab83 2022-06-23 thomas patch.blob[sizeof(patch.blob)-1] != '\0') {
199 ca357dd9 2022-06-23 thomas err = got_error(GOT_ERR_PRIVSEP_LEN);
200 ca357dd9 2022-06-23 thomas goto done;
203 8afec5d5 2022-07-01 thomas if (*patch.cid != '\0')
204 016bfe4b 2022-06-23 thomas strlcpy(p->cid, patch.cid, sizeof(p->cid));
206 8afec5d5 2022-07-01 thomas if (*patch.blob != '\0')
207 016bfe4b 2022-06-23 thomas strlcpy(p->blob, patch.blob, sizeof(p->blob));
209 37e766f4 2022-09-21 thomas p->xbit = patch.xbit;
211 d9db2ff9 2022-04-16 thomas /* automatically set strip=1 for git-style diffs */
212 d9db2ff9 2022-04-16 thomas if (strip == -1 && patch.git &&
213 d9db2ff9 2022-04-16 thomas (*patch.old == '\0' || !strncmp(patch.old, "a/", 2)) &&
214 d9db2ff9 2022-04-16 thomas (*patch.new == '\0' || !strncmp(patch.new, "b/", 2)))
215 d9db2ff9 2022-04-16 thomas strip = 1;
217 d9db2ff9 2022-04-16 thomas /* prefer the new name if not /dev/null for not git-style diffs */
218 d9db2ff9 2022-04-16 thomas if (!patch.git && *patch.new != '\0' && *patch.old != '\0') {
219 d9db2ff9 2022-04-16 thomas err = got_path_strip(&p->old, patch.new, strip);
221 d9db2ff9 2022-04-16 thomas goto done;
222 d9db2ff9 2022-04-16 thomas } else if (*patch.old != '\0') {
223 d9db2ff9 2022-04-16 thomas err = got_path_strip(&p->old, patch.old, strip);
225 d9db2ff9 2022-04-16 thomas goto done;
228 d9db2ff9 2022-04-16 thomas if (*patch.new != '\0') {
229 d9db2ff9 2022-04-16 thomas err = got_path_strip(&p->new, patch.new, strip);
231 d9db2ff9 2022-04-16 thomas goto done;
234 64c9e565 2022-03-13 thomas if (p->old == NULL && p->new == NULL) {
235 64c9e565 2022-03-13 thomas err = got_error(GOT_ERR_PATCH_MALFORMED);
236 64c9e565 2022-03-13 thomas goto done;
239 069bbb86 2022-03-07 thomas imsg_free(&imsg);
241 069bbb86 2022-03-07 thomas for (;;) {
244 069bbb86 2022-03-07 thomas err = got_privsep_recv_imsg(&imsg, ibuf, 0);
245 9880a1dd 2022-06-23 thomas if (err) {
246 9880a1dd 2022-06-23 thomas patch_free(p);
247 069bbb86 2022-03-07 thomas return err;
250 047c926f 2022-06-23 thomas datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
251 069bbb86 2022-03-07 thomas switch (imsg.hdr.type) {
252 069bbb86 2022-03-07 thomas case GOT_IMSG_PATCH_DONE:
253 88c260f4 2022-05-14 thomas if (h != NULL && h->len == 0)
254 88c260f4 2022-05-14 thomas err = got_error(GOT_ERR_PATCH_MALFORMED);
255 069bbb86 2022-03-07 thomas goto done;
256 069bbb86 2022-03-07 thomas case GOT_IMSG_PATCH_HUNK:
257 88c260f4 2022-05-14 thomas if (h != NULL &&
258 88c260f4 2022-05-14 thomas (h->len == 0 || h->old_nonl || h->new_nonl)) {
259 ff7f34d3 2022-03-22 thomas err = got_error(GOT_ERR_PATCH_MALFORMED);
260 ff7f34d3 2022-03-22 thomas goto done;
262 656c2baa 2022-04-23 thomas lastmode = -1;
263 069bbb86 2022-03-07 thomas if (datalen != sizeof(hdr)) {
264 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PRIVSEP_LEN);
265 069bbb86 2022-03-07 thomas goto done;
267 069bbb86 2022-03-07 thomas memcpy(&hdr, imsg.data, sizeof(hdr));
268 06227823 2022-06-23 thomas if (hdr.oldfrom < 0 || hdr.newfrom < 0) {
269 06227823 2022-06-23 thomas err = got_error(GOT_ERR_PRIVSEP_LEN);
270 eb35d814 2022-06-23 thomas goto done;
272 06227823 2022-06-23 thomas if ((h = calloc(1, sizeof(*h))) == NULL) {
273 06227823 2022-06-23 thomas err = got_error_from_errno("calloc");
274 069bbb86 2022-03-07 thomas goto done;
276 069bbb86 2022-03-07 thomas h->old_from = hdr.oldfrom;
277 069bbb86 2022-03-07 thomas h->old_lines = hdr.oldlines;
278 069bbb86 2022-03-07 thomas h->new_from = hdr.newfrom;
279 069bbb86 2022-03-07 thomas h->new_lines = hdr.newlines;
280 069bbb86 2022-03-07 thomas STAILQ_INSERT_TAIL(&p->head, h, entries);
282 069bbb86 2022-03-07 thomas case GOT_IMSG_PATCH_LINE:
283 069bbb86 2022-03-07 thomas if (h == NULL) {
284 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PRIVSEP_MSG);
285 069bbb86 2022-03-07 thomas goto done;
287 069bbb86 2022-03-07 thomas t = imsg.data;
288 ff7f34d3 2022-03-22 thomas /* at least one char */
289 069bbb86 2022-03-07 thomas if (datalen < 2 || t[datalen-1] != '\0') {
290 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PRIVSEP_MSG);
291 069bbb86 2022-03-07 thomas goto done;
293 ff7f34d3 2022-03-22 thomas if (*t != ' ' && *t != '-' && *t != '+' &&
294 ff7f34d3 2022-03-22 thomas *t != '\\') {
295 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PRIVSEP_MSG);
296 069bbb86 2022-03-07 thomas goto done;
299 656c2baa 2022-04-23 thomas if (*t != '\\')
300 ff7f34d3 2022-03-22 thomas err = pushline(h, t);
301 656c2baa 2022-04-23 thomas else if (lastmode == '-')
302 656c2baa 2022-04-23 thomas h->old_nonl = 1;
303 656c2baa 2022-04-23 thomas else if (lastmode == '+')
304 656c2baa 2022-04-23 thomas h->new_nonl = 1;
306 656c2baa 2022-04-23 thomas err = got_error(GOT_ERR_PATCH_MALFORMED);
309 069bbb86 2022-03-07 thomas goto done;
311 656c2baa 2022-04-23 thomas lastmode = *t;
314 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PRIVSEP_MSG);
315 069bbb86 2022-03-07 thomas goto done;
318 069bbb86 2022-03-07 thomas imsg_free(&imsg);
323 9880a1dd 2022-06-23 thomas patch_free(p);
325 069bbb86 2022-03-07 thomas imsg_free(&imsg);
326 069bbb86 2022-03-07 thomas return err;
329 f4602cbd 2022-07-23 thomas static void
330 f4602cbd 2022-07-23 thomas reverse_patch(struct got_patch *p)
332 f4602cbd 2022-07-23 thomas struct got_patch_hunk *h;
333 f4602cbd 2022-07-23 thomas size_t i;
336 f4602cbd 2022-07-23 thomas STAILQ_FOREACH(h, &p->head, entries) {
337 f4602cbd 2022-07-23 thomas tmp = h->old_from;
338 f4602cbd 2022-07-23 thomas h->old_from = h->new_from;
339 f4602cbd 2022-07-23 thomas h->new_from = tmp;
341 f4602cbd 2022-07-23 thomas tmp = h->old_lines;
342 f4602cbd 2022-07-23 thomas h->old_lines = h->new_lines;
343 f4602cbd 2022-07-23 thomas h->new_lines = tmp;
345 f4602cbd 2022-07-23 thomas tmp = h->old_nonl;
346 f4602cbd 2022-07-23 thomas h->old_nonl = h->new_nonl;
347 f4602cbd 2022-07-23 thomas h->new_nonl = tmp;
349 f4602cbd 2022-07-23 thomas for (i = 0; i < h->len; ++i) {
350 f4602cbd 2022-07-23 thomas if (*h->lines[i] == '+')
351 f4602cbd 2022-07-23 thomas *h->lines[i] = '-';
352 f4602cbd 2022-07-23 thomas else if (*h->lines[i] == '-')
353 f4602cbd 2022-07-23 thomas *h->lines[i] = '+';
359 069bbb86 2022-03-07 thomas * Copy data from orig starting at copypos until pos into tmp.
360 069bbb86 2022-03-07 thomas * If pos is -1, copy until EOF.
362 069bbb86 2022-03-07 thomas static const struct got_error *
363 069bbb86 2022-03-07 thomas copy(FILE *tmp, FILE *orig, off_t copypos, off_t pos)
365 069bbb86 2022-03-07 thomas char buf[BUFSIZ];
366 069bbb86 2022-03-07 thomas size_t len, r, w;
368 bafaf650 2022-05-14 thomas if (fseeko(orig, copypos, SEEK_SET) == -1)
369 bafaf650 2022-05-14 thomas return got_error_from_errno("fseeko");
371 069bbb86 2022-03-07 thomas while (pos == -1 || copypos < pos) {
372 069bbb86 2022-03-07 thomas len = sizeof(buf);
373 069bbb86 2022-03-07 thomas if (pos > 0)
374 069bbb86 2022-03-07 thomas len = MIN(len, (size_t)pos - copypos);
375 069bbb86 2022-03-07 thomas r = fread(buf, 1, len, orig);
376 069bbb86 2022-03-07 thomas if (r != len && ferror(orig))
377 069bbb86 2022-03-07 thomas return got_error_from_errno("fread");
378 069bbb86 2022-03-07 thomas w = fwrite(buf, 1, r, tmp);
379 069bbb86 2022-03-07 thomas if (w != r)
380 069bbb86 2022-03-07 thomas return got_error_from_errno("fwrite");
381 069bbb86 2022-03-07 thomas copypos += len;
382 069bbb86 2022-03-07 thomas if (r != len && feof(orig)) {
383 069bbb86 2022-03-07 thomas if (pos == -1)
384 069bbb86 2022-03-07 thomas return NULL;
385 49114f01 2022-03-22 thomas return got_error(GOT_ERR_HUNK_FAILED);
388 069bbb86 2022-03-07 thomas return NULL;
391 4f34ed97 2022-08-06 thomas static int linecmp(const char *, const char *, int *);
393 069bbb86 2022-03-07 thomas static const struct got_error *
394 8ebb3daa 2022-06-23 thomas locate_hunk(FILE *orig, struct got_patch_hunk *h, off_t *pos, int *lineno)
396 069bbb86 2022-03-07 thomas const struct got_error *err = NULL;
397 069bbb86 2022-03-07 thomas char *line = NULL;
398 069bbb86 2022-03-07 thomas char mode = *h->lines[0];
399 069bbb86 2022-03-07 thomas size_t linesize = 0;
400 069bbb86 2022-03-07 thomas ssize_t linelen;
401 069bbb86 2022-03-07 thomas off_t match = -1;
402 4f34ed97 2022-08-06 thomas int mangled = 0, match_lineno = -1;
404 069bbb86 2022-03-07 thomas for (;;) {
405 069bbb86 2022-03-07 thomas linelen = getline(&line, &linesize, orig);
406 069bbb86 2022-03-07 thomas if (linelen == -1) {
407 069bbb86 2022-03-07 thomas if (ferror(orig))
408 069bbb86 2022-03-07 thomas err = got_error_from_errno("getline");
409 069bbb86 2022-03-07 thomas else if (match == -1)
410 49114f01 2022-03-22 thomas err = got_error(GOT_ERR_HUNK_FAILED);
413 ff7f34d3 2022-03-22 thomas if (line[linelen - 1] == '\n')
414 ff7f34d3 2022-03-22 thomas line[linelen - 1] = '\0';
415 069bbb86 2022-03-07 thomas (*lineno)++;
417 4f34ed97 2022-08-06 thomas if ((mode == ' ' && !linecmp(h->lines[0] + 1, line, &mangled)) ||
418 4f34ed97 2022-08-06 thomas (mode == '-' && !linecmp(h->lines[0] + 1, line, &mangled)) ||
419 069bbb86 2022-03-07 thomas (mode == '+' && *lineno == h->old_from)) {
420 069bbb86 2022-03-07 thomas match = ftello(orig);
421 069bbb86 2022-03-07 thomas if (match == -1) {
422 069bbb86 2022-03-07 thomas err = got_error_from_errno("ftello");
425 069bbb86 2022-03-07 thomas match -= linelen;
426 069bbb86 2022-03-07 thomas match_lineno = (*lineno)-1;
429 aaabf83f 2022-08-06 thomas if (*lineno >= h->old_from && match != -1) {
430 aaabf83f 2022-08-06 thomas if (mangled)
431 aaabf83f 2022-08-06 thomas h->ws_mangled = 1;
436 069bbb86 2022-03-07 thomas if (err == NULL) {
437 122e1611 2022-03-22 thomas *pos = match;
438 069bbb86 2022-03-07 thomas *lineno = match_lineno;
439 bafaf650 2022-05-14 thomas if (fseeko(orig, match, SEEK_SET) == -1)
440 bafaf650 2022-05-14 thomas err = got_error_from_errno("fseeko");
443 069bbb86 2022-03-07 thomas free(line);
444 069bbb86 2022-03-07 thomas return err;
447 bb90ca7b 2022-07-03 thomas static int
448 bb90ca7b 2022-07-03 thomas linecmp(const char *a, const char *b, int *mangled)
452 bb90ca7b 2022-07-03 thomas *mangled = 0;
453 bb90ca7b 2022-07-03 thomas c = strcmp(a, b);
454 bb90ca7b 2022-07-03 thomas if (c == 0)
455 bb90ca7b 2022-07-03 thomas return c;
457 bb90ca7b 2022-07-03 thomas *mangled = 1;
458 bb90ca7b 2022-07-03 thomas for (;;) {
459 2140c6ec 2022-07-04 thomas while (*a == '\t' || *a == ' ' || *a == '\f')
461 2140c6ec 2022-07-04 thomas while (*b == '\t' || *b == ' ' || *b == '\f')
463 2140c6ec 2022-07-04 thomas if (*a == '\0' || *a != *b)
465 bb90ca7b 2022-07-03 thomas a++, b++;
468 bb90ca7b 2022-07-03 thomas return *a - *b;
471 069bbb86 2022-03-07 thomas static const struct got_error *
472 069bbb86 2022-03-07 thomas test_hunk(FILE *orig, struct got_patch_hunk *h)
474 069bbb86 2022-03-07 thomas const struct got_error *err = NULL;
475 069bbb86 2022-03-07 thomas char *line = NULL;
476 069bbb86 2022-03-07 thomas size_t linesize = 0, i = 0;
477 069bbb86 2022-03-07 thomas ssize_t linelen;
478 bb90ca7b 2022-07-03 thomas int mangled;
480 069bbb86 2022-03-07 thomas for (i = 0; i < h->len; ++i) {
481 069bbb86 2022-03-07 thomas switch (*h->lines[i]) {
482 069bbb86 2022-03-07 thomas case '+':
483 069bbb86 2022-03-07 thomas continue;
484 069bbb86 2022-03-07 thomas case ' ':
485 069bbb86 2022-03-07 thomas case '-':
486 069bbb86 2022-03-07 thomas linelen = getline(&line, &linesize, orig);
487 069bbb86 2022-03-07 thomas if (linelen == -1) {
488 069bbb86 2022-03-07 thomas if (ferror(orig))
489 069bbb86 2022-03-07 thomas err = got_error_from_errno("getline");
491 069bbb86 2022-03-07 thomas err = got_error(
492 49114f01 2022-03-22 thomas GOT_ERR_HUNK_FAILED);
493 069bbb86 2022-03-07 thomas goto done;
495 ff7f34d3 2022-03-22 thomas if (line[linelen - 1] == '\n')
496 ff7f34d3 2022-03-22 thomas line[linelen - 1] = '\0';
497 bb90ca7b 2022-07-03 thomas if (linecmp(h->lines[i] + 1, line, &mangled)) {
498 49114f01 2022-03-22 thomas err = got_error(GOT_ERR_HUNK_FAILED);
499 069bbb86 2022-03-07 thomas goto done;
501 bb90ca7b 2022-07-03 thomas if (mangled)
502 bb90ca7b 2022-07-03 thomas h->ws_mangled = 1;
508 069bbb86 2022-03-07 thomas free(line);
509 069bbb86 2022-03-07 thomas return err;
512 069bbb86 2022-03-07 thomas static const struct got_error *
513 bb90ca7b 2022-07-03 thomas apply_hunk(FILE *orig, FILE *tmp, struct got_patch_hunk *h, int *lineno,
514 bb90ca7b 2022-07-03 thomas off_t from)
516 bb90ca7b 2022-07-03 thomas const struct got_error *err = NULL;
517 bb90ca7b 2022-07-03 thomas const char *t;
518 bb90ca7b 2022-07-03 thomas size_t linesize = 0, i, new = 0;
519 bb90ca7b 2022-07-03 thomas char *line = NULL;
520 bb90ca7b 2022-07-03 thomas char mode;
521 bb90ca7b 2022-07-03 thomas ssize_t linelen;
523 bb90ca7b 2022-07-03 thomas if (orig != NULL && fseeko(orig, from, SEEK_SET) == -1)
524 bb90ca7b 2022-07-03 thomas return got_error_from_errno("fseeko");
526 069bbb86 2022-03-07 thomas for (i = 0; i < h->len; ++i) {
527 bb90ca7b 2022-07-03 thomas switch (mode = *h->lines[i]) {
528 069bbb86 2022-03-07 thomas case '-':
529 bb90ca7b 2022-07-03 thomas case ' ':
530 069bbb86 2022-03-07 thomas (*lineno)++;
531 bb90ca7b 2022-07-03 thomas if (orig != NULL) {
532 bb90ca7b 2022-07-03 thomas linelen = getline(&line, &linesize, orig);
533 bb90ca7b 2022-07-03 thomas if (linelen == -1) {
534 bb90ca7b 2022-07-03 thomas err = got_error_from_errno("getline");
535 bb90ca7b 2022-07-03 thomas goto done;
537 bb90ca7b 2022-07-03 thomas if (line[linelen - 1] == '\n')
538 bb90ca7b 2022-07-03 thomas line[linelen - 1] = '\0';
539 bb90ca7b 2022-07-03 thomas t = line;
541 bb90ca7b 2022-07-03 thomas t = h->lines[i] + 1;
542 bb90ca7b 2022-07-03 thomas if (mode == '-')
543 bb90ca7b 2022-07-03 thomas continue;
544 bb90ca7b 2022-07-03 thomas if (fprintf(tmp, "%s\n", t) < 0) {
545 bb90ca7b 2022-07-03 thomas err = got_error_from_errno("fprintf");
546 bb90ca7b 2022-07-03 thomas goto done;
549 069bbb86 2022-03-07 thomas case '+':
551 bb90ca7b 2022-07-03 thomas if (fprintf(tmp, "%s", h->lines[i] + 1) < 0) {
552 bb90ca7b 2022-07-03 thomas err = got_error_from_errno("fprintf");
553 bb90ca7b 2022-07-03 thomas goto done;
555 656c2baa 2022-04-23 thomas if (new != h->new_lines || !h->new_nonl) {
556 bb90ca7b 2022-07-03 thomas if (fprintf(tmp, "\n") < 0) {
557 bb90ca7b 2022-07-03 thomas err = got_error_from_errno("fprintf");
558 bb90ca7b 2022-07-03 thomas goto done;
566 bb90ca7b 2022-07-03 thomas free(line);
567 bb90ca7b 2022-07-03 thomas return err;
570 46e6bdd4 2022-03-22 thomas static const struct got_error *
571 25a880e1 2022-07-03 thomas patch_file(struct got_patch *p, FILE *orig, FILE *tmp)
573 bb2ad8ff 2022-03-13 thomas const struct got_error *err = NULL;
574 bb2ad8ff 2022-03-13 thomas struct got_patch_hunk *h;
575 da09d8ed 2022-03-22 thomas struct stat sb;
576 8ebb3daa 2022-06-23 thomas int lineno = 0;
577 bb2ad8ff 2022-03-13 thomas off_t copypos, pos;
578 bb2ad8ff 2022-03-13 thomas char *line = NULL;
579 bb2ad8ff 2022-03-13 thomas size_t linesize = 0;
580 bb2ad8ff 2022-03-13 thomas ssize_t linelen;
582 069bbb86 2022-03-07 thomas if (p->old == NULL) { /* create */
583 069bbb86 2022-03-07 thomas h = STAILQ_FIRST(&p->head);
584 bb2ad8ff 2022-03-13 thomas if (h == NULL || STAILQ_NEXT(h, entries) != NULL)
585 bb2ad8ff 2022-03-13 thomas return got_error(GOT_ERR_PATCH_MALFORMED);
586 bb90ca7b 2022-07-03 thomas return apply_hunk(orig, tmp, h, &lineno, 0);
589 650a3405 2023-01-02 thomas /* When deleting binary files there are no hunks to apply. */
590 650a3405 2023-01-02 thomas if (p->new == NULL && STAILQ_EMPTY(&p->head))
591 650a3405 2023-01-02 thomas return NULL;
593 2249fadd 2022-06-23 thomas if (fstat(fileno(orig), &sb) == -1)
594 2249fadd 2022-06-23 thomas return got_error_from_errno("fstat");
596 069bbb86 2022-03-07 thomas copypos = 0;
597 069bbb86 2022-03-07 thomas STAILQ_FOREACH(h, &p->head, entries) {
598 069bbb86 2022-03-07 thomas tryagain:
599 122e1611 2022-03-22 thomas err = locate_hunk(orig, h, &pos, &lineno);
600 49114f01 2022-03-22 thomas if (err != NULL && err->code == GOT_ERR_HUNK_FAILED)
601 49114f01 2022-03-22 thomas h->err = err;
602 069bbb86 2022-03-07 thomas if (err != NULL)
603 2249fadd 2022-06-23 thomas return err;
604 2d9b6837 2022-06-23 thomas err = copy(tmp, orig, copypos, pos);
605 069bbb86 2022-03-07 thomas if (err != NULL)
606 2249fadd 2022-06-23 thomas return err;
607 069bbb86 2022-03-07 thomas copypos = pos;
609 069bbb86 2022-03-07 thomas err = test_hunk(orig, h);
610 49114f01 2022-03-22 thomas if (err != NULL && err->code == GOT_ERR_HUNK_FAILED) {
612 069bbb86 2022-03-07 thomas * try to apply the hunk again starting the search
613 069bbb86 2022-03-07 thomas * after the previous partial match.
615 2249fadd 2022-06-23 thomas if (fseeko(orig, pos, SEEK_SET) == -1)
616 2249fadd 2022-06-23 thomas return got_error_from_errno("fseeko");
617 069bbb86 2022-03-07 thomas linelen = getline(&line, &linesize, orig);
618 2249fadd 2022-06-23 thomas if (linelen == -1)
619 2249fadd 2022-06-23 thomas return got_error_from_errno("getline");
620 069bbb86 2022-03-07 thomas lineno++;
621 069bbb86 2022-03-07 thomas goto tryagain;
623 069bbb86 2022-03-07 thomas if (err != NULL)
624 2249fadd 2022-06-23 thomas return err;
626 49114f01 2022-03-22 thomas if (lineno + 1 != h->old_from)
627 49114f01 2022-03-22 thomas h->offset = lineno + 1 - h->old_from;
629 bb90ca7b 2022-07-03 thomas err = apply_hunk(orig, tmp, h, &lineno, pos);
630 069bbb86 2022-03-07 thomas if (err != NULL)
631 2249fadd 2022-06-23 thomas return err;
633 069bbb86 2022-03-07 thomas copypos = ftello(orig);
634 2249fadd 2022-06-23 thomas if (copypos == -1)
635 2249fadd 2022-06-23 thomas return got_error_from_errno("ftello");
638 49114f01 2022-03-22 thomas if (p->new == NULL && sb.st_size != copypos) {
639 49114f01 2022-03-22 thomas h = STAILQ_FIRST(&p->head);
640 49114f01 2022-03-22 thomas h->err = got_error(GOT_ERR_HUNK_FAILED);
641 49114f01 2022-03-22 thomas err = h->err;
642 2d9b6837 2022-06-23 thomas } else if (!feof(orig))
643 069bbb86 2022-03-07 thomas err = copy(tmp, orig, copypos, -1);
645 10e55613 2022-03-22 thomas return err;
648 10e55613 2022-03-22 thomas static const struct got_error *
649 49114f01 2022-03-22 thomas report_progress(struct patch_args *pa, const char *old, const char *new,
650 49114f01 2022-03-22 thomas unsigned char status, const struct got_error *orig_error)
652 49114f01 2022-03-22 thomas const struct got_error *err;
653 49114f01 2022-03-22 thomas struct got_patch_hunk *h;
655 49114f01 2022-03-22 thomas err = pa->progress_cb(pa->progress_arg, old, new, status,
656 bb90ca7b 2022-07-03 thomas orig_error, 0, 0, 0, 0, 0, 0, NULL);
658 49114f01 2022-03-22 thomas return err;
660 49114f01 2022-03-22 thomas STAILQ_FOREACH(h, pa->head, entries) {
661 bb90ca7b 2022-07-03 thomas if (h->offset == 0 && !h->ws_mangled && h->err == NULL)
662 49114f01 2022-03-22 thomas continue;
664 49114f01 2022-03-22 thomas err = pa->progress_cb(pa->progress_arg, old, new, 0, NULL,
665 49114f01 2022-03-22 thomas h->old_from, h->old_lines, h->new_from, h->new_lines,
666 bb90ca7b 2022-07-03 thomas h->offset, h->ws_mangled, h->err);
668 49114f01 2022-03-22 thomas return err;
671 49114f01 2022-03-22 thomas return NULL;
674 49114f01 2022-03-22 thomas static const struct got_error *
675 c71da4f7 2022-03-22 thomas patch_delete(void *arg, unsigned char status, unsigned char staged_status,
676 c71da4f7 2022-03-22 thomas const char *path)
678 49114f01 2022-03-22 thomas return report_progress(arg, path, NULL, status, NULL);
681 c71da4f7 2022-03-22 thomas static const struct got_error *
682 c71da4f7 2022-03-22 thomas patch_add(void *arg, unsigned char status, const char *path)
684 49114f01 2022-03-22 thomas return report_progress(arg, NULL, path, status, NULL);
687 c71da4f7 2022-03-22 thomas static const struct got_error *
688 0f76ab83 2022-06-23 thomas open_blob(char **path, FILE **fp, const char *blobid,
689 0f76ab83 2022-06-23 thomas struct got_repository *repo)
691 bb2ad8ff 2022-03-13 thomas const struct got_error *err = NULL;
692 0f76ab83 2022-06-23 thomas struct got_blob_object *blob = NULL;
693 19dd85cb 2022-07-01 thomas struct got_object_id id, *idptr, *matched_id = NULL;
694 f4ae6ddb 2022-07-01 thomas int fd = -1;
696 0f76ab83 2022-06-23 thomas *fp = NULL;
697 0f76ab83 2022-06-23 thomas *path = NULL;
699 19dd85cb 2022-07-01 thomas if (strlen(blobid) != SHA1_DIGEST_STRING_LENGTH - 1) {
700 19dd85cb 2022-07-01 thomas err = got_repo_match_object_id(&matched_id, NULL, blobid,
701 19dd85cb 2022-07-01 thomas GOT_OBJ_TYPE_BLOB, NULL /* do not resolve tags */,
704 19dd85cb 2022-07-01 thomas return err;
705 19dd85cb 2022-07-01 thomas idptr = matched_id;
707 c8ae092d 2023-02-23 thomas if (!got_parse_object_id(&id, blobid, GOT_HASH_SHA1))
708 19dd85cb 2022-07-01 thomas return got_error(GOT_ERR_BAD_OBJ_ID_STR);
709 19dd85cb 2022-07-01 thomas idptr = &id;
712 f4ae6ddb 2022-07-01 thomas fd = got_opentempfd();
713 f4ae6ddb 2022-07-01 thomas if (fd == -1) {
714 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("got_opentempfd");
715 f4ae6ddb 2022-07-01 thomas goto done;
718 f4ae6ddb 2022-07-01 thomas err = got_object_open_as_blob(&blob, repo, idptr, 8192, fd);
720 0f76ab83 2022-06-23 thomas goto done;
722 fc2a50f2 2022-11-01 thomas err = got_opentemp_named(path, fp, GOT_TMPDIR_STR "/got-patch-blob",
725 0f76ab83 2022-06-23 thomas goto done;
727 0f76ab83 2022-06-23 thomas err = got_object_blob_dump_to_file(NULL, NULL, NULL, *fp, blob);
729 0f76ab83 2022-06-23 thomas goto done;
732 f4ae6ddb 2022-07-01 thomas if (fd != -1 && close(fd) == -1 && err == NULL)
733 f4ae6ddb 2022-07-01 thomas err = got_error_from_errno("close");
734 0f76ab83 2022-06-23 thomas if (blob)
735 0f76ab83 2022-06-23 thomas got_object_blob_close(blob);
736 19dd85cb 2022-07-01 thomas if (matched_id != NULL)
737 19dd85cb 2022-07-01 thomas free(matched_id);
738 0f76ab83 2022-06-23 thomas if (err) {
739 0f76ab83 2022-06-23 thomas if (*fp != NULL)
740 0f76ab83 2022-06-23 thomas fclose(*fp);
741 0f76ab83 2022-06-23 thomas if (*path != NULL)
742 0f76ab83 2022-06-23 thomas unlink(*path);
743 0f76ab83 2022-06-23 thomas free(*path);
744 0f76ab83 2022-06-23 thomas *fp = NULL;
745 0f76ab83 2022-06-23 thomas *path = NULL;
747 0f76ab83 2022-06-23 thomas return err;
750 0f76ab83 2022-06-23 thomas static const struct got_error *
751 7d8bcb99 2022-07-28 thomas prepare_merge(int *do_merge, char **apath, FILE **afile,
752 7d8bcb99 2022-07-28 thomas struct got_worktree *worktree, struct got_repository *repo,
753 7d8bcb99 2022-07-28 thomas struct got_patch *p, struct got_object_id *commit_id,
754 7d8bcb99 2022-07-28 thomas struct got_tree_object *tree, const char *path)
756 7d8bcb99 2022-07-28 thomas const struct got_error *err = NULL;
758 7d8bcb99 2022-07-28 thomas *do_merge = 0;
759 7d8bcb99 2022-07-28 thomas *apath = NULL;
760 7d8bcb99 2022-07-28 thomas *afile = NULL;
762 7d8bcb99 2022-07-28 thomas /* don't run the diff3 merge on creations/deletions */
763 7d8bcb99 2022-07-28 thomas if (p->old == NULL || p->new == NULL)
764 7d8bcb99 2022-07-28 thomas return NULL;
766 7d8bcb99 2022-07-28 thomas if (commit_id) {
767 7d8bcb99 2022-07-28 thomas struct got_object_id *id;
769 7d8bcb99 2022-07-28 thomas err = got_object_tree_find_path(&id, NULL, repo, tree, path);
771 7d8bcb99 2022-07-28 thomas return err;
772 7d8bcb99 2022-07-28 thomas got_sha1_digest_to_str(id->sha1, p->blob, sizeof(p->blob));
773 7d8bcb99 2022-07-28 thomas got_sha1_digest_to_str(commit_id->sha1, p->cid, sizeof(p->cid));
774 7d8bcb99 2022-07-28 thomas free(id);
775 7d8bcb99 2022-07-28 thomas err = open_blob(apath, afile, p->blob, repo);
776 7d8bcb99 2022-07-28 thomas *do_merge = err == NULL;
777 7d8bcb99 2022-07-28 thomas } else if (*p->blob != '\0') {
778 7d8bcb99 2022-07-28 thomas err = open_blob(apath, afile, p->blob, repo);
780 7d8bcb99 2022-07-28 thomas * ignore failures to open this blob, we might have
781 7d8bcb99 2022-07-28 thomas * parsed gibberish.
783 7d8bcb99 2022-07-28 thomas if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT) &&
784 7d8bcb99 2022-07-28 thomas err->code != GOT_ERR_NO_OBJ)
785 7d8bcb99 2022-07-28 thomas return err;
786 7d8bcb99 2022-07-28 thomas *do_merge = err == NULL;
787 7d8bcb99 2022-07-28 thomas err = NULL;
790 7d8bcb99 2022-07-28 thomas return err;
793 7d8bcb99 2022-07-28 thomas static const struct got_error *
794 0f76ab83 2022-06-23 thomas apply_patch(int *overlapcnt, struct got_worktree *worktree,
795 0f76ab83 2022-06-23 thomas struct got_repository *repo, struct got_fileindex *fileindex,
796 0f76ab83 2022-06-23 thomas const char *old, const char *new, struct got_patch *p, int nop,
797 7d8bcb99 2022-07-28 thomas int reverse, struct got_object_id *commit_id,
798 7d8bcb99 2022-07-28 thomas struct got_tree_object *tree, struct patch_args *pa,
799 f4602cbd 2022-07-23 thomas got_cancel_cb cancel_cb, void *cancel_arg)
801 0f76ab83 2022-06-23 thomas const struct got_error *err = NULL;
802 25a880e1 2022-07-03 thomas struct stat sb;
803 0f76ab83 2022-06-23 thomas int do_merge = 0, file_renamed = 0;
804 016bfe4b 2022-06-23 thomas char *oldlabel = NULL, *newlabel = NULL, *anclabel = NULL;
805 72f46891 2022-04-23 thomas char *oldpath = NULL, *newpath = NULL;
806 dd73a53d 2022-10-16 thomas char *tmppath = NULL, *template = NULL;
807 0f76ab83 2022-06-23 thomas char *apath = NULL, *mergepath = NULL;
808 0f76ab83 2022-06-23 thomas FILE *oldfile = NULL, *tmpfile = NULL, *afile = NULL, *mergefile = NULL;
809 0f76ab83 2022-06-23 thomas int outfd;
810 da09d8ed 2022-03-22 thomas mode_t mode = GOT_DEFAULT_FILE_MODE;
812 0f76ab83 2022-06-23 thomas *overlapcnt = 0;
814 7d8bcb99 2022-07-28 thomas err = prepare_merge(&do_merge, &apath, &afile, worktree, repo, p,
815 7d8bcb99 2022-07-28 thomas commit_id, tree, old);
817 7d8bcb99 2022-07-28 thomas return err;
819 21948212 2022-07-27 thomas if (reverse && !do_merge)
820 21948212 2022-07-27 thomas reverse_patch(p);
822 72f46891 2022-04-23 thomas if (asprintf(&oldpath, "%s/%s", got_worktree_get_root_path(worktree),
823 72f46891 2022-04-23 thomas old) == -1) {
824 72f46891 2022-04-23 thomas err = got_error_from_errno("asprintf");
825 814624e7 2022-03-22 thomas goto done;
828 72f46891 2022-04-23 thomas if (asprintf(&newpath, "%s/%s", got_worktree_get_root_path(worktree),
829 72f46891 2022-04-23 thomas new) == -1) {
830 72f46891 2022-04-23 thomas err = got_error_from_errno("asprintf");
831 72f46891 2022-04-23 thomas goto done;
834 814624e7 2022-03-22 thomas file_renamed = strcmp(oldpath, newpath);
836 bb2ad8ff 2022-03-13 thomas if (asprintf(&template, "%s/got-patch",
837 bb2ad8ff 2022-03-13 thomas got_worktree_get_root_path(worktree)) == -1) {
838 bb2ad8ff 2022-03-13 thomas err = got_error_from_errno(template);
839 069bbb86 2022-03-07 thomas goto done;
842 25a880e1 2022-07-03 thomas if (p->old != NULL) {
843 25a880e1 2022-07-03 thomas if ((oldfile = fopen(oldpath, "r")) == NULL) {
844 25a880e1 2022-07-03 thomas err = got_error_from_errno2("open", oldpath);
845 25a880e1 2022-07-03 thomas goto done;
847 25a880e1 2022-07-03 thomas if (fstat(fileno(oldfile), &sb) == -1) {
848 25a880e1 2022-07-03 thomas err = got_error_from_errno2("fstat", oldpath);
849 25a880e1 2022-07-03 thomas goto done;
851 25a880e1 2022-07-03 thomas mode = sb.st_mode;
852 37e766f4 2022-09-21 thomas } else if (p->xbit)
853 37e766f4 2022-09-21 thomas mode |= (S_IXUSR | S_IXGRP | S_IXOTH);
855 fc2a50f2 2022-11-01 thomas err = got_opentemp_named(&tmppath, &tmpfile, template, "");
857 bb2ad8ff 2022-03-13 thomas goto done;
858 0f76ab83 2022-06-23 thomas outfd = fileno(tmpfile);
859 25a880e1 2022-07-03 thomas err = patch_file(p, afile != NULL ? afile : oldfile, tmpfile);
861 bb2ad8ff 2022-03-13 thomas goto done;
863 0f76ab83 2022-06-23 thomas if (do_merge) {
864 8afec5d5 2022-07-01 thomas const char *type, *id;
866 0f76ab83 2022-06-23 thomas if (fseeko(afile, 0, SEEK_SET) == -1 ||
867 0f76ab83 2022-06-23 thomas fseeko(oldfile, 0, SEEK_SET) == -1 ||
868 0f76ab83 2022-06-23 thomas fseeko(tmpfile, 0, SEEK_SET) == -1) {
869 0f76ab83 2022-06-23 thomas err = got_error_from_errno("fseeko");
870 0f76ab83 2022-06-23 thomas goto done;
873 0f76ab83 2022-06-23 thomas if (asprintf(&oldlabel, "--- %s", p->old) == -1) {
874 0f76ab83 2022-06-23 thomas err = got_error_from_errno("asprintf");
875 0f76ab83 2022-06-23 thomas oldlabel = NULL;
876 0f76ab83 2022-06-23 thomas goto done;
879 0f76ab83 2022-06-23 thomas if (asprintf(&newlabel, "+++ %s", p->new) == -1) {
880 0f76ab83 2022-06-23 thomas err = got_error_from_errno("asprintf");
881 0f76ab83 2022-06-23 thomas newlabel = NULL;
882 0f76ab83 2022-06-23 thomas goto done;
885 8afec5d5 2022-07-01 thomas if (*p->cid != '\0') {
886 8afec5d5 2022-07-01 thomas type = "commit";
887 8afec5d5 2022-07-01 thomas id = p->cid;
889 8afec5d5 2022-07-01 thomas type = "blob";
890 8afec5d5 2022-07-01 thomas id = p->blob;
893 8afec5d5 2022-07-01 thomas if (asprintf(&anclabel, "%s %s", type, id) == -1) {
894 016bfe4b 2022-06-23 thomas err = got_error_from_errno("asprintf");
895 016bfe4b 2022-06-23 thomas anclabel = NULL;
896 016bfe4b 2022-06-23 thomas goto done;
899 f4602cbd 2022-07-23 thomas if (reverse) {
903 f4602cbd 2022-07-23 thomas s = anclabel;
904 f4602cbd 2022-07-23 thomas anclabel = newlabel;
905 f4602cbd 2022-07-23 thomas newlabel = s;
907 f4602cbd 2022-07-23 thomas t = afile;
908 f4602cbd 2022-07-23 thomas afile = tmpfile;
909 f4602cbd 2022-07-23 thomas tmpfile = t;
912 fc2a50f2 2022-11-01 thomas err = got_opentemp_named(&mergepath, &mergefile, template, "");
914 0f76ab83 2022-06-23 thomas goto done;
915 0f76ab83 2022-06-23 thomas outfd = fileno(mergefile);
917 0f76ab83 2022-06-23 thomas err = got_merge_diff3(overlapcnt, outfd, tmpfile, afile,
918 016bfe4b 2022-06-23 thomas oldfile, oldlabel, anclabel, newlabel,
919 0f76ab83 2022-06-23 thomas GOT_DIFF_ALGORITHM_PATIENCE);
921 0f76ab83 2022-06-23 thomas goto done;
925 eaf99875 2022-03-22 thomas goto done;
927 eaf99875 2022-03-22 thomas if (p->old != NULL && p->new == NULL) {
928 5e22b737 2022-05-31 thomas err = got_worktree_patch_schedule_rm(old, repo, worktree,
929 5e22b737 2022-05-31 thomas fileindex, patch_delete, pa);
930 eaf99875 2022-03-22 thomas goto done;
933 a2c162eb 2022-10-30 thomas if (fchmod(outfd, apply_umask(mode)) == -1) {
934 8260acc8 2022-05-01 thomas err = got_error_from_errno2("chmod", tmppath);
935 da09d8ed 2022-03-22 thomas goto done;
938 dd73a53d 2022-10-16 thomas if (mergepath) {
939 dd73a53d 2022-10-16 thomas err = got_path_move_file(mergepath, newpath);
941 e0c1f81c 2022-03-22 thomas goto done;
942 dd73a53d 2022-10-16 thomas free(mergepath);
943 dd73a53d 2022-10-16 thomas mergepath = NULL;
945 dd73a53d 2022-10-16 thomas err = got_path_move_file(tmppath, newpath);
947 e0c1f81c 2022-03-22 thomas goto done;
948 dd73a53d 2022-10-16 thomas free(tmppath);
949 dd73a53d 2022-10-16 thomas tmppath = NULL;
952 bb2ad8ff 2022-03-13 thomas if (file_renamed) {
953 5e22b737 2022-05-31 thomas err = got_worktree_patch_schedule_rm(old, repo, worktree,
954 5e22b737 2022-05-31 thomas fileindex, patch_delete, pa);
955 bb2ad8ff 2022-03-13 thomas if (err == NULL)
956 5e22b737 2022-05-31 thomas err = got_worktree_patch_schedule_add(new, repo,
957 5e22b737 2022-05-31 thomas worktree, fileindex, patch_add,
960 814624e7 2022-03-22 thomas unlink(newpath);
961 814624e7 2022-03-22 thomas } else if (p->old == NULL) {
962 5e22b737 2022-05-31 thomas err = got_worktree_patch_schedule_add(new, repo, worktree,
963 5e22b737 2022-05-31 thomas fileindex, patch_add, pa);
965 814624e7 2022-03-22 thomas unlink(newpath);
966 0f76ab83 2022-06-23 thomas } else if (*overlapcnt != 0)
967 0f76ab83 2022-06-23 thomas err = report_progress(pa, old, new, GOT_STATUS_CONFLICT, NULL);
968 762b8e82 2022-06-23 thomas else if (do_merge)
969 762b8e82 2022-06-23 thomas err = report_progress(pa, old, new, GOT_STATUS_MERGE, NULL);
971 72f46891 2022-04-23 thomas err = report_progress(pa, old, new, GOT_STATUS_MODIFY, NULL);
974 94af5a06 2022-03-08 thomas free(template);
976 dd73a53d 2022-10-16 thomas if (tmppath != NULL && unlink(tmppath) == -1 && err == NULL)
977 dd73a53d 2022-10-16 thomas err = got_error_from_errno("unlink");
978 0f76ab83 2022-06-23 thomas if (tmpfile != NULL && fclose(tmpfile) == EOF && err == NULL)
979 04cdf6ac 2022-06-23 thomas err = got_error_from_errno("fclose");
980 069bbb86 2022-03-07 thomas free(tmppath);
982 72f46891 2022-04-23 thomas free(oldpath);
983 2249fadd 2022-06-23 thomas if (oldfile != NULL && fclose(oldfile) == EOF && err == NULL)
984 2249fadd 2022-06-23 thomas err = got_error_from_errno("fclose");
986 dd73a53d 2022-10-16 thomas if (apath != NULL && unlink(apath) == -1 && err == NULL)
987 dd73a53d 2022-10-16 thomas err = got_error_from_errno("unlink");
988 0f76ab83 2022-06-23 thomas if (afile != NULL && fclose(afile) == EOF && err == NULL)
989 0f76ab83 2022-06-23 thomas err = got_error_from_errno("fclose");
990 0f76ab83 2022-06-23 thomas free(apath);
992 dd73a53d 2022-10-16 thomas if (mergepath != NULL && unlink(mergepath) == -1 && err == NULL)
993 dd73a53d 2022-10-16 thomas err = got_error_from_errno("unlink");
994 0f76ab83 2022-06-23 thomas if (mergefile != NULL && fclose(mergefile) == EOF && err == NULL)
995 0f76ab83 2022-06-23 thomas err = got_error_from_errno("fclose");
996 0f76ab83 2022-06-23 thomas free(mergepath);
998 72f46891 2022-04-23 thomas free(newpath);
999 0f76ab83 2022-06-23 thomas free(oldlabel);
1000 0f76ab83 2022-06-23 thomas free(newlabel);
1001 016bfe4b 2022-06-23 thomas free(anclabel);
1002 069bbb86 2022-03-07 thomas return err;
1005 069bbb86 2022-03-07 thomas const struct got_error *
1006 069bbb86 2022-03-07 thomas got_patch(int fd, struct got_worktree *worktree, struct got_repository *repo,
1007 7d8bcb99 2022-07-28 thomas int nop, int strip, int reverse, struct got_object_id *commit_id,
1008 7d8bcb99 2022-07-28 thomas got_patch_progress_cb progress_cb, void *progress_arg,
1009 7d8bcb99 2022-07-28 thomas got_cancel_cb cancel_cb, void *cancel_arg)
1011 36832a8e 2022-05-31 thomas const struct got_error *err = NULL, *complete_err = NULL;
1012 814624e7 2022-03-22 thomas struct got_fileindex *fileindex = NULL;
1013 7d8bcb99 2022-07-28 thomas struct got_commit_object *commit = NULL;
1014 7d8bcb99 2022-07-28 thomas struct got_tree_object *tree = NULL;
1015 5e22b737 2022-05-31 thomas char *fileindex_path = NULL;
1016 49114f01 2022-03-22 thomas char *oldpath, *newpath;
1017 069bbb86 2022-03-07 thomas struct imsgbuf *ibuf;
1018 069bbb86 2022-03-07 thomas int imsg_fds[2] = {-1, -1};
1019 0f76ab83 2022-06-23 thomas int overlapcnt, done = 0, failed = 0;
1020 069bbb86 2022-03-07 thomas pid_t pid;
1022 069bbb86 2022-03-07 thomas ibuf = calloc(1, sizeof(*ibuf));
1023 069bbb86 2022-03-07 thomas if (ibuf == NULL) {
1024 069bbb86 2022-03-07 thomas err = got_error_from_errno("calloc");
1025 069bbb86 2022-03-07 thomas goto done;
1028 069bbb86 2022-03-07 thomas if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1) {
1029 069bbb86 2022-03-07 thomas err = got_error_from_errno("socketpair");
1030 069bbb86 2022-03-07 thomas goto done;
1033 069bbb86 2022-03-07 thomas pid = fork();
1034 069bbb86 2022-03-07 thomas if (pid == -1) {
1035 069bbb86 2022-03-07 thomas err = got_error_from_errno("fork");
1036 069bbb86 2022-03-07 thomas goto done;
1037 069bbb86 2022-03-07 thomas } else if (pid == 0) {
1038 069bbb86 2022-03-07 thomas got_privsep_exec_child(imsg_fds, GOT_PATH_PROG_READ_PATCH,
1040 069bbb86 2022-03-07 thomas /* not reached */
1043 069bbb86 2022-03-07 thomas if (close(imsg_fds[1]) == -1) {
1044 069bbb86 2022-03-07 thomas err = got_error_from_errno("close");
1045 069bbb86 2022-03-07 thomas goto done;
1047 069bbb86 2022-03-07 thomas imsg_fds[1] = -1;
1048 069bbb86 2022-03-07 thomas imsg_init(ibuf, imsg_fds[0]);
1050 069bbb86 2022-03-07 thomas err = send_patch(ibuf, fd);
1051 069bbb86 2022-03-07 thomas fd = -1;
1052 069bbb86 2022-03-07 thomas if (err)
1053 069bbb86 2022-03-07 thomas goto done;
1055 5e22b737 2022-05-31 thomas err = got_worktree_patch_prepare(&fileindex, &fileindex_path,
1056 5e22b737 2022-05-31 thomas worktree);
1057 814624e7 2022-03-22 thomas if (err)
1058 814624e7 2022-03-22 thomas goto done;
1060 7d8bcb99 2022-07-28 thomas if (commit_id) {
1061 7d8bcb99 2022-07-28 thomas err = got_object_open_as_commit(&commit, repo, commit_id);
1062 7d8bcb99 2022-07-28 thomas if (err)
1063 7d8bcb99 2022-07-28 thomas goto done;
1065 7d8bcb99 2022-07-28 thomas err = got_object_open_as_tree(&tree, repo, commit->tree_id);
1066 7d8bcb99 2022-07-28 thomas if (err)
1067 7d8bcb99 2022-07-28 thomas goto done;
1070 069bbb86 2022-03-07 thomas while (!done && err == NULL) {
1071 069bbb86 2022-03-07 thomas struct got_patch p;
1072 49114f01 2022-03-22 thomas struct patch_args pa;
1074 49114f01 2022-03-22 thomas pa.progress_cb = progress_cb;
1075 49114f01 2022-03-22 thomas pa.progress_arg = progress_arg;
1076 49114f01 2022-03-22 thomas pa.head = &p.head;
1078 d9db2ff9 2022-04-16 thomas err = recv_patch(ibuf, &done, &p, strip);
1079 069bbb86 2022-03-07 thomas if (err || done)
1082 814624e7 2022-03-22 thomas err = got_worktree_patch_check_path(p.old, p.new, &oldpath,
1083 814624e7 2022-03-22 thomas &newpath, worktree, repo, fileindex);
1084 814624e7 2022-03-22 thomas if (err == NULL)
1085 0f76ab83 2022-06-23 thomas err = apply_patch(&overlapcnt, worktree, repo,
1086 f4602cbd 2022-07-23 thomas fileindex, oldpath, newpath, &p, nop, reverse,
1087 7d8bcb99 2022-07-28 thomas commit_id, tree, &pa, cancel_cb, cancel_arg);
1088 49114f01 2022-03-22 thomas if (err != NULL) {
1089 49114f01 2022-03-22 thomas failed = 1;
1090 49114f01 2022-03-22 thomas /* recoverable errors */
1091 49114f01 2022-03-22 thomas if (err->code == GOT_ERR_FILE_STATUS ||
1092 49114f01 2022-03-22 thomas (err->code == GOT_ERR_ERRNO && errno == ENOENT))
1093 49114f01 2022-03-22 thomas err = report_progress(&pa, p.old, p.new,
1094 49114f01 2022-03-22 thomas GOT_STATUS_CANNOT_UPDATE, err);
1095 49114f01 2022-03-22 thomas else if (err->code == GOT_ERR_HUNK_FAILED)
1096 49114f01 2022-03-22 thomas err = report_progress(&pa, p.old, p.new,
1097 49114f01 2022-03-22 thomas GOT_STATUS_CANNOT_UPDATE, NULL);
1099 0f76ab83 2022-06-23 thomas if (overlapcnt != 0)
1100 0f76ab83 2022-06-23 thomas failed = 1;
1102 49114f01 2022-03-22 thomas free(oldpath);
1103 49114f01 2022-03-22 thomas free(newpath);
1104 069bbb86 2022-03-07 thomas patch_free(&p);
1106 069bbb86 2022-03-07 thomas if (err)
1111 36832a8e 2022-05-31 thomas if (fileindex != NULL)
1112 36832a8e 2022-05-31 thomas complete_err = got_worktree_patch_complete(fileindex,
1113 36832a8e 2022-05-31 thomas fileindex_path);
1114 5e22b737 2022-05-31 thomas if (complete_err && err == NULL)
1115 5e22b737 2022-05-31 thomas err = complete_err;
1116 36832a8e 2022-05-31 thomas free(fileindex_path);
1117 7d8bcb99 2022-07-28 thomas if (tree)
1118 7d8bcb99 2022-07-28 thomas got_object_tree_close(tree);
1119 7d8bcb99 2022-07-28 thomas if (commit)
1120 7d8bcb99 2022-07-28 thomas got_object_commit_close(commit);
1121 069bbb86 2022-03-07 thomas if (fd != -1 && close(fd) == -1 && err == NULL)
1122 069bbb86 2022-03-07 thomas err = got_error_from_errno("close");
1123 069bbb86 2022-03-07 thomas if (ibuf != NULL)
1124 069bbb86 2022-03-07 thomas imsg_clear(ibuf);
1125 069bbb86 2022-03-07 thomas if (imsg_fds[0] != -1 && close(imsg_fds[0]) == -1 && err == NULL)
1126 069bbb86 2022-03-07 thomas err = got_error_from_errno("close");
1127 069bbb86 2022-03-07 thomas if (imsg_fds[1] != -1 && close(imsg_fds[1]) == -1 && err == NULL)
1128 069bbb86 2022-03-07 thomas err = got_error_from_errno("close");
1129 49114f01 2022-03-22 thomas if (err == NULL && failed)
1130 49114f01 2022-03-22 thomas err = got_error(GOT_ERR_PATCH_FAILED);
1131 069bbb86 2022-03-07 thomas return err;
