t5000: reformat indentation to the latest fashion
[git/debian.git] / apply.c
blob466f880d737dbdbff8259e89ec9767643fb248e1
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 "config.h"
12 #include "object-store.h"
13 #include "blob.h"
14 #include "delta.h"
15 #include "diff.h"
16 #include "dir.h"
17 #include "xdiff-interface.h"
18 #include "ll-merge.h"
19 #include "lockfile.h"
20 #include "parse-options.h"
21 #include "quote.h"
22 #include "rerere.h"
23 #include "apply.h"
24 #include "entry.h"
26 struct gitdiff_data {
27 struct strbuf *root;
28 int linenr;
29 int p_value;
32 static void git_apply_config(void)
34 git_config_get_string("apply.whitespace", &apply_default_whitespace);
35 git_config_get_string("apply.ignorewhitespace", &apply_default_ignorewhitespace);
36 git_config(git_xmerge_config, NULL);
39 static int parse_whitespace_option(struct apply_state *state, const char *option)
41 if (!option) {
42 state->ws_error_action = warn_on_ws_error;
43 return 0;
45 if (!strcmp(option, "warn")) {
46 state->ws_error_action = warn_on_ws_error;
47 return 0;
49 if (!strcmp(option, "nowarn")) {
50 state->ws_error_action = nowarn_ws_error;
51 return 0;
53 if (!strcmp(option, "error")) {
54 state->ws_error_action = die_on_ws_error;
55 return 0;
57 if (!strcmp(option, "error-all")) {
58 state->ws_error_action = die_on_ws_error;
59 state->squelch_whitespace_errors = 0;
60 return 0;
62 if (!strcmp(option, "strip") || !strcmp(option, "fix")) {
63 state->ws_error_action = correct_ws_error;
64 return 0;
67 * Please update $__git_whitespacelist in git-completion.bash
68 * when you add new options.
70 return error(_("unrecognized whitespace option '%s'"), option);
73 static int parse_ignorewhitespace_option(struct apply_state *state,
74 const char *option)
76 if (!option || !strcmp(option, "no") ||
77 !strcmp(option, "false") || !strcmp(option, "never") ||
78 !strcmp(option, "none")) {
79 state->ws_ignore_action = ignore_ws_none;
80 return 0;
82 if (!strcmp(option, "change")) {
83 state->ws_ignore_action = ignore_ws_change;
84 return 0;
86 return error(_("unrecognized whitespace ignore option '%s'"), option);
89 int init_apply_state(struct apply_state *state,
90 struct repository *repo,
91 const char *prefix)
93 memset(state, 0, sizeof(*state));
94 state->prefix = prefix;
95 state->repo = repo;
96 state->apply = 1;
97 state->line_termination = '\n';
98 state->p_value = 1;
99 state->p_context = UINT_MAX;
100 state->squelch_whitespace_errors = 5;
101 state->ws_error_action = warn_on_ws_error;
102 state->ws_ignore_action = ignore_ws_none;
103 state->linenr = 1;
104 string_list_init(&state->fn_table, 0);
105 string_list_init(&state->limit_by_name, 0);
106 string_list_init(&state->symlink_changes, 0);
107 strbuf_init(&state->root, 0);
109 git_apply_config();
110 if (apply_default_whitespace && parse_whitespace_option(state, apply_default_whitespace))
111 return -1;
112 if (apply_default_ignorewhitespace && parse_ignorewhitespace_option(state, apply_default_ignorewhitespace))
113 return -1;
114 return 0;
117 void clear_apply_state(struct apply_state *state)
119 string_list_clear(&state->limit_by_name, 0);
120 string_list_clear(&state->symlink_changes, 0);
121 strbuf_release(&state->root);
123 /* &state->fn_table is cleared at the end of apply_patch() */
126 static void mute_routine(const char *msg, va_list params)
128 /* do nothing */
131 int check_apply_state(struct apply_state *state, int force_apply)
133 int is_not_gitdir = !startup_info->have_repository;
135 if (state->apply_with_reject && state->threeway)
136 return error(_("--reject and --3way cannot be used together."));
137 if (state->cached && state->threeway)
138 return error(_("--cached and --3way cannot be used together."));
139 if (state->threeway) {
140 if (is_not_gitdir)
141 return error(_("--3way outside a repository"));
142 state->check_index = 1;
144 if (state->apply_with_reject) {
145 state->apply = 1;
146 if (state->apply_verbosity == verbosity_normal)
147 state->apply_verbosity = verbosity_verbose;
149 if (!force_apply && (state->diffstat || state->numstat || state->summary || state->check || state->fake_ancestor))
150 state->apply = 0;
151 if (state->check_index && is_not_gitdir)
152 return error(_("--index outside a repository"));
153 if (state->cached) {
154 if (is_not_gitdir)
155 return error(_("--cached outside a repository"));
156 state->check_index = 1;
158 if (state->ita_only && (state->check_index || is_not_gitdir))
159 state->ita_only = 0;
160 if (state->check_index)
161 state->unsafe_paths = 0;
163 if (state->apply_verbosity <= verbosity_silent) {
164 state->saved_error_routine = get_error_routine();
165 state->saved_warn_routine = get_warn_routine();
166 set_error_routine(mute_routine);
167 set_warn_routine(mute_routine);
170 return 0;
173 static void set_default_whitespace_mode(struct apply_state *state)
175 if (!state->whitespace_option && !apply_default_whitespace)
176 state->ws_error_action = (state->apply ? warn_on_ws_error : nowarn_ws_error);
180 * This represents one "hunk" from a patch, starting with
181 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The
182 * patch text is pointed at by patch, and its byte length
183 * is stored in size. leading and trailing are the number
184 * of context lines.
186 struct fragment {
187 unsigned long leading, trailing;
188 unsigned long oldpos, oldlines;
189 unsigned long newpos, newlines;
191 * 'patch' is usually borrowed from buf in apply_patch(),
192 * but some codepaths store an allocated buffer.
194 const char *patch;
195 unsigned free_patch:1,
196 rejected:1;
197 int size;
198 int linenr;
199 struct fragment *next;
203 * When dealing with a binary patch, we reuse "leading" field
204 * to store the type of the binary hunk, either deflated "delta"
205 * or deflated "literal".
207 #define binary_patch_method leading
208 #define BINARY_DELTA_DEFLATED 1
209 #define BINARY_LITERAL_DEFLATED 2
211 static void free_fragment_list(struct fragment *list)
213 while (list) {
214 struct fragment *next = list->next;
215 if (list->free_patch)
216 free((char *)list->patch);
217 free(list);
218 list = next;
222 static void free_patch(struct patch *patch)
224 free_fragment_list(patch->fragments);
225 free(patch->def_name);
226 free(patch->old_name);
227 free(patch->new_name);
228 free(patch->result);
229 free(patch);
232 static void free_patch_list(struct patch *list)
234 while (list) {
235 struct patch *next = list->next;
236 free_patch(list);
237 list = next;
242 * A line in a file, len-bytes long (includes the terminating LF,
243 * except for an incomplete line at the end if the file ends with
244 * one), and its contents hashes to 'hash'.
246 struct line {
247 size_t len;
248 unsigned hash : 24;
249 unsigned flag : 8;
250 #define LINE_COMMON 1
251 #define LINE_PATCHED 2
255 * This represents a "file", which is an array of "lines".
257 struct image {
258 char *buf;
259 size_t len;
260 size_t nr;
261 size_t alloc;
262 struct line *line_allocated;
263 struct line *line;
266 static uint32_t hash_line(const char *cp, size_t len)
268 size_t i;
269 uint32_t h;
270 for (i = 0, h = 0; i < len; i++) {
271 if (!isspace(cp[i])) {
272 h = h * 3 + (cp[i] & 0xff);
275 return h;
279 * Compare lines s1 of length n1 and s2 of length n2, ignoring
280 * whitespace difference. Returns 1 if they match, 0 otherwise
282 static int fuzzy_matchlines(const char *s1, size_t n1,
283 const char *s2, size_t n2)
285 const char *end1 = s1 + n1;
286 const char *end2 = s2 + n2;
288 /* ignore line endings */
289 while (s1 < end1 && (end1[-1] == '\r' || end1[-1] == '\n'))
290 end1--;
291 while (s2 < end2 && (end2[-1] == '\r' || end2[-1] == '\n'))
292 end2--;
294 while (s1 < end1 && s2 < end2) {
295 if (isspace(*s1)) {
297 * Skip whitespace. We check on both buffers
298 * because we don't want "a b" to match "ab".
300 if (!isspace(*s2))
301 return 0;
302 while (s1 < end1 && isspace(*s1))
303 s1++;
304 while (s2 < end2 && isspace(*s2))
305 s2++;
306 } else if (*s1++ != *s2++)
307 return 0;
310 /* If we reached the end on one side only, lines don't match. */
311 return s1 == end1 && s2 == end2;
314 static void add_line_info(struct image *img, const char *bol, size_t len, unsigned flag)
316 ALLOC_GROW(img->line_allocated, img->nr + 1, img->alloc);
317 img->line_allocated[img->nr].len = len;
318 img->line_allocated[img->nr].hash = hash_line(bol, len);
319 img->line_allocated[img->nr].flag = flag;
320 img->nr++;
324 * "buf" has the file contents to be patched (read from various sources).
325 * attach it to "image" and add line-based index to it.
326 * "image" now owns the "buf".
328 static void prepare_image(struct image *image, char *buf, size_t len,
329 int prepare_linetable)
331 const char *cp, *ep;
333 memset(image, 0, sizeof(*image));
334 image->buf = buf;
335 image->len = len;
337 if (!prepare_linetable)
338 return;
340 ep = image->buf + image->len;
341 cp = image->buf;
342 while (cp < ep) {
343 const char *next;
344 for (next = cp; next < ep && *next != '\n'; next++)
346 if (next < ep)
347 next++;
348 add_line_info(image, cp, next - cp, 0);
349 cp = next;
351 image->line = image->line_allocated;
354 static void clear_image(struct image *image)
356 free(image->buf);
357 free(image->line_allocated);
358 memset(image, 0, sizeof(*image));
361 /* fmt must contain _one_ %s and no other substitution */
362 static void say_patch_name(FILE *output, const char *fmt, struct patch *patch)
364 struct strbuf sb = STRBUF_INIT;
366 if (patch->old_name && patch->new_name &&
367 strcmp(patch->old_name, patch->new_name)) {
368 quote_c_style(patch->old_name, &sb, NULL, 0);
369 strbuf_addstr(&sb, " => ");
370 quote_c_style(patch->new_name, &sb, NULL, 0);
371 } else {
372 const char *n = patch->new_name;
373 if (!n)
374 n = patch->old_name;
375 quote_c_style(n, &sb, NULL, 0);
377 fprintf(output, fmt, sb.buf);
378 fputc('\n', output);
379 strbuf_release(&sb);
382 #define SLOP (16)
384 static int read_patch_file(struct strbuf *sb, int fd)
386 if (strbuf_read(sb, fd, 0) < 0)
387 return error_errno("git apply: failed to read");
390 * Make sure that we have some slop in the buffer
391 * so that we can do speculative "memcmp" etc, and
392 * see to it that it is NUL-filled.
394 strbuf_grow(sb, SLOP);
395 memset(sb->buf + sb->len, 0, SLOP);
396 return 0;
399 static unsigned long linelen(const char *buffer, unsigned long size)
401 unsigned long len = 0;
402 while (size--) {
403 len++;
404 if (*buffer++ == '\n')
405 break;
407 return len;
410 static int is_dev_null(const char *str)
412 return skip_prefix(str, "/dev/null", &str) && isspace(*str);
415 #define TERM_SPACE 1
416 #define TERM_TAB 2
418 static int name_terminate(int c, int terminate)
420 if (c == ' ' && !(terminate & TERM_SPACE))
421 return 0;
422 if (c == '\t' && !(terminate & TERM_TAB))
423 return 0;
425 return 1;
428 /* remove double slashes to make --index work with such filenames */
429 static char *squash_slash(char *name)
431 int i = 0, j = 0;
433 if (!name)
434 return NULL;
436 while (name[i]) {
437 if ((name[j++] = name[i++]) == '/')
438 while (name[i] == '/')
439 i++;
441 name[j] = '\0';
442 return name;
445 static char *find_name_gnu(struct strbuf *root,
446 const char *line,
447 int p_value)
449 struct strbuf name = STRBUF_INIT;
450 char *cp;
453 * Proposed "new-style" GNU patch/diff format; see
454 * https://lore.kernel.org/git/7vll0wvb2a.fsf@assigned-by-dhcp.cox.net/
456 if (unquote_c_style(&name, line, NULL)) {
457 strbuf_release(&name);
458 return NULL;
461 for (cp = name.buf; p_value; p_value--) {
462 cp = strchr(cp, '/');
463 if (!cp) {
464 strbuf_release(&name);
465 return NULL;
467 cp++;
470 strbuf_remove(&name, 0, cp - name.buf);
471 if (root->len)
472 strbuf_insert(&name, 0, root->buf, root->len);
473 return squash_slash(strbuf_detach(&name, NULL));
476 static size_t sane_tz_len(const char *line, size_t len)
478 const char *tz, *p;
480 if (len < strlen(" +0500") || line[len-strlen(" +0500")] != ' ')
481 return 0;
482 tz = line + len - strlen(" +0500");
484 if (tz[1] != '+' && tz[1] != '-')
485 return 0;
487 for (p = tz + 2; p != line + len; p++)
488 if (!isdigit(*p))
489 return 0;
491 return line + len - tz;
494 static size_t tz_with_colon_len(const char *line, size_t len)
496 const char *tz, *p;
498 if (len < strlen(" +08:00") || line[len - strlen(":00")] != ':')
499 return 0;
500 tz = line + len - strlen(" +08:00");
502 if (tz[0] != ' ' || (tz[1] != '+' && tz[1] != '-'))
503 return 0;
504 p = tz + 2;
505 if (!isdigit(*p++) || !isdigit(*p++) || *p++ != ':' ||
506 !isdigit(*p++) || !isdigit(*p++))
507 return 0;
509 return line + len - tz;
512 static size_t date_len(const char *line, size_t len)
514 const char *date, *p;
516 if (len < strlen("72-02-05") || line[len-strlen("-05")] != '-')
517 return 0;
518 p = date = line + len - strlen("72-02-05");
520 if (!isdigit(*p++) || !isdigit(*p++) || *p++ != '-' ||
521 !isdigit(*p++) || !isdigit(*p++) || *p++ != '-' ||
522 !isdigit(*p++) || !isdigit(*p++)) /* Not a date. */
523 return 0;
525 if (date - line >= strlen("19") &&
526 isdigit(date[-1]) && isdigit(date[-2])) /* 4-digit year */
527 date -= strlen("19");
529 return line + len - date;
532 static size_t short_time_len(const char *line, size_t len)
534 const char *time, *p;
536 if (len < strlen(" 07:01:32") || line[len-strlen(":32")] != ':')
537 return 0;
538 p = time = line + len - strlen(" 07:01:32");
540 /* Permit 1-digit hours? */
541 if (*p++ != ' ' ||
542 !isdigit(*p++) || !isdigit(*p++) || *p++ != ':' ||
543 !isdigit(*p++) || !isdigit(*p++) || *p++ != ':' ||
544 !isdigit(*p++) || !isdigit(*p++)) /* Not a time. */
545 return 0;
547 return line + len - time;
550 static size_t fractional_time_len(const char *line, size_t len)
552 const char *p;
553 size_t n;
555 /* Expected format: 19:41:17.620000023 */
556 if (!len || !isdigit(line[len - 1]))
557 return 0;
558 p = line + len - 1;
560 /* Fractional seconds. */
561 while (p > line && isdigit(*p))
562 p--;
563 if (*p != '.')
564 return 0;
566 /* Hours, minutes, and whole seconds. */
567 n = short_time_len(line, p - line);
568 if (!n)
569 return 0;
571 return line + len - p + n;
574 static size_t trailing_spaces_len(const char *line, size_t len)
576 const char *p;
578 /* Expected format: ' ' x (1 or more) */
579 if (!len || line[len - 1] != ' ')
580 return 0;
582 p = line + len;
583 while (p != line) {
584 p--;
585 if (*p != ' ')
586 return line + len - (p + 1);
589 /* All spaces! */
590 return len;
593 static size_t diff_timestamp_len(const char *line, size_t len)
595 const char *end = line + len;
596 size_t n;
599 * Posix: 2010-07-05 19:41:17
600 * GNU: 2010-07-05 19:41:17.620000023 -0500
603 if (!isdigit(end[-1]))
604 return 0;
606 n = sane_tz_len(line, end - line);
607 if (!n)
608 n = tz_with_colon_len(line, end - line);
609 end -= n;
611 n = short_time_len(line, end - line);
612 if (!n)
613 n = fractional_time_len(line, end - line);
614 end -= n;
616 n = date_len(line, end - line);
617 if (!n) /* No date. Too bad. */
618 return 0;
619 end -= n;
621 if (end == line) /* No space before date. */
622 return 0;
623 if (end[-1] == '\t') { /* Success! */
624 end--;
625 return line + len - end;
627 if (end[-1] != ' ') /* No space before date. */
628 return 0;
630 /* Whitespace damage. */
631 end -= trailing_spaces_len(line, end - line);
632 return line + len - end;
635 static char *find_name_common(struct strbuf *root,
636 const char *line,
637 const char *def,
638 int p_value,
639 const char *end,
640 int terminate)
642 int len;
643 const char *start = NULL;
645 if (p_value == 0)
646 start = line;
647 while (line != end) {
648 char c = *line;
650 if (!end && isspace(c)) {
651 if (c == '\n')
652 break;
653 if (name_terminate(c, terminate))
654 break;
656 line++;
657 if (c == '/' && !--p_value)
658 start = line;
660 if (!start)
661 return squash_slash(xstrdup_or_null(def));
662 len = line - start;
663 if (!len)
664 return squash_slash(xstrdup_or_null(def));
667 * Generally we prefer the shorter name, especially
668 * if the other one is just a variation of that with
669 * something else tacked on to the end (ie "file.orig"
670 * or "file~").
672 if (def) {
673 int deflen = strlen(def);
674 if (deflen < len && !strncmp(start, def, deflen))
675 return squash_slash(xstrdup(def));
678 if (root->len) {
679 char *ret = xstrfmt("%s%.*s", root->buf, len, start);
680 return squash_slash(ret);
683 return squash_slash(xmemdupz(start, len));
686 static char *find_name(struct strbuf *root,
687 const char *line,
688 char *def,
689 int p_value,
690 int terminate)
692 if (*line == '"') {
693 char *name = find_name_gnu(root, line, p_value);
694 if (name)
695 return name;
698 return find_name_common(root, line, def, p_value, NULL, terminate);
701 static char *find_name_traditional(struct strbuf *root,
702 const char *line,
703 char *def,
704 int p_value)
706 size_t len;
707 size_t date_len;
709 if (*line == '"') {
710 char *name = find_name_gnu(root, line, p_value);
711 if (name)
712 return name;
715 len = strchrnul(line, '\n') - line;
716 date_len = diff_timestamp_len(line, len);
717 if (!date_len)
718 return find_name_common(root, line, def, p_value, NULL, TERM_TAB);
719 len -= date_len;
721 return find_name_common(root, line, def, p_value, line + len, 0);
725 * Given the string after "--- " or "+++ ", guess the appropriate
726 * p_value for the given patch.
728 static int guess_p_value(struct apply_state *state, const char *nameline)
730 char *name, *cp;
731 int val = -1;
733 if (is_dev_null(nameline))
734 return -1;
735 name = find_name_traditional(&state->root, nameline, NULL, 0);
736 if (!name)
737 return -1;
738 cp = strchr(name, '/');
739 if (!cp)
740 val = 0;
741 else if (state->prefix) {
743 * Does it begin with "a/$our-prefix" and such? Then this is
744 * very likely to apply to our directory.
746 if (starts_with(name, state->prefix))
747 val = count_slashes(state->prefix);
748 else {
749 cp++;
750 if (starts_with(cp, state->prefix))
751 val = count_slashes(state->prefix) + 1;
754 free(name);
755 return val;
759 * Does the ---/+++ line have the POSIX timestamp after the last HT?
760 * GNU diff puts epoch there to signal a creation/deletion event. Is
761 * this such a timestamp?
763 static int has_epoch_timestamp(const char *nameline)
766 * We are only interested in epoch timestamp; any non-zero
767 * fraction cannot be one, hence "(\.0+)?" in the regexp below.
768 * For the same reason, the date must be either 1969-12-31 or
769 * 1970-01-01, and the seconds part must be "00".
771 const char stamp_regexp[] =
772 "^[0-2][0-9]:([0-5][0-9]):00(\\.0+)?"
774 "([-+][0-2][0-9]:?[0-5][0-9])\n";
775 const char *timestamp = NULL, *cp, *colon;
776 static regex_t *stamp;
777 regmatch_t m[10];
778 int zoneoffset, epoch_hour, hour, minute;
779 int status;
781 for (cp = nameline; *cp != '\n'; cp++) {
782 if (*cp == '\t')
783 timestamp = cp + 1;
785 if (!timestamp)
786 return 0;
789 * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31
790 * (west of GMT) or 1970-01-01 (east of GMT)
792 if (skip_prefix(timestamp, "1969-12-31 ", &timestamp))
793 epoch_hour = 24;
794 else if (skip_prefix(timestamp, "1970-01-01 ", &timestamp))
795 epoch_hour = 0;
796 else
797 return 0;
799 if (!stamp) {
800 stamp = xmalloc(sizeof(*stamp));
801 if (regcomp(stamp, stamp_regexp, REG_EXTENDED)) {
802 warning(_("Cannot prepare timestamp regexp %s"),
803 stamp_regexp);
804 return 0;
808 status = regexec(stamp, timestamp, ARRAY_SIZE(m), m, 0);
809 if (status) {
810 if (status != REG_NOMATCH)
811 warning(_("regexec returned %d for input: %s"),
812 status, timestamp);
813 return 0;
816 hour = strtol(timestamp, NULL, 10);
817 minute = strtol(timestamp + m[1].rm_so, NULL, 10);
819 zoneoffset = strtol(timestamp + m[3].rm_so + 1, (char **) &colon, 10);
820 if (*colon == ':')
821 zoneoffset = zoneoffset * 60 + strtol(colon + 1, NULL, 10);
822 else
823 zoneoffset = (zoneoffset / 100) * 60 + (zoneoffset % 100);
824 if (timestamp[m[3].rm_so] == '-')
825 zoneoffset = -zoneoffset;
827 return hour * 60 + minute - zoneoffset == epoch_hour * 60;
831 * Get the name etc info from the ---/+++ lines of a traditional patch header
833 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
834 * files, we can happily check the index for a match, but for creating a
835 * new file we should try to match whatever "patch" does. I have no idea.
837 static int parse_traditional_patch(struct apply_state *state,
838 const char *first,
839 const char *second,
840 struct patch *patch)
842 char *name;
844 first += 4; /* skip "--- " */
845 second += 4; /* skip "+++ " */
846 if (!state->p_value_known) {
847 int p, q;
848 p = guess_p_value(state, first);
849 q = guess_p_value(state, second);
850 if (p < 0) p = q;
851 if (0 <= p && p == q) {
852 state->p_value = p;
853 state->p_value_known = 1;
856 if (is_dev_null(first)) {
857 patch->is_new = 1;
858 patch->is_delete = 0;
859 name = find_name_traditional(&state->root, second, NULL, state->p_value);
860 patch->new_name = name;
861 } else if (is_dev_null(second)) {
862 patch->is_new = 0;
863 patch->is_delete = 1;
864 name = find_name_traditional(&state->root, first, NULL, state->p_value);
865 patch->old_name = name;
866 } else {
867 char *first_name;
868 first_name = find_name_traditional(&state->root, first, NULL, state->p_value);
869 name = find_name_traditional(&state->root, second, first_name, state->p_value);
870 free(first_name);
871 if (has_epoch_timestamp(first)) {
872 patch->is_new = 1;
873 patch->is_delete = 0;
874 patch->new_name = name;
875 } else if (has_epoch_timestamp(second)) {
876 patch->is_new = 0;
877 patch->is_delete = 1;
878 patch->old_name = name;
879 } else {
880 patch->old_name = name;
881 patch->new_name = xstrdup_or_null(name);
884 if (!name)
885 return error(_("unable to find filename in patch at line %d"), state->linenr);
887 return 0;
890 static int gitdiff_hdrend(struct gitdiff_data *state,
891 const char *line,
892 struct patch *patch)
894 return 1;
898 * We're anal about diff header consistency, to make
899 * sure that we don't end up having strange ambiguous
900 * patches floating around.
902 * As a result, gitdiff_{old|new}name() will check
903 * their names against any previous information, just
904 * to make sure..
906 #define DIFF_OLD_NAME 0
907 #define DIFF_NEW_NAME 1
909 static int gitdiff_verify_name(struct gitdiff_data *state,
910 const char *line,
911 int isnull,
912 char **name,
913 int side)
915 if (!*name && !isnull) {
916 *name = find_name(state->root, line, NULL, state->p_value, TERM_TAB);
917 return 0;
920 if (*name) {
921 char *another;
922 if (isnull)
923 return error(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"),
924 *name, state->linenr);
925 another = find_name(state->root, line, NULL, state->p_value, TERM_TAB);
926 if (!another || strcmp(another, *name)) {
927 free(another);
928 return error((side == DIFF_NEW_NAME) ?
929 _("git apply: bad git-diff - inconsistent new filename on line %d") :
930 _("git apply: bad git-diff - inconsistent old filename on line %d"), state->linenr);
932 free(another);
933 } else {
934 if (!is_dev_null(line))
935 return error(_("git apply: bad git-diff - expected /dev/null on line %d"), state->linenr);
938 return 0;
941 static int gitdiff_oldname(struct gitdiff_data *state,
942 const char *line,
943 struct patch *patch)
945 return gitdiff_verify_name(state, line,
946 patch->is_new, &patch->old_name,
947 DIFF_OLD_NAME);
950 static int gitdiff_newname(struct gitdiff_data *state,
951 const char *line,
952 struct patch *patch)
954 return gitdiff_verify_name(state, line,
955 patch->is_delete, &patch->new_name,
956 DIFF_NEW_NAME);
959 static int parse_mode_line(const char *line, int linenr, unsigned int *mode)
961 char *end;
962 *mode = strtoul(line, &end, 8);
963 if (end == line || !isspace(*end))
964 return error(_("invalid mode on line %d: %s"), linenr, line);
965 return 0;
968 static int gitdiff_oldmode(struct gitdiff_data *state,
969 const char *line,
970 struct patch *patch)
972 return parse_mode_line(line, state->linenr, &patch->old_mode);
975 static int gitdiff_newmode(struct gitdiff_data *state,
976 const char *line,
977 struct patch *patch)
979 return parse_mode_line(line, state->linenr, &patch->new_mode);
982 static int gitdiff_delete(struct gitdiff_data *state,
983 const char *line,
984 struct patch *patch)
986 patch->is_delete = 1;
987 free(patch->old_name);
988 patch->old_name = xstrdup_or_null(patch->def_name);
989 return gitdiff_oldmode(state, line, patch);
992 static int gitdiff_newfile(struct gitdiff_data *state,
993 const char *line,
994 struct patch *patch)
996 patch->is_new = 1;
997 free(patch->new_name);
998 patch->new_name = xstrdup_or_null(patch->def_name);
999 return gitdiff_newmode(state, line, patch);
1002 static int gitdiff_copysrc(struct gitdiff_data *state,
1003 const char *line,
1004 struct patch *patch)
1006 patch->is_copy = 1;
1007 free(patch->old_name);
1008 patch->old_name = find_name(state->root, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
1009 return 0;
1012 static int gitdiff_copydst(struct gitdiff_data *state,
1013 const char *line,
1014 struct patch *patch)
1016 patch->is_copy = 1;
1017 free(patch->new_name);
1018 patch->new_name = find_name(state->root, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
1019 return 0;
1022 static int gitdiff_renamesrc(struct gitdiff_data *state,
1023 const char *line,
1024 struct patch *patch)
1026 patch->is_rename = 1;
1027 free(patch->old_name);
1028 patch->old_name = find_name(state->root, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
1029 return 0;
1032 static int gitdiff_renamedst(struct gitdiff_data *state,
1033 const char *line,
1034 struct patch *patch)
1036 patch->is_rename = 1;
1037 free(patch->new_name);
1038 patch->new_name = find_name(state->root, line, NULL, state->p_value ? state->p_value - 1 : 0, 0);
1039 return 0;
1042 static int gitdiff_similarity(struct gitdiff_data *state,
1043 const char *line,
1044 struct patch *patch)
1046 unsigned long val = strtoul(line, NULL, 10);
1047 if (val <= 100)
1048 patch->score = val;
1049 return 0;
1052 static int gitdiff_dissimilarity(struct gitdiff_data *state,
1053 const char *line,
1054 struct patch *patch)
1056 unsigned long val = strtoul(line, NULL, 10);
1057 if (val <= 100)
1058 patch->score = val;
1059 return 0;
1062 static int gitdiff_index(struct gitdiff_data *state,
1063 const char *line,
1064 struct patch *patch)
1067 * index line is N hexadecimal, "..", N hexadecimal,
1068 * and optional space with octal mode.
1070 const char *ptr, *eol;
1071 int len;
1072 const unsigned hexsz = the_hash_algo->hexsz;
1074 ptr = strchr(line, '.');
1075 if (!ptr || ptr[1] != '.' || hexsz < ptr - line)
1076 return 0;
1077 len = ptr - line;
1078 memcpy(patch->old_oid_prefix, line, len);
1079 patch->old_oid_prefix[len] = 0;
1081 line = ptr + 2;
1082 ptr = strchr(line, ' ');
1083 eol = strchrnul(line, '\n');
1085 if (!ptr || eol < ptr)
1086 ptr = eol;
1087 len = ptr - line;
1089 if (hexsz < len)
1090 return 0;
1091 memcpy(patch->new_oid_prefix, line, len);
1092 patch->new_oid_prefix[len] = 0;
1093 if (*ptr == ' ')
1094 return gitdiff_oldmode(state, ptr + 1, patch);
1095 return 0;
1099 * This is normal for a diff that doesn't change anything: we'll fall through
1100 * into the next diff. Tell the parser to break out.
1102 static int gitdiff_unrecognized(struct gitdiff_data *state,
1103 const char *line,
1104 struct patch *patch)
1106 return 1;
1110 * Skip p_value leading components from "line"; as we do not accept
1111 * absolute paths, return NULL in that case.
1113 static const char *skip_tree_prefix(int p_value,
1114 const char *line,
1115 int llen)
1117 int nslash;
1118 int i;
1120 if (!p_value)
1121 return (llen && line[0] == '/') ? NULL : line;
1123 nslash = p_value;
1124 for (i = 0; i < llen; i++) {
1125 int ch = line[i];
1126 if (ch == '/' && --nslash <= 0)
1127 return (i == 0) ? NULL : &line[i + 1];
1129 return NULL;
1133 * This is to extract the same name that appears on "diff --git"
1134 * line. We do not find and return anything if it is a rename
1135 * patch, and it is OK because we will find the name elsewhere.
1136 * We need to reliably find name only when it is mode-change only,
1137 * creation or deletion of an empty file. In any of these cases,
1138 * both sides are the same name under a/ and b/ respectively.
1140 static char *git_header_name(int p_value,
1141 const char *line,
1142 int llen)
1144 const char *name;
1145 const char *second = NULL;
1146 size_t len, line_len;
1148 line += strlen("diff --git ");
1149 llen -= strlen("diff --git ");
1151 if (*line == '"') {
1152 const char *cp;
1153 struct strbuf first = STRBUF_INIT;
1154 struct strbuf sp = STRBUF_INIT;
1156 if (unquote_c_style(&first, line, &second))
1157 goto free_and_fail1;
1159 /* strip the a/b prefix including trailing slash */
1160 cp = skip_tree_prefix(p_value, first.buf, first.len);
1161 if (!cp)
1162 goto free_and_fail1;
1163 strbuf_remove(&first, 0, cp - first.buf);
1166 * second points at one past closing dq of name.
1167 * find the second name.
1169 while ((second < line + llen) && isspace(*second))
1170 second++;
1172 if (line + llen <= second)
1173 goto free_and_fail1;
1174 if (*second == '"') {
1175 if (unquote_c_style(&sp, second, NULL))
1176 goto free_and_fail1;
1177 cp = skip_tree_prefix(p_value, sp.buf, sp.len);
1178 if (!cp)
1179 goto free_and_fail1;
1180 /* They must match, otherwise ignore */
1181 if (strcmp(cp, first.buf))
1182 goto free_and_fail1;
1183 strbuf_release(&sp);
1184 return strbuf_detach(&first, NULL);
1187 /* unquoted second */
1188 cp = skip_tree_prefix(p_value, second, line + llen - second);
1189 if (!cp)
1190 goto free_and_fail1;
1191 if (line + llen - cp != first.len ||
1192 memcmp(first.buf, cp, first.len))
1193 goto free_and_fail1;
1194 return strbuf_detach(&first, NULL);
1196 free_and_fail1:
1197 strbuf_release(&first);
1198 strbuf_release(&sp);
1199 return NULL;
1202 /* unquoted first name */
1203 name = skip_tree_prefix(p_value, line, llen);
1204 if (!name)
1205 return NULL;
1208 * since the first name is unquoted, a dq if exists must be
1209 * the beginning of the second name.
1211 for (second = name; second < line + llen; second++) {
1212 if (*second == '"') {
1213 struct strbuf sp = STRBUF_INIT;
1214 const char *np;
1216 if (unquote_c_style(&sp, second, NULL))
1217 goto free_and_fail2;
1219 np = skip_tree_prefix(p_value, sp.buf, sp.len);
1220 if (!np)
1221 goto free_and_fail2;
1223 len = sp.buf + sp.len - np;
1224 if (len < second - name &&
1225 !strncmp(np, name, len) &&
1226 isspace(name[len])) {
1227 /* Good */
1228 strbuf_remove(&sp, 0, np - sp.buf);
1229 return strbuf_detach(&sp, NULL);
1232 free_and_fail2:
1233 strbuf_release(&sp);
1234 return NULL;
1239 * Accept a name only if it shows up twice, exactly the same
1240 * form.
1242 second = strchr(name, '\n');
1243 if (!second)
1244 return NULL;
1245 line_len = second - name;
1246 for (len = 0 ; ; len++) {
1247 switch (name[len]) {
1248 default:
1249 continue;
1250 case '\n':
1251 return NULL;
1252 case '\t': case ' ':
1254 * Is this the separator between the preimage
1255 * and the postimage pathname? Again, we are
1256 * only interested in the case where there is
1257 * no rename, as this is only to set def_name
1258 * and a rename patch has the names elsewhere
1259 * in an unambiguous form.
1261 if (!name[len + 1])
1262 return NULL; /* no postimage name */
1263 second = skip_tree_prefix(p_value, name + len + 1,
1264 line_len - (len + 1));
1265 if (!second)
1266 return NULL;
1268 * Does len bytes starting at "name" and "second"
1269 * (that are separated by one HT or SP we just
1270 * found) exactly match?
1272 if (second[len] == '\n' && !strncmp(name, second, len))
1273 return xmemdupz(name, len);
1278 static int check_header_line(int linenr, struct patch *patch)
1280 int extensions = (patch->is_delete == 1) + (patch->is_new == 1) +
1281 (patch->is_rename == 1) + (patch->is_copy == 1);
1282 if (extensions > 1)
1283 return error(_("inconsistent header lines %d and %d"),
1284 patch->extension_linenr, linenr);
1285 if (extensions && !patch->extension_linenr)
1286 patch->extension_linenr = linenr;
1287 return 0;
1290 int parse_git_diff_header(struct strbuf *root,
1291 int *linenr,
1292 int p_value,
1293 const char *line,
1294 int len,
1295 unsigned int size,
1296 struct patch *patch)
1298 unsigned long offset;
1299 struct gitdiff_data parse_hdr_state;
1301 /* A git diff has explicit new/delete information, so we don't guess */
1302 patch->is_new = 0;
1303 patch->is_delete = 0;
1306 * Some things may not have the old name in the
1307 * rest of the headers anywhere (pure mode changes,
1308 * or removing or adding empty files), so we get
1309 * the default name from the header.
1311 patch->def_name = git_header_name(p_value, line, len);
1312 if (patch->def_name && root->len) {
1313 char *s = xstrfmt("%s%s", root->buf, patch->def_name);
1314 free(patch->def_name);
1315 patch->def_name = s;
1318 line += len;
1319 size -= len;
1320 (*linenr)++;
1321 parse_hdr_state.root = root;
1322 parse_hdr_state.linenr = *linenr;
1323 parse_hdr_state.p_value = p_value;
1325 for (offset = len ; size > 0 ; offset += len, size -= len, line += len, (*linenr)++) {
1326 static const struct opentry {
1327 const char *str;
1328 int (*fn)(struct gitdiff_data *, const char *, struct patch *);
1329 } optable[] = {
1330 { "@@ -", gitdiff_hdrend },
1331 { "--- ", gitdiff_oldname },
1332 { "+++ ", gitdiff_newname },
1333 { "old mode ", gitdiff_oldmode },
1334 { "new mode ", gitdiff_newmode },
1335 { "deleted file mode ", gitdiff_delete },
1336 { "new file mode ", gitdiff_newfile },
1337 { "copy from ", gitdiff_copysrc },
1338 { "copy to ", gitdiff_copydst },
1339 { "rename old ", gitdiff_renamesrc },
1340 { "rename new ", gitdiff_renamedst },
1341 { "rename from ", gitdiff_renamesrc },
1342 { "rename to ", gitdiff_renamedst },
1343 { "similarity index ", gitdiff_similarity },
1344 { "dissimilarity index ", gitdiff_dissimilarity },
1345 { "index ", gitdiff_index },
1346 { "", gitdiff_unrecognized },
1348 int i;
1350 len = linelen(line, size);
1351 if (!len || line[len-1] != '\n')
1352 break;
1353 for (i = 0; i < ARRAY_SIZE(optable); i++) {
1354 const struct opentry *p = optable + i;
1355 int oplen = strlen(p->str);
1356 int res;
1357 if (len < oplen || memcmp(p->str, line, oplen))
1358 continue;
1359 res = p->fn(&parse_hdr_state, line + oplen, patch);
1360 if (res < 0)
1361 return -1;
1362 if (check_header_line(*linenr, patch))
1363 return -1;
1364 if (res > 0)
1365 goto done;
1366 break;
1370 done:
1371 if (!patch->old_name && !patch->new_name) {
1372 if (!patch->def_name) {
1373 error(Q_("git diff header lacks filename information when removing "
1374 "%d leading pathname component (line %d)",
1375 "git diff header lacks filename information when removing "
1376 "%d leading pathname components (line %d)",
1377 parse_hdr_state.p_value),
1378 parse_hdr_state.p_value, *linenr);
1379 return -128;
1381 patch->old_name = xstrdup(patch->def_name);
1382 patch->new_name = xstrdup(patch->def_name);
1384 if ((!patch->new_name && !patch->is_delete) ||
1385 (!patch->old_name && !patch->is_new)) {
1386 error(_("git diff header lacks filename information "
1387 "(line %d)"), *linenr);
1388 return -128;
1390 patch->is_toplevel_relative = 1;
1391 return offset;
1394 static int parse_num(const char *line, unsigned long *p)
1396 char *ptr;
1398 if (!isdigit(*line))
1399 return 0;
1400 *p = strtoul(line, &ptr, 10);
1401 return ptr - line;
1404 static int parse_range(const char *line, int len, int offset, const char *expect,
1405 unsigned long *p1, unsigned long *p2)
1407 int digits, ex;
1409 if (offset < 0 || offset >= len)
1410 return -1;
1411 line += offset;
1412 len -= offset;
1414 digits = parse_num(line, p1);
1415 if (!digits)
1416 return -1;
1418 offset += digits;
1419 line += digits;
1420 len -= digits;
1422 *p2 = 1;
1423 if (*line == ',') {
1424 digits = parse_num(line+1, p2);
1425 if (!digits)
1426 return -1;
1428 offset += digits+1;
1429 line += digits+1;
1430 len -= digits+1;
1433 ex = strlen(expect);
1434 if (ex > len)
1435 return -1;
1436 if (memcmp(line, expect, ex))
1437 return -1;
1439 return offset + ex;
1442 static void recount_diff(const char *line, int size, struct fragment *fragment)
1444 int oldlines = 0, newlines = 0, ret = 0;
1446 if (size < 1) {
1447 warning("recount: ignore empty hunk");
1448 return;
1451 for (;;) {
1452 int len = linelen(line, size);
1453 size -= len;
1454 line += len;
1456 if (size < 1)
1457 break;
1459 switch (*line) {
1460 case ' ': case '\n':
1461 newlines++;
1462 /* fall through */
1463 case '-':
1464 oldlines++;
1465 continue;
1466 case '+':
1467 newlines++;
1468 continue;
1469 case '\\':
1470 continue;
1471 case '@':
1472 ret = size < 3 || !starts_with(line, "@@ ");
1473 break;
1474 case 'd':
1475 ret = size < 5 || !starts_with(line, "diff ");
1476 break;
1477 default:
1478 ret = -1;
1479 break;
1481 if (ret) {
1482 warning(_("recount: unexpected line: %.*s"),
1483 (int)linelen(line, size), line);
1484 return;
1486 break;
1488 fragment->oldlines = oldlines;
1489 fragment->newlines = newlines;
1493 * Parse a unified diff fragment header of the
1494 * form "@@ -a,b +c,d @@"
1496 static int parse_fragment_header(const char *line, int len, struct fragment *fragment)
1498 int offset;
1500 if (!len || line[len-1] != '\n')
1501 return -1;
1503 /* Figure out the number of lines in a fragment */
1504 offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);
1505 offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);
1507 return offset;
1511 * Find file diff header
1513 * Returns:
1514 * -1 if no header was found
1515 * -128 in case of error
1516 * the size of the header in bytes (called "offset") otherwise
1518 static int find_header(struct apply_state *state,
1519 const char *line,
1520 unsigned long size,
1521 int *hdrsize,
1522 struct patch *patch)
1524 unsigned long offset, len;
1526 patch->is_toplevel_relative = 0;
1527 patch->is_rename = patch->is_copy = 0;
1528 patch->is_new = patch->is_delete = -1;
1529 patch->old_mode = patch->new_mode = 0;
1530 patch->old_name = patch->new_name = NULL;
1531 for (offset = 0; size > 0; offset += len, size -= len, line += len, state->linenr++) {
1532 unsigned long nextlen;
1534 len = linelen(line, size);
1535 if (!len)
1536 break;
1538 /* Testing this early allows us to take a few shortcuts.. */
1539 if (len < 6)
1540 continue;
1543 * Make sure we don't find any unconnected patch fragments.
1544 * That's a sign that we didn't find a header, and that a
1545 * patch has become corrupted/broken up.
1547 if (!memcmp("@@ -", line, 4)) {
1548 struct fragment dummy;
1549 if (parse_fragment_header(line, len, &dummy) < 0)
1550 continue;
1551 error(_("patch fragment without header at line %d: %.*s"),
1552 state->linenr, (int)len-1, line);
1553 return -128;
1556 if (size < len + 6)
1557 break;
1560 * Git patch? It might not have a real patch, just a rename
1561 * or mode change, so we handle that specially
1563 if (!memcmp("diff --git ", line, 11)) {
1564 int git_hdr_len = parse_git_diff_header(&state->root, &state->linenr,
1565 state->p_value, line, len,
1566 size, patch);
1567 if (git_hdr_len < 0)
1568 return -128;
1569 if (git_hdr_len <= len)
1570 continue;
1571 *hdrsize = git_hdr_len;
1572 return offset;
1575 /* --- followed by +++ ? */
1576 if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4))
1577 continue;
1580 * We only accept unified patches, so we want it to
1581 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
1582 * minimum ("@@ -0,0 +1 @@\n" is the shortest).
1584 nextlen = linelen(line + len, size - len);
1585 if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))
1586 continue;
1588 /* Ok, we'll consider it a patch */
1589 if (parse_traditional_patch(state, line, line+len, patch))
1590 return -128;
1591 *hdrsize = len + nextlen;
1592 state->linenr += 2;
1593 return offset;
1595 return -1;
1598 static void record_ws_error(struct apply_state *state,
1599 unsigned result,
1600 const char *line,
1601 int len,
1602 int linenr)
1604 char *err;
1606 if (!result)
1607 return;
1609 state->whitespace_error++;
1610 if (state->squelch_whitespace_errors &&
1611 state->squelch_whitespace_errors < state->whitespace_error)
1612 return;
1614 err = whitespace_error_string(result);
1615 if (state->apply_verbosity > verbosity_silent)
1616 fprintf(stderr, "%s:%d: %s.\n%.*s\n",
1617 state->patch_input_file, linenr, err, len, line);
1618 free(err);
1621 static void check_whitespace(struct apply_state *state,
1622 const char *line,
1623 int len,
1624 unsigned ws_rule)
1626 unsigned result = ws_check(line + 1, len - 1, ws_rule);
1628 record_ws_error(state, result, line + 1, len - 2, state->linenr);
1632 * Check if the patch has context lines with CRLF or
1633 * the patch wants to remove lines with CRLF.
1635 static void check_old_for_crlf(struct patch *patch, const char *line, int len)
1637 if (len >= 2 && line[len-1] == '\n' && line[len-2] == '\r') {
1638 patch->ws_rule |= WS_CR_AT_EOL;
1639 patch->crlf_in_old = 1;
1645 * Parse a unified diff. Note that this really needs to parse each
1646 * fragment separately, since the only way to know the difference
1647 * between a "---" that is part of a patch, and a "---" that starts
1648 * the next patch is to look at the line counts..
1650 static int parse_fragment(struct apply_state *state,
1651 const char *line,
1652 unsigned long size,
1653 struct patch *patch,
1654 struct fragment *fragment)
1656 int added, deleted;
1657 int len = linelen(line, size), offset;
1658 unsigned long oldlines, newlines;
1659 unsigned long leading, trailing;
1661 offset = parse_fragment_header(line, len, fragment);
1662 if (offset < 0)
1663 return -1;
1664 if (offset > 0 && patch->recount)
1665 recount_diff(line + offset, size - offset, fragment);
1666 oldlines = fragment->oldlines;
1667 newlines = fragment->newlines;
1668 leading = 0;
1669 trailing = 0;
1671 /* Parse the thing.. */
1672 line += len;
1673 size -= len;
1674 state->linenr++;
1675 added = deleted = 0;
1676 for (offset = len;
1677 0 < size;
1678 offset += len, size -= len, line += len, state->linenr++) {
1679 if (!oldlines && !newlines)
1680 break;
1681 len = linelen(line, size);
1682 if (!len || line[len-1] != '\n')
1683 return -1;
1684 switch (*line) {
1685 default:
1686 return -1;
1687 case '\n': /* newer GNU diff, an empty context line */
1688 case ' ':
1689 oldlines--;
1690 newlines--;
1691 if (!deleted && !added)
1692 leading++;
1693 trailing++;
1694 check_old_for_crlf(patch, line, len);
1695 if (!state->apply_in_reverse &&
1696 state->ws_error_action == correct_ws_error)
1697 check_whitespace(state, line, len, patch->ws_rule);
1698 break;
1699 case '-':
1700 if (!state->apply_in_reverse)
1701 check_old_for_crlf(patch, line, len);
1702 if (state->apply_in_reverse &&
1703 state->ws_error_action != nowarn_ws_error)
1704 check_whitespace(state, line, len, patch->ws_rule);
1705 deleted++;
1706 oldlines--;
1707 trailing = 0;
1708 break;
1709 case '+':
1710 if (state->apply_in_reverse)
1711 check_old_for_crlf(patch, line, len);
1712 if (!state->apply_in_reverse &&
1713 state->ws_error_action != nowarn_ws_error)
1714 check_whitespace(state, line, len, patch->ws_rule);
1715 added++;
1716 newlines--;
1717 trailing = 0;
1718 break;
1721 * We allow "\ No newline at end of file". Depending
1722 * on locale settings when the patch was produced we
1723 * don't know what this line looks like. The only
1724 * thing we do know is that it begins with "\ ".
1725 * Checking for 12 is just for sanity check -- any
1726 * l10n of "\ No newline..." is at least that long.
1728 case '\\':
1729 if (len < 12 || memcmp(line, "\\ ", 2))
1730 return -1;
1731 break;
1734 if (oldlines || newlines)
1735 return -1;
1736 if (!patch->recount && !deleted && !added)
1737 return -1;
1739 fragment->leading = leading;
1740 fragment->trailing = trailing;
1743 * If a fragment ends with an incomplete line, we failed to include
1744 * it in the above loop because we hit oldlines == newlines == 0
1745 * before seeing it.
1747 if (12 < size && !memcmp(line, "\\ ", 2))
1748 offset += linelen(line, size);
1750 patch->lines_added += added;
1751 patch->lines_deleted += deleted;
1753 if (0 < patch->is_new && oldlines)
1754 return error(_("new file depends on old contents"));
1755 if (0 < patch->is_delete && newlines)
1756 return error(_("deleted file still has contents"));
1757 return offset;
1761 * We have seen "diff --git a/... b/..." header (or a traditional patch
1762 * header). Read hunks that belong to this patch into fragments and hang
1763 * them to the given patch structure.
1765 * The (fragment->patch, fragment->size) pair points into the memory given
1766 * by the caller, not a copy, when we return.
1768 * Returns:
1769 * -1 in case of error,
1770 * the number of bytes in the patch otherwise.
1772 static int parse_single_patch(struct apply_state *state,
1773 const char *line,
1774 unsigned long size,
1775 struct patch *patch)
1777 unsigned long offset = 0;
1778 unsigned long oldlines = 0, newlines = 0, context = 0;
1779 struct fragment **fragp = &patch->fragments;
1781 while (size > 4 && !memcmp(line, "@@ -", 4)) {
1782 struct fragment *fragment;
1783 int len;
1785 CALLOC_ARRAY(fragment, 1);
1786 fragment->linenr = state->linenr;
1787 len = parse_fragment(state, line, size, patch, fragment);
1788 if (len <= 0) {
1789 free(fragment);
1790 return error(_("corrupt patch at line %d"), state->linenr);
1792 fragment->patch = line;
1793 fragment->size = len;
1794 oldlines += fragment->oldlines;
1795 newlines += fragment->newlines;
1796 context += fragment->leading + fragment->trailing;
1798 *fragp = fragment;
1799 fragp = &fragment->next;
1801 offset += len;
1802 line += len;
1803 size -= len;
1807 * If something was removed (i.e. we have old-lines) it cannot
1808 * be creation, and if something was added it cannot be
1809 * deletion. However, the reverse is not true; --unified=0
1810 * patches that only add are not necessarily creation even
1811 * though they do not have any old lines, and ones that only
1812 * delete are not necessarily deletion.
1814 * Unfortunately, a real creation/deletion patch do _not_ have
1815 * any context line by definition, so we cannot safely tell it
1816 * apart with --unified=0 insanity. At least if the patch has
1817 * more than one hunk it is not creation or deletion.
1819 if (patch->is_new < 0 &&
1820 (oldlines || (patch->fragments && patch->fragments->next)))
1821 patch->is_new = 0;
1822 if (patch->is_delete < 0 &&
1823 (newlines || (patch->fragments && patch->fragments->next)))
1824 patch->is_delete = 0;
1826 if (0 < patch->is_new && oldlines)
1827 return error(_("new file %s depends on old contents"), patch->new_name);
1828 if (0 < patch->is_delete && newlines)
1829 return error(_("deleted file %s still has contents"), patch->old_name);
1830 if (!patch->is_delete && !newlines && context && state->apply_verbosity > verbosity_silent)
1831 fprintf_ln(stderr,
1832 _("** warning: "
1833 "file %s becomes empty but is not deleted"),
1834 patch->new_name);
1836 return offset;
1839 static inline int metadata_changes(struct patch *patch)
1841 return patch->is_rename > 0 ||
1842 patch->is_copy > 0 ||
1843 patch->is_new > 0 ||
1844 patch->is_delete ||
1845 (patch->old_mode && patch->new_mode &&
1846 patch->old_mode != patch->new_mode);
1849 static char *inflate_it(const void *data, unsigned long size,
1850 unsigned long inflated_size)
1852 git_zstream stream;
1853 void *out;
1854 int st;
1856 memset(&stream, 0, sizeof(stream));
1858 stream.next_in = (unsigned char *)data;
1859 stream.avail_in = size;
1860 stream.next_out = out = xmalloc(inflated_size);
1861 stream.avail_out = inflated_size;
1862 git_inflate_init(&stream);
1863 st = git_inflate(&stream, Z_FINISH);
1864 git_inflate_end(&stream);
1865 if ((st != Z_STREAM_END) || stream.total_out != inflated_size) {
1866 free(out);
1867 return NULL;
1869 return out;
1873 * Read a binary hunk and return a new fragment; fragment->patch
1874 * points at an allocated memory that the caller must free, so
1875 * it is marked as "->free_patch = 1".
1877 static struct fragment *parse_binary_hunk(struct apply_state *state,
1878 char **buf_p,
1879 unsigned long *sz_p,
1880 int *status_p,
1881 int *used_p)
1884 * Expect a line that begins with binary patch method ("literal"
1885 * or "delta"), followed by the length of data before deflating.
1886 * a sequence of 'length-byte' followed by base-85 encoded data
1887 * should follow, terminated by a newline.
1889 * Each 5-byte sequence of base-85 encodes up to 4 bytes,
1890 * and we would limit the patch line to 66 characters,
1891 * so one line can fit up to 13 groups that would decode
1892 * to 52 bytes max. The length byte 'A'-'Z' corresponds
1893 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
1895 int llen, used;
1896 unsigned long size = *sz_p;
1897 char *buffer = *buf_p;
1898 int patch_method;
1899 unsigned long origlen;
1900 char *data = NULL;
1901 int hunk_size = 0;
1902 struct fragment *frag;
1904 llen = linelen(buffer, size);
1905 used = llen;
1907 *status_p = 0;
1909 if (starts_with(buffer, "delta ")) {
1910 patch_method = BINARY_DELTA_DEFLATED;
1911 origlen = strtoul(buffer + 6, NULL, 10);
1913 else if (starts_with(buffer, "literal ")) {
1914 patch_method = BINARY_LITERAL_DEFLATED;
1915 origlen = strtoul(buffer + 8, NULL, 10);
1917 else
1918 return NULL;
1920 state->linenr++;
1921 buffer += llen;
1922 while (1) {
1923 int byte_length, max_byte_length, newsize;
1924 llen = linelen(buffer, size);
1925 used += llen;
1926 state->linenr++;
1927 if (llen == 1) {
1928 /* consume the blank line */
1929 buffer++;
1930 size--;
1931 break;
1934 * Minimum line is "A00000\n" which is 7-byte long,
1935 * and the line length must be multiple of 5 plus 2.
1937 if ((llen < 7) || (llen-2) % 5)
1938 goto corrupt;
1939 max_byte_length = (llen - 2) / 5 * 4;
1940 byte_length = *buffer;
1941 if ('A' <= byte_length && byte_length <= 'Z')
1942 byte_length = byte_length - 'A' + 1;
1943 else if ('a' <= byte_length && byte_length <= 'z')
1944 byte_length = byte_length - 'a' + 27;
1945 else
1946 goto corrupt;
1947 /* if the input length was not multiple of 4, we would
1948 * have filler at the end but the filler should never
1949 * exceed 3 bytes
1951 if (max_byte_length < byte_length ||
1952 byte_length <= max_byte_length - 4)
1953 goto corrupt;
1954 newsize = hunk_size + byte_length;
1955 data = xrealloc(data, newsize);
1956 if (decode_85(data + hunk_size, buffer + 1, byte_length))
1957 goto corrupt;
1958 hunk_size = newsize;
1959 buffer += llen;
1960 size -= llen;
1963 CALLOC_ARRAY(frag, 1);
1964 frag->patch = inflate_it(data, hunk_size, origlen);
1965 frag->free_patch = 1;
1966 if (!frag->patch)
1967 goto corrupt;
1968 free(data);
1969 frag->size = origlen;
1970 *buf_p = buffer;
1971 *sz_p = size;
1972 *used_p = used;
1973 frag->binary_patch_method = patch_method;
1974 return frag;
1976 corrupt:
1977 free(data);
1978 *status_p = -1;
1979 error(_("corrupt binary patch at line %d: %.*s"),
1980 state->linenr-1, llen-1, buffer);
1981 return NULL;
1985 * Returns:
1986 * -1 in case of error,
1987 * the length of the parsed binary patch otherwise
1989 static int parse_binary(struct apply_state *state,
1990 char *buffer,
1991 unsigned long size,
1992 struct patch *patch)
1995 * We have read "GIT binary patch\n"; what follows is a line
1996 * that says the patch method (currently, either "literal" or
1997 * "delta") and the length of data before deflating; a
1998 * sequence of 'length-byte' followed by base-85 encoded data
1999 * follows.
2001 * When a binary patch is reversible, there is another binary
2002 * hunk in the same format, starting with patch method (either
2003 * "literal" or "delta") with the length of data, and a sequence
2004 * of length-byte + base-85 encoded data, terminated with another
2005 * empty line. This data, when applied to the postimage, produces
2006 * the preimage.
2008 struct fragment *forward;
2009 struct fragment *reverse;
2010 int status;
2011 int used, used_1;
2013 forward = parse_binary_hunk(state, &buffer, &size, &status, &used);
2014 if (!forward && !status)
2015 /* there has to be one hunk (forward hunk) */
2016 return error(_("unrecognized binary patch at line %d"), state->linenr-1);
2017 if (status)
2018 /* otherwise we already gave an error message */
2019 return status;
2021 reverse = parse_binary_hunk(state, &buffer, &size, &status, &used_1);
2022 if (reverse)
2023 used += used_1;
2024 else if (status) {
2026 * Not having reverse hunk is not an error, but having
2027 * a corrupt reverse hunk is.
2029 free((void*) forward->patch);
2030 free(forward);
2031 return status;
2033 forward->next = reverse;
2034 patch->fragments = forward;
2035 patch->is_binary = 1;
2036 return used;
2039 static void prefix_one(struct apply_state *state, char **name)
2041 char *old_name = *name;
2042 if (!old_name)
2043 return;
2044 *name = prefix_filename(state->prefix, *name);
2045 free(old_name);
2048 static void prefix_patch(struct apply_state *state, struct patch *p)
2050 if (!state->prefix || p->is_toplevel_relative)
2051 return;
2052 prefix_one(state, &p->new_name);
2053 prefix_one(state, &p->old_name);
2057 * include/exclude
2060 static void add_name_limit(struct apply_state *state,
2061 const char *name,
2062 int exclude)
2064 struct string_list_item *it;
2066 it = string_list_append(&state->limit_by_name, name);
2067 it->util = exclude ? NULL : (void *) 1;
2070 static int use_patch(struct apply_state *state, struct patch *p)
2072 const char *pathname = p->new_name ? p->new_name : p->old_name;
2073 int i;
2075 /* Paths outside are not touched regardless of "--include" */
2076 if (state->prefix && *state->prefix) {
2077 const char *rest;
2078 if (!skip_prefix(pathname, state->prefix, &rest) || !*rest)
2079 return 0;
2082 /* See if it matches any of exclude/include rule */
2083 for (i = 0; i < state->limit_by_name.nr; i++) {
2084 struct string_list_item *it = &state->limit_by_name.items[i];
2085 if (!wildmatch(it->string, pathname, 0))
2086 return (it->util != NULL);
2090 * If we had any include, a path that does not match any rule is
2091 * not used. Otherwise, we saw bunch of exclude rules (or none)
2092 * and such a path is used.
2094 return !state->has_include;
2098 * Read the patch text in "buffer" that extends for "size" bytes; stop
2099 * reading after seeing a single patch (i.e. changes to a single file).
2100 * Create fragments (i.e. patch hunks) and hang them to the given patch.
2102 * Returns:
2103 * -1 if no header was found or parse_binary() failed,
2104 * -128 on another error,
2105 * the number of bytes consumed otherwise,
2106 * so that the caller can call us again for the next patch.
2108 static int parse_chunk(struct apply_state *state, char *buffer, unsigned long size, struct patch *patch)
2110 int hdrsize, patchsize;
2111 int offset = find_header(state, buffer, size, &hdrsize, patch);
2113 if (offset < 0)
2114 return offset;
2116 prefix_patch(state, patch);
2118 if (!use_patch(state, patch))
2119 patch->ws_rule = 0;
2120 else if (patch->new_name)
2121 patch->ws_rule = whitespace_rule(state->repo->index,
2122 patch->new_name);
2123 else
2124 patch->ws_rule = whitespace_rule(state->repo->index,
2125 patch->old_name);
2127 patchsize = parse_single_patch(state,
2128 buffer + offset + hdrsize,
2129 size - offset - hdrsize,
2130 patch);
2132 if (patchsize < 0)
2133 return -128;
2135 if (!patchsize) {
2136 static const char git_binary[] = "GIT binary patch\n";
2137 int hd = hdrsize + offset;
2138 unsigned long llen = linelen(buffer + hd, size - hd);
2140 if (llen == sizeof(git_binary) - 1 &&
2141 !memcmp(git_binary, buffer + hd, llen)) {
2142 int used;
2143 state->linenr++;
2144 used = parse_binary(state, buffer + hd + llen,
2145 size - hd - llen, patch);
2146 if (used < 0)
2147 return -1;
2148 if (used)
2149 patchsize = used + llen;
2150 else
2151 patchsize = 0;
2153 else if (!memcmp(" differ\n", buffer + hd + llen - 8, 8)) {
2154 static const char *binhdr[] = {
2155 "Binary files ",
2156 "Files ",
2157 NULL,
2159 int i;
2160 for (i = 0; binhdr[i]; i++) {
2161 int len = strlen(binhdr[i]);
2162 if (len < size - hd &&
2163 !memcmp(binhdr[i], buffer + hd, len)) {
2164 state->linenr++;
2165 patch->is_binary = 1;
2166 patchsize = llen;
2167 break;
2172 /* Empty patch cannot be applied if it is a text patch
2173 * without metadata change. A binary patch appears
2174 * empty to us here.
2176 if ((state->apply || state->check) &&
2177 (!patch->is_binary && !metadata_changes(patch))) {
2178 error(_("patch with only garbage at line %d"), state->linenr);
2179 return -128;
2183 return offset + hdrsize + patchsize;
2186 static void reverse_patches(struct patch *p)
2188 for (; p; p = p->next) {
2189 struct fragment *frag = p->fragments;
2191 SWAP(p->new_name, p->old_name);
2192 SWAP(p->new_mode, p->old_mode);
2193 SWAP(p->is_new, p->is_delete);
2194 SWAP(p->lines_added, p->lines_deleted);
2195 SWAP(p->old_oid_prefix, p->new_oid_prefix);
2197 for (; frag; frag = frag->next) {
2198 SWAP(frag->newpos, frag->oldpos);
2199 SWAP(frag->newlines, frag->oldlines);
2204 static const char pluses[] =
2205 "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
2206 static const char minuses[]=
2207 "----------------------------------------------------------------------";
2209 static void show_stats(struct apply_state *state, struct patch *patch)
2211 struct strbuf qname = STRBUF_INIT;
2212 char *cp = patch->new_name ? patch->new_name : patch->old_name;
2213 int max, add, del;
2215 quote_c_style(cp, &qname, NULL, 0);
2218 * "scale" the filename
2220 max = state->max_len;
2221 if (max > 50)
2222 max = 50;
2224 if (qname.len > max) {
2225 cp = strchr(qname.buf + qname.len + 3 - max, '/');
2226 if (!cp)
2227 cp = qname.buf + qname.len + 3 - max;
2228 strbuf_splice(&qname, 0, cp - qname.buf, "...", 3);
2231 if (patch->is_binary) {
2232 printf(" %-*s | Bin\n", max, qname.buf);
2233 strbuf_release(&qname);
2234 return;
2237 printf(" %-*s |", max, qname.buf);
2238 strbuf_release(&qname);
2241 * scale the add/delete
2243 max = max + state->max_change > 70 ? 70 - max : state->max_change;
2244 add = patch->lines_added;
2245 del = patch->lines_deleted;
2247 if (state->max_change > 0) {
2248 int total = ((add + del) * max + state->max_change / 2) / state->max_change;
2249 add = (add * max + state->max_change / 2) / state->max_change;
2250 del = total - add;
2252 printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,
2253 add, pluses, del, minuses);
2256 static int read_old_data(struct stat *st, struct patch *patch,
2257 const char *path, struct strbuf *buf)
2259 int conv_flags = patch->crlf_in_old ?
2260 CONV_EOL_KEEP_CRLF : CONV_EOL_RENORMALIZE;
2261 switch (st->st_mode & S_IFMT) {
2262 case S_IFLNK:
2263 if (strbuf_readlink(buf, path, st->st_size) < 0)
2264 return error(_("unable to read symlink %s"), path);
2265 return 0;
2266 case S_IFREG:
2267 if (strbuf_read_file(buf, path, st->st_size) != st->st_size)
2268 return error(_("unable to open or read %s"), path);
2270 * "git apply" without "--index/--cached" should never look
2271 * at the index; the target file may not have been added to
2272 * the index yet, and we may not even be in any Git repository.
2273 * Pass NULL to convert_to_git() to stress this; the function
2274 * should never look at the index when explicit crlf option
2275 * is given.
2277 convert_to_git(NULL, path, buf->buf, buf->len, buf, conv_flags);
2278 return 0;
2279 default:
2280 return -1;
2285 * Update the preimage, and the common lines in postimage,
2286 * from buffer buf of length len. If postlen is 0 the postimage
2287 * is updated in place, otherwise it's updated on a new buffer
2288 * of length postlen
2291 static void update_pre_post_images(struct image *preimage,
2292 struct image *postimage,
2293 char *buf,
2294 size_t len, size_t postlen)
2296 int i, ctx, reduced;
2297 char *new_buf, *old_buf, *fixed;
2298 struct image fixed_preimage;
2301 * Update the preimage with whitespace fixes. Note that we
2302 * are not losing preimage->buf -- apply_one_fragment() will
2303 * free "oldlines".
2305 prepare_image(&fixed_preimage, buf, len, 1);
2306 assert(postlen
2307 ? fixed_preimage.nr == preimage->nr
2308 : fixed_preimage.nr <= preimage->nr);
2309 for (i = 0; i < fixed_preimage.nr; i++)
2310 fixed_preimage.line[i].flag = preimage->line[i].flag;
2311 free(preimage->line_allocated);
2312 *preimage = fixed_preimage;
2315 * Adjust the common context lines in postimage. This can be
2316 * done in-place when we are shrinking it with whitespace
2317 * fixing, but needs a new buffer when ignoring whitespace or
2318 * expanding leading tabs to spaces.
2320 * We trust the caller to tell us if the update can be done
2321 * in place (postlen==0) or not.
2323 old_buf = postimage->buf;
2324 if (postlen)
2325 new_buf = postimage->buf = xmalloc(postlen);
2326 else
2327 new_buf = old_buf;
2328 fixed = preimage->buf;
2330 for (i = reduced = ctx = 0; i < postimage->nr; i++) {
2331 size_t l_len = postimage->line[i].len;
2332 if (!(postimage->line[i].flag & LINE_COMMON)) {
2333 /* an added line -- no counterparts in preimage */
2334 memmove(new_buf, old_buf, l_len);
2335 old_buf += l_len;
2336 new_buf += l_len;
2337 continue;
2340 /* a common context -- skip it in the original postimage */
2341 old_buf += l_len;
2343 /* and find the corresponding one in the fixed preimage */
2344 while (ctx < preimage->nr &&
2345 !(preimage->line[ctx].flag & LINE_COMMON)) {
2346 fixed += preimage->line[ctx].len;
2347 ctx++;
2351 * preimage is expected to run out, if the caller
2352 * fixed addition of trailing blank lines.
2354 if (preimage->nr <= ctx) {
2355 reduced++;
2356 continue;
2359 /* and copy it in, while fixing the line length */
2360 l_len = preimage->line[ctx].len;
2361 memcpy(new_buf, fixed, l_len);
2362 new_buf += l_len;
2363 fixed += l_len;
2364 postimage->line[i].len = l_len;
2365 ctx++;
2368 if (postlen
2369 ? postlen < new_buf - postimage->buf
2370 : postimage->len < new_buf - postimage->buf)
2371 BUG("caller miscounted postlen: asked %d, orig = %d, used = %d",
2372 (int)postlen, (int) postimage->len, (int)(new_buf - postimage->buf));
2374 /* Fix the length of the whole thing */
2375 postimage->len = new_buf - postimage->buf;
2376 postimage->nr -= reduced;
2379 static int line_by_line_fuzzy_match(struct image *img,
2380 struct image *preimage,
2381 struct image *postimage,
2382 unsigned long current,
2383 int current_lno,
2384 int preimage_limit)
2386 int i;
2387 size_t imgoff = 0;
2388 size_t preoff = 0;
2389 size_t postlen = postimage->len;
2390 size_t extra_chars;
2391 char *buf;
2392 char *preimage_eof;
2393 char *preimage_end;
2394 struct strbuf fixed;
2395 char *fixed_buf;
2396 size_t fixed_len;
2398 for (i = 0; i < preimage_limit; i++) {
2399 size_t prelen = preimage->line[i].len;
2400 size_t imglen = img->line[current_lno+i].len;
2402 if (!fuzzy_matchlines(img->buf + current + imgoff, imglen,
2403 preimage->buf + preoff, prelen))
2404 return 0;
2405 if (preimage->line[i].flag & LINE_COMMON)
2406 postlen += imglen - prelen;
2407 imgoff += imglen;
2408 preoff += prelen;
2412 * Ok, the preimage matches with whitespace fuzz.
2414 * imgoff now holds the true length of the target that
2415 * matches the preimage before the end of the file.
2417 * Count the number of characters in the preimage that fall
2418 * beyond the end of the file and make sure that all of them
2419 * are whitespace characters. (This can only happen if
2420 * we are removing blank lines at the end of the file.)
2422 buf = preimage_eof = preimage->buf + preoff;
2423 for ( ; i < preimage->nr; i++)
2424 preoff += preimage->line[i].len;
2425 preimage_end = preimage->buf + preoff;
2426 for ( ; buf < preimage_end; buf++)
2427 if (!isspace(*buf))
2428 return 0;
2431 * Update the preimage and the common postimage context
2432 * lines to use the same whitespace as the target.
2433 * If whitespace is missing in the target (i.e.
2434 * if the preimage extends beyond the end of the file),
2435 * use the whitespace from the preimage.
2437 extra_chars = preimage_end - preimage_eof;
2438 strbuf_init(&fixed, imgoff + extra_chars);
2439 strbuf_add(&fixed, img->buf + current, imgoff);
2440 strbuf_add(&fixed, preimage_eof, extra_chars);
2441 fixed_buf = strbuf_detach(&fixed, &fixed_len);
2442 update_pre_post_images(preimage, postimage,
2443 fixed_buf, fixed_len, postlen);
2444 return 1;
2447 static int match_fragment(struct apply_state *state,
2448 struct image *img,
2449 struct image *preimage,
2450 struct image *postimage,
2451 unsigned long current,
2452 int current_lno,
2453 unsigned ws_rule,
2454 int match_beginning, int match_end)
2456 int i;
2457 char *fixed_buf, *buf, *orig, *target;
2458 struct strbuf fixed;
2459 size_t fixed_len, postlen;
2460 int preimage_limit;
2462 if (preimage->nr + current_lno <= img->nr) {
2464 * The hunk falls within the boundaries of img.
2466 preimage_limit = preimage->nr;
2467 if (match_end && (preimage->nr + current_lno != img->nr))
2468 return 0;
2469 } else if (state->ws_error_action == correct_ws_error &&
2470 (ws_rule & WS_BLANK_AT_EOF)) {
2472 * This hunk extends beyond the end of img, and we are
2473 * removing blank lines at the end of the file. This
2474 * many lines from the beginning of the preimage must
2475 * match with img, and the remainder of the preimage
2476 * must be blank.
2478 preimage_limit = img->nr - current_lno;
2479 } else {
2481 * The hunk extends beyond the end of the img and
2482 * we are not removing blanks at the end, so we
2483 * should reject the hunk at this position.
2485 return 0;
2488 if (match_beginning && current_lno)
2489 return 0;
2491 /* Quick hash check */
2492 for (i = 0; i < preimage_limit; i++)
2493 if ((img->line[current_lno + i].flag & LINE_PATCHED) ||
2494 (preimage->line[i].hash != img->line[current_lno + i].hash))
2495 return 0;
2497 if (preimage_limit == preimage->nr) {
2499 * Do we have an exact match? If we were told to match
2500 * at the end, size must be exactly at current+fragsize,
2501 * otherwise current+fragsize must be still within the preimage,
2502 * and either case, the old piece should match the preimage
2503 * exactly.
2505 if ((match_end
2506 ? (current + preimage->len == img->len)
2507 : (current + preimage->len <= img->len)) &&
2508 !memcmp(img->buf + current, preimage->buf, preimage->len))
2509 return 1;
2510 } else {
2512 * The preimage extends beyond the end of img, so
2513 * there cannot be an exact match.
2515 * There must be one non-blank context line that match
2516 * a line before the end of img.
2518 char *buf_end;
2520 buf = preimage->buf;
2521 buf_end = buf;
2522 for (i = 0; i < preimage_limit; i++)
2523 buf_end += preimage->line[i].len;
2525 for ( ; buf < buf_end; buf++)
2526 if (!isspace(*buf))
2527 break;
2528 if (buf == buf_end)
2529 return 0;
2533 * No exact match. If we are ignoring whitespace, run a line-by-line
2534 * fuzzy matching. We collect all the line length information because
2535 * we need it to adjust whitespace if we match.
2537 if (state->ws_ignore_action == ignore_ws_change)
2538 return line_by_line_fuzzy_match(img, preimage, postimage,
2539 current, current_lno, preimage_limit);
2541 if (state->ws_error_action != correct_ws_error)
2542 return 0;
2545 * The hunk does not apply byte-by-byte, but the hash says
2546 * it might with whitespace fuzz. We weren't asked to
2547 * ignore whitespace, we were asked to correct whitespace
2548 * errors, so let's try matching after whitespace correction.
2550 * While checking the preimage against the target, whitespace
2551 * errors in both fixed, we count how large the corresponding
2552 * postimage needs to be. The postimage prepared by
2553 * apply_one_fragment() has whitespace errors fixed on added
2554 * lines already, but the common lines were propagated as-is,
2555 * which may become longer when their whitespace errors are
2556 * fixed.
2559 /* First count added lines in postimage */
2560 postlen = 0;
2561 for (i = 0; i < postimage->nr; i++) {
2562 if (!(postimage->line[i].flag & LINE_COMMON))
2563 postlen += postimage->line[i].len;
2567 * The preimage may extend beyond the end of the file,
2568 * but in this loop we will only handle the part of the
2569 * preimage that falls within the file.
2571 strbuf_init(&fixed, preimage->len + 1);
2572 orig = preimage->buf;
2573 target = img->buf + current;
2574 for (i = 0; i < preimage_limit; i++) {
2575 size_t oldlen = preimage->line[i].len;
2576 size_t tgtlen = img->line[current_lno + i].len;
2577 size_t fixstart = fixed.len;
2578 struct strbuf tgtfix;
2579 int match;
2581 /* Try fixing the line in the preimage */
2582 ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);
2584 /* Try fixing the line in the target */
2585 strbuf_init(&tgtfix, tgtlen);
2586 ws_fix_copy(&tgtfix, target, tgtlen, ws_rule, NULL);
2589 * If they match, either the preimage was based on
2590 * a version before our tree fixed whitespace breakage,
2591 * or we are lacking a whitespace-fix patch the tree
2592 * the preimage was based on already had (i.e. target
2593 * has whitespace breakage, the preimage doesn't).
2594 * In either case, we are fixing the whitespace breakages
2595 * so we might as well take the fix together with their
2596 * real change.
2598 match = (tgtfix.len == fixed.len - fixstart &&
2599 !memcmp(tgtfix.buf, fixed.buf + fixstart,
2600 fixed.len - fixstart));
2602 /* Add the length if this is common with the postimage */
2603 if (preimage->line[i].flag & LINE_COMMON)
2604 postlen += tgtfix.len;
2606 strbuf_release(&tgtfix);
2607 if (!match)
2608 goto unmatch_exit;
2610 orig += oldlen;
2611 target += tgtlen;
2616 * Now handle the lines in the preimage that falls beyond the
2617 * end of the file (if any). They will only match if they are
2618 * empty or only contain whitespace (if WS_BLANK_AT_EOL is
2619 * false).
2621 for ( ; i < preimage->nr; i++) {
2622 size_t fixstart = fixed.len; /* start of the fixed preimage */
2623 size_t oldlen = preimage->line[i].len;
2624 int j;
2626 /* Try fixing the line in the preimage */
2627 ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);
2629 for (j = fixstart; j < fixed.len; j++)
2630 if (!isspace(fixed.buf[j]))
2631 goto unmatch_exit;
2633 orig += oldlen;
2637 * Yes, the preimage is based on an older version that still
2638 * has whitespace breakages unfixed, and fixing them makes the
2639 * hunk match. Update the context lines in the postimage.
2641 fixed_buf = strbuf_detach(&fixed, &fixed_len);
2642 if (postlen < postimage->len)
2643 postlen = 0;
2644 update_pre_post_images(preimage, postimage,
2645 fixed_buf, fixed_len, postlen);
2646 return 1;
2648 unmatch_exit:
2649 strbuf_release(&fixed);
2650 return 0;
2653 static int find_pos(struct apply_state *state,
2654 struct image *img,
2655 struct image *preimage,
2656 struct image *postimage,
2657 int line,
2658 unsigned ws_rule,
2659 int match_beginning, int match_end)
2661 int i;
2662 unsigned long backwards, forwards, current;
2663 int backwards_lno, forwards_lno, current_lno;
2666 * When running with --allow-overlap, it is possible that a hunk is
2667 * seen that pretends to start at the beginning (but no longer does),
2668 * and that *still* needs to match the end. So trust `match_end` more
2669 * than `match_beginning`.
2671 if (state->allow_overlap && match_beginning && match_end &&
2672 img->nr - preimage->nr != 0)
2673 match_beginning = 0;
2676 * If match_beginning or match_end is specified, there is no
2677 * point starting from a wrong line that will never match and
2678 * wander around and wait for a match at the specified end.
2680 if (match_beginning)
2681 line = 0;
2682 else if (match_end)
2683 line = img->nr - preimage->nr;
2686 * Because the comparison is unsigned, the following test
2687 * will also take care of a negative line number that can
2688 * result when match_end and preimage is larger than the target.
2690 if ((size_t) line > img->nr)
2691 line = img->nr;
2693 current = 0;
2694 for (i = 0; i < line; i++)
2695 current += img->line[i].len;
2698 * There's probably some smart way to do this, but I'll leave
2699 * that to the smart and beautiful people. I'm simple and stupid.
2701 backwards = current;
2702 backwards_lno = line;
2703 forwards = current;
2704 forwards_lno = line;
2705 current_lno = line;
2707 for (i = 0; ; i++) {
2708 if (match_fragment(state, img, preimage, postimage,
2709 current, current_lno, ws_rule,
2710 match_beginning, match_end))
2711 return current_lno;
2713 again:
2714 if (backwards_lno == 0 && forwards_lno == img->nr)
2715 break;
2717 if (i & 1) {
2718 if (backwards_lno == 0) {
2719 i++;
2720 goto again;
2722 backwards_lno--;
2723 backwards -= img->line[backwards_lno].len;
2724 current = backwards;
2725 current_lno = backwards_lno;
2726 } else {
2727 if (forwards_lno == img->nr) {
2728 i++;
2729 goto again;
2731 forwards += img->line[forwards_lno].len;
2732 forwards_lno++;
2733 current = forwards;
2734 current_lno = forwards_lno;
2738 return -1;
2741 static void remove_first_line(struct image *img)
2743 img->buf += img->line[0].len;
2744 img->len -= img->line[0].len;
2745 img->line++;
2746 img->nr--;
2749 static void remove_last_line(struct image *img)
2751 img->len -= img->line[--img->nr].len;
2755 * The change from "preimage" and "postimage" has been found to
2756 * apply at applied_pos (counts in line numbers) in "img".
2757 * Update "img" to remove "preimage" and replace it with "postimage".
2759 static void update_image(struct apply_state *state,
2760 struct image *img,
2761 int applied_pos,
2762 struct image *preimage,
2763 struct image *postimage)
2766 * remove the copy of preimage at offset in img
2767 * and replace it with postimage
2769 int i, nr;
2770 size_t remove_count, insert_count, applied_at = 0;
2771 char *result;
2772 int preimage_limit;
2775 * If we are removing blank lines at the end of img,
2776 * the preimage may extend beyond the end.
2777 * If that is the case, we must be careful only to
2778 * remove the part of the preimage that falls within
2779 * the boundaries of img. Initialize preimage_limit
2780 * to the number of lines in the preimage that falls
2781 * within the boundaries.
2783 preimage_limit = preimage->nr;
2784 if (preimage_limit > img->nr - applied_pos)
2785 preimage_limit = img->nr - applied_pos;
2787 for (i = 0; i < applied_pos; i++)
2788 applied_at += img->line[i].len;
2790 remove_count = 0;
2791 for (i = 0; i < preimage_limit; i++)
2792 remove_count += img->line[applied_pos + i].len;
2793 insert_count = postimage->len;
2795 /* Adjust the contents */
2796 result = xmalloc(st_add3(st_sub(img->len, remove_count), insert_count, 1));
2797 memcpy(result, img->buf, applied_at);
2798 memcpy(result + applied_at, postimage->buf, postimage->len);
2799 memcpy(result + applied_at + postimage->len,
2800 img->buf + (applied_at + remove_count),
2801 img->len - (applied_at + remove_count));
2802 free(img->buf);
2803 img->buf = result;
2804 img->len += insert_count - remove_count;
2805 result[img->len] = '\0';
2807 /* Adjust the line table */
2808 nr = img->nr + postimage->nr - preimage_limit;
2809 if (preimage_limit < postimage->nr) {
2811 * NOTE: this knows that we never call remove_first_line()
2812 * on anything other than pre/post image.
2814 REALLOC_ARRAY(img->line, nr);
2815 img->line_allocated = img->line;
2817 if (preimage_limit != postimage->nr)
2818 MOVE_ARRAY(img->line + applied_pos + postimage->nr,
2819 img->line + applied_pos + preimage_limit,
2820 img->nr - (applied_pos + preimage_limit));
2821 COPY_ARRAY(img->line + applied_pos, postimage->line, postimage->nr);
2822 if (!state->allow_overlap)
2823 for (i = 0; i < postimage->nr; i++)
2824 img->line[applied_pos + i].flag |= LINE_PATCHED;
2825 img->nr = nr;
2829 * Use the patch-hunk text in "frag" to prepare two images (preimage and
2830 * postimage) for the hunk. Find lines that match "preimage" in "img" and
2831 * replace the part of "img" with "postimage" text.
2833 static int apply_one_fragment(struct apply_state *state,
2834 struct image *img, struct fragment *frag,
2835 int inaccurate_eof, unsigned ws_rule,
2836 int nth_fragment)
2838 int match_beginning, match_end;
2839 const char *patch = frag->patch;
2840 int size = frag->size;
2841 char *old, *oldlines;
2842 struct strbuf newlines;
2843 int new_blank_lines_at_end = 0;
2844 int found_new_blank_lines_at_end = 0;
2845 int hunk_linenr = frag->linenr;
2846 unsigned long leading, trailing;
2847 int pos, applied_pos;
2848 struct image preimage;
2849 struct image postimage;
2851 memset(&preimage, 0, sizeof(preimage));
2852 memset(&postimage, 0, sizeof(postimage));
2853 oldlines = xmalloc(size);
2854 strbuf_init(&newlines, size);
2856 old = oldlines;
2857 while (size > 0) {
2858 char first;
2859 int len = linelen(patch, size);
2860 int plen;
2861 int added_blank_line = 0;
2862 int is_blank_context = 0;
2863 size_t start;
2865 if (!len)
2866 break;
2869 * "plen" is how much of the line we should use for
2870 * the actual patch data. Normally we just remove the
2871 * first character on the line, but if the line is
2872 * followed by "\ No newline", then we also remove the
2873 * last one (which is the newline, of course).
2875 plen = len - 1;
2876 if (len < size && patch[len] == '\\')
2877 plen--;
2878 first = *patch;
2879 if (state->apply_in_reverse) {
2880 if (first == '-')
2881 first = '+';
2882 else if (first == '+')
2883 first = '-';
2886 switch (first) {
2887 case '\n':
2888 /* Newer GNU diff, empty context line */
2889 if (plen < 0)
2890 /* ... followed by '\No newline'; nothing */
2891 break;
2892 *old++ = '\n';
2893 strbuf_addch(&newlines, '\n');
2894 add_line_info(&preimage, "\n", 1, LINE_COMMON);
2895 add_line_info(&postimage, "\n", 1, LINE_COMMON);
2896 is_blank_context = 1;
2897 break;
2898 case ' ':
2899 if (plen && (ws_rule & WS_BLANK_AT_EOF) &&
2900 ws_blank_line(patch + 1, plen, ws_rule))
2901 is_blank_context = 1;
2902 /* fallthrough */
2903 case '-':
2904 memcpy(old, patch + 1, plen);
2905 add_line_info(&preimage, old, plen,
2906 (first == ' ' ? LINE_COMMON : 0));
2907 old += plen;
2908 if (first == '-')
2909 break;
2910 /* fallthrough */
2911 case '+':
2912 /* --no-add does not add new lines */
2913 if (first == '+' && state->no_add)
2914 break;
2916 start = newlines.len;
2917 if (first != '+' ||
2918 !state->whitespace_error ||
2919 state->ws_error_action != correct_ws_error) {
2920 strbuf_add(&newlines, patch + 1, plen);
2922 else {
2923 ws_fix_copy(&newlines, patch + 1, plen, ws_rule, &state->applied_after_fixing_ws);
2925 add_line_info(&postimage, newlines.buf + start, newlines.len - start,
2926 (first == '+' ? 0 : LINE_COMMON));
2927 if (first == '+' &&
2928 (ws_rule & WS_BLANK_AT_EOF) &&
2929 ws_blank_line(patch + 1, plen, ws_rule))
2930 added_blank_line = 1;
2931 break;
2932 case '@': case '\\':
2933 /* Ignore it, we already handled it */
2934 break;
2935 default:
2936 if (state->apply_verbosity > verbosity_normal)
2937 error(_("invalid start of line: '%c'"), first);
2938 applied_pos = -1;
2939 goto out;
2941 if (added_blank_line) {
2942 if (!new_blank_lines_at_end)
2943 found_new_blank_lines_at_end = hunk_linenr;
2944 new_blank_lines_at_end++;
2946 else if (is_blank_context)
2948 else
2949 new_blank_lines_at_end = 0;
2950 patch += len;
2951 size -= len;
2952 hunk_linenr++;
2954 if (inaccurate_eof &&
2955 old > oldlines && old[-1] == '\n' &&
2956 newlines.len > 0 && newlines.buf[newlines.len - 1] == '\n') {
2957 old--;
2958 strbuf_setlen(&newlines, newlines.len - 1);
2959 preimage.line_allocated[preimage.nr - 1].len--;
2960 postimage.line_allocated[postimage.nr - 1].len--;
2963 leading = frag->leading;
2964 trailing = frag->trailing;
2967 * A hunk to change lines at the beginning would begin with
2968 * @@ -1,L +N,M @@
2969 * but we need to be careful. -U0 that inserts before the second
2970 * line also has this pattern.
2972 * And a hunk to add to an empty file would begin with
2973 * @@ -0,0 +N,M @@
2975 * In other words, a hunk that is (frag->oldpos <= 1) with or
2976 * without leading context must match at the beginning.
2978 match_beginning = (!frag->oldpos ||
2979 (frag->oldpos == 1 && !state->unidiff_zero));
2982 * A hunk without trailing lines must match at the end.
2983 * However, we simply cannot tell if a hunk must match end
2984 * from the lack of trailing lines if the patch was generated
2985 * with unidiff without any context.
2987 match_end = !state->unidiff_zero && !trailing;
2989 pos = frag->newpos ? (frag->newpos - 1) : 0;
2990 preimage.buf = oldlines;
2991 preimage.len = old - oldlines;
2992 postimage.buf = newlines.buf;
2993 postimage.len = newlines.len;
2994 preimage.line = preimage.line_allocated;
2995 postimage.line = postimage.line_allocated;
2997 for (;;) {
2999 applied_pos = find_pos(state, img, &preimage, &postimage, pos,
3000 ws_rule, match_beginning, match_end);
3002 if (applied_pos >= 0)
3003 break;
3005 /* Am I at my context limits? */
3006 if ((leading <= state->p_context) && (trailing <= state->p_context))
3007 break;
3008 if (match_beginning || match_end) {
3009 match_beginning = match_end = 0;
3010 continue;
3014 * Reduce the number of context lines; reduce both
3015 * leading and trailing if they are equal otherwise
3016 * just reduce the larger context.
3018 if (leading >= trailing) {
3019 remove_first_line(&preimage);
3020 remove_first_line(&postimage);
3021 pos--;
3022 leading--;
3024 if (trailing > leading) {
3025 remove_last_line(&preimage);
3026 remove_last_line(&postimage);
3027 trailing--;
3031 if (applied_pos >= 0) {
3032 if (new_blank_lines_at_end &&
3033 preimage.nr + applied_pos >= img->nr &&
3034 (ws_rule & WS_BLANK_AT_EOF) &&
3035 state->ws_error_action != nowarn_ws_error) {
3036 record_ws_error(state, WS_BLANK_AT_EOF, "+", 1,
3037 found_new_blank_lines_at_end);
3038 if (state->ws_error_action == correct_ws_error) {
3039 while (new_blank_lines_at_end--)
3040 remove_last_line(&postimage);
3043 * We would want to prevent write_out_results()
3044 * from taking place in apply_patch() that follows
3045 * the callchain led us here, which is:
3046 * apply_patch->check_patch_list->check_patch->
3047 * apply_data->apply_fragments->apply_one_fragment
3049 if (state->ws_error_action == die_on_ws_error)
3050 state->apply = 0;
3053 if (state->apply_verbosity > verbosity_normal && applied_pos != pos) {
3054 int offset = applied_pos - pos;
3055 if (state->apply_in_reverse)
3056 offset = 0 - offset;
3057 fprintf_ln(stderr,
3058 Q_("Hunk #%d succeeded at %d (offset %d line).",
3059 "Hunk #%d succeeded at %d (offset %d lines).",
3060 offset),
3061 nth_fragment, applied_pos + 1, offset);
3065 * Warn if it was necessary to reduce the number
3066 * of context lines.
3068 if ((leading != frag->leading ||
3069 trailing != frag->trailing) && state->apply_verbosity > verbosity_silent)
3070 fprintf_ln(stderr, _("Context reduced to (%ld/%ld)"
3071 " to apply fragment at %d"),
3072 leading, trailing, applied_pos+1);
3073 update_image(state, img, applied_pos, &preimage, &postimage);
3074 } else {
3075 if (state->apply_verbosity > verbosity_normal)
3076 error(_("while searching for:\n%.*s"),
3077 (int)(old - oldlines), oldlines);
3080 out:
3081 free(oldlines);
3082 strbuf_release(&newlines);
3083 free(preimage.line_allocated);
3084 free(postimage.line_allocated);
3086 return (applied_pos < 0);
3089 static int apply_binary_fragment(struct apply_state *state,
3090 struct image *img,
3091 struct patch *patch)
3093 struct fragment *fragment = patch->fragments;
3094 unsigned long len;
3095 void *dst;
3097 if (!fragment)
3098 return error(_("missing binary patch data for '%s'"),
3099 patch->new_name ?
3100 patch->new_name :
3101 patch->old_name);
3103 /* Binary patch is irreversible without the optional second hunk */
3104 if (state->apply_in_reverse) {
3105 if (!fragment->next)
3106 return error(_("cannot reverse-apply a binary patch "
3107 "without the reverse hunk to '%s'"),
3108 patch->new_name
3109 ? patch->new_name : patch->old_name);
3110 fragment = fragment->next;
3112 switch (fragment->binary_patch_method) {
3113 case BINARY_DELTA_DEFLATED:
3114 dst = patch_delta(img->buf, img->len, fragment->patch,
3115 fragment->size, &len);
3116 if (!dst)
3117 return -1;
3118 clear_image(img);
3119 img->buf = dst;
3120 img->len = len;
3121 return 0;
3122 case BINARY_LITERAL_DEFLATED:
3123 clear_image(img);
3124 img->len = fragment->size;
3125 img->buf = xmemdupz(fragment->patch, img->len);
3126 return 0;
3128 return -1;
3132 * Replace "img" with the result of applying the binary patch.
3133 * The binary patch data itself in patch->fragment is still kept
3134 * but the preimage prepared by the caller in "img" is freed here
3135 * or in the helper function apply_binary_fragment() this calls.
3137 static int apply_binary(struct apply_state *state,
3138 struct image *img,
3139 struct patch *patch)
3141 const char *name = patch->old_name ? patch->old_name : patch->new_name;
3142 struct object_id oid;
3143 const unsigned hexsz = the_hash_algo->hexsz;
3146 * For safety, we require patch index line to contain
3147 * full hex textual object ID for old and new, at least for now.
3149 if (strlen(patch->old_oid_prefix) != hexsz ||
3150 strlen(patch->new_oid_prefix) != hexsz ||
3151 get_oid_hex(patch->old_oid_prefix, &oid) ||
3152 get_oid_hex(patch->new_oid_prefix, &oid))
3153 return error(_("cannot apply binary patch to '%s' "
3154 "without full index line"), name);
3156 if (patch->old_name) {
3158 * See if the old one matches what the patch
3159 * applies to.
3161 hash_object_file(the_hash_algo, img->buf, img->len, blob_type,
3162 &oid);
3163 if (strcmp(oid_to_hex(&oid), patch->old_oid_prefix))
3164 return error(_("the patch applies to '%s' (%s), "
3165 "which does not match the "
3166 "current contents."),
3167 name, oid_to_hex(&oid));
3169 else {
3170 /* Otherwise, the old one must be empty. */
3171 if (img->len)
3172 return error(_("the patch applies to an empty "
3173 "'%s' but it is not empty"), name);
3176 get_oid_hex(patch->new_oid_prefix, &oid);
3177 if (is_null_oid(&oid)) {
3178 clear_image(img);
3179 return 0; /* deletion patch */
3182 if (has_object(the_repository, &oid, 0)) {
3183 /* We already have the postimage */
3184 enum object_type type;
3185 unsigned long size;
3186 char *result;
3188 result = read_object_file(&oid, &type, &size);
3189 if (!result)
3190 return error(_("the necessary postimage %s for "
3191 "'%s' cannot be read"),
3192 patch->new_oid_prefix, name);
3193 clear_image(img);
3194 img->buf = result;
3195 img->len = size;
3196 } else {
3198 * We have verified buf matches the preimage;
3199 * apply the patch data to it, which is stored
3200 * in the patch->fragments->{patch,size}.
3202 if (apply_binary_fragment(state, img, patch))
3203 return error(_("binary patch does not apply to '%s'"),
3204 name);
3206 /* verify that the result matches */
3207 hash_object_file(the_hash_algo, img->buf, img->len, blob_type,
3208 &oid);
3209 if (strcmp(oid_to_hex(&oid), patch->new_oid_prefix))
3210 return error(_("binary patch to '%s' creates incorrect result (expecting %s, got %s)"),
3211 name, patch->new_oid_prefix, oid_to_hex(&oid));
3214 return 0;
3217 static int apply_fragments(struct apply_state *state, struct image *img, struct patch *patch)
3219 struct fragment *frag = patch->fragments;
3220 const char *name = patch->old_name ? patch->old_name : patch->new_name;
3221 unsigned ws_rule = patch->ws_rule;
3222 unsigned inaccurate_eof = patch->inaccurate_eof;
3223 int nth = 0;
3225 if (patch->is_binary)
3226 return apply_binary(state, img, patch);
3228 while (frag) {
3229 nth++;
3230 if (apply_one_fragment(state, img, frag, inaccurate_eof, ws_rule, nth)) {
3231 error(_("patch failed: %s:%ld"), name, frag->oldpos);
3232 if (!state->apply_with_reject)
3233 return -1;
3234 frag->rejected = 1;
3236 frag = frag->next;
3238 return 0;
3241 static int read_blob_object(struct strbuf *buf, const struct object_id *oid, unsigned mode)
3243 if (S_ISGITLINK(mode)) {
3244 strbuf_grow(buf, 100);
3245 strbuf_addf(buf, "Subproject commit %s\n", oid_to_hex(oid));
3246 } else {
3247 enum object_type type;
3248 unsigned long sz;
3249 char *result;
3251 result = read_object_file(oid, &type, &sz);
3252 if (!result)
3253 return -1;
3254 /* XXX read_sha1_file NUL-terminates */
3255 strbuf_attach(buf, result, sz, sz + 1);
3257 return 0;
3260 static int read_file_or_gitlink(const struct cache_entry *ce, struct strbuf *buf)
3262 if (!ce)
3263 return 0;
3264 return read_blob_object(buf, &ce->oid, ce->ce_mode);
3267 static struct patch *in_fn_table(struct apply_state *state, const char *name)
3269 struct string_list_item *item;
3271 if (name == NULL)
3272 return NULL;
3274 item = string_list_lookup(&state->fn_table, name);
3275 if (item != NULL)
3276 return (struct patch *)item->util;
3278 return NULL;
3282 * item->util in the filename table records the status of the path.
3283 * Usually it points at a patch (whose result records the contents
3284 * of it after applying it), but it could be PATH_WAS_DELETED for a
3285 * path that a previously applied patch has already removed, or
3286 * PATH_TO_BE_DELETED for a path that a later patch would remove.
3288 * The latter is needed to deal with a case where two paths A and B
3289 * are swapped by first renaming A to B and then renaming B to A;
3290 * moving A to B should not be prevented due to presence of B as we
3291 * will remove it in a later patch.
3293 #define PATH_TO_BE_DELETED ((struct patch *) -2)
3294 #define PATH_WAS_DELETED ((struct patch *) -1)
3296 static int to_be_deleted(struct patch *patch)
3298 return patch == PATH_TO_BE_DELETED;
3301 static int was_deleted(struct patch *patch)
3303 return patch == PATH_WAS_DELETED;
3306 static void add_to_fn_table(struct apply_state *state, struct patch *patch)
3308 struct string_list_item *item;
3311 * Always add new_name unless patch is a deletion
3312 * This should cover the cases for normal diffs,
3313 * file creations and copies
3315 if (patch->new_name != NULL) {
3316 item = string_list_insert(&state->fn_table, patch->new_name);
3317 item->util = patch;
3321 * store a failure on rename/deletion cases because
3322 * later chunks shouldn't patch old names
3324 if ((patch->new_name == NULL) || (patch->is_rename)) {
3325 item = string_list_insert(&state->fn_table, patch->old_name);
3326 item->util = PATH_WAS_DELETED;
3330 static void prepare_fn_table(struct apply_state *state, struct patch *patch)
3333 * store information about incoming file deletion
3335 while (patch) {
3336 if ((patch->new_name == NULL) || (patch->is_rename)) {
3337 struct string_list_item *item;
3338 item = string_list_insert(&state->fn_table, patch->old_name);
3339 item->util = PATH_TO_BE_DELETED;
3341 patch = patch->next;
3345 static int checkout_target(struct index_state *istate,
3346 struct cache_entry *ce, struct stat *st)
3348 struct checkout costate = CHECKOUT_INIT;
3350 costate.refresh_cache = 1;
3351 costate.istate = istate;
3352 if (checkout_entry(ce, &costate, NULL, NULL) ||
3353 lstat(ce->name, st))
3354 return error(_("cannot checkout %s"), ce->name);
3355 return 0;
3358 static struct patch *previous_patch(struct apply_state *state,
3359 struct patch *patch,
3360 int *gone)
3362 struct patch *previous;
3364 *gone = 0;
3365 if (patch->is_copy || patch->is_rename)
3366 return NULL; /* "git" patches do not depend on the order */
3368 previous = in_fn_table(state, patch->old_name);
3369 if (!previous)
3370 return NULL;
3372 if (to_be_deleted(previous))
3373 return NULL; /* the deletion hasn't happened yet */
3375 if (was_deleted(previous))
3376 *gone = 1;
3378 return previous;
3381 static int verify_index_match(struct apply_state *state,
3382 const struct cache_entry *ce,
3383 struct stat *st)
3385 if (S_ISGITLINK(ce->ce_mode)) {
3386 if (!S_ISDIR(st->st_mode))
3387 return -1;
3388 return 0;
3390 return ie_match_stat(state->repo->index, ce, st,
3391 CE_MATCH_IGNORE_VALID | CE_MATCH_IGNORE_SKIP_WORKTREE);
3394 #define SUBMODULE_PATCH_WITHOUT_INDEX 1
3396 static int load_patch_target(struct apply_state *state,
3397 struct strbuf *buf,
3398 const struct cache_entry *ce,
3399 struct stat *st,
3400 struct patch *patch,
3401 const char *name,
3402 unsigned expected_mode)
3404 if (state->cached || state->check_index) {
3405 if (read_file_or_gitlink(ce, buf))
3406 return error(_("failed to read %s"), name);
3407 } else if (name) {
3408 if (S_ISGITLINK(expected_mode)) {
3409 if (ce)
3410 return read_file_or_gitlink(ce, buf);
3411 else
3412 return SUBMODULE_PATCH_WITHOUT_INDEX;
3413 } else if (has_symlink_leading_path(name, strlen(name))) {
3414 return error(_("reading from '%s' beyond a symbolic link"), name);
3415 } else {
3416 if (read_old_data(st, patch, name, buf))
3417 return error(_("failed to read %s"), name);
3420 return 0;
3424 * We are about to apply "patch"; populate the "image" with the
3425 * current version we have, from the working tree or from the index,
3426 * depending on the situation e.g. --cached/--index. If we are
3427 * applying a non-git patch that incrementally updates the tree,
3428 * we read from the result of a previous diff.
3430 static int load_preimage(struct apply_state *state,
3431 struct image *image,
3432 struct patch *patch, struct stat *st,
3433 const struct cache_entry *ce)
3435 struct strbuf buf = STRBUF_INIT;
3436 size_t len;
3437 char *img;
3438 struct patch *previous;
3439 int status;
3441 previous = previous_patch(state, patch, &status);
3442 if (status)
3443 return error(_("path %s has been renamed/deleted"),
3444 patch->old_name);
3445 if (previous) {
3446 /* We have a patched copy in memory; use that. */
3447 strbuf_add(&buf, previous->result, previous->resultsize);
3448 } else {
3449 status = load_patch_target(state, &buf, ce, st, patch,
3450 patch->old_name, patch->old_mode);
3451 if (status < 0)
3452 return status;
3453 else if (status == SUBMODULE_PATCH_WITHOUT_INDEX) {
3455 * There is no way to apply subproject
3456 * patch without looking at the index.
3457 * NEEDSWORK: shouldn't this be flagged
3458 * as an error???
3460 free_fragment_list(patch->fragments);
3461 patch->fragments = NULL;
3462 } else if (status) {
3463 return error(_("failed to read %s"), patch->old_name);
3467 img = strbuf_detach(&buf, &len);
3468 prepare_image(image, img, len, !patch->is_binary);
3469 return 0;
3472 static int three_way_merge(struct apply_state *state,
3473 struct image *image,
3474 char *path,
3475 const struct object_id *base,
3476 const struct object_id *ours,
3477 const struct object_id *theirs)
3479 mmfile_t base_file, our_file, their_file;
3480 mmbuffer_t result = { NULL };
3481 int status;
3483 read_mmblob(&base_file, base);
3484 read_mmblob(&our_file, ours);
3485 read_mmblob(&their_file, theirs);
3486 status = ll_merge(&result, path,
3487 &base_file, "base",
3488 &our_file, "ours",
3489 &their_file, "theirs",
3490 state->repo->index,
3491 NULL);
3492 free(base_file.ptr);
3493 free(our_file.ptr);
3494 free(their_file.ptr);
3495 if (status < 0 || !result.ptr) {
3496 free(result.ptr);
3497 return -1;
3499 clear_image(image);
3500 image->buf = result.ptr;
3501 image->len = result.size;
3503 return status;
3507 * When directly falling back to add/add three-way merge, we read from
3508 * the current contents of the new_name. In no cases other than that
3509 * this function will be called.
3511 static int load_current(struct apply_state *state,
3512 struct image *image,
3513 struct patch *patch)
3515 struct strbuf buf = STRBUF_INIT;
3516 int status, pos;
3517 size_t len;
3518 char *img;
3519 struct stat st;
3520 struct cache_entry *ce;
3521 char *name = patch->new_name;
3522 unsigned mode = patch->new_mode;
3524 if (!patch->is_new)
3525 BUG("patch to %s is not a creation", patch->old_name);
3527 pos = index_name_pos(state->repo->index, name, strlen(name));
3528 if (pos < 0)
3529 return error(_("%s: does not exist in index"), name);
3530 ce = state->repo->index->cache[pos];
3531 if (lstat(name, &st)) {
3532 if (errno != ENOENT)
3533 return error_errno("%s", name);
3534 if (checkout_target(state->repo->index, ce, &st))
3535 return -1;
3537 if (verify_index_match(state, ce, &st))
3538 return error(_("%s: does not match index"), name);
3540 status = load_patch_target(state, &buf, ce, &st, patch, name, mode);
3541 if (status < 0)
3542 return status;
3543 else if (status)
3544 return -1;
3545 img = strbuf_detach(&buf, &len);
3546 prepare_image(image, img, len, !patch->is_binary);
3547 return 0;
3550 static int try_threeway(struct apply_state *state,
3551 struct image *image,
3552 struct patch *patch,
3553 struct stat *st,
3554 const struct cache_entry *ce)
3556 struct object_id pre_oid, post_oid, our_oid;
3557 struct strbuf buf = STRBUF_INIT;
3558 size_t len;
3559 int status;
3560 char *img;
3561 struct image tmp_image;
3563 /* No point falling back to 3-way merge in these cases */
3564 if (patch->is_delete ||
3565 S_ISGITLINK(patch->old_mode) || S_ISGITLINK(patch->new_mode))
3566 return -1;
3568 /* Preimage the patch was prepared for */
3569 if (patch->is_new)
3570 write_object_file("", 0, blob_type, &pre_oid);
3571 else if (get_oid(patch->old_oid_prefix, &pre_oid) ||
3572 read_blob_object(&buf, &pre_oid, patch->old_mode))
3573 return error(_("repository lacks the necessary blob to fall back on 3-way merge."));
3575 if (state->apply_verbosity > verbosity_silent)
3576 fprintf(stderr, _("Falling back to three-way merge...\n"));
3578 img = strbuf_detach(&buf, &len);
3579 prepare_image(&tmp_image, img, len, 1);
3580 /* Apply the patch to get the post image */
3581 if (apply_fragments(state, &tmp_image, patch) < 0) {
3582 clear_image(&tmp_image);
3583 return -1;
3585 /* post_oid is theirs */
3586 write_object_file(tmp_image.buf, tmp_image.len, blob_type, &post_oid);
3587 clear_image(&tmp_image);
3589 /* our_oid is ours */
3590 if (patch->is_new) {
3591 if (load_current(state, &tmp_image, patch))
3592 return error(_("cannot read the current contents of '%s'"),
3593 patch->new_name);
3594 } else {
3595 if (load_preimage(state, &tmp_image, patch, st, ce))
3596 return error(_("cannot read the current contents of '%s'"),
3597 patch->old_name);
3599 write_object_file(tmp_image.buf, tmp_image.len, blob_type, &our_oid);
3600 clear_image(&tmp_image);
3602 /* in-core three-way merge between post and our using pre as base */
3603 status = three_way_merge(state, image, patch->new_name,
3604 &pre_oid, &our_oid, &post_oid);
3605 if (status < 0) {
3606 if (state->apply_verbosity > verbosity_silent)
3607 fprintf(stderr,
3608 _("Failed to fall back on three-way merge...\n"));
3609 return status;
3612 if (status) {
3613 patch->conflicted_threeway = 1;
3614 if (patch->is_new)
3615 oidclr(&patch->threeway_stage[0]);
3616 else
3617 oidcpy(&patch->threeway_stage[0], &pre_oid);
3618 oidcpy(&patch->threeway_stage[1], &our_oid);
3619 oidcpy(&patch->threeway_stage[2], &post_oid);
3620 if (state->apply_verbosity > verbosity_silent)
3621 fprintf(stderr,
3622 _("Applied patch to '%s' with conflicts.\n"),
3623 patch->new_name);
3624 } else {
3625 if (state->apply_verbosity > verbosity_silent)
3626 fprintf(stderr,
3627 _("Applied patch to '%s' cleanly.\n"),
3628 patch->new_name);
3630 return 0;
3633 static int apply_data(struct apply_state *state, struct patch *patch,
3634 struct stat *st, const struct cache_entry *ce)
3636 struct image image;
3638 if (load_preimage(state, &image, patch, st, ce) < 0)
3639 return -1;
3641 if (patch->direct_to_threeway ||
3642 apply_fragments(state, &image, patch) < 0) {
3643 /* Note: with --reject, apply_fragments() returns 0 */
3644 if (!state->threeway || try_threeway(state, &image, patch, st, ce) < 0)
3645 return -1;
3647 patch->result = image.buf;
3648 patch->resultsize = image.len;
3649 add_to_fn_table(state, patch);
3650 free(image.line_allocated);
3652 if (0 < patch->is_delete && patch->resultsize)
3653 return error(_("removal patch leaves file contents"));
3655 return 0;
3659 * If "patch" that we are looking at modifies or deletes what we have,
3660 * we would want it not to lose any local modification we have, either
3661 * in the working tree or in the index.
3663 * This also decides if a non-git patch is a creation patch or a
3664 * modification to an existing empty file. We do not check the state
3665 * of the current tree for a creation patch in this function; the caller
3666 * check_patch() separately makes sure (and errors out otherwise) that
3667 * the path the patch creates does not exist in the current tree.
3669 static int check_preimage(struct apply_state *state,
3670 struct patch *patch,
3671 struct cache_entry **ce,
3672 struct stat *st)
3674 const char *old_name = patch->old_name;
3675 struct patch *previous = NULL;
3676 int stat_ret = 0, status;
3677 unsigned st_mode = 0;
3679 if (!old_name)
3680 return 0;
3682 assert(patch->is_new <= 0);
3683 previous = previous_patch(state, patch, &status);
3685 if (status)
3686 return error(_("path %s has been renamed/deleted"), old_name);
3687 if (previous) {
3688 st_mode = previous->new_mode;
3689 } else if (!state->cached) {
3690 stat_ret = lstat(old_name, st);
3691 if (stat_ret && errno != ENOENT)
3692 return error_errno("%s", old_name);
3695 if (state->check_index && !previous) {
3696 int pos = index_name_pos(state->repo->index, old_name,
3697 strlen(old_name));
3698 if (pos < 0) {
3699 if (patch->is_new < 0)
3700 goto is_new;
3701 return error(_("%s: does not exist in index"), old_name);
3703 *ce = state->repo->index->cache[pos];
3704 if (stat_ret < 0) {
3705 if (checkout_target(state->repo->index, *ce, st))
3706 return -1;
3708 if (!state->cached && verify_index_match(state, *ce, st))
3709 return error(_("%s: does not match index"), old_name);
3710 if (state->cached)
3711 st_mode = (*ce)->ce_mode;
3712 } else if (stat_ret < 0) {
3713 if (patch->is_new < 0)
3714 goto is_new;
3715 return error_errno("%s", old_name);
3718 if (!state->cached && !previous)
3719 st_mode = ce_mode_from_stat(*ce, st->st_mode);
3721 if (patch->is_new < 0)
3722 patch->is_new = 0;
3723 if (!patch->old_mode)
3724 patch->old_mode = st_mode;
3725 if ((st_mode ^ patch->old_mode) & S_IFMT)
3726 return error(_("%s: wrong type"), old_name);
3727 if (st_mode != patch->old_mode)
3728 warning(_("%s has type %o, expected %o"),
3729 old_name, st_mode, patch->old_mode);
3730 if (!patch->new_mode && !patch->is_delete)
3731 patch->new_mode = st_mode;
3732 return 0;
3734 is_new:
3735 patch->is_new = 1;
3736 patch->is_delete = 0;
3737 FREE_AND_NULL(patch->old_name);
3738 return 0;
3742 #define EXISTS_IN_INDEX 1
3743 #define EXISTS_IN_WORKTREE 2
3744 #define EXISTS_IN_INDEX_AS_ITA 3
3746 static int check_to_create(struct apply_state *state,
3747 const char *new_name,
3748 int ok_if_exists)
3750 struct stat nst;
3752 if (state->check_index && (!ok_if_exists || !state->cached)) {
3753 int pos;
3755 pos = index_name_pos(state->repo->index, new_name, strlen(new_name));
3756 if (pos >= 0) {
3757 struct cache_entry *ce = state->repo->index->cache[pos];
3759 /* allow ITA, as they do not yet exist in the index */
3760 if (!ok_if_exists && !(ce->ce_flags & CE_INTENT_TO_ADD))
3761 return EXISTS_IN_INDEX;
3763 /* ITA entries can never match working tree files */
3764 if (!state->cached && (ce->ce_flags & CE_INTENT_TO_ADD))
3765 return EXISTS_IN_INDEX_AS_ITA;
3769 if (state->cached)
3770 return 0;
3772 if (!lstat(new_name, &nst)) {
3773 if (S_ISDIR(nst.st_mode) || ok_if_exists)
3774 return 0;
3776 * A leading component of new_name might be a symlink
3777 * that is going to be removed with this patch, but
3778 * still pointing at somewhere that has the path.
3779 * In such a case, path "new_name" does not exist as
3780 * far as git is concerned.
3782 if (has_symlink_leading_path(new_name, strlen(new_name)))
3783 return 0;
3785 return EXISTS_IN_WORKTREE;
3786 } else if (!is_missing_file_error(errno)) {
3787 return error_errno("%s", new_name);
3789 return 0;
3792 static uintptr_t register_symlink_changes(struct apply_state *state,
3793 const char *path,
3794 uintptr_t what)
3796 struct string_list_item *ent;
3798 ent = string_list_lookup(&state->symlink_changes, path);
3799 if (!ent) {
3800 ent = string_list_insert(&state->symlink_changes, path);
3801 ent->util = (void *)0;
3803 ent->util = (void *)(what | ((uintptr_t)ent->util));
3804 return (uintptr_t)ent->util;
3807 static uintptr_t check_symlink_changes(struct apply_state *state, const char *path)
3809 struct string_list_item *ent;
3811 ent = string_list_lookup(&state->symlink_changes, path);
3812 if (!ent)
3813 return 0;
3814 return (uintptr_t)ent->util;
3817 static void prepare_symlink_changes(struct apply_state *state, struct patch *patch)
3819 for ( ; patch; patch = patch->next) {
3820 if ((patch->old_name && S_ISLNK(patch->old_mode)) &&
3821 (patch->is_rename || patch->is_delete))
3822 /* the symlink at patch->old_name is removed */
3823 register_symlink_changes(state, patch->old_name, APPLY_SYMLINK_GOES_AWAY);
3825 if (patch->new_name && S_ISLNK(patch->new_mode))
3826 /* the symlink at patch->new_name is created or remains */
3827 register_symlink_changes(state, patch->new_name, APPLY_SYMLINK_IN_RESULT);
3831 static int path_is_beyond_symlink_1(struct apply_state *state, struct strbuf *name)
3833 do {
3834 unsigned int change;
3836 while (--name->len && name->buf[name->len] != '/')
3837 ; /* scan backwards */
3838 if (!name->len)
3839 break;
3840 name->buf[name->len] = '\0';
3841 change = check_symlink_changes(state, name->buf);
3842 if (change & APPLY_SYMLINK_IN_RESULT)
3843 return 1;
3844 if (change & APPLY_SYMLINK_GOES_AWAY)
3846 * This cannot be "return 0", because we may
3847 * see a new one created at a higher level.
3849 continue;
3851 /* otherwise, check the preimage */
3852 if (state->check_index) {
3853 struct cache_entry *ce;
3855 ce = index_file_exists(state->repo->index, name->buf,
3856 name->len, ignore_case);
3857 if (ce && S_ISLNK(ce->ce_mode))
3858 return 1;
3859 } else {
3860 struct stat st;
3861 if (!lstat(name->buf, &st) && S_ISLNK(st.st_mode))
3862 return 1;
3864 } while (1);
3865 return 0;
3868 static int path_is_beyond_symlink(struct apply_state *state, const char *name_)
3870 int ret;
3871 struct strbuf name = STRBUF_INIT;
3873 assert(*name_ != '\0');
3874 strbuf_addstr(&name, name_);
3875 ret = path_is_beyond_symlink_1(state, &name);
3876 strbuf_release(&name);
3878 return ret;
3881 static int check_unsafe_path(struct patch *patch)
3883 const char *old_name = NULL;
3884 const char *new_name = NULL;
3885 if (patch->is_delete)
3886 old_name = patch->old_name;
3887 else if (!patch->is_new && !patch->is_copy)
3888 old_name = patch->old_name;
3889 if (!patch->is_delete)
3890 new_name = patch->new_name;
3892 if (old_name && !verify_path(old_name, patch->old_mode))
3893 return error(_("invalid path '%s'"), old_name);
3894 if (new_name && !verify_path(new_name, patch->new_mode))
3895 return error(_("invalid path '%s'"), new_name);
3896 return 0;
3900 * Check and apply the patch in-core; leave the result in patch->result
3901 * for the caller to write it out to the final destination.
3903 static int check_patch(struct apply_state *state, struct patch *patch)
3905 struct stat st;
3906 const char *old_name = patch->old_name;
3907 const char *new_name = patch->new_name;
3908 const char *name = old_name ? old_name : new_name;
3909 struct cache_entry *ce = NULL;
3910 struct patch *tpatch;
3911 int ok_if_exists;
3912 int status;
3914 patch->rejected = 1; /* we will drop this after we succeed */
3916 status = check_preimage(state, patch, &ce, &st);
3917 if (status)
3918 return status;
3919 old_name = patch->old_name;
3922 * A type-change diff is always split into a patch to delete
3923 * old, immediately followed by a patch to create new (see
3924 * diff.c::run_diff()); in such a case it is Ok that the entry
3925 * to be deleted by the previous patch is still in the working
3926 * tree and in the index.
3928 * A patch to swap-rename between A and B would first rename A
3929 * to B and then rename B to A. While applying the first one,
3930 * the presence of B should not stop A from getting renamed to
3931 * B; ask to_be_deleted() about the later rename. Removal of
3932 * B and rename from A to B is handled the same way by asking
3933 * was_deleted().
3935 if ((tpatch = in_fn_table(state, new_name)) &&
3936 (was_deleted(tpatch) || to_be_deleted(tpatch)))
3937 ok_if_exists = 1;
3938 else
3939 ok_if_exists = 0;
3941 if (new_name &&
3942 ((0 < patch->is_new) || patch->is_rename || patch->is_copy)) {
3943 int err = check_to_create(state, new_name, ok_if_exists);
3945 if (err && state->threeway) {
3946 patch->direct_to_threeway = 1;
3947 } else switch (err) {
3948 case 0:
3949 break; /* happy */
3950 case EXISTS_IN_INDEX:
3951 return error(_("%s: already exists in index"), new_name);
3952 case EXISTS_IN_INDEX_AS_ITA:
3953 return error(_("%s: does not match index"), new_name);
3954 case EXISTS_IN_WORKTREE:
3955 return error(_("%s: already exists in working directory"),
3956 new_name);
3957 default:
3958 return err;
3961 if (!patch->new_mode) {
3962 if (0 < patch->is_new)
3963 patch->new_mode = S_IFREG | 0644;
3964 else
3965 patch->new_mode = patch->old_mode;
3969 if (new_name && old_name) {
3970 int same = !strcmp(old_name, new_name);
3971 if (!patch->new_mode)
3972 patch->new_mode = patch->old_mode;
3973 if ((patch->old_mode ^ patch->new_mode) & S_IFMT) {
3974 if (same)
3975 return error(_("new mode (%o) of %s does not "
3976 "match old mode (%o)"),
3977 patch->new_mode, new_name,
3978 patch->old_mode);
3979 else
3980 return error(_("new mode (%o) of %s does not "
3981 "match old mode (%o) of %s"),
3982 patch->new_mode, new_name,
3983 patch->old_mode, old_name);
3987 if (!state->unsafe_paths && check_unsafe_path(patch))
3988 return -128;
3991 * An attempt to read from or delete a path that is beyond a
3992 * symbolic link will be prevented by load_patch_target() that
3993 * is called at the beginning of apply_data() so we do not
3994 * have to worry about a patch marked with "is_delete" bit
3995 * here. We however need to make sure that the patch result
3996 * is not deposited to a path that is beyond a symbolic link
3997 * here.
3999 if (!patch->is_delete && path_is_beyond_symlink(state, patch->new_name))
4000 return error(_("affected file '%s' is beyond a symbolic link"),
4001 patch->new_name);
4003 if (apply_data(state, patch, &st, ce) < 0)
4004 return error(_("%s: patch does not apply"), name);
4005 patch->rejected = 0;
4006 return 0;
4009 static int check_patch_list(struct apply_state *state, struct patch *patch)
4011 int err = 0;
4013 prepare_symlink_changes(state, patch);
4014 prepare_fn_table(state, patch);
4015 while (patch) {
4016 int res;
4017 if (state->apply_verbosity > verbosity_normal)
4018 say_patch_name(stderr,
4019 _("Checking patch %s..."), patch);
4020 res = check_patch(state, patch);
4021 if (res == -128)
4022 return -128;
4023 err |= res;
4024 patch = patch->next;
4026 return err;
4029 static int read_apply_cache(struct apply_state *state)
4031 if (state->index_file)
4032 return read_index_from(state->repo->index, state->index_file,
4033 get_git_dir());
4034 else
4035 return repo_read_index(state->repo);
4038 /* This function tries to read the object name from the current index */
4039 static int get_current_oid(struct apply_state *state, const char *path,
4040 struct object_id *oid)
4042 int pos;
4044 if (read_apply_cache(state) < 0)
4045 return -1;
4046 pos = index_name_pos(state->repo->index, path, strlen(path));
4047 if (pos < 0)
4048 return -1;
4049 oidcpy(oid, &state->repo->index->cache[pos]->oid);
4050 return 0;
4053 static int preimage_oid_in_gitlink_patch(struct patch *p, struct object_id *oid)
4056 * A usable gitlink patch has only one fragment (hunk) that looks like:
4057 * @@ -1 +1 @@
4058 * -Subproject commit <old sha1>
4059 * +Subproject commit <new sha1>
4060 * or
4061 * @@ -1 +0,0 @@
4062 * -Subproject commit <old sha1>
4063 * for a removal patch.
4065 struct fragment *hunk = p->fragments;
4066 static const char heading[] = "-Subproject commit ";
4067 char *preimage;
4069 if (/* does the patch have only one hunk? */
4070 hunk && !hunk->next &&
4071 /* is its preimage one line? */
4072 hunk->oldpos == 1 && hunk->oldlines == 1 &&
4073 /* does preimage begin with the heading? */
4074 (preimage = memchr(hunk->patch, '\n', hunk->size)) != NULL &&
4075 starts_with(++preimage, heading) &&
4076 /* does it record full SHA-1? */
4077 !get_oid_hex(preimage + sizeof(heading) - 1, oid) &&
4078 preimage[sizeof(heading) + the_hash_algo->hexsz - 1] == '\n' &&
4079 /* does the abbreviated name on the index line agree with it? */
4080 starts_with(preimage + sizeof(heading) - 1, p->old_oid_prefix))
4081 return 0; /* it all looks fine */
4083 /* we may have full object name on the index line */
4084 return get_oid_hex(p->old_oid_prefix, oid);
4087 /* Build an index that contains just the files needed for a 3way merge */
4088 static int build_fake_ancestor(struct apply_state *state, struct patch *list)
4090 struct patch *patch;
4091 struct index_state result = { NULL };
4092 struct lock_file lock = LOCK_INIT;
4093 int res;
4095 /* Once we start supporting the reverse patch, it may be
4096 * worth showing the new sha1 prefix, but until then...
4098 for (patch = list; patch; patch = patch->next) {
4099 struct object_id oid;
4100 struct cache_entry *ce;
4101 const char *name;
4103 name = patch->old_name ? patch->old_name : patch->new_name;
4104 if (0 < patch->is_new)
4105 continue;
4107 if (S_ISGITLINK(patch->old_mode)) {
4108 if (!preimage_oid_in_gitlink_patch(patch, &oid))
4109 ; /* ok, the textual part looks sane */
4110 else
4111 return error(_("sha1 information is lacking or "
4112 "useless for submodule %s"), name);
4113 } else if (!get_oid_blob(patch->old_oid_prefix, &oid)) {
4114 ; /* ok */
4115 } else if (!patch->lines_added && !patch->lines_deleted) {
4116 /* mode-only change: update the current */
4117 if (get_current_oid(state, patch->old_name, &oid))
4118 return error(_("mode change for %s, which is not "
4119 "in current HEAD"), name);
4120 } else
4121 return error(_("sha1 information is lacking or useless "
4122 "(%s)."), name);
4124 ce = make_cache_entry(&result, patch->old_mode, &oid, name, 0, 0);
4125 if (!ce)
4126 return error(_("make_cache_entry failed for path '%s'"),
4127 name);
4128 if (add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD)) {
4129 discard_cache_entry(ce);
4130 return error(_("could not add %s to temporary index"),
4131 name);
4135 hold_lock_file_for_update(&lock, state->fake_ancestor, LOCK_DIE_ON_ERROR);
4136 res = write_locked_index(&result, &lock, COMMIT_LOCK);
4137 discard_index(&result);
4139 if (res)
4140 return error(_("could not write temporary index to %s"),
4141 state->fake_ancestor);
4143 return 0;
4146 static void stat_patch_list(struct apply_state *state, struct patch *patch)
4148 int files, adds, dels;
4150 for (files = adds = dels = 0 ; patch ; patch = patch->next) {
4151 files++;
4152 adds += patch->lines_added;
4153 dels += patch->lines_deleted;
4154 show_stats(state, patch);
4157 print_stat_summary(stdout, files, adds, dels);
4160 static void numstat_patch_list(struct apply_state *state,
4161 struct patch *patch)
4163 for ( ; patch; patch = patch->next) {
4164 const char *name;
4165 name = patch->new_name ? patch->new_name : patch->old_name;
4166 if (patch->is_binary)
4167 printf("-\t-\t");
4168 else
4169 printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);
4170 write_name_quoted(name, stdout, state->line_termination);
4174 static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)
4176 if (mode)
4177 printf(" %s mode %06o %s\n", newdelete, mode, name);
4178 else
4179 printf(" %s %s\n", newdelete, name);
4182 static void show_mode_change(struct patch *p, int show_name)
4184 if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {
4185 if (show_name)
4186 printf(" mode change %06o => %06o %s\n",
4187 p->old_mode, p->new_mode, p->new_name);
4188 else
4189 printf(" mode change %06o => %06o\n",
4190 p->old_mode, p->new_mode);
4194 static void show_rename_copy(struct patch *p)
4196 const char *renamecopy = p->is_rename ? "rename" : "copy";
4197 const char *old_name, *new_name;
4199 /* Find common prefix */
4200 old_name = p->old_name;
4201 new_name = p->new_name;
4202 while (1) {
4203 const char *slash_old, *slash_new;
4204 slash_old = strchr(old_name, '/');
4205 slash_new = strchr(new_name, '/');
4206 if (!slash_old ||
4207 !slash_new ||
4208 slash_old - old_name != slash_new - new_name ||
4209 memcmp(old_name, new_name, slash_new - new_name))
4210 break;
4211 old_name = slash_old + 1;
4212 new_name = slash_new + 1;
4214 /* p->old_name through old_name is the common prefix, and old_name and
4215 * new_name through the end of names are renames
4217 if (old_name != p->old_name)
4218 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
4219 (int)(old_name - p->old_name), p->old_name,
4220 old_name, new_name, p->score);
4221 else
4222 printf(" %s %s => %s (%d%%)\n", renamecopy,
4223 p->old_name, p->new_name, p->score);
4224 show_mode_change(p, 0);
4227 static void summary_patch_list(struct patch *patch)
4229 struct patch *p;
4231 for (p = patch; p; p = p->next) {
4232 if (p->is_new)
4233 show_file_mode_name("create", p->new_mode, p->new_name);
4234 else if (p->is_delete)
4235 show_file_mode_name("delete", p->old_mode, p->old_name);
4236 else {
4237 if (p->is_rename || p->is_copy)
4238 show_rename_copy(p);
4239 else {
4240 if (p->score) {
4241 printf(" rewrite %s (%d%%)\n",
4242 p->new_name, p->score);
4243 show_mode_change(p, 0);
4245 else
4246 show_mode_change(p, 1);
4252 static void patch_stats(struct apply_state *state, struct patch *patch)
4254 int lines = patch->lines_added + patch->lines_deleted;
4256 if (lines > state->max_change)
4257 state->max_change = lines;
4258 if (patch->old_name) {
4259 int len = quote_c_style(patch->old_name, NULL, NULL, 0);
4260 if (!len)
4261 len = strlen(patch->old_name);
4262 if (len > state->max_len)
4263 state->max_len = len;
4265 if (patch->new_name) {
4266 int len = quote_c_style(patch->new_name, NULL, NULL, 0);
4267 if (!len)
4268 len = strlen(patch->new_name);
4269 if (len > state->max_len)
4270 state->max_len = len;
4274 static int remove_file(struct apply_state *state, struct patch *patch, int rmdir_empty)
4276 if (state->update_index && !state->ita_only) {
4277 if (remove_file_from_index(state->repo->index, patch->old_name) < 0)
4278 return error(_("unable to remove %s from index"), patch->old_name);
4280 if (!state->cached) {
4281 if (!remove_or_warn(patch->old_mode, patch->old_name) && rmdir_empty) {
4282 remove_path(patch->old_name);
4285 return 0;
4288 static int add_index_file(struct apply_state *state,
4289 const char *path,
4290 unsigned mode,
4291 void *buf,
4292 unsigned long size)
4294 struct stat st;
4295 struct cache_entry *ce;
4296 int namelen = strlen(path);
4298 ce = make_empty_cache_entry(state->repo->index, namelen);
4299 memcpy(ce->name, path, namelen);
4300 ce->ce_mode = create_ce_mode(mode);
4301 ce->ce_flags = create_ce_flags(0);
4302 ce->ce_namelen = namelen;
4303 if (state->ita_only) {
4304 ce->ce_flags |= CE_INTENT_TO_ADD;
4305 set_object_name_for_intent_to_add_entry(ce);
4306 } else if (S_ISGITLINK(mode)) {
4307 const char *s;
4309 if (!skip_prefix(buf, "Subproject commit ", &s) ||
4310 get_oid_hex(s, &ce->oid)) {
4311 discard_cache_entry(ce);
4312 return error(_("corrupt patch for submodule %s"), path);
4314 } else {
4315 if (!state->cached) {
4316 if (lstat(path, &st) < 0) {
4317 discard_cache_entry(ce);
4318 return error_errno(_("unable to stat newly "
4319 "created file '%s'"),
4320 path);
4322 fill_stat_cache_info(state->repo->index, ce, &st);
4324 if (write_object_file(buf, size, blob_type, &ce->oid) < 0) {
4325 discard_cache_entry(ce);
4326 return error(_("unable to create backing store "
4327 "for newly created file %s"), path);
4330 if (add_index_entry(state->repo->index, ce, ADD_CACHE_OK_TO_ADD) < 0) {
4331 discard_cache_entry(ce);
4332 return error(_("unable to add cache entry for %s"), path);
4335 return 0;
4339 * Returns:
4340 * -1 if an unrecoverable error happened
4341 * 0 if everything went well
4342 * 1 if a recoverable error happened
4344 static int try_create_file(struct apply_state *state, const char *path,
4345 unsigned int mode, const char *buf,
4346 unsigned long size)
4348 int fd, res;
4349 struct strbuf nbuf = STRBUF_INIT;
4351 if (S_ISGITLINK(mode)) {
4352 struct stat st;
4353 if (!lstat(path, &st) && S_ISDIR(st.st_mode))
4354 return 0;
4355 return !!mkdir(path, 0777);
4358 if (has_symlinks && S_ISLNK(mode))
4359 /* Although buf:size is counted string, it also is NUL
4360 * terminated.
4362 return !!symlink(buf, path);
4364 fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);
4365 if (fd < 0)
4366 return 1;
4368 if (convert_to_working_tree(state->repo->index, path, buf, size, &nbuf, NULL)) {
4369 size = nbuf.len;
4370 buf = nbuf.buf;
4373 res = write_in_full(fd, buf, size) < 0;
4374 if (res)
4375 error_errno(_("failed to write to '%s'"), path);
4376 strbuf_release(&nbuf);
4378 if (close(fd) < 0 && !res)
4379 return error_errno(_("closing file '%s'"), path);
4381 return res ? -1 : 0;
4385 * We optimistically assume that the directories exist,
4386 * which is true 99% of the time anyway. If they don't,
4387 * we create them and try again.
4389 * Returns:
4390 * -1 on error
4391 * 0 otherwise
4393 static int create_one_file(struct apply_state *state,
4394 char *path,
4395 unsigned mode,
4396 const char *buf,
4397 unsigned long size)
4399 int res;
4401 if (state->cached)
4402 return 0;
4404 res = try_create_file(state, path, mode, buf, size);
4405 if (res < 0)
4406 return -1;
4407 if (!res)
4408 return 0;
4410 if (errno == ENOENT) {
4411 if (safe_create_leading_directories_no_share(path))
4412 return 0;
4413 res = try_create_file(state, path, mode, buf, size);
4414 if (res < 0)
4415 return -1;
4416 if (!res)
4417 return 0;
4420 if (errno == EEXIST || errno == EACCES) {
4421 /* We may be trying to create a file where a directory
4422 * used to be.
4424 struct stat st;
4425 if (!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))
4426 errno = EEXIST;
4429 if (errno == EEXIST) {
4430 unsigned int nr = getpid();
4432 for (;;) {
4433 char newpath[PATH_MAX];
4434 mksnpath(newpath, sizeof(newpath), "%s~%u", path, nr);
4435 res = try_create_file(state, newpath, mode, buf, size);
4436 if (res < 0)
4437 return -1;
4438 if (!res) {
4439 if (!rename(newpath, path))
4440 return 0;
4441 unlink_or_warn(newpath);
4442 break;
4444 if (errno != EEXIST)
4445 break;
4446 ++nr;
4449 return error_errno(_("unable to write file '%s' mode %o"),
4450 path, mode);
4453 static int add_conflicted_stages_file(struct apply_state *state,
4454 struct patch *patch)
4456 int stage, namelen;
4457 unsigned mode;
4458 struct cache_entry *ce;
4460 if (!state->update_index)
4461 return 0;
4462 namelen = strlen(patch->new_name);
4463 mode = patch->new_mode ? patch->new_mode : (S_IFREG | 0644);
4465 remove_file_from_index(state->repo->index, patch->new_name);
4466 for (stage = 1; stage < 4; stage++) {
4467 if (is_null_oid(&patch->threeway_stage[stage - 1]))
4468 continue;
4469 ce = make_empty_cache_entry(state->repo->index, namelen);
4470 memcpy(ce->name, patch->new_name, namelen);
4471 ce->ce_mode = create_ce_mode(mode);
4472 ce->ce_flags = create_ce_flags(stage);
4473 ce->ce_namelen = namelen;
4474 oidcpy(&ce->oid, &patch->threeway_stage[stage - 1]);
4475 if (add_index_entry(state->repo->index, ce, ADD_CACHE_OK_TO_ADD) < 0) {
4476 discard_cache_entry(ce);
4477 return error(_("unable to add cache entry for %s"),
4478 patch->new_name);
4482 return 0;
4485 static int create_file(struct apply_state *state, struct patch *patch)
4487 char *path = patch->new_name;
4488 unsigned mode = patch->new_mode;
4489 unsigned long size = patch->resultsize;
4490 char *buf = patch->result;
4492 if (!mode)
4493 mode = S_IFREG | 0644;
4494 if (create_one_file(state, path, mode, buf, size))
4495 return -1;
4497 if (patch->conflicted_threeway)
4498 return add_conflicted_stages_file(state, patch);
4499 else if (state->update_index)
4500 return add_index_file(state, path, mode, buf, size);
4501 return 0;
4504 /* phase zero is to remove, phase one is to create */
4505 static int write_out_one_result(struct apply_state *state,
4506 struct patch *patch,
4507 int phase)
4509 if (patch->is_delete > 0) {
4510 if (phase == 0)
4511 return remove_file(state, patch, 1);
4512 return 0;
4514 if (patch->is_new > 0 || patch->is_copy) {
4515 if (phase == 1)
4516 return create_file(state, patch);
4517 return 0;
4520 * Rename or modification boils down to the same
4521 * thing: remove the old, write the new
4523 if (phase == 0)
4524 return remove_file(state, patch, patch->is_rename);
4525 if (phase == 1)
4526 return create_file(state, patch);
4527 return 0;
4530 static int write_out_one_reject(struct apply_state *state, struct patch *patch)
4532 FILE *rej;
4533 char namebuf[PATH_MAX];
4534 struct fragment *frag;
4535 int cnt = 0;
4536 struct strbuf sb = STRBUF_INIT;
4538 for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) {
4539 if (!frag->rejected)
4540 continue;
4541 cnt++;
4544 if (!cnt) {
4545 if (state->apply_verbosity > verbosity_normal)
4546 say_patch_name(stderr,
4547 _("Applied patch %s cleanly."), patch);
4548 return 0;
4551 /* This should not happen, because a removal patch that leaves
4552 * contents are marked "rejected" at the patch level.
4554 if (!patch->new_name)
4555 die(_("internal error"));
4557 /* Say this even without --verbose */
4558 strbuf_addf(&sb, Q_("Applying patch %%s with %d reject...",
4559 "Applying patch %%s with %d rejects...",
4560 cnt),
4561 cnt);
4562 if (state->apply_verbosity > verbosity_silent)
4563 say_patch_name(stderr, sb.buf, patch);
4564 strbuf_release(&sb);
4566 cnt = strlen(patch->new_name);
4567 if (ARRAY_SIZE(namebuf) <= cnt + 5) {
4568 cnt = ARRAY_SIZE(namebuf) - 5;
4569 warning(_("truncating .rej filename to %.*s.rej"),
4570 cnt - 1, patch->new_name);
4572 memcpy(namebuf, patch->new_name, cnt);
4573 memcpy(namebuf + cnt, ".rej", 5);
4575 rej = fopen(namebuf, "w");
4576 if (!rej)
4577 return error_errno(_("cannot open %s"), namebuf);
4579 /* Normal git tools never deal with .rej, so do not pretend
4580 * this is a git patch by saying --git or giving extended
4581 * headers. While at it, maybe please "kompare" that wants
4582 * the trailing TAB and some garbage at the end of line ;-).
4584 fprintf(rej, "diff a/%s b/%s\t(rejected hunks)\n",
4585 patch->new_name, patch->new_name);
4586 for (cnt = 1, frag = patch->fragments;
4587 frag;
4588 cnt++, frag = frag->next) {
4589 if (!frag->rejected) {
4590 if (state->apply_verbosity > verbosity_silent)
4591 fprintf_ln(stderr, _("Hunk #%d applied cleanly."), cnt);
4592 continue;
4594 if (state->apply_verbosity > verbosity_silent)
4595 fprintf_ln(stderr, _("Rejected hunk #%d."), cnt);
4596 fprintf(rej, "%.*s", frag->size, frag->patch);
4597 if (frag->patch[frag->size-1] != '\n')
4598 fputc('\n', rej);
4600 fclose(rej);
4601 return -1;
4605 * Returns:
4606 * -1 if an error happened
4607 * 0 if the patch applied cleanly
4608 * 1 if the patch did not apply cleanly
4610 static int write_out_results(struct apply_state *state, struct patch *list)
4612 int phase;
4613 int errs = 0;
4614 struct patch *l;
4615 struct string_list cpath = STRING_LIST_INIT_DUP;
4617 for (phase = 0; phase < 2; phase++) {
4618 l = list;
4619 while (l) {
4620 if (l->rejected)
4621 errs = 1;
4622 else {
4623 if (write_out_one_result(state, l, phase)) {
4624 string_list_clear(&cpath, 0);
4625 return -1;
4627 if (phase == 1) {
4628 if (write_out_one_reject(state, l))
4629 errs = 1;
4630 if (l->conflicted_threeway) {
4631 string_list_append(&cpath, l->new_name);
4632 errs = 1;
4636 l = l->next;
4640 if (cpath.nr) {
4641 struct string_list_item *item;
4643 string_list_sort(&cpath);
4644 if (state->apply_verbosity > verbosity_silent) {
4645 for_each_string_list_item(item, &cpath)
4646 fprintf(stderr, "U %s\n", item->string);
4648 string_list_clear(&cpath, 0);
4650 repo_rerere(state->repo, 0);
4653 return errs;
4657 * Try to apply a patch.
4659 * Returns:
4660 * -128 if a bad error happened (like patch unreadable)
4661 * -1 if patch did not apply and user cannot deal with it
4662 * 0 if the patch applied
4663 * 1 if the patch did not apply but user might fix it
4665 static int apply_patch(struct apply_state *state,
4666 int fd,
4667 const char *filename,
4668 int options)
4670 size_t offset;
4671 struct strbuf buf = STRBUF_INIT; /* owns the patch text */
4672 struct patch *list = NULL, **listp = &list;
4673 int skipped_patch = 0;
4674 int res = 0;
4675 int flush_attributes = 0;
4677 state->patch_input_file = filename;
4678 if (read_patch_file(&buf, fd) < 0)
4679 return -128;
4680 offset = 0;
4681 while (offset < buf.len) {
4682 struct patch *patch;
4683 int nr;
4685 CALLOC_ARRAY(patch, 1);
4686 patch->inaccurate_eof = !!(options & APPLY_OPT_INACCURATE_EOF);
4687 patch->recount = !!(options & APPLY_OPT_RECOUNT);
4688 nr = parse_chunk(state, buf.buf + offset, buf.len - offset, patch);
4689 if (nr < 0) {
4690 free_patch(patch);
4691 if (nr == -128) {
4692 res = -128;
4693 goto end;
4695 break;
4697 if (state->apply_in_reverse)
4698 reverse_patches(patch);
4699 if (use_patch(state, patch)) {
4700 patch_stats(state, patch);
4701 if (!list || !state->apply_in_reverse) {
4702 *listp = patch;
4703 listp = &patch->next;
4704 } else {
4705 patch->next = list;
4706 list = patch;
4709 if ((patch->new_name &&
4710 ends_with_path_components(patch->new_name,
4711 GITATTRIBUTES_FILE)) ||
4712 (patch->old_name &&
4713 ends_with_path_components(patch->old_name,
4714 GITATTRIBUTES_FILE)))
4715 flush_attributes = 1;
4717 else {
4718 if (state->apply_verbosity > verbosity_normal)
4719 say_patch_name(stderr, _("Skipped patch '%s'."), patch);
4720 free_patch(patch);
4721 skipped_patch++;
4723 offset += nr;
4726 if (!list && !skipped_patch) {
4727 error(_("unrecognized input"));
4728 res = -128;
4729 goto end;
4732 if (state->whitespace_error && (state->ws_error_action == die_on_ws_error))
4733 state->apply = 0;
4735 state->update_index = (state->check_index || state->ita_only) && state->apply;
4736 if (state->update_index && !is_lock_file_locked(&state->lock_file)) {
4737 if (state->index_file)
4738 hold_lock_file_for_update(&state->lock_file,
4739 state->index_file,
4740 LOCK_DIE_ON_ERROR);
4741 else
4742 repo_hold_locked_index(state->repo, &state->lock_file,
4743 LOCK_DIE_ON_ERROR);
4746 if (state->check_index && read_apply_cache(state) < 0) {
4747 error(_("unable to read index file"));
4748 res = -128;
4749 goto end;
4752 if (state->check || state->apply) {
4753 int r = check_patch_list(state, list);
4754 if (r == -128) {
4755 res = -128;
4756 goto end;
4758 if (r < 0 && !state->apply_with_reject) {
4759 res = -1;
4760 goto end;
4764 if (state->apply) {
4765 int write_res = write_out_results(state, list);
4766 if (write_res < 0) {
4767 res = -128;
4768 goto end;
4770 if (write_res > 0) {
4771 /* with --3way, we still need to write the index out */
4772 res = state->apply_with_reject ? -1 : 1;
4773 goto end;
4777 if (state->fake_ancestor &&
4778 build_fake_ancestor(state, list)) {
4779 res = -128;
4780 goto end;
4783 if (state->diffstat && state->apply_verbosity > verbosity_silent)
4784 stat_patch_list(state, list);
4786 if (state->numstat && state->apply_verbosity > verbosity_silent)
4787 numstat_patch_list(state, list);
4789 if (state->summary && state->apply_verbosity > verbosity_silent)
4790 summary_patch_list(list);
4792 if (flush_attributes)
4793 reset_parsed_attributes();
4794 end:
4795 free_patch_list(list);
4796 strbuf_release(&buf);
4797 string_list_clear(&state->fn_table, 0);
4798 return res;
4801 static int apply_option_parse_exclude(const struct option *opt,
4802 const char *arg, int unset)
4804 struct apply_state *state = opt->value;
4806 BUG_ON_OPT_NEG(unset);
4808 add_name_limit(state, arg, 1);
4809 return 0;
4812 static int apply_option_parse_include(const struct option *opt,
4813 const char *arg, int unset)
4815 struct apply_state *state = opt->value;
4817 BUG_ON_OPT_NEG(unset);
4819 add_name_limit(state, arg, 0);
4820 state->has_include = 1;
4821 return 0;
4824 static int apply_option_parse_p(const struct option *opt,
4825 const char *arg,
4826 int unset)
4828 struct apply_state *state = opt->value;
4830 BUG_ON_OPT_NEG(unset);
4832 state->p_value = atoi(arg);
4833 state->p_value_known = 1;
4834 return 0;
4837 static int apply_option_parse_space_change(const struct option *opt,
4838 const char *arg, int unset)
4840 struct apply_state *state = opt->value;
4842 BUG_ON_OPT_ARG(arg);
4844 if (unset)
4845 state->ws_ignore_action = ignore_ws_none;
4846 else
4847 state->ws_ignore_action = ignore_ws_change;
4848 return 0;
4851 static int apply_option_parse_whitespace(const struct option *opt,
4852 const char *arg, int unset)
4854 struct apply_state *state = opt->value;
4856 BUG_ON_OPT_NEG(unset);
4858 state->whitespace_option = arg;
4859 if (parse_whitespace_option(state, arg))
4860 return -1;
4861 return 0;
4864 static int apply_option_parse_directory(const struct option *opt,
4865 const char *arg, int unset)
4867 struct apply_state *state = opt->value;
4869 BUG_ON_OPT_NEG(unset);
4871 strbuf_reset(&state->root);
4872 strbuf_addstr(&state->root, arg);
4873 strbuf_complete(&state->root, '/');
4874 return 0;
4877 int apply_all_patches(struct apply_state *state,
4878 int argc,
4879 const char **argv,
4880 int options)
4882 int i;
4883 int res;
4884 int errs = 0;
4885 int read_stdin = 1;
4887 for (i = 0; i < argc; i++) {
4888 const char *arg = argv[i];
4889 char *to_free = NULL;
4890 int fd;
4892 if (!strcmp(arg, "-")) {
4893 res = apply_patch(state, 0, "<stdin>", options);
4894 if (res < 0)
4895 goto end;
4896 errs |= res;
4897 read_stdin = 0;
4898 continue;
4899 } else
4900 arg = to_free = prefix_filename(state->prefix, arg);
4902 fd = open(arg, O_RDONLY);
4903 if (fd < 0) {
4904 error(_("can't open patch '%s': %s"), arg, strerror(errno));
4905 res = -128;
4906 free(to_free);
4907 goto end;
4909 read_stdin = 0;
4910 set_default_whitespace_mode(state);
4911 res = apply_patch(state, fd, arg, options);
4912 close(fd);
4913 free(to_free);
4914 if (res < 0)
4915 goto end;
4916 errs |= res;
4918 set_default_whitespace_mode(state);
4919 if (read_stdin) {
4920 res = apply_patch(state, 0, "<stdin>", options);
4921 if (res < 0)
4922 goto end;
4923 errs |= res;
4926 if (state->whitespace_error) {
4927 if (state->squelch_whitespace_errors &&
4928 state->squelch_whitespace_errors < state->whitespace_error) {
4929 int squelched =
4930 state->whitespace_error - state->squelch_whitespace_errors;
4931 warning(Q_("squelched %d whitespace error",
4932 "squelched %d whitespace errors",
4933 squelched),
4934 squelched);
4936 if (state->ws_error_action == die_on_ws_error) {
4937 error(Q_("%d line adds whitespace errors.",
4938 "%d lines add whitespace errors.",
4939 state->whitespace_error),
4940 state->whitespace_error);
4941 res = -128;
4942 goto end;
4944 if (state->applied_after_fixing_ws && state->apply)
4945 warning(Q_("%d line applied after"
4946 " fixing whitespace errors.",
4947 "%d lines applied after"
4948 " fixing whitespace errors.",
4949 state->applied_after_fixing_ws),
4950 state->applied_after_fixing_ws);
4951 else if (state->whitespace_error)
4952 warning(Q_("%d line adds whitespace errors.",
4953 "%d lines add whitespace errors.",
4954 state->whitespace_error),
4955 state->whitespace_error);
4958 if (state->update_index) {
4959 res = write_locked_index(state->repo->index, &state->lock_file, COMMIT_LOCK);
4960 if (res) {
4961 error(_("Unable to write new index file"));
4962 res = -128;
4963 goto end;
4967 res = !!errs;
4969 end:
4970 rollback_lock_file(&state->lock_file);
4972 if (state->apply_verbosity <= verbosity_silent) {
4973 set_error_routine(state->saved_error_routine);
4974 set_warn_routine(state->saved_warn_routine);
4977 if (res > -1)
4978 return res;
4979 return (res == -1 ? 1 : 128);
4982 int apply_parse_options(int argc, const char **argv,
4983 struct apply_state *state,
4984 int *force_apply, int *options,
4985 const char * const *apply_usage)
4987 struct option builtin_apply_options[] = {
4988 OPT_CALLBACK_F(0, "exclude", state, N_("path"),
4989 N_("don't apply changes matching the given path"),
4990 PARSE_OPT_NONEG, apply_option_parse_exclude),
4991 OPT_CALLBACK_F(0, "include", state, N_("path"),
4992 N_("apply changes matching the given path"),
4993 PARSE_OPT_NONEG, apply_option_parse_include),
4994 OPT_CALLBACK('p', NULL, state, N_("num"),
4995 N_("remove <num> leading slashes from traditional diff paths"),
4996 apply_option_parse_p),
4997 OPT_BOOL(0, "no-add", &state->no_add,
4998 N_("ignore additions made by the patch")),
4999 OPT_BOOL(0, "stat", &state->diffstat,
5000 N_("instead of applying the patch, output diffstat for the input")),
5001 OPT_NOOP_NOARG(0, "allow-binary-replacement"),
5002 OPT_NOOP_NOARG(0, "binary"),
5003 OPT_BOOL(0, "numstat", &state->numstat,
5004 N_("show number of added and deleted lines in decimal notation")),
5005 OPT_BOOL(0, "summary", &state->summary,
5006 N_("instead of applying the patch, output a summary for the input")),
5007 OPT_BOOL(0, "check", &state->check,
5008 N_("instead of applying the patch, see if the patch is applicable")),
5009 OPT_BOOL(0, "index", &state->check_index,
5010 N_("make sure the patch is applicable to the current index")),
5011 OPT_BOOL('N', "intent-to-add", &state->ita_only,
5012 N_("mark new files with `git add --intent-to-add`")),
5013 OPT_BOOL(0, "cached", &state->cached,
5014 N_("apply a patch without touching the working tree")),
5015 OPT_BOOL_F(0, "unsafe-paths", &state->unsafe_paths,
5016 N_("accept a patch that touches outside the working area"),
5017 PARSE_OPT_NOCOMPLETE),
5018 OPT_BOOL(0, "apply", force_apply,
5019 N_("also apply the patch (use with --stat/--summary/--check)")),
5020 OPT_BOOL('3', "3way", &state->threeway,
5021 N_( "attempt three-way merge if a patch does not apply")),
5022 OPT_FILENAME(0, "build-fake-ancestor", &state->fake_ancestor,
5023 N_("build a temporary index based on embedded index information")),
5024 /* Think twice before adding "--nul" synonym to this */
5025 OPT_SET_INT('z', NULL, &state->line_termination,
5026 N_("paths are separated with NUL character"), '\0'),
5027 OPT_INTEGER('C', NULL, &state->p_context,
5028 N_("ensure at least <n> lines of context match")),
5029 OPT_CALLBACK(0, "whitespace", state, N_("action"),
5030 N_("detect new or modified lines that have whitespace errors"),
5031 apply_option_parse_whitespace),
5032 OPT_CALLBACK_F(0, "ignore-space-change", state, NULL,
5033 N_("ignore changes in whitespace when finding context"),
5034 PARSE_OPT_NOARG, apply_option_parse_space_change),
5035 OPT_CALLBACK_F(0, "ignore-whitespace", state, NULL,
5036 N_("ignore changes in whitespace when finding context"),
5037 PARSE_OPT_NOARG, apply_option_parse_space_change),
5038 OPT_BOOL('R', "reverse", &state->apply_in_reverse,
5039 N_("apply the patch in reverse")),
5040 OPT_BOOL(0, "unidiff-zero", &state->unidiff_zero,
5041 N_("don't expect at least one line of context")),
5042 OPT_BOOL(0, "reject", &state->apply_with_reject,
5043 N_("leave the rejected hunks in corresponding *.rej files")),
5044 OPT_BOOL(0, "allow-overlap", &state->allow_overlap,
5045 N_("allow overlapping hunks")),
5046 OPT__VERBOSE(&state->apply_verbosity, N_("be verbose")),
5047 OPT_BIT(0, "inaccurate-eof", options,
5048 N_("tolerate incorrectly detected missing new-line at the end of file"),
5049 APPLY_OPT_INACCURATE_EOF),
5050 OPT_BIT(0, "recount", options,
5051 N_("do not trust the line counts in the hunk headers"),
5052 APPLY_OPT_RECOUNT),
5053 OPT_CALLBACK(0, "directory", state, N_("root"),
5054 N_("prepend <root> to all filenames"),
5055 apply_option_parse_directory),
5056 OPT_END()
5059 return parse_options(argc, argv, state->prefix, builtin_apply_options, apply_usage, 0);