4 * Copyright (C) Linus Torvalds, 2005
6 * This applies patches on top of some (arbitrary) version of the SCM.
10 #include "cache-tree.h"
17 * --check turns on checking that the working tree matches the
18 * files that are being modified, but doesn't apply the patch
19 * --stat does just a diffstat, and doesn't actually apply
20 * --numstat does numeric diffstat, and doesn't actually apply
21 * --index-info shows the old and new index info for paths if available.
22 * --index updates the cache as well.
23 * --cached updates only the cache without ever touching the working tree.
25 static const char *prefix;
26 static int prefix_length = -1;
27 static int newfd = -1;
29 static int unidiff_zero;
30 static int p_value = 1;
31 static int p_value_known;
32 static int check_index;
33 static int update_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 = ULONG_MAX;
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_fixing_ws;
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_new, is_delete; /* -1 = unknown, 0 = false, 1 = true */
145 unsigned long deflate_origlen;
146 int lines_added, lines_deleted;
148 unsigned int is_toplevel_relative:1;
149 unsigned int inaccurate_eof:1;
150 unsigned int is_binary:1;
151 unsigned int is_copy:1;
152 unsigned int is_rename:1;
153 struct fragment *fragments;
155 unsigned long resultsize;
156 char old_sha1_prefix[41];
157 char new_sha1_prefix[41];
161 static void say_patch_name(FILE *output, const char *pre, struct patch *patch, const char *post)
164 if (patch->old_name && patch->new_name &&
165 strcmp(patch->old_name, patch->new_name)) {
166 quote_c_style(patch->old_name, NULL, output, 0);
167 fputs(" => ", output);
168 quote_c_style(patch->new_name, NULL, output, 0);
170 const char *n = patch->new_name;
173 quote_c_style(n, NULL, output, 0);
178 #define CHUNKSIZE (8192)
181 static void *read_patch_file(int fd, unsigned long *sizep)
185 strbuf_init(&buf, 0);
186 if (strbuf_read(&buf, fd, 0) < 0)
187 die("git-apply: read returned %s", strerror(errno));
191 * Make sure that we have some slop in the buffer
192 * so that we can do speculative "memcmp" etc, and
193 * see to it that it is NUL-filled.
195 strbuf_grow(&buf, SLOP);
196 memset(buf.buf + buf.len, 0, SLOP);
197 return strbuf_detach(&buf);
200 static unsigned long linelen(const char *buffer, unsigned long size)
202 unsigned long len = 0;
205 if (*buffer++ == '\n')
211 static int is_dev_null(const char *str)
213 return !memcmp("/dev/null", str, 9) && isspace(str[9]);
219 static int name_terminate(const char *name, int namelen, int c, int terminate)
221 if (c == ' ' && !(terminate & TERM_SPACE))
223 if (c == '\t' && !(terminate & TERM_TAB))
229 static char *find_name(const char *line, char *def, int p_value, int terminate)
232 const char *start = line;
237 /* Proposed "new-style" GNU patch/diff format; see
238 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
240 strbuf_init(&name, 0);
241 if (!unquote_c_style(&name, line, NULL)) {
244 for (cp = name.buf; p_value; p_value--) {
245 cp = strchr(cp, '/');
251 /* name can later be freed, so we need
252 * to memmove, not just return cp
254 strbuf_remove(&name, 0, cp - name.buf);
259 strbuf_release(&name);
268 if (name_terminate(start, line-start, c, terminate))
272 if (c == '/' && !--p_value)
282 * Generally we prefer the shorter name, especially
283 * if the other one is just a variation of that with
284 * something else tacked on to the end (ie "file.orig"
288 int deflen = strlen(def);
289 if (deflen < len && !strncmp(start, def, deflen))
294 return xmemdupz(start, len);
297 static int count_slashes(const char *cp)
309 * Given the string after "--- " or "+++ ", guess the appropriate
310 * p_value for the given patch.
312 static int guess_p_value(const char *nameline)
317 if (is_dev_null(nameline))
319 name = find_name(nameline, NULL, 0, TERM_SPACE | TERM_TAB);
322 cp = strchr(name, '/');
327 * Does it begin with "a/$our-prefix" and such? Then this is
328 * very likely to apply to our directory.
330 if (!strncmp(name, prefix, prefix_length))
331 val = count_slashes(prefix);
334 if (!strncmp(cp, prefix, prefix_length))
335 val = count_slashes(prefix) + 1;
343 * Get the name etc info from the --/+++ lines of a traditional patch header
345 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
346 * files, we can happily check the index for a match, but for creating a
347 * new file we should try to match whatever "patch" does. I have no idea.
349 static void parse_traditional_patch(const char *first, const char *second, struct patch *patch)
353 first += 4; /* skip "--- " */
354 second += 4; /* skip "+++ " */
355 if (!p_value_known) {
357 p = guess_p_value(first);
358 q = guess_p_value(second);
360 if (0 <= p && p == q) {
365 if (is_dev_null(first)) {
367 patch->is_delete = 0;
368 name = find_name(second, NULL, p_value, TERM_SPACE | TERM_TAB);
369 patch->new_name = name;
370 } else if (is_dev_null(second)) {
372 patch->is_delete = 1;
373 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
374 patch->old_name = name;
376 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
377 name = find_name(second, name, p_value, TERM_SPACE | TERM_TAB);
378 patch->old_name = patch->new_name = name;
381 die("unable to find filename in patch at line %d", linenr);
384 static int gitdiff_hdrend(const char *line, struct patch *patch)
390 * We're anal about diff header consistency, to make
391 * sure that we don't end up having strange ambiguous
392 * patches floating around.
394 * As a result, gitdiff_{old|new}name() will check
395 * their names against any previous information, just
398 static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, const char *oldnew)
400 if (!orig_name && !isnull)
401 return find_name(line, NULL, p_value, TERM_TAB);
410 die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr);
411 another = find_name(line, NULL, p_value, TERM_TAB);
412 if (!another || memcmp(another, name, len))
413 die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr);
418 /* expect "/dev/null" */
419 if (memcmp("/dev/null", line, 9) || line[9] != '\n')
420 die("git-apply: bad git-diff - expected /dev/null on line %d", linenr);
425 static int gitdiff_oldname(const char *line, struct patch *patch)
427 patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name, "old");
431 static int gitdiff_newname(const char *line, struct patch *patch)
433 patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name, "new");
437 static int gitdiff_oldmode(const char *line, struct patch *patch)
439 patch->old_mode = strtoul(line, NULL, 8);
443 static int gitdiff_newmode(const char *line, struct patch *patch)
445 patch->new_mode = strtoul(line, NULL, 8);
449 static int gitdiff_delete(const char *line, struct patch *patch)
451 patch->is_delete = 1;
452 patch->old_name = patch->def_name;
453 return gitdiff_oldmode(line, patch);
456 static int gitdiff_newfile(const char *line, struct patch *patch)
459 patch->new_name = patch->def_name;
460 return gitdiff_newmode(line, patch);
463 static int gitdiff_copysrc(const char *line, struct patch *patch)
466 patch->old_name = find_name(line, NULL, 0, 0);
470 static int gitdiff_copydst(const char *line, struct patch *patch)
473 patch->new_name = find_name(line, NULL, 0, 0);
477 static int gitdiff_renamesrc(const char *line, struct patch *patch)
479 patch->is_rename = 1;
480 patch->old_name = find_name(line, NULL, 0, 0);
484 static int gitdiff_renamedst(const char *line, struct patch *patch)
486 patch->is_rename = 1;
487 patch->new_name = find_name(line, NULL, 0, 0);
491 static int gitdiff_similarity(const char *line, struct patch *patch)
493 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
498 static int gitdiff_dissimilarity(const char *line, struct patch *patch)
500 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
505 static int gitdiff_index(const char *line, struct patch *patch)
507 /* index line is N hexadecimal, "..", N hexadecimal,
508 * and optional space with octal mode.
510 const char *ptr, *eol;
513 ptr = strchr(line, '.');
514 if (!ptr || ptr[1] != '.' || 40 < ptr - line)
517 memcpy(patch->old_sha1_prefix, line, len);
518 patch->old_sha1_prefix[len] = 0;
521 ptr = strchr(line, ' ');
522 eol = strchr(line, '\n');
524 if (!ptr || eol < ptr)
530 memcpy(patch->new_sha1_prefix, line, len);
531 patch->new_sha1_prefix[len] = 0;
533 patch->new_mode = patch->old_mode = strtoul(ptr+1, NULL, 8);
538 * This is normal for a diff that doesn't change anything: we'll fall through
539 * into the next diff. Tell the parser to break out.
541 static int gitdiff_unrecognized(const char *line, struct patch *patch)
546 static const char *stop_at_slash(const char *line, int llen)
550 for (i = 0; i < llen; i++) {
558 /* This is to extract the same name that appears on "diff --git"
559 * line. We do not find and return anything if it is a rename
560 * patch, and it is OK because we will find the name elsewhere.
561 * We need to reliably find name only when it is mode-change only,
562 * creation or deletion of an empty file. In any of these cases,
563 * both sides are the same name under a/ and b/ respectively.
565 static char *git_header_name(char *line, int llen)
568 const char *second = NULL;
571 line += strlen("diff --git ");
572 llen -= strlen("diff --git ");
579 strbuf_init(&first, 0);
582 if (unquote_c_style(&first, line, &second))
585 /* advance to the first slash */
586 cp = stop_at_slash(first.buf, first.len);
587 /* we do not accept absolute paths */
588 if (!cp || cp == first.buf)
590 strbuf_remove(&first, 0, cp + 1 - first.buf);
592 /* second points at one past closing dq of name.
593 * find the second name.
595 while ((second < line + llen) && isspace(*second))
598 if (line + llen <= second)
600 if (*second == '"') {
601 if (unquote_c_style(&sp, second, NULL))
603 cp = stop_at_slash(sp.buf, sp.len);
604 if (!cp || cp == sp.buf)
606 /* They must match, otherwise ignore */
607 if (strcmp(cp + 1, first.buf))
613 /* unquoted second */
614 cp = stop_at_slash(second, line + llen - second);
615 if (!cp || cp == second)
618 if (line + llen - cp != first.len + 1 ||
619 memcmp(first.buf, cp, first.len))
624 strbuf_release(&first);
629 /* unquoted first name */
630 name = stop_at_slash(line, llen);
631 if (!name || name == line)
635 /* since the first name is unquoted, a dq if exists must be
636 * the beginning of the second name.
638 for (second = name; second < line + llen; second++) {
639 if (*second == '"') {
644 if (unquote_c_style(&sp, second, NULL))
647 np = stop_at_slash(sp.buf, sp.len);
648 if (!np || np == sp.buf)
652 len = sp.buf + sp.len - np;
653 if (len < second - name &&
654 !strncmp(np, name, len) &&
655 isspace(name[len])) {
657 strbuf_remove(&sp, 0, np - sp.buf);
668 * Accept a name only if it shows up twice, exactly the same
671 for (len = 0 ; ; len++) {
686 if (second[len] == '\n' && !memcmp(name, second, len)) {
687 return xmemdupz(name, len);
694 /* Verify that we recognize the lines following a git header */
695 static int parse_git_header(char *line, int len, unsigned int size, struct patch *patch)
697 unsigned long offset;
699 /* A git diff has explicit new/delete information, so we don't guess */
701 patch->is_delete = 0;
704 * Some things may not have the old name in the
705 * rest of the headers anywhere (pure mode changes,
706 * or removing or adding empty files), so we get
707 * the default name from the header.
709 patch->def_name = git_header_name(line, len);
714 for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {
715 static const struct opentry {
717 int (*fn)(const char *, struct patch *);
719 { "@@ -", gitdiff_hdrend },
720 { "--- ", gitdiff_oldname },
721 { "+++ ", gitdiff_newname },
722 { "old mode ", gitdiff_oldmode },
723 { "new mode ", gitdiff_newmode },
724 { "deleted file mode ", gitdiff_delete },
725 { "new file mode ", gitdiff_newfile },
726 { "copy from ", gitdiff_copysrc },
727 { "copy to ", gitdiff_copydst },
728 { "rename old ", gitdiff_renamesrc },
729 { "rename new ", gitdiff_renamedst },
730 { "rename from ", gitdiff_renamesrc },
731 { "rename to ", gitdiff_renamedst },
732 { "similarity index ", gitdiff_similarity },
733 { "dissimilarity index ", gitdiff_dissimilarity },
734 { "index ", gitdiff_index },
735 { "", gitdiff_unrecognized },
739 len = linelen(line, size);
740 if (!len || line[len-1] != '\n')
742 for (i = 0; i < ARRAY_SIZE(optable); i++) {
743 const struct opentry *p = optable + i;
744 int oplen = strlen(p->str);
745 if (len < oplen || memcmp(p->str, line, oplen))
747 if (p->fn(line + oplen, patch) < 0)
756 static int parse_num(const char *line, unsigned long *p)
762 *p = strtoul(line, &ptr, 10);
766 static int parse_range(const char *line, int len, int offset, const char *expect,
767 unsigned long *p1, unsigned long *p2)
771 if (offset < 0 || offset >= len)
776 digits = parse_num(line, p1);
786 digits = parse_num(line+1, p2);
798 if (memcmp(line, expect, ex))
805 * Parse a unified diff fragment header of the
806 * form "@@ -a,b +c,d @@"
808 static int parse_fragment_header(char *line, int len, struct fragment *fragment)
812 if (!len || line[len-1] != '\n')
815 /* Figure out the number of lines in a fragment */
816 offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);
817 offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);
822 static int find_header(char *line, unsigned long size, int *hdrsize, struct patch *patch)
824 unsigned long offset, len;
826 patch->is_toplevel_relative = 0;
827 patch->is_rename = patch->is_copy = 0;
828 patch->is_new = patch->is_delete = -1;
829 patch->old_mode = patch->new_mode = 0;
830 patch->old_name = patch->new_name = NULL;
831 for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {
832 unsigned long nextlen;
834 len = linelen(line, size);
838 /* Testing this early allows us to take a few shortcuts.. */
843 * Make sure we don't find any unconnected patch fragments.
844 * That's a sign that we didn't find a header, and that a
845 * patch has become corrupted/broken up.
847 if (!memcmp("@@ -", line, 4)) {
848 struct fragment dummy;
849 if (parse_fragment_header(line, len, &dummy) < 0)
851 die("patch fragment without header at line %d: %.*s",
852 linenr, (int)len-1, line);
859 * Git patch? It might not have a real patch, just a rename
860 * or mode change, so we handle that specially
862 if (!memcmp("diff --git ", line, 11)) {
863 int git_hdr_len = parse_git_header(line, len, size, patch);
864 if (git_hdr_len <= len)
866 if (!patch->old_name && !patch->new_name) {
867 if (!patch->def_name)
868 die("git diff header lacks filename information (line %d)", linenr);
869 patch->old_name = patch->new_name = patch->def_name;
871 patch->is_toplevel_relative = 1;
872 *hdrsize = git_hdr_len;
876 /** --- followed by +++ ? */
877 if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4))
881 * We only accept unified patches, so we want it to
882 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
885 nextlen = linelen(line + len, size - len);
886 if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))
889 /* Ok, we'll consider it a patch */
890 parse_traditional_patch(line, line+len, patch);
891 *hdrsize = len + nextlen;
898 static void check_whitespace(const char *line, int len)
900 const char *err = "Adds trailing whitespace";
905 * We know len is at least two, since we have a '+' and we
906 * checked that the last character was a '\n' before calling
907 * this function. That is, an addition of an empty line would
908 * check the '+' here. Sneaky...
910 if (isspace(line[len-2]))
914 * Make sure that there is no space followed by a tab in
917 err = "Space in indent is followed by a tab";
918 for (i = 1; i < len; i++) {
919 if (line[i] == '\t') {
923 else if (line[i] == ' ')
932 if (squelch_whitespace_errors &&
933 squelch_whitespace_errors < whitespace_error)
936 fprintf(stderr, "%s.\n%s:%d:%.*s\n",
937 err, patch_input_file, linenr, len-2, line+1);
942 * Parse a unified diff. Note that this really needs to parse each
943 * fragment separately, since the only way to know the difference
944 * between a "---" that is part of a patch, and a "---" that starts
945 * the next patch is to look at the line counts..
947 static int parse_fragment(char *line, unsigned long size, struct patch *patch, struct fragment *fragment)
950 int len = linelen(line, size), offset;
951 unsigned long oldlines, newlines;
952 unsigned long leading, trailing;
954 offset = parse_fragment_header(line, len, fragment);
957 oldlines = fragment->oldlines;
958 newlines = fragment->newlines;
962 /* Parse the thing.. */
969 offset += len, size -= len, line += len, linenr++) {
970 if (!oldlines && !newlines)
972 len = linelen(line, size);
973 if (!len || line[len-1] != '\n')
978 case '\n': /* newer GNU diff, an empty context line */
982 if (!deleted && !added)
987 if (apply_in_reverse &&
988 new_whitespace != nowarn_whitespace)
989 check_whitespace(line, len);
995 if (!apply_in_reverse &&
996 new_whitespace != nowarn_whitespace)
997 check_whitespace(line, len);
1003 /* We allow "\ No newline at end of file". Depending
1004 * on locale settings when the patch was produced we
1005 * don't know what this line looks like. The only
1006 * thing we do know is that it begins with "\ ".
1007 * Checking for 12 is just for sanity check -- any
1008 * l10n of "\ No newline..." is at least that long.
1011 if (len < 12 || memcmp(line, "\\ ", 2))
1016 if (oldlines || newlines)
1018 fragment->leading = leading;
1019 fragment->trailing = trailing;
1021 /* If a fragment ends with an incomplete line, we failed to include
1022 * it in the above loop because we hit oldlines == newlines == 0
1025 if (12 < size && !memcmp(line, "\\ ", 2))
1026 offset += linelen(line, size);
1028 patch->lines_added += added;
1029 patch->lines_deleted += deleted;
1031 if (0 < patch->is_new && oldlines)
1032 return error("new file depends on old contents");
1033 if (0 < patch->is_delete && newlines)
1034 return error("deleted file still has contents");
1038 static int parse_single_patch(char *line, unsigned long size, struct patch *patch)
1040 unsigned long offset = 0;
1041 unsigned long oldlines = 0, newlines = 0, context = 0;
1042 struct fragment **fragp = &patch->fragments;
1044 while (size > 4 && !memcmp(line, "@@ -", 4)) {
1045 struct fragment *fragment;
1048 fragment = xcalloc(1, sizeof(*fragment));
1049 len = parse_fragment(line, size, patch, fragment);
1051 die("corrupt patch at line %d", linenr);
1052 fragment->patch = line;
1053 fragment->size = len;
1054 oldlines += fragment->oldlines;
1055 newlines += fragment->newlines;
1056 context += fragment->leading + fragment->trailing;
1059 fragp = &fragment->next;
1067 * If something was removed (i.e. we have old-lines) it cannot
1068 * be creation, and if something was added it cannot be
1069 * deletion. However, the reverse is not true; --unified=0
1070 * patches that only add are not necessarily creation even
1071 * though they do not have any old lines, and ones that only
1072 * delete are not necessarily deletion.
1074 * Unfortunately, a real creation/deletion patch do _not_ have
1075 * any context line by definition, so we cannot safely tell it
1076 * apart with --unified=0 insanity. At least if the patch has
1077 * more than one hunk it is not creation or deletion.
1079 if (patch->is_new < 0 &&
1080 (oldlines || (patch->fragments && patch->fragments->next)))
1082 if (patch->is_delete < 0 &&
1083 (newlines || (patch->fragments && patch->fragments->next)))
1084 patch->is_delete = 0;
1085 if (!unidiff_zero || context) {
1086 /* If the user says the patch is not generated with
1087 * --unified=0, or if we have seen context lines,
1088 * then not having oldlines means the patch is creation,
1089 * and not having newlines means the patch is deletion.
1091 if (patch->is_new < 0 && !oldlines) {
1093 patch->old_name = NULL;
1095 if (patch->is_delete < 0 && !newlines) {
1096 patch->is_delete = 1;
1097 patch->new_name = NULL;
1101 if (0 < patch->is_new && oldlines)
1102 die("new file %s depends on old contents", patch->new_name);
1103 if (0 < patch->is_delete && newlines)
1104 die("deleted file %s still has contents", patch->old_name);
1105 if (!patch->is_delete && !newlines && context)
1106 fprintf(stderr, "** warning: file %s becomes empty but "
1107 "is not deleted\n", patch->new_name);
1112 static inline int metadata_changes(struct patch *patch)
1114 return patch->is_rename > 0 ||
1115 patch->is_copy > 0 ||
1116 patch->is_new > 0 ||
1118 (patch->old_mode && patch->new_mode &&
1119 patch->old_mode != patch->new_mode);
1122 static char *inflate_it(const void *data, unsigned long size,
1123 unsigned long inflated_size)
1129 memset(&stream, 0, sizeof(stream));
1131 stream.next_in = (unsigned char *)data;
1132 stream.avail_in = size;
1133 stream.next_out = out = xmalloc(inflated_size);
1134 stream.avail_out = inflated_size;
1135 inflateInit(&stream);
1136 st = inflate(&stream, Z_FINISH);
1137 if ((st != Z_STREAM_END) || stream.total_out != inflated_size) {
1144 static struct fragment *parse_binary_hunk(char **buf_p,
1145 unsigned long *sz_p,
1149 /* Expect a line that begins with binary patch method ("literal"
1150 * or "delta"), followed by the length of data before deflating.
1151 * a sequence of 'length-byte' followed by base-85 encoded data
1152 * should follow, terminated by a newline.
1154 * Each 5-byte sequence of base-85 encodes up to 4 bytes,
1155 * and we would limit the patch line to 66 characters,
1156 * so one line can fit up to 13 groups that would decode
1157 * to 52 bytes max. The length byte 'A'-'Z' corresponds
1158 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
1161 unsigned long size = *sz_p;
1162 char *buffer = *buf_p;
1164 unsigned long origlen;
1167 struct fragment *frag;
1169 llen = linelen(buffer, size);
1174 if (!prefixcmp(buffer, "delta ")) {
1175 patch_method = BINARY_DELTA_DEFLATED;
1176 origlen = strtoul(buffer + 6, NULL, 10);
1178 else if (!prefixcmp(buffer, "literal ")) {
1179 patch_method = BINARY_LITERAL_DEFLATED;
1180 origlen = strtoul(buffer + 8, NULL, 10);
1188 int byte_length, max_byte_length, newsize;
1189 llen = linelen(buffer, size);
1193 /* consume the blank line */
1198 /* Minimum line is "A00000\n" which is 7-byte long,
1199 * and the line length must be multiple of 5 plus 2.
1201 if ((llen < 7) || (llen-2) % 5)
1203 max_byte_length = (llen - 2) / 5 * 4;
1204 byte_length = *buffer;
1205 if ('A' <= byte_length && byte_length <= 'Z')
1206 byte_length = byte_length - 'A' + 1;
1207 else if ('a' <= byte_length && byte_length <= 'z')
1208 byte_length = byte_length - 'a' + 27;
1211 /* if the input length was not multiple of 4, we would
1212 * have filler at the end but the filler should never
1215 if (max_byte_length < byte_length ||
1216 byte_length <= max_byte_length - 4)
1218 newsize = hunk_size + byte_length;
1219 data = xrealloc(data, newsize);
1220 if (decode_85(data + hunk_size, buffer + 1, byte_length))
1222 hunk_size = newsize;
1227 frag = xcalloc(1, sizeof(*frag));
1228 frag->patch = inflate_it(data, hunk_size, origlen);
1232 frag->size = origlen;
1236 frag->binary_patch_method = patch_method;
1242 error("corrupt binary patch at line %d: %.*s",
1243 linenr-1, llen-1, buffer);
1247 static int parse_binary(char *buffer, unsigned long size, struct patch *patch)
1249 /* We have read "GIT binary patch\n"; what follows is a line
1250 * that says the patch method (currently, either "literal" or
1251 * "delta") and the length of data before deflating; a
1252 * sequence of 'length-byte' followed by base-85 encoded data
1255 * When a binary patch is reversible, there is another binary
1256 * hunk in the same format, starting with patch method (either
1257 * "literal" or "delta") with the length of data, and a sequence
1258 * of length-byte + base-85 encoded data, terminated with another
1259 * empty line. This data, when applied to the postimage, produces
1262 struct fragment *forward;
1263 struct fragment *reverse;
1267 forward = parse_binary_hunk(&buffer, &size, &status, &used);
1268 if (!forward && !status)
1269 /* there has to be one hunk (forward hunk) */
1270 return error("unrecognized binary patch at line %d", linenr-1);
1272 /* otherwise we already gave an error message */
1275 reverse = parse_binary_hunk(&buffer, &size, &status, &used_1);
1279 /* not having reverse hunk is not an error, but having
1280 * a corrupt reverse hunk is.
1282 free((void*) forward->patch);
1286 forward->next = reverse;
1287 patch->fragments = forward;
1288 patch->is_binary = 1;
1292 static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
1294 int hdrsize, patchsize;
1295 int offset = find_header(buffer, size, &hdrsize, patch);
1300 patchsize = parse_single_patch(buffer + offset + hdrsize, size - offset - hdrsize, patch);
1303 static const char *binhdr[] = {
1308 static const char git_binary[] = "GIT binary patch\n";
1310 int hd = hdrsize + offset;
1311 unsigned long llen = linelen(buffer + hd, size - hd);
1313 if (llen == sizeof(git_binary) - 1 &&
1314 !memcmp(git_binary, buffer + hd, llen)) {
1317 used = parse_binary(buffer + hd + llen,
1318 size - hd - llen, patch);
1320 patchsize = used + llen;
1324 else if (!memcmp(" differ\n", buffer + hd + llen - 8, 8)) {
1325 for (i = 0; binhdr[i]; i++) {
1326 int len = strlen(binhdr[i]);
1327 if (len < size - hd &&
1328 !memcmp(binhdr[i], buffer + hd, len)) {
1330 patch->is_binary = 1;
1337 /* Empty patch cannot be applied if it is a text patch
1338 * without metadata change. A binary patch appears
1341 if ((apply || check) &&
1342 (!patch->is_binary && !metadata_changes(patch)))
1343 die("patch with only garbage at line %d", linenr);
1346 return offset + hdrsize + patchsize;
1349 #define swap(a,b) myswap((a),(b),sizeof(a))
1351 #define myswap(a, b, size) do { \
1352 unsigned char mytmp[size]; \
1353 memcpy(mytmp, &a, size); \
1354 memcpy(&a, &b, size); \
1355 memcpy(&b, mytmp, size); \
1358 static void reverse_patches(struct patch *p)
1360 for (; p; p = p->next) {
1361 struct fragment *frag = p->fragments;
1363 swap(p->new_name, p->old_name);
1364 swap(p->new_mode, p->old_mode);
1365 swap(p->is_new, p->is_delete);
1366 swap(p->lines_added, p->lines_deleted);
1367 swap(p->old_sha1_prefix, p->new_sha1_prefix);
1369 for (; frag; frag = frag->next) {
1370 swap(frag->newpos, frag->oldpos);
1371 swap(frag->newlines, frag->oldlines);
1376 static const char pluses[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
1377 static const char minuses[]= "----------------------------------------------------------------------";
1379 static void show_stats(struct patch *patch)
1381 struct strbuf qname;
1382 char *cp = patch->new_name ? patch->new_name : patch->old_name;
1385 strbuf_init(&qname, 0);
1386 quote_c_style(cp, &qname, NULL, 0);
1389 * "scale" the filename
1395 if (qname.len > max) {
1396 cp = strchr(qname.buf + qname.len + 3 - max, '/');
1398 cp = qname.buf + qname.len + 3 - max;
1399 strbuf_splice(&qname, 0, cp - qname.buf, "...", 3);
1402 if (patch->is_binary) {
1403 printf(" %-*s | Bin\n", max, qname.buf);
1404 strbuf_release(&qname);
1408 printf(" %-*s |", max, qname.buf);
1409 strbuf_release(&qname);
1412 * scale the add/delete
1414 max = max + max_change > 70 ? 70 - max : max_change;
1415 add = patch->lines_added;
1416 del = patch->lines_deleted;
1418 if (max_change > 0) {
1419 int total = ((add + del) * max + max_change / 2) / max_change;
1420 add = (add * max + max_change / 2) / max_change;
1423 printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,
1424 add, pluses, del, minuses);
1427 static int read_old_data(struct stat *st, const char *path, struct strbuf *buf)
1431 switch (st->st_mode & S_IFMT) {
1433 strbuf_grow(buf, st->st_size);
1434 if (readlink(path, buf->buf, st->st_size) != st->st_size)
1436 strbuf_setlen(buf, st->st_size);
1439 fd = open(path, O_RDONLY);
1441 return error("unable to open %s", path);
1442 if (strbuf_read(buf, fd, st->st_size) < 0) {
1447 convert_to_git(path, buf->buf, buf->len, buf);
1454 static int find_offset(const char *buf, unsigned long size, const char *fragment, unsigned long fragsize, int line, int *lines)
1457 unsigned long start, backwards, forwards;
1459 if (fragsize > size)
1464 unsigned long offset = 0;
1466 while (offset + fragsize <= size) {
1467 if (buf[offset++] == '\n') {
1475 /* Exact line number? */
1476 if ((start + fragsize <= size) &&
1477 !memcmp(buf + start, fragment, fragsize))
1481 * There's probably some smart way to do this, but I'll leave
1482 * that to the smart and beautiful people. I'm simple and stupid.
1486 for (i = 0; ; i++) {
1493 if (forwards + fragsize > size)
1499 } while (backwards && buf[backwards-1] != '\n');
1502 while (forwards + fragsize <= size) {
1503 if (buf[forwards++] == '\n')
1509 if (try + fragsize > size)
1511 if (memcmp(buf + try, fragment, fragsize))
1521 * We should start searching forward and backward.
1526 static void remove_first_line(const char **rbuf, int *rsize)
1528 const char *buf = *rbuf;
1530 unsigned long offset;
1532 while (offset <= size) {
1533 if (buf[offset++] == '\n')
1536 *rsize = size - offset;
1537 *rbuf = buf + offset;
1540 static void remove_last_line(const char **rbuf, int *rsize)
1542 const char *buf = *rbuf;
1544 unsigned long offset;
1546 while (offset > 0) {
1547 if (buf[--offset] == '\n')
1550 *rsize = offset + 1;
1553 static int apply_line(char *output, const char *patch, int plen)
1555 /* plen is number of bytes to be copied from patch,
1556 * starting at patch+1 (patch[0] is '+'). Typically
1557 * patch[plen] is '\n', unless this is the incomplete
1561 int add_nl_to_tail = 0;
1563 int last_tab_in_indent = -1;
1564 int last_space_in_indent = -1;
1565 int need_fix_leading_space = 0;
1568 if ((new_whitespace != strip_whitespace) || !whitespace_error ||
1570 memcpy(output, patch + 1, plen);
1574 if (1 < plen && isspace(patch[plen-1])) {
1575 if (patch[plen] == '\n')
1578 while (0 < plen && isspace(patch[plen]))
1583 for (i = 1; i < plen; i++) {
1586 last_tab_in_indent = i;
1587 if (0 <= last_space_in_indent)
1588 need_fix_leading_space = 1;
1591 last_space_in_indent = i;
1597 if (need_fix_leading_space) {
1598 int consecutive_spaces = 0;
1599 /* between patch[1..last_tab_in_indent] strip the
1600 * funny spaces, updating them to tab as needed.
1602 for (i = 1; i < last_tab_in_indent; i++, plen--) {
1605 consecutive_spaces = 0;
1608 consecutive_spaces++;
1609 if (consecutive_spaces == 8) {
1611 consecutive_spaces = 0;
1616 i = last_tab_in_indent;
1621 memcpy(output, patch + i, plen);
1623 output[plen++] = '\n';
1625 applied_after_fixing_ws++;
1626 return output + plen - buf;
1629 static int apply_one_fragment(struct strbuf *buf, struct fragment *frag, int inaccurate_eof)
1631 int match_beginning, match_end;
1632 const char *patch = frag->patch;
1633 int offset, size = frag->size;
1634 char *old = xmalloc(size);
1635 char *new = xmalloc(size);
1636 const char *oldlines, *newlines;
1637 int oldsize = 0, newsize = 0;
1638 int new_blank_lines_at_end = 0;
1639 unsigned long leading, trailing;
1644 int len = linelen(patch, size);
1646 int added_blank_line = 0;
1652 * "plen" is how much of the line we should use for
1653 * the actual patch data. Normally we just remove the
1654 * first character on the line, but if the line is
1655 * followed by "\ No newline", then we also remove the
1656 * last one (which is the newline, of course).
1659 if (len < size && patch[len] == '\\')
1662 if (apply_in_reverse) {
1665 else if (first == '+')
1671 /* Newer GNU diff, empty context line */
1673 /* ... followed by '\No newline'; nothing */
1675 old[oldsize++] = '\n';
1676 new[newsize++] = '\n';
1680 memcpy(old + oldsize, patch + 1, plen);
1684 /* Fall-through for ' ' */
1686 if (first != '+' || !no_add) {
1687 int added = apply_line(new + newsize, patch,
1691 added == 1 && new[newsize-1] == '\n')
1692 added_blank_line = 1;
1695 case '@': case '\\':
1696 /* Ignore it, we already handled it */
1699 if (apply_verbosely)
1700 error("invalid start of line: '%c'", first);
1703 if (added_blank_line)
1704 new_blank_lines_at_end++;
1706 new_blank_lines_at_end = 0;
1711 if (inaccurate_eof && oldsize > 0 && old[oldsize - 1] == '\n' &&
1712 newsize > 0 && new[newsize - 1] == '\n') {
1719 leading = frag->leading;
1720 trailing = frag->trailing;
1723 * If we don't have any leading/trailing data in the patch,
1724 * we want it to match at the beginning/end of the file.
1726 * But that would break if the patch is generated with
1727 * --unified=0; sane people wouldn't do that to cause us
1728 * trouble, but we try to please not so sane ones as well.
1731 match_beginning = (!leading && !frag->oldpos);
1735 match_beginning = !leading && (frag->oldpos == 1);
1736 match_end = !trailing;
1742 offset = find_offset(buf->buf, buf->len,
1743 oldlines, oldsize, pos, &lines);
1744 if (match_end && offset + oldsize != buf->len)
1746 if (match_beginning && offset)
1749 if (new_whitespace == strip_whitespace &&
1750 (buf->len - oldsize - offset == 0)) /* end of file? */
1751 newsize -= new_blank_lines_at_end;
1753 /* Warn if it was necessary to reduce the number
1756 if ((leading != frag->leading) ||
1757 (trailing != frag->trailing))
1758 fprintf(stderr, "Context reduced to (%ld/%ld)"
1759 " to apply fragment at %d\n",
1760 leading, trailing, pos + lines);
1762 strbuf_splice(buf, offset, oldsize, newlines, newsize);
1767 /* Am I at my context limits? */
1768 if ((leading <= p_context) && (trailing <= p_context))
1770 if (match_beginning || match_end) {
1771 match_beginning = match_end = 0;
1774 /* Reduce the number of context lines
1775 * Reduce both leading and trailing if they are equal
1776 * otherwise just reduce the larger context.
1778 if (leading >= trailing) {
1779 remove_first_line(&oldlines, &oldsize);
1780 remove_first_line(&newlines, &newsize);
1784 if (trailing > leading) {
1785 remove_last_line(&oldlines, &oldsize);
1786 remove_last_line(&newlines, &newsize);
1791 if (offset && apply_verbosely)
1792 error("while searching for:\n%.*s", oldsize, oldlines);
1799 static int apply_binary_fragment(struct strbuf *buf, struct patch *patch)
1801 struct fragment *fragment = patch->fragments;
1805 /* Binary patch is irreversible without the optional second hunk */
1806 if (apply_in_reverse) {
1807 if (!fragment->next)
1808 return error("cannot reverse-apply a binary patch "
1809 "without the reverse hunk to '%s'",
1811 ? patch->new_name : patch->old_name);
1812 fragment = fragment->next;
1814 switch (fragment->binary_patch_method) {
1815 case BINARY_DELTA_DEFLATED:
1816 dst = patch_delta(buf->buf, buf->len, fragment->patch,
1817 fragment->size, &len);
1820 /* XXX patch_delta NUL-terminates */
1821 strbuf_attach(buf, dst, len, len + 1);
1823 case BINARY_LITERAL_DEFLATED:
1825 strbuf_add(buf, fragment->patch, fragment->size);
1831 static int apply_binary(struct strbuf *buf, struct patch *patch)
1833 const char *name = patch->old_name ? patch->old_name : patch->new_name;
1834 unsigned char sha1[20];
1836 /* For safety, we require patch index line to contain
1837 * full 40-byte textual SHA1 for old and new, at least for now.
1839 if (strlen(patch->old_sha1_prefix) != 40 ||
1840 strlen(patch->new_sha1_prefix) != 40 ||
1841 get_sha1_hex(patch->old_sha1_prefix, sha1) ||
1842 get_sha1_hex(patch->new_sha1_prefix, sha1))
1843 return error("cannot apply binary patch to '%s' "
1844 "without full index line", name);
1846 if (patch->old_name) {
1847 /* See if the old one matches what the patch
1850 hash_sha1_file(buf->buf, buf->len, blob_type, sha1);
1851 if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))
1852 return error("the patch applies to '%s' (%s), "
1853 "which does not match the "
1854 "current contents.",
1855 name, sha1_to_hex(sha1));
1858 /* Otherwise, the old one must be empty. */
1860 return error("the patch applies to an empty "
1861 "'%s' but it is not empty", name);
1864 get_sha1_hex(patch->new_sha1_prefix, sha1);
1865 if (is_null_sha1(sha1)) {
1866 strbuf_release(buf);
1867 return 0; /* deletion patch */
1870 if (has_sha1_file(sha1)) {
1871 /* We already have the postimage */
1872 enum object_type type;
1876 result = read_sha1_file(sha1, &type, &size);
1878 return error("the necessary postimage %s for "
1879 "'%s' cannot be read",
1880 patch->new_sha1_prefix, name);
1881 /* XXX read_sha1_file NUL-terminates */
1882 strbuf_attach(buf, result, size, size + 1);
1884 /* We have verified buf matches the preimage;
1885 * apply the patch data to it, which is stored
1886 * in the patch->fragments->{patch,size}.
1888 if (apply_binary_fragment(buf, patch))
1889 return error("binary patch does not apply to '%s'",
1892 /* verify that the result matches */
1893 hash_sha1_file(buf->buf, buf->len, blob_type, sha1);
1894 if (strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))
1895 return error("binary patch to '%s' creates incorrect result (expecting %s, got %s)",
1896 name, patch->new_sha1_prefix, sha1_to_hex(sha1));
1902 static int apply_fragments(struct strbuf *buf, struct patch *patch)
1904 struct fragment *frag = patch->fragments;
1905 const char *name = patch->old_name ? patch->old_name : patch->new_name;
1907 if (patch->is_binary)
1908 return apply_binary(buf, patch);
1911 if (apply_one_fragment(buf, frag, patch->inaccurate_eof)) {
1912 error("patch failed: %s:%ld", name, frag->oldpos);
1913 if (!apply_with_reject)
1922 static int read_file_or_gitlink(struct cache_entry *ce, struct strbuf *buf)
1927 if (S_ISGITLINK(ntohl(ce->ce_mode))) {
1928 strbuf_grow(buf, 100);
1929 strbuf_addf(buf, "Subproject commit %s\n", sha1_to_hex(ce->sha1));
1931 enum object_type type;
1935 result = read_sha1_file(ce->sha1, &type, &sz);
1938 /* XXX read_sha1_file NUL-terminates */
1939 strbuf_attach(buf, result, sz, sz + 1);
1944 static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *ce)
1948 strbuf_init(&buf, 0);
1950 if (read_file_or_gitlink(ce, &buf))
1951 return error("read of %s failed", patch->old_name);
1952 } else if (patch->old_name) {
1953 if (S_ISGITLINK(patch->old_mode)) {
1955 read_file_or_gitlink(ce, &buf);
1958 * There is no way to apply subproject
1959 * patch without looking at the index.
1961 patch->fragments = NULL;
1964 if (read_old_data(st, patch->old_name, &buf))
1965 return error("read of %s failed", patch->old_name);
1969 if (apply_fragments(&buf, patch) < 0)
1970 return -1; /* note with --reject this succeeds. */
1971 patch->result = buf.buf;
1972 patch->resultsize = buf.len;
1974 if (0 < patch->is_delete && patch->resultsize)
1975 return error("removal patch leaves file contents");
1980 static int check_to_create_blob(const char *new_name, int ok_if_exists)
1983 if (!lstat(new_name, &nst)) {
1984 if (S_ISDIR(nst.st_mode) || ok_if_exists)
1987 * A leading component of new_name might be a symlink
1988 * that is going to be removed with this patch, but
1989 * still pointing at somewhere that has the path.
1990 * In such a case, path "new_name" does not exist as
1991 * far as git is concerned.
1993 if (has_symlink_leading_path(new_name, NULL))
1996 return error("%s: already exists in working directory", new_name);
1998 else if ((errno != ENOENT) && (errno != ENOTDIR))
1999 return error("%s: %s", new_name, strerror(errno));
2003 static int verify_index_match(struct cache_entry *ce, struct stat *st)
2005 if (S_ISGITLINK(ntohl(ce->ce_mode))) {
2006 if (!S_ISDIR(st->st_mode))
2010 return ce_match_stat(ce, st, 1);
2013 static int check_patch(struct patch *patch, struct patch *prev_patch)
2016 const char *old_name = patch->old_name;
2017 const char *new_name = patch->new_name;
2018 const char *name = old_name ? old_name : new_name;
2019 struct cache_entry *ce = NULL;
2022 patch->rejected = 1; /* we will drop this after we succeed */
2025 * Make sure that we do not have local modifications from the
2026 * index when we are looking at the index. Also make sure
2027 * we have the preimage file to be patched in the work tree,
2028 * unless --cached, which tells git to apply only in the index.
2032 unsigned st_mode = 0;
2035 stat_ret = lstat(old_name, &st);
2037 int pos = cache_name_pos(old_name, strlen(old_name));
2039 return error("%s: does not exist in index",
2041 ce = active_cache[pos];
2043 struct checkout costate;
2044 if (errno != ENOENT)
2045 return error("%s: %s", old_name,
2048 costate.base_dir = "";
2049 costate.base_dir_len = 0;
2052 costate.not_new = 0;
2053 costate.refresh_cache = 1;
2054 if (checkout_entry(ce,
2057 lstat(old_name, &st))
2060 if (!cached && verify_index_match(ce, &st))
2061 return error("%s: does not match index",
2064 st_mode = ntohl(ce->ce_mode);
2065 } else if (stat_ret < 0)
2066 return error("%s: %s", old_name, strerror(errno));
2069 st_mode = ntohl(ce_mode_from_stat(ce, st.st_mode));
2071 if (patch->is_new < 0)
2073 if (!patch->old_mode)
2074 patch->old_mode = st_mode;
2075 if ((st_mode ^ patch->old_mode) & S_IFMT)
2076 return error("%s: wrong type", old_name);
2077 if (st_mode != patch->old_mode)
2078 fprintf(stderr, "warning: %s has type %o, expected %o\n",
2079 old_name, st_mode, patch->old_mode);
2082 if (new_name && prev_patch && 0 < prev_patch->is_delete &&
2083 !strcmp(prev_patch->old_name, new_name))
2084 /* A type-change diff is always split into a patch to
2085 * delete old, immediately followed by a patch to
2086 * create new (see diff.c::run_diff()); in such a case
2087 * it is Ok that the entry to be deleted by the
2088 * previous patch is still in the working tree and in
2096 ((0 < patch->is_new) | (0 < patch->is_rename) | patch->is_copy)) {
2098 cache_name_pos(new_name, strlen(new_name)) >= 0 &&
2100 return error("%s: already exists in index", new_name);
2102 int err = check_to_create_blob(new_name, ok_if_exists);
2106 if (!patch->new_mode) {
2107 if (0 < patch->is_new)
2108 patch->new_mode = S_IFREG | 0644;
2110 patch->new_mode = patch->old_mode;
2114 if (new_name && old_name) {
2115 int same = !strcmp(old_name, new_name);
2116 if (!patch->new_mode)
2117 patch->new_mode = patch->old_mode;
2118 if ((patch->old_mode ^ patch->new_mode) & S_IFMT)
2119 return error("new mode (%o) of %s does not match old mode (%o)%s%s",
2120 patch->new_mode, new_name, patch->old_mode,
2121 same ? "" : " of ", same ? "" : old_name);
2124 if (apply_data(patch, &st, ce) < 0)
2125 return error("%s: patch does not apply", name);
2126 patch->rejected = 0;
2130 static int check_patch_list(struct patch *patch)
2132 struct patch *prev_patch = NULL;
2135 for (prev_patch = NULL; patch ; patch = patch->next) {
2136 if (apply_verbosely)
2137 say_patch_name(stderr,
2138 "Checking patch ", patch, "...\n");
2139 err |= check_patch(patch, prev_patch);
2145 /* This function tries to read the sha1 from the current index */
2146 static int get_current_sha1(const char *path, unsigned char *sha1)
2150 if (read_cache() < 0)
2152 pos = cache_name_pos(path, strlen(path));
2155 hashcpy(sha1, active_cache[pos]->sha1);
2159 static void show_index_list(struct patch *list)
2161 struct patch *patch;
2163 /* Once we start supporting the reverse patch, it may be
2164 * worth showing the new sha1 prefix, but until then...
2166 for (patch = list; patch; patch = patch->next) {
2167 const unsigned char *sha1_ptr;
2168 unsigned char sha1[20];
2171 name = patch->old_name ? patch->old_name : patch->new_name;
2172 if (0 < patch->is_new)
2173 sha1_ptr = null_sha1;
2174 else if (get_sha1(patch->old_sha1_prefix, sha1))
2175 /* git diff has no index line for mode/type changes */
2176 if (!patch->lines_added && !patch->lines_deleted) {
2177 if (get_current_sha1(patch->new_name, sha1) ||
2178 get_current_sha1(patch->old_name, sha1))
2179 die("mode change for %s, which is not "
2180 "in current HEAD", name);
2183 die("sha1 information is lacking or useless "
2188 printf("%06o %s ",patch->old_mode, sha1_to_hex(sha1_ptr));
2189 if (line_termination && quote_c_style(name, NULL, NULL, 0))
2190 quote_c_style(name, NULL, stdout, 0);
2192 fputs(name, stdout);
2193 putchar(line_termination);
2197 static void stat_patch_list(struct patch *patch)
2199 int files, adds, dels;
2201 for (files = adds = dels = 0 ; patch ; patch = patch->next) {
2203 adds += patch->lines_added;
2204 dels += patch->lines_deleted;
2208 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files, adds, dels);
2211 static void numstat_patch_list(struct patch *patch)
2213 for ( ; patch; patch = patch->next) {
2215 name = patch->new_name ? patch->new_name : patch->old_name;
2216 if (patch->is_binary)
2219 printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);
2220 write_name_quoted(name, stdout, line_termination);
2224 static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)
2227 printf(" %s mode %06o %s\n", newdelete, mode, name);
2229 printf(" %s %s\n", newdelete, name);
2232 static void show_mode_change(struct patch *p, int show_name)
2234 if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {
2236 printf(" mode change %06o => %06o %s\n",
2237 p->old_mode, p->new_mode, p->new_name);
2239 printf(" mode change %06o => %06o\n",
2240 p->old_mode, p->new_mode);
2244 static void show_rename_copy(struct patch *p)
2246 const char *renamecopy = p->is_rename ? "rename" : "copy";
2247 const char *old, *new;
2249 /* Find common prefix */
2253 const char *slash_old, *slash_new;
2254 slash_old = strchr(old, '/');
2255 slash_new = strchr(new, '/');
2258 slash_old - old != slash_new - new ||
2259 memcmp(old, new, slash_new - new))
2261 old = slash_old + 1;
2262 new = slash_new + 1;
2264 /* p->old_name thru old is the common prefix, and old and new
2265 * through the end of names are renames
2267 if (old != p->old_name)
2268 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
2269 (int)(old - p->old_name), p->old_name,
2270 old, new, p->score);
2272 printf(" %s %s => %s (%d%%)\n", renamecopy,
2273 p->old_name, p->new_name, p->score);
2274 show_mode_change(p, 0);
2277 static void summary_patch_list(struct patch *patch)
2281 for (p = patch; p; p = p->next) {
2283 show_file_mode_name("create", p->new_mode, p->new_name);
2284 else if (p->is_delete)
2285 show_file_mode_name("delete", p->old_mode, p->old_name);
2287 if (p->is_rename || p->is_copy)
2288 show_rename_copy(p);
2291 printf(" rewrite %s (%d%%)\n",
2292 p->new_name, p->score);
2293 show_mode_change(p, 0);
2296 show_mode_change(p, 1);
2302 static void patch_stats(struct patch *patch)
2304 int lines = patch->lines_added + patch->lines_deleted;
2306 if (lines > max_change)
2308 if (patch->old_name) {
2309 int len = quote_c_style(patch->old_name, NULL, NULL, 0);
2311 len = strlen(patch->old_name);
2315 if (patch->new_name) {
2316 int len = quote_c_style(patch->new_name, NULL, NULL, 0);
2318 len = strlen(patch->new_name);
2324 static void remove_file(struct patch *patch, int rmdir_empty)
2327 if (remove_file_from_cache(patch->old_name) < 0)
2328 die("unable to remove %s from index", patch->old_name);
2331 if (S_ISGITLINK(patch->old_mode)) {
2332 if (rmdir(patch->old_name))
2333 warning("unable to remove submodule %s",
2335 } else if (!unlink(patch->old_name) && rmdir_empty) {
2336 char *name = xstrdup(patch->old_name);
2337 char *end = strrchr(name, '/');
2342 end = strrchr(name, '/');
2349 static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size)
2352 struct cache_entry *ce;
2353 int namelen = strlen(path);
2354 unsigned ce_size = cache_entry_size(namelen);
2359 ce = xcalloc(1, ce_size);
2360 memcpy(ce->name, path, namelen);
2361 ce->ce_mode = create_ce_mode(mode);
2362 ce->ce_flags = htons(namelen);
2363 if (S_ISGITLINK(mode)) {
2364 const char *s = buf;
2366 if (get_sha1_hex(s + strlen("Subproject commit "), ce->sha1))
2367 die("corrupt patch for subproject %s", path);
2370 if (lstat(path, &st) < 0)
2371 die("unable to stat newly created file %s",
2373 fill_stat_cache_info(ce, &st);
2375 if (write_sha1_file(buf, size, blob_type, ce->sha1) < 0)
2376 die("unable to create backing store for newly created file %s", path);
2378 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)
2379 die("unable to add cache entry for %s", path);
2382 static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)
2387 if (S_ISGITLINK(mode)) {
2389 if (!lstat(path, &st) && S_ISDIR(st.st_mode))
2391 return mkdir(path, 0777);
2394 if (has_symlinks && S_ISLNK(mode))
2395 /* Although buf:size is counted string, it also is NUL
2398 return symlink(buf, path);
2400 fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);
2404 strbuf_init(&nbuf, 0);
2405 if (convert_to_working_tree(path, buf, size, &nbuf)) {
2409 write_or_die(fd, buf, size);
2410 strbuf_release(&nbuf);
2413 die("closing file %s: %s", path, strerror(errno));
2418 * We optimistically assume that the directories exist,
2419 * which is true 99% of the time anyway. If they don't,
2420 * we create them and try again.
2422 static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size)
2426 if (!try_create_file(path, mode, buf, size))
2429 if (errno == ENOENT) {
2430 if (safe_create_leading_directories(path))
2432 if (!try_create_file(path, mode, buf, size))
2436 if (errno == EEXIST || errno == EACCES) {
2437 /* We may be trying to create a file where a directory
2441 if (!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))
2445 if (errno == EEXIST) {
2446 unsigned int nr = getpid();
2449 const char *newpath;
2450 newpath = mkpath("%s~%u", path, nr);
2451 if (!try_create_file(newpath, mode, buf, size)) {
2452 if (!rename(newpath, path))
2457 if (errno != EEXIST)
2462 die("unable to write file %s mode %o", path, mode);
2465 static void create_file(struct patch *patch)
2467 char *path = patch->new_name;
2468 unsigned mode = patch->new_mode;
2469 unsigned long size = patch->resultsize;
2470 char *buf = patch->result;
2473 mode = S_IFREG | 0644;
2474 create_one_file(path, mode, buf, size);
2475 add_index_file(path, mode, buf, size);
2478 /* phase zero is to remove, phase one is to create */
2479 static void write_out_one_result(struct patch *patch, int phase)
2481 if (patch->is_delete > 0) {
2483 remove_file(patch, 1);
2486 if (patch->is_new > 0 || patch->is_copy) {
2492 * Rename or modification boils down to the same
2493 * thing: remove the old, write the new
2496 remove_file(patch, patch->is_rename);
2501 static int write_out_one_reject(struct patch *patch)
2504 char namebuf[PATH_MAX];
2505 struct fragment *frag;
2508 for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) {
2509 if (!frag->rejected)
2515 if (apply_verbosely)
2516 say_patch_name(stderr,
2517 "Applied patch ", patch, " cleanly.\n");
2521 /* This should not happen, because a removal patch that leaves
2522 * contents are marked "rejected" at the patch level.
2524 if (!patch->new_name)
2525 die("internal error");
2527 /* Say this even without --verbose */
2528 say_patch_name(stderr, "Applying patch ", patch, " with");
2529 fprintf(stderr, " %d rejects...\n", cnt);
2531 cnt = strlen(patch->new_name);
2532 if (ARRAY_SIZE(namebuf) <= cnt + 5) {
2533 cnt = ARRAY_SIZE(namebuf) - 5;
2535 "warning: truncating .rej filename to %.*s.rej",
2536 cnt - 1, patch->new_name);
2538 memcpy(namebuf, patch->new_name, cnt);
2539 memcpy(namebuf + cnt, ".rej", 5);
2541 rej = fopen(namebuf, "w");
2543 return error("cannot open %s: %s", namebuf, strerror(errno));
2545 /* Normal git tools never deal with .rej, so do not pretend
2546 * this is a git patch by saying --git nor give extended
2547 * headers. While at it, maybe please "kompare" that wants
2548 * the trailing TAB and some garbage at the end of line ;-).
2550 fprintf(rej, "diff a/%s b/%s\t(rejected hunks)\n",
2551 patch->new_name, patch->new_name);
2552 for (cnt = 1, frag = patch->fragments;
2554 cnt++, frag = frag->next) {
2555 if (!frag->rejected) {
2556 fprintf(stderr, "Hunk #%d applied cleanly.\n", cnt);
2559 fprintf(stderr, "Rejected hunk #%d.\n", cnt);
2560 fprintf(rej, "%.*s", frag->size, frag->patch);
2561 if (frag->patch[frag->size-1] != '\n')
2568 static int write_out_results(struct patch *list, int skipped_patch)
2574 if (!list && !skipped_patch)
2575 return error("No changes");
2577 for (phase = 0; phase < 2; phase++) {
2583 write_out_one_result(l, phase);
2584 if (phase == 1 && write_out_one_reject(l))
2593 static struct lock_file lock_file;
2595 static struct excludes {
2596 struct excludes *next;
2600 static int use_patch(struct patch *p)
2602 const char *pathname = p->new_name ? p->new_name : p->old_name;
2603 struct excludes *x = excludes;
2605 if (fnmatch(x->path, pathname, 0) == 0)
2609 if (0 < prefix_length) {
2610 int pathlen = strlen(pathname);
2611 if (pathlen <= prefix_length ||
2612 memcmp(prefix, pathname, prefix_length))
2618 static void prefix_one(char **name)
2620 char *old_name = *name;
2623 *name = xstrdup(prefix_filename(prefix, prefix_length, *name));
2627 static void prefix_patches(struct patch *p)
2629 if (!prefix || p->is_toplevel_relative)
2631 for ( ; p; p = p->next) {
2632 if (p->new_name == p->old_name) {
2633 char *prefixed = p->new_name;
2634 prefix_one(&prefixed);
2635 p->new_name = p->old_name = prefixed;
2638 prefix_one(&p->new_name);
2639 prefix_one(&p->old_name);
2644 static int apply_patch(int fd, const char *filename, int inaccurate_eof)
2646 unsigned long offset, size;
2647 char *buffer = read_patch_file(fd, &size);
2648 struct patch *list = NULL, **listp = &list;
2649 int skipped_patch = 0;
2651 patch_input_file = filename;
2656 struct patch *patch;
2659 patch = xcalloc(1, sizeof(*patch));
2660 patch->inaccurate_eof = inaccurate_eof;
2661 nr = parse_chunk(buffer + offset, size, patch);
2664 if (apply_in_reverse)
2665 reverse_patches(patch);
2667 prefix_patches(patch);
2668 if (use_patch(patch)) {
2671 listp = &patch->next;
2674 /* perhaps free it a bit better? */
2682 if (whitespace_error && (new_whitespace == error_on_whitespace))
2685 update_index = check_index && apply;
2686 if (update_index && newfd < 0)
2687 newfd = hold_locked_index(&lock_file, 1);
2690 if (read_cache() < 0)
2691 die("unable to read index file");
2694 if ((check || apply) &&
2695 check_patch_list(list) < 0 &&
2699 if (apply && write_out_results(list, skipped_patch))
2702 if (show_index_info)
2703 show_index_list(list);
2706 stat_patch_list(list);
2709 numstat_patch_list(list);
2712 summary_patch_list(list);
2718 static int git_apply_config(const char *var, const char *value)
2720 if (!strcmp(var, "apply.whitespace")) {
2721 apply_default_whitespace = xstrdup(value);
2724 return git_default_config(var, value);
2728 int cmd_apply(int argc, const char **argv, const char *unused_prefix)
2732 int inaccurate_eof = 0;
2734 int is_not_gitdir = 0;
2736 const char *whitespace_option = NULL;
2738 prefix = setup_git_directory_gently(&is_not_gitdir);
2739 prefix_length = prefix ? strlen(prefix) : 0;
2740 git_config(git_apply_config);
2741 if (apply_default_whitespace)
2742 parse_whitespace_option(apply_default_whitespace);
2744 for (i = 1; i < argc; i++) {
2745 const char *arg = argv[i];
2749 if (!strcmp(arg, "-")) {
2750 errs |= apply_patch(0, "<stdin>", inaccurate_eof);
2754 if (!prefixcmp(arg, "--exclude=")) {
2755 struct excludes *x = xmalloc(sizeof(*x));
2761 if (!prefixcmp(arg, "-p")) {
2762 p_value = atoi(arg + 2);
2766 if (!strcmp(arg, "--no-add")) {
2770 if (!strcmp(arg, "--stat")) {
2775 if (!strcmp(arg, "--allow-binary-replacement") ||
2776 !strcmp(arg, "--binary")) {
2777 continue; /* now no-op */
2779 if (!strcmp(arg, "--numstat")) {
2784 if (!strcmp(arg, "--summary")) {
2789 if (!strcmp(arg, "--check")) {
2794 if (!strcmp(arg, "--index")) {
2796 die("--index outside a repository");
2800 if (!strcmp(arg, "--cached")) {
2802 die("--cached outside a repository");
2807 if (!strcmp(arg, "--apply")) {
2811 if (!strcmp(arg, "--index-info")) {
2813 show_index_info = 1;
2816 if (!strcmp(arg, "-z")) {
2817 line_termination = 0;
2820 if (!prefixcmp(arg, "-C")) {
2821 p_context = strtoul(arg + 2, &end, 0);
2823 die("unrecognized context count '%s'", arg + 2);
2826 if (!prefixcmp(arg, "--whitespace=")) {
2827 whitespace_option = arg + 13;
2828 parse_whitespace_option(arg + 13);
2831 if (!strcmp(arg, "-R") || !strcmp(arg, "--reverse")) {
2832 apply_in_reverse = 1;
2835 if (!strcmp(arg, "--unidiff-zero")) {
2839 if (!strcmp(arg, "--reject")) {
2840 apply = apply_with_reject = apply_verbosely = 1;
2843 if (!strcmp(arg, "-v") || !strcmp(arg, "--verbose")) {
2844 apply_verbosely = 1;
2847 if (!strcmp(arg, "--inaccurate-eof")) {
2851 if (0 < prefix_length)
2852 arg = prefix_filename(prefix, prefix_length, arg);
2854 fd = open(arg, O_RDONLY);
2858 set_default_whitespace_mode(whitespace_option);
2859 errs |= apply_patch(fd, arg, inaccurate_eof);
2862 set_default_whitespace_mode(whitespace_option);
2864 errs |= apply_patch(0, "<stdin>", inaccurate_eof);
2865 if (whitespace_error) {
2866 if (squelch_whitespace_errors &&
2867 squelch_whitespace_errors < whitespace_error) {
2869 whitespace_error - squelch_whitespace_errors;
2870 fprintf(stderr, "warning: squelched %d "
2871 "whitespace error%s\n",
2873 squelched == 1 ? "" : "s");
2875 if (new_whitespace == error_on_whitespace)
2876 die("%d line%s add%s whitespace errors.",
2878 whitespace_error == 1 ? "" : "s",
2879 whitespace_error == 1 ? "s" : "");
2880 if (applied_after_fixing_ws)
2881 fprintf(stderr, "warning: %d line%s applied after"
2882 " fixing whitespace errors.\n",
2883 applied_after_fixing_ws,
2884 applied_after_fixing_ws == 1 ? "" : "s");
2885 else if (whitespace_error)
2886 fprintf(stderr, "warning: %d line%s add%s whitespace errors.\n",
2888 whitespace_error == 1 ? "" : "s",
2889 whitespace_error == 1 ? "s" : "");
2893 if (write_cache(newfd, active_cache, active_nr) ||
2894 close(newfd) || commit_locked_index(&lock_file))
2895 die("Unable to write new index file");