4 * Copyright (C) Linus Torvalds, 2005
6 * This applies patches on top of some (arbitrary) version of the SCM.
11 #include "cache-tree.h"
18 * --check turns on checking that the working tree matches the
19 * files that are being modified, but doesn't apply the patch
20 * --stat does just a diffstat, and doesn't actually apply
21 * --numstat does numeric diffstat, and doesn't actually apply
22 * --index-info shows the old and new index info for paths if available.
23 * --index updates the cache as well.
24 * --cached updates only the cache without ever touching the working tree.
26 static const char *prefix;
27 static int prefix_length = -1;
28 static int newfd = -1;
30 static int p_value = 1;
31 static int allow_binary_replacement;
32 static int check_index;
33 static int write_index;
40 static int apply_in_reverse;
41 static int apply_with_reject;
42 static int apply_verbosely;
44 static int show_index_info;
45 static int line_termination = '\n';
46 static unsigned long p_context = -1;
47 static const char apply_usage[] =
48 "git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--cached] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [--reverse] [--reject] [--verbose] [-z] [-pNUM] [-CNUM] [--whitespace=<nowarn|warn|error|error-all|strip>] <patch>...";
50 static enum whitespace_eol {
55 } new_whitespace = warn_on_whitespace;
56 static int whitespace_error;
57 static int squelch_whitespace_errors = 5;
58 static int applied_after_stripping;
59 static const char *patch_input_file;
61 static void parse_whitespace_option(const char *option)
64 new_whitespace = warn_on_whitespace;
67 if (!strcmp(option, "warn")) {
68 new_whitespace = warn_on_whitespace;
71 if (!strcmp(option, "nowarn")) {
72 new_whitespace = nowarn_whitespace;
75 if (!strcmp(option, "error")) {
76 new_whitespace = error_on_whitespace;
79 if (!strcmp(option, "error-all")) {
80 new_whitespace = error_on_whitespace;
81 squelch_whitespace_errors = 0;
84 if (!strcmp(option, "strip")) {
85 new_whitespace = strip_whitespace;
88 die("unrecognized whitespace option '%s'", option);
91 static void set_default_whitespace_mode(const char *whitespace_option)
93 if (!whitespace_option && !apply_default_whitespace) {
94 new_whitespace = (apply
101 * For "diff-stat" like behaviour, we keep track of the biggest change
102 * we've seen, and the longest filename. That allows us to do simple
105 static int max_change, max_len;
108 * Various "current state", notably line numbers and what
109 * file (and how) we're patching right now.. The "is_xxxx"
110 * things are flags, where -1 means "don't know yet".
112 static int linenr = 1;
115 * This represents one "hunk" from a patch, starting with
116 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The
117 * patch text is pointed at by patch, and its byte length
118 * is stored in size. leading and trailing are the number
122 unsigned long leading, trailing;
123 unsigned long oldpos, oldlines;
124 unsigned long newpos, newlines;
128 struct fragment *next;
132 * When dealing with a binary patch, we reuse "leading" field
133 * to store the type of the binary hunk, either deflated "delta"
134 * or deflated "literal".
136 #define binary_patch_method leading
137 #define BINARY_DELTA_DEFLATED 1
138 #define BINARY_LITERAL_DEFLATED 2
141 char *new_name, *old_name, *def_name;
142 unsigned int old_mode, new_mode;
143 int is_rename, is_copy, is_new, is_delete, is_binary;
145 unsigned long deflate_origlen;
146 int lines_added, lines_deleted;
148 int inaccurate_eof:1;
149 struct fragment *fragments;
151 unsigned long resultsize;
152 char old_sha1_prefix[41];
153 char new_sha1_prefix[41];
157 static void say_patch_name(FILE *output, const char *pre, struct patch *patch, const char *post)
160 if (patch->old_name && patch->new_name &&
161 strcmp(patch->old_name, patch->new_name)) {
162 write_name_quoted(NULL, 0, patch->old_name, 1, output);
163 fputs(" => ", output);
164 write_name_quoted(NULL, 0, patch->new_name, 1, output);
167 const char *n = patch->new_name;
170 write_name_quoted(NULL, 0, n, 1, output);
175 #define CHUNKSIZE (8192)
178 static void *read_patch_file(int fd, unsigned long *sizep)
180 unsigned long size = 0, alloc = CHUNKSIZE;
181 void *buffer = xmalloc(alloc);
184 int nr = alloc - size;
187 buffer = xrealloc(buffer, alloc);
190 nr = xread(fd, (char *) buffer + size, nr);
194 die("git-apply: read returned %s", strerror(errno));
200 * Make sure that we have some slop in the buffer
201 * so that we can do speculative "memcmp" etc, and
202 * see to it that it is NUL-filled.
204 if (alloc < size + SLOP)
205 buffer = xrealloc(buffer, size + SLOP);
206 memset((char *) buffer + size, 0, SLOP);
210 static unsigned long linelen(const char *buffer, unsigned long size)
212 unsigned long len = 0;
215 if (*buffer++ == '\n')
221 static int is_dev_null(const char *str)
223 return !memcmp("/dev/null", str, 9) && isspace(str[9]);
229 static int name_terminate(const char *name, int namelen, int c, int terminate)
231 if (c == ' ' && !(terminate & TERM_SPACE))
233 if (c == '\t' && !(terminate & TERM_TAB))
239 static char * find_name(const char *line, char *def, int p_value, int terminate)
242 const char *start = line;
246 /* Proposed "new-style" GNU patch/diff format; see
247 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
249 name = unquote_c_style(line, NULL);
253 cp = strchr(name, '/');
260 /* name can later be freed, so we need
261 * to memmove, not just return cp
263 memmove(name, cp, strlen(cp) + 1);
280 if (name_terminate(start, line-start, c, terminate))
284 if (c == '/' && !--p_value)
294 * Generally we prefer the shorter name, especially
295 * if the other one is just a variation of that with
296 * something else tacked on to the end (ie "file.orig"
300 int deflen = strlen(def);
301 if (deflen < len && !strncmp(start, def, deflen))
305 name = xmalloc(len + 1);
306 memcpy(name, start, len);
313 * Get the name etc info from the --/+++ lines of a traditional patch header
315 * NOTE! This hardcodes "-p1" behaviour in filename detection.
317 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
318 * files, we can happily check the index for a match, but for creating a
319 * new file we should try to match whatever "patch" does. I have no idea.
321 static void parse_traditional_patch(const char *first, const char *second, struct patch *patch)
325 first += 4; /* skip "--- " */
326 second += 4; /* skip "+++ " */
327 if (is_dev_null(first)) {
329 patch->is_delete = 0;
330 name = find_name(second, NULL, p_value, TERM_SPACE | TERM_TAB);
331 patch->new_name = name;
332 } else if (is_dev_null(second)) {
334 patch->is_delete = 1;
335 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
336 patch->old_name = name;
338 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
339 name = find_name(second, name, p_value, TERM_SPACE | TERM_TAB);
340 patch->old_name = patch->new_name = name;
343 die("unable to find filename in patch at line %d", linenr);
346 static int gitdiff_hdrend(const char *line, struct patch *patch)
352 * We're anal about diff header consistency, to make
353 * sure that we don't end up having strange ambiguous
354 * patches floating around.
356 * As a result, gitdiff_{old|new}name() will check
357 * their names against any previous information, just
360 static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, const char *oldnew)
362 if (!orig_name && !isnull)
363 return find_name(line, NULL, 1, 0);
372 die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr);
373 another = find_name(line, NULL, 1, 0);
374 if (!another || memcmp(another, name, len))
375 die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr);
380 /* expect "/dev/null" */
381 if (memcmp("/dev/null", line, 9) || line[9] != '\n')
382 die("git-apply: bad git-diff - expected /dev/null on line %d", linenr);
387 static int gitdiff_oldname(const char *line, struct patch *patch)
389 patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name, "old");
393 static int gitdiff_newname(const char *line, struct patch *patch)
395 patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name, "new");
399 static int gitdiff_oldmode(const char *line, struct patch *patch)
401 patch->old_mode = strtoul(line, NULL, 8);
405 static int gitdiff_newmode(const char *line, struct patch *patch)
407 patch->new_mode = strtoul(line, NULL, 8);
411 static int gitdiff_delete(const char *line, struct patch *patch)
413 patch->is_delete = 1;
414 patch->old_name = patch->def_name;
415 return gitdiff_oldmode(line, patch);
418 static int gitdiff_newfile(const char *line, struct patch *patch)
421 patch->new_name = patch->def_name;
422 return gitdiff_newmode(line, patch);
425 static int gitdiff_copysrc(const char *line, struct patch *patch)
428 patch->old_name = find_name(line, NULL, 0, 0);
432 static int gitdiff_copydst(const char *line, struct patch *patch)
435 patch->new_name = find_name(line, NULL, 0, 0);
439 static int gitdiff_renamesrc(const char *line, struct patch *patch)
441 patch->is_rename = 1;
442 patch->old_name = find_name(line, NULL, 0, 0);
446 static int gitdiff_renamedst(const char *line, struct patch *patch)
448 patch->is_rename = 1;
449 patch->new_name = find_name(line, NULL, 0, 0);
453 static int gitdiff_similarity(const char *line, struct patch *patch)
455 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
460 static int gitdiff_dissimilarity(const char *line, struct patch *patch)
462 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
467 static int gitdiff_index(const char *line, struct patch *patch)
469 /* index line is N hexadecimal, "..", N hexadecimal,
470 * and optional space with octal mode.
472 const char *ptr, *eol;
475 ptr = strchr(line, '.');
476 if (!ptr || ptr[1] != '.' || 40 < ptr - line)
479 memcpy(patch->old_sha1_prefix, line, len);
480 patch->old_sha1_prefix[len] = 0;
483 ptr = strchr(line, ' ');
484 eol = strchr(line, '\n');
486 if (!ptr || eol < ptr)
492 memcpy(patch->new_sha1_prefix, line, len);
493 patch->new_sha1_prefix[len] = 0;
495 patch->new_mode = patch->old_mode = strtoul(ptr+1, NULL, 8);
500 * This is normal for a diff that doesn't change anything: we'll fall through
501 * into the next diff. Tell the parser to break out.
503 static int gitdiff_unrecognized(const char *line, struct patch *patch)
508 static const char *stop_at_slash(const char *line, int llen)
512 for (i = 0; i < llen; i++) {
520 /* This is to extract the same name that appears on "diff --git"
521 * line. We do not find and return anything if it is a rename
522 * patch, and it is OK because we will find the name elsewhere.
523 * We need to reliably find name only when it is mode-change only,
524 * creation or deletion of an empty file. In any of these cases,
525 * both sides are the same name under a/ and b/ respectively.
527 static char *git_header_name(char *line, int llen)
531 const char *second = NULL;
533 line += strlen("diff --git ");
534 llen -= strlen("diff --git ");
538 char *first = unquote_c_style(line, &second);
542 /* advance to the first slash */
543 cp = stop_at_slash(first, strlen(first));
544 if (!cp || cp == first) {
545 /* we do not accept absolute paths */
551 memmove(first, cp+1, len+1); /* including NUL */
553 /* second points at one past closing dq of name.
554 * find the second name.
556 while ((second < line + llen) && isspace(*second))
559 if (line + llen <= second)
560 goto free_first_and_fail;
561 if (*second == '"') {
562 char *sp = unquote_c_style(second, NULL);
564 goto free_first_and_fail;
565 cp = stop_at_slash(sp, strlen(sp));
566 if (!cp || cp == sp) {
569 goto free_first_and_fail;
571 /* They must match, otherwise ignore */
572 if (strcmp(cp+1, first))
573 goto free_both_and_fail;
578 /* unquoted second */
579 cp = stop_at_slash(second, line + llen - second);
580 if (!cp || cp == second)
581 goto free_first_and_fail;
583 if (line + llen - cp != len + 1 ||
584 memcmp(first, cp, len))
585 goto free_first_and_fail;
589 /* unquoted first name */
590 name = stop_at_slash(line, llen);
591 if (!name || name == line)
596 /* since the first name is unquoted, a dq if exists must be
597 * the beginning of the second name.
599 for (second = name; second < line + llen; second++) {
600 if (*second == '"') {
601 const char *cp = second;
603 char *sp = unquote_c_style(second, NULL);
607 np = stop_at_slash(sp, strlen(sp));
608 if (!np || np == sp) {
609 free_second_and_fail:
615 if (len < cp - name &&
616 !strncmp(np, name, len) &&
617 isspace(name[len])) {
619 memmove(sp, np, len + 1);
622 goto free_second_and_fail;
627 * Accept a name only if it shows up twice, exactly the same
630 for (len = 0 ; ; len++) {
645 if (second[len] == '\n' && !memcmp(name, second, len)) {
646 char *ret = xmalloc(len + 1);
647 memcpy(ret, name, len);
656 /* Verify that we recognize the lines following a git header */
657 static int parse_git_header(char *line, int len, unsigned int size, struct patch *patch)
659 unsigned long offset;
661 /* A git diff has explicit new/delete information, so we don't guess */
663 patch->is_delete = 0;
666 * Some things may not have the old name in the
667 * rest of the headers anywhere (pure mode changes,
668 * or removing or adding empty files), so we get
669 * the default name from the header.
671 patch->def_name = git_header_name(line, len);
676 for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {
677 static const struct opentry {
679 int (*fn)(const char *, struct patch *);
681 { "@@ -", gitdiff_hdrend },
682 { "--- ", gitdiff_oldname },
683 { "+++ ", gitdiff_newname },
684 { "old mode ", gitdiff_oldmode },
685 { "new mode ", gitdiff_newmode },
686 { "deleted file mode ", gitdiff_delete },
687 { "new file mode ", gitdiff_newfile },
688 { "copy from ", gitdiff_copysrc },
689 { "copy to ", gitdiff_copydst },
690 { "rename old ", gitdiff_renamesrc },
691 { "rename new ", gitdiff_renamedst },
692 { "rename from ", gitdiff_renamesrc },
693 { "rename to ", gitdiff_renamedst },
694 { "similarity index ", gitdiff_similarity },
695 { "dissimilarity index ", gitdiff_dissimilarity },
696 { "index ", gitdiff_index },
697 { "", gitdiff_unrecognized },
701 len = linelen(line, size);
702 if (!len || line[len-1] != '\n')
704 for (i = 0; i < ARRAY_SIZE(optable); i++) {
705 const struct opentry *p = optable + i;
706 int oplen = strlen(p->str);
707 if (len < oplen || memcmp(p->str, line, oplen))
709 if (p->fn(line + oplen, patch) < 0)
718 static int parse_num(const char *line, unsigned long *p)
724 *p = strtoul(line, &ptr, 10);
728 static int parse_range(const char *line, int len, int offset, const char *expect,
729 unsigned long *p1, unsigned long *p2)
733 if (offset < 0 || offset >= len)
738 digits = parse_num(line, p1);
748 digits = parse_num(line+1, p2);
760 if (memcmp(line, expect, ex))
767 * Parse a unified diff fragment header of the
768 * form "@@ -a,b +c,d @@"
770 static int parse_fragment_header(char *line, int len, struct fragment *fragment)
774 if (!len || line[len-1] != '\n')
777 /* Figure out the number of lines in a fragment */
778 offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);
779 offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);
784 static int find_header(char *line, unsigned long size, int *hdrsize, struct patch *patch)
786 unsigned long offset, len;
788 patch->is_rename = patch->is_copy = 0;
789 patch->is_new = patch->is_delete = -1;
790 patch->old_mode = patch->new_mode = 0;
791 patch->old_name = patch->new_name = NULL;
792 for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {
793 unsigned long nextlen;
795 len = linelen(line, size);
799 /* Testing this early allows us to take a few shortcuts.. */
804 * Make sure we don't find any unconnected patch fragments.
805 * That's a sign that we didn't find a header, and that a
806 * patch has become corrupted/broken up.
808 if (!memcmp("@@ -", line, 4)) {
809 struct fragment dummy;
810 if (parse_fragment_header(line, len, &dummy) < 0)
812 error("patch fragment without header at line %d: %.*s", linenr, (int)len-1, line);
819 * Git patch? It might not have a real patch, just a rename
820 * or mode change, so we handle that specially
822 if (!memcmp("diff --git ", line, 11)) {
823 int git_hdr_len = parse_git_header(line, len, size, patch);
824 if (git_hdr_len <= len)
826 if (!patch->old_name && !patch->new_name) {
827 if (!patch->def_name)
828 die("git diff header lacks filename information (line %d)", linenr);
829 patch->old_name = patch->new_name = patch->def_name;
831 *hdrsize = git_hdr_len;
835 /** --- followed by +++ ? */
836 if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4))
840 * We only accept unified patches, so we want it to
841 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
844 nextlen = linelen(line + len, size - len);
845 if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))
848 /* Ok, we'll consider it a patch */
849 parse_traditional_patch(line, line+len, patch);
850 *hdrsize = len + nextlen;
858 * Parse a unified diff. Note that this really needs
859 * to parse each fragment separately, since the only
860 * way to know the difference between a "---" that is
861 * part of a patch, and a "---" that starts the next
862 * patch is to look at the line counts..
864 static int parse_fragment(char *line, unsigned long size, struct patch *patch, struct fragment *fragment)
867 int len = linelen(line, size), offset;
868 unsigned long oldlines, newlines;
869 unsigned long leading, trailing;
871 offset = parse_fragment_header(line, len, fragment);
874 oldlines = fragment->oldlines;
875 newlines = fragment->newlines;
879 if (patch->is_new < 0) {
880 patch->is_new = !oldlines;
882 patch->old_name = NULL;
884 if (patch->is_delete < 0) {
885 patch->is_delete = !newlines;
887 patch->new_name = NULL;
890 if (patch->is_new && oldlines)
891 return error("new file depends on old contents");
892 if (patch->is_delete != !newlines) {
894 return error("deleted file still has contents");
895 fprintf(stderr, "** warning: file %s becomes empty but is not deleted\n", patch->new_name);
898 /* Parse the thing.. */
903 for (offset = len; size > 0; offset += len, size -= len, line += len, linenr++) {
904 if (!oldlines && !newlines)
906 len = linelen(line, size);
907 if (!len || line[len-1] != '\n')
915 if (!deleted && !added)
926 * We know len is at least two, since we have a '+' and
927 * we checked that the last character was a '\n' above.
928 * That is, an addition of an empty line would check
929 * the '+' here. Sneaky...
931 if ((new_whitespace != nowarn_whitespace) &&
932 isspace(line[len-2])) {
934 if (squelch_whitespace_errors &&
935 squelch_whitespace_errors <
939 fprintf(stderr, "Adds trailing whitespace.\n%s:%d:%.*s\n",
941 linenr, len-2, line+1);
949 /* We allow "\ No newline at end of file". Depending
950 * on locale settings when the patch was produced we
951 * don't know what this line looks like. The only
952 * thing we do know is that it begins with "\ ".
953 * Checking for 12 is just for sanity check -- any
954 * l10n of "\ No newline..." is at least that long.
957 if (len < 12 || memcmp(line, "\\ ", 2))
962 if (oldlines || newlines)
964 fragment->leading = leading;
965 fragment->trailing = trailing;
967 /* If a fragment ends with an incomplete line, we failed to include
968 * it in the above loop because we hit oldlines == newlines == 0
971 if (12 < size && !memcmp(line, "\\ ", 2))
972 offset += linelen(line, size);
974 patch->lines_added += added;
975 patch->lines_deleted += deleted;
979 static int parse_single_patch(char *line, unsigned long size, struct patch *patch)
981 unsigned long offset = 0;
982 struct fragment **fragp = &patch->fragments;
984 while (size > 4 && !memcmp(line, "@@ -", 4)) {
985 struct fragment *fragment;
988 fragment = xcalloc(1, sizeof(*fragment));
989 len = parse_fragment(line, size, patch, fragment);
991 die("corrupt patch at line %d", linenr);
993 fragment->patch = line;
994 fragment->size = len;
997 fragp = &fragment->next;
1006 static inline int metadata_changes(struct patch *patch)
1008 return patch->is_rename > 0 ||
1009 patch->is_copy > 0 ||
1010 patch->is_new > 0 ||
1012 (patch->old_mode && patch->new_mode &&
1013 patch->old_mode != patch->new_mode);
1016 static char *inflate_it(const void *data, unsigned long size,
1017 unsigned long inflated_size)
1023 memset(&stream, 0, sizeof(stream));
1025 stream.next_in = (unsigned char *)data;
1026 stream.avail_in = size;
1027 stream.next_out = out = xmalloc(inflated_size);
1028 stream.avail_out = inflated_size;
1029 inflateInit(&stream);
1030 st = inflate(&stream, Z_FINISH);
1031 if ((st != Z_STREAM_END) || stream.total_out != inflated_size) {
1038 static struct fragment *parse_binary_hunk(char **buf_p,
1039 unsigned long *sz_p,
1043 /* Expect a line that begins with binary patch method ("literal"
1044 * or "delta"), followed by the length of data before deflating.
1045 * a sequence of 'length-byte' followed by base-85 encoded data
1046 * should follow, terminated by a newline.
1048 * Each 5-byte sequence of base-85 encodes up to 4 bytes,
1049 * and we would limit the patch line to 66 characters,
1050 * so one line can fit up to 13 groups that would decode
1051 * to 52 bytes max. The length byte 'A'-'Z' corresponds
1052 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
1055 unsigned long size = *sz_p;
1056 char *buffer = *buf_p;
1058 unsigned long origlen;
1061 struct fragment *frag;
1063 llen = linelen(buffer, size);
1068 if (!strncmp(buffer, "delta ", 6)) {
1069 patch_method = BINARY_DELTA_DEFLATED;
1070 origlen = strtoul(buffer + 6, NULL, 10);
1072 else if (!strncmp(buffer, "literal ", 8)) {
1073 patch_method = BINARY_LITERAL_DEFLATED;
1074 origlen = strtoul(buffer + 8, NULL, 10);
1082 int byte_length, max_byte_length, newsize;
1083 llen = linelen(buffer, size);
1087 /* consume the blank line */
1092 /* Minimum line is "A00000\n" which is 7-byte long,
1093 * and the line length must be multiple of 5 plus 2.
1095 if ((llen < 7) || (llen-2) % 5)
1097 max_byte_length = (llen - 2) / 5 * 4;
1098 byte_length = *buffer;
1099 if ('A' <= byte_length && byte_length <= 'Z')
1100 byte_length = byte_length - 'A' + 1;
1101 else if ('a' <= byte_length && byte_length <= 'z')
1102 byte_length = byte_length - 'a' + 27;
1105 /* if the input length was not multiple of 4, we would
1106 * have filler at the end but the filler should never
1109 if (max_byte_length < byte_length ||
1110 byte_length <= max_byte_length - 4)
1112 newsize = hunk_size + byte_length;
1113 data = xrealloc(data, newsize);
1114 if (decode_85(data + hunk_size, buffer + 1, byte_length))
1116 hunk_size = newsize;
1121 frag = xcalloc(1, sizeof(*frag));
1122 frag->patch = inflate_it(data, hunk_size, origlen);
1126 frag->size = origlen;
1130 frag->binary_patch_method = patch_method;
1136 error("corrupt binary patch at line %d: %.*s",
1137 linenr-1, llen-1, buffer);
1141 static int parse_binary(char *buffer, unsigned long size, struct patch *patch)
1143 /* We have read "GIT binary patch\n"; what follows is a line
1144 * that says the patch method (currently, either "literal" or
1145 * "delta") and the length of data before deflating; a
1146 * sequence of 'length-byte' followed by base-85 encoded data
1149 * When a binary patch is reversible, there is another binary
1150 * hunk in the same format, starting with patch method (either
1151 * "literal" or "delta") with the length of data, and a sequence
1152 * of length-byte + base-85 encoded data, terminated with another
1153 * empty line. This data, when applied to the postimage, produces
1156 struct fragment *forward;
1157 struct fragment *reverse;
1161 forward = parse_binary_hunk(&buffer, &size, &status, &used);
1162 if (!forward && !status)
1163 /* there has to be one hunk (forward hunk) */
1164 return error("unrecognized binary patch at line %d", linenr-1);
1166 /* otherwise we already gave an error message */
1169 reverse = parse_binary_hunk(&buffer, &size, &status, &used_1);
1173 /* not having reverse hunk is not an error, but having
1174 * a corrupt reverse hunk is.
1176 free((void*) forward->patch);
1180 forward->next = reverse;
1181 patch->fragments = forward;
1182 patch->is_binary = 1;
1186 static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
1188 int hdrsize, patchsize;
1189 int offset = find_header(buffer, size, &hdrsize, patch);
1194 patchsize = parse_single_patch(buffer + offset + hdrsize, size - offset - hdrsize, patch);
1197 static const char *binhdr[] = {
1202 static const char git_binary[] = "GIT binary patch\n";
1204 int hd = hdrsize + offset;
1205 unsigned long llen = linelen(buffer + hd, size - hd);
1207 if (llen == sizeof(git_binary) - 1 &&
1208 !memcmp(git_binary, buffer + hd, llen)) {
1211 used = parse_binary(buffer + hd + llen,
1212 size - hd - llen, patch);
1214 patchsize = used + llen;
1218 else if (!memcmp(" differ\n", buffer + hd + llen - 8, 8)) {
1219 for (i = 0; binhdr[i]; i++) {
1220 int len = strlen(binhdr[i]);
1221 if (len < size - hd &&
1222 !memcmp(binhdr[i], buffer + hd, len)) {
1224 patch->is_binary = 1;
1231 /* Empty patch cannot be applied if:
1232 * - it is a binary patch and we do not do binary_replace, or
1233 * - text patch without metadata change
1235 if ((apply || check) &&
1237 ? !allow_binary_replacement
1238 : !metadata_changes(patch)))
1239 die("patch with only garbage at line %d", linenr);
1242 return offset + hdrsize + patchsize;
1245 #define swap(a,b) myswap((a),(b),sizeof(a))
1247 #define myswap(a, b, size) do { \
1248 unsigned char mytmp[size]; \
1249 memcpy(mytmp, &a, size); \
1250 memcpy(&a, &b, size); \
1251 memcpy(&b, mytmp, size); \
1254 static void reverse_patches(struct patch *p)
1256 for (; p; p = p->next) {
1257 struct fragment *frag = p->fragments;
1259 swap(p->new_name, p->old_name);
1260 swap(p->new_mode, p->old_mode);
1261 swap(p->is_new, p->is_delete);
1262 swap(p->lines_added, p->lines_deleted);
1263 swap(p->old_sha1_prefix, p->new_sha1_prefix);
1265 for (; frag; frag = frag->next) {
1266 swap(frag->newpos, frag->oldpos);
1267 swap(frag->newlines, frag->oldlines);
1272 static const char pluses[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
1273 static const char minuses[]= "----------------------------------------------------------------------";
1275 static void show_stats(struct patch *patch)
1277 const char *prefix = "";
1278 char *name = patch->new_name;
1280 int len, max, add, del, total;
1283 name = patch->old_name;
1285 if (0 < (len = quote_c_style(name, NULL, NULL, 0))) {
1286 qname = xmalloc(len + 1);
1287 quote_c_style(name, qname, NULL, 0);
1292 * "scale" the filename
1303 slash = strchr(name, '/');
1310 * scale the add/delete
1316 add = patch->lines_added;
1317 del = patch->lines_deleted;
1320 if (max_change > 0) {
1321 total = (total * max + max_change / 2) / max_change;
1322 add = (add * max + max_change / 2) / max_change;
1325 if (patch->is_binary)
1326 printf(" %s%-*s | Bin\n", prefix, len, name);
1328 printf(" %s%-*s |%5d %.*s%.*s\n", prefix,
1329 len, name, patch->lines_added + patch->lines_deleted,
1330 add, pluses, del, minuses);
1334 static int read_old_data(struct stat *st, const char *path, void *buf, unsigned long size)
1339 switch (st->st_mode & S_IFMT) {
1341 return readlink(path, buf, size);
1343 fd = open(path, O_RDONLY);
1345 return error("unable to open %s", path);
1348 int ret = xread(fd, (char *) buf + got, size - got);
1361 static int find_offset(const char *buf, unsigned long size, const char *fragment, unsigned long fragsize, int line, int *lines)
1364 unsigned long start, backwards, forwards;
1366 if (fragsize > size)
1371 unsigned long offset = 0;
1373 while (offset + fragsize <= size) {
1374 if (buf[offset++] == '\n') {
1382 /* Exact line number? */
1383 if (!memcmp(buf + start, fragment, fragsize))
1387 * There's probably some smart way to do this, but I'll leave
1388 * that to the smart and beautiful people. I'm simple and stupid.
1392 for (i = 0; ; i++) {
1399 if (forwards + fragsize > size)
1405 } while (backwards && buf[backwards-1] != '\n');
1408 while (forwards + fragsize <= size) {
1409 if (buf[forwards++] == '\n')
1415 if (try + fragsize > size)
1417 if (memcmp(buf + try, fragment, fragsize))
1427 * We should start searching forward and backward.
1432 static void remove_first_line(const char **rbuf, int *rsize)
1434 const char *buf = *rbuf;
1436 unsigned long offset;
1438 while (offset <= size) {
1439 if (buf[offset++] == '\n')
1442 *rsize = size - offset;
1443 *rbuf = buf + offset;
1446 static void remove_last_line(const char **rbuf, int *rsize)
1448 const char *buf = *rbuf;
1450 unsigned long offset;
1452 while (offset > 0) {
1453 if (buf[--offset] == '\n')
1456 *rsize = offset + 1;
1459 struct buffer_desc {
1462 unsigned long alloc;
1465 static int apply_line(char *output, const char *patch, int plen)
1467 /* plen is number of bytes to be copied from patch,
1468 * starting at patch+1 (patch[0] is '+'). Typically
1469 * patch[plen] is '\n'.
1471 int add_nl_to_tail = 0;
1472 if ((new_whitespace == strip_whitespace) &&
1473 1 < plen && isspace(patch[plen-1])) {
1474 if (patch[plen] == '\n')
1477 while (0 < plen && isspace(patch[plen]))
1479 applied_after_stripping++;
1481 memcpy(output, patch + 1, plen);
1483 output[plen++] = '\n';
1487 static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag, int inaccurate_eof)
1489 int match_beginning, match_end;
1490 char *buf = desc->buffer;
1491 const char *patch = frag->patch;
1492 int offset, size = frag->size;
1493 char *old = xmalloc(size);
1494 char *new = xmalloc(size);
1495 const char *oldlines, *newlines;
1496 int oldsize = 0, newsize = 0;
1497 unsigned long leading, trailing;
1502 int len = linelen(patch, size);
1509 * "plen" is how much of the line we should use for
1510 * the actual patch data. Normally we just remove the
1511 * first character on the line, but if the line is
1512 * followed by "\ No newline", then we also remove the
1513 * last one (which is the newline, of course).
1516 if (len < size && patch[len] == '\\')
1519 if (apply_in_reverse) {
1522 else if (first == '+')
1528 memcpy(old + oldsize, patch + 1, plen);
1532 /* Fall-through for ' ' */
1534 if (first != '+' || !no_add)
1535 newsize += apply_line(new + newsize, patch,
1538 case '@': case '\\':
1539 /* Ignore it, we already handled it */
1548 if (inaccurate_eof && oldsize > 0 && old[oldsize - 1] == '\n' &&
1549 newsize > 0 && new[newsize - 1] == '\n') {
1556 leading = frag->leading;
1557 trailing = frag->trailing;
1560 * If we don't have any leading/trailing data in the patch,
1561 * we want it to match at the beginning/end of the file.
1563 match_beginning = !leading && (frag->oldpos == 1);
1564 match_end = !trailing;
1569 offset = find_offset(buf, desc->size,
1570 oldlines, oldsize, pos, &lines);
1571 if (match_end && offset + oldsize != desc->size)
1573 if (match_beginning && offset)
1576 int diff = newsize - oldsize;
1577 unsigned long size = desc->size + diff;
1578 unsigned long alloc = desc->alloc;
1580 /* Warn if it was necessary to reduce the number
1583 if ((leading != frag->leading) ||
1584 (trailing != frag->trailing))
1585 fprintf(stderr, "Context reduced to (%ld/%ld)"
1586 " to apply fragment at %d\n",
1587 leading, trailing, pos + lines);
1590 alloc = size + 8192;
1591 desc->alloc = alloc;
1592 buf = xrealloc(buf, alloc);
1596 memmove(buf + offset + newsize,
1597 buf + offset + oldsize,
1598 size - offset - newsize);
1599 memcpy(buf + offset, newlines, newsize);
1605 /* Am I at my context limits? */
1606 if ((leading <= p_context) && (trailing <= p_context))
1608 if (match_beginning || match_end) {
1609 match_beginning = match_end = 0;
1612 /* Reduce the number of context lines
1613 * Reduce both leading and trailing if they are equal
1614 * otherwise just reduce the larger context.
1616 if (leading >= trailing) {
1617 remove_first_line(&oldlines, &oldsize);
1618 remove_first_line(&newlines, &newsize);
1622 if (trailing > leading) {
1623 remove_last_line(&oldlines, &oldsize);
1624 remove_last_line(&newlines, &newsize);
1634 static int apply_binary_fragment(struct buffer_desc *desc, struct patch *patch)
1636 unsigned long dst_size;
1637 struct fragment *fragment = patch->fragments;
1641 /* Binary patch is irreversible without the optional second hunk */
1642 if (apply_in_reverse) {
1643 if (!fragment->next)
1644 return error("cannot reverse-apply a binary patch "
1645 "without the reverse hunk to '%s'",
1647 ? patch->new_name : patch->old_name);
1648 fragment = fragment->next;
1650 data = (void*) fragment->patch;
1651 switch (fragment->binary_patch_method) {
1652 case BINARY_DELTA_DEFLATED:
1653 result = patch_delta(desc->buffer, desc->size,
1658 desc->buffer = result;
1660 case BINARY_LITERAL_DEFLATED:
1662 desc->buffer = data;
1663 dst_size = fragment->size;
1668 desc->size = desc->alloc = dst_size;
1672 static int apply_binary(struct buffer_desc *desc, struct patch *patch)
1674 const char *name = patch->old_name ? patch->old_name : patch->new_name;
1675 unsigned char sha1[20];
1676 unsigned char hdr[50];
1679 if (!allow_binary_replacement)
1680 return error("cannot apply binary patch to '%s' "
1681 "without --allow-binary-replacement",
1684 /* For safety, we require patch index line to contain
1685 * full 40-byte textual SHA1 for old and new, at least for now.
1687 if (strlen(patch->old_sha1_prefix) != 40 ||
1688 strlen(patch->new_sha1_prefix) != 40 ||
1689 get_sha1_hex(patch->old_sha1_prefix, sha1) ||
1690 get_sha1_hex(patch->new_sha1_prefix, sha1))
1691 return error("cannot apply binary patch to '%s' "
1692 "without full index line", name);
1694 if (patch->old_name) {
1695 /* See if the old one matches what the patch
1698 write_sha1_file_prepare(desc->buffer, desc->size,
1699 blob_type, sha1, hdr, &hdrlen);
1700 if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))
1701 return error("the patch applies to '%s' (%s), "
1702 "which does not match the "
1703 "current contents.",
1704 name, sha1_to_hex(sha1));
1707 /* Otherwise, the old one must be empty. */
1709 return error("the patch applies to an empty "
1710 "'%s' but it is not empty", name);
1713 get_sha1_hex(patch->new_sha1_prefix, sha1);
1714 if (is_null_sha1(sha1)) {
1716 desc->alloc = desc->size = 0;
1717 desc->buffer = NULL;
1718 return 0; /* deletion patch */
1721 if (has_sha1_file(sha1)) {
1722 /* We already have the postimage */
1727 desc->buffer = read_sha1_file(sha1, type, &size);
1729 return error("the necessary postimage %s for "
1730 "'%s' cannot be read",
1731 patch->new_sha1_prefix, name);
1732 desc->alloc = desc->size = size;
1735 /* We have verified desc matches the preimage;
1736 * apply the patch data to it, which is stored
1737 * in the patch->fragments->{patch,size}.
1739 if (apply_binary_fragment(desc, patch))
1740 return error("binary patch does not apply to '%s'",
1743 /* verify that the result matches */
1744 write_sha1_file_prepare(desc->buffer, desc->size, blob_type,
1745 sha1, hdr, &hdrlen);
1746 if (strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))
1747 return error("binary patch to '%s' creates incorrect result (expecting %s, got %s)", name, patch->new_sha1_prefix, sha1_to_hex(sha1));
1753 static int apply_fragments(struct buffer_desc *desc, struct patch *patch)
1755 struct fragment *frag = patch->fragments;
1756 const char *name = patch->old_name ? patch->old_name : patch->new_name;
1758 if (patch->is_binary)
1759 return apply_binary(desc, patch);
1762 if (apply_one_fragment(desc, frag, patch->inaccurate_eof)) {
1763 error("patch failed: %s:%ld", name, frag->oldpos);
1764 if (!apply_with_reject)
1773 static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *ce)
1776 unsigned long size, alloc;
1777 struct buffer_desc desc;
1785 buf = read_sha1_file(ce->sha1, type, &size);
1787 return error("read of %s failed",
1792 else if (patch->old_name) {
1794 alloc = size + 8192;
1795 buf = xmalloc(alloc);
1796 if (read_old_data(st, patch->old_name, buf, alloc) != size)
1797 return error("read of %s failed", patch->old_name);
1804 if (apply_fragments(&desc, patch) < 0)
1805 return -1; /* note with --reject this succeeds. */
1807 /* NUL terminate the result */
1808 if (desc.alloc <= desc.size)
1809 desc.buffer = xrealloc(desc.buffer, desc.size + 1);
1810 desc.buffer[desc.size] = 0;
1812 patch->result = desc.buffer;
1813 patch->resultsize = desc.size;
1815 if (patch->is_delete && patch->resultsize)
1816 return error("removal patch leaves file contents");
1821 static int check_patch(struct patch *patch, struct patch *prev_patch)
1824 const char *old_name = patch->old_name;
1825 const char *new_name = patch->new_name;
1826 const char *name = old_name ? old_name : new_name;
1827 struct cache_entry *ce = NULL;
1830 patch->rejected = 1; /* we will drop this after we succeed */
1834 unsigned st_mode = 0;
1837 stat_ret = lstat(old_name, &st);
1839 int pos = cache_name_pos(old_name, strlen(old_name));
1841 return error("%s: does not exist in index",
1843 ce = active_cache[pos];
1845 struct checkout costate;
1846 if (errno != ENOENT)
1847 return error("%s: %s", old_name,
1850 costate.base_dir = "";
1851 costate.base_dir_len = 0;
1854 costate.not_new = 0;
1855 costate.refresh_cache = 1;
1856 if (checkout_entry(ce,
1859 lstat(old_name, &st))
1863 changed = ce_match_stat(ce, &st, 1);
1865 return error("%s: does not match index",
1868 st_mode = ntohl(ce->ce_mode);
1870 else if (stat_ret < 0)
1871 return error("%s: %s", old_name, strerror(errno));
1874 st_mode = ntohl(create_ce_mode(st.st_mode));
1876 if (patch->is_new < 0)
1878 if (!patch->old_mode)
1879 patch->old_mode = st_mode;
1880 if ((st_mode ^ patch->old_mode) & S_IFMT)
1881 return error("%s: wrong type", old_name);
1882 if (st_mode != patch->old_mode)
1883 fprintf(stderr, "warning: %s has type %o, expected %o\n",
1884 old_name, st_mode, patch->old_mode);
1887 if (new_name && prev_patch && prev_patch->is_delete &&
1888 !strcmp(prev_patch->old_name, new_name))
1889 /* A type-change diff is always split into a patch to
1890 * delete old, immediately followed by a patch to
1891 * create new (see diff.c::run_diff()); in such a case
1892 * it is Ok that the entry to be deleted by the
1893 * previous patch is still in the working tree and in
1900 if (new_name && (patch->is_new | patch->is_rename | patch->is_copy)) {
1902 cache_name_pos(new_name, strlen(new_name)) >= 0 &&
1904 return error("%s: already exists in index", new_name);
1907 if (!lstat(new_name, &nst)) {
1908 if (S_ISDIR(nst.st_mode) || ok_if_exists)
1911 return error("%s: already exists in working directory", new_name);
1913 else if ((errno != ENOENT) && (errno != ENOTDIR))
1914 return error("%s: %s", new_name, strerror(errno));
1916 if (!patch->new_mode) {
1918 patch->new_mode = S_IFREG | 0644;
1920 patch->new_mode = patch->old_mode;
1924 if (new_name && old_name) {
1925 int same = !strcmp(old_name, new_name);
1926 if (!patch->new_mode)
1927 patch->new_mode = patch->old_mode;
1928 if ((patch->old_mode ^ patch->new_mode) & S_IFMT)
1929 return error("new mode (%o) of %s does not match old mode (%o)%s%s",
1930 patch->new_mode, new_name, patch->old_mode,
1931 same ? "" : " of ", same ? "" : old_name);
1934 if (apply_data(patch, &st, ce) < 0)
1935 return error("%s: patch does not apply", name);
1936 patch->rejected = 0;
1940 static int check_patch_list(struct patch *patch)
1942 struct patch *prev_patch = NULL;
1945 for (prev_patch = NULL; patch ; patch = patch->next) {
1946 if (apply_verbosely)
1947 say_patch_name(stderr,
1948 "Checking patch ", patch, "...\n");
1949 err |= check_patch(patch, prev_patch);
1955 static void show_index_list(struct patch *list)
1957 struct patch *patch;
1959 /* Once we start supporting the reverse patch, it may be
1960 * worth showing the new sha1 prefix, but until then...
1962 for (patch = list; patch; patch = patch->next) {
1963 const unsigned char *sha1_ptr;
1964 unsigned char sha1[20];
1967 name = patch->old_name ? patch->old_name : patch->new_name;
1969 sha1_ptr = null_sha1;
1970 else if (get_sha1(patch->old_sha1_prefix, sha1))
1971 die("sha1 information is lacking or useless (%s).",
1976 printf("%06o %s ",patch->old_mode, sha1_to_hex(sha1_ptr));
1977 if (line_termination && quote_c_style(name, NULL, NULL, 0))
1978 quote_c_style(name, NULL, stdout, 0);
1980 fputs(name, stdout);
1981 putchar(line_termination);
1985 static void stat_patch_list(struct patch *patch)
1987 int files, adds, dels;
1989 for (files = adds = dels = 0 ; patch ; patch = patch->next) {
1991 adds += patch->lines_added;
1992 dels += patch->lines_deleted;
1996 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files, adds, dels);
1999 static void numstat_patch_list(struct patch *patch)
2001 for ( ; patch; patch = patch->next) {
2003 name = patch->new_name ? patch->new_name : patch->old_name;
2004 printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);
2005 if (line_termination && quote_c_style(name, NULL, NULL, 0))
2006 quote_c_style(name, NULL, stdout, 0);
2008 fputs(name, stdout);
2013 static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)
2016 printf(" %s mode %06o %s\n", newdelete, mode, name);
2018 printf(" %s %s\n", newdelete, name);
2021 static void show_mode_change(struct patch *p, int show_name)
2023 if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {
2025 printf(" mode change %06o => %06o %s\n",
2026 p->old_mode, p->new_mode, p->new_name);
2028 printf(" mode change %06o => %06o\n",
2029 p->old_mode, p->new_mode);
2033 static void show_rename_copy(struct patch *p)
2035 const char *renamecopy = p->is_rename ? "rename" : "copy";
2036 const char *old, *new;
2038 /* Find common prefix */
2042 const char *slash_old, *slash_new;
2043 slash_old = strchr(old, '/');
2044 slash_new = strchr(new, '/');
2047 slash_old - old != slash_new - new ||
2048 memcmp(old, new, slash_new - new))
2050 old = slash_old + 1;
2051 new = slash_new + 1;
2053 /* p->old_name thru old is the common prefix, and old and new
2054 * through the end of names are renames
2056 if (old != p->old_name)
2057 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
2058 (int)(old - p->old_name), p->old_name,
2059 old, new, p->score);
2061 printf(" %s %s => %s (%d%%)\n", renamecopy,
2062 p->old_name, p->new_name, p->score);
2063 show_mode_change(p, 0);
2066 static void summary_patch_list(struct patch *patch)
2070 for (p = patch; p; p = p->next) {
2072 show_file_mode_name("create", p->new_mode, p->new_name);
2073 else if (p->is_delete)
2074 show_file_mode_name("delete", p->old_mode, p->old_name);
2076 if (p->is_rename || p->is_copy)
2077 show_rename_copy(p);
2080 printf(" rewrite %s (%d%%)\n",
2081 p->new_name, p->score);
2082 show_mode_change(p, 0);
2085 show_mode_change(p, 1);
2091 static void patch_stats(struct patch *patch)
2093 int lines = patch->lines_added + patch->lines_deleted;
2095 if (lines > max_change)
2097 if (patch->old_name) {
2098 int len = quote_c_style(patch->old_name, NULL, NULL, 0);
2100 len = strlen(patch->old_name);
2104 if (patch->new_name) {
2105 int len = quote_c_style(patch->new_name, NULL, NULL, 0);
2107 len = strlen(patch->new_name);
2113 static void remove_file(struct patch *patch)
2116 if (remove_file_from_cache(patch->old_name) < 0)
2117 die("unable to remove %s from index", patch->old_name);
2118 cache_tree_invalidate_path(active_cache_tree, patch->old_name);
2121 unlink(patch->old_name);
2124 static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size)
2127 struct cache_entry *ce;
2128 int namelen = strlen(path);
2129 unsigned ce_size = cache_entry_size(namelen);
2134 ce = xcalloc(1, ce_size);
2135 memcpy(ce->name, path, namelen);
2136 ce->ce_mode = create_ce_mode(mode);
2137 ce->ce_flags = htons(namelen);
2139 if (lstat(path, &st) < 0)
2140 die("unable to stat newly created file %s", path);
2141 fill_stat_cache_info(ce, &st);
2143 if (write_sha1_file(buf, size, blob_type, ce->sha1) < 0)
2144 die("unable to create backing store for newly created file %s", path);
2145 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)
2146 die("unable to add cache entry for %s", path);
2149 static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)
2154 /* Although buf:size is counted string, it also is NUL
2157 return symlink(buf, path);
2158 fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);
2162 int written = xwrite(fd, buf, size);
2164 die("writing file %s: %s", path, strerror(errno));
2166 die("out of space writing file %s", path);
2171 die("closing file %s: %s", path, strerror(errno));
2176 * We optimistically assume that the directories exist,
2177 * which is true 99% of the time anyway. If they don't,
2178 * we create them and try again.
2180 static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size)
2184 if (!try_create_file(path, mode, buf, size))
2187 if (errno == ENOENT) {
2188 if (safe_create_leading_directories(path))
2190 if (!try_create_file(path, mode, buf, size))
2194 if (errno == EEXIST || errno == EACCES) {
2195 /* We may be trying to create a file where a directory
2200 if (!lstat(path, &st) && S_ISDIR(st.st_mode) && !rmdir(path))
2204 if (errno == EEXIST) {
2205 unsigned int nr = getpid();
2208 const char *newpath;
2209 newpath = mkpath("%s~%u", path, nr);
2210 if (!try_create_file(newpath, mode, buf, size)) {
2211 if (!rename(newpath, path))
2216 if (errno != EEXIST)
2221 die("unable to write file %s mode %o", path, mode);
2224 static void create_file(struct patch *patch)
2226 char *path = patch->new_name;
2227 unsigned mode = patch->new_mode;
2228 unsigned long size = patch->resultsize;
2229 char *buf = patch->result;
2232 mode = S_IFREG | 0644;
2233 create_one_file(path, mode, buf, size);
2234 add_index_file(path, mode, buf, size);
2235 cache_tree_invalidate_path(active_cache_tree, path);
2238 /* phase zero is to remove, phase one is to create */
2239 static void write_out_one_result(struct patch *patch, int phase)
2241 if (patch->is_delete > 0) {
2246 if (patch->is_new > 0 || patch->is_copy) {
2252 * Rename or modification boils down to the same
2253 * thing: remove the old, write the new
2261 static int write_out_one_reject(struct patch *patch)
2264 char namebuf[PATH_MAX];
2265 struct fragment *frag;
2268 for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) {
2269 if (!frag->rejected)
2275 if (apply_verbosely)
2276 say_patch_name(stderr,
2277 "Applied patch ", patch, " cleanly.\n");
2281 /* This should not happen, because a removal patch that leaves
2282 * contents are marked "rejected" at the patch level.
2284 if (!patch->new_name)
2285 die("internal error");
2287 /* Say this even without --verbose */
2288 say_patch_name(stderr, "Applying patch ", patch, " with");
2289 fprintf(stderr, " %d rejects...\n", cnt);
2291 cnt = strlen(patch->new_name);
2292 if (ARRAY_SIZE(namebuf) <= cnt + 5) {
2293 cnt = ARRAY_SIZE(namebuf) - 5;
2295 "warning: truncating .rej filename to %.*s.rej",
2296 cnt - 1, patch->new_name);
2298 memcpy(namebuf, patch->new_name, cnt);
2299 memcpy(namebuf + cnt, ".rej", 5);
2301 rej = fopen(namebuf, "w");
2303 return error("cannot open %s: %s", namebuf, strerror(errno));
2305 /* Normal git tools never deal with .rej, so do not pretend
2306 * this is a git patch by saying --git nor give extended
2307 * headers. While at it, maybe please "kompare" that wants
2308 * the trailing TAB and some garbage at the end of line ;-).
2310 fprintf(rej, "diff a/%s b/%s\t(rejected hunks)\n",
2311 patch->new_name, patch->new_name);
2312 for (cnt = 1, frag = patch->fragments;
2314 cnt++, frag = frag->next) {
2315 if (!frag->rejected) {
2316 fprintf(stderr, "Hunk #%d applied cleanly.\n", cnt);
2319 fprintf(stderr, "Rejected hunk #%d.\n", cnt);
2320 fprintf(rej, "%.*s", frag->size, frag->patch);
2321 if (frag->patch[frag->size-1] != '\n')
2328 static int write_out_results(struct patch *list, int skipped_patch)
2334 if (!list && !skipped_patch)
2335 return error("No changes");
2337 for (phase = 0; phase < 2; phase++) {
2343 write_out_one_result(l, phase);
2344 if (phase == 1 && write_out_one_reject(l))
2353 static struct lock_file lock_file;
2355 static struct excludes {
2356 struct excludes *next;
2360 static int use_patch(struct patch *p)
2362 const char *pathname = p->new_name ? p->new_name : p->old_name;
2363 struct excludes *x = excludes;
2365 if (fnmatch(x->path, pathname, 0) == 0)
2369 if (0 < prefix_length) {
2370 int pathlen = strlen(pathname);
2371 if (pathlen <= prefix_length ||
2372 memcmp(prefix, pathname, prefix_length))
2378 static int apply_patch(int fd, const char *filename, int inaccurate_eof)
2380 unsigned long offset, size;
2381 char *buffer = read_patch_file(fd, &size);
2382 struct patch *list = NULL, **listp = &list;
2383 int skipped_patch = 0;
2385 patch_input_file = filename;
2390 struct patch *patch;
2393 patch = xcalloc(1, sizeof(*patch));
2394 patch->inaccurate_eof = inaccurate_eof;
2395 nr = parse_chunk(buffer + offset, size, patch);
2398 if (apply_in_reverse)
2399 reverse_patches(patch);
2400 if (use_patch(patch)) {
2403 listp = &patch->next;
2405 /* perhaps free it a bit better? */
2413 if (whitespace_error && (new_whitespace == error_on_whitespace))
2416 write_index = check_index && apply;
2417 if (write_index && newfd < 0)
2418 newfd = hold_lock_file_for_update(&lock_file,
2419 get_index_file(), 1);
2421 if (read_cache() < 0)
2422 die("unable to read index file");
2425 if ((check || apply) &&
2426 check_patch_list(list) < 0 &&
2430 if (apply && write_out_results(list, skipped_patch))
2433 if (show_index_info)
2434 show_index_list(list);
2437 stat_patch_list(list);
2440 numstat_patch_list(list);
2443 summary_patch_list(list);
2449 static int git_apply_config(const char *var, const char *value)
2451 if (!strcmp(var, "apply.whitespace")) {
2452 apply_default_whitespace = xstrdup(value);
2455 return git_default_config(var, value);
2459 int cmd_apply(int argc, const char **argv, const char *prefix)
2463 int inaccurate_eof = 0;
2466 const char *whitespace_option = NULL;
2468 for (i = 1; i < argc; i++) {
2469 const char *arg = argv[i];
2473 if (!strcmp(arg, "-")) {
2474 errs |= apply_patch(0, "<stdin>", inaccurate_eof);
2478 if (!strncmp(arg, "--exclude=", 10)) {
2479 struct excludes *x = xmalloc(sizeof(*x));
2485 if (!strncmp(arg, "-p", 2)) {
2486 p_value = atoi(arg + 2);
2489 if (!strcmp(arg, "--no-add")) {
2493 if (!strcmp(arg, "--stat")) {
2498 if (!strcmp(arg, "--allow-binary-replacement") ||
2499 !strcmp(arg, "--binary")) {
2500 allow_binary_replacement = 1;
2503 if (!strcmp(arg, "--numstat")) {
2508 if (!strcmp(arg, "--summary")) {
2513 if (!strcmp(arg, "--check")) {
2518 if (!strcmp(arg, "--index")) {
2522 if (!strcmp(arg, "--cached")) {
2527 if (!strcmp(arg, "--apply")) {
2531 if (!strcmp(arg, "--index-info")) {
2533 show_index_info = 1;
2536 if (!strcmp(arg, "-z")) {
2537 line_termination = 0;
2540 if (!strncmp(arg, "-C", 2)) {
2541 p_context = strtoul(arg + 2, &end, 0);
2543 die("unrecognized context count '%s'", arg + 2);
2546 if (!strncmp(arg, "--whitespace=", 13)) {
2547 whitespace_option = arg + 13;
2548 parse_whitespace_option(arg + 13);
2551 if (!strcmp(arg, "-R") || !strcmp(arg, "--reverse")) {
2552 apply_in_reverse = 1;
2555 if (!strcmp(arg, "--reject")) {
2556 apply = apply_with_reject = apply_verbosely = 1;
2559 if (!strcmp(arg, "--verbose")) {
2560 apply_verbosely = 1;
2563 if (!strcmp(arg, "--inaccurate-eof")) {
2568 if (check_index && prefix_length < 0) {
2569 prefix = setup_git_directory();
2570 prefix_length = prefix ? strlen(prefix) : 0;
2571 git_config(git_apply_config);
2572 if (!whitespace_option && apply_default_whitespace)
2573 parse_whitespace_option(apply_default_whitespace);
2575 if (0 < prefix_length)
2576 arg = prefix_filename(prefix, prefix_length, arg);
2578 fd = open(arg, O_RDONLY);
2582 set_default_whitespace_mode(whitespace_option);
2583 errs |= apply_patch(fd, arg, inaccurate_eof);
2586 set_default_whitespace_mode(whitespace_option);
2588 errs |= apply_patch(0, "<stdin>", inaccurate_eof);
2589 if (whitespace_error) {
2590 if (squelch_whitespace_errors &&
2591 squelch_whitespace_errors < whitespace_error) {
2593 whitespace_error - squelch_whitespace_errors;
2594 fprintf(stderr, "warning: squelched %d "
2595 "whitespace error%s\n",
2597 squelched == 1 ? "" : "s");
2599 if (new_whitespace == error_on_whitespace)
2600 die("%d line%s add%s trailing whitespaces.",
2602 whitespace_error == 1 ? "" : "s",
2603 whitespace_error == 1 ? "s" : "");
2604 if (applied_after_stripping)
2605 fprintf(stderr, "warning: %d line%s applied after"
2606 " stripping trailing whitespaces.\n",
2607 applied_after_stripping,
2608 applied_after_stripping == 1 ? "" : "s");
2609 else if (whitespace_error)
2610 fprintf(stderr, "warning: %d line%s add%s trailing"
2613 whitespace_error == 1 ? "" : "s",
2614 whitespace_error == 1 ? "s" : "");
2618 if (write_cache(newfd, active_cache, active_nr) ||
2619 close(newfd) || commit_lock_file(&lock_file))
2620 die("Unable to write new index file");