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 write_name_quoted(NULL, 0, patch->old_name, 1, output);
167 fputs(" => ", output);
168 write_name_quoted(NULL, 0, patch->new_name, 1, output);
171 const char *n = patch->new_name;
174 write_name_quoted(NULL, 0, n, 1, output);
179 #define CHUNKSIZE (8192)
182 static void *read_patch_file(int fd, unsigned long *sizep)
186 strbuf_init(&buf, 0);
187 if (strbuf_read(&buf, fd, 0) < 0)
188 die("git-apply: read returned %s", strerror(errno));
192 * Make sure that we have some slop in the buffer
193 * so that we can do speculative "memcmp" etc, and
194 * see to it that it is NUL-filled.
196 strbuf_grow(&buf, SLOP);
197 memset(buf.buf + buf.len, 0, SLOP);
198 return strbuf_detach(&buf);
201 static unsigned long linelen(const char *buffer, unsigned long size)
203 unsigned long len = 0;
206 if (*buffer++ == '\n')
212 static int is_dev_null(const char *str)
214 return !memcmp("/dev/null", str, 9) && isspace(str[9]);
220 static int name_terminate(const char *name, int namelen, int c, int terminate)
222 if (c == ' ' && !(terminate & TERM_SPACE))
224 if (c == '\t' && !(terminate & TERM_TAB))
230 static char *find_name(const char *line, char *def, int p_value, int terminate)
233 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 name = unquote_c_style(line, NULL);
244 cp = strchr(cp, '/');
251 /* name can later be freed, so we need
252 * to memmove, not just return cp
254 memmove(name, cp, strlen(cp) + 1);
271 if (name_terminate(start, line-start, c, terminate))
275 if (c == '/' && !--p_value)
285 * Generally we prefer the shorter name, especially
286 * if the other one is just a variation of that with
287 * something else tacked on to the end (ie "file.orig"
291 int deflen = strlen(def);
292 if (deflen < len && !strncmp(start, def, deflen))
296 return xmemdupz(start, len);
299 static int count_slashes(const char *cp)
311 * Given the string after "--- " or "+++ ", guess the appropriate
312 * p_value for the given patch.
314 static int guess_p_value(const char *nameline)
319 if (is_dev_null(nameline))
321 name = find_name(nameline, NULL, 0, TERM_SPACE | TERM_TAB);
324 cp = strchr(name, '/');
329 * Does it begin with "a/$our-prefix" and such? Then this is
330 * very likely to apply to our directory.
332 if (!strncmp(name, prefix, prefix_length))
333 val = count_slashes(prefix);
336 if (!strncmp(cp, prefix, prefix_length))
337 val = count_slashes(prefix) + 1;
345 * Get the name etc info from the --/+++ lines of a traditional patch header
347 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
348 * files, we can happily check the index for a match, but for creating a
349 * new file we should try to match whatever "patch" does. I have no idea.
351 static void parse_traditional_patch(const char *first, const char *second, struct patch *patch)
355 first += 4; /* skip "--- " */
356 second += 4; /* skip "+++ " */
357 if (!p_value_known) {
359 p = guess_p_value(first);
360 q = guess_p_value(second);
362 if (0 <= p && p == q) {
367 if (is_dev_null(first)) {
369 patch->is_delete = 0;
370 name = find_name(second, NULL, p_value, TERM_SPACE | TERM_TAB);
371 patch->new_name = name;
372 } else if (is_dev_null(second)) {
374 patch->is_delete = 1;
375 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
376 patch->old_name = name;
378 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
379 name = find_name(second, name, p_value, TERM_SPACE | TERM_TAB);
380 patch->old_name = patch->new_name = name;
383 die("unable to find filename in patch at line %d", linenr);
386 static int gitdiff_hdrend(const char *line, struct patch *patch)
392 * We're anal about diff header consistency, to make
393 * sure that we don't end up having strange ambiguous
394 * patches floating around.
396 * As a result, gitdiff_{old|new}name() will check
397 * their names against any previous information, just
400 static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, const char *oldnew)
402 if (!orig_name && !isnull)
403 return find_name(line, NULL, p_value, TERM_TAB);
412 die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr);
413 another = find_name(line, NULL, p_value, TERM_TAB);
414 if (!another || memcmp(another, name, len))
415 die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr);
420 /* expect "/dev/null" */
421 if (memcmp("/dev/null", line, 9) || line[9] != '\n')
422 die("git-apply: bad git-diff - expected /dev/null on line %d", linenr);
427 static int gitdiff_oldname(const char *line, struct patch *patch)
429 patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name, "old");
433 static int gitdiff_newname(const char *line, struct patch *patch)
435 patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name, "new");
439 static int gitdiff_oldmode(const char *line, struct patch *patch)
441 patch->old_mode = strtoul(line, NULL, 8);
445 static int gitdiff_newmode(const char *line, struct patch *patch)
447 patch->new_mode = strtoul(line, NULL, 8);
451 static int gitdiff_delete(const char *line, struct patch *patch)
453 patch->is_delete = 1;
454 patch->old_name = patch->def_name;
455 return gitdiff_oldmode(line, patch);
458 static int gitdiff_newfile(const char *line, struct patch *patch)
461 patch->new_name = patch->def_name;
462 return gitdiff_newmode(line, patch);
465 static int gitdiff_copysrc(const char *line, struct patch *patch)
468 patch->old_name = find_name(line, NULL, 0, 0);
472 static int gitdiff_copydst(const char *line, struct patch *patch)
475 patch->new_name = find_name(line, NULL, 0, 0);
479 static int gitdiff_renamesrc(const char *line, struct patch *patch)
481 patch->is_rename = 1;
482 patch->old_name = find_name(line, NULL, 0, 0);
486 static int gitdiff_renamedst(const char *line, struct patch *patch)
488 patch->is_rename = 1;
489 patch->new_name = find_name(line, NULL, 0, 0);
493 static int gitdiff_similarity(const char *line, struct patch *patch)
495 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
500 static int gitdiff_dissimilarity(const char *line, struct patch *patch)
502 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
507 static int gitdiff_index(const char *line, struct patch *patch)
509 /* index line is N hexadecimal, "..", N hexadecimal,
510 * and optional space with octal mode.
512 const char *ptr, *eol;
515 ptr = strchr(line, '.');
516 if (!ptr || ptr[1] != '.' || 40 < ptr - line)
519 memcpy(patch->old_sha1_prefix, line, len);
520 patch->old_sha1_prefix[len] = 0;
523 ptr = strchr(line, ' ');
524 eol = strchr(line, '\n');
526 if (!ptr || eol < ptr)
532 memcpy(patch->new_sha1_prefix, line, len);
533 patch->new_sha1_prefix[len] = 0;
535 patch->new_mode = patch->old_mode = strtoul(ptr+1, NULL, 8);
540 * This is normal for a diff that doesn't change anything: we'll fall through
541 * into the next diff. Tell the parser to break out.
543 static int gitdiff_unrecognized(const char *line, struct patch *patch)
548 static const char *stop_at_slash(const char *line, int llen)
552 for (i = 0; i < llen; i++) {
560 /* This is to extract the same name that appears on "diff --git"
561 * line. We do not find and return anything if it is a rename
562 * patch, and it is OK because we will find the name elsewhere.
563 * We need to reliably find name only when it is mode-change only,
564 * creation or deletion of an empty file. In any of these cases,
565 * both sides are the same name under a/ and b/ respectively.
567 static char *git_header_name(char *line, int llen)
571 const char *second = NULL;
573 line += strlen("diff --git ");
574 llen -= strlen("diff --git ");
578 char *first = unquote_c_style(line, &second);
582 /* advance to the first slash */
583 cp = stop_at_slash(first, strlen(first));
584 if (!cp || cp == first) {
585 /* we do not accept absolute paths */
591 memmove(first, cp+1, len+1); /* including NUL */
593 /* second points at one past closing dq of name.
594 * find the second name.
596 while ((second < line + llen) && isspace(*second))
599 if (line + llen <= second)
600 goto free_first_and_fail;
601 if (*second == '"') {
602 char *sp = unquote_c_style(second, NULL);
604 goto free_first_and_fail;
605 cp = stop_at_slash(sp, strlen(sp));
606 if (!cp || cp == sp) {
609 goto free_first_and_fail;
611 /* They must match, otherwise ignore */
612 if (strcmp(cp+1, first))
613 goto free_both_and_fail;
618 /* unquoted second */
619 cp = stop_at_slash(second, line + llen - second);
620 if (!cp || cp == second)
621 goto free_first_and_fail;
623 if (line + llen - cp != len + 1 ||
624 memcmp(first, cp, len))
625 goto free_first_and_fail;
629 /* unquoted first name */
630 name = stop_at_slash(line, llen);
631 if (!name || name == line)
636 /* since the first name is unquoted, a dq if exists must be
637 * the beginning of the second name.
639 for (second = name; second < line + llen; second++) {
640 if (*second == '"') {
641 const char *cp = second;
643 char *sp = unquote_c_style(second, NULL);
647 np = stop_at_slash(sp, strlen(sp));
648 if (!np || np == sp) {
649 free_second_and_fail:
655 if (len < cp - name &&
656 !strncmp(np, name, len) &&
657 isspace(name[len])) {
659 memmove(sp, np, len + 1);
662 goto free_second_and_fail;
667 * Accept a name only if it shows up twice, exactly the same
670 for (len = 0 ; ; len++) {
685 if (second[len] == '\n' && !memcmp(name, second, len)) {
686 return xmemdupz(name, len);
693 /* Verify that we recognize the lines following a git header */
694 static int parse_git_header(char *line, int len, unsigned int size, struct patch *patch)
696 unsigned long offset;
698 /* A git diff has explicit new/delete information, so we don't guess */
700 patch->is_delete = 0;
703 * Some things may not have the old name in the
704 * rest of the headers anywhere (pure mode changes,
705 * or removing or adding empty files), so we get
706 * the default name from the header.
708 patch->def_name = git_header_name(line, len);
713 for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {
714 static const struct opentry {
716 int (*fn)(const char *, struct patch *);
718 { "@@ -", gitdiff_hdrend },
719 { "--- ", gitdiff_oldname },
720 { "+++ ", gitdiff_newname },
721 { "old mode ", gitdiff_oldmode },
722 { "new mode ", gitdiff_newmode },
723 { "deleted file mode ", gitdiff_delete },
724 { "new file mode ", gitdiff_newfile },
725 { "copy from ", gitdiff_copysrc },
726 { "copy to ", gitdiff_copydst },
727 { "rename old ", gitdiff_renamesrc },
728 { "rename new ", gitdiff_renamedst },
729 { "rename from ", gitdiff_renamesrc },
730 { "rename to ", gitdiff_renamedst },
731 { "similarity index ", gitdiff_similarity },
732 { "dissimilarity index ", gitdiff_dissimilarity },
733 { "index ", gitdiff_index },
734 { "", gitdiff_unrecognized },
738 len = linelen(line, size);
739 if (!len || line[len-1] != '\n')
741 for (i = 0; i < ARRAY_SIZE(optable); i++) {
742 const struct opentry *p = optable + i;
743 int oplen = strlen(p->str);
744 if (len < oplen || memcmp(p->str, line, oplen))
746 if (p->fn(line + oplen, patch) < 0)
755 static int parse_num(const char *line, unsigned long *p)
761 *p = strtoul(line, &ptr, 10);
765 static int parse_range(const char *line, int len, int offset, const char *expect,
766 unsigned long *p1, unsigned long *p2)
770 if (offset < 0 || offset >= len)
775 digits = parse_num(line, p1);
785 digits = parse_num(line+1, p2);
797 if (memcmp(line, expect, ex))
804 * Parse a unified diff fragment header of the
805 * form "@@ -a,b +c,d @@"
807 static int parse_fragment_header(char *line, int len, struct fragment *fragment)
811 if (!len || line[len-1] != '\n')
814 /* Figure out the number of lines in a fragment */
815 offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);
816 offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);
821 static int find_header(char *line, unsigned long size, int *hdrsize, struct patch *patch)
823 unsigned long offset, len;
825 patch->is_toplevel_relative = 0;
826 patch->is_rename = patch->is_copy = 0;
827 patch->is_new = patch->is_delete = -1;
828 patch->old_mode = patch->new_mode = 0;
829 patch->old_name = patch->new_name = NULL;
830 for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {
831 unsigned long nextlen;
833 len = linelen(line, size);
837 /* Testing this early allows us to take a few shortcuts.. */
842 * Make sure we don't find any unconnected patch fragments.
843 * That's a sign that we didn't find a header, and that a
844 * patch has become corrupted/broken up.
846 if (!memcmp("@@ -", line, 4)) {
847 struct fragment dummy;
848 if (parse_fragment_header(line, len, &dummy) < 0)
850 die("patch fragment without header at line %d: %.*s",
851 linenr, (int)len-1, line);
858 * Git patch? It might not have a real patch, just a rename
859 * or mode change, so we handle that specially
861 if (!memcmp("diff --git ", line, 11)) {
862 int git_hdr_len = parse_git_header(line, len, size, patch);
863 if (git_hdr_len <= len)
865 if (!patch->old_name && !patch->new_name) {
866 if (!patch->def_name)
867 die("git diff header lacks filename information (line %d)", linenr);
868 patch->old_name = patch->new_name = patch->def_name;
870 patch->is_toplevel_relative = 1;
871 *hdrsize = git_hdr_len;
875 /** --- followed by +++ ? */
876 if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4))
880 * We only accept unified patches, so we want it to
881 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
884 nextlen = linelen(line + len, size - len);
885 if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))
888 /* Ok, we'll consider it a patch */
889 parse_traditional_patch(line, line+len, patch);
890 *hdrsize = len + nextlen;
897 static void check_whitespace(const char *line, int len)
899 const char *err = "Adds trailing whitespace";
904 * We know len is at least two, since we have a '+' and we
905 * checked that the last character was a '\n' before calling
906 * this function. That is, an addition of an empty line would
907 * check the '+' here. Sneaky...
909 if (isspace(line[len-2]))
913 * Make sure that there is no space followed by a tab in
916 err = "Space in indent is followed by a tab";
917 for (i = 1; i < len; i++) {
918 if (line[i] == '\t') {
922 else if (line[i] == ' ')
931 if (squelch_whitespace_errors &&
932 squelch_whitespace_errors < whitespace_error)
935 fprintf(stderr, "%s.\n%s:%d:%.*s\n",
936 err, patch_input_file, linenr, len-2, line+1);
941 * Parse a unified diff. Note that this really needs to parse each
942 * fragment separately, since the only way to know the difference
943 * between a "---" that is part of a patch, and a "---" that starts
944 * the next patch is to look at the line counts..
946 static int parse_fragment(char *line, unsigned long size, struct patch *patch, struct fragment *fragment)
949 int len = linelen(line, size), offset;
950 unsigned long oldlines, newlines;
951 unsigned long leading, trailing;
953 offset = parse_fragment_header(line, len, fragment);
956 oldlines = fragment->oldlines;
957 newlines = fragment->newlines;
961 /* Parse the thing.. */
968 offset += len, size -= len, line += len, linenr++) {
969 if (!oldlines && !newlines)
971 len = linelen(line, size);
972 if (!len || line[len-1] != '\n')
977 case '\n': /* newer GNU diff, an empty context line */
981 if (!deleted && !added)
986 if (apply_in_reverse &&
987 new_whitespace != nowarn_whitespace)
988 check_whitespace(line, len);
994 if (!apply_in_reverse &&
995 new_whitespace != nowarn_whitespace)
996 check_whitespace(line, len);
1002 /* We allow "\ No newline at end of file". Depending
1003 * on locale settings when the patch was produced we
1004 * don't know what this line looks like. The only
1005 * thing we do know is that it begins with "\ ".
1006 * Checking for 12 is just for sanity check -- any
1007 * l10n of "\ No newline..." is at least that long.
1010 if (len < 12 || memcmp(line, "\\ ", 2))
1015 if (oldlines || newlines)
1017 fragment->leading = leading;
1018 fragment->trailing = trailing;
1020 /* If a fragment ends with an incomplete line, we failed to include
1021 * it in the above loop because we hit oldlines == newlines == 0
1024 if (12 < size && !memcmp(line, "\\ ", 2))
1025 offset += linelen(line, size);
1027 patch->lines_added += added;
1028 patch->lines_deleted += deleted;
1030 if (0 < patch->is_new && oldlines)
1031 return error("new file depends on old contents");
1032 if (0 < patch->is_delete && newlines)
1033 return error("deleted file still has contents");
1037 static int parse_single_patch(char *line, unsigned long size, struct patch *patch)
1039 unsigned long offset = 0;
1040 unsigned long oldlines = 0, newlines = 0, context = 0;
1041 struct fragment **fragp = &patch->fragments;
1043 while (size > 4 && !memcmp(line, "@@ -", 4)) {
1044 struct fragment *fragment;
1047 fragment = xcalloc(1, sizeof(*fragment));
1048 len = parse_fragment(line, size, patch, fragment);
1050 die("corrupt patch at line %d", linenr);
1051 fragment->patch = line;
1052 fragment->size = len;
1053 oldlines += fragment->oldlines;
1054 newlines += fragment->newlines;
1055 context += fragment->leading + fragment->trailing;
1058 fragp = &fragment->next;
1066 * If something was removed (i.e. we have old-lines) it cannot
1067 * be creation, and if something was added it cannot be
1068 * deletion. However, the reverse is not true; --unified=0
1069 * patches that only add are not necessarily creation even
1070 * though they do not have any old lines, and ones that only
1071 * delete are not necessarily deletion.
1073 * Unfortunately, a real creation/deletion patch do _not_ have
1074 * any context line by definition, so we cannot safely tell it
1075 * apart with --unified=0 insanity. At least if the patch has
1076 * more than one hunk it is not creation or deletion.
1078 if (patch->is_new < 0 &&
1079 (oldlines || (patch->fragments && patch->fragments->next)))
1081 if (patch->is_delete < 0 &&
1082 (newlines || (patch->fragments && patch->fragments->next)))
1083 patch->is_delete = 0;
1084 if (!unidiff_zero || context) {
1085 /* If the user says the patch is not generated with
1086 * --unified=0, or if we have seen context lines,
1087 * then not having oldlines means the patch is creation,
1088 * and not having newlines means the patch is deletion.
1090 if (patch->is_new < 0 && !oldlines) {
1092 patch->old_name = NULL;
1094 if (patch->is_delete < 0 && !newlines) {
1095 patch->is_delete = 1;
1096 patch->new_name = NULL;
1100 if (0 < patch->is_new && oldlines)
1101 die("new file %s depends on old contents", patch->new_name);
1102 if (0 < patch->is_delete && newlines)
1103 die("deleted file %s still has contents", patch->old_name);
1104 if (!patch->is_delete && !newlines && context)
1105 fprintf(stderr, "** warning: file %s becomes empty but "
1106 "is not deleted\n", patch->new_name);
1111 static inline int metadata_changes(struct patch *patch)
1113 return patch->is_rename > 0 ||
1114 patch->is_copy > 0 ||
1115 patch->is_new > 0 ||
1117 (patch->old_mode && patch->new_mode &&
1118 patch->old_mode != patch->new_mode);
1121 static char *inflate_it(const void *data, unsigned long size,
1122 unsigned long inflated_size)
1128 memset(&stream, 0, sizeof(stream));
1130 stream.next_in = (unsigned char *)data;
1131 stream.avail_in = size;
1132 stream.next_out = out = xmalloc(inflated_size);
1133 stream.avail_out = inflated_size;
1134 inflateInit(&stream);
1135 st = inflate(&stream, Z_FINISH);
1136 if ((st != Z_STREAM_END) || stream.total_out != inflated_size) {
1143 static struct fragment *parse_binary_hunk(char **buf_p,
1144 unsigned long *sz_p,
1148 /* Expect a line that begins with binary patch method ("literal"
1149 * or "delta"), followed by the length of data before deflating.
1150 * a sequence of 'length-byte' followed by base-85 encoded data
1151 * should follow, terminated by a newline.
1153 * Each 5-byte sequence of base-85 encodes up to 4 bytes,
1154 * and we would limit the patch line to 66 characters,
1155 * so one line can fit up to 13 groups that would decode
1156 * to 52 bytes max. The length byte 'A'-'Z' corresponds
1157 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
1160 unsigned long size = *sz_p;
1161 char *buffer = *buf_p;
1163 unsigned long origlen;
1166 struct fragment *frag;
1168 llen = linelen(buffer, size);
1173 if (!prefixcmp(buffer, "delta ")) {
1174 patch_method = BINARY_DELTA_DEFLATED;
1175 origlen = strtoul(buffer + 6, NULL, 10);
1177 else if (!prefixcmp(buffer, "literal ")) {
1178 patch_method = BINARY_LITERAL_DEFLATED;
1179 origlen = strtoul(buffer + 8, NULL, 10);
1187 int byte_length, max_byte_length, newsize;
1188 llen = linelen(buffer, size);
1192 /* consume the blank line */
1197 /* Minimum line is "A00000\n" which is 7-byte long,
1198 * and the line length must be multiple of 5 plus 2.
1200 if ((llen < 7) || (llen-2) % 5)
1202 max_byte_length = (llen - 2) / 5 * 4;
1203 byte_length = *buffer;
1204 if ('A' <= byte_length && byte_length <= 'Z')
1205 byte_length = byte_length - 'A' + 1;
1206 else if ('a' <= byte_length && byte_length <= 'z')
1207 byte_length = byte_length - 'a' + 27;
1210 /* if the input length was not multiple of 4, we would
1211 * have filler at the end but the filler should never
1214 if (max_byte_length < byte_length ||
1215 byte_length <= max_byte_length - 4)
1217 newsize = hunk_size + byte_length;
1218 data = xrealloc(data, newsize);
1219 if (decode_85(data + hunk_size, buffer + 1, byte_length))
1221 hunk_size = newsize;
1226 frag = xcalloc(1, sizeof(*frag));
1227 frag->patch = inflate_it(data, hunk_size, origlen);
1231 frag->size = origlen;
1235 frag->binary_patch_method = patch_method;
1241 error("corrupt binary patch at line %d: %.*s",
1242 linenr-1, llen-1, buffer);
1246 static int parse_binary(char *buffer, unsigned long size, struct patch *patch)
1248 /* We have read "GIT binary patch\n"; what follows is a line
1249 * that says the patch method (currently, either "literal" or
1250 * "delta") and the length of data before deflating; a
1251 * sequence of 'length-byte' followed by base-85 encoded data
1254 * When a binary patch is reversible, there is another binary
1255 * hunk in the same format, starting with patch method (either
1256 * "literal" or "delta") with the length of data, and a sequence
1257 * of length-byte + base-85 encoded data, terminated with another
1258 * empty line. This data, when applied to the postimage, produces
1261 struct fragment *forward;
1262 struct fragment *reverse;
1266 forward = parse_binary_hunk(&buffer, &size, &status, &used);
1267 if (!forward && !status)
1268 /* there has to be one hunk (forward hunk) */
1269 return error("unrecognized binary patch at line %d", linenr-1);
1271 /* otherwise we already gave an error message */
1274 reverse = parse_binary_hunk(&buffer, &size, &status, &used_1);
1278 /* not having reverse hunk is not an error, but having
1279 * a corrupt reverse hunk is.
1281 free((void*) forward->patch);
1285 forward->next = reverse;
1286 patch->fragments = forward;
1287 patch->is_binary = 1;
1291 static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
1293 int hdrsize, patchsize;
1294 int offset = find_header(buffer, size, &hdrsize, patch);
1299 patchsize = parse_single_patch(buffer + offset + hdrsize, size - offset - hdrsize, patch);
1302 static const char *binhdr[] = {
1307 static const char git_binary[] = "GIT binary patch\n";
1309 int hd = hdrsize + offset;
1310 unsigned long llen = linelen(buffer + hd, size - hd);
1312 if (llen == sizeof(git_binary) - 1 &&
1313 !memcmp(git_binary, buffer + hd, llen)) {
1316 used = parse_binary(buffer + hd + llen,
1317 size - hd - llen, patch);
1319 patchsize = used + llen;
1323 else if (!memcmp(" differ\n", buffer + hd + llen - 8, 8)) {
1324 for (i = 0; binhdr[i]; i++) {
1325 int len = strlen(binhdr[i]);
1326 if (len < size - hd &&
1327 !memcmp(binhdr[i], buffer + hd, len)) {
1329 patch->is_binary = 1;
1336 /* Empty patch cannot be applied if it is a text patch
1337 * without metadata change. A binary patch appears
1340 if ((apply || check) &&
1341 (!patch->is_binary && !metadata_changes(patch)))
1342 die("patch with only garbage at line %d", linenr);
1345 return offset + hdrsize + patchsize;
1348 #define swap(a,b) myswap((a),(b),sizeof(a))
1350 #define myswap(a, b, size) do { \
1351 unsigned char mytmp[size]; \
1352 memcpy(mytmp, &a, size); \
1353 memcpy(&a, &b, size); \
1354 memcpy(&b, mytmp, size); \
1357 static void reverse_patches(struct patch *p)
1359 for (; p; p = p->next) {
1360 struct fragment *frag = p->fragments;
1362 swap(p->new_name, p->old_name);
1363 swap(p->new_mode, p->old_mode);
1364 swap(p->is_new, p->is_delete);
1365 swap(p->lines_added, p->lines_deleted);
1366 swap(p->old_sha1_prefix, p->new_sha1_prefix);
1368 for (; frag; frag = frag->next) {
1369 swap(frag->newpos, frag->oldpos);
1370 swap(frag->newlines, frag->oldlines);
1375 static const char pluses[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
1376 static const char minuses[]= "----------------------------------------------------------------------";
1378 static void show_stats(struct patch *patch)
1380 const char *prefix = "";
1381 char *name = patch->new_name;
1383 int len, max, add, del, total;
1386 name = patch->old_name;
1388 if (0 < (len = quote_c_style(name, NULL, NULL, 0))) {
1389 qname = xmalloc(len + 1);
1390 quote_c_style(name, qname, NULL, 0);
1395 * "scale" the filename
1406 slash = strchr(name, '/');
1413 * scale the add/delete
1419 add = patch->lines_added;
1420 del = patch->lines_deleted;
1423 if (max_change > 0) {
1424 total = (total * max + max_change / 2) / max_change;
1425 add = (add * max + max_change / 2) / max_change;
1428 if (patch->is_binary)
1429 printf(" %s%-*s | Bin\n", prefix, len, name);
1431 printf(" %s%-*s |%5d %.*s%.*s\n", prefix,
1432 len, name, patch->lines_added + patch->lines_deleted,
1433 add, pluses, del, minuses);
1437 static int read_old_data(struct stat *st, const char *path, struct strbuf *buf)
1441 switch (st->st_mode & S_IFMT) {
1443 strbuf_grow(buf, st->st_size);
1444 if (readlink(path, buf->buf, st->st_size) != st->st_size)
1446 strbuf_setlen(buf, st->st_size);
1449 fd = open(path, O_RDONLY);
1451 return error("unable to open %s", path);
1452 if (strbuf_read(buf, fd, st->st_size) < 0) {
1457 convert_to_git(path, buf->buf, buf->len, buf);
1464 static int find_offset(const char *buf, unsigned long size, const char *fragment, unsigned long fragsize, int line, int *lines)
1467 unsigned long start, backwards, forwards;
1469 if (fragsize > size)
1474 unsigned long offset = 0;
1476 while (offset + fragsize <= size) {
1477 if (buf[offset++] == '\n') {
1485 /* Exact line number? */
1486 if ((start + fragsize <= size) &&
1487 !memcmp(buf + start, fragment, fragsize))
1491 * There's probably some smart way to do this, but I'll leave
1492 * that to the smart and beautiful people. I'm simple and stupid.
1496 for (i = 0; ; i++) {
1503 if (forwards + fragsize > size)
1509 } while (backwards && buf[backwards-1] != '\n');
1512 while (forwards + fragsize <= size) {
1513 if (buf[forwards++] == '\n')
1519 if (try + fragsize > size)
1521 if (memcmp(buf + try, fragment, fragsize))
1531 * We should start searching forward and backward.
1536 static void remove_first_line(const char **rbuf, int *rsize)
1538 const char *buf = *rbuf;
1540 unsigned long offset;
1542 while (offset <= size) {
1543 if (buf[offset++] == '\n')
1546 *rsize = size - offset;
1547 *rbuf = buf + offset;
1550 static void remove_last_line(const char **rbuf, int *rsize)
1552 const char *buf = *rbuf;
1554 unsigned long offset;
1556 while (offset > 0) {
1557 if (buf[--offset] == '\n')
1560 *rsize = offset + 1;
1563 static int apply_line(char *output, const char *patch, int plen)
1565 /* plen is number of bytes to be copied from patch,
1566 * starting at patch+1 (patch[0] is '+'). Typically
1567 * patch[plen] is '\n', unless this is the incomplete
1571 int add_nl_to_tail = 0;
1573 int last_tab_in_indent = -1;
1574 int last_space_in_indent = -1;
1575 int need_fix_leading_space = 0;
1578 if ((new_whitespace != strip_whitespace) || !whitespace_error ||
1580 memcpy(output, patch + 1, plen);
1584 if (1 < plen && isspace(patch[plen-1])) {
1585 if (patch[plen] == '\n')
1588 while (0 < plen && isspace(patch[plen]))
1593 for (i = 1; i < plen; i++) {
1596 last_tab_in_indent = i;
1597 if (0 <= last_space_in_indent)
1598 need_fix_leading_space = 1;
1601 last_space_in_indent = i;
1607 if (need_fix_leading_space) {
1608 int consecutive_spaces = 0;
1609 /* between patch[1..last_tab_in_indent] strip the
1610 * funny spaces, updating them to tab as needed.
1612 for (i = 1; i < last_tab_in_indent; i++, plen--) {
1615 consecutive_spaces = 0;
1618 consecutive_spaces++;
1619 if (consecutive_spaces == 8) {
1621 consecutive_spaces = 0;
1626 i = last_tab_in_indent;
1631 memcpy(output, patch + i, plen);
1633 output[plen++] = '\n';
1635 applied_after_fixing_ws++;
1636 return output + plen - buf;
1639 static int apply_one_fragment(struct strbuf *buf, struct fragment *frag, int inaccurate_eof)
1641 int match_beginning, match_end;
1642 const char *patch = frag->patch;
1643 int offset, size = frag->size;
1644 char *old = xmalloc(size);
1645 char *new = xmalloc(size);
1646 const char *oldlines, *newlines;
1647 int oldsize = 0, newsize = 0;
1648 int new_blank_lines_at_end = 0;
1649 unsigned long leading, trailing;
1654 int len = linelen(patch, size);
1656 int added_blank_line = 0;
1662 * "plen" is how much of the line we should use for
1663 * the actual patch data. Normally we just remove the
1664 * first character on the line, but if the line is
1665 * followed by "\ No newline", then we also remove the
1666 * last one (which is the newline, of course).
1669 if (len < size && patch[len] == '\\')
1672 if (apply_in_reverse) {
1675 else if (first == '+')
1681 /* Newer GNU diff, empty context line */
1683 /* ... followed by '\No newline'; nothing */
1685 old[oldsize++] = '\n';
1686 new[newsize++] = '\n';
1690 memcpy(old + oldsize, patch + 1, plen);
1694 /* Fall-through for ' ' */
1696 if (first != '+' || !no_add) {
1697 int added = apply_line(new + newsize, patch,
1701 added == 1 && new[newsize-1] == '\n')
1702 added_blank_line = 1;
1705 case '@': case '\\':
1706 /* Ignore it, we already handled it */
1709 if (apply_verbosely)
1710 error("invalid start of line: '%c'", first);
1713 if (added_blank_line)
1714 new_blank_lines_at_end++;
1716 new_blank_lines_at_end = 0;
1721 if (inaccurate_eof && oldsize > 0 && old[oldsize - 1] == '\n' &&
1722 newsize > 0 && new[newsize - 1] == '\n') {
1729 leading = frag->leading;
1730 trailing = frag->trailing;
1733 * If we don't have any leading/trailing data in the patch,
1734 * we want it to match at the beginning/end of the file.
1736 * But that would break if the patch is generated with
1737 * --unified=0; sane people wouldn't do that to cause us
1738 * trouble, but we try to please not so sane ones as well.
1741 match_beginning = (!leading && !frag->oldpos);
1745 match_beginning = !leading && (frag->oldpos == 1);
1746 match_end = !trailing;
1752 offset = find_offset(buf->buf, buf->len,
1753 oldlines, oldsize, pos, &lines);
1754 if (match_end && offset + oldsize != buf->len)
1756 if (match_beginning && offset)
1759 if (new_whitespace == strip_whitespace &&
1760 (buf->len - oldsize - offset == 0)) /* end of file? */
1761 newsize -= new_blank_lines_at_end;
1763 /* Warn if it was necessary to reduce the number
1766 if ((leading != frag->leading) ||
1767 (trailing != frag->trailing))
1768 fprintf(stderr, "Context reduced to (%ld/%ld)"
1769 " to apply fragment at %d\n",
1770 leading, trailing, pos + lines);
1772 strbuf_splice(buf, offset, oldsize, newlines, newsize);
1777 /* Am I at my context limits? */
1778 if ((leading <= p_context) && (trailing <= p_context))
1780 if (match_beginning || match_end) {
1781 match_beginning = match_end = 0;
1784 /* Reduce the number of context lines
1785 * Reduce both leading and trailing if they are equal
1786 * otherwise just reduce the larger context.
1788 if (leading >= trailing) {
1789 remove_first_line(&oldlines, &oldsize);
1790 remove_first_line(&newlines, &newsize);
1794 if (trailing > leading) {
1795 remove_last_line(&oldlines, &oldsize);
1796 remove_last_line(&newlines, &newsize);
1801 if (offset && apply_verbosely)
1802 error("while searching for:\n%.*s", oldsize, oldlines);
1809 static int apply_binary_fragment(struct strbuf *buf, struct patch *patch)
1811 struct fragment *fragment = patch->fragments;
1815 /* Binary patch is irreversible without the optional second hunk */
1816 if (apply_in_reverse) {
1817 if (!fragment->next)
1818 return error("cannot reverse-apply a binary patch "
1819 "without the reverse hunk to '%s'",
1821 ? patch->new_name : patch->old_name);
1822 fragment = fragment->next;
1824 switch (fragment->binary_patch_method) {
1825 case BINARY_DELTA_DEFLATED:
1826 dst = patch_delta(buf->buf, buf->len, fragment->patch,
1827 fragment->size, &len);
1830 /* XXX patch_delta NUL-terminates */
1831 strbuf_attach(buf, dst, len, len + 1);
1833 case BINARY_LITERAL_DEFLATED:
1835 strbuf_add(buf, fragment->patch, fragment->size);
1841 static int apply_binary(struct strbuf *buf, struct patch *patch)
1843 const char *name = patch->old_name ? patch->old_name : patch->new_name;
1844 unsigned char sha1[20];
1846 /* For safety, we require patch index line to contain
1847 * full 40-byte textual SHA1 for old and new, at least for now.
1849 if (strlen(patch->old_sha1_prefix) != 40 ||
1850 strlen(patch->new_sha1_prefix) != 40 ||
1851 get_sha1_hex(patch->old_sha1_prefix, sha1) ||
1852 get_sha1_hex(patch->new_sha1_prefix, sha1))
1853 return error("cannot apply binary patch to '%s' "
1854 "without full index line", name);
1856 if (patch->old_name) {
1857 /* See if the old one matches what the patch
1860 hash_sha1_file(buf->buf, buf->len, blob_type, sha1);
1861 if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))
1862 return error("the patch applies to '%s' (%s), "
1863 "which does not match the "
1864 "current contents.",
1865 name, sha1_to_hex(sha1));
1868 /* Otherwise, the old one must be empty. */
1870 return error("the patch applies to an empty "
1871 "'%s' but it is not empty", name);
1874 get_sha1_hex(patch->new_sha1_prefix, sha1);
1875 if (is_null_sha1(sha1)) {
1876 strbuf_release(buf);
1877 return 0; /* deletion patch */
1880 if (has_sha1_file(sha1)) {
1881 /* We already have the postimage */
1882 enum object_type type;
1886 result = read_sha1_file(sha1, &type, &size);
1888 return error("the necessary postimage %s for "
1889 "'%s' cannot be read",
1890 patch->new_sha1_prefix, name);
1891 /* XXX read_sha1_file NUL-terminates */
1892 strbuf_attach(buf, result, size, size + 1);
1894 /* We have verified buf matches the preimage;
1895 * apply the patch data to it, which is stored
1896 * in the patch->fragments->{patch,size}.
1898 if (apply_binary_fragment(buf, patch))
1899 return error("binary patch does not apply to '%s'",
1902 /* verify that the result matches */
1903 hash_sha1_file(buf->buf, buf->len, blob_type, sha1);
1904 if (strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))
1905 return error("binary patch to '%s' creates incorrect result (expecting %s, got %s)",
1906 name, patch->new_sha1_prefix, sha1_to_hex(sha1));
1912 static int apply_fragments(struct strbuf *buf, struct patch *patch)
1914 struct fragment *frag = patch->fragments;
1915 const char *name = patch->old_name ? patch->old_name : patch->new_name;
1917 if (patch->is_binary)
1918 return apply_binary(buf, patch);
1921 if (apply_one_fragment(buf, frag, patch->inaccurate_eof)) {
1922 error("patch failed: %s:%ld", name, frag->oldpos);
1923 if (!apply_with_reject)
1932 static int read_file_or_gitlink(struct cache_entry *ce, struct strbuf *buf)
1937 if (S_ISGITLINK(ntohl(ce->ce_mode))) {
1938 strbuf_grow(buf, 100);
1939 strbuf_addf(buf, "Subproject commit %s\n", sha1_to_hex(ce->sha1));
1941 enum object_type type;
1945 result = read_sha1_file(ce->sha1, &type, &sz);
1948 /* XXX read_sha1_file NUL-terminates */
1949 strbuf_attach(buf, result, sz, sz + 1);
1954 static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *ce)
1958 strbuf_init(&buf, 0);
1960 if (read_file_or_gitlink(ce, &buf))
1961 return error("read of %s failed", patch->old_name);
1962 } else if (patch->old_name) {
1963 if (S_ISGITLINK(patch->old_mode)) {
1965 read_file_or_gitlink(ce, &buf);
1968 * There is no way to apply subproject
1969 * patch without looking at the index.
1971 patch->fragments = NULL;
1974 if (read_old_data(st, patch->old_name, &buf))
1975 return error("read of %s failed", patch->old_name);
1979 if (apply_fragments(&buf, patch) < 0)
1980 return -1; /* note with --reject this succeeds. */
1981 patch->result = buf.buf;
1982 patch->resultsize = buf.len;
1984 if (0 < patch->is_delete && patch->resultsize)
1985 return error("removal patch leaves file contents");
1990 static int check_to_create_blob(const char *new_name, int ok_if_exists)
1993 if (!lstat(new_name, &nst)) {
1994 if (S_ISDIR(nst.st_mode) || ok_if_exists)
1997 * A leading component of new_name might be a symlink
1998 * that is going to be removed with this patch, but
1999 * still pointing at somewhere that has the path.
2000 * In such a case, path "new_name" does not exist as
2001 * far as git is concerned.
2003 if (has_symlink_leading_path(new_name, NULL))
2006 return error("%s: already exists in working directory", new_name);
2008 else if ((errno != ENOENT) && (errno != ENOTDIR))
2009 return error("%s: %s", new_name, strerror(errno));
2013 static int verify_index_match(struct cache_entry *ce, struct stat *st)
2015 if (S_ISGITLINK(ntohl(ce->ce_mode))) {
2016 if (!S_ISDIR(st->st_mode))
2020 return ce_match_stat(ce, st, 1);
2023 static int check_patch(struct patch *patch, struct patch *prev_patch)
2026 const char *old_name = patch->old_name;
2027 const char *new_name = patch->new_name;
2028 const char *name = old_name ? old_name : new_name;
2029 struct cache_entry *ce = NULL;
2032 patch->rejected = 1; /* we will drop this after we succeed */
2035 * Make sure that we do not have local modifications from the
2036 * index when we are looking at the index. Also make sure
2037 * we have the preimage file to be patched in the work tree,
2038 * unless --cached, which tells git to apply only in the index.
2042 unsigned st_mode = 0;
2045 stat_ret = lstat(old_name, &st);
2047 int pos = cache_name_pos(old_name, strlen(old_name));
2049 return error("%s: does not exist in index",
2051 ce = active_cache[pos];
2053 struct checkout costate;
2054 if (errno != ENOENT)
2055 return error("%s: %s", old_name,
2058 costate.base_dir = "";
2059 costate.base_dir_len = 0;
2062 costate.not_new = 0;
2063 costate.refresh_cache = 1;
2064 if (checkout_entry(ce,
2067 lstat(old_name, &st))
2070 if (!cached && verify_index_match(ce, &st))
2071 return error("%s: does not match index",
2074 st_mode = ntohl(ce->ce_mode);
2075 } else if (stat_ret < 0)
2076 return error("%s: %s", old_name, strerror(errno));
2079 st_mode = ntohl(ce_mode_from_stat(ce, st.st_mode));
2081 if (patch->is_new < 0)
2083 if (!patch->old_mode)
2084 patch->old_mode = st_mode;
2085 if ((st_mode ^ patch->old_mode) & S_IFMT)
2086 return error("%s: wrong type", old_name);
2087 if (st_mode != patch->old_mode)
2088 fprintf(stderr, "warning: %s has type %o, expected %o\n",
2089 old_name, st_mode, patch->old_mode);
2092 if (new_name && prev_patch && 0 < prev_patch->is_delete &&
2093 !strcmp(prev_patch->old_name, new_name))
2094 /* A type-change diff is always split into a patch to
2095 * delete old, immediately followed by a patch to
2096 * create new (see diff.c::run_diff()); in such a case
2097 * it is Ok that the entry to be deleted by the
2098 * previous patch is still in the working tree and in
2106 ((0 < patch->is_new) | (0 < patch->is_rename) | patch->is_copy)) {
2108 cache_name_pos(new_name, strlen(new_name)) >= 0 &&
2110 return error("%s: already exists in index", new_name);
2112 int err = check_to_create_blob(new_name, ok_if_exists);
2116 if (!patch->new_mode) {
2117 if (0 < patch->is_new)
2118 patch->new_mode = S_IFREG | 0644;
2120 patch->new_mode = patch->old_mode;
2124 if (new_name && old_name) {
2125 int same = !strcmp(old_name, new_name);
2126 if (!patch->new_mode)
2127 patch->new_mode = patch->old_mode;
2128 if ((patch->old_mode ^ patch->new_mode) & S_IFMT)
2129 return error("new mode (%o) of %s does not match old mode (%o)%s%s",
2130 patch->new_mode, new_name, patch->old_mode,
2131 same ? "" : " of ", same ? "" : old_name);
2134 if (apply_data(patch, &st, ce) < 0)
2135 return error("%s: patch does not apply", name);
2136 patch->rejected = 0;
2140 static int check_patch_list(struct patch *patch)
2142 struct patch *prev_patch = NULL;
2145 for (prev_patch = NULL; patch ; patch = patch->next) {
2146 if (apply_verbosely)
2147 say_patch_name(stderr,
2148 "Checking patch ", patch, "...\n");
2149 err |= check_patch(patch, prev_patch);
2155 /* This function tries to read the sha1 from the current index */
2156 static int get_current_sha1(const char *path, unsigned char *sha1)
2160 if (read_cache() < 0)
2162 pos = cache_name_pos(path, strlen(path));
2165 hashcpy(sha1, active_cache[pos]->sha1);
2169 static void show_index_list(struct patch *list)
2171 struct patch *patch;
2173 /* Once we start supporting the reverse patch, it may be
2174 * worth showing the new sha1 prefix, but until then...
2176 for (patch = list; patch; patch = patch->next) {
2177 const unsigned char *sha1_ptr;
2178 unsigned char sha1[20];
2181 name = patch->old_name ? patch->old_name : patch->new_name;
2182 if (0 < patch->is_new)
2183 sha1_ptr = null_sha1;
2184 else if (get_sha1(patch->old_sha1_prefix, sha1))
2185 /* git diff has no index line for mode/type changes */
2186 if (!patch->lines_added && !patch->lines_deleted) {
2187 if (get_current_sha1(patch->new_name, sha1) ||
2188 get_current_sha1(patch->old_name, sha1))
2189 die("mode change for %s, which is not "
2190 "in current HEAD", name);
2193 die("sha1 information is lacking or useless "
2198 printf("%06o %s ",patch->old_mode, sha1_to_hex(sha1_ptr));
2199 if (line_termination && quote_c_style(name, NULL, NULL, 0))
2200 quote_c_style(name, NULL, stdout, 0);
2202 fputs(name, stdout);
2203 putchar(line_termination);
2207 static void stat_patch_list(struct patch *patch)
2209 int files, adds, dels;
2211 for (files = adds = dels = 0 ; patch ; patch = patch->next) {
2213 adds += patch->lines_added;
2214 dels += patch->lines_deleted;
2218 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files, adds, dels);
2221 static void numstat_patch_list(struct patch *patch)
2223 for ( ; patch; patch = patch->next) {
2225 name = patch->new_name ? patch->new_name : patch->old_name;
2226 if (patch->is_binary)
2230 patch->lines_added, patch->lines_deleted);
2231 if (line_termination && quote_c_style(name, NULL, NULL, 0))
2232 quote_c_style(name, NULL, stdout, 0);
2234 fputs(name, stdout);
2235 putchar(line_termination);
2239 static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)
2242 printf(" %s mode %06o %s\n", newdelete, mode, name);
2244 printf(" %s %s\n", newdelete, name);
2247 static void show_mode_change(struct patch *p, int show_name)
2249 if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {
2251 printf(" mode change %06o => %06o %s\n",
2252 p->old_mode, p->new_mode, p->new_name);
2254 printf(" mode change %06o => %06o\n",
2255 p->old_mode, p->new_mode);
2259 static void show_rename_copy(struct patch *p)
2261 const char *renamecopy = p->is_rename ? "rename" : "copy";
2262 const char *old, *new;
2264 /* Find common prefix */
2268 const char *slash_old, *slash_new;
2269 slash_old = strchr(old, '/');
2270 slash_new = strchr(new, '/');
2273 slash_old - old != slash_new - new ||
2274 memcmp(old, new, slash_new - new))
2276 old = slash_old + 1;
2277 new = slash_new + 1;
2279 /* p->old_name thru old is the common prefix, and old and new
2280 * through the end of names are renames
2282 if (old != p->old_name)
2283 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
2284 (int)(old - p->old_name), p->old_name,
2285 old, new, p->score);
2287 printf(" %s %s => %s (%d%%)\n", renamecopy,
2288 p->old_name, p->new_name, p->score);
2289 show_mode_change(p, 0);
2292 static void summary_patch_list(struct patch *patch)
2296 for (p = patch; p; p = p->next) {
2298 show_file_mode_name("create", p->new_mode, p->new_name);
2299 else if (p->is_delete)
2300 show_file_mode_name("delete", p->old_mode, p->old_name);
2302 if (p->is_rename || p->is_copy)
2303 show_rename_copy(p);
2306 printf(" rewrite %s (%d%%)\n",
2307 p->new_name, p->score);
2308 show_mode_change(p, 0);
2311 show_mode_change(p, 1);
2317 static void patch_stats(struct patch *patch)
2319 int lines = patch->lines_added + patch->lines_deleted;
2321 if (lines > max_change)
2323 if (patch->old_name) {
2324 int len = quote_c_style(patch->old_name, NULL, NULL, 0);
2326 len = strlen(patch->old_name);
2330 if (patch->new_name) {
2331 int len = quote_c_style(patch->new_name, NULL, NULL, 0);
2333 len = strlen(patch->new_name);
2339 static void remove_file(struct patch *patch, int rmdir_empty)
2342 if (remove_file_from_cache(patch->old_name) < 0)
2343 die("unable to remove %s from index", patch->old_name);
2346 if (S_ISGITLINK(patch->old_mode)) {
2347 if (rmdir(patch->old_name))
2348 warning("unable to remove submodule %s",
2350 } else if (!unlink(patch->old_name) && rmdir_empty) {
2351 char *name = xstrdup(patch->old_name);
2352 char *end = strrchr(name, '/');
2357 end = strrchr(name, '/');
2364 static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size)
2367 struct cache_entry *ce;
2368 int namelen = strlen(path);
2369 unsigned ce_size = cache_entry_size(namelen);
2374 ce = xcalloc(1, ce_size);
2375 memcpy(ce->name, path, namelen);
2376 ce->ce_mode = create_ce_mode(mode);
2377 ce->ce_flags = htons(namelen);
2378 if (S_ISGITLINK(mode)) {
2379 const char *s = buf;
2381 if (get_sha1_hex(s + strlen("Subproject commit "), ce->sha1))
2382 die("corrupt patch for subproject %s", path);
2385 if (lstat(path, &st) < 0)
2386 die("unable to stat newly created file %s",
2388 fill_stat_cache_info(ce, &st);
2390 if (write_sha1_file(buf, size, blob_type, ce->sha1) < 0)
2391 die("unable to create backing store for newly created file %s", path);
2393 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)
2394 die("unable to add cache entry for %s", path);
2397 static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)
2402 if (S_ISGITLINK(mode)) {
2404 if (!lstat(path, &st) && S_ISDIR(st.st_mode))
2406 return mkdir(path, 0777);
2409 if (has_symlinks && S_ISLNK(mode))
2410 /* Although buf:size is counted string, it also is NUL
2413 return symlink(buf, path);
2415 fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);
2419 strbuf_init(&nbuf, 0);
2420 if (convert_to_working_tree(path, buf, size, &nbuf)) {
2424 write_or_die(fd, buf, size);
2425 strbuf_release(&nbuf);
2428 die("closing file %s: %s", path, strerror(errno));
2433 * We optimistically assume that the directories exist,
2434 * which is true 99% of the time anyway. If they don't,
2435 * we create them and try again.
2437 static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size)
2441 if (!try_create_file(path, mode, buf, size))
2444 if (errno == ENOENT) {
2445 if (safe_create_leading_directories(path))
2447 if (!try_create_file(path, mode, buf, size))
2451 if (errno == EEXIST || errno == EACCES) {
2452 /* We may be trying to create a file where a directory
2456 if (!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))
2460 if (errno == EEXIST) {
2461 unsigned int nr = getpid();
2464 const char *newpath;
2465 newpath = mkpath("%s~%u", path, nr);
2466 if (!try_create_file(newpath, mode, buf, size)) {
2467 if (!rename(newpath, path))
2472 if (errno != EEXIST)
2477 die("unable to write file %s mode %o", path, mode);
2480 static void create_file(struct patch *patch)
2482 char *path = patch->new_name;
2483 unsigned mode = patch->new_mode;
2484 unsigned long size = patch->resultsize;
2485 char *buf = patch->result;
2488 mode = S_IFREG | 0644;
2489 create_one_file(path, mode, buf, size);
2490 add_index_file(path, mode, buf, size);
2493 /* phase zero is to remove, phase one is to create */
2494 static void write_out_one_result(struct patch *patch, int phase)
2496 if (patch->is_delete > 0) {
2498 remove_file(patch, 1);
2501 if (patch->is_new > 0 || patch->is_copy) {
2507 * Rename or modification boils down to the same
2508 * thing: remove the old, write the new
2511 remove_file(patch, patch->is_rename);
2516 static int write_out_one_reject(struct patch *patch)
2519 char namebuf[PATH_MAX];
2520 struct fragment *frag;
2523 for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) {
2524 if (!frag->rejected)
2530 if (apply_verbosely)
2531 say_patch_name(stderr,
2532 "Applied patch ", patch, " cleanly.\n");
2536 /* This should not happen, because a removal patch that leaves
2537 * contents are marked "rejected" at the patch level.
2539 if (!patch->new_name)
2540 die("internal error");
2542 /* Say this even without --verbose */
2543 say_patch_name(stderr, "Applying patch ", patch, " with");
2544 fprintf(stderr, " %d rejects...\n", cnt);
2546 cnt = strlen(patch->new_name);
2547 if (ARRAY_SIZE(namebuf) <= cnt + 5) {
2548 cnt = ARRAY_SIZE(namebuf) - 5;
2550 "warning: truncating .rej filename to %.*s.rej",
2551 cnt - 1, patch->new_name);
2553 memcpy(namebuf, patch->new_name, cnt);
2554 memcpy(namebuf + cnt, ".rej", 5);
2556 rej = fopen(namebuf, "w");
2558 return error("cannot open %s: %s", namebuf, strerror(errno));
2560 /* Normal git tools never deal with .rej, so do not pretend
2561 * this is a git patch by saying --git nor give extended
2562 * headers. While at it, maybe please "kompare" that wants
2563 * the trailing TAB and some garbage at the end of line ;-).
2565 fprintf(rej, "diff a/%s b/%s\t(rejected hunks)\n",
2566 patch->new_name, patch->new_name);
2567 for (cnt = 1, frag = patch->fragments;
2569 cnt++, frag = frag->next) {
2570 if (!frag->rejected) {
2571 fprintf(stderr, "Hunk #%d applied cleanly.\n", cnt);
2574 fprintf(stderr, "Rejected hunk #%d.\n", cnt);
2575 fprintf(rej, "%.*s", frag->size, frag->patch);
2576 if (frag->patch[frag->size-1] != '\n')
2583 static int write_out_results(struct patch *list, int skipped_patch)
2589 if (!list && !skipped_patch)
2590 return error("No changes");
2592 for (phase = 0; phase < 2; phase++) {
2598 write_out_one_result(l, phase);
2599 if (phase == 1 && write_out_one_reject(l))
2608 static struct lock_file lock_file;
2610 static struct excludes {
2611 struct excludes *next;
2615 static int use_patch(struct patch *p)
2617 const char *pathname = p->new_name ? p->new_name : p->old_name;
2618 struct excludes *x = excludes;
2620 if (fnmatch(x->path, pathname, 0) == 0)
2624 if (0 < prefix_length) {
2625 int pathlen = strlen(pathname);
2626 if (pathlen <= prefix_length ||
2627 memcmp(prefix, pathname, prefix_length))
2633 static void prefix_one(char **name)
2635 char *old_name = *name;
2638 *name = xstrdup(prefix_filename(prefix, prefix_length, *name));
2642 static void prefix_patches(struct patch *p)
2644 if (!prefix || p->is_toplevel_relative)
2646 for ( ; p; p = p->next) {
2647 if (p->new_name == p->old_name) {
2648 char *prefixed = p->new_name;
2649 prefix_one(&prefixed);
2650 p->new_name = p->old_name = prefixed;
2653 prefix_one(&p->new_name);
2654 prefix_one(&p->old_name);
2659 static int apply_patch(int fd, const char *filename, int inaccurate_eof)
2661 unsigned long offset, size;
2662 char *buffer = read_patch_file(fd, &size);
2663 struct patch *list = NULL, **listp = &list;
2664 int skipped_patch = 0;
2666 patch_input_file = filename;
2671 struct patch *patch;
2674 patch = xcalloc(1, sizeof(*patch));
2675 patch->inaccurate_eof = inaccurate_eof;
2676 nr = parse_chunk(buffer + offset, size, patch);
2679 if (apply_in_reverse)
2680 reverse_patches(patch);
2682 prefix_patches(patch);
2683 if (use_patch(patch)) {
2686 listp = &patch->next;
2689 /* perhaps free it a bit better? */
2697 if (whitespace_error && (new_whitespace == error_on_whitespace))
2700 update_index = check_index && apply;
2701 if (update_index && newfd < 0)
2702 newfd = hold_locked_index(&lock_file, 1);
2705 if (read_cache() < 0)
2706 die("unable to read index file");
2709 if ((check || apply) &&
2710 check_patch_list(list) < 0 &&
2714 if (apply && write_out_results(list, skipped_patch))
2717 if (show_index_info)
2718 show_index_list(list);
2721 stat_patch_list(list);
2724 numstat_patch_list(list);
2727 summary_patch_list(list);
2733 static int git_apply_config(const char *var, const char *value)
2735 if (!strcmp(var, "apply.whitespace")) {
2736 apply_default_whitespace = xstrdup(value);
2739 return git_default_config(var, value);
2743 int cmd_apply(int argc, const char **argv, const char *unused_prefix)
2747 int inaccurate_eof = 0;
2749 int is_not_gitdir = 0;
2751 const char *whitespace_option = NULL;
2753 prefix = setup_git_directory_gently(&is_not_gitdir);
2754 prefix_length = prefix ? strlen(prefix) : 0;
2755 git_config(git_apply_config);
2756 if (apply_default_whitespace)
2757 parse_whitespace_option(apply_default_whitespace);
2759 for (i = 1; i < argc; i++) {
2760 const char *arg = argv[i];
2764 if (!strcmp(arg, "-")) {
2765 errs |= apply_patch(0, "<stdin>", inaccurate_eof);
2769 if (!prefixcmp(arg, "--exclude=")) {
2770 struct excludes *x = xmalloc(sizeof(*x));
2776 if (!prefixcmp(arg, "-p")) {
2777 p_value = atoi(arg + 2);
2781 if (!strcmp(arg, "--no-add")) {
2785 if (!strcmp(arg, "--stat")) {
2790 if (!strcmp(arg, "--allow-binary-replacement") ||
2791 !strcmp(arg, "--binary")) {
2792 continue; /* now no-op */
2794 if (!strcmp(arg, "--numstat")) {
2799 if (!strcmp(arg, "--summary")) {
2804 if (!strcmp(arg, "--check")) {
2809 if (!strcmp(arg, "--index")) {
2811 die("--index outside a repository");
2815 if (!strcmp(arg, "--cached")) {
2817 die("--cached outside a repository");
2822 if (!strcmp(arg, "--apply")) {
2826 if (!strcmp(arg, "--index-info")) {
2828 show_index_info = 1;
2831 if (!strcmp(arg, "-z")) {
2832 line_termination = 0;
2835 if (!prefixcmp(arg, "-C")) {
2836 p_context = strtoul(arg + 2, &end, 0);
2838 die("unrecognized context count '%s'", arg + 2);
2841 if (!prefixcmp(arg, "--whitespace=")) {
2842 whitespace_option = arg + 13;
2843 parse_whitespace_option(arg + 13);
2846 if (!strcmp(arg, "-R") || !strcmp(arg, "--reverse")) {
2847 apply_in_reverse = 1;
2850 if (!strcmp(arg, "--unidiff-zero")) {
2854 if (!strcmp(arg, "--reject")) {
2855 apply = apply_with_reject = apply_verbosely = 1;
2858 if (!strcmp(arg, "-v") || !strcmp(arg, "--verbose")) {
2859 apply_verbosely = 1;
2862 if (!strcmp(arg, "--inaccurate-eof")) {
2866 if (0 < prefix_length)
2867 arg = prefix_filename(prefix, prefix_length, arg);
2869 fd = open(arg, O_RDONLY);
2873 set_default_whitespace_mode(whitespace_option);
2874 errs |= apply_patch(fd, arg, inaccurate_eof);
2877 set_default_whitespace_mode(whitespace_option);
2879 errs |= apply_patch(0, "<stdin>", inaccurate_eof);
2880 if (whitespace_error) {
2881 if (squelch_whitespace_errors &&
2882 squelch_whitespace_errors < whitespace_error) {
2884 whitespace_error - squelch_whitespace_errors;
2885 fprintf(stderr, "warning: squelched %d "
2886 "whitespace error%s\n",
2888 squelched == 1 ? "" : "s");
2890 if (new_whitespace == error_on_whitespace)
2891 die("%d line%s add%s whitespace errors.",
2893 whitespace_error == 1 ? "" : "s",
2894 whitespace_error == 1 ? "s" : "");
2895 if (applied_after_fixing_ws)
2896 fprintf(stderr, "warning: %d line%s applied after"
2897 " fixing whitespace errors.\n",
2898 applied_after_fixing_ws,
2899 applied_after_fixing_ws == 1 ? "" : "s");
2900 else if (whitespace_error)
2901 fprintf(stderr, "warning: %d line%s add%s whitespace errors.\n",
2903 whitespace_error == 1 ? "" : "s",
2904 whitespace_error == 1 ? "s" : "");
2908 if (write_cache(newfd, active_cache, active_nr) ||
2909 close(newfd) || commit_locked_index(&lock_file))
2910 die("Unable to write new index file");