]>
Commit | Line | Data |
---|---|---|
13b5af22 CC |
1 | /* |
2 | * apply.c | |
3 | * | |
4 | * Copyright (C) Linus Torvalds, 2005 | |
5 | * | |
6 | * This applies patches on top of some (arbitrary) version of the SCM. | |
7 | * | |
8 | */ | |
9 | ||
bb493a5c | 10 | #include "cache.h" |
b2141fc1 | 11 | #include "config.h" |
cbd53a21 | 12 | #include "object-store.h" |
13b5af22 CC |
13 | #include "blob.h" |
14 | #include "delta.h" | |
15 | #include "diff.h" | |
16 | #include "dir.h" | |
17 | #include "xdiff-interface.h" | |
18 | #include "ll-merge.h" | |
bb493a5c | 19 | #include "lockfile.h" |
13b5af22 CC |
20 | #include "parse-options.h" |
21 | #include "quote.h" | |
22 | #include "rerere.h" | |
bb493a5c CC |
23 | #include "apply.h" |
24 | ||
25 | static void git_apply_config(void) | |
26 | { | |
27 | git_config_get_string_const("apply.whitespace", &apply_default_whitespace); | |
28 | git_config_get_string_const("apply.ignorewhitespace", &apply_default_ignorewhitespace); | |
29 | git_config(git_default_config, NULL); | |
30 | } | |
31 | ||
9123d5dd | 32 | static int parse_whitespace_option(struct apply_state *state, const char *option) |
bb493a5c CC |
33 | { |
34 | if (!option) { | |
35 | state->ws_error_action = warn_on_ws_error; | |
36 | return 0; | |
37 | } | |
38 | if (!strcmp(option, "warn")) { | |
39 | state->ws_error_action = warn_on_ws_error; | |
40 | return 0; | |
41 | } | |
42 | if (!strcmp(option, "nowarn")) { | |
43 | state->ws_error_action = nowarn_ws_error; | |
44 | return 0; | |
45 | } | |
46 | if (!strcmp(option, "error")) { | |
47 | state->ws_error_action = die_on_ws_error; | |
48 | return 0; | |
49 | } | |
50 | if (!strcmp(option, "error-all")) { | |
51 | state->ws_error_action = die_on_ws_error; | |
52 | state->squelch_whitespace_errors = 0; | |
53 | return 0; | |
54 | } | |
55 | if (!strcmp(option, "strip") || !strcmp(option, "fix")) { | |
56 | state->ws_error_action = correct_ws_error; | |
57 | return 0; | |
58 | } | |
59 | return error(_("unrecognized whitespace option '%s'"), option); | |
60 | } | |
61 | ||
9123d5dd CC |
62 | static int parse_ignorewhitespace_option(struct apply_state *state, |
63 | const char *option) | |
bb493a5c CC |
64 | { |
65 | if (!option || !strcmp(option, "no") || | |
66 | !strcmp(option, "false") || !strcmp(option, "never") || | |
67 | !strcmp(option, "none")) { | |
68 | state->ws_ignore_action = ignore_ws_none; | |
69 | return 0; | |
70 | } | |
71 | if (!strcmp(option, "change")) { | |
72 | state->ws_ignore_action = ignore_ws_change; | |
73 | return 0; | |
74 | } | |
75 | return error(_("unrecognized whitespace ignore option '%s'"), option); | |
76 | } | |
77 | ||
2f5a6d12 | 78 | int init_apply_state(struct apply_state *state, |
82ea77ec | 79 | struct repository *repo, |
6d058c88 | 80 | const char *prefix) |
bb493a5c CC |
81 | { |
82 | memset(state, 0, sizeof(*state)); | |
83 | state->prefix = prefix; | |
82ea77ec | 84 | state->repo = repo; |
bb493a5c CC |
85 | state->apply = 1; |
86 | state->line_termination = '\n'; | |
87 | state->p_value = 1; | |
88 | state->p_context = UINT_MAX; | |
89 | state->squelch_whitespace_errors = 5; | |
90 | state->ws_error_action = warn_on_ws_error; | |
91 | state->ws_ignore_action = ignore_ws_none; | |
92 | state->linenr = 1; | |
93 | string_list_init(&state->fn_table, 0); | |
94 | string_list_init(&state->limit_by_name, 0); | |
95 | string_list_init(&state->symlink_changes, 0); | |
96 | strbuf_init(&state->root, 0); | |
97 | ||
98 | git_apply_config(); | |
99 | if (apply_default_whitespace && parse_whitespace_option(state, apply_default_whitespace)) | |
2f5a6d12 | 100 | return -1; |
bb493a5c | 101 | if (apply_default_ignorewhitespace && parse_ignorewhitespace_option(state, apply_default_ignorewhitespace)) |
2f5a6d12 CC |
102 | return -1; |
103 | return 0; | |
bb493a5c CC |
104 | } |
105 | ||
106 | void clear_apply_state(struct apply_state *state) | |
107 | { | |
108 | string_list_clear(&state->limit_by_name, 0); | |
109 | string_list_clear(&state->symlink_changes, 0); | |
110 | strbuf_release(&state->root); | |
111 | ||
112 | /* &state->fn_table is cleared at the end of apply_patch() */ | |
113 | } | |
b6446d54 | 114 | |
45b78d8b CC |
115 | static void mute_routine(const char *msg, va_list params) |
116 | { | |
117 | /* do nothing */ | |
118 | } | |
119 | ||
b6446d54 CC |
120 | int check_apply_state(struct apply_state *state, int force_apply) |
121 | { | |
122 | int is_not_gitdir = !startup_info->have_repository; | |
123 | ||
124 | if (state->apply_with_reject && state->threeway) | |
d1d42bf5 | 125 | return error(_("--reject and --3way cannot be used together.")); |
b6446d54 | 126 | if (state->cached && state->threeway) |
d1d42bf5 | 127 | return error(_("--cached and --3way cannot be used together.")); |
b6446d54 CC |
128 | if (state->threeway) { |
129 | if (is_not_gitdir) | |
130 | return error(_("--3way outside a repository")); | |
131 | state->check_index = 1; | |
132 | } | |
a46160d2 CC |
133 | if (state->apply_with_reject) { |
134 | state->apply = 1; | |
135 | if (state->apply_verbosity == verbosity_normal) | |
136 | state->apply_verbosity = verbosity_verbose; | |
137 | } | |
b6446d54 CC |
138 | if (!force_apply && (state->diffstat || state->numstat || state->summary || state->check || state->fake_ancestor)) |
139 | state->apply = 0; | |
140 | if (state->check_index && is_not_gitdir) | |
141 | return error(_("--index outside a repository")); | |
142 | if (state->cached) { | |
143 | if (is_not_gitdir) | |
144 | return error(_("--cached outside a repository")); | |
145 | state->check_index = 1; | |
146 | } | |
cff5dc09 NTND |
147 | if (state->ita_only && (state->check_index || is_not_gitdir)) |
148 | state->ita_only = 0; | |
b6446d54 CC |
149 | if (state->check_index) |
150 | state->unsafe_paths = 0; | |
b6446d54 | 151 | |
45b78d8b CC |
152 | if (state->apply_verbosity <= verbosity_silent) { |
153 | state->saved_error_routine = get_error_routine(); | |
154 | state->saved_warn_routine = get_warn_routine(); | |
155 | set_error_routine(mute_routine); | |
156 | set_warn_routine(mute_routine); | |
157 | } | |
158 | ||
b6446d54 CC |
159 | return 0; |
160 | } | |
13b5af22 CC |
161 | |
162 | static void set_default_whitespace_mode(struct apply_state *state) | |
163 | { | |
164 | if (!state->whitespace_option && !apply_default_whitespace) | |
165 | state->ws_error_action = (state->apply ? warn_on_ws_error : nowarn_ws_error); | |
166 | } | |
167 | ||
168 | /* | |
169 | * This represents one "hunk" from a patch, starting with | |
170 | * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The | |
171 | * patch text is pointed at by patch, and its byte length | |
172 | * is stored in size. leading and trailing are the number | |
173 | * of context lines. | |
174 | */ | |
175 | struct fragment { | |
176 | unsigned long leading, trailing; | |
177 | unsigned long oldpos, oldlines; | |
178 | unsigned long newpos, newlines; | |
179 | /* | |
180 | * 'patch' is usually borrowed from buf in apply_patch(), | |
181 | * but some codepaths store an allocated buffer. | |
182 | */ | |
183 | const char *patch; | |
184 | unsigned free_patch:1, | |
185 | rejected:1; | |
186 | int size; | |
187 | int linenr; | |
188 | struct fragment *next; | |
189 | }; | |
190 | ||
191 | /* | |
192 | * When dealing with a binary patch, we reuse "leading" field | |
193 | * to store the type of the binary hunk, either deflated "delta" | |
194 | * or deflated "literal". | |
195 | */ | |
196 | #define binary_patch_method leading | |
197 | #define BINARY_DELTA_DEFLATED 1 | |
198 | #define BINARY_LITERAL_DEFLATED 2 | |
199 | ||
200 | /* | |
201 | * This represents a "patch" to a file, both metainfo changes | |
202 | * such as creation/deletion, filemode and content changes represented | |
203 | * as a series of fragments. | |
204 | */ | |
205 | struct patch { | |
206 | char *new_name, *old_name, *def_name; | |
207 | unsigned int old_mode, new_mode; | |
208 | int is_new, is_delete; /* -1 = unknown, 0 = false, 1 = true */ | |
209 | int rejected; | |
210 | unsigned ws_rule; | |
211 | int lines_added, lines_deleted; | |
212 | int score; | |
d70e9c5c | 213 | int extension_linenr; /* first line specifying delete/new/rename/copy */ |
13b5af22 CC |
214 | unsigned int is_toplevel_relative:1; |
215 | unsigned int inaccurate_eof:1; | |
216 | unsigned int is_binary:1; | |
217 | unsigned int is_copy:1; | |
218 | unsigned int is_rename:1; | |
219 | unsigned int recount:1; | |
220 | unsigned int conflicted_threeway:1; | |
221 | unsigned int direct_to_threeway:1; | |
c24f3aba | 222 | unsigned int crlf_in_old:1; |
13b5af22 CC |
223 | struct fragment *fragments; |
224 | char *result; | |
225 | size_t resultsize; | |
eccb5a5f | 226 | char old_oid_prefix[GIT_MAX_HEXSZ + 1]; |
227 | char new_oid_prefix[GIT_MAX_HEXSZ + 1]; | |
13b5af22 CC |
228 | struct patch *next; |
229 | ||
230 | /* three-way fallback result */ | |
231 | struct object_id threeway_stage[3]; | |
232 | }; | |
233 | ||
234 | static void free_fragment_list(struct fragment *list) | |
235 | { | |
236 | while (list) { | |
237 | struct fragment *next = list->next; | |
238 | if (list->free_patch) | |
239 | free((char *)list->patch); | |
240 | free(list); | |
241 | list = next; | |
242 | } | |
243 | } | |
244 | ||
245 | static void free_patch(struct patch *patch) | |
246 | { | |
247 | free_fragment_list(patch->fragments); | |
248 | free(patch->def_name); | |
249 | free(patch->old_name); | |
250 | free(patch->new_name); | |
251 | free(patch->result); | |
252 | free(patch); | |
253 | } | |
254 | ||
255 | static void free_patch_list(struct patch *list) | |
256 | { | |
257 | while (list) { | |
258 | struct patch *next = list->next; | |
259 | free_patch(list); | |
260 | list = next; | |
261 | } | |
262 | } | |
263 | ||
264 | /* | |
265 | * A line in a file, len-bytes long (includes the terminating LF, | |
266 | * except for an incomplete line at the end if the file ends with | |
267 | * one), and its contents hashes to 'hash'. | |
268 | */ | |
269 | struct line { | |
270 | size_t len; | |
271 | unsigned hash : 24; | |
272 | unsigned flag : 8; | |
273 | #define LINE_COMMON 1 | |
274 | #define LINE_PATCHED 2 | |
275 | }; | |
276 | ||
277 | /* | |
278 | * This represents a "file", which is an array of "lines". | |
279 | */ | |
280 | struct image { | |
281 | char *buf; | |
282 | size_t len; | |
283 | size_t nr; | |
284 | size_t alloc; | |
285 | struct line *line_allocated; | |
286 | struct line *line; | |
287 | }; | |
288 | ||
289 | static uint32_t hash_line(const char *cp, size_t len) | |
290 | { | |
291 | size_t i; | |
292 | uint32_t h; | |
293 | for (i = 0, h = 0; i < len; i++) { | |
294 | if (!isspace(cp[i])) { | |
295 | h = h * 3 + (cp[i] & 0xff); | |
296 | } | |
297 | } | |
298 | return h; | |
299 | } | |
300 | ||
301 | /* | |
302 | * Compare lines s1 of length n1 and s2 of length n2, ignoring | |
303 | * whitespace difference. Returns 1 if they match, 0 otherwise | |
304 | */ | |
305 | static int fuzzy_matchlines(const char *s1, size_t n1, | |
306 | const char *s2, size_t n2) | |
307 | { | |
6ce15ce5 RS |
308 | const char *end1 = s1 + n1; |
309 | const char *end2 = s2 + n2; | |
13b5af22 CC |
310 | |
311 | /* ignore line endings */ | |
6ce15ce5 RS |
312 | while (s1 < end1 && (end1[-1] == '\r' || end1[-1] == '\n')) |
313 | end1--; | |
314 | while (s2 < end2 && (end2[-1] == '\r' || end2[-1] == '\n')) | |
315 | end2--; | |
13b5af22 | 316 | |
6ce15ce5 RS |
317 | while (s1 < end1 && s2 < end2) { |
318 | if (isspace(*s1)) { | |
319 | /* | |
320 | * Skip whitespace. We check on both buffers | |
321 | * because we don't want "a b" to match "ab". | |
322 | */ | |
323 | if (!isspace(*s2)) | |
324 | return 0; | |
325 | while (s1 < end1 && isspace(*s1)) | |
13b5af22 | 326 | s1++; |
6ce15ce5 | 327 | while (s2 < end2 && isspace(*s2)) |
13b5af22 | 328 | s2++; |
6ce15ce5 | 329 | } else if (*s1++ != *s2++) |
13b5af22 | 330 | return 0; |
13b5af22 CC |
331 | } |
332 | ||
6ce15ce5 RS |
333 | /* If we reached the end on one side only, lines don't match. */ |
334 | return s1 == end1 && s2 == end2; | |
13b5af22 CC |
335 | } |
336 | ||
337 | static void add_line_info(struct image *img, const char *bol, size_t len, unsigned flag) | |
338 | { | |
339 | ALLOC_GROW(img->line_allocated, img->nr + 1, img->alloc); | |
340 | img->line_allocated[img->nr].len = len; | |
341 | img->line_allocated[img->nr].hash = hash_line(bol, len); | |
342 | img->line_allocated[img->nr].flag = flag; | |
343 | img->nr++; | |
344 | } | |
345 | ||
346 | /* | |
347 | * "buf" has the file contents to be patched (read from various sources). | |
348 | * attach it to "image" and add line-based index to it. | |
349 | * "image" now owns the "buf". | |
350 | */ | |
351 | static void prepare_image(struct image *image, char *buf, size_t len, | |
352 | int prepare_linetable) | |
353 | { | |
354 | const char *cp, *ep; | |
355 | ||
356 | memset(image, 0, sizeof(*image)); | |
357 | image->buf = buf; | |
358 | image->len = len; | |
359 | ||
360 | if (!prepare_linetable) | |
361 | return; | |
362 | ||
363 | ep = image->buf + image->len; | |
364 | cp = image->buf; | |
365 | while (cp < ep) { | |
366 | const char *next; | |
367 | for (next = cp; next < ep && *next != '\n'; next++) | |
368 | ; | |
369 | if (next < ep) | |
370 | next++; | |
371 | add_line_info(image, cp, next - cp, 0); | |
372 | cp = next; | |
373 | } | |
374 | image->line = image->line_allocated; | |
375 | } | |
376 | ||
377 | static void clear_image(struct image *image) | |
378 | { | |
379 | free(image->buf); | |
380 | free(image->line_allocated); | |
381 | memset(image, 0, sizeof(*image)); | |
382 | } | |
383 | ||
384 | /* fmt must contain _one_ %s and no other substitution */ | |
385 | static void say_patch_name(FILE *output, const char *fmt, struct patch *patch) | |
386 | { | |
387 | struct strbuf sb = STRBUF_INIT; | |
388 | ||
389 | if (patch->old_name && patch->new_name && | |
390 | strcmp(patch->old_name, patch->new_name)) { | |
391 | quote_c_style(patch->old_name, &sb, NULL, 0); | |
392 | strbuf_addstr(&sb, " => "); | |
393 | quote_c_style(patch->new_name, &sb, NULL, 0); | |
394 | } else { | |
395 | const char *n = patch->new_name; | |
396 | if (!n) | |
397 | n = patch->old_name; | |
398 | quote_c_style(n, &sb, NULL, 0); | |
399 | } | |
400 | fprintf(output, fmt, sb.buf); | |
401 | fputc('\n', output); | |
402 | strbuf_release(&sb); | |
403 | } | |
404 | ||
405 | #define SLOP (16) | |
406 | ||
407 | static int read_patch_file(struct strbuf *sb, int fd) | |
408 | { | |
409 | if (strbuf_read(sb, fd, 0) < 0) | |
410 | return error_errno("git apply: failed to read"); | |
411 | ||
412 | /* | |
413 | * Make sure that we have some slop in the buffer | |
414 | * so that we can do speculative "memcmp" etc, and | |
415 | * see to it that it is NUL-filled. | |
416 | */ | |
417 | strbuf_grow(sb, SLOP); | |
418 | memset(sb->buf + sb->len, 0, SLOP); | |
419 | return 0; | |
420 | } | |
421 | ||
422 | static unsigned long linelen(const char *buffer, unsigned long size) | |
423 | { | |
424 | unsigned long len = 0; | |
425 | while (size--) { | |
426 | len++; | |
427 | if (*buffer++ == '\n') | |
428 | break; | |
429 | } | |
430 | return len; | |
431 | } | |
432 | ||
433 | static int is_dev_null(const char *str) | |
434 | { | |
435 | return skip_prefix(str, "/dev/null", &str) && isspace(*str); | |
436 | } | |
437 | ||
438 | #define TERM_SPACE 1 | |
439 | #define TERM_TAB 2 | |
440 | ||
441 | static int name_terminate(int c, int terminate) | |
442 | { | |
443 | if (c == ' ' && !(terminate & TERM_SPACE)) | |
444 | return 0; | |
445 | if (c == '\t' && !(terminate & TERM_TAB)) | |
446 | return 0; | |
447 | ||
448 | return 1; | |
449 | } | |
450 | ||
451 | /* remove double slashes to make --index work with such filenames */ | |
452 | static char *squash_slash(char *name) | |
453 | { | |
454 | int i = 0, j = 0; | |
455 | ||
456 | if (!name) | |
457 | return NULL; | |
458 | ||
459 | while (name[i]) { | |
460 | if ((name[j++] = name[i++]) == '/') | |
461 | while (name[i] == '/') | |
462 | i++; | |
463 | } | |
464 | name[j] = '\0'; | |
465 | return name; | |
466 | } | |
467 | ||
468 | static char *find_name_gnu(struct apply_state *state, | |
469 | const char *line, | |
13b5af22 CC |
470 | int p_value) |
471 | { | |
472 | struct strbuf name = STRBUF_INIT; | |
473 | char *cp; | |
474 | ||
475 | /* | |
476 | * Proposed "new-style" GNU patch/diff format; see | |
477 | * http://marc.info/?l=git&m=112927316408690&w=2 | |
478 | */ | |
479 | if (unquote_c_style(&name, line, NULL)) { | |
480 | strbuf_release(&name); | |
481 | return NULL; | |
482 | } | |
483 | ||
484 | for (cp = name.buf; p_value; p_value--) { | |
485 | cp = strchr(cp, '/'); | |
486 | if (!cp) { | |
487 | strbuf_release(&name); | |
488 | return NULL; | |
489 | } | |
490 | cp++; | |
491 | } | |
492 | ||
493 | strbuf_remove(&name, 0, cp - name.buf); | |
494 | if (state->root.len) | |
495 | strbuf_insert(&name, 0, state->root.buf, state->root.len); | |
496 | return squash_slash(strbuf_detach(&name, NULL)); | |
497 | } | |
498 | ||
499 | static size_t sane_tz_len(const char *line, size_t len) | |
500 | { | |
501 | const char *tz, *p; | |
502 | ||
503 | if (len < strlen(" +0500") || line[len-strlen(" +0500")] != ' ') | |
504 | return 0; | |
505 | tz = line + len - strlen(" +0500"); | |
506 | ||
507 | if (tz[1] != '+' && tz[1] != '-') | |
508 | return 0; | |
509 | ||
510 | for (p = tz + 2; p != line + len; p++) | |
511 | if (!isdigit(*p)) | |
512 | return 0; | |
513 | ||
514 | return line + len - tz; | |
515 | } | |
516 | ||
517 | static size_t tz_with_colon_len(const char *line, size_t len) | |
518 | { | |
519 | const char *tz, *p; | |
520 | ||
521 | if (len < strlen(" +08:00") || line[len - strlen(":00")] != ':') | |
522 | return 0; | |
523 | tz = line + len - strlen(" +08:00"); | |
524 | ||
525 | if (tz[0] != ' ' || (tz[1] != '+' && tz[1] != '-')) | |
526 | return 0; | |
527 | p = tz + 2; | |
528 | if (!isdigit(*p++) || !isdigit(*p++) || *p++ != ':' || | |
529 | !isdigit(*p++) || !isdigit(*p++)) | |
530 | return 0; | |
531 | ||
532 | return line + len - tz; | |
533 | } | |
534 | ||
535 | static size_t date_len(const char *line, size_t len) | |
536 | { | |
537 | const char *date, *p; | |
538 | ||
539 | if (len < strlen("72-02-05") || line[len-strlen("-05")] != '-') | |
540 | return 0; | |
541 | p = date = line + len - strlen("72-02-05"); | |
542 | ||
543 | if (!isdigit(*p++) || !isdigit(*p++) || *p++ != '-' || | |
544 | !isdigit(*p++) || !isdigit(*p++) || *p++ != '-' || | |
545 | !isdigit(*p++) || !isdigit(*p++)) /* Not a date. */ | |
546 | return 0; | |
547 | ||
548 | if (date - line >= strlen("19") && | |
549 | isdigit(date[-1]) && isdigit(date[-2])) /* 4-digit year */ | |
550 | date -= strlen("19"); | |
551 | ||
552 | return line + len - date; | |
553 | } | |
554 | ||
555 | static size_t short_time_len(const char *line, size_t len) | |
556 | { | |
557 | const char *time, *p; | |
558 | ||
559 | if (len < strlen(" 07:01:32") || line[len-strlen(":32")] != ':') | |
560 | return 0; | |
561 | p = time = line + len - strlen(" 07:01:32"); | |
562 | ||
563 | /* Permit 1-digit hours? */ | |
564 | if (*p++ != ' ' || | |
565 | !isdigit(*p++) || !isdigit(*p++) || *p++ != ':' || | |
566 | !isdigit(*p++) || !isdigit(*p++) || *p++ != ':' || | |
567 | !isdigit(*p++) || !isdigit(*p++)) /* Not a time. */ | |
568 | return 0; | |
569 | ||
570 | return line + len - time; | |
571 | } | |
572 | ||
573 | static size_t fractional_time_len(const char *line, size_t len) | |
574 | { | |
575 | const char *p; | |
576 | size_t n; | |
577 | ||
578 | /* Expected format: 19:41:17.620000023 */ | |
579 | if (!len || !isdigit(line[len - 1])) | |
580 | return 0; | |
581 | p = line + len - 1; | |
582 | ||
583 | /* Fractional seconds. */ | |
584 | while (p > line && isdigit(*p)) | |
585 | p--; | |
586 | if (*p != '.') | |
587 | return 0; | |
588 | ||
589 | /* Hours, minutes, and whole seconds. */ | |
590 | n = short_time_len(line, p - line); | |
591 | if (!n) | |
592 | return 0; | |
593 | ||
594 | return line + len - p + n; | |
595 | } | |
596 | ||
597 | static size_t trailing_spaces_len(const char *line, size_t len) | |
598 | { | |
599 | const char *p; | |
600 | ||
601 | /* Expected format: ' ' x (1 or more) */ | |
602 | if (!len || line[len - 1] != ' ') | |
603 | return 0; | |
604 | ||
605 | p = line + len; | |
606 | while (p != line) { | |
607 | p--; | |
608 | if (*p != ' ') | |
609 | return line + len - (p + 1); | |
610 | } | |
611 | ||
612 | /* All spaces! */ | |
613 | return len; | |
614 | } | |
615 | ||
616 | static size_t diff_timestamp_len(const char *line, size_t len) | |
617 | { | |
618 | const char *end = line + len; | |
619 | size_t n; | |
620 | ||
621 | /* | |
622 | * Posix: 2010-07-05 19:41:17 | |
623 | * GNU: 2010-07-05 19:41:17.620000023 -0500 | |
624 | */ | |
625 | ||
626 | if (!isdigit(end[-1])) | |
627 | return 0; | |
628 | ||
629 | n = sane_tz_len(line, end - line); | |
630 | if (!n) | |
631 | n = tz_with_colon_len(line, end - line); | |
632 | end -= n; | |
633 | ||
634 | n = short_time_len(line, end - line); | |
635 | if (!n) | |
636 | n = fractional_time_len(line, end - line); | |
637 | end -= n; | |
638 | ||
639 | n = date_len(line, end - line); | |
640 | if (!n) /* No date. Too bad. */ | |
641 | return 0; | |
642 | end -= n; | |
643 | ||
644 | if (end == line) /* No space before date. */ | |
645 | return 0; | |
646 | if (end[-1] == '\t') { /* Success! */ | |
647 | end--; | |
648 | return line + len - end; | |
649 | } | |
650 | if (end[-1] != ' ') /* No space before date. */ | |
651 | return 0; | |
652 | ||
653 | /* Whitespace damage. */ | |
654 | end -= trailing_spaces_len(line, end - line); | |
655 | return line + len - end; | |
656 | } | |
657 | ||
658 | static char *find_name_common(struct apply_state *state, | |
659 | const char *line, | |
660 | const char *def, | |
661 | int p_value, | |
662 | const char *end, | |
663 | int terminate) | |
664 | { | |
665 | int len; | |
666 | const char *start = NULL; | |
667 | ||
668 | if (p_value == 0) | |
669 | start = line; | |
670 | while (line != end) { | |
671 | char c = *line; | |
672 | ||
673 | if (!end && isspace(c)) { | |
674 | if (c == '\n') | |
675 | break; | |
676 | if (name_terminate(c, terminate)) | |
677 | break; | |
678 | } | |
679 | line++; | |
680 | if (c == '/' && !--p_value) | |
681 | start = line; | |
682 | } | |
683 | if (!start) | |
684 | return squash_slash(xstrdup_or_null(def)); | |
685 | len = line - start; | |
686 | if (!len) | |
687 | return squash_slash(xstrdup_or_null(def)); | |
688 | ||
689 | /* | |
690 | * Generally we prefer the shorter name, especially | |
691 | * if the other one is just a variation of that with | |
692 | * something else tacked on to the end (ie "file.orig" | |
693 | * or "file~"). | |
694 | */ | |
695 | if (def) { | |
696 | int deflen = strlen(def); | |
697 | if (deflen < len && !strncmp(start, def, deflen)) | |
698 | return squash_slash(xstrdup(def)); | |
699 | } | |
700 | ||
701 | if (state->root.len) { | |
702 | char *ret = xstrfmt("%s%.*s", state->root.buf, len, start); | |
703 | return squash_slash(ret); | |
704 | } | |
705 | ||
706 | return squash_slash(xmemdupz(start, len)); | |
707 | } | |
708 | ||
709 | static char *find_name(struct apply_state *state, | |
710 | const char *line, | |
711 | char *def, | |
712 | int p_value, | |
713 | int terminate) | |
714 | { | |
715 | if (*line == '"') { | |
74f8a9c9 | 716 | char *name = find_name_gnu(state, line, p_value); |
13b5af22 CC |
717 | if (name) |
718 | return name; | |
719 | } | |
720 | ||
721 | return find_name_common(state, line, def, p_value, NULL, terminate); | |
722 | } | |
723 | ||
724 | static char *find_name_traditional(struct apply_state *state, | |
725 | const char *line, | |
726 | char *def, | |
727 | int p_value) | |
728 | { | |
729 | size_t len; | |
730 | size_t date_len; | |
731 | ||
732 | if (*line == '"') { | |
74f8a9c9 | 733 | char *name = find_name_gnu(state, line, p_value); |
13b5af22 CC |
734 | if (name) |
735 | return name; | |
736 | } | |
737 | ||
738 | len = strchrnul(line, '\n') - line; | |
739 | date_len = diff_timestamp_len(line, len); | |
740 | if (!date_len) | |
741 | return find_name_common(state, line, def, p_value, NULL, TERM_TAB); | |
742 | len -= date_len; | |
743 | ||
744 | return find_name_common(state, line, def, p_value, line + len, 0); | |
745 | } | |
746 | ||
13b5af22 CC |
747 | /* |
748 | * Given the string after "--- " or "+++ ", guess the appropriate | |
749 | * p_value for the given patch. | |
750 | */ | |
751 | static int guess_p_value(struct apply_state *state, const char *nameline) | |
752 | { | |
753 | char *name, *cp; | |
754 | int val = -1; | |
755 | ||
756 | if (is_dev_null(nameline)) | |
757 | return -1; | |
758 | name = find_name_traditional(state, nameline, NULL, 0); | |
759 | if (!name) | |
760 | return -1; | |
761 | cp = strchr(name, '/'); | |
762 | if (!cp) | |
763 | val = 0; | |
764 | else if (state->prefix) { | |
765 | /* | |
766 | * Does it begin with "a/$our-prefix" and such? Then this is | |
767 | * very likely to apply to our directory. | |
768 | */ | |
881529c8 | 769 | if (starts_with(name, state->prefix)) |
13b5af22 CC |
770 | val = count_slashes(state->prefix); |
771 | else { | |
772 | cp++; | |
881529c8 | 773 | if (starts_with(cp, state->prefix)) |
13b5af22 CC |
774 | val = count_slashes(state->prefix) + 1; |
775 | } | |
776 | } | |
777 | free(name); | |
778 | return val; | |
779 | } | |
780 | ||
781 | /* | |
782 | * Does the ---/+++ line have the POSIX timestamp after the last HT? | |
783 | * GNU diff puts epoch there to signal a creation/deletion event. Is | |
784 | * this such a timestamp? | |
785 | */ | |
786 | static int has_epoch_timestamp(const char *nameline) | |
787 | { | |
788 | /* | |
789 | * We are only interested in epoch timestamp; any non-zero | |
790 | * fraction cannot be one, hence "(\.0+)?" in the regexp below. | |
791 | * For the same reason, the date must be either 1969-12-31 or | |
792 | * 1970-01-01, and the seconds part must be "00". | |
793 | */ | |
794 | const char stamp_regexp[] = | |
0db3dc75 | 795 | "^[0-2][0-9]:([0-5][0-9]):00(\\.0+)?" |
13b5af22 CC |
796 | " " |
797 | "([-+][0-2][0-9]:?[0-5][0-9])\n"; | |
798 | const char *timestamp = NULL, *cp, *colon; | |
799 | static regex_t *stamp; | |
800 | regmatch_t m[10]; | |
e4905019 | 801 | int zoneoffset, epoch_hour, hour, minute; |
13b5af22 CC |
802 | int status; |
803 | ||
804 | for (cp = nameline; *cp != '\n'; cp++) { | |
805 | if (*cp == '\t') | |
806 | timestamp = cp + 1; | |
807 | } | |
808 | if (!timestamp) | |
809 | return 0; | |
e4905019 RS |
810 | |
811 | /* | |
812 | * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31 | |
813 | * (west of GMT) or 1970-01-01 (east of GMT) | |
814 | */ | |
0db3dc75 | 815 | if (skip_prefix(timestamp, "1969-12-31 ", ×tamp)) |
e4905019 | 816 | epoch_hour = 24; |
0db3dc75 | 817 | else if (skip_prefix(timestamp, "1970-01-01 ", ×tamp)) |
e4905019 RS |
818 | epoch_hour = 0; |
819 | else | |
820 | return 0; | |
821 | ||
13b5af22 CC |
822 | if (!stamp) { |
823 | stamp = xmalloc(sizeof(*stamp)); | |
824 | if (regcomp(stamp, stamp_regexp, REG_EXTENDED)) { | |
825 | warning(_("Cannot prepare timestamp regexp %s"), | |
826 | stamp_regexp); | |
827 | return 0; | |
828 | } | |
829 | } | |
830 | ||
831 | status = regexec(stamp, timestamp, ARRAY_SIZE(m), m, 0); | |
832 | if (status) { | |
833 | if (status != REG_NOMATCH) | |
834 | warning(_("regexec returned %d for input: %s"), | |
835 | status, timestamp); | |
836 | return 0; | |
837 | } | |
838 | ||
0db3dc75 RS |
839 | hour = strtol(timestamp, NULL, 10); |
840 | minute = strtol(timestamp + m[1].rm_so, NULL, 10); | |
e4905019 | 841 | |
13b5af22 CC |
842 | zoneoffset = strtol(timestamp + m[3].rm_so + 1, (char **) &colon, 10); |
843 | if (*colon == ':') | |
844 | zoneoffset = zoneoffset * 60 + strtol(colon + 1, NULL, 10); | |
845 | else | |
846 | zoneoffset = (zoneoffset / 100) * 60 + (zoneoffset % 100); | |
847 | if (timestamp[m[3].rm_so] == '-') | |
848 | zoneoffset = -zoneoffset; | |
849 | ||
e4905019 | 850 | return hour * 60 + minute - zoneoffset == epoch_hour * 60; |
13b5af22 CC |
851 | } |
852 | ||
853 | /* | |
854 | * Get the name etc info from the ---/+++ lines of a traditional patch header | |
855 | * | |
856 | * FIXME! The end-of-filename heuristics are kind of screwy. For existing | |
857 | * files, we can happily check the index for a match, but for creating a | |
858 | * new file we should try to match whatever "patch" does. I have no idea. | |
859 | */ | |
860 | static int parse_traditional_patch(struct apply_state *state, | |
861 | const char *first, | |
862 | const char *second, | |
863 | struct patch *patch) | |
864 | { | |
865 | char *name; | |
866 | ||
867 | first += 4; /* skip "--- " */ | |
868 | second += 4; /* skip "+++ " */ | |
869 | if (!state->p_value_known) { | |
870 | int p, q; | |
871 | p = guess_p_value(state, first); | |
872 | q = guess_p_value(state, second); | |
873 | if (p < 0) p = q; | |
874 | if (0 <= p && p == q) { | |
875 | state->p_value = p; | |
876 | state->p_value_known = 1; | |
877 | } | |
878 | } | |
879 | if (is_dev_null(first)) { | |
880 | patch->is_new = 1; | |
881 | patch->is_delete = 0; | |
882 | name = find_name_traditional(state, second, NULL, state->p_value); | |
883 | patch->new_name = name; | |
884 | } else if (is_dev_null(second)) { | |
885 | patch->is_new = 0; | |
886 | patch->is_delete = 1; | |
887 | name = find_name_traditional(state, first, NULL, state->p_value); | |
888 | patch->old_name = name; | |
889 | } else { | |
890 | char *first_name; | |
891 | first_name = find_name_traditional(state, first, NULL, state->p_value); | |
892 | name = find_name_traditional(state, second, first_name, state->p_value); | |
893 | free(first_name); | |
894 | if (has_epoch_timestamp(first)) { | |
895 | patch->is_new = 1; | |
896 | patch->is_delete = 0; | |
897 | patch->new_name = name; | |
898 | } else if (has_epoch_timestamp(second)) { | |
899 | patch->is_new = 0; | |
900 | patch->is_delete = 1; | |
901 | patch->old_name = name; | |
902 | } else { | |
903 | patch->old_name = name; | |
904 | patch->new_name = xstrdup_or_null(name); | |
905 | } | |
906 | } | |
907 | if (!name) | |
908 | return error(_("unable to find filename in patch at line %d"), state->linenr); | |
909 | ||
910 | return 0; | |
911 | } | |
912 | ||
913 | static int gitdiff_hdrend(struct apply_state *state, | |
914 | const char *line, | |
915 | struct patch *patch) | |
916 | { | |
917 | return 1; | |
918 | } | |
919 | ||
920 | /* | |
921 | * We're anal about diff header consistency, to make | |
922 | * sure that we don't end up having strange ambiguous | |
923 | * patches floating around. | |
924 | * | |
925 | * As a result, gitdiff_{old|new}name() will check | |
926 | * their names against any previous information, just | |
927 | * to make sure.. | |
928 | */ | |
929 | #define DIFF_OLD_NAME 0 | |
930 | #define DIFF_NEW_NAME 1 | |
931 | ||
932 | static int gitdiff_verify_name(struct apply_state *state, | |
933 | const char *line, | |
934 | int isnull, | |
935 | char **name, | |
936 | int side) | |
937 | { | |
938 | if (!*name && !isnull) { | |
939 | *name = find_name(state, line, NULL, state->p_value, TERM_TAB); | |
940 | return 0; | |
941 | } | |
942 | ||
943 | if (*name) { | |
13b5af22 CC |
944 | char *another; |
945 | if (isnull) | |
946 | return error(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"), | |
947 | *name, state->linenr); | |
948 | another = find_name(state, line, NULL, state->p_value, TERM_TAB); | |
2d105451 | 949 | if (!another || strcmp(another, *name)) { |
13b5af22 CC |
950 | free(another); |
951 | return error((side == DIFF_NEW_NAME) ? | |
952 | _("git apply: bad git-diff - inconsistent new filename on line %d") : | |
953 | _("git apply: bad git-diff - inconsistent old filename on line %d"), state->linenr); | |
954 | } | |
955 | free(another); | |
956 | } else { | |
e454ad4b | 957 | if (!is_dev_null(line)) |
13b5af22 CC |
958 | return error(_("git apply: bad git-diff - expected /dev/null on line %d"), state->linenr); |
959 | } | |
960 | ||
961 | return 0; | |
962 | } | |
963 | ||
964 | static int gitdiff_oldname(struct apply_state *state, | |
965 | const char *line, | |
966 | struct patch *patch) | |
967 | { | |
968 | return gitdiff_verify_name(state, line, | |
969 | patch->is_new, &patch->old_name, | |
970 | DIFF_OLD_NAME); | |
971 | } | |
972 | ||
973 | static int gitdiff_newname(struct apply_state *state, | |
974 | const char *line, | |
975 | struct patch *patch) | |
976 | { | |
977 | return gitdiff_verify_name(state, line, | |
978 | patch->is_delete, &patch->new_name, | |
979 | DIFF_NEW_NAME); | |
980 | } | |
981 | ||
44e5471a RS |
982 | static int parse_mode_line(const char *line, int linenr, unsigned int *mode) |
983 | { | |
984 | char *end; | |
985 | *mode = strtoul(line, &end, 8); | |
986 | if (end == line || !isspace(*end)) | |
987 | return error(_("invalid mode on line %d: %s"), linenr, line); | |
988 | return 0; | |
989 | } | |
990 | ||
13b5af22 CC |
991 | static int gitdiff_oldmode(struct apply_state *state, |
992 | const char *line, | |
993 | struct patch *patch) | |
994 | { | |
44e5471a | 995 | return parse_mode_line(line, state->linenr, &patch->old_mode); |
13b5af22 CC |
996 | } |
997 | ||
998 | static int gitdiff_newmode(struct apply_state *state, | |
999 | const char *line, | |
1000 | struct patch *patch) | |
1001 | { | |
44e5471a | 1002 | return parse_mode_line(line, state->linenr, &patch->new_mode); |
13b5af22 CC |
1003 | } |
1004 | ||
1005 | static int gitdiff_delete(struct apply_state *state, | |
1006 | const char *line, | |
1007 | struct patch *patch) | |
1008 | { | |
1009 | patch->is_delete = 1; | |
1010 | free(patch->old_name); | |
1011 | patch->old_name = xstrdup_or_null(patch->def_name); | |
1012 | return gitdiff_oldmode(state, line, patch); | |
1013 | } | |
1014 | ||
1015 | static int gitdiff_newfile(struct apply_state *state, | |
1016 | const char *line, | |
1017 | struct patch *patch) | |
1018 | { | |
1019 | patch->is_new = 1; | |
1020 | free(patch->new_name); | |
1021 | patch->new_name = xstrdup_or_null(patch->def_name); | |
1022 | return gitdiff_newmode(state, line, patch); | |
1023 | } | |
1024 | ||
1025 | static int gitdiff_copysrc(struct apply_state *state, | |
1026 | const char *line, | |
1027 | struct patch *patch) | |
1028 | { | |
1029 | patch->is_copy = 1; | |
1030 | free(patch->old_name); | |
1031 | patch->old_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0); | |
1032 | return 0; | |
1033 | } | |
1034 | ||
1035 | static int gitdiff_copydst(struct apply_state *state, | |
1036 | const char *line, | |
1037 | struct patch *patch) | |
1038 | { | |
1039 | patch->is_copy = 1; | |
1040 | free(patch->new_name); | |
1041 | patch->new_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0); | |
1042 | return 0; | |
1043 | } | |
1044 | ||
1045 | static int gitdiff_renamesrc(struct apply_state *state, | |
1046 | const char *line, | |
1047 | struct patch *patch) | |
1048 | { | |
1049 | patch->is_rename = 1; | |
1050 | free(patch->old_name); | |
1051 | patch->old_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0); | |
1052 | return 0; | |
1053 | } | |
1054 | ||
1055 | static int gitdiff_renamedst(struct apply_state *state, | |
1056 | const char *line, | |
1057 | struct patch *patch) | |
1058 | { | |
1059 | patch->is_rename = 1; | |
1060 | free(patch->new_name); | |
1061 | patch->new_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0); | |
1062 | return 0; | |
1063 | } | |
1064 | ||
1065 | static int gitdiff_similarity(struct apply_state *state, | |
1066 | const char *line, | |
1067 | struct patch *patch) | |
1068 | { | |
1069 | unsigned long val = strtoul(line, NULL, 10); | |
1070 | if (val <= 100) | |
1071 | patch->score = val; | |
1072 | return 0; | |
1073 | } | |
1074 | ||
1075 | static int gitdiff_dissimilarity(struct apply_state *state, | |
1076 | const char *line, | |
1077 | struct patch *patch) | |
1078 | { | |
1079 | unsigned long val = strtoul(line, NULL, 10); | |
1080 | if (val <= 100) | |
1081 | patch->score = val; | |
1082 | return 0; | |
1083 | } | |
1084 | ||
1085 | static int gitdiff_index(struct apply_state *state, | |
1086 | const char *line, | |
1087 | struct patch *patch) | |
1088 | { | |
1089 | /* | |
1090 | * index line is N hexadecimal, "..", N hexadecimal, | |
1091 | * and optional space with octal mode. | |
1092 | */ | |
1093 | const char *ptr, *eol; | |
1094 | int len; | |
93eb00f7 | 1095 | const unsigned hexsz = the_hash_algo->hexsz; |
13b5af22 CC |
1096 | |
1097 | ptr = strchr(line, '.'); | |
93eb00f7 | 1098 | if (!ptr || ptr[1] != '.' || hexsz < ptr - line) |
13b5af22 CC |
1099 | return 0; |
1100 | len = ptr - line; | |
eccb5a5f | 1101 | memcpy(patch->old_oid_prefix, line, len); |
1102 | patch->old_oid_prefix[len] = 0; | |
13b5af22 CC |
1103 | |
1104 | line = ptr + 2; | |
1105 | ptr = strchr(line, ' '); | |
1106 | eol = strchrnul(line, '\n'); | |
1107 | ||
1108 | if (!ptr || eol < ptr) | |
1109 | ptr = eol; | |
1110 | len = ptr - line; | |
1111 | ||
93eb00f7 | 1112 | if (hexsz < len) |
13b5af22 | 1113 | return 0; |
eccb5a5f | 1114 | memcpy(patch->new_oid_prefix, line, len); |
1115 | patch->new_oid_prefix[len] = 0; | |
13b5af22 | 1116 | if (*ptr == ' ') |
44e5471a | 1117 | return gitdiff_oldmode(state, ptr + 1, patch); |
13b5af22 CC |
1118 | return 0; |
1119 | } | |
1120 | ||
1121 | /* | |
1122 | * This is normal for a diff that doesn't change anything: we'll fall through | |
1123 | * into the next diff. Tell the parser to break out. | |
1124 | */ | |
1125 | static int gitdiff_unrecognized(struct apply_state *state, | |
1126 | const char *line, | |
1127 | struct patch *patch) | |
1128 | { | |
1129 | return 1; | |
1130 | } | |
1131 | ||
1132 | /* | |
1133 | * Skip p_value leading components from "line"; as we do not accept | |
1134 | * absolute paths, return NULL in that case. | |
1135 | */ | |
1136 | static const char *skip_tree_prefix(struct apply_state *state, | |
1137 | const char *line, | |
1138 | int llen) | |
1139 | { | |
1140 | int nslash; | |
1141 | int i; | |
1142 | ||
1143 | if (!state->p_value) | |
1144 | return (llen && line[0] == '/') ? NULL : line; | |
1145 | ||
1146 | nslash = state->p_value; | |
1147 | for (i = 0; i < llen; i++) { | |
1148 | int ch = line[i]; | |
1149 | if (ch == '/' && --nslash <= 0) | |
1150 | return (i == 0) ? NULL : &line[i + 1]; | |
1151 | } | |
1152 | return NULL; | |
1153 | } | |
1154 | ||
1155 | /* | |
1156 | * This is to extract the same name that appears on "diff --git" | |
1157 | * line. We do not find and return anything if it is a rename | |
1158 | * patch, and it is OK because we will find the name elsewhere. | |
1159 | * We need to reliably find name only when it is mode-change only, | |
1160 | * creation or deletion of an empty file. In any of these cases, | |
1161 | * both sides are the same name under a/ and b/ respectively. | |
1162 | */ | |
1163 | static char *git_header_name(struct apply_state *state, | |
1164 | const char *line, | |
1165 | int llen) | |
1166 | { | |
1167 | const char *name; | |
1168 | const char *second = NULL; | |
1169 | size_t len, line_len; | |
1170 | ||
1171 | line += strlen("diff --git "); | |
1172 | llen -= strlen("diff --git "); | |
1173 | ||
1174 | if (*line == '"') { | |
1175 | const char *cp; | |
1176 | struct strbuf first = STRBUF_INIT; | |
1177 | struct strbuf sp = STRBUF_INIT; | |
1178 | ||
1179 | if (unquote_c_style(&first, line, &second)) | |
1180 | goto free_and_fail1; | |
1181 | ||
1182 | /* strip the a/b prefix including trailing slash */ | |
1183 | cp = skip_tree_prefix(state, first.buf, first.len); | |
1184 | if (!cp) | |
1185 | goto free_and_fail1; | |
1186 | strbuf_remove(&first, 0, cp - first.buf); | |
1187 | ||
1188 | /* | |
1189 | * second points at one past closing dq of name. | |
1190 | * find the second name. | |
1191 | */ | |
1192 | while ((second < line + llen) && isspace(*second)) | |
1193 | second++; | |
1194 | ||
1195 | if (line + llen <= second) | |
1196 | goto free_and_fail1; | |
1197 | if (*second == '"') { | |
1198 | if (unquote_c_style(&sp, second, NULL)) | |
1199 | goto free_and_fail1; | |
1200 | cp = skip_tree_prefix(state, sp.buf, sp.len); | |
1201 | if (!cp) | |
1202 | goto free_and_fail1; | |
1203 | /* They must match, otherwise ignore */ | |
1204 | if (strcmp(cp, first.buf)) | |
1205 | goto free_and_fail1; | |
1206 | strbuf_release(&sp); | |
1207 | return strbuf_detach(&first, NULL); | |
1208 | } | |
1209 | ||
1210 | /* unquoted second */ | |
1211 | cp = skip_tree_prefix(state, second, line + llen - second); | |
1212 | if (!cp) | |
1213 | goto free_and_fail1; | |
1214 | if (line + llen - cp != first.len || | |
1215 | memcmp(first.buf, cp, first.len)) | |
1216 | goto free_and_fail1; | |
1217 | return strbuf_detach(&first, NULL); | |
1218 | ||
1219 | free_and_fail1: | |
1220 | strbuf_release(&first); | |
1221 | strbuf_release(&sp); | |
1222 | return NULL; | |
1223 | } | |
1224 | ||
1225 | /* unquoted first name */ | |
1226 | name = skip_tree_prefix(state, line, llen); | |
1227 | if (!name) | |
1228 | return NULL; | |
1229 | ||
1230 | /* | |
1231 | * since the first name is unquoted, a dq if exists must be | |
1232 | * the beginning of the second name. | |
1233 | */ | |
1234 | for (second = name; second < line + llen; second++) { | |
1235 | if (*second == '"') { | |
1236 | struct strbuf sp = STRBUF_INIT; | |
1237 | const char *np; | |
1238 | ||
1239 | if (unquote_c_style(&sp, second, NULL)) | |
1240 | goto free_and_fail2; | |
1241 | ||
1242 | np = skip_tree_prefix(state, sp.buf, sp.len); | |
1243 | if (!np) | |
1244 | goto free_and_fail2; | |
1245 | ||
1246 | len = sp.buf + sp.len - np; | |
1247 | if (len < second - name && | |
1248 | !strncmp(np, name, len) && | |
1249 | isspace(name[len])) { | |
1250 | /* Good */ | |
1251 | strbuf_remove(&sp, 0, np - sp.buf); | |
1252 | return strbuf_detach(&sp, NULL); | |
1253 | } | |
1254 | ||
1255 | free_and_fail2: | |
1256 | strbuf_release(&sp); | |
1257 | return NULL; | |
1258 | } | |
1259 | } | |
1260 | ||
1261 | /* | |
1262 | * Accept a name only if it shows up twice, exactly the same | |
1263 | * form. | |
1264 | */ | |
1265 | second = strchr(name, '\n'); | |
1266 | if (!second) | |
1267 | return NULL; | |
1268 | line_len = second - name; | |
1269 | for (len = 0 ; ; len++) { | |
1270 | switch (name[len]) { | |
1271 | default: | |
1272 | continue; | |
1273 | case '\n': | |
1274 | return NULL; | |
1275 | case '\t': case ' ': | |
1276 | /* | |
1277 | * Is this the separator between the preimage | |
1278 | * and the postimage pathname? Again, we are | |
1279 | * only interested in the case where there is | |
1280 | * no rename, as this is only to set def_name | |
1281 | * and a rename patch has the names elsewhere | |
1282 | * in an unambiguous form. | |
1283 | */ | |
1284 | if (!name[len + 1]) | |
1285 | return NULL; /* no postimage name */ | |
1286 | second = skip_tree_prefix(state, name + len + 1, | |
1287 | line_len - (len + 1)); | |
1288 | if (!second) | |
1289 | return NULL; | |
1290 | /* | |
1291 | * Does len bytes starting at "name" and "second" | |
1292 | * (that are separated by one HT or SP we just | |
1293 | * found) exactly match? | |
1294 | */ | |
1295 | if (second[len] == '\n' && !strncmp(name, second, len)) | |
1296 | return xmemdupz(name, len); | |
1297 | } | |
1298 | } | |
1299 | } | |
1300 | ||
d70e9c5c RS |
1301 | static int check_header_line(struct apply_state *state, struct patch *patch) |
1302 | { | |
1303 | int extensions = (patch->is_delete == 1) + (patch->is_new == 1) + | |
1304 | (patch->is_rename == 1) + (patch->is_copy == 1); | |
1305 | if (extensions > 1) | |
1306 | return error(_("inconsistent header lines %d and %d"), | |
1307 | patch->extension_linenr, state->linenr); | |
1308 | if (extensions && !patch->extension_linenr) | |
1309 | patch->extension_linenr = state->linenr; | |
1310 | return 0; | |
1311 | } | |
1312 | ||
13b5af22 CC |
1313 | /* Verify that we recognize the lines following a git header */ |
1314 | static int parse_git_header(struct apply_state *state, | |
1315 | const char *line, | |
1316 | int len, | |
1317 | unsigned int size, | |
1318 | struct patch *patch) | |
1319 | { | |
1320 | unsigned long offset; | |
1321 | ||
1322 | /* A git diff has explicit new/delete information, so we don't guess */ | |
1323 | patch->is_new = 0; | |
1324 | patch->is_delete = 0; | |
1325 | ||
1326 | /* | |
1327 | * Some things may not have the old name in the | |
1328 | * rest of the headers anywhere (pure mode changes, | |
1329 | * or removing or adding empty files), so we get | |
1330 | * the default name from the header. | |
1331 | */ | |
1332 | patch->def_name = git_header_name(state, line, len); | |
1333 | if (patch->def_name && state->root.len) { | |
1334 | char *s = xstrfmt("%s%s", state->root.buf, patch->def_name); | |
1335 | free(patch->def_name); | |
1336 | patch->def_name = s; | |
1337 | } | |
1338 | ||
1339 | line += len; | |
1340 | size -= len; | |
1341 | state->linenr++; | |
1342 | for (offset = len ; size > 0 ; offset += len, size -= len, line += len, state->linenr++) { | |
1343 | static const struct opentry { | |
1344 | const char *str; | |
1345 | int (*fn)(struct apply_state *, const char *, struct patch *); | |
1346 | } optable[] = { | |
1347 | { "@@ -", gitdiff_hdrend }, | |
1348 | { "--- ", gitdiff_oldname }, | |
1349 | { "+++ ", gitdiff_newname }, | |
1350 | { "old mode ", gitdiff_oldmode }, | |
1351 | { "new mode ", gitdiff_newmode }, | |
1352 | { "deleted file mode ", gitdiff_delete }, | |
1353 | { "new file mode ", gitdiff_newfile }, | |
1354 | { "copy from ", gitdiff_copysrc }, | |
1355 | { "copy to ", gitdiff_copydst }, | |
1356 | { "rename old ", gitdiff_renamesrc }, | |
1357 | { "rename new ", gitdiff_renamedst }, | |
1358 | { "rename from ", gitdiff_renamesrc }, | |
1359 | { "rename to ", gitdiff_renamedst }, | |
1360 | { "similarity index ", gitdiff_similarity }, | |
1361 | { "dissimilarity index ", gitdiff_dissimilarity }, | |
1362 | { "index ", gitdiff_index }, | |
1363 | { "", gitdiff_unrecognized }, | |
1364 | }; | |
1365 | int i; | |
1366 | ||
1367 | len = linelen(line, size); | |
1368 | if (!len || line[len-1] != '\n') | |
1369 | break; | |
1370 | for (i = 0; i < ARRAY_SIZE(optable); i++) { | |
1371 | const struct opentry *p = optable + i; | |
1372 | int oplen = strlen(p->str); | |
1373 | int res; | |
1374 | if (len < oplen || memcmp(p->str, line, oplen)) | |
1375 | continue; | |
1376 | res = p->fn(state, line + oplen, patch); | |
1377 | if (res < 0) | |
1378 | return -1; | |
d70e9c5c RS |
1379 | if (check_header_line(state, patch)) |
1380 | return -1; | |
13b5af22 CC |
1381 | if (res > 0) |
1382 | return offset; | |
1383 | break; | |
1384 | } | |
1385 | } | |
1386 | ||
1387 | return offset; | |
1388 | } | |
1389 | ||
1390 | static int parse_num(const char *line, unsigned long *p) | |
1391 | { | |
1392 | char *ptr; | |
1393 | ||
1394 | if (!isdigit(*line)) | |
1395 | return 0; | |
1396 | *p = strtoul(line, &ptr, 10); | |
1397 | return ptr - line; | |
1398 | } | |
1399 | ||
1400 | static int parse_range(const char *line, int len, int offset, const char *expect, | |
1401 | unsigned long *p1, unsigned long *p2) | |
1402 | { | |
1403 | int digits, ex; | |
1404 | ||
1405 | if (offset < 0 || offset >= len) | |
1406 | return -1; | |
1407 | line += offset; | |
1408 | len -= offset; | |
1409 | ||
1410 | digits = parse_num(line, p1); | |
1411 | if (!digits) | |
1412 | return -1; | |
1413 | ||
1414 | offset += digits; | |
1415 | line += digits; | |
1416 | len -= digits; | |
1417 | ||
1418 | *p2 = 1; | |
1419 | if (*line == ',') { | |
1420 | digits = parse_num(line+1, p2); | |
1421 | if (!digits) | |
1422 | return -1; | |
1423 | ||
1424 | offset += digits+1; | |
1425 | line += digits+1; | |
1426 | len -= digits+1; | |
1427 | } | |
1428 | ||
1429 | ex = strlen(expect); | |
1430 | if (ex > len) | |
1431 | return -1; | |
1432 | if (memcmp(line, expect, ex)) | |
1433 | return -1; | |
1434 | ||
1435 | return offset + ex; | |
1436 | } | |
1437 | ||
1438 | static void recount_diff(const char *line, int size, struct fragment *fragment) | |
1439 | { | |
1440 | int oldlines = 0, newlines = 0, ret = 0; | |
1441 | ||
1442 | if (size < 1) { | |
1443 | warning("recount: ignore empty hunk"); | |
1444 | return; | |
1445 | } | |
1446 | ||
1447 | for (;;) { | |
1448 | int len = linelen(line, size); | |
1449 | size -= len; | |
1450 | line += len; | |
1451 | ||
1452 | if (size < 1) | |
1453 | break; | |
1454 | ||
1455 | switch (*line) { | |
1456 | case ' ': case '\n': | |
1457 | newlines++; | |
1458 | /* fall through */ | |
1459 | case '-': | |
1460 | oldlines++; | |
1461 | continue; | |
1462 | case '+': | |
1463 | newlines++; | |
1464 | continue; | |
1465 | case '\\': | |
1466 | continue; | |
1467 | case '@': | |
1468 | ret = size < 3 || !starts_with(line, "@@ "); | |
1469 | break; | |
1470 | case 'd': | |
1471 | ret = size < 5 || !starts_with(line, "diff "); | |
1472 | break; | |
1473 | default: | |
1474 | ret = -1; | |
1475 | break; | |
1476 | } | |
1477 | if (ret) { | |
1478 | warning(_("recount: unexpected line: %.*s"), | |
1479 | (int)linelen(line, size), line); | |
1480 | return; | |
1481 | } | |
1482 | break; | |
1483 | } | |
1484 | fragment->oldlines = oldlines; | |
1485 | fragment->newlines = newlines; | |
1486 | } | |
1487 | ||
1488 | /* | |
1489 | * Parse a unified diff fragment header of the | |
1490 | * form "@@ -a,b +c,d @@" | |
1491 | */ | |
1492 | static int parse_fragment_header(const char *line, int len, struct fragment *fragment) | |
1493 | { | |
1494 | int offset; | |
1495 | ||
1496 | if (!len || line[len-1] != '\n') | |
1497 | return -1; | |
1498 | ||
1499 | /* Figure out the number of lines in a fragment */ | |
1500 | offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines); | |
1501 | offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines); | |
1502 | ||
1503 | return offset; | |
1504 | } | |
1505 | ||
1506 | /* | |
1507 | * Find file diff header | |
1508 | * | |
1509 | * Returns: | |
1510 | * -1 if no header was found | |
1511 | * -128 in case of error | |
1512 | * the size of the header in bytes (called "offset") otherwise | |
1513 | */ | |
1514 | static int find_header(struct apply_state *state, | |
1515 | const char *line, | |
1516 | unsigned long size, | |
1517 | int *hdrsize, | |
1518 | struct patch *patch) | |
1519 | { | |
1520 | unsigned long offset, len; | |
1521 | ||
1522 | patch->is_toplevel_relative = 0; | |
1523 | patch->is_rename = patch->is_copy = 0; | |
1524 | patch->is_new = patch->is_delete = -1; | |
1525 | patch->old_mode = patch->new_mode = 0; | |
1526 | patch->old_name = patch->new_name = NULL; | |
1527 | for (offset = 0; size > 0; offset += len, size -= len, line += len, state->linenr++) { | |
1528 | unsigned long nextlen; | |
1529 | ||
1530 | len = linelen(line, size); | |
1531 | if (!len) | |
1532 | break; | |
1533 | ||
1534 | /* Testing this early allows us to take a few shortcuts.. */ | |
1535 | if (len < 6) | |
1536 | continue; | |
1537 | ||
1538 | /* | |
1539 | * Make sure we don't find any unconnected patch fragments. | |
1540 | * That's a sign that we didn't find a header, and that a | |
1541 | * patch has become corrupted/broken up. | |
1542 | */ | |
1543 | if (!memcmp("@@ -", line, 4)) { | |
1544 | struct fragment dummy; | |
1545 | if (parse_fragment_header(line, len, &dummy) < 0) | |
1546 | continue; | |
1547 | error(_("patch fragment without header at line %d: %.*s"), | |
1548 | state->linenr, (int)len-1, line); | |
1549 | return -128; | |
1550 | } | |
1551 | ||
1552 | if (size < len + 6) | |
1553 | break; | |
1554 | ||
1555 | /* | |
1556 | * Git patch? It might not have a real patch, just a rename | |
1557 | * or mode change, so we handle that specially | |
1558 | */ | |
1559 | if (!memcmp("diff --git ", line, 11)) { | |
1560 | int git_hdr_len = parse_git_header(state, line, len, size, patch); | |
1561 | if (git_hdr_len < 0) | |
1562 | return -128; | |
1563 | if (git_hdr_len <= len) | |
1564 | continue; | |
1565 | if (!patch->old_name && !patch->new_name) { | |
1566 | if (!patch->def_name) { | |
1567 | error(Q_("git diff header lacks filename information when removing " | |
1568 | "%d leading pathname component (line %d)", | |
1569 | "git diff header lacks filename information when removing " | |
1570 | "%d leading pathname components (line %d)", | |
1571 | state->p_value), | |
1572 | state->p_value, state->linenr); | |
1573 | return -128; | |
1574 | } | |
1575 | patch->old_name = xstrdup(patch->def_name); | |
1576 | patch->new_name = xstrdup(patch->def_name); | |
1577 | } | |
42699741 RS |
1578 | if ((!patch->new_name && !patch->is_delete) || |
1579 | (!patch->old_name && !patch->is_new)) { | |
f25dfb5e VA |
1580 | error(_("git diff header lacks filename information " |
1581 | "(line %d)"), state->linenr); | |
13b5af22 CC |
1582 | return -128; |
1583 | } | |
1584 | patch->is_toplevel_relative = 1; | |
1585 | *hdrsize = git_hdr_len; | |
1586 | return offset; | |
1587 | } | |
1588 | ||
1589 | /* --- followed by +++ ? */ | |
1590 | if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4)) | |
1591 | continue; | |
1592 | ||
1593 | /* | |
1594 | * We only accept unified patches, so we want it to | |
1595 | * at least have "@@ -a,b +c,d @@\n", which is 14 chars | |
1596 | * minimum ("@@ -0,0 +1 @@\n" is the shortest). | |
1597 | */ | |
1598 | nextlen = linelen(line + len, size - len); | |
1599 | if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4)) | |
1600 | continue; | |
1601 | ||
1602 | /* Ok, we'll consider it a patch */ | |
1603 | if (parse_traditional_patch(state, line, line+len, patch)) | |
1604 | return -128; | |
1605 | *hdrsize = len + nextlen; | |
1606 | state->linenr += 2; | |
1607 | return offset; | |
1608 | } | |
1609 | return -1; | |
1610 | } | |
1611 | ||
1612 | static void record_ws_error(struct apply_state *state, | |
1613 | unsigned result, | |
1614 | const char *line, | |
1615 | int len, | |
1616 | int linenr) | |
1617 | { | |
1618 | char *err; | |
1619 | ||
1620 | if (!result) | |
1621 | return; | |
1622 | ||
1623 | state->whitespace_error++; | |
1624 | if (state->squelch_whitespace_errors && | |
1625 | state->squelch_whitespace_errors < state->whitespace_error) | |
1626 | return; | |
1627 | ||
1628 | err = whitespace_error_string(result); | |
a46160d2 CC |
1629 | if (state->apply_verbosity > verbosity_silent) |
1630 | fprintf(stderr, "%s:%d: %s.\n%.*s\n", | |
1631 | state->patch_input_file, linenr, err, len, line); | |
13b5af22 CC |
1632 | free(err); |
1633 | } | |
1634 | ||
1635 | static void check_whitespace(struct apply_state *state, | |
1636 | const char *line, | |
1637 | int len, | |
1638 | unsigned ws_rule) | |
1639 | { | |
1640 | unsigned result = ws_check(line + 1, len - 1, ws_rule); | |
1641 | ||
1642 | record_ws_error(state, result, line + 1, len - 2, state->linenr); | |
1643 | } | |
1644 | ||
c24f3aba TB |
1645 | /* |
1646 | * Check if the patch has context lines with CRLF or | |
1647 | * the patch wants to remove lines with CRLF. | |
1648 | */ | |
1649 | static void check_old_for_crlf(struct patch *patch, const char *line, int len) | |
1650 | { | |
1651 | if (len >= 2 && line[len-1] == '\n' && line[len-2] == '\r') { | |
1652 | patch->ws_rule |= WS_CR_AT_EOL; | |
1653 | patch->crlf_in_old = 1; | |
1654 | } | |
1655 | } | |
1656 | ||
1657 | ||
13b5af22 CC |
1658 | /* |
1659 | * Parse a unified diff. Note that this really needs to parse each | |
1660 | * fragment separately, since the only way to know the difference | |
1661 | * between a "---" that is part of a patch, and a "---" that starts | |
1662 | * the next patch is to look at the line counts.. | |
1663 | */ | |
1664 | static int parse_fragment(struct apply_state *state, | |
1665 | const char *line, | |
1666 | unsigned long size, | |
1667 | struct patch *patch, | |
1668 | struct fragment *fragment) | |
1669 | { | |
1670 | int added, deleted; | |
1671 | int len = linelen(line, size), offset; | |
1672 | unsigned long oldlines, newlines; | |
1673 | unsigned long leading, trailing; | |
1674 | ||
1675 | offset = parse_fragment_header(line, len, fragment); | |
1676 | if (offset < 0) | |
1677 | return -1; | |
1678 | if (offset > 0 && patch->recount) | |
1679 | recount_diff(line + offset, size - offset, fragment); | |
1680 | oldlines = fragment->oldlines; | |
1681 | newlines = fragment->newlines; | |
1682 | leading = 0; | |
1683 | trailing = 0; | |
1684 | ||
1685 | /* Parse the thing.. */ | |
1686 | line += len; | |
1687 | size -= len; | |
1688 | state->linenr++; | |
1689 | added = deleted = 0; | |
1690 | for (offset = len; | |
1691 | 0 < size; | |
1692 | offset += len, size -= len, line += len, state->linenr++) { | |
1693 | if (!oldlines && !newlines) | |
1694 | break; | |
1695 | len = linelen(line, size); | |
1696 | if (!len || line[len-1] != '\n') | |
1697 | return -1; | |
1698 | switch (*line) { | |
1699 | default: | |
1700 | return -1; | |
1701 | case '\n': /* newer GNU diff, an empty context line */ | |
1702 | case ' ': | |
1703 | oldlines--; | |
1704 | newlines--; | |
1705 | if (!deleted && !added) | |
1706 | leading++; | |
1707 | trailing++; | |
c24f3aba | 1708 | check_old_for_crlf(patch, line, len); |
13b5af22 CC |
1709 | if (!state->apply_in_reverse && |
1710 | state->ws_error_action == correct_ws_error) | |
1711 | check_whitespace(state, line, len, patch->ws_rule); | |
1712 | break; | |
1713 | case '-': | |
c24f3aba TB |
1714 | if (!state->apply_in_reverse) |
1715 | check_old_for_crlf(patch, line, len); | |
13b5af22 CC |
1716 | if (state->apply_in_reverse && |
1717 | state->ws_error_action != nowarn_ws_error) | |
1718 | check_whitespace(state, line, len, patch->ws_rule); | |
1719 | deleted++; | |
1720 | oldlines--; | |
1721 | trailing = 0; | |
1722 | break; | |
1723 | case '+': | |
c24f3aba TB |
1724 | if (state->apply_in_reverse) |
1725 | check_old_for_crlf(patch, line, len); | |
13b5af22 CC |
1726 | if (!state->apply_in_reverse && |
1727 | state->ws_error_action != nowarn_ws_error) | |
1728 | check_whitespace(state, line, len, patch->ws_rule); | |
1729 | added++; | |
1730 | newlines--; | |
1731 | trailing = 0; | |
1732 | break; | |
1733 | ||
1734 | /* | |
1735 | * We allow "\ No newline at end of file". Depending | |
1736 | * on locale settings when the patch was produced we | |
1737 | * don't know what this line looks like. The only | |
1738 | * thing we do know is that it begins with "\ ". | |
1739 | * Checking for 12 is just for sanity check -- any | |
1740 | * l10n of "\ No newline..." is at least that long. | |
1741 | */ | |
1742 | case '\\': | |
1743 | if (len < 12 || memcmp(line, "\\ ", 2)) | |
1744 | return -1; | |
1745 | break; | |
1746 | } | |
1747 | } | |
1748 | if (oldlines || newlines) | |
1749 | return -1; | |
22cb3835 | 1750 | if (!patch->recount && !deleted && !added) |
13b5af22 CC |
1751 | return -1; |
1752 | ||
1753 | fragment->leading = leading; | |
1754 | fragment->trailing = trailing; | |
1755 | ||
1756 | /* | |
1757 | * If a fragment ends with an incomplete line, we failed to include | |
1758 | * it in the above loop because we hit oldlines == newlines == 0 | |
1759 | * before seeing it. | |
1760 | */ | |
1761 | if (12 < size && !memcmp(line, "\\ ", 2)) | |
1762 | offset += linelen(line, size); | |
1763 | ||
1764 | patch->lines_added += added; | |
1765 | patch->lines_deleted += deleted; | |
1766 | ||
1767 | if (0 < patch->is_new && oldlines) | |
1768 | return error(_("new file depends on old contents")); | |
1769 | if (0 < patch->is_delete && newlines) | |
1770 | return error(_("deleted file still has contents")); | |
1771 | return offset; | |
1772 | } | |
1773 | ||
1774 | /* | |
1775 | * We have seen "diff --git a/... b/..." header (or a traditional patch | |
1776 | * header). Read hunks that belong to this patch into fragments and hang | |
1777 | * them to the given patch structure. | |
1778 | * | |
1779 | * The (fragment->patch, fragment->size) pair points into the memory given | |
1780 | * by the caller, not a copy, when we return. | |
1781 | * | |
1782 | * Returns: | |
1783 | * -1 in case of error, | |
1784 | * the number of bytes in the patch otherwise. | |
1785 | */ | |
1786 | static int parse_single_patch(struct apply_state *state, | |
1787 | const char *line, | |
1788 | unsigned long size, | |
1789 | struct patch *patch) | |
1790 | { | |
1791 | unsigned long offset = 0; | |
1792 | unsigned long oldlines = 0, newlines = 0, context = 0; | |
1793 | struct fragment **fragp = &patch->fragments; | |
1794 | ||
1795 | while (size > 4 && !memcmp(line, "@@ -", 4)) { | |
1796 | struct fragment *fragment; | |
1797 | int len; | |
1798 | ||
1799 | fragment = xcalloc(1, sizeof(*fragment)); | |
1800 | fragment->linenr = state->linenr; | |
1801 | len = parse_fragment(state, line, size, patch, fragment); | |
1802 | if (len <= 0) { | |
1803 | free(fragment); | |
1804 | return error(_("corrupt patch at line %d"), state->linenr); | |
1805 | } | |
1806 | fragment->patch = line; | |
1807 | fragment->size = len; | |
1808 | oldlines += fragment->oldlines; | |
1809 | newlines += fragment->newlines; | |
1810 | context += fragment->leading + fragment->trailing; | |
1811 | ||
1812 | *fragp = fragment; | |
1813 | fragp = &fragment->next; | |
1814 | ||
1815 | offset += len; | |
1816 | line += len; | |
1817 | size -= len; | |
1818 | } | |
1819 | ||
1820 | /* | |
1821 | * If something was removed (i.e. we have old-lines) it cannot | |
1822 | * be creation, and if something was added it cannot be | |
1823 | * deletion. However, the reverse is not true; --unified=0 | |
1824 | * patches that only add are not necessarily creation even | |
1825 | * though they do not have any old lines, and ones that only | |
1826 | * delete are not necessarily deletion. | |
1827 | * | |
1828 | * Unfortunately, a real creation/deletion patch do _not_ have | |
1829 | * any context line by definition, so we cannot safely tell it | |
1830 | * apart with --unified=0 insanity. At least if the patch has | |
1831 | * more than one hunk it is not creation or deletion. | |
1832 | */ | |
1833 | if (patch->is_new < 0 && | |
1834 | (oldlines || (patch->fragments && patch->fragments->next))) | |
1835 | patch->is_new = 0; | |
1836 | if (patch->is_delete < 0 && | |
1837 | (newlines || (patch->fragments && patch->fragments->next))) | |
1838 | patch->is_delete = 0; | |
1839 | ||
1840 | if (0 < patch->is_new && oldlines) | |
1841 | return error(_("new file %s depends on old contents"), patch->new_name); | |
1842 | if (0 < patch->is_delete && newlines) | |
1843 | return error(_("deleted file %s still has contents"), patch->old_name); | |
a46160d2 | 1844 | if (!patch->is_delete && !newlines && context && state->apply_verbosity > verbosity_silent) |
13b5af22 CC |
1845 | fprintf_ln(stderr, |
1846 | _("** warning: " | |
1847 | "file %s becomes empty but is not deleted"), | |
1848 | patch->new_name); | |
1849 | ||
1850 | return offset; | |
1851 | } | |
1852 | ||
1853 | static inline int metadata_changes(struct patch *patch) | |
1854 | { | |
1855 | return patch->is_rename > 0 || | |
1856 | patch->is_copy > 0 || | |
1857 | patch->is_new > 0 || | |
1858 | patch->is_delete || | |
1859 | (patch->old_mode && patch->new_mode && | |
1860 | patch->old_mode != patch->new_mode); | |
1861 | } | |
1862 | ||
1863 | static char *inflate_it(const void *data, unsigned long size, | |
1864 | unsigned long inflated_size) | |
1865 | { | |
1866 | git_zstream stream; | |
1867 | void *out; | |
1868 | int st; | |
1869 | ||
1870 | memset(&stream, 0, sizeof(stream)); | |
1871 | ||
1872 | stream.next_in = (unsigned char *)data; | |
1873 | stream.avail_in = size; | |
1874 | stream.next_out = out = xmalloc(inflated_size); | |
1875 | stream.avail_out = inflated_size; | |
1876 | git_inflate_init(&stream); | |
1877 | st = git_inflate(&stream, Z_FINISH); | |
1878 | git_inflate_end(&stream); | |
1879 | if ((st != Z_STREAM_END) || stream.total_out != inflated_size) { | |
1880 | free(out); | |
1881 | return NULL; | |
1882 | } | |
1883 | return out; | |
1884 | } | |
1885 | ||
1886 | /* | |
1887 | * Read a binary hunk and return a new fragment; fragment->patch | |
1888 | * points at an allocated memory that the caller must free, so | |
1889 | * it is marked as "->free_patch = 1". | |
1890 | */ | |
1891 | static struct fragment *parse_binary_hunk(struct apply_state *state, | |
1892 | char **buf_p, | |
1893 | unsigned long *sz_p, | |
1894 | int *status_p, | |
1895 | int *used_p) | |
1896 | { | |
1897 | /* | |
1898 | * Expect a line that begins with binary patch method ("literal" | |
1899 | * or "delta"), followed by the length of data before deflating. | |
1900 | * a sequence of 'length-byte' followed by base-85 encoded data | |
1901 | * should follow, terminated by a newline. | |
1902 | * | |
1903 | * Each 5-byte sequence of base-85 encodes up to 4 bytes, | |
1904 | * and we would limit the patch line to 66 characters, | |
1905 | * so one line can fit up to 13 groups that would decode | |
1906 | * to 52 bytes max. The length byte 'A'-'Z' corresponds | |
1907 | * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes. | |
1908 | */ | |
1909 | int llen, used; | |
1910 | unsigned long size = *sz_p; | |
1911 | char *buffer = *buf_p; | |
1912 | int patch_method; | |
1913 | unsigned long origlen; | |
1914 | char *data = NULL; | |
1915 | int hunk_size = 0; | |
1916 | struct fragment *frag; | |
1917 | ||
1918 | llen = linelen(buffer, size); | |
1919 | used = llen; | |
1920 | ||
1921 | *status_p = 0; | |
1922 | ||
1923 | if (starts_with(buffer, "delta ")) { | |
1924 | patch_method = BINARY_DELTA_DEFLATED; | |
1925 | origlen = strtoul(buffer + 6, NULL, 10); | |
1926 | } | |
1927 | else if (starts_with(buffer, "literal ")) { | |
1928 | patch_method = BINARY_LITERAL_DEFLATED; | |
1929 | origlen = strtoul(buffer + 8, NULL, 10); | |
1930 | } | |
1931 | else | |
1932 | return NULL; | |
1933 | ||
1934 | state->linenr++; | |
1935 | buffer += llen; | |
1936 | while (1) { | |
1937 | int byte_length, max_byte_length, newsize; | |
1938 | llen = linelen(buffer, size); | |
1939 | used += llen; | |
1940 | state->linenr++; | |
1941 | if (llen == 1) { | |
1942 | /* consume the blank line */ | |
1943 | buffer++; | |
1944 | size--; | |
1945 | break; | |
1946 | } | |
1947 | /* | |
1948 | * Minimum line is "A00000\n" which is 7-byte long, | |
1949 | * and the line length must be multiple of 5 plus 2. | |
1950 | */ | |
1951 | if ((llen < 7) || (llen-2) % 5) | |
1952 | goto corrupt; | |
1953 | max_byte_length = (llen - 2) / 5 * 4; | |
1954 | byte_length = *buffer; | |
1955 | if ('A' <= byte_length && byte_length <= 'Z') | |
1956 | byte_length = byte_length - 'A' + 1; | |
1957 | else if ('a' <= byte_length && byte_length <= 'z') | |
1958 | byte_length = byte_length - 'a' + 27; | |
1959 | else | |
1960 | goto corrupt; | |
1961 | /* if the input length was not multiple of 4, we would | |
1962 | * have filler at the end but the filler should never | |
1963 | * exceed 3 bytes | |
1964 | */ | |
1965 | if (max_byte_length < byte_length || | |
1966 | byte_length <= max_byte_length - 4) | |
1967 | goto corrupt; | |
1968 | newsize = hunk_size + byte_length; | |
1969 | data = xrealloc(data, newsize); | |
1970 | if (decode_85(data + hunk_size, buffer + 1, byte_length)) | |
1971 | goto corrupt; | |
1972 | hunk_size = newsize; | |
1973 | buffer += llen; | |
1974 | size -= llen; | |
1975 | } | |
1976 | ||
1977 | frag = xcalloc(1, sizeof(*frag)); | |
1978 | frag->patch = inflate_it(data, hunk_size, origlen); | |
1979 | frag->free_patch = 1; | |
1980 | if (!frag->patch) | |
1981 | goto corrupt; | |
1982 | free(data); | |
1983 | frag->size = origlen; | |
1984 | *buf_p = buffer; | |
1985 | *sz_p = size; | |
1986 | *used_p = used; | |
1987 | frag->binary_patch_method = patch_method; | |
1988 | return frag; | |
1989 | ||
1990 | corrupt: | |
1991 | free(data); | |
1992 | *status_p = -1; | |
1993 | error(_("corrupt binary patch at line %d: %.*s"), | |
1994 | state->linenr-1, llen-1, buffer); | |
1995 | return NULL; | |
1996 | } | |
1997 | ||
1998 | /* | |
1999 | * Returns: | |
2000 | * -1 in case of error, | |
2001 | * the length of the parsed binary patch otherwise | |
2002 | */ | |
2003 | static int parse_binary(struct apply_state *state, | |
2004 | char *buffer, | |
2005 | unsigned long size, | |
2006 | struct patch *patch) | |
2007 | { | |
2008 | /* | |
2009 | * We have read "GIT binary patch\n"; what follows is a line | |
2010 | * that says the patch method (currently, either "literal" or | |
2011 | * "delta") and the length of data before deflating; a | |
2012 | * sequence of 'length-byte' followed by base-85 encoded data | |
2013 | * follows. | |
2014 | * | |
2015 | * When a binary patch is reversible, there is another binary | |
2016 | * hunk in the same format, starting with patch method (either | |
2017 | * "literal" or "delta") with the length of data, and a sequence | |
2018 | * of length-byte + base-85 encoded data, terminated with another | |
2019 | * empty line. This data, when applied to the postimage, produces | |
2020 | * the preimage. | |
2021 | */ | |
2022 | struct fragment *forward; | |
2023 | struct fragment *reverse; | |
2024 | int status; | |
2025 | int used, used_1; | |
2026 | ||
2027 | forward = parse_binary_hunk(state, &buffer, &size, &status, &used); | |
2028 | if (!forward && !status) | |
2029 | /* there has to be one hunk (forward hunk) */ | |
2030 | return error(_("unrecognized binary patch at line %d"), state->linenr-1); | |
2031 | if (status) | |
2032 | /* otherwise we already gave an error message */ | |
2033 | return status; | |
2034 | ||
2035 | reverse = parse_binary_hunk(state, &buffer, &size, &status, &used_1); | |
2036 | if (reverse) | |
2037 | used += used_1; | |
2038 | else if (status) { | |
2039 | /* | |
2040 | * Not having reverse hunk is not an error, but having | |
2041 | * a corrupt reverse hunk is. | |
2042 | */ | |
2043 | free((void*) forward->patch); | |
2044 | free(forward); | |
2045 | return status; | |
2046 | } | |
2047 | forward->next = reverse; | |
2048 | patch->fragments = forward; | |
2049 | patch->is_binary = 1; | |
2050 | return used; | |
2051 | } | |
2052 | ||
2053 | static void prefix_one(struct apply_state *state, char **name) | |
2054 | { | |
2055 | char *old_name = *name; | |
2056 | if (!old_name) | |
2057 | return; | |
e4da43b1 | 2058 | *name = prefix_filename(state->prefix, *name); |
13b5af22 CC |
2059 | free(old_name); |
2060 | } | |
2061 | ||
2062 | static void prefix_patch(struct apply_state *state, struct patch *p) | |
2063 | { | |
2064 | if (!state->prefix || p->is_toplevel_relative) | |
2065 | return; | |
2066 | prefix_one(state, &p->new_name); | |
2067 | prefix_one(state, &p->old_name); | |
2068 | } | |
2069 | ||
2070 | /* | |
2071 | * include/exclude | |
2072 | */ | |
2073 | ||
2074 | static void add_name_limit(struct apply_state *state, | |
2075 | const char *name, | |
2076 | int exclude) | |
2077 | { | |
2078 | struct string_list_item *it; | |
2079 | ||
2080 | it = string_list_append(&state->limit_by_name, name); | |
2081 | it->util = exclude ? NULL : (void *) 1; | |
2082 | } | |
2083 | ||
2084 | static int use_patch(struct apply_state *state, struct patch *p) | |
2085 | { | |
2086 | const char *pathname = p->new_name ? p->new_name : p->old_name; | |
2087 | int i; | |
2088 | ||
2089 | /* Paths outside are not touched regardless of "--include" */ | |
881529c8 RS |
2090 | if (state->prefix && *state->prefix) { |
2091 | const char *rest; | |
2092 | if (!skip_prefix(pathname, state->prefix, &rest) || !*rest) | |
13b5af22 CC |
2093 | return 0; |
2094 | } | |
2095 | ||
2096 | /* See if it matches any of exclude/include rule */ | |
2097 | for (i = 0; i < state->limit_by_name.nr; i++) { | |
2098 | struct string_list_item *it = &state->limit_by_name.items[i]; | |
55d34269 | 2099 | if (!wildmatch(it->string, pathname, 0)) |
13b5af22 CC |
2100 | return (it->util != NULL); |
2101 | } | |
2102 | ||
2103 | /* | |
2104 | * If we had any include, a path that does not match any rule is | |
2105 | * not used. Otherwise, we saw bunch of exclude rules (or none) | |
2106 | * and such a path is used. | |
2107 | */ | |
2108 | return !state->has_include; | |
2109 | } | |
2110 | ||
2111 | /* | |
2112 | * Read the patch text in "buffer" that extends for "size" bytes; stop | |
2113 | * reading after seeing a single patch (i.e. changes to a single file). | |
2114 | * Create fragments (i.e. patch hunks) and hang them to the given patch. | |
2115 | * | |
2116 | * Returns: | |
2117 | * -1 if no header was found or parse_binary() failed, | |
2118 | * -128 on another error, | |
2119 | * the number of bytes consumed otherwise, | |
2120 | * so that the caller can call us again for the next patch. | |
2121 | */ | |
2122 | static int parse_chunk(struct apply_state *state, char *buffer, unsigned long size, struct patch *patch) | |
2123 | { | |
2124 | int hdrsize, patchsize; | |
2125 | int offset = find_header(state, buffer, size, &hdrsize, patch); | |
2126 | ||
2127 | if (offset < 0) | |
2128 | return offset; | |
2129 | ||
2130 | prefix_patch(state, patch); | |
2131 | ||
2132 | if (!use_patch(state, patch)) | |
2133 | patch->ws_rule = 0; | |
26d024ec NTND |
2134 | else if (patch->new_name) |
2135 | patch->ws_rule = whitespace_rule(state->repo->index, | |
2136 | patch->new_name); | |
13b5af22 | 2137 | else |
26d024ec NTND |
2138 | patch->ws_rule = whitespace_rule(state->repo->index, |
2139 | patch->old_name); | |
13b5af22 CC |
2140 | |
2141 | patchsize = parse_single_patch(state, | |
2142 | buffer + offset + hdrsize, | |
2143 | size - offset - hdrsize, | |
2144 | patch); | |
2145 | ||
2146 | if (patchsize < 0) | |
2147 | return -128; | |
2148 | ||
2149 | if (!patchsize) { | |
2150 | static const char git_binary[] = "GIT binary patch\n"; | |
2151 | int hd = hdrsize + offset; | |
2152 | unsigned long llen = linelen(buffer + hd, size - hd); | |
2153 | ||
2154 | if (llen == sizeof(git_binary) - 1 && | |
2155 | !memcmp(git_binary, buffer + hd, llen)) { | |
2156 | int used; | |
2157 | state->linenr++; | |
2158 | used = parse_binary(state, buffer + hd + llen, | |
2159 | size - hd - llen, patch); | |
2160 | if (used < 0) | |
2161 | return -1; | |
2162 | if (used) | |
2163 | patchsize = used + llen; | |
2164 | else | |
2165 | patchsize = 0; | |
2166 | } | |
2167 | else if (!memcmp(" differ\n", buffer + hd + llen - 8, 8)) { | |
2168 | static const char *binhdr[] = { | |
2169 | "Binary files ", | |
2170 | "Files ", | |
2171 | NULL, | |
2172 | }; | |
2173 | int i; | |
2174 | for (i = 0; binhdr[i]; i++) { | |
2175 | int len = strlen(binhdr[i]); | |
2176 | if (len < size - hd && | |
2177 | !memcmp(binhdr[i], buffer + hd, len)) { | |
2178 | state->linenr++; | |
2179 | patch->is_binary = 1; | |
2180 | patchsize = llen; | |
2181 | break; | |
2182 | } | |
2183 | } | |
2184 | } | |
2185 | ||
2186 | /* Empty patch cannot be applied if it is a text patch | |
2187 | * without metadata change. A binary patch appears | |
2188 | * empty to us here. | |
2189 | */ | |
2190 | if ((state->apply || state->check) && | |
2191 | (!patch->is_binary && !metadata_changes(patch))) { | |
2192 | error(_("patch with only garbage at line %d"), state->linenr); | |
2193 | return -128; | |
2194 | } | |
2195 | } | |
2196 | ||
2197 | return offset + hdrsize + patchsize; | |
2198 | } | |
2199 | ||
13b5af22 CC |
2200 | static void reverse_patches(struct patch *p) |
2201 | { | |
2202 | for (; p; p = p->next) { | |
2203 | struct fragment *frag = p->fragments; | |
2204 | ||
db101991 RS |
2205 | SWAP(p->new_name, p->old_name); |
2206 | SWAP(p->new_mode, p->old_mode); | |
2207 | SWAP(p->is_new, p->is_delete); | |
2208 | SWAP(p->lines_added, p->lines_deleted); | |
eccb5a5f | 2209 | SWAP(p->old_oid_prefix, p->new_oid_prefix); |
13b5af22 CC |
2210 | |
2211 | for (; frag; frag = frag->next) { | |
db101991 RS |
2212 | SWAP(frag->newpos, frag->oldpos); |
2213 | SWAP(frag->newlines, frag->oldlines); | |
13b5af22 CC |
2214 | } |
2215 | } | |
2216 | } | |
2217 | ||
2218 | static const char pluses[] = | |
2219 | "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"; | |
2220 | static const char minuses[]= | |
2221 | "----------------------------------------------------------------------"; | |
2222 | ||
2223 | static void show_stats(struct apply_state *state, struct patch *patch) | |
2224 | { | |
2225 | struct strbuf qname = STRBUF_INIT; | |
2226 | char *cp = patch->new_name ? patch->new_name : patch->old_name; | |
2227 | int max, add, del; | |
2228 | ||
2229 | quote_c_style(cp, &qname, NULL, 0); | |
2230 | ||
2231 | /* | |
2232 | * "scale" the filename | |
2233 | */ | |
2234 | max = state->max_len; | |
2235 | if (max > 50) | |
2236 | max = 50; | |
2237 | ||
2238 | if (qname.len > max) { | |
2239 | cp = strchr(qname.buf + qname.len + 3 - max, '/'); | |
2240 | if (!cp) | |
2241 | cp = qname.buf + qname.len + 3 - max; | |
2242 | strbuf_splice(&qname, 0, cp - qname.buf, "...", 3); | |
2243 | } | |
2244 | ||
2245 | if (patch->is_binary) { | |
2246 | printf(" %-*s | Bin\n", max, qname.buf); | |
2247 | strbuf_release(&qname); | |
2248 | return; | |
2249 | } | |
2250 | ||
2251 | printf(" %-*s |", max, qname.buf); | |
2252 | strbuf_release(&qname); | |
2253 | ||
2254 | /* | |
2255 | * scale the add/delete | |
2256 | */ | |
2257 | max = max + state->max_change > 70 ? 70 - max : state->max_change; | |
2258 | add = patch->lines_added; | |
2259 | del = patch->lines_deleted; | |
2260 | ||
2261 | if (state->max_change > 0) { | |
2262 | int total = ((add + del) * max + state->max_change / 2) / state->max_change; | |
2263 | add = (add * max + state->max_change / 2) / state->max_change; | |
2264 | del = total - add; | |
2265 | } | |
2266 | printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted, | |
2267 | add, pluses, del, minuses); | |
2268 | } | |
2269 | ||
c24f3aba TB |
2270 | static int read_old_data(struct stat *st, struct patch *patch, |
2271 | const char *path, struct strbuf *buf) | |
13b5af22 | 2272 | { |
8462ff43 TB |
2273 | int conv_flags = patch->crlf_in_old ? |
2274 | CONV_EOL_KEEP_CRLF : CONV_EOL_RENORMALIZE; | |
13b5af22 CC |
2275 | switch (st->st_mode & S_IFMT) { |
2276 | case S_IFLNK: | |
2277 | if (strbuf_readlink(buf, path, st->st_size) < 0) | |
2278 | return error(_("unable to read symlink %s"), path); | |
2279 | return 0; | |
2280 | case S_IFREG: | |
2281 | if (strbuf_read_file(buf, path, st->st_size) != st->st_size) | |
2282 | return error(_("unable to open or read %s"), path); | |
c24f3aba TB |
2283 | /* |
2284 | * "git apply" without "--index/--cached" should never look | |
2285 | * at the index; the target file may not have been added to | |
2286 | * the index yet, and we may not even be in any Git repository. | |
2287 | * Pass NULL to convert_to_git() to stress this; the function | |
2288 | * should never look at the index when explicit crlf option | |
2289 | * is given. | |
2290 | */ | |
8462ff43 | 2291 | convert_to_git(NULL, path, buf->buf, buf->len, buf, conv_flags); |
13b5af22 CC |
2292 | return 0; |
2293 | default: | |
2294 | return -1; | |
2295 | } | |
2296 | } | |
2297 | ||
2298 | /* | |
2299 | * Update the preimage, and the common lines in postimage, | |
2300 | * from buffer buf of length len. If postlen is 0 the postimage | |
2301 | * is updated in place, otherwise it's updated on a new buffer | |
2302 | * of length postlen | |
2303 | */ | |
2304 | ||
2305 | static void update_pre_post_images(struct image *preimage, | |
2306 | struct image *postimage, | |
2307 | char *buf, | |
2308 | size_t len, size_t postlen) | |
2309 | { | |
2310 | int i, ctx, reduced; | |
f1ae97d3 | 2311 | char *new_buf, *old_buf, *fixed; |
13b5af22 CC |
2312 | struct image fixed_preimage; |
2313 | ||
2314 | /* | |
2315 | * Update the preimage with whitespace fixes. Note that we | |
2316 | * are not losing preimage->buf -- apply_one_fragment() will | |
2317 | * free "oldlines". | |
2318 | */ | |
2319 | prepare_image(&fixed_preimage, buf, len, 1); | |
2320 | assert(postlen | |
2321 | ? fixed_preimage.nr == preimage->nr | |
2322 | : fixed_preimage.nr <= preimage->nr); | |
2323 | for (i = 0; i < fixed_preimage.nr; i++) | |
2324 | fixed_preimage.line[i].flag = preimage->line[i].flag; | |
2325 | free(preimage->line_allocated); | |
2326 | *preimage = fixed_preimage; | |
2327 | ||
2328 | /* | |
2329 | * Adjust the common context lines in postimage. This can be | |
2330 | * done in-place when we are shrinking it with whitespace | |
2331 | * fixing, but needs a new buffer when ignoring whitespace or | |
2332 | * expanding leading tabs to spaces. | |
2333 | * | |
2334 | * We trust the caller to tell us if the update can be done | |
2335 | * in place (postlen==0) or not. | |
2336 | */ | |
f1ae97d3 | 2337 | old_buf = postimage->buf; |
13b5af22 | 2338 | if (postlen) |
f1ae97d3 | 2339 | new_buf = postimage->buf = xmalloc(postlen); |
13b5af22 | 2340 | else |
f1ae97d3 | 2341 | new_buf = old_buf; |
13b5af22 CC |
2342 | fixed = preimage->buf; |
2343 | ||
2344 | for (i = reduced = ctx = 0; i < postimage->nr; i++) { | |
2345 | size_t l_len = postimage->line[i].len; | |
2346 | if (!(postimage->line[i].flag & LINE_COMMON)) { | |
2347 | /* an added line -- no counterparts in preimage */ | |
f1ae97d3 BW |
2348 | memmove(new_buf, old_buf, l_len); |
2349 | old_buf += l_len; | |
2350 | new_buf += l_len; | |
13b5af22 CC |
2351 | continue; |
2352 | } | |
2353 | ||
2354 | /* a common context -- skip it in the original postimage */ | |
f1ae97d3 | 2355 | old_buf += l_len; |
13b5af22 CC |
2356 | |
2357 | /* and find the corresponding one in the fixed preimage */ | |
2358 | while (ctx < preimage->nr && | |
2359 | !(preimage->line[ctx].flag & LINE_COMMON)) { | |
2360 | fixed += preimage->line[ctx].len; | |
2361 | ctx++; | |
2362 | } | |
2363 | ||
2364 | /* | |
2365 | * preimage is expected to run out, if the caller | |
2366 | * fixed addition of trailing blank lines. | |
2367 | */ | |
2368 | if (preimage->nr <= ctx) { | |
2369 | reduced++; | |
2370 | continue; | |
2371 | } | |
2372 | ||
2373 | /* and copy it in, while fixing the line length */ | |
2374 | l_len = preimage->line[ctx].len; | |
f1ae97d3 BW |
2375 | memcpy(new_buf, fixed, l_len); |
2376 | new_buf += l_len; | |
13b5af22 CC |
2377 | fixed += l_len; |
2378 | postimage->line[i].len = l_len; | |
2379 | ctx++; | |
2380 | } | |
2381 | ||
2382 | if (postlen | |
f1ae97d3 BW |
2383 | ? postlen < new_buf - postimage->buf |
2384 | : postimage->len < new_buf - postimage->buf) | |
033abf97 | 2385 | BUG("caller miscounted postlen: asked %d, orig = %d, used = %d", |
f1ae97d3 | 2386 | (int)postlen, (int) postimage->len, (int)(new_buf - postimage->buf)); |
13b5af22 CC |
2387 | |
2388 | /* Fix the length of the whole thing */ | |
f1ae97d3 | 2389 | postimage->len = new_buf - postimage->buf; |
13b5af22 CC |
2390 | postimage->nr -= reduced; |
2391 | } | |
2392 | ||
2393 | static int line_by_line_fuzzy_match(struct image *img, | |
2394 | struct image *preimage, | |
2395 | struct image *postimage, | |
6cbc7cfd BW |
2396 | unsigned long current, |
2397 | int current_lno, | |
13b5af22 CC |
2398 | int preimage_limit) |
2399 | { | |
2400 | int i; | |
2401 | size_t imgoff = 0; | |
2402 | size_t preoff = 0; | |
2403 | size_t postlen = postimage->len; | |
2404 | size_t extra_chars; | |
2405 | char *buf; | |
2406 | char *preimage_eof; | |
2407 | char *preimage_end; | |
2408 | struct strbuf fixed; | |
2409 | char *fixed_buf; | |
2410 | size_t fixed_len; | |
2411 | ||
2412 | for (i = 0; i < preimage_limit; i++) { | |
2413 | size_t prelen = preimage->line[i].len; | |
6cbc7cfd | 2414 | size_t imglen = img->line[current_lno+i].len; |
13b5af22 | 2415 | |
6cbc7cfd | 2416 | if (!fuzzy_matchlines(img->buf + current + imgoff, imglen, |
13b5af22 CC |
2417 | preimage->buf + preoff, prelen)) |
2418 | return 0; | |
2419 | if (preimage->line[i].flag & LINE_COMMON) | |
2420 | postlen += imglen - prelen; | |
2421 | imgoff += imglen; | |
2422 | preoff += prelen; | |
2423 | } | |
2424 | ||
2425 | /* | |
2426 | * Ok, the preimage matches with whitespace fuzz. | |
2427 | * | |
2428 | * imgoff now holds the true length of the target that | |
2429 | * matches the preimage before the end of the file. | |
2430 | * | |
2431 | * Count the number of characters in the preimage that fall | |
2432 | * beyond the end of the file and make sure that all of them | |
2433 | * are whitespace characters. (This can only happen if | |
2434 | * we are removing blank lines at the end of the file.) | |
2435 | */ | |
2436 | buf = preimage_eof = preimage->buf + preoff; | |
2437 | for ( ; i < preimage->nr; i++) | |
2438 | preoff += preimage->line[i].len; | |
2439 | preimage_end = preimage->buf + preoff; | |
2440 | for ( ; buf < preimage_end; buf++) | |
2441 | if (!isspace(*buf)) | |
2442 | return 0; | |
2443 | ||
2444 | /* | |
2445 | * Update the preimage and the common postimage context | |
2446 | * lines to use the same whitespace as the target. | |
2447 | * If whitespace is missing in the target (i.e. | |
2448 | * if the preimage extends beyond the end of the file), | |
2449 | * use the whitespace from the preimage. | |
2450 | */ | |
2451 | extra_chars = preimage_end - preimage_eof; | |
2452 | strbuf_init(&fixed, imgoff + extra_chars); | |
6cbc7cfd | 2453 | strbuf_add(&fixed, img->buf + current, imgoff); |
13b5af22 CC |
2454 | strbuf_add(&fixed, preimage_eof, extra_chars); |
2455 | fixed_buf = strbuf_detach(&fixed, &fixed_len); | |
2456 | update_pre_post_images(preimage, postimage, | |
2457 | fixed_buf, fixed_len, postlen); | |
2458 | return 1; | |
2459 | } | |
2460 | ||
2461 | static int match_fragment(struct apply_state *state, | |
2462 | struct image *img, | |
2463 | struct image *preimage, | |
2464 | struct image *postimage, | |
6cbc7cfd BW |
2465 | unsigned long current, |
2466 | int current_lno, | |
13b5af22 CC |
2467 | unsigned ws_rule, |
2468 | int match_beginning, int match_end) | |
2469 | { | |
2470 | int i; | |
2471 | char *fixed_buf, *buf, *orig, *target; | |
2472 | struct strbuf fixed; | |
2473 | size_t fixed_len, postlen; | |
2474 | int preimage_limit; | |
2475 | ||
6cbc7cfd | 2476 | if (preimage->nr + current_lno <= img->nr) { |
13b5af22 CC |
2477 | /* |
2478 | * The hunk falls within the boundaries of img. | |
2479 | */ | |
2480 | preimage_limit = preimage->nr; | |
6cbc7cfd | 2481 | if (match_end && (preimage->nr + current_lno != img->nr)) |
13b5af22 CC |
2482 | return 0; |
2483 | } else if (state->ws_error_action == correct_ws_error && | |
2484 | (ws_rule & WS_BLANK_AT_EOF)) { | |
2485 | /* | |
2486 | * This hunk extends beyond the end of img, and we are | |
2487 | * removing blank lines at the end of the file. This | |
2488 | * many lines from the beginning of the preimage must | |
2489 | * match with img, and the remainder of the preimage | |
2490 | * must be blank. | |
2491 | */ | |
6cbc7cfd | 2492 | preimage_limit = img->nr - current_lno; |
13b5af22 CC |
2493 | } else { |
2494 | /* | |
2495 | * The hunk extends beyond the end of the img and | |
2496 | * we are not removing blanks at the end, so we | |
2497 | * should reject the hunk at this position. | |
2498 | */ | |
2499 | return 0; | |
2500 | } | |
2501 | ||
6cbc7cfd | 2502 | if (match_beginning && current_lno) |
13b5af22 CC |
2503 | return 0; |
2504 | ||
2505 | /* Quick hash check */ | |
2506 | for (i = 0; i < preimage_limit; i++) | |
6cbc7cfd BW |
2507 | if ((img->line[current_lno + i].flag & LINE_PATCHED) || |
2508 | (preimage->line[i].hash != img->line[current_lno + i].hash)) | |
13b5af22 CC |
2509 | return 0; |
2510 | ||
2511 | if (preimage_limit == preimage->nr) { | |
2512 | /* | |
2513 | * Do we have an exact match? If we were told to match | |
6cbc7cfd BW |
2514 | * at the end, size must be exactly at current+fragsize, |
2515 | * otherwise current+fragsize must be still within the preimage, | |
13b5af22 CC |
2516 | * and either case, the old piece should match the preimage |
2517 | * exactly. | |
2518 | */ | |
2519 | if ((match_end | |
6cbc7cfd BW |
2520 | ? (current + preimage->len == img->len) |
2521 | : (current + preimage->len <= img->len)) && | |
2522 | !memcmp(img->buf + current, preimage->buf, preimage->len)) | |
13b5af22 CC |
2523 | return 1; |
2524 | } else { | |
2525 | /* | |
2526 | * The preimage extends beyond the end of img, so | |
2527 | * there cannot be an exact match. | |
2528 | * | |
2529 | * There must be one non-blank context line that match | |
2530 | * a line before the end of img. | |
2531 | */ | |
2532 | char *buf_end; | |
2533 | ||
2534 | buf = preimage->buf; | |
2535 | buf_end = buf; | |
2536 | for (i = 0; i < preimage_limit; i++) | |
2537 | buf_end += preimage->line[i].len; | |
2538 | ||
2539 | for ( ; buf < buf_end; buf++) | |
2540 | if (!isspace(*buf)) | |
2541 | break; | |
2542 | if (buf == buf_end) | |
2543 | return 0; | |
2544 | } | |
2545 | ||
2546 | /* | |
2547 | * No exact match. If we are ignoring whitespace, run a line-by-line | |
2548 | * fuzzy matching. We collect all the line length information because | |
2549 | * we need it to adjust whitespace if we match. | |
2550 | */ | |
2551 | if (state->ws_ignore_action == ignore_ws_change) | |
2552 | return line_by_line_fuzzy_match(img, preimage, postimage, | |
6cbc7cfd | 2553 | current, current_lno, preimage_limit); |
13b5af22 CC |
2554 | |
2555 | if (state->ws_error_action != correct_ws_error) | |
2556 | return 0; | |
2557 | ||
2558 | /* | |
2559 | * The hunk does not apply byte-by-byte, but the hash says | |
2560 | * it might with whitespace fuzz. We weren't asked to | |
2561 | * ignore whitespace, we were asked to correct whitespace | |
2562 | * errors, so let's try matching after whitespace correction. | |
2563 | * | |
2564 | * While checking the preimage against the target, whitespace | |
2565 | * errors in both fixed, we count how large the corresponding | |
2566 | * postimage needs to be. The postimage prepared by | |
2567 | * apply_one_fragment() has whitespace errors fixed on added | |
2568 | * lines already, but the common lines were propagated as-is, | |
2569 | * which may become longer when their whitespace errors are | |
2570 | * fixed. | |
2571 | */ | |
2572 | ||
2573 | /* First count added lines in postimage */ | |
2574 | postlen = 0; | |
2575 | for (i = 0; i < postimage->nr; i++) { | |
2576 | if (!(postimage->line[i].flag & LINE_COMMON)) | |
2577 | postlen += postimage->line[i].len; | |
2578 | } | |
2579 | ||
2580 | /* | |
2581 | * The preimage may extend beyond the end of the file, | |
2582 | * but in this loop we will only handle the part of the | |
2583 | * preimage that falls within the file. | |
2584 | */ | |
2585 | strbuf_init(&fixed, preimage->len + 1); | |
2586 | orig = preimage->buf; | |
6cbc7cfd | 2587 | target = img->buf + current; |
13b5af22 CC |
2588 | for (i = 0; i < preimage_limit; i++) { |
2589 | size_t oldlen = preimage->line[i].len; | |
6cbc7cfd | 2590 | size_t tgtlen = img->line[current_lno + i].len; |
13b5af22 CC |
2591 | size_t fixstart = fixed.len; |
2592 | struct strbuf tgtfix; | |
2593 | int match; | |
2594 | ||
2595 | /* Try fixing the line in the preimage */ | |
2596 | ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL); | |
2597 | ||
2598 | /* Try fixing the line in the target */ | |
2599 | strbuf_init(&tgtfix, tgtlen); | |
2600 | ws_fix_copy(&tgtfix, target, tgtlen, ws_rule, NULL); | |
2601 | ||
2602 | /* | |
2603 | * If they match, either the preimage was based on | |
2604 | * a version before our tree fixed whitespace breakage, | |
2605 | * or we are lacking a whitespace-fix patch the tree | |
2606 | * the preimage was based on already had (i.e. target | |
2607 | * has whitespace breakage, the preimage doesn't). | |
2608 | * In either case, we are fixing the whitespace breakages | |
2609 | * so we might as well take the fix together with their | |
2610 | * real change. | |
2611 | */ | |
2612 | match = (tgtfix.len == fixed.len - fixstart && | |
2613 | !memcmp(tgtfix.buf, fixed.buf + fixstart, | |
2614 | fixed.len - fixstart)); | |
2615 | ||
2616 | /* Add the length if this is common with the postimage */ | |
2617 | if (preimage->line[i].flag & LINE_COMMON) | |
2618 | postlen += tgtfix.len; | |
2619 | ||
2620 | strbuf_release(&tgtfix); | |
2621 | if (!match) | |
2622 | goto unmatch_exit; | |
2623 | ||
2624 | orig += oldlen; | |
2625 | target += tgtlen; | |
2626 | } | |
2627 | ||
2628 | ||
2629 | /* | |
2630 | * Now handle the lines in the preimage that falls beyond the | |
2631 | * end of the file (if any). They will only match if they are | |
2632 | * empty or only contain whitespace (if WS_BLANK_AT_EOL is | |
2633 | * false). | |
2634 | */ | |
2635 | for ( ; i < preimage->nr; i++) { | |
2636 | size_t fixstart = fixed.len; /* start of the fixed preimage */ | |
2637 | size_t oldlen = preimage->line[i].len; | |
2638 | int j; | |
2639 | ||
2640 | /* Try fixing the line in the preimage */ | |
2641 | ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL); | |
2642 | ||
2643 | for (j = fixstart; j < fixed.len; j++) | |
2644 | if (!isspace(fixed.buf[j])) | |
2645 | goto unmatch_exit; | |
2646 | ||
2647 | orig += oldlen; | |
2648 | } | |
2649 | ||
2650 | /* | |
2651 | * Yes, the preimage is based on an older version that still | |
2652 | * has whitespace breakages unfixed, and fixing them makes the | |
2653 | * hunk match. Update the context lines in the postimage. | |
2654 | */ | |
2655 | fixed_buf = strbuf_detach(&fixed, &fixed_len); | |
2656 | if (postlen < postimage->len) | |
2657 | postlen = 0; | |
2658 | update_pre_post_images(preimage, postimage, | |
2659 | fixed_buf, fixed_len, postlen); | |
2660 | return 1; | |
2661 | ||
2662 | unmatch_exit: | |
2663 | strbuf_release(&fixed); | |
2664 | return 0; | |
2665 | } | |
2666 | ||
2667 | static int find_pos(struct apply_state *state, | |
2668 | struct image *img, | |
2669 | struct image *preimage, | |
2670 | struct image *postimage, | |
2671 | int line, | |
2672 | unsigned ws_rule, | |
2673 | int match_beginning, int match_end) | |
2674 | { | |
2675 | int i; | |
6cbc7cfd BW |
2676 | unsigned long backwards, forwards, current; |
2677 | int backwards_lno, forwards_lno, current_lno; | |
13b5af22 CC |
2678 | |
2679 | /* | |
2680 | * If match_beginning or match_end is specified, there is no | |
2681 | * point starting from a wrong line that will never match and | |
2682 | * wander around and wait for a match at the specified end. | |
2683 | */ | |
2684 | if (match_beginning) | |
2685 | line = 0; | |
2686 | else if (match_end) | |
2687 | line = img->nr - preimage->nr; | |
2688 | ||
2689 | /* | |
2690 | * Because the comparison is unsigned, the following test | |
2691 | * will also take care of a negative line number that can | |
2692 | * result when match_end and preimage is larger than the target. | |
2693 | */ | |
2694 | if ((size_t) line > img->nr) | |
2695 | line = img->nr; | |
2696 | ||
6cbc7cfd | 2697 | current = 0; |
13b5af22 | 2698 | for (i = 0; i < line; i++) |
6cbc7cfd | 2699 | current += img->line[i].len; |
13b5af22 CC |
2700 | |
2701 | /* | |
2702 | * There's probably some smart way to do this, but I'll leave | |
2703 | * that to the smart and beautiful people. I'm simple and stupid. | |
2704 | */ | |
6cbc7cfd | 2705 | backwards = current; |
13b5af22 | 2706 | backwards_lno = line; |
6cbc7cfd | 2707 | forwards = current; |
13b5af22 | 2708 | forwards_lno = line; |
6cbc7cfd | 2709 | current_lno = line; |
13b5af22 CC |
2710 | |
2711 | for (i = 0; ; i++) { | |
2712 | if (match_fragment(state, img, preimage, postimage, | |
6cbc7cfd | 2713 | current, current_lno, ws_rule, |
13b5af22 | 2714 | match_beginning, match_end)) |
6cbc7cfd | 2715 | return current_lno; |
13b5af22 CC |
2716 | |
2717 | again: | |
2718 | if (backwards_lno == 0 && forwards_lno == img->nr) | |
2719 | break; | |
2720 | ||
2721 | if (i & 1) { | |
2722 | if (backwards_lno == 0) { | |
2723 | i++; | |
2724 | goto again; | |
2725 | } | |
2726 | backwards_lno--; | |
2727 | backwards -= img->line[backwards_lno].len; | |
6cbc7cfd BW |
2728 | current = backwards; |
2729 | current_lno = backwards_lno; | |
13b5af22 CC |
2730 | } else { |
2731 | if (forwards_lno == img->nr) { | |
2732 | i++; | |
2733 | goto again; | |
2734 | } | |
2735 | forwards += img->line[forwards_lno].len; | |
2736 | forwards_lno++; | |
6cbc7cfd BW |
2737 | current = forwards; |
2738 | current_lno = forwards_lno; | |
13b5af22 CC |
2739 | } |
2740 | ||
2741 | } | |
2742 | return -1; | |
2743 | } | |
2744 | ||
2745 | static void remove_first_line(struct image *img) | |
2746 | { | |
2747 | img->buf += img->line[0].len; | |
2748 | img->len -= img->line[0].len; | |
2749 | img->line++; | |
2750 | img->nr--; | |
2751 | } | |
2752 | ||
2753 | static void remove_last_line(struct image *img) | |
2754 | { | |
2755 | img->len -= img->line[--img->nr].len; | |
2756 | } | |
2757 | ||
2758 | /* | |
2759 | * The change from "preimage" and "postimage" has been found to | |
2760 | * apply at applied_pos (counts in line numbers) in "img". | |
2761 | * Update "img" to remove "preimage" and replace it with "postimage". | |
2762 | */ | |
2763 | static void update_image(struct apply_state *state, | |
2764 | struct image *img, | |
2765 | int applied_pos, | |
2766 | struct image *preimage, | |
2767 | struct image *postimage) | |
2768 | { | |
2769 | /* | |
2770 | * remove the copy of preimage at offset in img | |
2771 | * and replace it with postimage | |
2772 | */ | |
2773 | int i, nr; | |
2774 | size_t remove_count, insert_count, applied_at = 0; | |
2775 | char *result; | |
2776 | int preimage_limit; | |
2777 | ||
2778 | /* | |
2779 | * If we are removing blank lines at the end of img, | |
2780 | * the preimage may extend beyond the end. | |
2781 | * If that is the case, we must be careful only to | |
2782 | * remove the part of the preimage that falls within | |
2783 | * the boundaries of img. Initialize preimage_limit | |
2784 | * to the number of lines in the preimage that falls | |
2785 | * within the boundaries. | |
2786 | */ | |
2787 | preimage_limit = preimage->nr; | |
2788 | if (preimage_limit > img->nr - applied_pos) | |
2789 | preimage_limit = img->nr - applied_pos; | |
2790 | ||
2791 | for (i = 0; i < applied_pos; i++) | |
2792 | applied_at += img->line[i].len; | |
2793 | ||
2794 | remove_count = 0; | |
2795 | for (i = 0; i < preimage_limit; i++) | |
2796 | remove_count += img->line[applied_pos + i].len; | |
2797 | insert_count = postimage->len; | |
2798 | ||
2799 | /* Adjust the contents */ | |
2800 | result = xmalloc(st_add3(st_sub(img->len, remove_count), insert_count, 1)); | |
2801 | memcpy(result, img->buf, applied_at); | |
2802 | memcpy(result + applied_at, postimage->buf, postimage->len); | |
2803 | memcpy(result + applied_at + postimage->len, | |
2804 | img->buf + (applied_at + remove_count), | |
2805 | img->len - (applied_at + remove_count)); | |
2806 | free(img->buf); | |
2807 | img->buf = result; | |
2808 | img->len += insert_count - remove_count; | |
2809 | result[img->len] = '\0'; | |
2810 | ||
2811 | /* Adjust the line table */ | |
2812 | nr = img->nr + postimage->nr - preimage_limit; | |
2813 | if (preimage_limit < postimage->nr) { | |
2814 | /* | |
2815 | * NOTE: this knows that we never call remove_first_line() | |
2816 | * on anything other than pre/post image. | |
2817 | */ | |
2818 | REALLOC_ARRAY(img->line, nr); | |
2819 | img->line_allocated = img->line; | |
2820 | } | |
2821 | if (preimage_limit != postimage->nr) | |
17736641 RS |
2822 | MOVE_ARRAY(img->line + applied_pos + postimage->nr, |
2823 | img->line + applied_pos + preimage_limit, | |
2824 | img->nr - (applied_pos + preimage_limit)); | |
2825 | COPY_ARRAY(img->line + applied_pos, postimage->line, postimage->nr); | |
13b5af22 CC |
2826 | if (!state->allow_overlap) |
2827 | for (i = 0; i < postimage->nr; i++) | |
2828 | img->line[applied_pos + i].flag |= LINE_PATCHED; | |
2829 | img->nr = nr; | |
2830 | } | |
2831 | ||
2832 | /* | |
2833 | * Use the patch-hunk text in "frag" to prepare two images (preimage and | |
2834 | * postimage) for the hunk. Find lines that match "preimage" in "img" and | |
2835 | * replace the part of "img" with "postimage" text. | |
2836 | */ | |
2837 | static int apply_one_fragment(struct apply_state *state, | |
2838 | struct image *img, struct fragment *frag, | |
2839 | int inaccurate_eof, unsigned ws_rule, | |
2840 | int nth_fragment) | |
2841 | { | |
2842 | int match_beginning, match_end; | |
2843 | const char *patch = frag->patch; | |
2844 | int size = frag->size; | |
2845 | char *old, *oldlines; | |
2846 | struct strbuf newlines; | |
2847 | int new_blank_lines_at_end = 0; | |
2848 | int found_new_blank_lines_at_end = 0; | |
2849 | int hunk_linenr = frag->linenr; | |
2850 | unsigned long leading, trailing; | |
2851 | int pos, applied_pos; | |
2852 | struct image preimage; | |
2853 | struct image postimage; | |
2854 | ||
2855 | memset(&preimage, 0, sizeof(preimage)); | |
2856 | memset(&postimage, 0, sizeof(postimage)); | |
2857 | oldlines = xmalloc(size); | |
2858 | strbuf_init(&newlines, size); | |
2859 | ||
2860 | old = oldlines; | |
2861 | while (size > 0) { | |
2862 | char first; | |
2863 | int len = linelen(patch, size); | |
2864 | int plen; | |
2865 | int added_blank_line = 0; | |
2866 | int is_blank_context = 0; | |
2867 | size_t start; | |
2868 | ||
2869 | if (!len) | |
2870 | break; | |
2871 | ||
2872 | /* | |
2873 | * "plen" is how much of the line we should use for | |
2874 | * the actual patch data. Normally we just remove the | |
2875 | * first character on the line, but if the line is | |
2876 | * followed by "\ No newline", then we also remove the | |
2877 | * last one (which is the newline, of course). | |
2878 | */ | |
2879 | plen = len - 1; | |
2880 | if (len < size && patch[len] == '\\') | |
2881 | plen--; | |
2882 | first = *patch; | |
2883 | if (state->apply_in_reverse) { | |
2884 | if (first == '-') | |
2885 | first = '+'; | |
2886 | else if (first == '+') | |
2887 | first = '-'; | |
2888 | } | |
2889 | ||
2890 | switch (first) { | |
2891 | case '\n': | |
2892 | /* Newer GNU diff, empty context line */ | |
2893 | if (plen < 0) | |
2894 | /* ... followed by '\No newline'; nothing */ | |
2895 | break; | |
2896 | *old++ = '\n'; | |
2897 | strbuf_addch(&newlines, '\n'); | |
2898 | add_line_info(&preimage, "\n", 1, LINE_COMMON); | |
2899 | add_line_info(&postimage, "\n", 1, LINE_COMMON); | |
2900 | is_blank_context = 1; | |
2901 | break; | |
2902 | case ' ': | |
2903 | if (plen && (ws_rule & WS_BLANK_AT_EOF) && | |
2904 | ws_blank_line(patch + 1, plen, ws_rule)) | |
2905 | is_blank_context = 1; | |
1cf01a34 | 2906 | /* fallthrough */ |
13b5af22 CC |
2907 | case '-': |
2908 | memcpy(old, patch + 1, plen); | |
2909 | add_line_info(&preimage, old, plen, | |
2910 | (first == ' ' ? LINE_COMMON : 0)); | |
2911 | old += plen; | |
2912 | if (first == '-') | |
2913 | break; | |
1cf01a34 | 2914 | /* fallthrough */ |
13b5af22 CC |
2915 | case '+': |
2916 | /* --no-add does not add new lines */ | |
2917 | if (first == '+' && state->no_add) | |
2918 | break; | |
2919 | ||
2920 | start = newlines.len; | |
2921 | if (first != '+' || | |
2922 | !state->whitespace_error || | |
2923 | state->ws_error_action != correct_ws_error) { | |
2924 | strbuf_add(&newlines, patch + 1, plen); | |
2925 | } | |
2926 | else { | |
2927 | ws_fix_copy(&newlines, patch + 1, plen, ws_rule, &state->applied_after_fixing_ws); | |
2928 | } | |
2929 | add_line_info(&postimage, newlines.buf + start, newlines.len - start, | |
2930 | (first == '+' ? 0 : LINE_COMMON)); | |
2931 | if (first == '+' && | |
2932 | (ws_rule & WS_BLANK_AT_EOF) && | |
2933 | ws_blank_line(patch + 1, plen, ws_rule)) | |
2934 | added_blank_line = 1; | |
2935 | break; | |
2936 | case '@': case '\\': | |
2937 | /* Ignore it, we already handled it */ | |
2938 | break; | |
2939 | default: | |
a46160d2 | 2940 | if (state->apply_verbosity > verbosity_normal) |
13b5af22 CC |
2941 | error(_("invalid start of line: '%c'"), first); |
2942 | applied_pos = -1; | |
2943 | goto out; | |
2944 | } | |
2945 | if (added_blank_line) { | |
2946 | if (!new_blank_lines_at_end) | |
2947 | found_new_blank_lines_at_end = hunk_linenr; | |
2948 | new_blank_lines_at_end++; | |
2949 | } | |
2950 | else if (is_blank_context) | |
2951 | ; | |
2952 | else | |
2953 | new_blank_lines_at_end = 0; | |
2954 | patch += len; | |
2955 | size -= len; | |
2956 | hunk_linenr++; | |
2957 | } | |
2958 | if (inaccurate_eof && | |
2959 | old > oldlines && old[-1] == '\n' && | |
2960 | newlines.len > 0 && newlines.buf[newlines.len - 1] == '\n') { | |
2961 | old--; | |
2962 | strbuf_setlen(&newlines, newlines.len - 1); | |
4855de12 RS |
2963 | preimage.line_allocated[preimage.nr - 1].len--; |
2964 | postimage.line_allocated[postimage.nr - 1].len--; | |
13b5af22 CC |
2965 | } |
2966 | ||
2967 | leading = frag->leading; | |
2968 | trailing = frag->trailing; | |
2969 | ||
2970 | /* | |
2971 | * A hunk to change lines at the beginning would begin with | |
2972 | * @@ -1,L +N,M @@ | |
2973 | * but we need to be careful. -U0 that inserts before the second | |
2974 | * line also has this pattern. | |
2975 | * | |
2976 | * And a hunk to add to an empty file would begin with | |
2977 | * @@ -0,0 +N,M @@ | |
2978 | * | |
2979 | * In other words, a hunk that is (frag->oldpos <= 1) with or | |
2980 | * without leading context must match at the beginning. | |
2981 | */ | |
2982 | match_beginning = (!frag->oldpos || | |
2983 | (frag->oldpos == 1 && !state->unidiff_zero)); | |
2984 | ||
2985 | /* | |
2986 | * A hunk without trailing lines must match at the end. | |
2987 | * However, we simply cannot tell if a hunk must match end | |
2988 | * from the lack of trailing lines if the patch was generated | |
2989 | * with unidiff without any context. | |
2990 | */ | |
2991 | match_end = !state->unidiff_zero && !trailing; | |
2992 | ||
2993 | pos = frag->newpos ? (frag->newpos - 1) : 0; | |
2994 | preimage.buf = oldlines; | |
2995 | preimage.len = old - oldlines; | |
2996 | postimage.buf = newlines.buf; | |
2997 | postimage.len = newlines.len; | |
2998 | preimage.line = preimage.line_allocated; | |
2999 | postimage.line = postimage.line_allocated; | |
3000 | ||
3001 | for (;;) { | |
3002 | ||
3003 | applied_pos = find_pos(state, img, &preimage, &postimage, pos, | |
3004 | ws_rule, match_beginning, match_end); | |
3005 | ||
3006 | if (applied_pos >= 0) | |
3007 | break; | |
3008 | ||
3009 | /* Am I at my context limits? */ | |
3010 | if ((leading <= state->p_context) && (trailing <= state->p_context)) | |
3011 | break; | |
3012 | if (match_beginning || match_end) { | |
3013 | match_beginning = match_end = 0; | |
3014 | continue; | |
3015 | } | |
3016 | ||
3017 | /* | |
3018 | * Reduce the number of context lines; reduce both | |
3019 | * leading and trailing if they are equal otherwise | |
3020 | * just reduce the larger context. | |
3021 | */ | |
3022 | if (leading >= trailing) { | |
3023 | remove_first_line(&preimage); | |
3024 | remove_first_line(&postimage); | |
3025 | pos--; | |
3026 | leading--; | |
3027 | } | |
3028 | if (trailing > leading) { | |
3029 | remove_last_line(&preimage); | |
3030 | remove_last_line(&postimage); | |
3031 | trailing--; | |
3032 | } | |
3033 | } | |
3034 | ||
3035 | if (applied_pos >= 0) { | |
3036 | if (new_blank_lines_at_end && | |
3037 | preimage.nr + applied_pos >= img->nr && | |
3038 | (ws_rule & WS_BLANK_AT_EOF) && | |
3039 | state->ws_error_action != nowarn_ws_error) { | |
3040 | record_ws_error(state, WS_BLANK_AT_EOF, "+", 1, | |
3041 | found_new_blank_lines_at_end); | |
3042 | if (state->ws_error_action == correct_ws_error) { | |
3043 | while (new_blank_lines_at_end--) | |
3044 | remove_last_line(&postimage); | |
3045 | } | |
3046 | /* | |
3047 | * We would want to prevent write_out_results() | |
3048 | * from taking place in apply_patch() that follows | |
3049 | * the callchain led us here, which is: | |
3050 | * apply_patch->check_patch_list->check_patch-> | |
3051 | * apply_data->apply_fragments->apply_one_fragment | |
3052 | */ | |
3053 | if (state->ws_error_action == die_on_ws_error) | |
3054 | state->apply = 0; | |
3055 | } | |
3056 | ||
a46160d2 | 3057 | if (state->apply_verbosity > verbosity_normal && applied_pos != pos) { |
13b5af22 CC |
3058 | int offset = applied_pos - pos; |
3059 | if (state->apply_in_reverse) | |
3060 | offset = 0 - offset; | |
3061 | fprintf_ln(stderr, | |
3062 | Q_("Hunk #%d succeeded at %d (offset %d line).", | |
3063 | "Hunk #%d succeeded at %d (offset %d lines).", | |
3064 | offset), | |
3065 | nth_fragment, applied_pos + 1, offset); | |
3066 | } | |
3067 | ||
3068 | /* | |
3069 | * Warn if it was necessary to reduce the number | |
3070 | * of context lines. | |
3071 | */ | |
a46160d2 CC |
3072 | if ((leading != frag->leading || |
3073 | trailing != frag->trailing) && state->apply_verbosity > verbosity_silent) | |
13b5af22 CC |
3074 | fprintf_ln(stderr, _("Context reduced to (%ld/%ld)" |
3075 | " to apply fragment at %d"), | |
3076 | leading, trailing, applied_pos+1); | |
3077 | update_image(state, img, applied_pos, &preimage, &postimage); | |
3078 | } else { | |
a46160d2 | 3079 | if (state->apply_verbosity > verbosity_normal) |
13b5af22 CC |
3080 | error(_("while searching for:\n%.*s"), |
3081 | (int)(old - oldlines), oldlines); | |
3082 | } | |
3083 | ||
3084 | out: | |
3085 | free(oldlines); | |
3086 | strbuf_release(&newlines); | |
3087 | free(preimage.line_allocated); | |
3088 | free(postimage.line_allocated); | |
3089 | ||
3090 | return (applied_pos < 0); | |
3091 | } | |
3092 | ||
3093 | static int apply_binary_fragment(struct apply_state *state, | |
3094 | struct image *img, | |
3095 | struct patch *patch) | |
3096 | { | |
3097 | struct fragment *fragment = patch->fragments; | |
3098 | unsigned long len; | |
3099 | void *dst; | |
3100 | ||
3101 | if (!fragment) | |
3102 | return error(_("missing binary patch data for '%s'"), | |
3103 | patch->new_name ? | |
3104 | patch->new_name : | |
3105 | patch->old_name); | |
3106 | ||
3107 | /* Binary patch is irreversible without the optional second hunk */ | |
3108 | if (state->apply_in_reverse) { | |
3109 | if (!fragment->next) | |
d1d42bf5 VA |
3110 | return error(_("cannot reverse-apply a binary patch " |
3111 | "without the reverse hunk to '%s'"), | |
13b5af22 CC |
3112 | patch->new_name |
3113 | ? patch->new_name : patch->old_name); | |
3114 | fragment = fragment->next; | |
3115 | } | |
3116 | switch (fragment->binary_patch_method) { | |
3117 | case BINARY_DELTA_DEFLATED: | |
3118 | dst = patch_delta(img->buf, img->len, fragment->patch, | |
3119 | fragment->size, &len); | |
3120 | if (!dst) | |
3121 | return -1; | |
3122 | clear_image(img); | |
3123 | img->buf = dst; | |
3124 | img->len = len; | |
3125 | return 0; | |
3126 | case BINARY_LITERAL_DEFLATED: | |
3127 | clear_image(img); | |
3128 | img->len = fragment->size; | |
3129 | img->buf = xmemdupz(fragment->patch, img->len); | |
3130 | return 0; | |
3131 | } | |
3132 | return -1; | |
3133 | } | |
3134 | ||
3135 | /* | |
3136 | * Replace "img" with the result of applying the binary patch. | |
3137 | * The binary patch data itself in patch->fragment is still kept | |
3138 | * but the preimage prepared by the caller in "img" is freed here | |
3139 | * or in the helper function apply_binary_fragment() this calls. | |
3140 | */ | |
3141 | static int apply_binary(struct apply_state *state, | |
3142 | struct image *img, | |
3143 | struct patch *patch) | |
3144 | { | |
3145 | const char *name = patch->old_name ? patch->old_name : patch->new_name; | |
4af9a7d3 | 3146 | struct object_id oid; |
93eb00f7 | 3147 | const unsigned hexsz = the_hash_algo->hexsz; |
13b5af22 CC |
3148 | |
3149 | /* | |
3150 | * For safety, we require patch index line to contain | |
93eb00f7 | 3151 | * full hex textual object ID for old and new, at least for now. |
13b5af22 | 3152 | */ |
eccb5a5f | 3153 | if (strlen(patch->old_oid_prefix) != hexsz || |
3154 | strlen(patch->new_oid_prefix) != hexsz || | |
3155 | get_oid_hex(patch->old_oid_prefix, &oid) || | |
3156 | get_oid_hex(patch->new_oid_prefix, &oid)) | |
d1d42bf5 VA |
3157 | return error(_("cannot apply binary patch to '%s' " |
3158 | "without full index line"), name); | |
13b5af22 CC |
3159 | |
3160 | if (patch->old_name) { | |
3161 | /* | |
3162 | * See if the old one matches what the patch | |
3163 | * applies to. | |
3164 | */ | |
f070facc | 3165 | hash_object_file(img->buf, img->len, blob_type, &oid); |
eccb5a5f | 3166 | if (strcmp(oid_to_hex(&oid), patch->old_oid_prefix)) |
d1d42bf5 VA |
3167 | return error(_("the patch applies to '%s' (%s), " |
3168 | "which does not match the " | |
3169 | "current contents."), | |
4af9a7d3 | 3170 | name, oid_to_hex(&oid)); |
13b5af22 CC |
3171 | } |
3172 | else { | |
3173 | /* Otherwise, the old one must be empty. */ | |
3174 | if (img->len) | |
d1d42bf5 VA |
3175 | return error(_("the patch applies to an empty " |
3176 | "'%s' but it is not empty"), name); | |
13b5af22 CC |
3177 | } |
3178 | ||
eccb5a5f | 3179 | get_oid_hex(patch->new_oid_prefix, &oid); |
4af9a7d3 | 3180 | if (is_null_oid(&oid)) { |
13b5af22 CC |
3181 | clear_image(img); |
3182 | return 0; /* deletion patch */ | |
3183 | } | |
3184 | ||
98374a07 | 3185 | if (has_object_file(&oid)) { |
13b5af22 CC |
3186 | /* We already have the postimage */ |
3187 | enum object_type type; | |
3188 | unsigned long size; | |
3189 | char *result; | |
3190 | ||
b4f5aca4 | 3191 | result = read_object_file(&oid, &type, &size); |
13b5af22 | 3192 | if (!result) |
d1d42bf5 VA |
3193 | return error(_("the necessary postimage %s for " |
3194 | "'%s' cannot be read"), | |
eccb5a5f | 3195 | patch->new_oid_prefix, name); |
13b5af22 CC |
3196 | clear_image(img); |
3197 | img->buf = result; | |
3198 | img->len = size; | |
3199 | } else { | |
3200 | /* | |
3201 | * We have verified buf matches the preimage; | |
3202 | * apply the patch data to it, which is stored | |
3203 | * in the patch->fragments->{patch,size}. | |
3204 | */ | |
3205 | if (apply_binary_fragment(state, img, patch)) | |
3206 | return error(_("binary patch does not apply to '%s'"), | |
3207 | name); | |
3208 | ||
3209 | /* verify that the result matches */ | |
f070facc | 3210 | hash_object_file(img->buf, img->len, blob_type, &oid); |
eccb5a5f | 3211 | if (strcmp(oid_to_hex(&oid), patch->new_oid_prefix)) |
13b5af22 | 3212 | return error(_("binary patch to '%s' creates incorrect result (expecting %s, got %s)"), |
eccb5a5f | 3213 | name, patch->new_oid_prefix, oid_to_hex(&oid)); |
13b5af22 CC |
3214 | } |
3215 | ||
3216 | return 0; | |
3217 | } | |
3218 | ||
3219 | static int apply_fragments(struct apply_state *state, struct image *img, struct patch *patch) | |
3220 | { | |
3221 | struct fragment *frag = patch->fragments; | |
3222 | const char *name = patch->old_name ? patch->old_name : patch->new_name; | |
3223 | unsigned ws_rule = patch->ws_rule; | |
3224 | unsigned inaccurate_eof = patch->inaccurate_eof; | |
3225 | int nth = 0; | |
3226 | ||
3227 | if (patch->is_binary) | |
3228 | return apply_binary(state, img, patch); | |
3229 | ||
3230 | while (frag) { | |
3231 | nth++; | |
3232 | if (apply_one_fragment(state, img, frag, inaccurate_eof, ws_rule, nth)) { | |
3233 | error(_("patch failed: %s:%ld"), name, frag->oldpos); | |
3234 | if (!state->apply_with_reject) | |
3235 | return -1; | |
3236 | frag->rejected = 1; | |
3237 | } | |
3238 | frag = frag->next; | |
3239 | } | |
3240 | return 0; | |
3241 | } | |
3242 | ||
4af9a7d3 | 3243 | static int read_blob_object(struct strbuf *buf, const struct object_id *oid, unsigned mode) |
13b5af22 CC |
3244 | { |
3245 | if (S_ISGITLINK(mode)) { | |
3246 | strbuf_grow(buf, 100); | |
4af9a7d3 | 3247 | strbuf_addf(buf, "Subproject commit %s\n", oid_to_hex(oid)); |
13b5af22 CC |
3248 | } else { |
3249 | enum object_type type; | |
3250 | unsigned long sz; | |
3251 | char *result; | |
3252 | ||
b4f5aca4 | 3253 | result = read_object_file(oid, &type, &sz); |
13b5af22 CC |
3254 | if (!result) |
3255 | return -1; | |
3256 | /* XXX read_sha1_file NUL-terminates */ | |
3257 | strbuf_attach(buf, result, sz, sz + 1); | |
3258 | } | |
3259 | return 0; | |
3260 | } | |
3261 | ||
3262 | static int read_file_or_gitlink(const struct cache_entry *ce, struct strbuf *buf) | |
3263 | { | |
3264 | if (!ce) | |
3265 | return 0; | |
4af9a7d3 | 3266 | return read_blob_object(buf, &ce->oid, ce->ce_mode); |
13b5af22 CC |
3267 | } |
3268 | ||
3269 | static struct patch *in_fn_table(struct apply_state *state, const char *name) | |
3270 | { | |
3271 | struct string_list_item *item; | |
3272 | ||
3273 | if (name == NULL) | |
3274 | return NULL; | |
3275 | ||
3276 | item = string_list_lookup(&state->fn_table, name); | |
3277 | if (item != NULL) | |
3278 | return (struct patch *)item->util; | |
3279 | ||
3280 | return NULL; | |
3281 | } | |
3282 | ||
3283 | /* | |
3284 | * item->util in the filename table records the status of the path. | |
3285 | * Usually it points at a patch (whose result records the contents | |
3286 | * of it after applying it), but it could be PATH_WAS_DELETED for a | |
3287 | * path that a previously applied patch has already removed, or | |
3288 | * PATH_TO_BE_DELETED for a path that a later patch would remove. | |
3289 | * | |
3290 | * The latter is needed to deal with a case where two paths A and B | |
3291 | * are swapped by first renaming A to B and then renaming B to A; | |
3292 | * moving A to B should not be prevented due to presence of B as we | |
3293 | * will remove it in a later patch. | |
3294 | */ | |
3295 | #define PATH_TO_BE_DELETED ((struct patch *) -2) | |
3296 | #define PATH_WAS_DELETED ((struct patch *) -1) | |
3297 | ||
3298 | static int to_be_deleted(struct patch *patch) | |
3299 | { | |
3300 | return patch == PATH_TO_BE_DELETED; | |
3301 | } | |
3302 | ||
3303 | static int was_deleted(struct patch *patch) | |
3304 | { | |
3305 | return patch == PATH_WAS_DELETED; | |
3306 | } | |
3307 | ||
3308 | static void add_to_fn_table(struct apply_state *state, struct patch *patch) | |
3309 | { | |
3310 | struct string_list_item *item; | |
3311 | ||
3312 | /* | |
3313 | * Always add new_name unless patch is a deletion | |
3314 | * This should cover the cases for normal diffs, | |
3315 | * file creations and copies | |
3316 | */ | |
3317 | if (patch->new_name != NULL) { | |
3318 | item = string_list_insert(&state->fn_table, patch->new_name); | |
3319 | item->util = patch; | |
3320 | } | |
3321 | ||
3322 | /* | |
3323 | * store a failure on rename/deletion cases because | |
3324 | * later chunks shouldn't patch old names | |
3325 | */ | |
3326 | if ((patch->new_name == NULL) || (patch->is_rename)) { | |
3327 | item = string_list_insert(&state->fn_table, patch->old_name); | |
3328 | item->util = PATH_WAS_DELETED; | |
3329 | } | |
3330 | } | |
3331 | ||
3332 | static void prepare_fn_table(struct apply_state *state, struct patch *patch) | |
3333 | { | |
3334 | /* | |
3335 | * store information about incoming file deletion | |
3336 | */ | |
3337 | while (patch) { | |
3338 | if ((patch->new_name == NULL) || (patch->is_rename)) { | |
3339 | struct string_list_item *item; | |
3340 | item = string_list_insert(&state->fn_table, patch->old_name); | |
3341 | item->util = PATH_TO_BE_DELETED; | |
3342 | } | |
3343 | patch = patch->next; | |
3344 | } | |
3345 | } | |
3346 | ||
3347 | static int checkout_target(struct index_state *istate, | |
3348 | struct cache_entry *ce, struct stat *st) | |
3349 | { | |
68e3d629 | 3350 | struct checkout costate = CHECKOUT_INIT; |
13b5af22 | 3351 | |
13b5af22 CC |
3352 | costate.refresh_cache = 1; |
3353 | costate.istate = istate; | |
0f086e6d NTND |
3354 | if (checkout_entry(ce, &costate, NULL, NULL) || |
3355 | lstat(ce->name, st)) | |
13b5af22 CC |
3356 | return error(_("cannot checkout %s"), ce->name); |
3357 | return 0; | |
3358 | } | |
3359 | ||
3360 | static struct patch *previous_patch(struct apply_state *state, | |
3361 | struct patch *patch, | |
3362 | int *gone) | |
3363 | { | |
3364 | struct patch *previous; | |
3365 | ||
3366 | *gone = 0; | |
3367 | if (patch->is_copy || patch->is_rename) | |
3368 | return NULL; /* "git" patches do not depend on the order */ | |
3369 | ||
3370 | previous = in_fn_table(state, patch->old_name); | |
3371 | if (!previous) | |
3372 | return NULL; | |
3373 | ||
3374 | if (to_be_deleted(previous)) | |
3375 | return NULL; /* the deletion hasn't happened yet */ | |
3376 | ||
3377 | if (was_deleted(previous)) | |
3378 | *gone = 1; | |
3379 | ||
3380 | return previous; | |
3381 | } | |
3382 | ||
332a82a5 NTND |
3383 | static int verify_index_match(struct apply_state *state, |
3384 | const struct cache_entry *ce, | |
3385 | struct stat *st) | |
13b5af22 CC |
3386 | { |
3387 | if (S_ISGITLINK(ce->ce_mode)) { | |
3388 | if (!S_ISDIR(st->st_mode)) | |
3389 | return -1; | |
3390 | return 0; | |
3391 | } | |
1b5c6c1e NTND |
3392 | return ie_match_stat(state->repo->index, ce, st, |
3393 | CE_MATCH_IGNORE_VALID | CE_MATCH_IGNORE_SKIP_WORKTREE); | |
13b5af22 CC |
3394 | } |
3395 | ||
3396 | #define SUBMODULE_PATCH_WITHOUT_INDEX 1 | |
3397 | ||
3398 | static int load_patch_target(struct apply_state *state, | |
3399 | struct strbuf *buf, | |
3400 | const struct cache_entry *ce, | |
3401 | struct stat *st, | |
c24f3aba | 3402 | struct patch *patch, |
13b5af22 CC |
3403 | const char *name, |
3404 | unsigned expected_mode) | |
3405 | { | |
3406 | if (state->cached || state->check_index) { | |
3407 | if (read_file_or_gitlink(ce, buf)) | |
3408 | return error(_("failed to read %s"), name); | |
3409 | } else if (name) { | |
3410 | if (S_ISGITLINK(expected_mode)) { | |
3411 | if (ce) | |
3412 | return read_file_or_gitlink(ce, buf); | |
3413 | else | |
3414 | return SUBMODULE_PATCH_WITHOUT_INDEX; | |
3415 | } else if (has_symlink_leading_path(name, strlen(name))) { | |
3416 | return error(_("reading from '%s' beyond a symbolic link"), name); | |
3417 | } else { | |
c24f3aba | 3418 | if (read_old_data(st, patch, name, buf)) |
13b5af22 CC |
3419 | return error(_("failed to read %s"), name); |
3420 | } | |
3421 | } | |
3422 | return 0; | |
3423 | } | |
3424 | ||
3425 | /* | |
3426 | * We are about to apply "patch"; populate the "image" with the | |
3427 | * current version we have, from the working tree or from the index, | |
3428 | * depending on the situation e.g. --cached/--index. If we are | |
3429 | * applying a non-git patch that incrementally updates the tree, | |
3430 | * we read from the result of a previous diff. | |
3431 | */ | |
3432 | static int load_preimage(struct apply_state *state, | |
3433 | struct image *image, | |
3434 | struct patch *patch, struct stat *st, | |
3435 | const struct cache_entry *ce) | |
3436 | { | |
3437 | struct strbuf buf = STRBUF_INIT; | |
3438 | size_t len; | |
3439 | char *img; | |
3440 | struct patch *previous; | |
3441 | int status; | |
3442 | ||
3443 | previous = previous_patch(state, patch, &status); | |
3444 | if (status) | |
3445 | return error(_("path %s has been renamed/deleted"), | |
3446 | patch->old_name); | |
3447 | if (previous) { | |
3448 | /* We have a patched copy in memory; use that. */ | |
3449 | strbuf_add(&buf, previous->result, previous->resultsize); | |
3450 | } else { | |
c24f3aba | 3451 | status = load_patch_target(state, &buf, ce, st, patch, |
13b5af22 CC |
3452 | patch->old_name, patch->old_mode); |
3453 | if (status < 0) | |
3454 | return status; | |
3455 | else if (status == SUBMODULE_PATCH_WITHOUT_INDEX) { | |
3456 | /* | |
3457 | * There is no way to apply subproject | |
3458 | * patch without looking at the index. | |
3459 | * NEEDSWORK: shouldn't this be flagged | |
3460 | * as an error??? | |
3461 | */ | |
3462 | free_fragment_list(patch->fragments); | |
3463 | patch->fragments = NULL; | |
3464 | } else if (status) { | |
3465 | return error(_("failed to read %s"), patch->old_name); | |
3466 | } | |
3467 | } | |
3468 | ||
3469 | img = strbuf_detach(&buf, &len); | |
3470 | prepare_image(image, img, len, !patch->is_binary); | |
3471 | return 0; | |
3472 | } | |
3473 | ||
32eaa468 NTND |
3474 | static int three_way_merge(struct apply_state *state, |
3475 | struct image *image, | |
13b5af22 | 3476 | char *path, |
4af9a7d3 JH |
3477 | const struct object_id *base, |
3478 | const struct object_id *ours, | |
3479 | const struct object_id *theirs) | |
13b5af22 CC |
3480 | { |
3481 | mmfile_t base_file, our_file, their_file; | |
3482 | mmbuffer_t result = { NULL }; | |
3483 | int status; | |
3484 | ||
3485 | read_mmblob(&base_file, base); | |
3486 | read_mmblob(&our_file, ours); | |
3487 | read_mmblob(&their_file, theirs); | |
3488 | status = ll_merge(&result, path, | |
3489 | &base_file, "base", | |
3490 | &our_file, "ours", | |
32eaa468 NTND |
3491 | &their_file, "theirs", |
3492 | state->repo->index, | |
3493 | NULL); | |
13b5af22 CC |
3494 | free(base_file.ptr); |
3495 | free(our_file.ptr); | |
3496 | free(their_file.ptr); | |
3497 | if (status < 0 || !result.ptr) { | |
3498 | free(result.ptr); | |
3499 | return -1; | |
3500 | } | |
3501 | clear_image(image); | |
3502 | image->buf = result.ptr; | |
3503 | image->len = result.size; | |
3504 | ||
3505 | return status; | |
3506 | } | |
3507 | ||
3508 | /* | |
3509 | * When directly falling back to add/add three-way merge, we read from | |
3510 | * the current contents of the new_name. In no cases other than that | |
3511 | * this function will be called. | |
3512 | */ | |
3513 | static int load_current(struct apply_state *state, | |
3514 | struct image *image, | |
3515 | struct patch *patch) | |
3516 | { | |
3517 | struct strbuf buf = STRBUF_INIT; | |
3518 | int status, pos; | |
3519 | size_t len; | |
3520 | char *img; | |
3521 | struct stat st; | |
3522 | struct cache_entry *ce; | |
3523 | char *name = patch->new_name; | |
3524 | unsigned mode = patch->new_mode; | |
3525 | ||
3526 | if (!patch->is_new) | |
033abf97 | 3527 | BUG("patch to %s is not a creation", patch->old_name); |
13b5af22 | 3528 | |
1b5c6c1e | 3529 | pos = index_name_pos(state->repo->index, name, strlen(name)); |
13b5af22 CC |
3530 | if (pos < 0) |
3531 | return error(_("%s: does not exist in index"), name); | |
1b5c6c1e | 3532 | ce = state->repo->index->cache[pos]; |
13b5af22 CC |
3533 | if (lstat(name, &st)) { |
3534 | if (errno != ENOENT) | |
90875eca | 3535 | return error_errno("%s", name); |
1b5c6c1e | 3536 | if (checkout_target(state->repo->index, ce, &st)) |
13b5af22 CC |
3537 | return -1; |
3538 | } | |
332a82a5 | 3539 | if (verify_index_match(state, ce, &st)) |
13b5af22 CC |
3540 | return error(_("%s: does not match index"), name); |
3541 | ||
c24f3aba | 3542 | status = load_patch_target(state, &buf, ce, &st, patch, name, mode); |
13b5af22 CC |
3543 | if (status < 0) |
3544 | return status; | |
3545 | else if (status) | |
3546 | return -1; | |
3547 | img = strbuf_detach(&buf, &len); | |
3548 | prepare_image(image, img, len, !patch->is_binary); | |
3549 | return 0; | |
3550 | } | |
3551 | ||
3552 | static int try_threeway(struct apply_state *state, | |
3553 | struct image *image, | |
3554 | struct patch *patch, | |
3555 | struct stat *st, | |
3556 | const struct cache_entry *ce) | |
3557 | { | |
4af9a7d3 | 3558 | struct object_id pre_oid, post_oid, our_oid; |
13b5af22 CC |
3559 | struct strbuf buf = STRBUF_INIT; |
3560 | size_t len; | |
3561 | int status; | |
3562 | char *img; | |
3563 | struct image tmp_image; | |
3564 | ||
3565 | /* No point falling back to 3-way merge in these cases */ | |
3566 | if (patch->is_delete || | |
3567 | S_ISGITLINK(patch->old_mode) || S_ISGITLINK(patch->new_mode)) | |
3568 | return -1; | |
3569 | ||
3570 | /* Preimage the patch was prepared for */ | |
3571 | if (patch->is_new) | |
a09c985e | 3572 | write_object_file("", 0, blob_type, &pre_oid); |
eccb5a5f | 3573 | else if (get_oid(patch->old_oid_prefix, &pre_oid) || |
4af9a7d3 | 3574 | read_blob_object(&buf, &pre_oid, patch->old_mode)) |
d1d42bf5 | 3575 | return error(_("repository lacks the necessary blob to fall back on 3-way merge.")); |
13b5af22 | 3576 | |
a46160d2 | 3577 | if (state->apply_verbosity > verbosity_silent) |
5886637a | 3578 | fprintf(stderr, _("Falling back to three-way merge...\n")); |
13b5af22 CC |
3579 | |
3580 | img = strbuf_detach(&buf, &len); | |
3581 | prepare_image(&tmp_image, img, len, 1); | |
3582 | /* Apply the patch to get the post image */ | |
3583 | if (apply_fragments(state, &tmp_image, patch) < 0) { | |
3584 | clear_image(&tmp_image); | |
3585 | return -1; | |
3586 | } | |
4af9a7d3 | 3587 | /* post_oid is theirs */ |
a09c985e | 3588 | write_object_file(tmp_image.buf, tmp_image.len, blob_type, &post_oid); |
13b5af22 CC |
3589 | clear_image(&tmp_image); |
3590 | ||
4af9a7d3 | 3591 | /* our_oid is ours */ |
13b5af22 CC |
3592 | if (patch->is_new) { |
3593 | if (load_current(state, &tmp_image, patch)) | |
d1d42bf5 | 3594 | return error(_("cannot read the current contents of '%s'"), |
13b5af22 CC |
3595 | patch->new_name); |
3596 | } else { | |
3597 | if (load_preimage(state, &tmp_image, patch, st, ce)) | |
d1d42bf5 | 3598 | return error(_("cannot read the current contents of '%s'"), |
13b5af22 CC |
3599 | patch->old_name); |
3600 | } | |
a09c985e | 3601 | write_object_file(tmp_image.buf, tmp_image.len, blob_type, &our_oid); |
13b5af22 CC |
3602 | clear_image(&tmp_image); |
3603 | ||
3604 | /* in-core three-way merge between post and our using pre as base */ | |
32eaa468 | 3605 | status = three_way_merge(state, image, patch->new_name, |
4af9a7d3 | 3606 | &pre_oid, &our_oid, &post_oid); |
13b5af22 | 3607 | if (status < 0) { |
a46160d2 CC |
3608 | if (state->apply_verbosity > verbosity_silent) |
3609 | fprintf(stderr, | |
5886637a | 3610 | _("Failed to fall back on three-way merge...\n")); |
13b5af22 CC |
3611 | return status; |
3612 | } | |
3613 | ||
3614 | if (status) { | |
3615 | patch->conflicted_threeway = 1; | |
3616 | if (patch->is_new) | |
3617 | oidclr(&patch->threeway_stage[0]); | |
3618 | else | |
4af9a7d3 JH |
3619 | oidcpy(&patch->threeway_stage[0], &pre_oid); |
3620 | oidcpy(&patch->threeway_stage[1], &our_oid); | |
3621 | oidcpy(&patch->threeway_stage[2], &post_oid); | |
a46160d2 CC |
3622 | if (state->apply_verbosity > verbosity_silent) |
3623 | fprintf(stderr, | |
5886637a | 3624 | _("Applied patch to '%s' with conflicts.\n"), |
a46160d2 | 3625 | patch->new_name); |
13b5af22 | 3626 | } else { |
a46160d2 CC |
3627 | if (state->apply_verbosity > verbosity_silent) |
3628 | fprintf(stderr, | |
5886637a | 3629 | _("Applied patch to '%s' cleanly.\n"), |
a46160d2 | 3630 | patch->new_name); |
13b5af22 CC |
3631 | } |
3632 | return 0; | |
3633 | } | |
3634 | ||
3635 | static int apply_data(struct apply_state *state, struct patch *patch, | |
3636 | struct stat *st, const struct cache_entry *ce) | |
3637 | { | |
3638 | struct image image; | |
3639 | ||
3640 | if (load_preimage(state, &image, patch, st, ce) < 0) | |
3641 | return -1; | |
3642 | ||
3643 | if (patch->direct_to_threeway || | |
3644 | apply_fragments(state, &image, patch) < 0) { | |
3645 | /* Note: with --reject, apply_fragments() returns 0 */ | |
3646 | if (!state->threeway || try_threeway(state, &image, patch, st, ce) < 0) | |
3647 | return -1; | |
3648 | } | |
3649 | patch->result = image.buf; | |
3650 | patch->resultsize = image.len; | |
3651 | add_to_fn_table(state, patch); | |
3652 | free(image.line_allocated); | |
3653 | ||
3654 | if (0 < patch->is_delete && patch->resultsize) | |
3655 | return error(_("removal patch leaves file contents")); | |
3656 | ||
3657 | return 0; | |
3658 | } | |
3659 | ||
3660 | /* | |
3661 | * If "patch" that we are looking at modifies or deletes what we have, | |
3662 | * we would want it not to lose any local modification we have, either | |
3663 | * in the working tree or in the index. | |
3664 | * | |
3665 | * This also decides if a non-git patch is a creation patch or a | |
3666 | * modification to an existing empty file. We do not check the state | |
3667 | * of the current tree for a creation patch in this function; the caller | |
3668 | * check_patch() separately makes sure (and errors out otherwise) that | |
3669 | * the path the patch creates does not exist in the current tree. | |
3670 | */ | |
3671 | static int check_preimage(struct apply_state *state, | |
3672 | struct patch *patch, | |
3673 | struct cache_entry **ce, | |
3674 | struct stat *st) | |
3675 | { | |
3676 | const char *old_name = patch->old_name; | |
3677 | struct patch *previous = NULL; | |
3678 | int stat_ret = 0, status; | |
3679 | unsigned st_mode = 0; | |
3680 | ||
3681 | if (!old_name) | |
3682 | return 0; | |
3683 | ||
3684 | assert(patch->is_new <= 0); | |
3685 | previous = previous_patch(state, patch, &status); | |
3686 | ||
3687 | if (status) | |
3688 | return error(_("path %s has been renamed/deleted"), old_name); | |
3689 | if (previous) { | |
3690 | st_mode = previous->new_mode; | |
3691 | } else if (!state->cached) { | |
3692 | stat_ret = lstat(old_name, st); | |
3693 | if (stat_ret && errno != ENOENT) | |
90875eca | 3694 | return error_errno("%s", old_name); |
13b5af22 CC |
3695 | } |
3696 | ||
3697 | if (state->check_index && !previous) { | |
1b5c6c1e NTND |
3698 | int pos = index_name_pos(state->repo->index, old_name, |
3699 | strlen(old_name)); | |
13b5af22 CC |
3700 | if (pos < 0) { |
3701 | if (patch->is_new < 0) | |
3702 | goto is_new; | |
3703 | return error(_("%s: does not exist in index"), old_name); | |
3704 | } | |
1b5c6c1e | 3705 | *ce = state->repo->index->cache[pos]; |
13b5af22 | 3706 | if (stat_ret < 0) { |
1b5c6c1e | 3707 | if (checkout_target(state->repo->index, *ce, st)) |
13b5af22 CC |
3708 | return -1; |
3709 | } | |
332a82a5 | 3710 | if (!state->cached && verify_index_match(state, *ce, st)) |
13b5af22 CC |
3711 | return error(_("%s: does not match index"), old_name); |
3712 | if (state->cached) | |
3713 | st_mode = (*ce)->ce_mode; | |
3714 | } else if (stat_ret < 0) { | |
3715 | if (patch->is_new < 0) | |
3716 | goto is_new; | |
90875eca | 3717 | return error_errno("%s", old_name); |
13b5af22 CC |
3718 | } |
3719 | ||
3720 | if (!state->cached && !previous) | |
3721 | st_mode = ce_mode_from_stat(*ce, st->st_mode); | |
3722 | ||
3723 | if (patch->is_new < 0) | |
3724 | patch->is_new = 0; | |
3725 | if (!patch->old_mode) | |
3726 | patch->old_mode = st_mode; | |
3727 | if ((st_mode ^ patch->old_mode) & S_IFMT) | |
3728 | return error(_("%s: wrong type"), old_name); | |
3729 | if (st_mode != patch->old_mode) | |
3730 | warning(_("%s has type %o, expected %o"), | |
3731 | old_name, st_mode, patch->old_mode); | |
3732 | if (!patch->new_mode && !patch->is_delete) | |
3733 | patch->new_mode = st_mode; | |
3734 | return 0; | |
3735 | ||
3736 | is_new: | |
3737 | patch->is_new = 1; | |
3738 | patch->is_delete = 0; | |
6a83d902 | 3739 | FREE_AND_NULL(patch->old_name); |
13b5af22 CC |
3740 | return 0; |
3741 | } | |
3742 | ||
3743 | ||
3744 | #define EXISTS_IN_INDEX 1 | |
3745 | #define EXISTS_IN_WORKTREE 2 | |
3746 | ||
3747 | static int check_to_create(struct apply_state *state, | |
3748 | const char *new_name, | |
3749 | int ok_if_exists) | |
3750 | { | |
3751 | struct stat nst; | |
3752 | ||
3753 | if (state->check_index && | |
1b5c6c1e | 3754 | index_name_pos(state->repo->index, new_name, strlen(new_name)) >= 0 && |
13b5af22 CC |
3755 | !ok_if_exists) |
3756 | return EXISTS_IN_INDEX; | |
3757 | if (state->cached) | |
3758 | return 0; | |
3759 | ||
3760 | if (!lstat(new_name, &nst)) { | |
3761 | if (S_ISDIR(nst.st_mode) || ok_if_exists) | |
3762 | return 0; | |
3763 | /* | |
3764 | * A leading component of new_name might be a symlink | |
3765 | * that is going to be removed with this patch, but | |
3766 | * still pointing at somewhere that has the path. | |
3767 | * In such a case, path "new_name" does not exist as | |
3768 | * far as git is concerned. | |
3769 | */ | |
3770 | if (has_symlink_leading_path(new_name, strlen(new_name))) | |
3771 | return 0; | |
3772 | ||
3773 | return EXISTS_IN_WORKTREE; | |
c7054209 | 3774 | } else if (!is_missing_file_error(errno)) { |
90875eca | 3775 | return error_errno("%s", new_name); |
13b5af22 CC |
3776 | } |
3777 | return 0; | |
3778 | } | |
3779 | ||
3780 | static uintptr_t register_symlink_changes(struct apply_state *state, | |
3781 | const char *path, | |
3782 | uintptr_t what) | |
3783 | { | |
3784 | struct string_list_item *ent; | |
3785 | ||
3786 | ent = string_list_lookup(&state->symlink_changes, path); | |
3787 | if (!ent) { | |
3788 | ent = string_list_insert(&state->symlink_changes, path); | |
3789 | ent->util = (void *)0; | |
3790 | } | |
3791 | ent->util = (void *)(what | ((uintptr_t)ent->util)); | |
3792 | return (uintptr_t)ent->util; | |
3793 | } | |
3794 | ||
3795 | static uintptr_t check_symlink_changes(struct apply_state *state, const char *path) | |
3796 | { | |
3797 | struct string_list_item *ent; | |
3798 | ||
3799 | ent = string_list_lookup(&state->symlink_changes, path); | |
3800 | if (!ent) | |
3801 | return 0; | |
3802 | return (uintptr_t)ent->util; | |
3803 | } | |
3804 | ||
3805 | static void prepare_symlink_changes(struct apply_state *state, struct patch *patch) | |
3806 | { | |
3807 | for ( ; patch; patch = patch->next) { | |
3808 | if ((patch->old_name && S_ISLNK(patch->old_mode)) && | |
3809 | (patch->is_rename || patch->is_delete)) | |
3810 | /* the symlink at patch->old_name is removed */ | |
3811 | register_symlink_changes(state, patch->old_name, APPLY_SYMLINK_GOES_AWAY); | |
3812 | ||
3813 | if (patch->new_name && S_ISLNK(patch->new_mode)) | |
3814 | /* the symlink at patch->new_name is created or remains */ | |
3815 | register_symlink_changes(state, patch->new_name, APPLY_SYMLINK_IN_RESULT); | |
3816 | } | |
3817 | } | |
3818 | ||
3819 | static int path_is_beyond_symlink_1(struct apply_state *state, struct strbuf *name) | |
3820 | { | |
3821 | do { | |
3822 | unsigned int change; | |
3823 | ||
3824 | while (--name->len && name->buf[name->len] != '/') | |
3825 | ; /* scan backwards */ | |
3826 | if (!name->len) | |
3827 | break; | |
3828 | name->buf[name->len] = '\0'; | |
3829 | change = check_symlink_changes(state, name->buf); | |
3830 | if (change & APPLY_SYMLINK_IN_RESULT) | |
3831 | return 1; | |
3832 | if (change & APPLY_SYMLINK_GOES_AWAY) | |
3833 | /* | |
3834 | * This cannot be "return 0", because we may | |
3835 | * see a new one created at a higher level. | |
3836 | */ | |
3837 | continue; | |
3838 | ||
3839 | /* otherwise, check the preimage */ | |
3840 | if (state->check_index) { | |
3841 | struct cache_entry *ce; | |
3842 | ||
1b5c6c1e NTND |
3843 | ce = index_file_exists(state->repo->index, name->buf, |
3844 | name->len, ignore_case); | |
13b5af22 CC |
3845 | if (ce && S_ISLNK(ce->ce_mode)) |
3846 | return 1; | |
3847 | } else { | |
3848 | struct stat st; | |
3849 | if (!lstat(name->buf, &st) && S_ISLNK(st.st_mode)) | |
3850 | return 1; | |
3851 | } | |
3852 | } while (1); | |
3853 | return 0; | |
3854 | } | |
3855 | ||
3856 | static int path_is_beyond_symlink(struct apply_state *state, const char *name_) | |
3857 | { | |
3858 | int ret; | |
3859 | struct strbuf name = STRBUF_INIT; | |
3860 | ||
3861 | assert(*name_ != '\0'); | |
3862 | strbuf_addstr(&name, name_); | |
3863 | ret = path_is_beyond_symlink_1(state, &name); | |
3864 | strbuf_release(&name); | |
3865 | ||
3866 | return ret; | |
3867 | } | |
3868 | ||
3869 | static int check_unsafe_path(struct patch *patch) | |
3870 | { | |
3871 | const char *old_name = NULL; | |
3872 | const char *new_name = NULL; | |
3873 | if (patch->is_delete) | |
3874 | old_name = patch->old_name; | |
3875 | else if (!patch->is_new && !patch->is_copy) | |
3876 | old_name = patch->old_name; | |
3877 | if (!patch->is_delete) | |
3878 | new_name = patch->new_name; | |
3879 | ||
10ecfa76 | 3880 | if (old_name && !verify_path(old_name, patch->old_mode)) |
13b5af22 | 3881 | return error(_("invalid path '%s'"), old_name); |
10ecfa76 | 3882 | if (new_name && !verify_path(new_name, patch->new_mode)) |
13b5af22 CC |
3883 | return error(_("invalid path '%s'"), new_name); |
3884 | return 0; | |
3885 | } | |
3886 | ||
3887 | /* | |
3888 | * Check and apply the patch in-core; leave the result in patch->result | |
3889 | * for the caller to write it out to the final destination. | |
3890 | */ | |
3891 | static int check_patch(struct apply_state *state, struct patch *patch) | |
3892 | { | |
3893 | struct stat st; | |
3894 | const char *old_name = patch->old_name; | |
3895 | const char *new_name = patch->new_name; | |
3896 | const char *name = old_name ? old_name : new_name; | |
3897 | struct cache_entry *ce = NULL; | |
3898 | struct patch *tpatch; | |
3899 | int ok_if_exists; | |
3900 | int status; | |
3901 | ||
3902 | patch->rejected = 1; /* we will drop this after we succeed */ | |
3903 | ||
3904 | status = check_preimage(state, patch, &ce, &st); | |
3905 | if (status) | |
3906 | return status; | |
3907 | old_name = patch->old_name; | |
3908 | ||
3909 | /* | |
3910 | * A type-change diff is always split into a patch to delete | |
3911 | * old, immediately followed by a patch to create new (see | |
3912 | * diff.c::run_diff()); in such a case it is Ok that the entry | |
3913 | * to be deleted by the previous patch is still in the working | |
3914 | * tree and in the index. | |
3915 | * | |
3916 | * A patch to swap-rename between A and B would first rename A | |
3917 | * to B and then rename B to A. While applying the first one, | |
3918 | * the presence of B should not stop A from getting renamed to | |
3919 | * B; ask to_be_deleted() about the later rename. Removal of | |
3920 | * B and rename from A to B is handled the same way by asking | |
3921 | * was_deleted(). | |
3922 | */ | |
3923 | if ((tpatch = in_fn_table(state, new_name)) && | |
3924 | (was_deleted(tpatch) || to_be_deleted(tpatch))) | |
3925 | ok_if_exists = 1; | |
3926 | else | |
3927 | ok_if_exists = 0; | |
3928 | ||
3929 | if (new_name && | |
3930 | ((0 < patch->is_new) || patch->is_rename || patch->is_copy)) { | |
3931 | int err = check_to_create(state, new_name, ok_if_exists); | |
3932 | ||
3933 | if (err && state->threeway) { | |
3934 | patch->direct_to_threeway = 1; | |
3935 | } else switch (err) { | |
3936 | case 0: | |
3937 | break; /* happy */ | |
3938 | case EXISTS_IN_INDEX: | |
3939 | return error(_("%s: already exists in index"), new_name); | |
3940 | break; | |
3941 | case EXISTS_IN_WORKTREE: | |
3942 | return error(_("%s: already exists in working directory"), | |
3943 | new_name); | |
3944 | default: | |
3945 | return err; | |
3946 | } | |
3947 | ||
3948 | if (!patch->new_mode) { | |
3949 | if (0 < patch->is_new) | |
3950 | patch->new_mode = S_IFREG | 0644; | |
3951 | else | |
3952 | patch->new_mode = patch->old_mode; | |
3953 | } | |
3954 | } | |
3955 | ||
3956 | if (new_name && old_name) { | |
3957 | int same = !strcmp(old_name, new_name); | |
3958 | if (!patch->new_mode) | |
3959 | patch->new_mode = patch->old_mode; | |
3960 | if ((patch->old_mode ^ patch->new_mode) & S_IFMT) { | |
3961 | if (same) | |
3962 | return error(_("new mode (%o) of %s does not " | |
3963 | "match old mode (%o)"), | |
3964 | patch->new_mode, new_name, | |
3965 | patch->old_mode); | |
3966 | else | |
3967 | return error(_("new mode (%o) of %s does not " | |
3968 | "match old mode (%o) of %s"), | |
3969 | patch->new_mode, new_name, | |
3970 | patch->old_mode, old_name); | |
3971 | } | |
3972 | } | |
3973 | ||
3974 | if (!state->unsafe_paths && check_unsafe_path(patch)) | |
3975 | return -128; | |
3976 | ||
3977 | /* | |
3978 | * An attempt to read from or delete a path that is beyond a | |
3979 | * symbolic link will be prevented by load_patch_target() that | |
3980 | * is called at the beginning of apply_data() so we do not | |
3981 | * have to worry about a patch marked with "is_delete" bit | |
3982 | * here. We however need to make sure that the patch result | |
3983 | * is not deposited to a path that is beyond a symbolic link | |
3984 | * here. | |
3985 | */ | |
3986 | if (!patch->is_delete && path_is_beyond_symlink(state, patch->new_name)) | |
3987 | return error(_("affected file '%s' is beyond a symbolic link"), | |
3988 | patch->new_name); | |
3989 | ||
3990 | if (apply_data(state, patch, &st, ce) < 0) | |
3991 | return error(_("%s: patch does not apply"), name); | |
3992 | patch->rejected = 0; | |
3993 | return 0; | |
3994 | } | |
3995 | ||
3996 | static int check_patch_list(struct apply_state *state, struct patch *patch) | |
3997 | { | |
3998 | int err = 0; | |
3999 | ||
4000 | prepare_symlink_changes(state, patch); | |
4001 | prepare_fn_table(state, patch); | |
4002 | while (patch) { | |
4003 | int res; | |
a46160d2 | 4004 | if (state->apply_verbosity > verbosity_normal) |
13b5af22 CC |
4005 | say_patch_name(stderr, |
4006 | _("Checking patch %s..."), patch); | |
4007 | res = check_patch(state, patch); | |
4008 | if (res == -128) | |
4009 | return -128; | |
4010 | err |= res; | |
4011 | patch = patch->next; | |
4012 | } | |
4013 | return err; | |
4014 | } | |
4015 | ||
5b0b57fd CC |
4016 | static int read_apply_cache(struct apply_state *state) |
4017 | { | |
4018 | if (state->index_file) | |
1b5c6c1e NTND |
4019 | return read_index_from(state->repo->index, state->index_file, |
4020 | get_git_dir()); | |
5b0b57fd | 4021 | else |
e1ff0a32 | 4022 | return repo_read_index(state->repo); |
5b0b57fd CC |
4023 | } |
4024 | ||
4af9a7d3 JH |
4025 | /* This function tries to read the object name from the current index */ |
4026 | static int get_current_oid(struct apply_state *state, const char *path, | |
4027 | struct object_id *oid) | |
13b5af22 CC |
4028 | { |
4029 | int pos; | |
4030 | ||
5b0b57fd | 4031 | if (read_apply_cache(state) < 0) |
13b5af22 | 4032 | return -1; |
1b5c6c1e | 4033 | pos = index_name_pos(state->repo->index, path, strlen(path)); |
13b5af22 CC |
4034 | if (pos < 0) |
4035 | return -1; | |
1b5c6c1e | 4036 | oidcpy(oid, &state->repo->index->cache[pos]->oid); |
13b5af22 CC |
4037 | return 0; |
4038 | } | |
4039 | ||
4af9a7d3 | 4040 | static int preimage_oid_in_gitlink_patch(struct patch *p, struct object_id *oid) |
13b5af22 CC |
4041 | { |
4042 | /* | |
4043 | * A usable gitlink patch has only one fragment (hunk) that looks like: | |
4044 | * @@ -1 +1 @@ | |
4045 | * -Subproject commit <old sha1> | |
4046 | * +Subproject commit <new sha1> | |
4047 | * or | |
4048 | * @@ -1 +0,0 @@ | |
4049 | * -Subproject commit <old sha1> | |
4050 | * for a removal patch. | |
4051 | */ | |
4052 | struct fragment *hunk = p->fragments; | |
4053 | static const char heading[] = "-Subproject commit "; | |
4054 | char *preimage; | |
4055 | ||
4056 | if (/* does the patch have only one hunk? */ | |
4057 | hunk && !hunk->next && | |
4058 | /* is its preimage one line? */ | |
4059 | hunk->oldpos == 1 && hunk->oldlines == 1 && | |
4060 | /* does preimage begin with the heading? */ | |
4061 | (preimage = memchr(hunk->patch, '\n', hunk->size)) != NULL && | |
4062 | starts_with(++preimage, heading) && | |
4063 | /* does it record full SHA-1? */ | |
4af9a7d3 | 4064 | !get_oid_hex(preimage + sizeof(heading) - 1, oid) && |
93eb00f7 | 4065 | preimage[sizeof(heading) + the_hash_algo->hexsz - 1] == '\n' && |
13b5af22 | 4066 | /* does the abbreviated name on the index line agree with it? */ |
eccb5a5f | 4067 | starts_with(preimage + sizeof(heading) - 1, p->old_oid_prefix)) |
13b5af22 CC |
4068 | return 0; /* it all looks fine */ |
4069 | ||
4070 | /* we may have full object name on the index line */ | |
eccb5a5f | 4071 | return get_oid_hex(p->old_oid_prefix, oid); |
13b5af22 CC |
4072 | } |
4073 | ||
59caacab | 4074 | /* Build an index that contains just the files needed for a 3way merge */ |
b4290342 | 4075 | static int build_fake_ancestor(struct apply_state *state, struct patch *list) |
13b5af22 CC |
4076 | { |
4077 | struct patch *patch; | |
4078 | struct index_state result = { NULL }; | |
b2275868 | 4079 | struct lock_file lock = LOCK_INIT; |
13b5af22 CC |
4080 | int res; |
4081 | ||
4082 | /* Once we start supporting the reverse patch, it may be | |
4083 | * worth showing the new sha1 prefix, but until then... | |
4084 | */ | |
4085 | for (patch = list; patch; patch = patch->next) { | |
4af9a7d3 | 4086 | struct object_id oid; |
13b5af22 CC |
4087 | struct cache_entry *ce; |
4088 | const char *name; | |
4089 | ||
4090 | name = patch->old_name ? patch->old_name : patch->new_name; | |
4091 | if (0 < patch->is_new) | |
4092 | continue; | |
4093 | ||
4094 | if (S_ISGITLINK(patch->old_mode)) { | |
4af9a7d3 | 4095 | if (!preimage_oid_in_gitlink_patch(patch, &oid)) |
13b5af22 CC |
4096 | ; /* ok, the textual part looks sane */ |
4097 | else | |
d1d42bf5 VA |
4098 | return error(_("sha1 information is lacking or " |
4099 | "useless for submodule %s"), name); | |
eccb5a5f | 4100 | } else if (!get_oid_blob(patch->old_oid_prefix, &oid)) { |
13b5af22 CC |
4101 | ; /* ok */ |
4102 | } else if (!patch->lines_added && !patch->lines_deleted) { | |
4103 | /* mode-only change: update the current */ | |
4af9a7d3 | 4104 | if (get_current_oid(state, patch->old_name, &oid)) |
d1d42bf5 VA |
4105 | return error(_("mode change for %s, which is not " |
4106 | "in current HEAD"), name); | |
13b5af22 | 4107 | } else |
d1d42bf5 VA |
4108 | return error(_("sha1 information is lacking or useless " |
4109 | "(%s)."), name); | |
13b5af22 | 4110 | |
a849735b | 4111 | ce = make_cache_entry(&result, patch->old_mode, &oid, name, 0, 0); |
13b5af22 CC |
4112 | if (!ce) |
4113 | return error(_("make_cache_entry failed for path '%s'"), | |
4114 | name); | |
4115 | if (add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD)) { | |
a849735b | 4116 | discard_cache_entry(ce); |
d1d42bf5 | 4117 | return error(_("could not add %s to temporary index"), |
13b5af22 CC |
4118 | name); |
4119 | } | |
4120 | } | |
4121 | ||
b4290342 | 4122 | hold_lock_file_for_update(&lock, state->fake_ancestor, LOCK_DIE_ON_ERROR); |
13b5af22 CC |
4123 | res = write_locked_index(&result, &lock, COMMIT_LOCK); |
4124 | discard_index(&result); | |
4125 | ||
e294e895 JH |
4126 | if (res) |
4127 | return error(_("could not write temporary index to %s"), | |
4128 | state->fake_ancestor); | |
13b5af22 | 4129 | |
e294e895 JH |
4130 | return 0; |
4131 | } | |
13b5af22 | 4132 | |
e294e895 JH |
4133 | static void stat_patch_list(struct apply_state *state, struct patch *patch) |
4134 | { | |
4135 | int files, adds, dels; | |
13b5af22 | 4136 | |
e294e895 JH |
4137 | for (files = adds = dels = 0 ; patch ; patch = patch->next) { |
4138 | files++; | |
4139 | adds += patch->lines_added; | |
4140 | dels += patch->lines_deleted; | |
4141 | show_stats(state, patch); | |
4142 | } | |
13b5af22 | 4143 | |
e294e895 JH |
4144 | print_stat_summary(stdout, files, adds, dels); |
4145 | } | |
13b5af22 | 4146 | |
e294e895 JH |
4147 | static void numstat_patch_list(struct apply_state *state, |
4148 | struct patch *patch) | |
4149 | { | |
4150 | for ( ; patch; patch = patch->next) { | |
4151 | const char *name; | |
4152 | name = patch->new_name ? patch->new_name : patch->old_name; | |
4153 | if (patch->is_binary) | |
4154 | printf("-\t-\t"); | |
4155 | else | |
4156 | printf("%d\t%d\t", patch->lines_added, patch->lines_deleted); | |
4157 | write_name_quoted(name, stdout, state->line_termination); | |
4158 | } | |
4159 | } | |
4160 | ||
4161 | static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name) | |
4162 | { | |
4163 | if (mode) | |
4164 | printf(" %s mode %06o %s\n", newdelete, mode, name); | |
4165 | else | |
4166 | printf(" %s %s\n", newdelete, name); | |
4167 | } | |
4168 | ||
4169 | static void show_mode_change(struct patch *p, int show_name) | |
4170 | { | |
4171 | if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) { | |
4172 | if (show_name) | |
4173 | printf(" mode change %06o => %06o %s\n", | |
4174 | p->old_mode, p->new_mode, p->new_name); | |
4175 | else | |
4176 | printf(" mode change %06o => %06o\n", | |
4177 | p->old_mode, p->new_mode); | |
4178 | } | |
4179 | } | |
4180 | ||
4181 | static void show_rename_copy(struct patch *p) | |
4182 | { | |
4183 | const char *renamecopy = p->is_rename ? "rename" : "copy"; | |
f1ae97d3 | 4184 | const char *old_name, *new_name; |
e294e895 JH |
4185 | |
4186 | /* Find common prefix */ | |
f1ae97d3 BW |
4187 | old_name = p->old_name; |
4188 | new_name = p->new_name; | |
e294e895 JH |
4189 | while (1) { |
4190 | const char *slash_old, *slash_new; | |
f1ae97d3 BW |
4191 | slash_old = strchr(old_name, '/'); |
4192 | slash_new = strchr(new_name, '/'); | |
e294e895 JH |
4193 | if (!slash_old || |
4194 | !slash_new || | |
f1ae97d3 BW |
4195 | slash_old - old_name != slash_new - new_name || |
4196 | memcmp(old_name, new_name, slash_new - new_name)) | |
e294e895 | 4197 | break; |
f1ae97d3 BW |
4198 | old_name = slash_old + 1; |
4199 | new_name = slash_new + 1; | |
e294e895 | 4200 | } |
f1ae97d3 | 4201 | /* p->old_name thru old_name is the common prefix, and old_name and new_name |
e294e895 JH |
4202 | * through the end of names are renames |
4203 | */ | |
f1ae97d3 | 4204 | if (old_name != p->old_name) |
e294e895 | 4205 | printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy, |
f1ae97d3 BW |
4206 | (int)(old_name - p->old_name), p->old_name, |
4207 | old_name, new_name, p->score); | |
e294e895 JH |
4208 | else |
4209 | printf(" %s %s => %s (%d%%)\n", renamecopy, | |
4210 | p->old_name, p->new_name, p->score); | |
4211 | show_mode_change(p, 0); | |
4212 | } | |
4213 | ||
4214 | static void summary_patch_list(struct patch *patch) | |
4215 | { | |
4216 | struct patch *p; | |
4217 | ||
4218 | for (p = patch; p; p = p->next) { | |
4219 | if (p->is_new) | |
4220 | show_file_mode_name("create", p->new_mode, p->new_name); | |
4221 | else if (p->is_delete) | |
4222 | show_file_mode_name("delete", p->old_mode, p->old_name); | |
4223 | else { | |
4224 | if (p->is_rename || p->is_copy) | |
4225 | show_rename_copy(p); | |
4226 | else { | |
4227 | if (p->score) { | |
4228 | printf(" rewrite %s (%d%%)\n", | |
4229 | p->new_name, p->score); | |
4230 | show_mode_change(p, 0); | |
4231 | } | |
4232 | else | |
4233 | show_mode_change(p, 1); | |
4234 | } | |
4235 | } | |
4236 | } | |
4237 | } | |
4238 | ||
4239 | static void patch_stats(struct apply_state *state, struct patch *patch) | |
4240 | { | |
4241 | int lines = patch->lines_added + patch->lines_deleted; | |
4242 | ||
4243 | if (lines > state->max_change) | |
4244 | state->max_change = lines; | |
4245 | if (patch->old_name) { | |
4246 | int len = quote_c_style(patch->old_name, NULL, NULL, 0); | |
4247 | if (!len) | |
4248 | len = strlen(patch->old_name); | |
4249 | if (len > state->max_len) | |
4250 | state->max_len = len; | |
4251 | } | |
4252 | if (patch->new_name) { | |
4253 | int len = quote_c_style(patch->new_name, NULL, NULL, 0); | |
4254 | if (!len) | |
4255 | len = strlen(patch->new_name); | |
4256 | if (len > state->max_len) | |
4257 | state->max_len = len; | |
4258 | } | |
4259 | } | |
4260 | ||
4261 | static int remove_file(struct apply_state *state, struct patch *patch, int rmdir_empty) | |
4262 | { | |
cff5dc09 | 4263 | if (state->update_index && !state->ita_only) { |
1b5c6c1e | 4264 | if (remove_file_from_index(state->repo->index, patch->old_name) < 0) |
e294e895 JH |
4265 | return error(_("unable to remove %s from index"), patch->old_name); |
4266 | } | |
4267 | if (!state->cached) { | |
4268 | if (!remove_or_warn(patch->old_mode, patch->old_name) && rmdir_empty) { | |
4269 | remove_path(patch->old_name); | |
4270 | } | |
4271 | } | |
4272 | return 0; | |
4273 | } | |
4274 | ||
4275 | static int add_index_file(struct apply_state *state, | |
4276 | const char *path, | |
4277 | unsigned mode, | |
4278 | void *buf, | |
4279 | unsigned long size) | |
4280 | { | |
4281 | struct stat st; | |
4282 | struct cache_entry *ce; | |
4283 | int namelen = strlen(path); | |
e294e895 | 4284 | |
1b5c6c1e | 4285 | ce = make_empty_cache_entry(state->repo->index, namelen); |
e294e895 JH |
4286 | memcpy(ce->name, path, namelen); |
4287 | ce->ce_mode = create_ce_mode(mode); | |
4288 | ce->ce_flags = create_ce_flags(0); | |
4289 | ce->ce_namelen = namelen; | |
cff5dc09 NTND |
4290 | if (state->ita_only) { |
4291 | ce->ce_flags |= CE_INTENT_TO_ADD; | |
4292 | set_object_name_for_intent_to_add_entry(ce); | |
4293 | } else if (S_ISGITLINK(mode)) { | |
e294e895 JH |
4294 | const char *s; |
4295 | ||
4296 | if (!skip_prefix(buf, "Subproject commit ", &s) || | |
4297 | get_oid_hex(s, &ce->oid)) { | |
a849735b JM |
4298 | discard_cache_entry(ce); |
4299 | return error(_("corrupt patch for submodule %s"), path); | |
13b5af22 CC |
4300 | } |
4301 | } else { | |
4302 | if (!state->cached) { | |
4303 | if (lstat(path, &st) < 0) { | |
a849735b | 4304 | discard_cache_entry(ce); |
90875eca CC |
4305 | return error_errno(_("unable to stat newly " |
4306 | "created file '%s'"), | |
4307 | path); | |
13b5af22 CC |
4308 | } |
4309 | fill_stat_cache_info(ce, &st); | |
4310 | } | |
a09c985e | 4311 | if (write_object_file(buf, size, blob_type, &ce->oid) < 0) { |
a849735b | 4312 | discard_cache_entry(ce); |
13b5af22 CC |
4313 | return error(_("unable to create backing store " |
4314 | "for newly created file %s"), path); | |
4315 | } | |
4316 | } | |
1b5c6c1e | 4317 | if (add_index_entry(state->repo->index, ce, ADD_CACHE_OK_TO_ADD) < 0) { |
a849735b | 4318 | discard_cache_entry(ce); |
13b5af22 CC |
4319 | return error(_("unable to add cache entry for %s"), path); |
4320 | } | |
4321 | ||
4322 | return 0; | |
4323 | } | |
4324 | ||
4325 | /* | |
4326 | * Returns: | |
4327 | * -1 if an unrecoverable error happened | |
4328 | * 0 if everything went well | |
4329 | * 1 if a recoverable error happened | |
4330 | */ | |
332a82a5 NTND |
4331 | static int try_create_file(struct apply_state *state, const char *path, |
4332 | unsigned int mode, const char *buf, | |
4333 | unsigned long size) | |
13b5af22 CC |
4334 | { |
4335 | int fd, res; | |
4336 | struct strbuf nbuf = STRBUF_INIT; | |
4337 | ||
4338 | if (S_ISGITLINK(mode)) { | |
4339 | struct stat st; | |
4340 | if (!lstat(path, &st) && S_ISDIR(st.st_mode)) | |
4341 | return 0; | |
4342 | return !!mkdir(path, 0777); | |
4343 | } | |
4344 | ||
4345 | if (has_symlinks && S_ISLNK(mode)) | |
4346 | /* Although buf:size is counted string, it also is NUL | |
4347 | * terminated. | |
4348 | */ | |
4349 | return !!symlink(buf, path); | |
4350 | ||
4351 | fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666); | |
4352 | if (fd < 0) | |
4353 | return 1; | |
4354 | ||
1b5c6c1e | 4355 | if (convert_to_working_tree(state->repo->index, path, buf, size, &nbuf)) { |
13b5af22 CC |
4356 | size = nbuf.len; |
4357 | buf = nbuf.buf; | |
4358 | } | |
4359 | ||
4360 | res = write_in_full(fd, buf, size) < 0; | |
4361 | if (res) | |
4362 | error_errno(_("failed to write to '%s'"), path); | |
4363 | strbuf_release(&nbuf); | |
4364 | ||
4365 | if (close(fd) < 0 && !res) | |
4366 | return error_errno(_("closing file '%s'"), path); | |
4367 | ||
4368 | return res ? -1 : 0; | |
4369 | } | |
4370 | ||
4371 | /* | |
4372 | * We optimistically assume that the directories exist, | |
4373 | * which is true 99% of the time anyway. If they don't, | |
4374 | * we create them and try again. | |
4375 | * | |
4376 | * Returns: | |
4377 | * -1 on error | |
4378 | * 0 otherwise | |
4379 | */ | |
4380 | static int create_one_file(struct apply_state *state, | |
4381 | char *path, | |
4382 | unsigned mode, | |
4383 | const char *buf, | |
4384 | unsigned long size) | |
4385 | { | |
4386 | int res; | |
4387 | ||
4388 | if (state->cached) | |
4389 | return 0; | |
4390 | ||
332a82a5 | 4391 | res = try_create_file(state, path, mode, buf, size); |
13b5af22 CC |
4392 | if (res < 0) |
4393 | return -1; | |
4394 | if (!res) | |
4395 | return 0; | |
4396 | ||
4397 | if (errno == ENOENT) { | |
4398 | if (safe_create_leading_directories(path)) | |
4399 | return 0; | |
332a82a5 | 4400 | res = try_create_file(state, path, mode, buf, size); |
13b5af22 CC |
4401 | if (res < 0) |
4402 | return -1; | |
4403 | if (!res) | |
4404 | return 0; | |
4405 | } | |
4406 | ||
4407 | if (errno == EEXIST || errno == EACCES) { | |
4408 | /* We may be trying to create a file where a directory | |
4409 | * used to be. | |
4410 | */ | |
4411 | struct stat st; | |
4412 | if (!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path))) | |
4413 | errno = EEXIST; | |
4414 | } | |
4415 | ||
4416 | if (errno == EEXIST) { | |
4417 | unsigned int nr = getpid(); | |
4418 | ||
4419 | for (;;) { | |
4420 | char newpath[PATH_MAX]; | |
4421 | mksnpath(newpath, sizeof(newpath), "%s~%u", path, nr); | |
332a82a5 | 4422 | res = try_create_file(state, newpath, mode, buf, size); |
13b5af22 CC |
4423 | if (res < 0) |
4424 | return -1; | |
4425 | if (!res) { | |
4426 | if (!rename(newpath, path)) | |
4427 | return 0; | |
4428 | unlink_or_warn(newpath); | |
4429 | break; | |
4430 | } | |
4431 | if (errno != EEXIST) | |
4432 | break; | |
4433 | ++nr; | |
4434 | } | |
4435 | } | |
4436 | return error_errno(_("unable to write file '%s' mode %o"), | |
4437 | path, mode); | |
4438 | } | |
4439 | ||
4440 | static int add_conflicted_stages_file(struct apply_state *state, | |
4441 | struct patch *patch) | |
4442 | { | |
4443 | int stage, namelen; | |
a849735b | 4444 | unsigned mode; |
13b5af22 CC |
4445 | struct cache_entry *ce; |
4446 | ||
4447 | if (!state->update_index) | |
4448 | return 0; | |
4449 | namelen = strlen(patch->new_name); | |
13b5af22 CC |
4450 | mode = patch->new_mode ? patch->new_mode : (S_IFREG | 0644); |
4451 | ||
1b5c6c1e | 4452 | remove_file_from_index(state->repo->index, patch->new_name); |
13b5af22 CC |
4453 | for (stage = 1; stage < 4; stage++) { |
4454 | if (is_null_oid(&patch->threeway_stage[stage - 1])) | |
4455 | continue; | |
1b5c6c1e | 4456 | ce = make_empty_cache_entry(state->repo->index, namelen); |
13b5af22 CC |
4457 | memcpy(ce->name, patch->new_name, namelen); |
4458 | ce->ce_mode = create_ce_mode(mode); | |
4459 | ce->ce_flags = create_ce_flags(stage); | |
4460 | ce->ce_namelen = namelen; | |
4af9a7d3 | 4461 | oidcpy(&ce->oid, &patch->threeway_stage[stage - 1]); |
1b5c6c1e | 4462 | if (add_index_entry(state->repo->index, ce, ADD_CACHE_OK_TO_ADD) < 0) { |
a849735b | 4463 | discard_cache_entry(ce); |
13b5af22 CC |
4464 | return error(_("unable to add cache entry for %s"), |
4465 | patch->new_name); | |
4466 | } | |
4467 | } | |
4468 | ||
4469 | return 0; | |
4470 | } | |
4471 | ||
4472 | static int create_file(struct apply_state *state, struct patch *patch) | |
4473 | { | |
4474 | char *path = patch->new_name; | |
4475 | unsigned mode = patch->new_mode; | |
4476 | unsigned long size = patch->resultsize; | |
4477 | char *buf = patch->result; | |
4478 | ||
4479 | if (!mode) | |
4480 | mode = S_IFREG | 0644; | |
4481 | if (create_one_file(state, path, mode, buf, size)) | |
4482 | return -1; | |
4483 | ||
4484 | if (patch->conflicted_threeway) | |
4485 | return add_conflicted_stages_file(state, patch); | |
cff5dc09 | 4486 | else if (state->update_index) |
13b5af22 | 4487 | return add_index_file(state, path, mode, buf, size); |
cff5dc09 | 4488 | return 0; |
13b5af22 CC |
4489 | } |
4490 | ||
4491 | /* phase zero is to remove, phase one is to create */ | |
4492 | static int write_out_one_result(struct apply_state *state, | |
4493 | struct patch *patch, | |
4494 | int phase) | |
4495 | { | |
4496 | if (patch->is_delete > 0) { | |
4497 | if (phase == 0) | |
4498 | return remove_file(state, patch, 1); | |
4499 | return 0; | |
4500 | } | |
4501 | if (patch->is_new > 0 || patch->is_copy) { | |
4502 | if (phase == 1) | |
4503 | return create_file(state, patch); | |
4504 | return 0; | |
4505 | } | |
4506 | /* | |
4507 | * Rename or modification boils down to the same | |
4508 | * thing: remove the old, write the new | |
4509 | */ | |
4510 | if (phase == 0) | |
4511 | return remove_file(state, patch, patch->is_rename); | |
4512 | if (phase == 1) | |
4513 | return create_file(state, patch); | |
4514 | return 0; | |
4515 | } | |
4516 | ||
4517 | static int write_out_one_reject(struct apply_state *state, struct patch *patch) | |
4518 | { | |
4519 | FILE *rej; | |
4520 | char namebuf[PATH_MAX]; | |
4521 | struct fragment *frag; | |
4522 | int cnt = 0; | |
4523 | struct strbuf sb = STRBUF_INIT; | |
4524 | ||
4525 | for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) { | |
4526 | if (!frag->rejected) | |
4527 | continue; | |
4528 | cnt++; | |
4529 | } | |
4530 | ||
4531 | if (!cnt) { | |
a46160d2 | 4532 | if (state->apply_verbosity > verbosity_normal) |
13b5af22 CC |
4533 | say_patch_name(stderr, |
4534 | _("Applied patch %s cleanly."), patch); | |
4535 | return 0; | |
4536 | } | |
4537 | ||
4538 | /* This should not happen, because a removal patch that leaves | |
4539 | * contents are marked "rejected" at the patch level. | |
4540 | */ | |
4541 | if (!patch->new_name) | |
4542 | die(_("internal error")); | |
4543 | ||
4544 | /* Say this even without --verbose */ | |
4545 | strbuf_addf(&sb, Q_("Applying patch %%s with %d reject...", | |
4546 | "Applying patch %%s with %d rejects...", | |
4547 | cnt), | |
4548 | cnt); | |
a46160d2 CC |
4549 | if (state->apply_verbosity > verbosity_silent) |
4550 | say_patch_name(stderr, sb.buf, patch); | |
13b5af22 CC |
4551 | strbuf_release(&sb); |
4552 | ||
4553 | cnt = strlen(patch->new_name); | |
4554 | if (ARRAY_SIZE(namebuf) <= cnt + 5) { | |
4555 | cnt = ARRAY_SIZE(namebuf) - 5; | |
4556 | warning(_("truncating .rej filename to %.*s.rej"), | |
4557 | cnt - 1, patch->new_name); | |
4558 | } | |
4559 | memcpy(namebuf, patch->new_name, cnt); | |
4560 | memcpy(namebuf + cnt, ".rej", 5); | |
4561 | ||
4562 | rej = fopen(namebuf, "w"); | |
4563 | if (!rej) | |
90875eca | 4564 | return error_errno(_("cannot open %s"), namebuf); |
13b5af22 CC |
4565 | |
4566 | /* Normal git tools never deal with .rej, so do not pretend | |
4567 | * this is a git patch by saying --git or giving extended | |
4568 | * headers. While at it, maybe please "kompare" that wants | |
4569 | * the trailing TAB and some garbage at the end of line ;-). | |
4570 | */ | |
4571 | fprintf(rej, "diff a/%s b/%s\t(rejected hunks)\n", | |
4572 | patch->new_name, patch->new_name); | |
4573 | for (cnt = 1, frag = patch->fragments; | |
4574 | frag; | |
4575 | cnt++, frag = frag->next) { | |
4576 | if (!frag->rejected) { | |
a46160d2 CC |
4577 | if (state->apply_verbosity > verbosity_silent) |
4578 | fprintf_ln(stderr, _("Hunk #%d applied cleanly."), cnt); | |
13b5af22 CC |
4579 | continue; |
4580 | } | |
a46160d2 CC |
4581 | if (state->apply_verbosity > verbosity_silent) |
4582 | fprintf_ln(stderr, _("Rejected hunk #%d."), cnt); | |
13b5af22 CC |
4583 | fprintf(rej, "%.*s", frag->size, frag->patch); |
4584 | if (frag->patch[frag->size-1] != '\n') | |
4585 | fputc('\n', rej); | |
4586 | } | |
4587 | fclose(rej); | |
4588 | return -1; | |
4589 | } | |
4590 | ||
4591 | /* | |
4592 | * Returns: | |
4593 | * -1 if an error happened | |
4594 | * 0 if the patch applied cleanly | |
4595 | * 1 if the patch did not apply cleanly | |
4596 | */ | |
4597 | static int write_out_results(struct apply_state *state, struct patch *list) | |
4598 | { | |
4599 | int phase; | |
4600 | int errs = 0; | |
4601 | struct patch *l; | |
4602 | struct string_list cpath = STRING_LIST_INIT_DUP; | |
4603 | ||
4604 | for (phase = 0; phase < 2; phase++) { | |
4605 | l = list; | |
4606 | while (l) { | |
4607 | if (l->rejected) | |
4608 | errs = 1; | |
4609 | else { | |
4610 | if (write_out_one_result(state, l, phase)) { | |
4611 | string_list_clear(&cpath, 0); | |
4612 | return -1; | |
4613 | } | |
4614 | if (phase == 1) { | |
4615 | if (write_out_one_reject(state, l)) | |
4616 | errs = 1; | |
4617 | if (l->conflicted_threeway) { | |
4618 | string_list_append(&cpath, l->new_name); | |
4619 | errs = 1; | |
4620 | } | |
4621 | } | |
4622 | } | |
4623 | l = l->next; | |
4624 | } | |
4625 | } | |
4626 | ||
4627 | if (cpath.nr) { | |
4628 | struct string_list_item *item; | |
4629 | ||
4630 | string_list_sort(&cpath); | |
a46160d2 CC |
4631 | if (state->apply_verbosity > verbosity_silent) { |
4632 | for_each_string_list_item(item, &cpath) | |
4633 | fprintf(stderr, "U %s\n", item->string); | |
4634 | } | |
13b5af22 CC |
4635 | string_list_clear(&cpath, 0); |
4636 | ||
35843b11 | 4637 | repo_rerere(state->repo, 0); |
13b5af22 CC |
4638 | } |
4639 | ||
4640 | return errs; | |
4641 | } | |
4642 | ||
4643 | /* | |
4644 | * Try to apply a patch. | |
4645 | * | |
4646 | * Returns: | |
4647 | * -128 if a bad error happened (like patch unreadable) | |
4648 | * -1 if patch did not apply and user cannot deal with it | |
4649 | * 0 if the patch applied | |
4650 | * 1 if the patch did not apply but user might fix it | |
4651 | */ | |
4652 | static int apply_patch(struct apply_state *state, | |
4653 | int fd, | |
4654 | const char *filename, | |
4655 | int options) | |
4656 | { | |
4657 | size_t offset; | |
4658 | struct strbuf buf = STRBUF_INIT; /* owns the patch text */ | |
4659 | struct patch *list = NULL, **listp = &list; | |
4660 | int skipped_patch = 0; | |
4661 | int res = 0; | |
4662 | ||
4663 | state->patch_input_file = filename; | |
4664 | if (read_patch_file(&buf, fd) < 0) | |
4665 | return -128; | |
4666 | offset = 0; | |
4667 | while (offset < buf.len) { | |
4668 | struct patch *patch; | |
4669 | int nr; | |
4670 | ||
4671 | patch = xcalloc(1, sizeof(*patch)); | |
4672 | patch->inaccurate_eof = !!(options & APPLY_OPT_INACCURATE_EOF); | |
4673 | patch->recount = !!(options & APPLY_OPT_RECOUNT); | |
4674 | nr = parse_chunk(state, buf.buf + offset, buf.len - offset, patch); | |
4675 | if (nr < 0) { | |
4676 | free_patch(patch); | |
4677 | if (nr == -128) { | |
4678 | res = -128; | |
4679 | goto end; | |
4680 | } | |
4681 | break; | |
4682 | } | |
4683 | if (state->apply_in_reverse) | |
4684 | reverse_patches(patch); | |
4685 | if (use_patch(state, patch)) { | |
4686 | patch_stats(state, patch); | |
4687 | *listp = patch; | |
4688 | listp = &patch->next; | |
4689 | } | |
4690 | else { | |
a46160d2 | 4691 | if (state->apply_verbosity > verbosity_normal) |
13b5af22 CC |
4692 | say_patch_name(stderr, _("Skipped patch '%s'."), patch); |
4693 | free_patch(patch); | |
4694 | skipped_patch++; | |
4695 | } | |
4696 | offset += nr; | |
4697 | } | |
4698 | ||
4699 | if (!list && !skipped_patch) { | |
4700 | error(_("unrecognized input")); | |
4701 | res = -128; | |
4702 | goto end; | |
4703 | } | |
4704 | ||
4705 | if (state->whitespace_error && (state->ws_error_action == die_on_ws_error)) | |
4706 | state->apply = 0; | |
4707 | ||
cff5dc09 | 4708 | state->update_index = (state->check_index || state->ita_only) && state->apply; |
d13cd4c9 | 4709 | if (state->update_index && !is_lock_file_locked(&state->lock_file)) { |
5b0b57fd | 4710 | if (state->index_file) |
d13cd4c9 MÅ |
4711 | hold_lock_file_for_update(&state->lock_file, |
4712 | state->index_file, | |
4713 | LOCK_DIE_ON_ERROR); | |
5b0b57fd | 4714 | else |
3a95f31d NTND |
4715 | repo_hold_locked_index(state->repo, &state->lock_file, |
4716 | LOCK_DIE_ON_ERROR); | |
5b0b57fd | 4717 | } |
13b5af22 | 4718 | |
5b0b57fd | 4719 | if (state->check_index && read_apply_cache(state) < 0) { |
13b5af22 CC |
4720 | error(_("unable to read index file")); |
4721 | res = -128; | |
4722 | goto end; | |
4723 | } | |
4724 | ||
4725 | if (state->check || state->apply) { | |
4726 | int r = check_patch_list(state, list); | |
4727 | if (r == -128) { | |
4728 | res = -128; | |
4729 | goto end; | |
4730 | } | |
4731 | if (r < 0 && !state->apply_with_reject) { | |
4732 | res = -1; | |
4733 | goto end; | |
4734 | } | |
4735 | } | |
4736 | ||
4737 | if (state->apply) { | |
4738 | int write_res = write_out_results(state, list); | |
4739 | if (write_res < 0) { | |
4740 | res = -128; | |
4741 | goto end; | |
4742 | } | |
4743 | if (write_res > 0) { | |
4744 | /* with --3way, we still need to write the index out */ | |
4745 | res = state->apply_with_reject ? -1 : 1; | |
4746 | goto end; | |
4747 | } | |
4748 | } | |
4749 | ||
4750 | if (state->fake_ancestor && | |
b4290342 | 4751 | build_fake_ancestor(state, list)) { |
13b5af22 CC |
4752 | res = -128; |
4753 | goto end; | |
4754 | } | |
4755 | ||
487beee0 | 4756 | if (state->diffstat && state->apply_verbosity > verbosity_silent) |
13b5af22 CC |
4757 | stat_patch_list(state, list); |
4758 | ||
487beee0 | 4759 | if (state->numstat && state->apply_verbosity > verbosity_silent) |
13b5af22 CC |
4760 | numstat_patch_list(state, list); |
4761 | ||
487beee0 | 4762 | if (state->summary && state->apply_verbosity > verbosity_silent) |
13b5af22 CC |
4763 | summary_patch_list(list); |
4764 | ||
4765 | end: | |
4766 | free_patch_list(list); | |
4767 | strbuf_release(&buf); | |
4768 | string_list_clear(&state->fn_table, 0); | |
4769 | return res; | |
4770 | } | |
4771 | ||
7e1bad24 CC |
4772 | static int apply_option_parse_exclude(const struct option *opt, |
4773 | const char *arg, int unset) | |
13b5af22 CC |
4774 | { |
4775 | struct apply_state *state = opt->value; | |
517fe807 JK |
4776 | |
4777 | BUG_ON_OPT_NEG(unset); | |
4778 | ||
13b5af22 CC |
4779 | add_name_limit(state, arg, 1); |
4780 | return 0; | |
4781 | } | |
4782 | ||
7e1bad24 CC |
4783 | static int apply_option_parse_include(const struct option *opt, |
4784 | const char *arg, int unset) | |
13b5af22 CC |
4785 | { |
4786 | struct apply_state *state = opt->value; | |
517fe807 JK |
4787 | |
4788 | BUG_ON_OPT_NEG(unset); | |
4789 | ||
13b5af22 CC |
4790 | add_name_limit(state, arg, 0); |
4791 | state->has_include = 1; | |
4792 | return 0; | |
4793 | } | |
4794 | ||
7e1bad24 CC |
4795 | static int apply_option_parse_p(const struct option *opt, |
4796 | const char *arg, | |
4797 | int unset) | |
13b5af22 CC |
4798 | { |
4799 | struct apply_state *state = opt->value; | |
517fe807 JK |
4800 | |
4801 | BUG_ON_OPT_NEG(unset); | |
4802 | ||
13b5af22 CC |
4803 | state->p_value = atoi(arg); |
4804 | state->p_value_known = 1; | |
4805 | return 0; | |
4806 | } | |
4807 | ||
7e1bad24 CC |
4808 | static int apply_option_parse_space_change(const struct option *opt, |
4809 | const char *arg, int unset) | |
13b5af22 CC |
4810 | { |
4811 | struct apply_state *state = opt->value; | |
517fe807 JK |
4812 | |
4813 | BUG_ON_OPT_ARG(arg); | |
4814 | ||
13b5af22 CC |
4815 | if (unset) |
4816 | state->ws_ignore_action = ignore_ws_none; | |
4817 | else | |
4818 | state->ws_ignore_action = ignore_ws_change; | |
4819 | return 0; | |
4820 | } | |
4821 | ||
7e1bad24 CC |
4822 | static int apply_option_parse_whitespace(const struct option *opt, |
4823 | const char *arg, int unset) | |
13b5af22 CC |
4824 | { |
4825 | struct apply_state *state = opt->value; | |
517fe807 JK |
4826 | |
4827 | BUG_ON_OPT_NEG(unset); | |
4828 | ||
13b5af22 CC |
4829 | state->whitespace_option = arg; |
4830 | if (parse_whitespace_option(state, arg)) | |
735ca208 | 4831 | return -1; |
13b5af22 CC |
4832 | return 0; |
4833 | } | |
4834 | ||
7e1bad24 CC |
4835 | static int apply_option_parse_directory(const struct option *opt, |
4836 | const char *arg, int unset) | |
13b5af22 CC |
4837 | { |
4838 | struct apply_state *state = opt->value; | |
517fe807 JK |
4839 | |
4840 | BUG_ON_OPT_NEG(unset); | |
4841 | ||
13b5af22 CC |
4842 | strbuf_reset(&state->root); |
4843 | strbuf_addstr(&state->root, arg); | |
4844 | strbuf_complete(&state->root, '/'); | |
4845 | return 0; | |
4846 | } | |
4847 | ||
4848 | int apply_all_patches(struct apply_state *state, | |
4849 | int argc, | |
4850 | const char **argv, | |
4851 | int options) | |
4852 | { | |
4853 | int i; | |
4854 | int res; | |
4855 | int errs = 0; | |
4856 | int read_stdin = 1; | |
4857 | ||
4858 | for (i = 0; i < argc; i++) { | |
4859 | const char *arg = argv[i]; | |
e4da43b1 | 4860 | char *to_free = NULL; |
13b5af22 CC |
4861 | int fd; |
4862 | ||
4863 | if (!strcmp(arg, "-")) { | |
4864 | res = apply_patch(state, 0, "<stdin>", options); | |
4865 | if (res < 0) | |
4866 | goto end; | |
4867 | errs |= res; | |
4868 | read_stdin = 0; | |
4869 | continue; | |
e4da43b1 JK |
4870 | } else |
4871 | arg = to_free = prefix_filename(state->prefix, arg); | |
13b5af22 CC |
4872 | |
4873 | fd = open(arg, O_RDONLY); | |
4874 | if (fd < 0) { | |
4875 | error(_("can't open patch '%s': %s"), arg, strerror(errno)); | |
4876 | res = -128; | |
e4da43b1 | 4877 | free(to_free); |
13b5af22 CC |
4878 | goto end; |
4879 | } | |
4880 | read_stdin = 0; | |
4881 | set_default_whitespace_mode(state); | |
4882 | res = apply_patch(state, fd, arg, options); | |
4883 | close(fd); | |
e4da43b1 | 4884 | free(to_free); |
13b5af22 CC |
4885 | if (res < 0) |
4886 | goto end; | |
4887 | errs |= res; | |
4888 | } | |
4889 | set_default_whitespace_mode(state); | |
4890 | if (read_stdin) { | |
4891 | res = apply_patch(state, 0, "<stdin>", options); | |
4892 | if (res < 0) | |
4893 | goto end; | |
4894 | errs |= res; | |
4895 | } | |
4896 | ||
4897 | if (state->whitespace_error) { | |
4898 | if (state->squelch_whitespace_errors && | |
4899 | state->squelch_whitespace_errors < state->whitespace_error) { | |
4900 | int squelched = | |
4901 | state->whitespace_error - state->squelch_whitespace_errors; | |
4902 | warning(Q_("squelched %d whitespace error", | |
4903 | "squelched %d whitespace errors", | |
4904 | squelched), | |
4905 | squelched); | |
4906 | } | |
4907 | if (state->ws_error_action == die_on_ws_error) { | |
4908 | error(Q_("%d line adds whitespace errors.", | |
4909 | "%d lines add whitespace errors.", | |
4910 | state->whitespace_error), | |
4911 | state->whitespace_error); | |
4912 | res = -128; | |
4913 | goto end; | |
4914 | } | |
4915 | if (state->applied_after_fixing_ws && state->apply) | |
965d5c85 VA |
4916 | warning(Q_("%d line applied after" |
4917 | " fixing whitespace errors.", | |
4918 | "%d lines applied after" | |
4919 | " fixing whitespace errors.", | |
4920 | state->applied_after_fixing_ws), | |
4921 | state->applied_after_fixing_ws); | |
13b5af22 CC |
4922 | else if (state->whitespace_error) |
4923 | warning(Q_("%d line adds whitespace errors.", | |
4924 | "%d lines add whitespace errors.", | |
4925 | state->whitespace_error), | |
4926 | state->whitespace_error); | |
4927 | } | |
4928 | ||
4929 | if (state->update_index) { | |
1b5c6c1e | 4930 | res = write_locked_index(state->repo->index, &state->lock_file, COMMIT_LOCK); |
13b5af22 CC |
4931 | if (res) { |
4932 | error(_("Unable to write new index file")); | |
4933 | res = -128; | |
4934 | goto end; | |
4935 | } | |
13b5af22 CC |
4936 | } |
4937 | ||
45b78d8b | 4938 | res = !!errs; |
13b5af22 CC |
4939 | |
4940 | end: | |
d13cd4c9 | 4941 | rollback_lock_file(&state->lock_file); |
13b5af22 | 4942 | |
45b78d8b CC |
4943 | if (state->apply_verbosity <= verbosity_silent) { |
4944 | set_error_routine(state->saved_error_routine); | |
4945 | set_warn_routine(state->saved_warn_routine); | |
4946 | } | |
4947 | ||
4948 | if (res > -1) | |
4949 | return res; | |
13b5af22 CC |
4950 | return (res == -1 ? 1 : 128); |
4951 | } | |
7e1bad24 CC |
4952 | |
4953 | int apply_parse_options(int argc, const char **argv, | |
4954 | struct apply_state *state, | |
4955 | int *force_apply, int *options, | |
4956 | const char * const *apply_usage) | |
4957 | { | |
4958 | struct option builtin_apply_options[] = { | |
4959 | { OPTION_CALLBACK, 0, "exclude", state, N_("path"), | |
4960 | N_("don't apply changes matching the given path"), | |
d5d20253 | 4961 | PARSE_OPT_NONEG, apply_option_parse_exclude }, |
7e1bad24 CC |
4962 | { OPTION_CALLBACK, 0, "include", state, N_("path"), |
4963 | N_("apply changes matching the given path"), | |
d5d20253 | 4964 | PARSE_OPT_NONEG, apply_option_parse_include }, |
7e1bad24 CC |
4965 | { OPTION_CALLBACK, 'p', NULL, state, N_("num"), |
4966 | N_("remove <num> leading slashes from traditional diff paths"), | |
4967 | 0, apply_option_parse_p }, | |
4968 | OPT_BOOL(0, "no-add", &state->no_add, | |
4969 | N_("ignore additions made by the patch")), | |
4970 | OPT_BOOL(0, "stat", &state->diffstat, | |
4971 | N_("instead of applying the patch, output diffstat for the input")), | |
4972 | OPT_NOOP_NOARG(0, "allow-binary-replacement"), | |
4973 | OPT_NOOP_NOARG(0, "binary"), | |
4974 | OPT_BOOL(0, "numstat", &state->numstat, | |
4975 | N_("show number of added and deleted lines in decimal notation")), | |
4976 | OPT_BOOL(0, "summary", &state->summary, | |
4977 | N_("instead of applying the patch, output a summary for the input")), | |
4978 | OPT_BOOL(0, "check", &state->check, | |
4979 | N_("instead of applying the patch, see if the patch is applicable")), | |
4980 | OPT_BOOL(0, "index", &state->check_index, | |
4981 | N_("make sure the patch is applicable to the current index")), | |
cff5dc09 NTND |
4982 | OPT_BOOL('N', "intent-to-add", &state->ita_only, |
4983 | N_("mark new files with `git add --intent-to-add`")), | |
7e1bad24 CC |
4984 | OPT_BOOL(0, "cached", &state->cached, |
4985 | N_("apply a patch without touching the working tree")), | |
b8e9d662 NTND |
4986 | OPT_BOOL_F(0, "unsafe-paths", &state->unsafe_paths, |
4987 | N_("accept a patch that touches outside the working area"), | |
4988 | PARSE_OPT_NOCOMPLETE), | |
7e1bad24 CC |
4989 | OPT_BOOL(0, "apply", force_apply, |
4990 | N_("also apply the patch (use with --stat/--summary/--check)")), | |
4991 | OPT_BOOL('3', "3way", &state->threeway, | |
4992 | N_( "attempt three-way merge if a patch does not apply")), | |
4993 | OPT_FILENAME(0, "build-fake-ancestor", &state->fake_ancestor, | |
4994 | N_("build a temporary index based on embedded index information")), | |
4995 | /* Think twice before adding "--nul" synonym to this */ | |
4996 | OPT_SET_INT('z', NULL, &state->line_termination, | |
4997 | N_("paths are separated with NUL character"), '\0'), | |
4998 | OPT_INTEGER('C', NULL, &state->p_context, | |
4999 | N_("ensure at least <n> lines of context match")), | |
5000 | { OPTION_CALLBACK, 0, "whitespace", state, N_("action"), | |
5001 | N_("detect new or modified lines that have whitespace errors"), | |
5002 | 0, apply_option_parse_whitespace }, | |
5003 | { OPTION_CALLBACK, 0, "ignore-space-change", state, NULL, | |
5004 | N_("ignore changes in whitespace when finding context"), | |
5005 | PARSE_OPT_NOARG, apply_option_parse_space_change }, | |
5006 | { OPTION_CALLBACK, 0, "ignore-whitespace", state, NULL, | |
5007 | N_("ignore changes in whitespace when finding context"), | |
5008 | PARSE_OPT_NOARG, apply_option_parse_space_change }, | |
5009 | OPT_BOOL('R', "reverse", &state->apply_in_reverse, | |
5010 | N_("apply the patch in reverse")), | |
5011 | OPT_BOOL(0, "unidiff-zero", &state->unidiff_zero, | |
5012 | N_("don't expect at least one line of context")), | |
5013 | OPT_BOOL(0, "reject", &state->apply_with_reject, | |
5014 | N_("leave the rejected hunks in corresponding *.rej files")), | |
5015 | OPT_BOOL(0, "allow-overlap", &state->allow_overlap, | |
5016 | N_("allow overlapping hunks")), | |
5017 | OPT__VERBOSE(&state->apply_verbosity, N_("be verbose")), | |
5018 | OPT_BIT(0, "inaccurate-eof", options, | |
5019 | N_("tolerate incorrectly detected missing new-line at the end of file"), | |
5020 | APPLY_OPT_INACCURATE_EOF), | |
5021 | OPT_BIT(0, "recount", options, | |
5022 | N_("do not trust the line counts in the hunk headers"), | |
5023 | APPLY_OPT_RECOUNT), | |
5024 | { OPTION_CALLBACK, 0, "directory", state, N_("root"), | |
5025 | N_("prepend <root> to all filenames"), | |
5026 | 0, apply_option_parse_directory }, | |
5027 | OPT_END() | |
5028 | }; | |
5029 | ||
5030 | return parse_options(argc, argv, state->prefix, builtin_apply_options, apply_usage, 0); | |
5031 | } |