wildmatch: remove unused wildopts parameter
[alt-git.git] / apply.c
blobbb411b5810d9550c16689bf77101e0f40c49ac6e
1 /*
2 * apply.c
4 * Copyright (C) Linus Torvalds, 2005
6 * This applies patches on top of some (arbitrary) version of the SCM.
8 */
10 #include "cache.h"
11 #include "blob.h"
12 #include "delta.h"
13 #include "diff.h"
14 #include "dir.h"
15 #include "xdiff-interface.h"
16 #include "ll-merge.h"
17 #include "lockfile.h"
18 #include "parse-options.h"
19 #include "quote.h"
20 #include "rerere.h"
21 #include "apply.h"
23 static void git_apply_config(void)
25 git_config_get_string_const("apply.whitespace", &apply_default_whitespace);
26 git_config_get_string_const("apply.ignorewhitespace", &apply_default_ignorewhitespace);
27 git_config(git_default_config, NULL);
30 static int parse_whitespace_option(struct apply_state *state, const char *option)
32 if (!option) {
33 state->ws_error_action = warn_on_ws_error;
34 return 0;
36 if (!strcmp(option, "warn")) {
37 state->ws_error_action = warn_on_ws_error;
38 return 0;
40 if (!strcmp(option, "nowarn")) {
41 state->ws_error_action = nowarn_ws_error;
42 return 0;
44 if (!strcmp(option, "error")) {
45 state->ws_error_action = die_on_ws_error;
46 return 0;
48 if (!strcmp(option, "error-all")) {
49 state->ws_error_action = die_on_ws_error;
50 state->squelch_whitespace_errors = 0;
51 return 0;
53 if (!strcmp(option, "strip") || !strcmp(option, "fix")) {
54 state->ws_error_action = correct_ws_error;
55 return 0;
57 return error(_("unrecognized whitespace option '%s'"), option);
60 static int parse_ignorewhitespace_option(struct apply_state *state,
61 const char *option)
63 if (!option || !strcmp(option, "no") ||
64 !strcmp(option, "false") || !strcmp(option, "never") ||
65 !strcmp(option, "none")) {
66 state->ws_ignore_action = ignore_ws_none;
67 return 0;
69 if (!strcmp(option, "change")) {
70 state->ws_ignore_action = ignore_ws_change;
71 return 0;
73 return error(_("unrecognized whitespace ignore option '%s'"), option);
76 int init_apply_state(struct apply_state *state,
77 const char *prefix,
78 struct lock_file *lock_file)
80 memset(state, 0, sizeof(*state));
81 state->prefix = prefix;
82 state->prefix_length = state->prefix ? strlen(state->prefix) : 0;
83 state->lock_file = lock_file;
84 state->newfd = -1;
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);
98 git_apply_config();
99 if (apply_default_whitespace && parse_whitespace_option(state, apply_default_whitespace))
100 return -1;
101 if (apply_default_ignorewhitespace && parse_ignorewhitespace_option(state, apply_default_ignorewhitespace))
102 return -1;
103 return 0;
106 void clear_apply_state(struct apply_state *state)
108 string_list_clear(&state->limit_by_name, 0);
109 string_list_clear(&state->symlink_changes, 0);
110 strbuf_release(&state->root);
112 /* &state->fn_table is cleared at the end of apply_patch() */
115 static void mute_routine(const char *msg, va_list params)
117 /* do nothing */
120 int check_apply_state(struct apply_state *state, int force_apply)
122 int is_not_gitdir = !startup_info->have_repository;
124 if (state->apply_with_reject && state->threeway)
125 return error(_("--reject and --3way cannot be used together."));
126 if (state->cached && state->threeway)
127 return error(_("--cached and --3way cannot be used together."));
128 if (state->threeway) {
129 if (is_not_gitdir)
130 return error(_("--3way outside a repository"));
131 state->check_index = 1;
133 if (state->apply_with_reject) {
134 state->apply = 1;
135 if (state->apply_verbosity == verbosity_normal)
136 state->apply_verbosity = verbosity_verbose;
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;
147 if (state->check_index)
148 state->unsafe_paths = 0;
149 if (!state->lock_file)
150 return error("BUG: state->lock_file should not be NULL");
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);
159 return 0;
162 static void set_default_whitespace_mode(struct apply_state *state)
164 if (!state->whitespace_option && !apply_default_whitespace)
165 state->ws_error_action = (state->apply ? warn_on_ws_error : nowarn_ws_error);
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.
175 struct fragment {
176 unsigned long leading, trailing;
177 unsigned long oldpos, oldlines;
178 unsigned long newpos, newlines;
180 * 'patch' is usually borrowed from buf in apply_patch(),
181 * but some codepaths store an allocated buffer.
183 const char *patch;
184 unsigned free_patch:1,
185 rejected:1;
186 int size;
187 int linenr;
188 struct fragment *next;
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".
196 #define binary_patch_method leading
197 #define BINARY_DELTA_DEFLATED 1
198 #define BINARY_LITERAL_DEFLATED 2
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.
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;
213 unsigned int is_toplevel_relative:1;
214 unsigned int inaccurate_eof:1;
215 unsigned int is_binary:1;
216 unsigned int is_copy:1;
217 unsigned int is_rename:1;
218 unsigned int recount:1;
219 unsigned int conflicted_threeway:1;
220 unsigned int direct_to_threeway:1;
221 struct fragment *fragments;
222 char *result;
223 size_t resultsize;
224 char old_sha1_prefix[41];
225 char new_sha1_prefix[41];
226 struct patch *next;
228 /* three-way fallback result */
229 struct object_id threeway_stage[3];
232 static void free_fragment_list(struct fragment *list)
234 while (list) {
235 struct fragment *next = list->next;
236 if (list->free_patch)
237 free((char *)list->patch);
238 free(list);
239 list = next;
243 static void free_patch(struct patch *patch)
245 free_fragment_list(patch->fragments);
246 free(patch->def_name);
247 free(patch->old_name);
248 free(patch->new_name);
249 free(patch->result);
250 free(patch);
253 static void free_patch_list(struct patch *list)
255 while (list) {
256 struct patch *next = list->next;
257 free_patch(list);
258 list = next;
263 * A line in a file, len-bytes long (includes the terminating LF,
264 * except for an incomplete line at the end if the file ends with
265 * one), and its contents hashes to 'hash'.
267 struct line {
268 size_t len;
269 unsigned hash : 24;
270 unsigned flag : 8;
271 #define LINE_COMMON 1
272 #define LINE_PATCHED 2
276 * This represents a "file", which is an array of "lines".
278 struct image {
279 char *buf;
280 size_t len;
281 size_t nr;
282 size_t alloc;
283 struct line *line_allocated;
284 struct line *line;
287 static uint32_t hash_line(const char *cp, size_t len)
289 size_t i;
290 uint32_t h;
291 for (i = 0, h = 0; i < len; i++) {
292 if (!isspace(cp[i])) {
293 h = h * 3 + (cp[i] & 0xff);
296 return h;
300 * Compare lines s1 of length n1 and s2 of length n2, ignoring
301 * whitespace difference. Returns 1 if they match, 0 otherwise
303 static int fuzzy_matchlines(const char *s1, size_t n1,
304 const char *s2, size_t n2)
306 const char *last1 = s1 + n1 - 1;
307 const char *last2 = s2 + n2 - 1;
308 int result = 0;
310 /* ignore line endings */
311 while ((*last1 == '\r') || (*last1 == '\n'))
312 last1--;
313 while ((*last2 == '\r') || (*last2 == '\n'))
314 last2--;
316 /* skip leading whitespaces, if both begin with whitespace */
317 if (s1 <= last1 && s2 <= last2 && isspace(*s1) && isspace(*s2)) {
318 while (isspace(*s1) && (s1 <= last1))
319 s1++;
320 while (isspace(*s2) && (s2 <= last2))
321 s2++;
323 /* early return if both lines are empty */
324 if ((s1 > last1) && (s2 > last2))
325 return 1;
326 while (!result) {
327 result = *s1++ - *s2++;
329 * Skip whitespace inside. We check for whitespace on
330 * both buffers because we don't want "a b" to match
331 * "ab"
333 if (isspace(*s1) && isspace(*s2)) {
334 while (isspace(*s1) && s1 <= last1)
335 s1++;
336 while (isspace(*s2) && s2 <= last2)
337 s2++;
340 * If we reached the end on one side only,
341 * lines don't match
343 if (
344 ((s2 > last2) && (s1 <= last1)) ||
345 ((s1 > last1) && (s2 <= last2)))
346 return 0;
347 if ((s1 > last1) && (s2 > last2))
348 break;
351 return !result;
354 static void add_line_info(struct image *img, const char *bol, size_t len, unsigned flag)
356 ALLOC_GROW(img->line_allocated, img->nr + 1, img->alloc);
357 img->line_allocated[img->nr].len = len;
358 img->line_allocated[img->nr].hash = hash_line(bol, len);
359 img->line_allocated[img->nr].flag = flag;
360 img->nr++;
364 * "buf" has the file contents to be patched (read from various sources).
365 * attach it to "image" and add line-based index to it.
366 * "image" now owns the "buf".
368 static void prepare_image(struct image *image, char *buf, size_t len,
369 int prepare_linetable)
371 const char *cp, *ep;
373 memset(image, 0, sizeof(*image));
374 image->buf = buf;
375 image->len = len;
377 if (!prepare_linetable)
378 return;
380 ep = image->buf + image->len;
381 cp = image->buf;
382 while (cp < ep) {
383 const char *next;
384 for (next = cp; next < ep && *next != '\n'; next++)
386 if (next < ep)
387 next++;
388 add_line_info(image, cp, next - cp, 0);
389 cp = next;
391 image->line = image->line_allocated;
394 static void clear_image(struct image *image)
396 free(image->buf);
397 free(image->line_allocated);
398 memset(image, 0, sizeof(*image));
401 /* fmt must contain _one_ %s and no other substitution */
402 static void say_patch_name(FILE *output, const char *fmt, struct patch *patch)
404 struct strbuf sb = STRBUF_INIT;
406 if (patch->old_name && patch->new_name &&
407 strcmp(patch->old_name, patch->new_name)) {
408 quote_c_style(patch->old_name, &sb, NULL, 0);
409 strbuf_addstr(&sb, " => ");
410 quote_c_style(patch->new_name, &sb, NULL, 0);
411 } else {
412 const char *n = patch->new_name;
413 if (!n)
414 n = patch->old_name;
415 quote_c_style(n, &sb, NULL, 0);
417 fprintf(output, fmt, sb.buf);
418 fputc('\n', output);
419 strbuf_release(&sb);
422 #define SLOP (16)
424 static int read_patch_file(struct strbuf *sb, int fd)
426 if (strbuf_read(sb, fd, 0) < 0)
427 return error_errno("git apply: failed to read");
430 * Make sure that we have some slop in the buffer
431 * so that we can do speculative "memcmp" etc, and
432 * see to it that it is NUL-filled.
434 strbuf_grow(sb, SLOP);
435 memset(sb->buf + sb->len, 0, SLOP);
436 return 0;
439 static unsigned long linelen(const char *buffer, unsigned long size)
441 unsigned long len = 0;
442 while (size--) {
443 len++;
444 if (*buffer++ == '\n')
445 break;
447 return len;
450 static int is_dev_null(const char *str)
452 return skip_prefix(str, "/dev/null", &str) && isspace(*str);
455 #define TERM_SPACE 1
456 #define TERM_TAB 2
458 static int name_terminate(int c, int terminate)
460 if (c == ' ' && !(terminate & TERM_SPACE))
461 return 0;
462 if (c == '\t' && !(terminate & TERM_TAB))
463 return 0;
465 return 1;
468 /* remove double slashes to make --index work with such filenames */
469 static char *squash_slash(char *name)
471 int i = 0, j = 0;
473 if (!name)
474 return NULL;
476 while (name[i]) {
477 if ((name[j++] = name[i++]) == '/')
478 while (name[i] == '/')
479 i++;
481 name[j] = '\0';
482 return name;
485 static char *find_name_gnu(struct apply_state *state,
486 const char *line,
487 const char *def,
488 int p_value)
490 struct strbuf name = STRBUF_INIT;
491 char *cp;
494 * Proposed "new-style" GNU patch/diff format; see
495 * http://marc.info/?l=git&m=112927316408690&w=2
497 if (unquote_c_style(&name, line, NULL)) {
498 strbuf_release(&name);
499 return NULL;
502 for (cp = name.buf; p_value; p_value--) {
503 cp = strchr(cp, '/');
504 if (!cp) {
505 strbuf_release(&name);
506 return NULL;
508 cp++;
511 strbuf_remove(&name, 0, cp - name.buf);
512 if (state->root.len)
513 strbuf_insert(&name, 0, state->root.buf, state->root.len);
514 return squash_slash(strbuf_detach(&name, NULL));
517 static size_t sane_tz_len(const char *line, size_t len)
519 const char *tz, *p;
521 if (len < strlen(" +0500") || line[len-strlen(" +0500")] != ' ')
522 return 0;
523 tz = line + len - strlen(" +0500");
525 if (tz[1] != '+' && tz[1] != '-')
526 return 0;
528 for (p = tz + 2; p != line + len; p++)
529 if (!isdigit(*p))
530 return 0;
532 return line + len - tz;
535 static size_t tz_with_colon_len(const char *line, size_t len)
537 const char *tz, *p;
539 if (len < strlen(" +08:00") || line[len - strlen(":00")] != ':')
540 return 0;
541 tz = line + len - strlen(" +08:00");
543 if (tz[0] != ' ' || (tz[1] != '+' && tz[1] != '-'))
544 return 0;
545 p = tz + 2;
546 if (!isdigit(*p++) || !isdigit(*p++) || *p++ != ':' ||
547 !isdigit(*p++) || !isdigit(*p++))
548 return 0;
550 return line + len - tz;
553 static size_t date_len(const char *line, size_t len)
555 const char *date, *p;
557 if (len < strlen("72-02-05") || line[len-strlen("-05")] != '-')
558 return 0;
559 p = date = line + len - strlen("72-02-05");
561 if (!isdigit(*p++) || !isdigit(*p++) || *p++ != '-' ||
562 !isdigit(*p++) || !isdigit(*p++) || *p++ != '-' ||
563 !isdigit(*p++) || !isdigit(*p++)) /* Not a date. */
564 return 0;
566 if (date - line >= strlen("19") &&
567 isdigit(date[-1]) && isdigit(date[-2])) /* 4-digit year */
568 date -= strlen("19");
570 return line + len - date;
573 static size_t short_time_len(const char *line, size_t len)
575 const char *time, *p;
577 if (len < strlen(" 07:01:32") || line[len-strlen(":32")] != ':')
578 return 0;
579 p = time = line + len - strlen(" 07:01:32");
581 /* Permit 1-digit hours? */
582 if (*p++ != ' ' ||
583 !isdigit(*p++) || !isdigit(*p++) || *p++ != ':' ||
584 !isdigit(*p++) || !isdigit(*p++) || *p++ != ':' ||
585 !isdigit(*p++) || !isdigit(*p++)) /* Not a time. */
586 return 0;
588 return line + len - time;
591 static size_t fractional_time_len(const char *line, size_t len)
593 const char *p;
594 size_t n;
596 /* Expected format: 19:41:17.620000023 */
597 if (!len || !isdigit(line[len - 1]))
598 return 0;
599 p = line + len - 1;
601 /* Fractional seconds. */
602 while (p > line && isdigit(*p))
603 p--;
604 if (*p != '.')
605 return 0;
607 /* Hours, minutes, and whole seconds. */
608 n = short_time_len(line, p - line);
609 if (!n)
610 return 0;
612 return line + len - p + n;
615 static size_t trailing_spaces_len(const char *line, size_t len)
617 const char *p;
619 /* Expected format: ' ' x (1 or more) */
620 if (!len || line[len - 1] != ' ')
621 return 0;
623 p = line + len;
624 while (p != line) {
625 p--;
626 if (*p != ' ')
627 return line + len - (p + 1);
630 /* All spaces! */
631 return len;
634 static size_t diff_timestamp_len(const char *line, size_t len)
636 const char *end = line + len;
637 size_t n;
640 * Posix: 2010-07-05 19:41:17
641 * GNU: 2010-07-05 19:41:17.620000023 -0500
644 if (!isdigit(end[-1]))
645 return 0;
647 n = sane_tz_len(line, end - line);
648 if (!n)
649 n = tz_with_colon_len(line, end - line);
650 end -= n;
652 n = short_time_len(line, end - line);
653 if (!n)
654 n = fractional_time_len(line, end - line);
655 end -= n;
657 n = date_len(line, end - line);
658 if (!n) /* No date. Too bad. */
659 return 0;
660 end -= n;
662 if (end == line) /* No space before date. */
663 return 0;
664 if (end[-1] == '\t') { /* Success! */
665 end--;
666 return line + len - end;
668 if (end[-1] != ' ') /* No space before date. */
669 return 0;
671 /* Whitespace damage. */
672 end -= trailing_spaces_len(line, end - line);
673 return line + len - end;
676 static char *find_name_common(struct apply_state *state,
677 const char *line,
678 const char *def,
679 int p_value,
680 const char *end,
681 int terminate)
683 int len;
684 const char *start = NULL;
686 if (p_value == 0)
687 start = line;
688 while (line != end) {
689 char c = *line;
691 if (!end && isspace(c)) {
692 if (c == '\n')
693 break;
694 if (name_terminate(c, terminate))
695 break;
697 line++;
698 if (c == '/' && !--p_value)
699 start = line;
701 if (!start)
702 return squash_slash(xstrdup_or_null(def));
703 len = line - start;
704 if (!len)
705 return squash_slash(xstrdup_or_null(def));
708 * Generally we prefer the shorter name, especially
709 * if the other one is just a variation of that with
710 * something else tacked on to the end (ie "file.orig"
711 * or "file~").
713 if (def) {
714 int deflen = strlen(def);
715 if (deflen < len && !strncmp(start, def, deflen))
716 return squash_slash(xstrdup(def));
719 if (state->root.len) {
720 char *ret = xstrfmt("%s%.*s", state->root.buf, len, start);
721 return squash_slash(ret);
724 return squash_slash(xmemdupz(start, len));
727 static char *find_name(struct apply_state *state,
728 const char *line,
729 char *def,
730 int p_value,
731 int terminate)
733 if (*line == '"') {
734 char *name = find_name_gnu(state, line, def, p_value);
735 if (name)
736 return name;
739 return find_name_common(state, line, def, p_value, NULL, terminate);
742 static char *find_name_traditional(struct apply_state *state,
743 const char *line,
744 char *def,
745 int p_value)
747 size_t len;
748 size_t date_len;
750 if (*line == '"') {
751 char *name = find_name_gnu(state, line, def, p_value);
752 if (name)
753 return name;
756 len = strchrnul(line, '\n') - line;
757 date_len = diff_timestamp_len(line, len);
758 if (!date_len)
759 return find_name_common(state, line, def, p_value, NULL, TERM_TAB);
760 len -= date_len;
762 return find_name_common(state, line, def, p_value, line + len, 0);
766 * Given the string after "--- " or "+++ ", guess the appropriate
767 * p_value for the given patch.
769 static int guess_p_value(struct apply_state *state, const char *nameline)
771 char *name, *cp;
772 int val = -1;
774 if (is_dev_null(nameline))
775 return -1;
776 name = find_name_traditional(state, nameline, NULL, 0);
777 if (!name)
778 return -1;
779 cp = strchr(name, '/');
780 if (!cp)
781 val = 0;
782 else if (state->prefix) {
784 * Does it begin with "a/$our-prefix" and such? Then this is
785 * very likely to apply to our directory.
787 if (!strncmp(name, state->prefix, state->prefix_length))
788 val = count_slashes(state->prefix);
789 else {
790 cp++;
791 if (!strncmp(cp, state->prefix, state->prefix_length))
792 val = count_slashes(state->prefix) + 1;
795 free(name);
796 return val;
800 * Does the ---/+++ line have the POSIX timestamp after the last HT?
801 * GNU diff puts epoch there to signal a creation/deletion event. Is
802 * this such a timestamp?
804 static int has_epoch_timestamp(const char *nameline)
807 * We are only interested in epoch timestamp; any non-zero
808 * fraction cannot be one, hence "(\.0+)?" in the regexp below.
809 * For the same reason, the date must be either 1969-12-31 or
810 * 1970-01-01, and the seconds part must be "00".
812 const char stamp_regexp[] =
813 "^(1969-12-31|1970-01-01)"
815 "[0-2][0-9]:[0-5][0-9]:00(\\.0+)?"
817 "([-+][0-2][0-9]:?[0-5][0-9])\n";
818 const char *timestamp = NULL, *cp, *colon;
819 static regex_t *stamp;
820 regmatch_t m[10];
821 int zoneoffset;
822 int hourminute;
823 int status;
825 for (cp = nameline; *cp != '\n'; cp++) {
826 if (*cp == '\t')
827 timestamp = cp + 1;
829 if (!timestamp)
830 return 0;
831 if (!stamp) {
832 stamp = xmalloc(sizeof(*stamp));
833 if (regcomp(stamp, stamp_regexp, REG_EXTENDED)) {
834 warning(_("Cannot prepare timestamp regexp %s"),
835 stamp_regexp);
836 return 0;
840 status = regexec(stamp, timestamp, ARRAY_SIZE(m), m, 0);
841 if (status) {
842 if (status != REG_NOMATCH)
843 warning(_("regexec returned %d for input: %s"),
844 status, timestamp);
845 return 0;
848 zoneoffset = strtol(timestamp + m[3].rm_so + 1, (char **) &colon, 10);
849 if (*colon == ':')
850 zoneoffset = zoneoffset * 60 + strtol(colon + 1, NULL, 10);
851 else
852 zoneoffset = (zoneoffset / 100) * 60 + (zoneoffset % 100);
853 if (timestamp[m[3].rm_so] == '-')
854 zoneoffset = -zoneoffset;
857 * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31
858 * (west of GMT) or 1970-01-01 (east of GMT)
860 if ((zoneoffset < 0 && memcmp(timestamp, "1969-12-31", 10)) ||
861 (0 <= zoneoffset && memcmp(timestamp, "1970-01-01", 10)))
862 return 0;
864 hourminute = (strtol(timestamp + 11, NULL, 10) * 60 +
865 strtol(timestamp + 14, NULL, 10) -
866 zoneoffset);
868 return ((zoneoffset < 0 && hourminute == 1440) ||
869 (0 <= zoneoffset && !hourminute));
873 * Get the name etc info from the ---/+++ lines of a traditional patch header
875 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
876 * files, we can happily check the index for a match, but for creating a
877 * new file we should try to match whatever "patch" does. I have no idea.
879 static int parse_traditional_patch(struct apply_state *state,
880 const char *first,
881 const char *second,
882 struct patch *patch)
884 char *name;
886 first += 4; /* skip "--- " */
887 second += 4; /* skip "+++ " */
888 if (!state->p_value_known) {
889 int p, q;
890 p = guess_p_value(state, first);
891 q = guess_p_value(state, second);
892 if (p < 0) p = q;
893 if (0 <= p && p == q) {
894 state->p_value = p;
895 state->p_value_known = 1;
898 if (is_dev_null(first)) {
899 patch->is_new = 1;
900 patch->is_delete = 0;
901 name = find_name_traditional(state, second, NULL, state->p_value);
902 patch->new_name = name;
903 } else if (is_dev_null(second)) {
904 patch->is_new = 0;
905 patch->is_delete = 1;
906 name = find_name_traditional(state, first, NULL, state->p_value);
907 patch->old_name = name;
908 } else {
909 char *first_name;
910 first_name = find_name_traditional(state, first, NULL, state->p_value);
911 name = find_name_traditional(state, second, first_name, state->p_value);
912 free(first_name);
913 if (has_epoch_timestamp(first)) {
914 patch->is_new = 1;
915 patch->is_delete = 0;
916 patch->new_name = name;
917 } else if (has_epoch_timestamp(second)) {
918 patch->is_new = 0;
919 patch->is_delete = 1;
920 patch->old_name = name;
921 } else {
922 patch->old_name = name;
923 patch->new_name = xstrdup_or_null(name);
926 if (!name)
927 return error(_("unable to find filename in patch at line %d"), state->linenr);
929 return 0;
932 static int gitdiff_hdrend(struct apply_state *state,
933 const char *line,
934 struct patch *patch)
936 return 1;
940 * We're anal about diff header consistency, to make
941 * sure that we don't end up having strange ambiguous
942 * patches floating around.
944 * As a result, gitdiff_{old|new}name() will check
945 * their names against any previous information, just
946 * to make sure..
948 #define DIFF_OLD_NAME 0
949 #define DIFF_NEW_NAME 1
951 static int gitdiff_verify_name(struct apply_state *state,
952 const char *line,
953 int isnull,
954 char **name,
955 int side)
957 if (!*name && !isnull) {
958 *name = find_name(state, line, NULL, state->p_value, TERM_TAB);
959 return 0;
962 if (*name) {
963 int len = strlen(*name);
964 char *another;
965 if (isnull)
966 return error(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"),
967 *name, state->linenr);
968 another = find_name(state, line, NULL, state->p_value, TERM_TAB);
969 if (!another || memcmp(another, *name, len + 1)) {
970 free(another);
971 return error((side == DIFF_NEW_NAME) ?
972 _("git apply: bad git-diff - inconsistent new filename on line %d") :
973 _("git apply: bad git-diff - inconsistent old filename on line %d"), state->linenr);
975 free(another);
976 } else {
977 /* expect "/dev/null" */
978 if (memcmp("/dev/null", line, 9) || line[9] != '\n')
979 return error(_("git apply: bad git-diff - expected /dev/null on line %d"), state->linenr);
982 return 0;
985 static int gitdiff_oldname(struct apply_state *state,
986 const char *line,
987 struct patch *patch)
989 return gitdiff_verify_name(state, line,
990 patch->is_new, &patch->old_name,
991 DIFF_OLD_NAME);
994 static int gitdiff_newname(struct apply_state *state,
995 const char *line,
996 struct patch *patch)
998 return gitdiff_verify_name(state, line,
999 patch->is_delete, &patch->new_name,
1000 DIFF_NEW_NAME);
1003 static int gitdiff_oldmode(struct apply_state *state,
1004 const char *line,
1005 struct patch *patch)
1007 patch->old_mode = strtoul(line, NULL, 8);
1008 return 0;
1011 static int gitdiff_newmode(struct apply_state *state,
1012 const char *line,
1013 struct patch *patch)
1015 patch->new_mode = strtoul(line, NULL, 8);
1016 return 0;
1019 static int gitdiff_delete(struct apply_state *state,
1020 const char *line,
1021 struct patch *patch)
1023 patch->is_delete = 1;
1024 free(patch->old_name);
1025 patch->old_name = xstrdup_or_null(patch->def_name);
1026 return gitdiff_oldmode(state, line, patch);
1029 static int gitdiff_newfile(struct apply_state *state,
1030 const char *line,
1031 struct patch *patch)
1033 patch->is_new = 1;
1034 free(patch->new_name);
1035 patch->new_name = xstrdup_or_null(patch->def_name);
1036 return gitdiff_newmode(state, line, patch);
1039 static int gitdiff_copysrc(struct apply_state *state,
1040 const char *line,
1041 struct patch *patch)
1043 patch->is_copy = 1;
1044 free(patch->old_name);
1045 patch->old_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
1046 return 0;
1049 static int gitdiff_copydst(struct apply_state *state,
1050 const char *line,
1051 struct patch *patch)
1053 patch->is_copy = 1;
1054 free(patch->new_name);
1055 patch->new_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
1056 return 0;
1059 static int gitdiff_renamesrc(struct apply_state *state,
1060 const char *line,
1061 struct patch *patch)
1063 patch->is_rename = 1;
1064 free(patch->old_name);
1065 patch->old_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
1066 return 0;
1069 static int gitdiff_renamedst(struct apply_state *state,
1070 const char *line,
1071 struct patch *patch)
1073 patch->is_rename = 1;
1074 free(patch->new_name);
1075 patch->new_name = find_name(state, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
1076 return 0;
1079 static int gitdiff_similarity(struct apply_state *state,
1080 const char *line,
1081 struct patch *patch)
1083 unsigned long val = strtoul(line, NULL, 10);
1084 if (val <= 100)
1085 patch->score = val;
1086 return 0;
1089 static int gitdiff_dissimilarity(struct apply_state *state,
1090 const char *line,
1091 struct patch *patch)
1093 unsigned long val = strtoul(line, NULL, 10);
1094 if (val <= 100)
1095 patch->score = val;
1096 return 0;
1099 static int gitdiff_index(struct apply_state *state,
1100 const char *line,
1101 struct patch *patch)
1104 * index line is N hexadecimal, "..", N hexadecimal,
1105 * and optional space with octal mode.
1107 const char *ptr, *eol;
1108 int len;
1110 ptr = strchr(line, '.');
1111 if (!ptr || ptr[1] != '.' || 40 < ptr - line)
1112 return 0;
1113 len = ptr - line;
1114 memcpy(patch->old_sha1_prefix, line, len);
1115 patch->old_sha1_prefix[len] = 0;
1117 line = ptr + 2;
1118 ptr = strchr(line, ' ');
1119 eol = strchrnul(line, '\n');
1121 if (!ptr || eol < ptr)
1122 ptr = eol;
1123 len = ptr - line;
1125 if (40 < len)
1126 return 0;
1127 memcpy(patch->new_sha1_prefix, line, len);
1128 patch->new_sha1_prefix[len] = 0;
1129 if (*ptr == ' ')
1130 patch->old_mode = strtoul(ptr+1, NULL, 8);
1131 return 0;
1135 * This is normal for a diff that doesn't change anything: we'll fall through
1136 * into the next diff. Tell the parser to break out.
1138 static int gitdiff_unrecognized(struct apply_state *state,
1139 const char *line,
1140 struct patch *patch)
1142 return 1;
1146 * Skip p_value leading components from "line"; as we do not accept
1147 * absolute paths, return NULL in that case.
1149 static const char *skip_tree_prefix(struct apply_state *state,
1150 const char *line,
1151 int llen)
1153 int nslash;
1154 int i;
1156 if (!state->p_value)
1157 return (llen && line[0] == '/') ? NULL : line;
1159 nslash = state->p_value;
1160 for (i = 0; i < llen; i++) {
1161 int ch = line[i];
1162 if (ch == '/' && --nslash <= 0)
1163 return (i == 0) ? NULL : &line[i + 1];
1165 return NULL;
1169 * This is to extract the same name that appears on "diff --git"
1170 * line. We do not find and return anything if it is a rename
1171 * patch, and it is OK because we will find the name elsewhere.
1172 * We need to reliably find name only when it is mode-change only,
1173 * creation or deletion of an empty file. In any of these cases,
1174 * both sides are the same name under a/ and b/ respectively.
1176 static char *git_header_name(struct apply_state *state,
1177 const char *line,
1178 int llen)
1180 const char *name;
1181 const char *second = NULL;
1182 size_t len, line_len;
1184 line += strlen("diff --git ");
1185 llen -= strlen("diff --git ");
1187 if (*line == '"') {
1188 const char *cp;
1189 struct strbuf first = STRBUF_INIT;
1190 struct strbuf sp = STRBUF_INIT;
1192 if (unquote_c_style(&first, line, &second))
1193 goto free_and_fail1;
1195 /* strip the a/b prefix including trailing slash */
1196 cp = skip_tree_prefix(state, first.buf, first.len);
1197 if (!cp)
1198 goto free_and_fail1;
1199 strbuf_remove(&first, 0, cp - first.buf);
1202 * second points at one past closing dq of name.
1203 * find the second name.
1205 while ((second < line + llen) && isspace(*second))
1206 second++;
1208 if (line + llen <= second)
1209 goto free_and_fail1;
1210 if (*second == '"') {
1211 if (unquote_c_style(&sp, second, NULL))
1212 goto free_and_fail1;
1213 cp = skip_tree_prefix(state, sp.buf, sp.len);
1214 if (!cp)
1215 goto free_and_fail1;
1216 /* They must match, otherwise ignore */
1217 if (strcmp(cp, first.buf))
1218 goto free_and_fail1;
1219 strbuf_release(&sp);
1220 return strbuf_detach(&first, NULL);
1223 /* unquoted second */
1224 cp = skip_tree_prefix(state, second, line + llen - second);
1225 if (!cp)
1226 goto free_and_fail1;
1227 if (line + llen - cp != first.len ||
1228 memcmp(first.buf, cp, first.len))
1229 goto free_and_fail1;
1230 return strbuf_detach(&first, NULL);
1232 free_and_fail1:
1233 strbuf_release(&first);
1234 strbuf_release(&sp);
1235 return NULL;
1238 /* unquoted first name */
1239 name = skip_tree_prefix(state, line, llen);
1240 if (!name)
1241 return NULL;
1244 * since the first name is unquoted, a dq if exists must be
1245 * the beginning of the second name.
1247 for (second = name; second < line + llen; second++) {
1248 if (*second == '"') {
1249 struct strbuf sp = STRBUF_INIT;
1250 const char *np;
1252 if (unquote_c_style(&sp, second, NULL))
1253 goto free_and_fail2;
1255 np = skip_tree_prefix(state, sp.buf, sp.len);
1256 if (!np)
1257 goto free_and_fail2;
1259 len = sp.buf + sp.len - np;
1260 if (len < second - name &&
1261 !strncmp(np, name, len) &&
1262 isspace(name[len])) {
1263 /* Good */
1264 strbuf_remove(&sp, 0, np - sp.buf);
1265 return strbuf_detach(&sp, NULL);
1268 free_and_fail2:
1269 strbuf_release(&sp);
1270 return NULL;
1275 * Accept a name only if it shows up twice, exactly the same
1276 * form.
1278 second = strchr(name, '\n');
1279 if (!second)
1280 return NULL;
1281 line_len = second - name;
1282 for (len = 0 ; ; len++) {
1283 switch (name[len]) {
1284 default:
1285 continue;
1286 case '\n':
1287 return NULL;
1288 case '\t': case ' ':
1290 * Is this the separator between the preimage
1291 * and the postimage pathname? Again, we are
1292 * only interested in the case where there is
1293 * no rename, as this is only to set def_name
1294 * and a rename patch has the names elsewhere
1295 * in an unambiguous form.
1297 if (!name[len + 1])
1298 return NULL; /* no postimage name */
1299 second = skip_tree_prefix(state, name + len + 1,
1300 line_len - (len + 1));
1301 if (!second)
1302 return NULL;
1304 * Does len bytes starting at "name" and "second"
1305 * (that are separated by one HT or SP we just
1306 * found) exactly match?
1308 if (second[len] == '\n' && !strncmp(name, second, len))
1309 return xmemdupz(name, len);
1314 /* Verify that we recognize the lines following a git header */
1315 static int parse_git_header(struct apply_state *state,
1316 const char *line,
1317 int len,
1318 unsigned int size,
1319 struct patch *patch)
1321 unsigned long offset;
1323 /* A git diff has explicit new/delete information, so we don't guess */
1324 patch->is_new = 0;
1325 patch->is_delete = 0;
1328 * Some things may not have the old name in the
1329 * rest of the headers anywhere (pure mode changes,
1330 * or removing or adding empty files), so we get
1331 * the default name from the header.
1333 patch->def_name = git_header_name(state, line, len);
1334 if (patch->def_name && state->root.len) {
1335 char *s = xstrfmt("%s%s", state->root.buf, patch->def_name);
1336 free(patch->def_name);
1337 patch->def_name = s;
1340 line += len;
1341 size -= len;
1342 state->linenr++;
1343 for (offset = len ; size > 0 ; offset += len, size -= len, line += len, state->linenr++) {
1344 static const struct opentry {
1345 const char *str;
1346 int (*fn)(struct apply_state *, const char *, struct patch *);
1347 } optable[] = {
1348 { "@@ -", gitdiff_hdrend },
1349 { "--- ", gitdiff_oldname },
1350 { "+++ ", gitdiff_newname },
1351 { "old mode ", gitdiff_oldmode },
1352 { "new mode ", gitdiff_newmode },
1353 { "deleted file mode ", gitdiff_delete },
1354 { "new file mode ", gitdiff_newfile },
1355 { "copy from ", gitdiff_copysrc },
1356 { "copy to ", gitdiff_copydst },
1357 { "rename old ", gitdiff_renamesrc },
1358 { "rename new ", gitdiff_renamedst },
1359 { "rename from ", gitdiff_renamesrc },
1360 { "rename to ", gitdiff_renamedst },
1361 { "similarity index ", gitdiff_similarity },
1362 { "dissimilarity index ", gitdiff_dissimilarity },
1363 { "index ", gitdiff_index },
1364 { "", gitdiff_unrecognized },
1366 int i;
1368 len = linelen(line, size);
1369 if (!len || line[len-1] != '\n')
1370 break;
1371 for (i = 0; i < ARRAY_SIZE(optable); i++) {
1372 const struct opentry *p = optable + i;
1373 int oplen = strlen(p->str);
1374 int res;
1375 if (len < oplen || memcmp(p->str, line, oplen))
1376 continue;
1377 res = p->fn(state, line + oplen, patch);
1378 if (res < 0)
1379 return -1;
1380 if (res > 0)
1381 return offset;
1382 break;
1386 return offset;
1389 static int parse_num(const char *line, unsigned long *p)
1391 char *ptr;
1393 if (!isdigit(*line))
1394 return 0;
1395 *p = strtoul(line, &ptr, 10);
1396 return ptr - line;
1399 static int parse_range(const char *line, int len, int offset, const char *expect,
1400 unsigned long *p1, unsigned long *p2)
1402 int digits, ex;
1404 if (offset < 0 || offset >= len)
1405 return -1;
1406 line += offset;
1407 len -= offset;
1409 digits = parse_num(line, p1);
1410 if (!digits)
1411 return -1;
1413 offset += digits;
1414 line += digits;
1415 len -= digits;
1417 *p2 = 1;
1418 if (*line == ',') {
1419 digits = parse_num(line+1, p2);
1420 if (!digits)
1421 return -1;
1423 offset += digits+1;
1424 line += digits+1;
1425 len -= digits+1;
1428 ex = strlen(expect);
1429 if (ex > len)
1430 return -1;
1431 if (memcmp(line, expect, ex))
1432 return -1;
1434 return offset + ex;
1437 static void recount_diff(const char *line, int size, struct fragment *fragment)
1439 int oldlines = 0, newlines = 0, ret = 0;
1441 if (size < 1) {
1442 warning("recount: ignore empty hunk");
1443 return;
1446 for (;;) {
1447 int len = linelen(line, size);
1448 size -= len;
1449 line += len;
1451 if (size < 1)
1452 break;
1454 switch (*line) {
1455 case ' ': case '\n':
1456 newlines++;
1457 /* fall through */
1458 case '-':
1459 oldlines++;
1460 continue;
1461 case '+':
1462 newlines++;
1463 continue;
1464 case '\\':
1465 continue;
1466 case '@':
1467 ret = size < 3 || !starts_with(line, "@@ ");
1468 break;
1469 case 'd':
1470 ret = size < 5 || !starts_with(line, "diff ");
1471 break;
1472 default:
1473 ret = -1;
1474 break;
1476 if (ret) {
1477 warning(_("recount: unexpected line: %.*s"),
1478 (int)linelen(line, size), line);
1479 return;
1481 break;
1483 fragment->oldlines = oldlines;
1484 fragment->newlines = newlines;
1488 * Parse a unified diff fragment header of the
1489 * form "@@ -a,b +c,d @@"
1491 static int parse_fragment_header(const char *line, int len, struct fragment *fragment)
1493 int offset;
1495 if (!len || line[len-1] != '\n')
1496 return -1;
1498 /* Figure out the number of lines in a fragment */
1499 offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);
1500 offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);
1502 return offset;
1506 * Find file diff header
1508 * Returns:
1509 * -1 if no header was found
1510 * -128 in case of error
1511 * the size of the header in bytes (called "offset") otherwise
1513 static int find_header(struct apply_state *state,
1514 const char *line,
1515 unsigned long size,
1516 int *hdrsize,
1517 struct patch *patch)
1519 unsigned long offset, len;
1521 patch->is_toplevel_relative = 0;
1522 patch->is_rename = patch->is_copy = 0;
1523 patch->is_new = patch->is_delete = -1;
1524 patch->old_mode = patch->new_mode = 0;
1525 patch->old_name = patch->new_name = NULL;
1526 for (offset = 0; size > 0; offset += len, size -= len, line += len, state->linenr++) {
1527 unsigned long nextlen;
1529 len = linelen(line, size);
1530 if (!len)
1531 break;
1533 /* Testing this early allows us to take a few shortcuts.. */
1534 if (len < 6)
1535 continue;
1538 * Make sure we don't find any unconnected patch fragments.
1539 * That's a sign that we didn't find a header, and that a
1540 * patch has become corrupted/broken up.
1542 if (!memcmp("@@ -", line, 4)) {
1543 struct fragment dummy;
1544 if (parse_fragment_header(line, len, &dummy) < 0)
1545 continue;
1546 error(_("patch fragment without header at line %d: %.*s"),
1547 state->linenr, (int)len-1, line);
1548 return -128;
1551 if (size < len + 6)
1552 break;
1555 * Git patch? It might not have a real patch, just a rename
1556 * or mode change, so we handle that specially
1558 if (!memcmp("diff --git ", line, 11)) {
1559 int git_hdr_len = parse_git_header(state, line, len, size, patch);
1560 if (git_hdr_len < 0)
1561 return -128;
1562 if (git_hdr_len <= len)
1563 continue;
1564 if (!patch->old_name && !patch->new_name) {
1565 if (!patch->def_name) {
1566 error(Q_("git diff header lacks filename information when removing "
1567 "%d leading pathname component (line %d)",
1568 "git diff header lacks filename information when removing "
1569 "%d leading pathname components (line %d)",
1570 state->p_value),
1571 state->p_value, state->linenr);
1572 return -128;
1574 patch->old_name = xstrdup(patch->def_name);
1575 patch->new_name = xstrdup(patch->def_name);
1577 if (!patch->is_delete && !patch->new_name) {
1578 error(_("git diff header lacks filename information "
1579 "(line %d)"), state->linenr);
1580 return -128;
1582 patch->is_toplevel_relative = 1;
1583 *hdrsize = git_hdr_len;
1584 return offset;
1587 /* --- followed by +++ ? */
1588 if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4))
1589 continue;
1592 * We only accept unified patches, so we want it to
1593 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
1594 * minimum ("@@ -0,0 +1 @@\n" is the shortest).
1596 nextlen = linelen(line + len, size - len);
1597 if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))
1598 continue;
1600 /* Ok, we'll consider it a patch */
1601 if (parse_traditional_patch(state, line, line+len, patch))
1602 return -128;
1603 *hdrsize = len + nextlen;
1604 state->linenr += 2;
1605 return offset;
1607 return -1;
1610 static void record_ws_error(struct apply_state *state,
1611 unsigned result,
1612 const char *line,
1613 int len,
1614 int linenr)
1616 char *err;
1618 if (!result)
1619 return;
1621 state->whitespace_error++;
1622 if (state->squelch_whitespace_errors &&
1623 state->squelch_whitespace_errors < state->whitespace_error)
1624 return;
1626 err = whitespace_error_string(result);
1627 if (state->apply_verbosity > verbosity_silent)
1628 fprintf(stderr, "%s:%d: %s.\n%.*s\n",
1629 state->patch_input_file, linenr, err, len, line);
1630 free(err);
1633 static void check_whitespace(struct apply_state *state,
1634 const char *line,
1635 int len,
1636 unsigned ws_rule)
1638 unsigned result = ws_check(line + 1, len - 1, ws_rule);
1640 record_ws_error(state, result, line + 1, len - 2, state->linenr);
1644 * Parse a unified diff. Note that this really needs to parse each
1645 * fragment separately, since the only way to know the difference
1646 * between a "---" that is part of a patch, and a "---" that starts
1647 * the next patch is to look at the line counts..
1649 static int parse_fragment(struct apply_state *state,
1650 const char *line,
1651 unsigned long size,
1652 struct patch *patch,
1653 struct fragment *fragment)
1655 int added, deleted;
1656 int len = linelen(line, size), offset;
1657 unsigned long oldlines, newlines;
1658 unsigned long leading, trailing;
1660 offset = parse_fragment_header(line, len, fragment);
1661 if (offset < 0)
1662 return -1;
1663 if (offset > 0 && patch->recount)
1664 recount_diff(line + offset, size - offset, fragment);
1665 oldlines = fragment->oldlines;
1666 newlines = fragment->newlines;
1667 leading = 0;
1668 trailing = 0;
1670 /* Parse the thing.. */
1671 line += len;
1672 size -= len;
1673 state->linenr++;
1674 added = deleted = 0;
1675 for (offset = len;
1676 0 < size;
1677 offset += len, size -= len, line += len, state->linenr++) {
1678 if (!oldlines && !newlines)
1679 break;
1680 len = linelen(line, size);
1681 if (!len || line[len-1] != '\n')
1682 return -1;
1683 switch (*line) {
1684 default:
1685 return -1;
1686 case '\n': /* newer GNU diff, an empty context line */
1687 case ' ':
1688 oldlines--;
1689 newlines--;
1690 if (!deleted && !added)
1691 leading++;
1692 trailing++;
1693 if (!state->apply_in_reverse &&
1694 state->ws_error_action == correct_ws_error)
1695 check_whitespace(state, line, len, patch->ws_rule);
1696 break;
1697 case '-':
1698 if (state->apply_in_reverse &&
1699 state->ws_error_action != nowarn_ws_error)
1700 check_whitespace(state, line, len, patch->ws_rule);
1701 deleted++;
1702 oldlines--;
1703 trailing = 0;
1704 break;
1705 case '+':
1706 if (!state->apply_in_reverse &&
1707 state->ws_error_action != nowarn_ws_error)
1708 check_whitespace(state, line, len, patch->ws_rule);
1709 added++;
1710 newlines--;
1711 trailing = 0;
1712 break;
1715 * We allow "\ No newline at end of file". Depending
1716 * on locale settings when the patch was produced we
1717 * don't know what this line looks like. The only
1718 * thing we do know is that it begins with "\ ".
1719 * Checking for 12 is just for sanity check -- any
1720 * l10n of "\ No newline..." is at least that long.
1722 case '\\':
1723 if (len < 12 || memcmp(line, "\\ ", 2))
1724 return -1;
1725 break;
1728 if (oldlines || newlines)
1729 return -1;
1730 if (!deleted && !added)
1731 return -1;
1733 fragment->leading = leading;
1734 fragment->trailing = trailing;
1737 * If a fragment ends with an incomplete line, we failed to include
1738 * it in the above loop because we hit oldlines == newlines == 0
1739 * before seeing it.
1741 if (12 < size && !memcmp(line, "\\ ", 2))
1742 offset += linelen(line, size);
1744 patch->lines_added += added;
1745 patch->lines_deleted += deleted;
1747 if (0 < patch->is_new && oldlines)
1748 return error(_("new file depends on old contents"));
1749 if (0 < patch->is_delete && newlines)
1750 return error(_("deleted file still has contents"));
1751 return offset;
1755 * We have seen "diff --git a/... b/..." header (or a traditional patch
1756 * header). Read hunks that belong to this patch into fragments and hang
1757 * them to the given patch structure.
1759 * The (fragment->patch, fragment->size) pair points into the memory given
1760 * by the caller, not a copy, when we return.
1762 * Returns:
1763 * -1 in case of error,
1764 * the number of bytes in the patch otherwise.
1766 static int parse_single_patch(struct apply_state *state,
1767 const char *line,
1768 unsigned long size,
1769 struct patch *patch)
1771 unsigned long offset = 0;
1772 unsigned long oldlines = 0, newlines = 0, context = 0;
1773 struct fragment **fragp = &patch->fragments;
1775 while (size > 4 && !memcmp(line, "@@ -", 4)) {
1776 struct fragment *fragment;
1777 int len;
1779 fragment = xcalloc(1, sizeof(*fragment));
1780 fragment->linenr = state->linenr;
1781 len = parse_fragment(state, line, size, patch, fragment);
1782 if (len <= 0) {
1783 free(fragment);
1784 return error(_("corrupt patch at line %d"), state->linenr);
1786 fragment->patch = line;
1787 fragment->size = len;
1788 oldlines += fragment->oldlines;
1789 newlines += fragment->newlines;
1790 context += fragment->leading + fragment->trailing;
1792 *fragp = fragment;
1793 fragp = &fragment->next;
1795 offset += len;
1796 line += len;
1797 size -= len;
1801 * If something was removed (i.e. we have old-lines) it cannot
1802 * be creation, and if something was added it cannot be
1803 * deletion. However, the reverse is not true; --unified=0
1804 * patches that only add are not necessarily creation even
1805 * though they do not have any old lines, and ones that only
1806 * delete are not necessarily deletion.
1808 * Unfortunately, a real creation/deletion patch do _not_ have
1809 * any context line by definition, so we cannot safely tell it
1810 * apart with --unified=0 insanity. At least if the patch has
1811 * more than one hunk it is not creation or deletion.
1813 if (patch->is_new < 0 &&
1814 (oldlines || (patch->fragments && patch->fragments->next)))
1815 patch->is_new = 0;
1816 if (patch->is_delete < 0 &&
1817 (newlines || (patch->fragments && patch->fragments->next)))
1818 patch->is_delete = 0;
1820 if (0 < patch->is_new && oldlines)
1821 return error(_("new file %s depends on old contents"), patch->new_name);
1822 if (0 < patch->is_delete && newlines)
1823 return error(_("deleted file %s still has contents"), patch->old_name);
1824 if (!patch->is_delete && !newlines && context && state->apply_verbosity > verbosity_silent)
1825 fprintf_ln(stderr,
1826 _("** warning: "
1827 "file %s becomes empty but is not deleted"),
1828 patch->new_name);
1830 return offset;
1833 static inline int metadata_changes(struct patch *patch)
1835 return patch->is_rename > 0 ||
1836 patch->is_copy > 0 ||
1837 patch->is_new > 0 ||
1838 patch->is_delete ||
1839 (patch->old_mode && patch->new_mode &&
1840 patch->old_mode != patch->new_mode);
1843 static char *inflate_it(const void *data, unsigned long size,
1844 unsigned long inflated_size)
1846 git_zstream stream;
1847 void *out;
1848 int st;
1850 memset(&stream, 0, sizeof(stream));
1852 stream.next_in = (unsigned char *)data;
1853 stream.avail_in = size;
1854 stream.next_out = out = xmalloc(inflated_size);
1855 stream.avail_out = inflated_size;
1856 git_inflate_init(&stream);
1857 st = git_inflate(&stream, Z_FINISH);
1858 git_inflate_end(&stream);
1859 if ((st != Z_STREAM_END) || stream.total_out != inflated_size) {
1860 free(out);
1861 return NULL;
1863 return out;
1867 * Read a binary hunk and return a new fragment; fragment->patch
1868 * points at an allocated memory that the caller must free, so
1869 * it is marked as "->free_patch = 1".
1871 static struct fragment *parse_binary_hunk(struct apply_state *state,
1872 char **buf_p,
1873 unsigned long *sz_p,
1874 int *status_p,
1875 int *used_p)
1878 * Expect a line that begins with binary patch method ("literal"
1879 * or "delta"), followed by the length of data before deflating.
1880 * a sequence of 'length-byte' followed by base-85 encoded data
1881 * should follow, terminated by a newline.
1883 * Each 5-byte sequence of base-85 encodes up to 4 bytes,
1884 * and we would limit the patch line to 66 characters,
1885 * so one line can fit up to 13 groups that would decode
1886 * to 52 bytes max. The length byte 'A'-'Z' corresponds
1887 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
1889 int llen, used;
1890 unsigned long size = *sz_p;
1891 char *buffer = *buf_p;
1892 int patch_method;
1893 unsigned long origlen;
1894 char *data = NULL;
1895 int hunk_size = 0;
1896 struct fragment *frag;
1898 llen = linelen(buffer, size);
1899 used = llen;
1901 *status_p = 0;
1903 if (starts_with(buffer, "delta ")) {
1904 patch_method = BINARY_DELTA_DEFLATED;
1905 origlen = strtoul(buffer + 6, NULL, 10);
1907 else if (starts_with(buffer, "literal ")) {
1908 patch_method = BINARY_LITERAL_DEFLATED;
1909 origlen = strtoul(buffer + 8, NULL, 10);
1911 else
1912 return NULL;
1914 state->linenr++;
1915 buffer += llen;
1916 while (1) {
1917 int byte_length, max_byte_length, newsize;
1918 llen = linelen(buffer, size);
1919 used += llen;
1920 state->linenr++;
1921 if (llen == 1) {
1922 /* consume the blank line */
1923 buffer++;
1924 size--;
1925 break;
1928 * Minimum line is "A00000\n" which is 7-byte long,
1929 * and the line length must be multiple of 5 plus 2.
1931 if ((llen < 7) || (llen-2) % 5)
1932 goto corrupt;
1933 max_byte_length = (llen - 2) / 5 * 4;
1934 byte_length = *buffer;
1935 if ('A' <= byte_length && byte_length <= 'Z')
1936 byte_length = byte_length - 'A' + 1;
1937 else if ('a' <= byte_length && byte_length <= 'z')
1938 byte_length = byte_length - 'a' + 27;
1939 else
1940 goto corrupt;
1941 /* if the input length was not multiple of 4, we would
1942 * have filler at the end but the filler should never
1943 * exceed 3 bytes
1945 if (max_byte_length < byte_length ||
1946 byte_length <= max_byte_length - 4)
1947 goto corrupt;
1948 newsize = hunk_size + byte_length;
1949 data = xrealloc(data, newsize);
1950 if (decode_85(data + hunk_size, buffer + 1, byte_length))
1951 goto corrupt;
1952 hunk_size = newsize;
1953 buffer += llen;
1954 size -= llen;
1957 frag = xcalloc(1, sizeof(*frag));
1958 frag->patch = inflate_it(data, hunk_size, origlen);
1959 frag->free_patch = 1;
1960 if (!frag->patch)
1961 goto corrupt;
1962 free(data);
1963 frag->size = origlen;
1964 *buf_p = buffer;
1965 *sz_p = size;
1966 *used_p = used;
1967 frag->binary_patch_method = patch_method;
1968 return frag;
1970 corrupt:
1971 free(data);
1972 *status_p = -1;
1973 error(_("corrupt binary patch at line %d: %.*s"),
1974 state->linenr-1, llen-1, buffer);
1975 return NULL;
1979 * Returns:
1980 * -1 in case of error,
1981 * the length of the parsed binary patch otherwise
1983 static int parse_binary(struct apply_state *state,
1984 char *buffer,
1985 unsigned long size,
1986 struct patch *patch)
1989 * We have read "GIT binary patch\n"; what follows is a line
1990 * that says the patch method (currently, either "literal" or
1991 * "delta") and the length of data before deflating; a
1992 * sequence of 'length-byte' followed by base-85 encoded data
1993 * follows.
1995 * When a binary patch is reversible, there is another binary
1996 * hunk in the same format, starting with patch method (either
1997 * "literal" or "delta") with the length of data, and a sequence
1998 * of length-byte + base-85 encoded data, terminated with another
1999 * empty line. This data, when applied to the postimage, produces
2000 * the preimage.
2002 struct fragment *forward;
2003 struct fragment *reverse;
2004 int status;
2005 int used, used_1;
2007 forward = parse_binary_hunk(state, &buffer, &size, &status, &used);
2008 if (!forward && !status)
2009 /* there has to be one hunk (forward hunk) */
2010 return error(_("unrecognized binary patch at line %d"), state->linenr-1);
2011 if (status)
2012 /* otherwise we already gave an error message */
2013 return status;
2015 reverse = parse_binary_hunk(state, &buffer, &size, &status, &used_1);
2016 if (reverse)
2017 used += used_1;
2018 else if (status) {
2020 * Not having reverse hunk is not an error, but having
2021 * a corrupt reverse hunk is.
2023 free((void*) forward->patch);
2024 free(forward);
2025 return status;
2027 forward->next = reverse;
2028 patch->fragments = forward;
2029 patch->is_binary = 1;
2030 return used;
2033 static void prefix_one(struct apply_state *state, char **name)
2035 char *old_name = *name;
2036 if (!old_name)
2037 return;
2038 *name = prefix_filename(state->prefix, *name);
2039 free(old_name);
2042 static void prefix_patch(struct apply_state *state, struct patch *p)
2044 if (!state->prefix || p->is_toplevel_relative)
2045 return;
2046 prefix_one(state, &p->new_name);
2047 prefix_one(state, &p->old_name);
2051 * include/exclude
2054 static void add_name_limit(struct apply_state *state,
2055 const char *name,
2056 int exclude)
2058 struct string_list_item *it;
2060 it = string_list_append(&state->limit_by_name, name);
2061 it->util = exclude ? NULL : (void *) 1;
2064 static int use_patch(struct apply_state *state, struct patch *p)
2066 const char *pathname = p->new_name ? p->new_name : p->old_name;
2067 int i;
2069 /* Paths outside are not touched regardless of "--include" */
2070 if (0 < state->prefix_length) {
2071 int pathlen = strlen(pathname);
2072 if (pathlen <= state->prefix_length ||
2073 memcmp(state->prefix, pathname, state->prefix_length))
2074 return 0;
2077 /* See if it matches any of exclude/include rule */
2078 for (i = 0; i < state->limit_by_name.nr; i++) {
2079 struct string_list_item *it = &state->limit_by_name.items[i];
2080 if (!wildmatch(it->string, pathname, 0))
2081 return (it->util != NULL);
2085 * If we had any include, a path that does not match any rule is
2086 * not used. Otherwise, we saw bunch of exclude rules (or none)
2087 * and such a path is used.
2089 return !state->has_include;
2093 * Read the patch text in "buffer" that extends for "size" bytes; stop
2094 * reading after seeing a single patch (i.e. changes to a single file).
2095 * Create fragments (i.e. patch hunks) and hang them to the given patch.
2097 * Returns:
2098 * -1 if no header was found or parse_binary() failed,
2099 * -128 on another error,
2100 * the number of bytes consumed otherwise,
2101 * so that the caller can call us again for the next patch.
2103 static int parse_chunk(struct apply_state *state, char *buffer, unsigned long size, struct patch *patch)
2105 int hdrsize, patchsize;
2106 int offset = find_header(state, buffer, size, &hdrsize, patch);
2108 if (offset < 0)
2109 return offset;
2111 prefix_patch(state, patch);
2113 if (!use_patch(state, patch))
2114 patch->ws_rule = 0;
2115 else
2116 patch->ws_rule = whitespace_rule(patch->new_name
2117 ? patch->new_name
2118 : patch->old_name);
2120 patchsize = parse_single_patch(state,
2121 buffer + offset + hdrsize,
2122 size - offset - hdrsize,
2123 patch);
2125 if (patchsize < 0)
2126 return -128;
2128 if (!patchsize) {
2129 static const char git_binary[] = "GIT binary patch\n";
2130 int hd = hdrsize + offset;
2131 unsigned long llen = linelen(buffer + hd, size - hd);
2133 if (llen == sizeof(git_binary) - 1 &&
2134 !memcmp(git_binary, buffer + hd, llen)) {
2135 int used;
2136 state->linenr++;
2137 used = parse_binary(state, buffer + hd + llen,
2138 size - hd - llen, patch);
2139 if (used < 0)
2140 return -1;
2141 if (used)
2142 patchsize = used + llen;
2143 else
2144 patchsize = 0;
2146 else if (!memcmp(" differ\n", buffer + hd + llen - 8, 8)) {
2147 static const char *binhdr[] = {
2148 "Binary files ",
2149 "Files ",
2150 NULL,
2152 int i;
2153 for (i = 0; binhdr[i]; i++) {
2154 int len = strlen(binhdr[i]);
2155 if (len < size - hd &&
2156 !memcmp(binhdr[i], buffer + hd, len)) {
2157 state->linenr++;
2158 patch->is_binary = 1;
2159 patchsize = llen;
2160 break;
2165 /* Empty patch cannot be applied if it is a text patch
2166 * without metadata change. A binary patch appears
2167 * empty to us here.
2169 if ((state->apply || state->check) &&
2170 (!patch->is_binary && !metadata_changes(patch))) {
2171 error(_("patch with only garbage at line %d"), state->linenr);
2172 return -128;
2176 return offset + hdrsize + patchsize;
2179 static void reverse_patches(struct patch *p)
2181 for (; p; p = p->next) {
2182 struct fragment *frag = p->fragments;
2184 SWAP(p->new_name, p->old_name);
2185 SWAP(p->new_mode, p->old_mode);
2186 SWAP(p->is_new, p->is_delete);
2187 SWAP(p->lines_added, p->lines_deleted);
2188 SWAP(p->old_sha1_prefix, p->new_sha1_prefix);
2190 for (; frag; frag = frag->next) {
2191 SWAP(frag->newpos, frag->oldpos);
2192 SWAP(frag->newlines, frag->oldlines);
2197 static const char pluses[] =
2198 "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
2199 static const char minuses[]=
2200 "----------------------------------------------------------------------";
2202 static void show_stats(struct apply_state *state, struct patch *patch)
2204 struct strbuf qname = STRBUF_INIT;
2205 char *cp = patch->new_name ? patch->new_name : patch->old_name;
2206 int max, add, del;
2208 quote_c_style(cp, &qname, NULL, 0);
2211 * "scale" the filename
2213 max = state->max_len;
2214 if (max > 50)
2215 max = 50;
2217 if (qname.len > max) {
2218 cp = strchr(qname.buf + qname.len + 3 - max, '/');
2219 if (!cp)
2220 cp = qname.buf + qname.len + 3 - max;
2221 strbuf_splice(&qname, 0, cp - qname.buf, "...", 3);
2224 if (patch->is_binary) {
2225 printf(" %-*s | Bin\n", max, qname.buf);
2226 strbuf_release(&qname);
2227 return;
2230 printf(" %-*s |", max, qname.buf);
2231 strbuf_release(&qname);
2234 * scale the add/delete
2236 max = max + state->max_change > 70 ? 70 - max : state->max_change;
2237 add = patch->lines_added;
2238 del = patch->lines_deleted;
2240 if (state->max_change > 0) {
2241 int total = ((add + del) * max + state->max_change / 2) / state->max_change;
2242 add = (add * max + state->max_change / 2) / state->max_change;
2243 del = total - add;
2245 printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,
2246 add, pluses, del, minuses);
2249 static int read_old_data(struct stat *st, const char *path, struct strbuf *buf)
2251 switch (st->st_mode & S_IFMT) {
2252 case S_IFLNK:
2253 if (strbuf_readlink(buf, path, st->st_size) < 0)
2254 return error(_("unable to read symlink %s"), path);
2255 return 0;
2256 case S_IFREG:
2257 if (strbuf_read_file(buf, path, st->st_size) != st->st_size)
2258 return error(_("unable to open or read %s"), path);
2259 convert_to_git(path, buf->buf, buf->len, buf, 0);
2260 return 0;
2261 default:
2262 return -1;
2267 * Update the preimage, and the common lines in postimage,
2268 * from buffer buf of length len. If postlen is 0 the postimage
2269 * is updated in place, otherwise it's updated on a new buffer
2270 * of length postlen
2273 static void update_pre_post_images(struct image *preimage,
2274 struct image *postimage,
2275 char *buf,
2276 size_t len, size_t postlen)
2278 int i, ctx, reduced;
2279 char *new, *old, *fixed;
2280 struct image fixed_preimage;
2283 * Update the preimage with whitespace fixes. Note that we
2284 * are not losing preimage->buf -- apply_one_fragment() will
2285 * free "oldlines".
2287 prepare_image(&fixed_preimage, buf, len, 1);
2288 assert(postlen
2289 ? fixed_preimage.nr == preimage->nr
2290 : fixed_preimage.nr <= preimage->nr);
2291 for (i = 0; i < fixed_preimage.nr; i++)
2292 fixed_preimage.line[i].flag = preimage->line[i].flag;
2293 free(preimage->line_allocated);
2294 *preimage = fixed_preimage;
2297 * Adjust the common context lines in postimage. This can be
2298 * done in-place when we are shrinking it with whitespace
2299 * fixing, but needs a new buffer when ignoring whitespace or
2300 * expanding leading tabs to spaces.
2302 * We trust the caller to tell us if the update can be done
2303 * in place (postlen==0) or not.
2305 old = postimage->buf;
2306 if (postlen)
2307 new = postimage->buf = xmalloc(postlen);
2308 else
2309 new = old;
2310 fixed = preimage->buf;
2312 for (i = reduced = ctx = 0; i < postimage->nr; i++) {
2313 size_t l_len = postimage->line[i].len;
2314 if (!(postimage->line[i].flag & LINE_COMMON)) {
2315 /* an added line -- no counterparts in preimage */
2316 memmove(new, old, l_len);
2317 old += l_len;
2318 new += l_len;
2319 continue;
2322 /* a common context -- skip it in the original postimage */
2323 old += l_len;
2325 /* and find the corresponding one in the fixed preimage */
2326 while (ctx < preimage->nr &&
2327 !(preimage->line[ctx].flag & LINE_COMMON)) {
2328 fixed += preimage->line[ctx].len;
2329 ctx++;
2333 * preimage is expected to run out, if the caller
2334 * fixed addition of trailing blank lines.
2336 if (preimage->nr <= ctx) {
2337 reduced++;
2338 continue;
2341 /* and copy it in, while fixing the line length */
2342 l_len = preimage->line[ctx].len;
2343 memcpy(new, fixed, l_len);
2344 new += l_len;
2345 fixed += l_len;
2346 postimage->line[i].len = l_len;
2347 ctx++;
2350 if (postlen
2351 ? postlen < new - postimage->buf
2352 : postimage->len < new - postimage->buf)
2353 die("BUG: caller miscounted postlen: asked %d, orig = %d, used = %d",
2354 (int)postlen, (int) postimage->len, (int)(new - postimage->buf));
2356 /* Fix the length of the whole thing */
2357 postimage->len = new - postimage->buf;
2358 postimage->nr -= reduced;
2361 static int line_by_line_fuzzy_match(struct image *img,
2362 struct image *preimage,
2363 struct image *postimage,
2364 unsigned long try,
2365 int try_lno,
2366 int preimage_limit)
2368 int i;
2369 size_t imgoff = 0;
2370 size_t preoff = 0;
2371 size_t postlen = postimage->len;
2372 size_t extra_chars;
2373 char *buf;
2374 char *preimage_eof;
2375 char *preimage_end;
2376 struct strbuf fixed;
2377 char *fixed_buf;
2378 size_t fixed_len;
2380 for (i = 0; i < preimage_limit; i++) {
2381 size_t prelen = preimage->line[i].len;
2382 size_t imglen = img->line[try_lno+i].len;
2384 if (!fuzzy_matchlines(img->buf + try + imgoff, imglen,
2385 preimage->buf + preoff, prelen))
2386 return 0;
2387 if (preimage->line[i].flag & LINE_COMMON)
2388 postlen += imglen - prelen;
2389 imgoff += imglen;
2390 preoff += prelen;
2394 * Ok, the preimage matches with whitespace fuzz.
2396 * imgoff now holds the true length of the target that
2397 * matches the preimage before the end of the file.
2399 * Count the number of characters in the preimage that fall
2400 * beyond the end of the file and make sure that all of them
2401 * are whitespace characters. (This can only happen if
2402 * we are removing blank lines at the end of the file.)
2404 buf = preimage_eof = preimage->buf + preoff;
2405 for ( ; i < preimage->nr; i++)
2406 preoff += preimage->line[i].len;
2407 preimage_end = preimage->buf + preoff;
2408 for ( ; buf < preimage_end; buf++)
2409 if (!isspace(*buf))
2410 return 0;
2413 * Update the preimage and the common postimage context
2414 * lines to use the same whitespace as the target.
2415 * If whitespace is missing in the target (i.e.
2416 * if the preimage extends beyond the end of the file),
2417 * use the whitespace from the preimage.
2419 extra_chars = preimage_end - preimage_eof;
2420 strbuf_init(&fixed, imgoff + extra_chars);
2421 strbuf_add(&fixed, img->buf + try, imgoff);
2422 strbuf_add(&fixed, preimage_eof, extra_chars);
2423 fixed_buf = strbuf_detach(&fixed, &fixed_len);
2424 update_pre_post_images(preimage, postimage,
2425 fixed_buf, fixed_len, postlen);
2426 return 1;
2429 static int match_fragment(struct apply_state *state,
2430 struct image *img,
2431 struct image *preimage,
2432 struct image *postimage,
2433 unsigned long try,
2434 int try_lno,
2435 unsigned ws_rule,
2436 int match_beginning, int match_end)
2438 int i;
2439 char *fixed_buf, *buf, *orig, *target;
2440 struct strbuf fixed;
2441 size_t fixed_len, postlen;
2442 int preimage_limit;
2444 if (preimage->nr + try_lno <= img->nr) {
2446 * The hunk falls within the boundaries of img.
2448 preimage_limit = preimage->nr;
2449 if (match_end && (preimage->nr + try_lno != img->nr))
2450 return 0;
2451 } else if (state->ws_error_action == correct_ws_error &&
2452 (ws_rule & WS_BLANK_AT_EOF)) {
2454 * This hunk extends beyond the end of img, and we are
2455 * removing blank lines at the end of the file. This
2456 * many lines from the beginning of the preimage must
2457 * match with img, and the remainder of the preimage
2458 * must be blank.
2460 preimage_limit = img->nr - try_lno;
2461 } else {
2463 * The hunk extends beyond the end of the img and
2464 * we are not removing blanks at the end, so we
2465 * should reject the hunk at this position.
2467 return 0;
2470 if (match_beginning && try_lno)
2471 return 0;
2473 /* Quick hash check */
2474 for (i = 0; i < preimage_limit; i++)
2475 if ((img->line[try_lno + i].flag & LINE_PATCHED) ||
2476 (preimage->line[i].hash != img->line[try_lno + i].hash))
2477 return 0;
2479 if (preimage_limit == preimage->nr) {
2481 * Do we have an exact match? If we were told to match
2482 * at the end, size must be exactly at try+fragsize,
2483 * otherwise try+fragsize must be still within the preimage,
2484 * and either case, the old piece should match the preimage
2485 * exactly.
2487 if ((match_end
2488 ? (try + preimage->len == img->len)
2489 : (try + preimage->len <= img->len)) &&
2490 !memcmp(img->buf + try, preimage->buf, preimage->len))
2491 return 1;
2492 } else {
2494 * The preimage extends beyond the end of img, so
2495 * there cannot be an exact match.
2497 * There must be one non-blank context line that match
2498 * a line before the end of img.
2500 char *buf_end;
2502 buf = preimage->buf;
2503 buf_end = buf;
2504 for (i = 0; i < preimage_limit; i++)
2505 buf_end += preimage->line[i].len;
2507 for ( ; buf < buf_end; buf++)
2508 if (!isspace(*buf))
2509 break;
2510 if (buf == buf_end)
2511 return 0;
2515 * No exact match. If we are ignoring whitespace, run a line-by-line
2516 * fuzzy matching. We collect all the line length information because
2517 * we need it to adjust whitespace if we match.
2519 if (state->ws_ignore_action == ignore_ws_change)
2520 return line_by_line_fuzzy_match(img, preimage, postimage,
2521 try, try_lno, preimage_limit);
2523 if (state->ws_error_action != correct_ws_error)
2524 return 0;
2527 * The hunk does not apply byte-by-byte, but the hash says
2528 * it might with whitespace fuzz. We weren't asked to
2529 * ignore whitespace, we were asked to correct whitespace
2530 * errors, so let's try matching after whitespace correction.
2532 * While checking the preimage against the target, whitespace
2533 * errors in both fixed, we count how large the corresponding
2534 * postimage needs to be. The postimage prepared by
2535 * apply_one_fragment() has whitespace errors fixed on added
2536 * lines already, but the common lines were propagated as-is,
2537 * which may become longer when their whitespace errors are
2538 * fixed.
2541 /* First count added lines in postimage */
2542 postlen = 0;
2543 for (i = 0; i < postimage->nr; i++) {
2544 if (!(postimage->line[i].flag & LINE_COMMON))
2545 postlen += postimage->line[i].len;
2549 * The preimage may extend beyond the end of the file,
2550 * but in this loop we will only handle the part of the
2551 * preimage that falls within the file.
2553 strbuf_init(&fixed, preimage->len + 1);
2554 orig = preimage->buf;
2555 target = img->buf + try;
2556 for (i = 0; i < preimage_limit; i++) {
2557 size_t oldlen = preimage->line[i].len;
2558 size_t tgtlen = img->line[try_lno + i].len;
2559 size_t fixstart = fixed.len;
2560 struct strbuf tgtfix;
2561 int match;
2563 /* Try fixing the line in the preimage */
2564 ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);
2566 /* Try fixing the line in the target */
2567 strbuf_init(&tgtfix, tgtlen);
2568 ws_fix_copy(&tgtfix, target, tgtlen, ws_rule, NULL);
2571 * If they match, either the preimage was based on
2572 * a version before our tree fixed whitespace breakage,
2573 * or we are lacking a whitespace-fix patch the tree
2574 * the preimage was based on already had (i.e. target
2575 * has whitespace breakage, the preimage doesn't).
2576 * In either case, we are fixing the whitespace breakages
2577 * so we might as well take the fix together with their
2578 * real change.
2580 match = (tgtfix.len == fixed.len - fixstart &&
2581 !memcmp(tgtfix.buf, fixed.buf + fixstart,
2582 fixed.len - fixstart));
2584 /* Add the length if this is common with the postimage */
2585 if (preimage->line[i].flag & LINE_COMMON)
2586 postlen += tgtfix.len;
2588 strbuf_release(&tgtfix);
2589 if (!match)
2590 goto unmatch_exit;
2592 orig += oldlen;
2593 target += tgtlen;
2598 * Now handle the lines in the preimage that falls beyond the
2599 * end of the file (if any). They will only match if they are
2600 * empty or only contain whitespace (if WS_BLANK_AT_EOL is
2601 * false).
2603 for ( ; i < preimage->nr; i++) {
2604 size_t fixstart = fixed.len; /* start of the fixed preimage */
2605 size_t oldlen = preimage->line[i].len;
2606 int j;
2608 /* Try fixing the line in the preimage */
2609 ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);
2611 for (j = fixstart; j < fixed.len; j++)
2612 if (!isspace(fixed.buf[j]))
2613 goto unmatch_exit;
2615 orig += oldlen;
2619 * Yes, the preimage is based on an older version that still
2620 * has whitespace breakages unfixed, and fixing them makes the
2621 * hunk match. Update the context lines in the postimage.
2623 fixed_buf = strbuf_detach(&fixed, &fixed_len);
2624 if (postlen < postimage->len)
2625 postlen = 0;
2626 update_pre_post_images(preimage, postimage,
2627 fixed_buf, fixed_len, postlen);
2628 return 1;
2630 unmatch_exit:
2631 strbuf_release(&fixed);
2632 return 0;
2635 static int find_pos(struct apply_state *state,
2636 struct image *img,
2637 struct image *preimage,
2638 struct image *postimage,
2639 int line,
2640 unsigned ws_rule,
2641 int match_beginning, int match_end)
2643 int i;
2644 unsigned long backwards, forwards, try;
2645 int backwards_lno, forwards_lno, try_lno;
2648 * If match_beginning or match_end is specified, there is no
2649 * point starting from a wrong line that will never match and
2650 * wander around and wait for a match at the specified end.
2652 if (match_beginning)
2653 line = 0;
2654 else if (match_end)
2655 line = img->nr - preimage->nr;
2658 * Because the comparison is unsigned, the following test
2659 * will also take care of a negative line number that can
2660 * result when match_end and preimage is larger than the target.
2662 if ((size_t) line > img->nr)
2663 line = img->nr;
2665 try = 0;
2666 for (i = 0; i < line; i++)
2667 try += img->line[i].len;
2670 * There's probably some smart way to do this, but I'll leave
2671 * that to the smart and beautiful people. I'm simple and stupid.
2673 backwards = try;
2674 backwards_lno = line;
2675 forwards = try;
2676 forwards_lno = line;
2677 try_lno = line;
2679 for (i = 0; ; i++) {
2680 if (match_fragment(state, img, preimage, postimage,
2681 try, try_lno, ws_rule,
2682 match_beginning, match_end))
2683 return try_lno;
2685 again:
2686 if (backwards_lno == 0 && forwards_lno == img->nr)
2687 break;
2689 if (i & 1) {
2690 if (backwards_lno == 0) {
2691 i++;
2692 goto again;
2694 backwards_lno--;
2695 backwards -= img->line[backwards_lno].len;
2696 try = backwards;
2697 try_lno = backwards_lno;
2698 } else {
2699 if (forwards_lno == img->nr) {
2700 i++;
2701 goto again;
2703 forwards += img->line[forwards_lno].len;
2704 forwards_lno++;
2705 try = forwards;
2706 try_lno = forwards_lno;
2710 return -1;
2713 static void remove_first_line(struct image *img)
2715 img->buf += img->line[0].len;
2716 img->len -= img->line[0].len;
2717 img->line++;
2718 img->nr--;
2721 static void remove_last_line(struct image *img)
2723 img->len -= img->line[--img->nr].len;
2727 * The change from "preimage" and "postimage" has been found to
2728 * apply at applied_pos (counts in line numbers) in "img".
2729 * Update "img" to remove "preimage" and replace it with "postimage".
2731 static void update_image(struct apply_state *state,
2732 struct image *img,
2733 int applied_pos,
2734 struct image *preimage,
2735 struct image *postimage)
2738 * remove the copy of preimage at offset in img
2739 * and replace it with postimage
2741 int i, nr;
2742 size_t remove_count, insert_count, applied_at = 0;
2743 char *result;
2744 int preimage_limit;
2747 * If we are removing blank lines at the end of img,
2748 * the preimage may extend beyond the end.
2749 * If that is the case, we must be careful only to
2750 * remove the part of the preimage that falls within
2751 * the boundaries of img. Initialize preimage_limit
2752 * to the number of lines in the preimage that falls
2753 * within the boundaries.
2755 preimage_limit = preimage->nr;
2756 if (preimage_limit > img->nr - applied_pos)
2757 preimage_limit = img->nr - applied_pos;
2759 for (i = 0; i < applied_pos; i++)
2760 applied_at += img->line[i].len;
2762 remove_count = 0;
2763 for (i = 0; i < preimage_limit; i++)
2764 remove_count += img->line[applied_pos + i].len;
2765 insert_count = postimage->len;
2767 /* Adjust the contents */
2768 result = xmalloc(st_add3(st_sub(img->len, remove_count), insert_count, 1));
2769 memcpy(result, img->buf, applied_at);
2770 memcpy(result + applied_at, postimage->buf, postimage->len);
2771 memcpy(result + applied_at + postimage->len,
2772 img->buf + (applied_at + remove_count),
2773 img->len - (applied_at + remove_count));
2774 free(img->buf);
2775 img->buf = result;
2776 img->len += insert_count - remove_count;
2777 result[img->len] = '\0';
2779 /* Adjust the line table */
2780 nr = img->nr + postimage->nr - preimage_limit;
2781 if (preimage_limit < postimage->nr) {
2783 * NOTE: this knows that we never call remove_first_line()
2784 * on anything other than pre/post image.
2786 REALLOC_ARRAY(img->line, nr);
2787 img->line_allocated = img->line;
2789 if (preimage_limit != postimage->nr)
2790 memmove(img->line + applied_pos + postimage->nr,
2791 img->line + applied_pos + preimage_limit,
2792 (img->nr - (applied_pos + preimage_limit)) *
2793 sizeof(*img->line));
2794 memcpy(img->line + applied_pos,
2795 postimage->line,
2796 postimage->nr * sizeof(*img->line));
2797 if (!state->allow_overlap)
2798 for (i = 0; i < postimage->nr; i++)
2799 img->line[applied_pos + i].flag |= LINE_PATCHED;
2800 img->nr = nr;
2804 * Use the patch-hunk text in "frag" to prepare two images (preimage and
2805 * postimage) for the hunk. Find lines that match "preimage" in "img" and
2806 * replace the part of "img" with "postimage" text.
2808 static int apply_one_fragment(struct apply_state *state,
2809 struct image *img, struct fragment *frag,
2810 int inaccurate_eof, unsigned ws_rule,
2811 int nth_fragment)
2813 int match_beginning, match_end;
2814 const char *patch = frag->patch;
2815 int size = frag->size;
2816 char *old, *oldlines;
2817 struct strbuf newlines;
2818 int new_blank_lines_at_end = 0;
2819 int found_new_blank_lines_at_end = 0;
2820 int hunk_linenr = frag->linenr;
2821 unsigned long leading, trailing;
2822 int pos, applied_pos;
2823 struct image preimage;
2824 struct image postimage;
2826 memset(&preimage, 0, sizeof(preimage));
2827 memset(&postimage, 0, sizeof(postimage));
2828 oldlines = xmalloc(size);
2829 strbuf_init(&newlines, size);
2831 old = oldlines;
2832 while (size > 0) {
2833 char first;
2834 int len = linelen(patch, size);
2835 int plen;
2836 int added_blank_line = 0;
2837 int is_blank_context = 0;
2838 size_t start;
2840 if (!len)
2841 break;
2844 * "plen" is how much of the line we should use for
2845 * the actual patch data. Normally we just remove the
2846 * first character on the line, but if the line is
2847 * followed by "\ No newline", then we also remove the
2848 * last one (which is the newline, of course).
2850 plen = len - 1;
2851 if (len < size && patch[len] == '\\')
2852 plen--;
2853 first = *patch;
2854 if (state->apply_in_reverse) {
2855 if (first == '-')
2856 first = '+';
2857 else if (first == '+')
2858 first = '-';
2861 switch (first) {
2862 case '\n':
2863 /* Newer GNU diff, empty context line */
2864 if (plen < 0)
2865 /* ... followed by '\No newline'; nothing */
2866 break;
2867 *old++ = '\n';
2868 strbuf_addch(&newlines, '\n');
2869 add_line_info(&preimage, "\n", 1, LINE_COMMON);
2870 add_line_info(&postimage, "\n", 1, LINE_COMMON);
2871 is_blank_context = 1;
2872 break;
2873 case ' ':
2874 if (plen && (ws_rule & WS_BLANK_AT_EOF) &&
2875 ws_blank_line(patch + 1, plen, ws_rule))
2876 is_blank_context = 1;
2877 case '-':
2878 memcpy(old, patch + 1, plen);
2879 add_line_info(&preimage, old, plen,
2880 (first == ' ' ? LINE_COMMON : 0));
2881 old += plen;
2882 if (first == '-')
2883 break;
2884 /* Fall-through for ' ' */
2885 case '+':
2886 /* --no-add does not add new lines */
2887 if (first == '+' && state->no_add)
2888 break;
2890 start = newlines.len;
2891 if (first != '+' ||
2892 !state->whitespace_error ||
2893 state->ws_error_action != correct_ws_error) {
2894 strbuf_add(&newlines, patch + 1, plen);
2896 else {
2897 ws_fix_copy(&newlines, patch + 1, plen, ws_rule, &state->applied_after_fixing_ws);
2899 add_line_info(&postimage, newlines.buf + start, newlines.len - start,
2900 (first == '+' ? 0 : LINE_COMMON));
2901 if (first == '+' &&
2902 (ws_rule & WS_BLANK_AT_EOF) &&
2903 ws_blank_line(patch + 1, plen, ws_rule))
2904 added_blank_line = 1;
2905 break;
2906 case '@': case '\\':
2907 /* Ignore it, we already handled it */
2908 break;
2909 default:
2910 if (state->apply_verbosity > verbosity_normal)
2911 error(_("invalid start of line: '%c'"), first);
2912 applied_pos = -1;
2913 goto out;
2915 if (added_blank_line) {
2916 if (!new_blank_lines_at_end)
2917 found_new_blank_lines_at_end = hunk_linenr;
2918 new_blank_lines_at_end++;
2920 else if (is_blank_context)
2922 else
2923 new_blank_lines_at_end = 0;
2924 patch += len;
2925 size -= len;
2926 hunk_linenr++;
2928 if (inaccurate_eof &&
2929 old > oldlines && old[-1] == '\n' &&
2930 newlines.len > 0 && newlines.buf[newlines.len - 1] == '\n') {
2931 old--;
2932 strbuf_setlen(&newlines, newlines.len - 1);
2935 leading = frag->leading;
2936 trailing = frag->trailing;
2939 * A hunk to change lines at the beginning would begin with
2940 * @@ -1,L +N,M @@
2941 * but we need to be careful. -U0 that inserts before the second
2942 * line also has this pattern.
2944 * And a hunk to add to an empty file would begin with
2945 * @@ -0,0 +N,M @@
2947 * In other words, a hunk that is (frag->oldpos <= 1) with or
2948 * without leading context must match at the beginning.
2950 match_beginning = (!frag->oldpos ||
2951 (frag->oldpos == 1 && !state->unidiff_zero));
2954 * A hunk without trailing lines must match at the end.
2955 * However, we simply cannot tell if a hunk must match end
2956 * from the lack of trailing lines if the patch was generated
2957 * with unidiff without any context.
2959 match_end = !state->unidiff_zero && !trailing;
2961 pos = frag->newpos ? (frag->newpos - 1) : 0;
2962 preimage.buf = oldlines;
2963 preimage.len = old - oldlines;
2964 postimage.buf = newlines.buf;
2965 postimage.len = newlines.len;
2966 preimage.line = preimage.line_allocated;
2967 postimage.line = postimage.line_allocated;
2969 for (;;) {
2971 applied_pos = find_pos(state, img, &preimage, &postimage, pos,
2972 ws_rule, match_beginning, match_end);
2974 if (applied_pos >= 0)
2975 break;
2977 /* Am I at my context limits? */
2978 if ((leading <= state->p_context) && (trailing <= state->p_context))
2979 break;
2980 if (match_beginning || match_end) {
2981 match_beginning = match_end = 0;
2982 continue;
2986 * Reduce the number of context lines; reduce both
2987 * leading and trailing if they are equal otherwise
2988 * just reduce the larger context.
2990 if (leading >= trailing) {
2991 remove_first_line(&preimage);
2992 remove_first_line(&postimage);
2993 pos--;
2994 leading--;
2996 if (trailing > leading) {
2997 remove_last_line(&preimage);
2998 remove_last_line(&postimage);
2999 trailing--;
3003 if (applied_pos >= 0) {
3004 if (new_blank_lines_at_end &&
3005 preimage.nr + applied_pos >= img->nr &&
3006 (ws_rule & WS_BLANK_AT_EOF) &&
3007 state->ws_error_action != nowarn_ws_error) {
3008 record_ws_error(state, WS_BLANK_AT_EOF, "+", 1,
3009 found_new_blank_lines_at_end);
3010 if (state->ws_error_action == correct_ws_error) {
3011 while (new_blank_lines_at_end--)
3012 remove_last_line(&postimage);
3015 * We would want to prevent write_out_results()
3016 * from taking place in apply_patch() that follows
3017 * the callchain led us here, which is:
3018 * apply_patch->check_patch_list->check_patch->
3019 * apply_data->apply_fragments->apply_one_fragment
3021 if (state->ws_error_action == die_on_ws_error)
3022 state->apply = 0;
3025 if (state->apply_verbosity > verbosity_normal && applied_pos != pos) {
3026 int offset = applied_pos - pos;
3027 if (state->apply_in_reverse)
3028 offset = 0 - offset;
3029 fprintf_ln(stderr,
3030 Q_("Hunk #%d succeeded at %d (offset %d line).",
3031 "Hunk #%d succeeded at %d (offset %d lines).",
3032 offset),
3033 nth_fragment, applied_pos + 1, offset);
3037 * Warn if it was necessary to reduce the number
3038 * of context lines.
3040 if ((leading != frag->leading ||
3041 trailing != frag->trailing) && state->apply_verbosity > verbosity_silent)
3042 fprintf_ln(stderr, _("Context reduced to (%ld/%ld)"
3043 " to apply fragment at %d"),
3044 leading, trailing, applied_pos+1);
3045 update_image(state, img, applied_pos, &preimage, &postimage);
3046 } else {
3047 if (state->apply_verbosity > verbosity_normal)
3048 error(_("while searching for:\n%.*s"),
3049 (int)(old - oldlines), oldlines);
3052 out:
3053 free(oldlines);
3054 strbuf_release(&newlines);
3055 free(preimage.line_allocated);
3056 free(postimage.line_allocated);
3058 return (applied_pos < 0);
3061 static int apply_binary_fragment(struct apply_state *state,
3062 struct image *img,
3063 struct patch *patch)
3065 struct fragment *fragment = patch->fragments;
3066 unsigned long len;
3067 void *dst;
3069 if (!fragment)
3070 return error(_("missing binary patch data for '%s'"),
3071 patch->new_name ?
3072 patch->new_name :
3073 patch->old_name);
3075 /* Binary patch is irreversible without the optional second hunk */
3076 if (state->apply_in_reverse) {
3077 if (!fragment->next)
3078 return error(_("cannot reverse-apply a binary patch "
3079 "without the reverse hunk to '%s'"),
3080 patch->new_name
3081 ? patch->new_name : patch->old_name);
3082 fragment = fragment->next;
3084 switch (fragment->binary_patch_method) {
3085 case BINARY_DELTA_DEFLATED:
3086 dst = patch_delta(img->buf, img->len, fragment->patch,
3087 fragment->size, &len);
3088 if (!dst)
3089 return -1;
3090 clear_image(img);
3091 img->buf = dst;
3092 img->len = len;
3093 return 0;
3094 case BINARY_LITERAL_DEFLATED:
3095 clear_image(img);
3096 img->len = fragment->size;
3097 img->buf = xmemdupz(fragment->patch, img->len);
3098 return 0;
3100 return -1;
3104 * Replace "img" with the result of applying the binary patch.
3105 * The binary patch data itself in patch->fragment is still kept
3106 * but the preimage prepared by the caller in "img" is freed here
3107 * or in the helper function apply_binary_fragment() this calls.
3109 static int apply_binary(struct apply_state *state,
3110 struct image *img,
3111 struct patch *patch)
3113 const char *name = patch->old_name ? patch->old_name : patch->new_name;
3114 struct object_id oid;
3117 * For safety, we require patch index line to contain
3118 * full 40-byte textual SHA1 for old and new, at least for now.
3120 if (strlen(patch->old_sha1_prefix) != 40 ||
3121 strlen(patch->new_sha1_prefix) != 40 ||
3122 get_oid_hex(patch->old_sha1_prefix, &oid) ||
3123 get_oid_hex(patch->new_sha1_prefix, &oid))
3124 return error(_("cannot apply binary patch to '%s' "
3125 "without full index line"), name);
3127 if (patch->old_name) {
3129 * See if the old one matches what the patch
3130 * applies to.
3132 hash_sha1_file(img->buf, img->len, blob_type, oid.hash);
3133 if (strcmp(oid_to_hex(&oid), patch->old_sha1_prefix))
3134 return error(_("the patch applies to '%s' (%s), "
3135 "which does not match the "
3136 "current contents."),
3137 name, oid_to_hex(&oid));
3139 else {
3140 /* Otherwise, the old one must be empty. */
3141 if (img->len)
3142 return error(_("the patch applies to an empty "
3143 "'%s' but it is not empty"), name);
3146 get_oid_hex(patch->new_sha1_prefix, &oid);
3147 if (is_null_oid(&oid)) {
3148 clear_image(img);
3149 return 0; /* deletion patch */
3152 if (has_sha1_file(oid.hash)) {
3153 /* We already have the postimage */
3154 enum object_type type;
3155 unsigned long size;
3156 char *result;
3158 result = read_sha1_file(oid.hash, &type, &size);
3159 if (!result)
3160 return error(_("the necessary postimage %s for "
3161 "'%s' cannot be read"),
3162 patch->new_sha1_prefix, name);
3163 clear_image(img);
3164 img->buf = result;
3165 img->len = size;
3166 } else {
3168 * We have verified buf matches the preimage;
3169 * apply the patch data to it, which is stored
3170 * in the patch->fragments->{patch,size}.
3172 if (apply_binary_fragment(state, img, patch))
3173 return error(_("binary patch does not apply to '%s'"),
3174 name);
3176 /* verify that the result matches */
3177 hash_sha1_file(img->buf, img->len, blob_type, oid.hash);
3178 if (strcmp(oid_to_hex(&oid), patch->new_sha1_prefix))
3179 return error(_("binary patch to '%s' creates incorrect result (expecting %s, got %s)"),
3180 name, patch->new_sha1_prefix, oid_to_hex(&oid));
3183 return 0;
3186 static int apply_fragments(struct apply_state *state, struct image *img, struct patch *patch)
3188 struct fragment *frag = patch->fragments;
3189 const char *name = patch->old_name ? patch->old_name : patch->new_name;
3190 unsigned ws_rule = patch->ws_rule;
3191 unsigned inaccurate_eof = patch->inaccurate_eof;
3192 int nth = 0;
3194 if (patch->is_binary)
3195 return apply_binary(state, img, patch);
3197 while (frag) {
3198 nth++;
3199 if (apply_one_fragment(state, img, frag, inaccurate_eof, ws_rule, nth)) {
3200 error(_("patch failed: %s:%ld"), name, frag->oldpos);
3201 if (!state->apply_with_reject)
3202 return -1;
3203 frag->rejected = 1;
3205 frag = frag->next;
3207 return 0;
3210 static int read_blob_object(struct strbuf *buf, const struct object_id *oid, unsigned mode)
3212 if (S_ISGITLINK(mode)) {
3213 strbuf_grow(buf, 100);
3214 strbuf_addf(buf, "Subproject commit %s\n", oid_to_hex(oid));
3215 } else {
3216 enum object_type type;
3217 unsigned long sz;
3218 char *result;
3220 result = read_sha1_file(oid->hash, &type, &sz);
3221 if (!result)
3222 return -1;
3223 /* XXX read_sha1_file NUL-terminates */
3224 strbuf_attach(buf, result, sz, sz + 1);
3226 return 0;
3229 static int read_file_or_gitlink(const struct cache_entry *ce, struct strbuf *buf)
3231 if (!ce)
3232 return 0;
3233 return read_blob_object(buf, &ce->oid, ce->ce_mode);
3236 static struct patch *in_fn_table(struct apply_state *state, const char *name)
3238 struct string_list_item *item;
3240 if (name == NULL)
3241 return NULL;
3243 item = string_list_lookup(&state->fn_table, name);
3244 if (item != NULL)
3245 return (struct patch *)item->util;
3247 return NULL;
3251 * item->util in the filename table records the status of the path.
3252 * Usually it points at a patch (whose result records the contents
3253 * of it after applying it), but it could be PATH_WAS_DELETED for a
3254 * path that a previously applied patch has already removed, or
3255 * PATH_TO_BE_DELETED for a path that a later patch would remove.
3257 * The latter is needed to deal with a case where two paths A and B
3258 * are swapped by first renaming A to B and then renaming B to A;
3259 * moving A to B should not be prevented due to presence of B as we
3260 * will remove it in a later patch.
3262 #define PATH_TO_BE_DELETED ((struct patch *) -2)
3263 #define PATH_WAS_DELETED ((struct patch *) -1)
3265 static int to_be_deleted(struct patch *patch)
3267 return patch == PATH_TO_BE_DELETED;
3270 static int was_deleted(struct patch *patch)
3272 return patch == PATH_WAS_DELETED;
3275 static void add_to_fn_table(struct apply_state *state, struct patch *patch)
3277 struct string_list_item *item;
3280 * Always add new_name unless patch is a deletion
3281 * This should cover the cases for normal diffs,
3282 * file creations and copies
3284 if (patch->new_name != NULL) {
3285 item = string_list_insert(&state->fn_table, patch->new_name);
3286 item->util = patch;
3290 * store a failure on rename/deletion cases because
3291 * later chunks shouldn't patch old names
3293 if ((patch->new_name == NULL) || (patch->is_rename)) {
3294 item = string_list_insert(&state->fn_table, patch->old_name);
3295 item->util = PATH_WAS_DELETED;
3299 static void prepare_fn_table(struct apply_state *state, struct patch *patch)
3302 * store information about incoming file deletion
3304 while (patch) {
3305 if ((patch->new_name == NULL) || (patch->is_rename)) {
3306 struct string_list_item *item;
3307 item = string_list_insert(&state->fn_table, patch->old_name);
3308 item->util = PATH_TO_BE_DELETED;
3310 patch = patch->next;
3314 static int checkout_target(struct index_state *istate,
3315 struct cache_entry *ce, struct stat *st)
3317 struct checkout costate = CHECKOUT_INIT;
3319 costate.refresh_cache = 1;
3320 costate.istate = istate;
3321 if (checkout_entry(ce, &costate, NULL) || lstat(ce->name, st))
3322 return error(_("cannot checkout %s"), ce->name);
3323 return 0;
3326 static struct patch *previous_patch(struct apply_state *state,
3327 struct patch *patch,
3328 int *gone)
3330 struct patch *previous;
3332 *gone = 0;
3333 if (patch->is_copy || patch->is_rename)
3334 return NULL; /* "git" patches do not depend on the order */
3336 previous = in_fn_table(state, patch->old_name);
3337 if (!previous)
3338 return NULL;
3340 if (to_be_deleted(previous))
3341 return NULL; /* the deletion hasn't happened yet */
3343 if (was_deleted(previous))
3344 *gone = 1;
3346 return previous;
3349 static int verify_index_match(const struct cache_entry *ce, struct stat *st)
3351 if (S_ISGITLINK(ce->ce_mode)) {
3352 if (!S_ISDIR(st->st_mode))
3353 return -1;
3354 return 0;
3356 return ce_match_stat(ce, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
3359 #define SUBMODULE_PATCH_WITHOUT_INDEX 1
3361 static int load_patch_target(struct apply_state *state,
3362 struct strbuf *buf,
3363 const struct cache_entry *ce,
3364 struct stat *st,
3365 const char *name,
3366 unsigned expected_mode)
3368 if (state->cached || state->check_index) {
3369 if (read_file_or_gitlink(ce, buf))
3370 return error(_("failed to read %s"), name);
3371 } else if (name) {
3372 if (S_ISGITLINK(expected_mode)) {
3373 if (ce)
3374 return read_file_or_gitlink(ce, buf);
3375 else
3376 return SUBMODULE_PATCH_WITHOUT_INDEX;
3377 } else if (has_symlink_leading_path(name, strlen(name))) {
3378 return error(_("reading from '%s' beyond a symbolic link"), name);
3379 } else {
3380 if (read_old_data(st, name, buf))
3381 return error(_("failed to read %s"), name);
3384 return 0;
3388 * We are about to apply "patch"; populate the "image" with the
3389 * current version we have, from the working tree or from the index,
3390 * depending on the situation e.g. --cached/--index. If we are
3391 * applying a non-git patch that incrementally updates the tree,
3392 * we read from the result of a previous diff.
3394 static int load_preimage(struct apply_state *state,
3395 struct image *image,
3396 struct patch *patch, struct stat *st,
3397 const struct cache_entry *ce)
3399 struct strbuf buf = STRBUF_INIT;
3400 size_t len;
3401 char *img;
3402 struct patch *previous;
3403 int status;
3405 previous = previous_patch(state, patch, &status);
3406 if (status)
3407 return error(_("path %s has been renamed/deleted"),
3408 patch->old_name);
3409 if (previous) {
3410 /* We have a patched copy in memory; use that. */
3411 strbuf_add(&buf, previous->result, previous->resultsize);
3412 } else {
3413 status = load_patch_target(state, &buf, ce, st,
3414 patch->old_name, patch->old_mode);
3415 if (status < 0)
3416 return status;
3417 else if (status == SUBMODULE_PATCH_WITHOUT_INDEX) {
3419 * There is no way to apply subproject
3420 * patch without looking at the index.
3421 * NEEDSWORK: shouldn't this be flagged
3422 * as an error???
3424 free_fragment_list(patch->fragments);
3425 patch->fragments = NULL;
3426 } else if (status) {
3427 return error(_("failed to read %s"), patch->old_name);
3431 img = strbuf_detach(&buf, &len);
3432 prepare_image(image, img, len, !patch->is_binary);
3433 return 0;
3436 static int three_way_merge(struct image *image,
3437 char *path,
3438 const struct object_id *base,
3439 const struct object_id *ours,
3440 const struct object_id *theirs)
3442 mmfile_t base_file, our_file, their_file;
3443 mmbuffer_t result = { NULL };
3444 int status;
3446 read_mmblob(&base_file, base);
3447 read_mmblob(&our_file, ours);
3448 read_mmblob(&their_file, theirs);
3449 status = ll_merge(&result, path,
3450 &base_file, "base",
3451 &our_file, "ours",
3452 &their_file, "theirs", NULL);
3453 free(base_file.ptr);
3454 free(our_file.ptr);
3455 free(their_file.ptr);
3456 if (status < 0 || !result.ptr) {
3457 free(result.ptr);
3458 return -1;
3460 clear_image(image);
3461 image->buf = result.ptr;
3462 image->len = result.size;
3464 return status;
3468 * When directly falling back to add/add three-way merge, we read from
3469 * the current contents of the new_name. In no cases other than that
3470 * this function will be called.
3472 static int load_current(struct apply_state *state,
3473 struct image *image,
3474 struct patch *patch)
3476 struct strbuf buf = STRBUF_INIT;
3477 int status, pos;
3478 size_t len;
3479 char *img;
3480 struct stat st;
3481 struct cache_entry *ce;
3482 char *name = patch->new_name;
3483 unsigned mode = patch->new_mode;
3485 if (!patch->is_new)
3486 die("BUG: patch to %s is not a creation", patch->old_name);
3488 pos = cache_name_pos(name, strlen(name));
3489 if (pos < 0)
3490 return error(_("%s: does not exist in index"), name);
3491 ce = active_cache[pos];
3492 if (lstat(name, &st)) {
3493 if (errno != ENOENT)
3494 return error_errno("%s", name);
3495 if (checkout_target(&the_index, ce, &st))
3496 return -1;
3498 if (verify_index_match(ce, &st))
3499 return error(_("%s: does not match index"), name);
3501 status = load_patch_target(state, &buf, ce, &st, name, mode);
3502 if (status < 0)
3503 return status;
3504 else if (status)
3505 return -1;
3506 img = strbuf_detach(&buf, &len);
3507 prepare_image(image, img, len, !patch->is_binary);
3508 return 0;
3511 static int try_threeway(struct apply_state *state,
3512 struct image *image,
3513 struct patch *patch,
3514 struct stat *st,
3515 const struct cache_entry *ce)
3517 struct object_id pre_oid, post_oid, our_oid;
3518 struct strbuf buf = STRBUF_INIT;
3519 size_t len;
3520 int status;
3521 char *img;
3522 struct image tmp_image;
3524 /* No point falling back to 3-way merge in these cases */
3525 if (patch->is_delete ||
3526 S_ISGITLINK(patch->old_mode) || S_ISGITLINK(patch->new_mode))
3527 return -1;
3529 /* Preimage the patch was prepared for */
3530 if (patch->is_new)
3531 write_sha1_file("", 0, blob_type, pre_oid.hash);
3532 else if (get_sha1(patch->old_sha1_prefix, pre_oid.hash) ||
3533 read_blob_object(&buf, &pre_oid, patch->old_mode))
3534 return error(_("repository lacks the necessary blob to fall back on 3-way merge."));
3536 if (state->apply_verbosity > verbosity_silent)
3537 fprintf(stderr, _("Falling back to three-way merge...\n"));
3539 img = strbuf_detach(&buf, &len);
3540 prepare_image(&tmp_image, img, len, 1);
3541 /* Apply the patch to get the post image */
3542 if (apply_fragments(state, &tmp_image, patch) < 0) {
3543 clear_image(&tmp_image);
3544 return -1;
3546 /* post_oid is theirs */
3547 write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, post_oid.hash);
3548 clear_image(&tmp_image);
3550 /* our_oid is ours */
3551 if (patch->is_new) {
3552 if (load_current(state, &tmp_image, patch))
3553 return error(_("cannot read the current contents of '%s'"),
3554 patch->new_name);
3555 } else {
3556 if (load_preimage(state, &tmp_image, patch, st, ce))
3557 return error(_("cannot read the current contents of '%s'"),
3558 patch->old_name);
3560 write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, our_oid.hash);
3561 clear_image(&tmp_image);
3563 /* in-core three-way merge between post and our using pre as base */
3564 status = three_way_merge(image, patch->new_name,
3565 &pre_oid, &our_oid, &post_oid);
3566 if (status < 0) {
3567 if (state->apply_verbosity > verbosity_silent)
3568 fprintf(stderr,
3569 _("Failed to fall back on three-way merge...\n"));
3570 return status;
3573 if (status) {
3574 patch->conflicted_threeway = 1;
3575 if (patch->is_new)
3576 oidclr(&patch->threeway_stage[0]);
3577 else
3578 oidcpy(&patch->threeway_stage[0], &pre_oid);
3579 oidcpy(&patch->threeway_stage[1], &our_oid);
3580 oidcpy(&patch->threeway_stage[2], &post_oid);
3581 if (state->apply_verbosity > verbosity_silent)
3582 fprintf(stderr,
3583 _("Applied patch to '%s' with conflicts.\n"),
3584 patch->new_name);
3585 } else {
3586 if (state->apply_verbosity > verbosity_silent)
3587 fprintf(stderr,
3588 _("Applied patch to '%s' cleanly.\n"),
3589 patch->new_name);
3591 return 0;
3594 static int apply_data(struct apply_state *state, struct patch *patch,
3595 struct stat *st, const struct cache_entry *ce)
3597 struct image image;
3599 if (load_preimage(state, &image, patch, st, ce) < 0)
3600 return -1;
3602 if (patch->direct_to_threeway ||
3603 apply_fragments(state, &image, patch) < 0) {
3604 /* Note: with --reject, apply_fragments() returns 0 */
3605 if (!state->threeway || try_threeway(state, &image, patch, st, ce) < 0)
3606 return -1;
3608 patch->result = image.buf;
3609 patch->resultsize = image.len;
3610 add_to_fn_table(state, patch);
3611 free(image.line_allocated);
3613 if (0 < patch->is_delete && patch->resultsize)
3614 return error(_("removal patch leaves file contents"));
3616 return 0;
3620 * If "patch" that we are looking at modifies or deletes what we have,
3621 * we would want it not to lose any local modification we have, either
3622 * in the working tree or in the index.
3624 * This also decides if a non-git patch is a creation patch or a
3625 * modification to an existing empty file. We do not check the state
3626 * of the current tree for a creation patch in this function; the caller
3627 * check_patch() separately makes sure (and errors out otherwise) that
3628 * the path the patch creates does not exist in the current tree.
3630 static int check_preimage(struct apply_state *state,
3631 struct patch *patch,
3632 struct cache_entry **ce,
3633 struct stat *st)
3635 const char *old_name = patch->old_name;
3636 struct patch *previous = NULL;
3637 int stat_ret = 0, status;
3638 unsigned st_mode = 0;
3640 if (!old_name)
3641 return 0;
3643 assert(patch->is_new <= 0);
3644 previous = previous_patch(state, patch, &status);
3646 if (status)
3647 return error(_("path %s has been renamed/deleted"), old_name);
3648 if (previous) {
3649 st_mode = previous->new_mode;
3650 } else if (!state->cached) {
3651 stat_ret = lstat(old_name, st);
3652 if (stat_ret && errno != ENOENT)
3653 return error_errno("%s", old_name);
3656 if (state->check_index && !previous) {
3657 int pos = cache_name_pos(old_name, strlen(old_name));
3658 if (pos < 0) {
3659 if (patch->is_new < 0)
3660 goto is_new;
3661 return error(_("%s: does not exist in index"), old_name);
3663 *ce = active_cache[pos];
3664 if (stat_ret < 0) {
3665 if (checkout_target(&the_index, *ce, st))
3666 return -1;
3668 if (!state->cached && verify_index_match(*ce, st))
3669 return error(_("%s: does not match index"), old_name);
3670 if (state->cached)
3671 st_mode = (*ce)->ce_mode;
3672 } else if (stat_ret < 0) {
3673 if (patch->is_new < 0)
3674 goto is_new;
3675 return error_errno("%s", old_name);
3678 if (!state->cached && !previous)
3679 st_mode = ce_mode_from_stat(*ce, st->st_mode);
3681 if (patch->is_new < 0)
3682 patch->is_new = 0;
3683 if (!patch->old_mode)
3684 patch->old_mode = st_mode;
3685 if ((st_mode ^ patch->old_mode) & S_IFMT)
3686 return error(_("%s: wrong type"), old_name);
3687 if (st_mode != patch->old_mode)
3688 warning(_("%s has type %o, expected %o"),
3689 old_name, st_mode, patch->old_mode);
3690 if (!patch->new_mode && !patch->is_delete)
3691 patch->new_mode = st_mode;
3692 return 0;
3694 is_new:
3695 patch->is_new = 1;
3696 patch->is_delete = 0;
3697 free(patch->old_name);
3698 patch->old_name = NULL;
3699 return 0;
3703 #define EXISTS_IN_INDEX 1
3704 #define EXISTS_IN_WORKTREE 2
3706 static int check_to_create(struct apply_state *state,
3707 const char *new_name,
3708 int ok_if_exists)
3710 struct stat nst;
3712 if (state->check_index &&
3713 cache_name_pos(new_name, strlen(new_name)) >= 0 &&
3714 !ok_if_exists)
3715 return EXISTS_IN_INDEX;
3716 if (state->cached)
3717 return 0;
3719 if (!lstat(new_name, &nst)) {
3720 if (S_ISDIR(nst.st_mode) || ok_if_exists)
3721 return 0;
3723 * A leading component of new_name might be a symlink
3724 * that is going to be removed with this patch, but
3725 * still pointing at somewhere that has the path.
3726 * In such a case, path "new_name" does not exist as
3727 * far as git is concerned.
3729 if (has_symlink_leading_path(new_name, strlen(new_name)))
3730 return 0;
3732 return EXISTS_IN_WORKTREE;
3733 } else if (!is_missing_file_error(errno)) {
3734 return error_errno("%s", new_name);
3736 return 0;
3739 static uintptr_t register_symlink_changes(struct apply_state *state,
3740 const char *path,
3741 uintptr_t what)
3743 struct string_list_item *ent;
3745 ent = string_list_lookup(&state->symlink_changes, path);
3746 if (!ent) {
3747 ent = string_list_insert(&state->symlink_changes, path);
3748 ent->util = (void *)0;
3750 ent->util = (void *)(what | ((uintptr_t)ent->util));
3751 return (uintptr_t)ent->util;
3754 static uintptr_t check_symlink_changes(struct apply_state *state, const char *path)
3756 struct string_list_item *ent;
3758 ent = string_list_lookup(&state->symlink_changes, path);
3759 if (!ent)
3760 return 0;
3761 return (uintptr_t)ent->util;
3764 static void prepare_symlink_changes(struct apply_state *state, struct patch *patch)
3766 for ( ; patch; patch = patch->next) {
3767 if ((patch->old_name && S_ISLNK(patch->old_mode)) &&
3768 (patch->is_rename || patch->is_delete))
3769 /* the symlink at patch->old_name is removed */
3770 register_symlink_changes(state, patch->old_name, APPLY_SYMLINK_GOES_AWAY);
3772 if (patch->new_name && S_ISLNK(patch->new_mode))
3773 /* the symlink at patch->new_name is created or remains */
3774 register_symlink_changes(state, patch->new_name, APPLY_SYMLINK_IN_RESULT);
3778 static int path_is_beyond_symlink_1(struct apply_state *state, struct strbuf *name)
3780 do {
3781 unsigned int change;
3783 while (--name->len && name->buf[name->len] != '/')
3784 ; /* scan backwards */
3785 if (!name->len)
3786 break;
3787 name->buf[name->len] = '\0';
3788 change = check_symlink_changes(state, name->buf);
3789 if (change & APPLY_SYMLINK_IN_RESULT)
3790 return 1;
3791 if (change & APPLY_SYMLINK_GOES_AWAY)
3793 * This cannot be "return 0", because we may
3794 * see a new one created at a higher level.
3796 continue;
3798 /* otherwise, check the preimage */
3799 if (state->check_index) {
3800 struct cache_entry *ce;
3802 ce = cache_file_exists(name->buf, name->len, ignore_case);
3803 if (ce && S_ISLNK(ce->ce_mode))
3804 return 1;
3805 } else {
3806 struct stat st;
3807 if (!lstat(name->buf, &st) && S_ISLNK(st.st_mode))
3808 return 1;
3810 } while (1);
3811 return 0;
3814 static int path_is_beyond_symlink(struct apply_state *state, const char *name_)
3816 int ret;
3817 struct strbuf name = STRBUF_INIT;
3819 assert(*name_ != '\0');
3820 strbuf_addstr(&name, name_);
3821 ret = path_is_beyond_symlink_1(state, &name);
3822 strbuf_release(&name);
3824 return ret;
3827 static int check_unsafe_path(struct patch *patch)
3829 const char *old_name = NULL;
3830 const char *new_name = NULL;
3831 if (patch->is_delete)
3832 old_name = patch->old_name;
3833 else if (!patch->is_new && !patch->is_copy)
3834 old_name = patch->old_name;
3835 if (!patch->is_delete)
3836 new_name = patch->new_name;
3838 if (old_name && !verify_path(old_name))
3839 return error(_("invalid path '%s'"), old_name);
3840 if (new_name && !verify_path(new_name))
3841 return error(_("invalid path '%s'"), new_name);
3842 return 0;
3846 * Check and apply the patch in-core; leave the result in patch->result
3847 * for the caller to write it out to the final destination.
3849 static int check_patch(struct apply_state *state, struct patch *patch)
3851 struct stat st;
3852 const char *old_name = patch->old_name;
3853 const char *new_name = patch->new_name;
3854 const char *name = old_name ? old_name : new_name;
3855 struct cache_entry *ce = NULL;
3856 struct patch *tpatch;
3857 int ok_if_exists;
3858 int status;
3860 patch->rejected = 1; /* we will drop this after we succeed */
3862 status = check_preimage(state, patch, &ce, &st);
3863 if (status)
3864 return status;
3865 old_name = patch->old_name;
3868 * A type-change diff is always split into a patch to delete
3869 * old, immediately followed by a patch to create new (see
3870 * diff.c::run_diff()); in such a case it is Ok that the entry
3871 * to be deleted by the previous patch is still in the working
3872 * tree and in the index.
3874 * A patch to swap-rename between A and B would first rename A
3875 * to B and then rename B to A. While applying the first one,
3876 * the presence of B should not stop A from getting renamed to
3877 * B; ask to_be_deleted() about the later rename. Removal of
3878 * B and rename from A to B is handled the same way by asking
3879 * was_deleted().
3881 if ((tpatch = in_fn_table(state, new_name)) &&
3882 (was_deleted(tpatch) || to_be_deleted(tpatch)))
3883 ok_if_exists = 1;
3884 else
3885 ok_if_exists = 0;
3887 if (new_name &&
3888 ((0 < patch->is_new) || patch->is_rename || patch->is_copy)) {
3889 int err = check_to_create(state, new_name, ok_if_exists);
3891 if (err && state->threeway) {
3892 patch->direct_to_threeway = 1;
3893 } else switch (err) {
3894 case 0:
3895 break; /* happy */
3896 case EXISTS_IN_INDEX:
3897 return error(_("%s: already exists in index"), new_name);
3898 break;
3899 case EXISTS_IN_WORKTREE:
3900 return error(_("%s: already exists in working directory"),
3901 new_name);
3902 default:
3903 return err;
3906 if (!patch->new_mode) {
3907 if (0 < patch->is_new)
3908 patch->new_mode = S_IFREG | 0644;
3909 else
3910 patch->new_mode = patch->old_mode;
3914 if (new_name && old_name) {
3915 int same = !strcmp(old_name, new_name);
3916 if (!patch->new_mode)
3917 patch->new_mode = patch->old_mode;
3918 if ((patch->old_mode ^ patch->new_mode) & S_IFMT) {
3919 if (same)
3920 return error(_("new mode (%o) of %s does not "
3921 "match old mode (%o)"),
3922 patch->new_mode, new_name,
3923 patch->old_mode);
3924 else
3925 return error(_("new mode (%o) of %s does not "
3926 "match old mode (%o) of %s"),
3927 patch->new_mode, new_name,
3928 patch->old_mode, old_name);
3932 if (!state->unsafe_paths && check_unsafe_path(patch))
3933 return -128;
3936 * An attempt to read from or delete a path that is beyond a
3937 * symbolic link will be prevented by load_patch_target() that
3938 * is called at the beginning of apply_data() so we do not
3939 * have to worry about a patch marked with "is_delete" bit
3940 * here. We however need to make sure that the patch result
3941 * is not deposited to a path that is beyond a symbolic link
3942 * here.
3944 if (!patch->is_delete && path_is_beyond_symlink(state, patch->new_name))
3945 return error(_("affected file '%s' is beyond a symbolic link"),
3946 patch->new_name);
3948 if (apply_data(state, patch, &st, ce) < 0)
3949 return error(_("%s: patch does not apply"), name);
3950 patch->rejected = 0;
3951 return 0;
3954 static int check_patch_list(struct apply_state *state, struct patch *patch)
3956 int err = 0;
3958 prepare_symlink_changes(state, patch);
3959 prepare_fn_table(state, patch);
3960 while (patch) {
3961 int res;
3962 if (state->apply_verbosity > verbosity_normal)
3963 say_patch_name(stderr,
3964 _("Checking patch %s..."), patch);
3965 res = check_patch(state, patch);
3966 if (res == -128)
3967 return -128;
3968 err |= res;
3969 patch = patch->next;
3971 return err;
3974 static int read_apply_cache(struct apply_state *state)
3976 if (state->index_file)
3977 return read_cache_from(state->index_file);
3978 else
3979 return read_cache();
3982 /* This function tries to read the object name from the current index */
3983 static int get_current_oid(struct apply_state *state, const char *path,
3984 struct object_id *oid)
3986 int pos;
3988 if (read_apply_cache(state) < 0)
3989 return -1;
3990 pos = cache_name_pos(path, strlen(path));
3991 if (pos < 0)
3992 return -1;
3993 oidcpy(oid, &active_cache[pos]->oid);
3994 return 0;
3997 static int preimage_oid_in_gitlink_patch(struct patch *p, struct object_id *oid)
4000 * A usable gitlink patch has only one fragment (hunk) that looks like:
4001 * @@ -1 +1 @@
4002 * -Subproject commit <old sha1>
4003 * +Subproject commit <new sha1>
4004 * or
4005 * @@ -1 +0,0 @@
4006 * -Subproject commit <old sha1>
4007 * for a removal patch.
4009 struct fragment *hunk = p->fragments;
4010 static const char heading[] = "-Subproject commit ";
4011 char *preimage;
4013 if (/* does the patch have only one hunk? */
4014 hunk && !hunk->next &&
4015 /* is its preimage one line? */
4016 hunk->oldpos == 1 && hunk->oldlines == 1 &&
4017 /* does preimage begin with the heading? */
4018 (preimage = memchr(hunk->patch, '\n', hunk->size)) != NULL &&
4019 starts_with(++preimage, heading) &&
4020 /* does it record full SHA-1? */
4021 !get_oid_hex(preimage + sizeof(heading) - 1, oid) &&
4022 preimage[sizeof(heading) + GIT_SHA1_HEXSZ - 1] == '\n' &&
4023 /* does the abbreviated name on the index line agree with it? */
4024 starts_with(preimage + sizeof(heading) - 1, p->old_sha1_prefix))
4025 return 0; /* it all looks fine */
4027 /* we may have full object name on the index line */
4028 return get_oid_hex(p->old_sha1_prefix, oid);
4031 /* Build an index that contains the just the files needed for a 3way merge */
4032 static int build_fake_ancestor(struct apply_state *state, struct patch *list)
4034 struct patch *patch;
4035 struct index_state result = { NULL };
4036 static struct lock_file lock;
4037 int res;
4039 /* Once we start supporting the reverse patch, it may be
4040 * worth showing the new sha1 prefix, but until then...
4042 for (patch = list; patch; patch = patch->next) {
4043 struct object_id oid;
4044 struct cache_entry *ce;
4045 const char *name;
4047 name = patch->old_name ? patch->old_name : patch->new_name;
4048 if (0 < patch->is_new)
4049 continue;
4051 if (S_ISGITLINK(patch->old_mode)) {
4052 if (!preimage_oid_in_gitlink_patch(patch, &oid))
4053 ; /* ok, the textual part looks sane */
4054 else
4055 return error(_("sha1 information is lacking or "
4056 "useless for submodule %s"), name);
4057 } else if (!get_sha1_blob(patch->old_sha1_prefix, oid.hash)) {
4058 ; /* ok */
4059 } else if (!patch->lines_added && !patch->lines_deleted) {
4060 /* mode-only change: update the current */
4061 if (get_current_oid(state, patch->old_name, &oid))
4062 return error(_("mode change for %s, which is not "
4063 "in current HEAD"), name);
4064 } else
4065 return error(_("sha1 information is lacking or useless "
4066 "(%s)."), name);
4068 ce = make_cache_entry(patch->old_mode, oid.hash, name, 0, 0);
4069 if (!ce)
4070 return error(_("make_cache_entry failed for path '%s'"),
4071 name);
4072 if (add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD)) {
4073 free(ce);
4074 return error(_("could not add %s to temporary index"),
4075 name);
4079 hold_lock_file_for_update(&lock, state->fake_ancestor, LOCK_DIE_ON_ERROR);
4080 res = write_locked_index(&result, &lock, COMMIT_LOCK);
4081 discard_index(&result);
4083 if (res)
4084 return error(_("could not write temporary index to %s"),
4085 state->fake_ancestor);
4087 return 0;
4090 static void stat_patch_list(struct apply_state *state, struct patch *patch)
4092 int files, adds, dels;
4094 for (files = adds = dels = 0 ; patch ; patch = patch->next) {
4095 files++;
4096 adds += patch->lines_added;
4097 dels += patch->lines_deleted;
4098 show_stats(state, patch);
4101 print_stat_summary(stdout, files, adds, dels);
4104 static void numstat_patch_list(struct apply_state *state,
4105 struct patch *patch)
4107 for ( ; patch; patch = patch->next) {
4108 const char *name;
4109 name = patch->new_name ? patch->new_name : patch->old_name;
4110 if (patch->is_binary)
4111 printf("-\t-\t");
4112 else
4113 printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);
4114 write_name_quoted(name, stdout, state->line_termination);
4118 static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)
4120 if (mode)
4121 printf(" %s mode %06o %s\n", newdelete, mode, name);
4122 else
4123 printf(" %s %s\n", newdelete, name);
4126 static void show_mode_change(struct patch *p, int show_name)
4128 if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {
4129 if (show_name)
4130 printf(" mode change %06o => %06o %s\n",
4131 p->old_mode, p->new_mode, p->new_name);
4132 else
4133 printf(" mode change %06o => %06o\n",
4134 p->old_mode, p->new_mode);
4138 static void show_rename_copy(struct patch *p)
4140 const char *renamecopy = p->is_rename ? "rename" : "copy";
4141 const char *old, *new;
4143 /* Find common prefix */
4144 old = p->old_name;
4145 new = p->new_name;
4146 while (1) {
4147 const char *slash_old, *slash_new;
4148 slash_old = strchr(old, '/');
4149 slash_new = strchr(new, '/');
4150 if (!slash_old ||
4151 !slash_new ||
4152 slash_old - old != slash_new - new ||
4153 memcmp(old, new, slash_new - new))
4154 break;
4155 old = slash_old + 1;
4156 new = slash_new + 1;
4158 /* p->old_name thru old is the common prefix, and old and new
4159 * through the end of names are renames
4161 if (old != p->old_name)
4162 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
4163 (int)(old - p->old_name), p->old_name,
4164 old, new, p->score);
4165 else
4166 printf(" %s %s => %s (%d%%)\n", renamecopy,
4167 p->old_name, p->new_name, p->score);
4168 show_mode_change(p, 0);
4171 static void summary_patch_list(struct patch *patch)
4173 struct patch *p;
4175 for (p = patch; p; p = p->next) {
4176 if (p->is_new)
4177 show_file_mode_name("create", p->new_mode, p->new_name);
4178 else if (p->is_delete)
4179 show_file_mode_name("delete", p->old_mode, p->old_name);
4180 else {
4181 if (p->is_rename || p->is_copy)
4182 show_rename_copy(p);
4183 else {
4184 if (p->score) {
4185 printf(" rewrite %s (%d%%)\n",
4186 p->new_name, p->score);
4187 show_mode_change(p, 0);
4189 else
4190 show_mode_change(p, 1);
4196 static void patch_stats(struct apply_state *state, struct patch *patch)
4198 int lines = patch->lines_added + patch->lines_deleted;
4200 if (lines > state->max_change)
4201 state->max_change = lines;
4202 if (patch->old_name) {
4203 int len = quote_c_style(patch->old_name, NULL, NULL, 0);
4204 if (!len)
4205 len = strlen(patch->old_name);
4206 if (len > state->max_len)
4207 state->max_len = len;
4209 if (patch->new_name) {
4210 int len = quote_c_style(patch->new_name, NULL, NULL, 0);
4211 if (!len)
4212 len = strlen(patch->new_name);
4213 if (len > state->max_len)
4214 state->max_len = len;
4218 static int remove_file(struct apply_state *state, struct patch *patch, int rmdir_empty)
4220 if (state->update_index) {
4221 if (remove_file_from_cache(patch->old_name) < 0)
4222 return error(_("unable to remove %s from index"), patch->old_name);
4224 if (!state->cached) {
4225 if (!remove_or_warn(patch->old_mode, patch->old_name) && rmdir_empty) {
4226 remove_path(patch->old_name);
4229 return 0;
4232 static int add_index_file(struct apply_state *state,
4233 const char *path,
4234 unsigned mode,
4235 void *buf,
4236 unsigned long size)
4238 struct stat st;
4239 struct cache_entry *ce;
4240 int namelen = strlen(path);
4241 unsigned ce_size = cache_entry_size(namelen);
4243 if (!state->update_index)
4244 return 0;
4246 ce = xcalloc(1, ce_size);
4247 memcpy(ce->name, path, namelen);
4248 ce->ce_mode = create_ce_mode(mode);
4249 ce->ce_flags = create_ce_flags(0);
4250 ce->ce_namelen = namelen;
4251 if (S_ISGITLINK(mode)) {
4252 const char *s;
4254 if (!skip_prefix(buf, "Subproject commit ", &s) ||
4255 get_oid_hex(s, &ce->oid)) {
4256 free(ce);
4257 return error(_("corrupt patch for submodule %s"), path);
4259 } else {
4260 if (!state->cached) {
4261 if (lstat(path, &st) < 0) {
4262 free(ce);
4263 return error_errno(_("unable to stat newly "
4264 "created file '%s'"),
4265 path);
4267 fill_stat_cache_info(ce, &st);
4269 if (write_sha1_file(buf, size, blob_type, ce->oid.hash) < 0) {
4270 free(ce);
4271 return error(_("unable to create backing store "
4272 "for newly created file %s"), path);
4275 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0) {
4276 free(ce);
4277 return error(_("unable to add cache entry for %s"), path);
4280 return 0;
4284 * Returns:
4285 * -1 if an unrecoverable error happened
4286 * 0 if everything went well
4287 * 1 if a recoverable error happened
4289 static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)
4291 int fd, res;
4292 struct strbuf nbuf = STRBUF_INIT;
4294 if (S_ISGITLINK(mode)) {
4295 struct stat st;
4296 if (!lstat(path, &st) && S_ISDIR(st.st_mode))
4297 return 0;
4298 return !!mkdir(path, 0777);
4301 if (has_symlinks && S_ISLNK(mode))
4302 /* Although buf:size is counted string, it also is NUL
4303 * terminated.
4305 return !!symlink(buf, path);
4307 fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);
4308 if (fd < 0)
4309 return 1;
4311 if (convert_to_working_tree(path, buf, size, &nbuf)) {
4312 size = nbuf.len;
4313 buf = nbuf.buf;
4316 res = write_in_full(fd, buf, size) < 0;
4317 if (res)
4318 error_errno(_("failed to write to '%s'"), path);
4319 strbuf_release(&nbuf);
4321 if (close(fd) < 0 && !res)
4322 return error_errno(_("closing file '%s'"), path);
4324 return res ? -1 : 0;
4328 * We optimistically assume that the directories exist,
4329 * which is true 99% of the time anyway. If they don't,
4330 * we create them and try again.
4332 * Returns:
4333 * -1 on error
4334 * 0 otherwise
4336 static int create_one_file(struct apply_state *state,
4337 char *path,
4338 unsigned mode,
4339 const char *buf,
4340 unsigned long size)
4342 int res;
4344 if (state->cached)
4345 return 0;
4347 res = try_create_file(path, mode, buf, size);
4348 if (res < 0)
4349 return -1;
4350 if (!res)
4351 return 0;
4353 if (errno == ENOENT) {
4354 if (safe_create_leading_directories(path))
4355 return 0;
4356 res = try_create_file(path, mode, buf, size);
4357 if (res < 0)
4358 return -1;
4359 if (!res)
4360 return 0;
4363 if (errno == EEXIST || errno == EACCES) {
4364 /* We may be trying to create a file where a directory
4365 * used to be.
4367 struct stat st;
4368 if (!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))
4369 errno = EEXIST;
4372 if (errno == EEXIST) {
4373 unsigned int nr = getpid();
4375 for (;;) {
4376 char newpath[PATH_MAX];
4377 mksnpath(newpath, sizeof(newpath), "%s~%u", path, nr);
4378 res = try_create_file(newpath, mode, buf, size);
4379 if (res < 0)
4380 return -1;
4381 if (!res) {
4382 if (!rename(newpath, path))
4383 return 0;
4384 unlink_or_warn(newpath);
4385 break;
4387 if (errno != EEXIST)
4388 break;
4389 ++nr;
4392 return error_errno(_("unable to write file '%s' mode %o"),
4393 path, mode);
4396 static int add_conflicted_stages_file(struct apply_state *state,
4397 struct patch *patch)
4399 int stage, namelen;
4400 unsigned ce_size, mode;
4401 struct cache_entry *ce;
4403 if (!state->update_index)
4404 return 0;
4405 namelen = strlen(patch->new_name);
4406 ce_size = cache_entry_size(namelen);
4407 mode = patch->new_mode ? patch->new_mode : (S_IFREG | 0644);
4409 remove_file_from_cache(patch->new_name);
4410 for (stage = 1; stage < 4; stage++) {
4411 if (is_null_oid(&patch->threeway_stage[stage - 1]))
4412 continue;
4413 ce = xcalloc(1, ce_size);
4414 memcpy(ce->name, patch->new_name, namelen);
4415 ce->ce_mode = create_ce_mode(mode);
4416 ce->ce_flags = create_ce_flags(stage);
4417 ce->ce_namelen = namelen;
4418 oidcpy(&ce->oid, &patch->threeway_stage[stage - 1]);
4419 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0) {
4420 free(ce);
4421 return error(_("unable to add cache entry for %s"),
4422 patch->new_name);
4426 return 0;
4429 static int create_file(struct apply_state *state, struct patch *patch)
4431 char *path = patch->new_name;
4432 unsigned mode = patch->new_mode;
4433 unsigned long size = patch->resultsize;
4434 char *buf = patch->result;
4436 if (!mode)
4437 mode = S_IFREG | 0644;
4438 if (create_one_file(state, path, mode, buf, size))
4439 return -1;
4441 if (patch->conflicted_threeway)
4442 return add_conflicted_stages_file(state, patch);
4443 else
4444 return add_index_file(state, path, mode, buf, size);
4447 /* phase zero is to remove, phase one is to create */
4448 static int write_out_one_result(struct apply_state *state,
4449 struct patch *patch,
4450 int phase)
4452 if (patch->is_delete > 0) {
4453 if (phase == 0)
4454 return remove_file(state, patch, 1);
4455 return 0;
4457 if (patch->is_new > 0 || patch->is_copy) {
4458 if (phase == 1)
4459 return create_file(state, patch);
4460 return 0;
4463 * Rename or modification boils down to the same
4464 * thing: remove the old, write the new
4466 if (phase == 0)
4467 return remove_file(state, patch, patch->is_rename);
4468 if (phase == 1)
4469 return create_file(state, patch);
4470 return 0;
4473 static int write_out_one_reject(struct apply_state *state, struct patch *patch)
4475 FILE *rej;
4476 char namebuf[PATH_MAX];
4477 struct fragment *frag;
4478 int cnt = 0;
4479 struct strbuf sb = STRBUF_INIT;
4481 for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) {
4482 if (!frag->rejected)
4483 continue;
4484 cnt++;
4487 if (!cnt) {
4488 if (state->apply_verbosity > verbosity_normal)
4489 say_patch_name(stderr,
4490 _("Applied patch %s cleanly."), patch);
4491 return 0;
4494 /* This should not happen, because a removal patch that leaves
4495 * contents are marked "rejected" at the patch level.
4497 if (!patch->new_name)
4498 die(_("internal error"));
4500 /* Say this even without --verbose */
4501 strbuf_addf(&sb, Q_("Applying patch %%s with %d reject...",
4502 "Applying patch %%s with %d rejects...",
4503 cnt),
4504 cnt);
4505 if (state->apply_verbosity > verbosity_silent)
4506 say_patch_name(stderr, sb.buf, patch);
4507 strbuf_release(&sb);
4509 cnt = strlen(patch->new_name);
4510 if (ARRAY_SIZE(namebuf) <= cnt + 5) {
4511 cnt = ARRAY_SIZE(namebuf) - 5;
4512 warning(_("truncating .rej filename to %.*s.rej"),
4513 cnt - 1, patch->new_name);
4515 memcpy(namebuf, patch->new_name, cnt);
4516 memcpy(namebuf + cnt, ".rej", 5);
4518 rej = fopen(namebuf, "w");
4519 if (!rej)
4520 return error_errno(_("cannot open %s"), namebuf);
4522 /* Normal git tools never deal with .rej, so do not pretend
4523 * this is a git patch by saying --git or giving extended
4524 * headers. While at it, maybe please "kompare" that wants
4525 * the trailing TAB and some garbage at the end of line ;-).
4527 fprintf(rej, "diff a/%s b/%s\t(rejected hunks)\n",
4528 patch->new_name, patch->new_name);
4529 for (cnt = 1, frag = patch->fragments;
4530 frag;
4531 cnt++, frag = frag->next) {
4532 if (!frag->rejected) {
4533 if (state->apply_verbosity > verbosity_silent)
4534 fprintf_ln(stderr, _("Hunk #%d applied cleanly."), cnt);
4535 continue;
4537 if (state->apply_verbosity > verbosity_silent)
4538 fprintf_ln(stderr, _("Rejected hunk #%d."), cnt);
4539 fprintf(rej, "%.*s", frag->size, frag->patch);
4540 if (frag->patch[frag->size-1] != '\n')
4541 fputc('\n', rej);
4543 fclose(rej);
4544 return -1;
4548 * Returns:
4549 * -1 if an error happened
4550 * 0 if the patch applied cleanly
4551 * 1 if the patch did not apply cleanly
4553 static int write_out_results(struct apply_state *state, struct patch *list)
4555 int phase;
4556 int errs = 0;
4557 struct patch *l;
4558 struct string_list cpath = STRING_LIST_INIT_DUP;
4560 for (phase = 0; phase < 2; phase++) {
4561 l = list;
4562 while (l) {
4563 if (l->rejected)
4564 errs = 1;
4565 else {
4566 if (write_out_one_result(state, l, phase)) {
4567 string_list_clear(&cpath, 0);
4568 return -1;
4570 if (phase == 1) {
4571 if (write_out_one_reject(state, l))
4572 errs = 1;
4573 if (l->conflicted_threeway) {
4574 string_list_append(&cpath, l->new_name);
4575 errs = 1;
4579 l = l->next;
4583 if (cpath.nr) {
4584 struct string_list_item *item;
4586 string_list_sort(&cpath);
4587 if (state->apply_verbosity > verbosity_silent) {
4588 for_each_string_list_item(item, &cpath)
4589 fprintf(stderr, "U %s\n", item->string);
4591 string_list_clear(&cpath, 0);
4593 rerere(0);
4596 return errs;
4600 * Try to apply a patch.
4602 * Returns:
4603 * -128 if a bad error happened (like patch unreadable)
4604 * -1 if patch did not apply and user cannot deal with it
4605 * 0 if the patch applied
4606 * 1 if the patch did not apply but user might fix it
4608 static int apply_patch(struct apply_state *state,
4609 int fd,
4610 const char *filename,
4611 int options)
4613 size_t offset;
4614 struct strbuf buf = STRBUF_INIT; /* owns the patch text */
4615 struct patch *list = NULL, **listp = &list;
4616 int skipped_patch = 0;
4617 int res = 0;
4619 state->patch_input_file = filename;
4620 if (read_patch_file(&buf, fd) < 0)
4621 return -128;
4622 offset = 0;
4623 while (offset < buf.len) {
4624 struct patch *patch;
4625 int nr;
4627 patch = xcalloc(1, sizeof(*patch));
4628 patch->inaccurate_eof = !!(options & APPLY_OPT_INACCURATE_EOF);
4629 patch->recount = !!(options & APPLY_OPT_RECOUNT);
4630 nr = parse_chunk(state, buf.buf + offset, buf.len - offset, patch);
4631 if (nr < 0) {
4632 free_patch(patch);
4633 if (nr == -128) {
4634 res = -128;
4635 goto end;
4637 break;
4639 if (state->apply_in_reverse)
4640 reverse_patches(patch);
4641 if (use_patch(state, patch)) {
4642 patch_stats(state, patch);
4643 *listp = patch;
4644 listp = &patch->next;
4646 else {
4647 if (state->apply_verbosity > verbosity_normal)
4648 say_patch_name(stderr, _("Skipped patch '%s'."), patch);
4649 free_patch(patch);
4650 skipped_patch++;
4652 offset += nr;
4655 if (!list && !skipped_patch) {
4656 error(_("unrecognized input"));
4657 res = -128;
4658 goto end;
4661 if (state->whitespace_error && (state->ws_error_action == die_on_ws_error))
4662 state->apply = 0;
4664 state->update_index = state->check_index && state->apply;
4665 if (state->update_index && state->newfd < 0) {
4666 if (state->index_file)
4667 state->newfd = hold_lock_file_for_update(state->lock_file,
4668 state->index_file,
4669 LOCK_DIE_ON_ERROR);
4670 else
4671 state->newfd = hold_locked_index(state->lock_file, LOCK_DIE_ON_ERROR);
4674 if (state->check_index && read_apply_cache(state) < 0) {
4675 error(_("unable to read index file"));
4676 res = -128;
4677 goto end;
4680 if (state->check || state->apply) {
4681 int r = check_patch_list(state, list);
4682 if (r == -128) {
4683 res = -128;
4684 goto end;
4686 if (r < 0 && !state->apply_with_reject) {
4687 res = -1;
4688 goto end;
4692 if (state->apply) {
4693 int write_res = write_out_results(state, list);
4694 if (write_res < 0) {
4695 res = -128;
4696 goto end;
4698 if (write_res > 0) {
4699 /* with --3way, we still need to write the index out */
4700 res = state->apply_with_reject ? -1 : 1;
4701 goto end;
4705 if (state->fake_ancestor &&
4706 build_fake_ancestor(state, list)) {
4707 res = -128;
4708 goto end;
4711 if (state->diffstat && state->apply_verbosity > verbosity_silent)
4712 stat_patch_list(state, list);
4714 if (state->numstat && state->apply_verbosity > verbosity_silent)
4715 numstat_patch_list(state, list);
4717 if (state->summary && state->apply_verbosity > verbosity_silent)
4718 summary_patch_list(list);
4720 end:
4721 free_patch_list(list);
4722 strbuf_release(&buf);
4723 string_list_clear(&state->fn_table, 0);
4724 return res;
4727 static int apply_option_parse_exclude(const struct option *opt,
4728 const char *arg, int unset)
4730 struct apply_state *state = opt->value;
4731 add_name_limit(state, arg, 1);
4732 return 0;
4735 static int apply_option_parse_include(const struct option *opt,
4736 const char *arg, int unset)
4738 struct apply_state *state = opt->value;
4739 add_name_limit(state, arg, 0);
4740 state->has_include = 1;
4741 return 0;
4744 static int apply_option_parse_p(const struct option *opt,
4745 const char *arg,
4746 int unset)
4748 struct apply_state *state = opt->value;
4749 state->p_value = atoi(arg);
4750 state->p_value_known = 1;
4751 return 0;
4754 static int apply_option_parse_space_change(const struct option *opt,
4755 const char *arg, int unset)
4757 struct apply_state *state = opt->value;
4758 if (unset)
4759 state->ws_ignore_action = ignore_ws_none;
4760 else
4761 state->ws_ignore_action = ignore_ws_change;
4762 return 0;
4765 static int apply_option_parse_whitespace(const struct option *opt,
4766 const char *arg, int unset)
4768 struct apply_state *state = opt->value;
4769 state->whitespace_option = arg;
4770 if (parse_whitespace_option(state, arg))
4771 exit(1);
4772 return 0;
4775 static int apply_option_parse_directory(const struct option *opt,
4776 const char *arg, int unset)
4778 struct apply_state *state = opt->value;
4779 strbuf_reset(&state->root);
4780 strbuf_addstr(&state->root, arg);
4781 strbuf_complete(&state->root, '/');
4782 return 0;
4785 int apply_all_patches(struct apply_state *state,
4786 int argc,
4787 const char **argv,
4788 int options)
4790 int i;
4791 int res;
4792 int errs = 0;
4793 int read_stdin = 1;
4795 for (i = 0; i < argc; i++) {
4796 const char *arg = argv[i];
4797 char *to_free = NULL;
4798 int fd;
4800 if (!strcmp(arg, "-")) {
4801 res = apply_patch(state, 0, "<stdin>", options);
4802 if (res < 0)
4803 goto end;
4804 errs |= res;
4805 read_stdin = 0;
4806 continue;
4807 } else
4808 arg = to_free = prefix_filename(state->prefix, arg);
4810 fd = open(arg, O_RDONLY);
4811 if (fd < 0) {
4812 error(_("can't open patch '%s': %s"), arg, strerror(errno));
4813 res = -128;
4814 free(to_free);
4815 goto end;
4817 read_stdin = 0;
4818 set_default_whitespace_mode(state);
4819 res = apply_patch(state, fd, arg, options);
4820 close(fd);
4821 free(to_free);
4822 if (res < 0)
4823 goto end;
4824 errs |= res;
4826 set_default_whitespace_mode(state);
4827 if (read_stdin) {
4828 res = apply_patch(state, 0, "<stdin>", options);
4829 if (res < 0)
4830 goto end;
4831 errs |= res;
4834 if (state->whitespace_error) {
4835 if (state->squelch_whitespace_errors &&
4836 state->squelch_whitespace_errors < state->whitespace_error) {
4837 int squelched =
4838 state->whitespace_error - state->squelch_whitespace_errors;
4839 warning(Q_("squelched %d whitespace error",
4840 "squelched %d whitespace errors",
4841 squelched),
4842 squelched);
4844 if (state->ws_error_action == die_on_ws_error) {
4845 error(Q_("%d line adds whitespace errors.",
4846 "%d lines add whitespace errors.",
4847 state->whitespace_error),
4848 state->whitespace_error);
4849 res = -128;
4850 goto end;
4852 if (state->applied_after_fixing_ws && state->apply)
4853 warning(Q_("%d line applied after"
4854 " fixing whitespace errors.",
4855 "%d lines applied after"
4856 " fixing whitespace errors.",
4857 state->applied_after_fixing_ws),
4858 state->applied_after_fixing_ws);
4859 else if (state->whitespace_error)
4860 warning(Q_("%d line adds whitespace errors.",
4861 "%d lines add whitespace errors.",
4862 state->whitespace_error),
4863 state->whitespace_error);
4866 if (state->update_index) {
4867 res = write_locked_index(&the_index, state->lock_file, COMMIT_LOCK);
4868 if (res) {
4869 error(_("Unable to write new index file"));
4870 res = -128;
4871 goto end;
4873 state->newfd = -1;
4876 res = !!errs;
4878 end:
4879 if (state->newfd >= 0) {
4880 rollback_lock_file(state->lock_file);
4881 state->newfd = -1;
4884 if (state->apply_verbosity <= verbosity_silent) {
4885 set_error_routine(state->saved_error_routine);
4886 set_warn_routine(state->saved_warn_routine);
4889 if (res > -1)
4890 return res;
4891 return (res == -1 ? 1 : 128);
4894 int apply_parse_options(int argc, const char **argv,
4895 struct apply_state *state,
4896 int *force_apply, int *options,
4897 const char * const *apply_usage)
4899 struct option builtin_apply_options[] = {
4900 { OPTION_CALLBACK, 0, "exclude", state, N_("path"),
4901 N_("don't apply changes matching the given path"),
4902 0, apply_option_parse_exclude },
4903 { OPTION_CALLBACK, 0, "include", state, N_("path"),
4904 N_("apply changes matching the given path"),
4905 0, apply_option_parse_include },
4906 { OPTION_CALLBACK, 'p', NULL, state, N_("num"),
4907 N_("remove <num> leading slashes from traditional diff paths"),
4908 0, apply_option_parse_p },
4909 OPT_BOOL(0, "no-add", &state->no_add,
4910 N_("ignore additions made by the patch")),
4911 OPT_BOOL(0, "stat", &state->diffstat,
4912 N_("instead of applying the patch, output diffstat for the input")),
4913 OPT_NOOP_NOARG(0, "allow-binary-replacement"),
4914 OPT_NOOP_NOARG(0, "binary"),
4915 OPT_BOOL(0, "numstat", &state->numstat,
4916 N_("show number of added and deleted lines in decimal notation")),
4917 OPT_BOOL(0, "summary", &state->summary,
4918 N_("instead of applying the patch, output a summary for the input")),
4919 OPT_BOOL(0, "check", &state->check,
4920 N_("instead of applying the patch, see if the patch is applicable")),
4921 OPT_BOOL(0, "index", &state->check_index,
4922 N_("make sure the patch is applicable to the current index")),
4923 OPT_BOOL(0, "cached", &state->cached,
4924 N_("apply a patch without touching the working tree")),
4925 OPT_BOOL(0, "unsafe-paths", &state->unsafe_paths,
4926 N_("accept a patch that touches outside the working area")),
4927 OPT_BOOL(0, "apply", force_apply,
4928 N_("also apply the patch (use with --stat/--summary/--check)")),
4929 OPT_BOOL('3', "3way", &state->threeway,
4930 N_( "attempt three-way merge if a patch does not apply")),
4931 OPT_FILENAME(0, "build-fake-ancestor", &state->fake_ancestor,
4932 N_("build a temporary index based on embedded index information")),
4933 /* Think twice before adding "--nul" synonym to this */
4934 OPT_SET_INT('z', NULL, &state->line_termination,
4935 N_("paths are separated with NUL character"), '\0'),
4936 OPT_INTEGER('C', NULL, &state->p_context,
4937 N_("ensure at least <n> lines of context match")),
4938 { OPTION_CALLBACK, 0, "whitespace", state, N_("action"),
4939 N_("detect new or modified lines that have whitespace errors"),
4940 0, apply_option_parse_whitespace },
4941 { OPTION_CALLBACK, 0, "ignore-space-change", state, NULL,
4942 N_("ignore changes in whitespace when finding context"),
4943 PARSE_OPT_NOARG, apply_option_parse_space_change },
4944 { OPTION_CALLBACK, 0, "ignore-whitespace", state, NULL,
4945 N_("ignore changes in whitespace when finding context"),
4946 PARSE_OPT_NOARG, apply_option_parse_space_change },
4947 OPT_BOOL('R', "reverse", &state->apply_in_reverse,
4948 N_("apply the patch in reverse")),
4949 OPT_BOOL(0, "unidiff-zero", &state->unidiff_zero,
4950 N_("don't expect at least one line of context")),
4951 OPT_BOOL(0, "reject", &state->apply_with_reject,
4952 N_("leave the rejected hunks in corresponding *.rej files")),
4953 OPT_BOOL(0, "allow-overlap", &state->allow_overlap,
4954 N_("allow overlapping hunks")),
4955 OPT__VERBOSE(&state->apply_verbosity, N_("be verbose")),
4956 OPT_BIT(0, "inaccurate-eof", options,
4957 N_("tolerate incorrectly detected missing new-line at the end of file"),
4958 APPLY_OPT_INACCURATE_EOF),
4959 OPT_BIT(0, "recount", options,
4960 N_("do not trust the line counts in the hunk headers"),
4961 APPLY_OPT_RECOUNT),
4962 { OPTION_CALLBACK, 0, "directory", state, N_("root"),
4963 N_("prepend <root> to all filenames"),
4964 0, apply_option_parse_directory },
4965 OPT_END()
4968 return parse_options(argc, argv, state->prefix, builtin_apply_options, apply_usage, 0);