4 * Copyright (C) Linus Torvalds, 2005
6 * This applies patches on top of some (arbitrary) version of the SCM.
11 #include "cache-tree.h"
18 * --check turns on checking that the working tree matches the
19 * files that are being modified, but doesn't apply the patch
20 * --stat does just a diffstat, and doesn't actually apply
21 * --numstat does numeric diffstat, and doesn't actually apply
22 * --index-info shows the old and new index info for paths if available.
23 * --index updates the cache as well.
24 * --cached updates only the cache without ever touching the working tree.
26 static const char *prefix;
27 static int prefix_length = -1;
28 static int newfd = -1;
30 static int unidiff_zero;
31 static int p_value = 1;
32 static int check_index;
33 static int write_index;
40 static int apply_in_reverse;
41 static int apply_with_reject;
42 static int apply_verbosely;
44 static int show_index_info;
45 static int line_termination = '\n';
46 static unsigned long p_context = 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_stripping;
59 static const char *patch_input_file;
61 static void parse_whitespace_option(const char *option)
64 new_whitespace = warn_on_whitespace;
67 if (!strcmp(option, "warn")) {
68 new_whitespace = warn_on_whitespace;
71 if (!strcmp(option, "nowarn")) {
72 new_whitespace = nowarn_whitespace;
75 if (!strcmp(option, "error")) {
76 new_whitespace = error_on_whitespace;
79 if (!strcmp(option, "error-all")) {
80 new_whitespace = error_on_whitespace;
81 squelch_whitespace_errors = 0;
84 if (!strcmp(option, "strip")) {
85 new_whitespace = strip_whitespace;
88 die("unrecognized whitespace option '%s'", option);
91 static void set_default_whitespace_mode(const char *whitespace_option)
93 if (!whitespace_option && !apply_default_whitespace) {
94 new_whitespace = (apply
101 * For "diff-stat" like behaviour, we keep track of the biggest change
102 * we've seen, and the longest filename. That allows us to do simple
105 static int max_change, max_len;
108 * Various "current state", notably line numbers and what
109 * file (and how) we're patching right now.. The "is_xxxx"
110 * things are flags, where -1 means "don't know yet".
112 static int linenr = 1;
115 * This represents one "hunk" from a patch, starting with
116 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The
117 * patch text is pointed at by patch, and its byte length
118 * is stored in size. leading and trailing are the number
122 unsigned long leading, trailing;
123 unsigned long oldpos, oldlines;
124 unsigned long newpos, newlines;
128 struct fragment *next;
132 * When dealing with a binary patch, we reuse "leading" field
133 * to store the type of the binary hunk, either deflated "delta"
134 * or deflated "literal".
136 #define binary_patch_method leading
137 #define BINARY_DELTA_DEFLATED 1
138 #define BINARY_LITERAL_DEFLATED 2
141 char *new_name, *old_name, *def_name;
142 unsigned int old_mode, new_mode;
143 int is_new, is_delete; /* -1 = unknown, 0 = false, 1 = true */
145 unsigned long deflate_origlen;
146 int lines_added, lines_deleted;
148 unsigned int inaccurate_eof:1;
149 unsigned int is_binary:1;
150 unsigned int is_copy:1;
151 unsigned int is_rename:1;
152 struct fragment *fragments;
154 unsigned long resultsize;
155 char old_sha1_prefix[41];
156 char new_sha1_prefix[41];
160 static void say_patch_name(FILE *output, const char *pre, struct patch *patch, const char *post)
163 if (patch->old_name && patch->new_name &&
164 strcmp(patch->old_name, patch->new_name)) {
165 write_name_quoted(NULL, 0, patch->old_name, 1, output);
166 fputs(" => ", output);
167 write_name_quoted(NULL, 0, patch->new_name, 1, output);
170 const char *n = patch->new_name;
173 write_name_quoted(NULL, 0, n, 1, output);
178 #define CHUNKSIZE (8192)
181 static void *read_patch_file(int fd, unsigned long *sizep)
183 unsigned long size = 0, alloc = CHUNKSIZE;
184 void *buffer = xmalloc(alloc);
187 int nr = alloc - size;
190 buffer = xrealloc(buffer, alloc);
193 nr = xread(fd, (char *) buffer + size, nr);
197 die("git-apply: read returned %s", strerror(errno));
203 * Make sure that we have some slop in the buffer
204 * so that we can do speculative "memcmp" etc, and
205 * see to it that it is NUL-filled.
207 if (alloc < size + SLOP)
208 buffer = xrealloc(buffer, size + SLOP);
209 memset((char *) buffer + size, 0, SLOP);
213 static unsigned long linelen(const char *buffer, unsigned long size)
215 unsigned long len = 0;
218 if (*buffer++ == '\n')
224 static int is_dev_null(const char *str)
226 return !memcmp("/dev/null", str, 9) && isspace(str[9]);
232 static int name_terminate(const char *name, int namelen, int c, int terminate)
234 if (c == ' ' && !(terminate & TERM_SPACE))
236 if (c == '\t' && !(terminate & TERM_TAB))
242 static char * find_name(const char *line, char *def, int p_value, int terminate)
245 const char *start = line;
249 /* Proposed "new-style" GNU patch/diff format; see
250 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
252 name = unquote_c_style(line, NULL);
256 cp = strchr(name, '/');
263 /* name can later be freed, so we need
264 * to memmove, not just return cp
266 memmove(name, cp, strlen(cp) + 1);
283 if (name_terminate(start, line-start, c, terminate))
287 if (c == '/' && !--p_value)
297 * Generally we prefer the shorter name, especially
298 * if the other one is just a variation of that with
299 * something else tacked on to the end (ie "file.orig"
303 int deflen = strlen(def);
304 if (deflen < len && !strncmp(start, def, deflen))
308 name = xmalloc(len + 1);
309 memcpy(name, start, len);
316 * Get the name etc info from the --/+++ lines of a traditional patch header
318 * NOTE! This hardcodes "-p1" behaviour in filename detection.
320 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
321 * files, we can happily check the index for a match, but for creating a
322 * new file we should try to match whatever "patch" does. I have no idea.
324 static void parse_traditional_patch(const char *first, const char *second, struct patch *patch)
328 first += 4; /* skip "--- " */
329 second += 4; /* skip "+++ " */
330 if (is_dev_null(first)) {
332 patch->is_delete = 0;
333 name = find_name(second, NULL, p_value, TERM_SPACE | TERM_TAB);
334 patch->new_name = name;
335 } else if (is_dev_null(second)) {
337 patch->is_delete = 1;
338 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
339 patch->old_name = name;
341 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
342 name = find_name(second, name, p_value, TERM_SPACE | TERM_TAB);
343 patch->old_name = patch->new_name = name;
346 die("unable to find filename in patch at line %d", linenr);
349 static int gitdiff_hdrend(const char *line, struct patch *patch)
355 * We're anal about diff header consistency, to make
356 * sure that we don't end up having strange ambiguous
357 * patches floating around.
359 * As a result, gitdiff_{old|new}name() will check
360 * their names against any previous information, just
363 static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, const char *oldnew)
365 if (!orig_name && !isnull)
366 return find_name(line, NULL, 1, TERM_TAB);
375 die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr);
376 another = find_name(line, NULL, 1, TERM_TAB);
377 if (!another || memcmp(another, name, len))
378 die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr);
383 /* expect "/dev/null" */
384 if (memcmp("/dev/null", line, 9) || line[9] != '\n')
385 die("git-apply: bad git-diff - expected /dev/null on line %d", linenr);
390 static int gitdiff_oldname(const char *line, struct patch *patch)
392 patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name, "old");
396 static int gitdiff_newname(const char *line, struct patch *patch)
398 patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name, "new");
402 static int gitdiff_oldmode(const char *line, struct patch *patch)
404 patch->old_mode = strtoul(line, NULL, 8);
408 static int gitdiff_newmode(const char *line, struct patch *patch)
410 patch->new_mode = strtoul(line, NULL, 8);
414 static int gitdiff_delete(const char *line, struct patch *patch)
416 patch->is_delete = 1;
417 patch->old_name = patch->def_name;
418 return gitdiff_oldmode(line, patch);
421 static int gitdiff_newfile(const char *line, struct patch *patch)
424 patch->new_name = patch->def_name;
425 return gitdiff_newmode(line, patch);
428 static int gitdiff_copysrc(const char *line, struct patch *patch)
431 patch->old_name = find_name(line, NULL, 0, 0);
435 static int gitdiff_copydst(const char *line, struct patch *patch)
438 patch->new_name = find_name(line, NULL, 0, 0);
442 static int gitdiff_renamesrc(const char *line, struct patch *patch)
444 patch->is_rename = 1;
445 patch->old_name = find_name(line, NULL, 0, 0);
449 static int gitdiff_renamedst(const char *line, struct patch *patch)
451 patch->is_rename = 1;
452 patch->new_name = find_name(line, NULL, 0, 0);
456 static int gitdiff_similarity(const char *line, struct patch *patch)
458 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
463 static int gitdiff_dissimilarity(const char *line, struct patch *patch)
465 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
470 static int gitdiff_index(const char *line, struct patch *patch)
472 /* index line is N hexadecimal, "..", N hexadecimal,
473 * and optional space with octal mode.
475 const char *ptr, *eol;
478 ptr = strchr(line, '.');
479 if (!ptr || ptr[1] != '.' || 40 < ptr - line)
482 memcpy(patch->old_sha1_prefix, line, len);
483 patch->old_sha1_prefix[len] = 0;
486 ptr = strchr(line, ' ');
487 eol = strchr(line, '\n');
489 if (!ptr || eol < ptr)
495 memcpy(patch->new_sha1_prefix, line, len);
496 patch->new_sha1_prefix[len] = 0;
498 patch->new_mode = patch->old_mode = strtoul(ptr+1, NULL, 8);
503 * This is normal for a diff that doesn't change anything: we'll fall through
504 * into the next diff. Tell the parser to break out.
506 static int gitdiff_unrecognized(const char *line, struct patch *patch)
511 static const char *stop_at_slash(const char *line, int llen)
515 for (i = 0; i < llen; i++) {
523 /* This is to extract the same name that appears on "diff --git"
524 * line. We do not find and return anything if it is a rename
525 * patch, and it is OK because we will find the name elsewhere.
526 * We need to reliably find name only when it is mode-change only,
527 * creation or deletion of an empty file. In any of these cases,
528 * both sides are the same name under a/ and b/ respectively.
530 static char *git_header_name(char *line, int llen)
534 const char *second = NULL;
536 line += strlen("diff --git ");
537 llen -= strlen("diff --git ");
541 char *first = unquote_c_style(line, &second);
545 /* advance to the first slash */
546 cp = stop_at_slash(first, strlen(first));
547 if (!cp || cp == first) {
548 /* we do not accept absolute paths */
554 memmove(first, cp+1, len+1); /* including NUL */
556 /* second points at one past closing dq of name.
557 * find the second name.
559 while ((second < line + llen) && isspace(*second))
562 if (line + llen <= second)
563 goto free_first_and_fail;
564 if (*second == '"') {
565 char *sp = unquote_c_style(second, NULL);
567 goto free_first_and_fail;
568 cp = stop_at_slash(sp, strlen(sp));
569 if (!cp || cp == sp) {
572 goto free_first_and_fail;
574 /* They must match, otherwise ignore */
575 if (strcmp(cp+1, first))
576 goto free_both_and_fail;
581 /* unquoted second */
582 cp = stop_at_slash(second, line + llen - second);
583 if (!cp || cp == second)
584 goto free_first_and_fail;
586 if (line + llen - cp != len + 1 ||
587 memcmp(first, cp, len))
588 goto free_first_and_fail;
592 /* unquoted first name */
593 name = stop_at_slash(line, llen);
594 if (!name || name == line)
599 /* since the first name is unquoted, a dq if exists must be
600 * the beginning of the second name.
602 for (second = name; second < line + llen; second++) {
603 if (*second == '"') {
604 const char *cp = second;
606 char *sp = unquote_c_style(second, NULL);
610 np = stop_at_slash(sp, strlen(sp));
611 if (!np || np == sp) {
612 free_second_and_fail:
618 if (len < cp - name &&
619 !strncmp(np, name, len) &&
620 isspace(name[len])) {
622 memmove(sp, np, len + 1);
625 goto free_second_and_fail;
630 * Accept a name only if it shows up twice, exactly the same
633 for (len = 0 ; ; len++) {
648 if (second[len] == '\n' && !memcmp(name, second, len)) {
649 char *ret = xmalloc(len + 1);
650 memcpy(ret, name, len);
659 /* Verify that we recognize the lines following a git header */
660 static int parse_git_header(char *line, int len, unsigned int size, struct patch *patch)
662 unsigned long offset;
664 /* A git diff has explicit new/delete information, so we don't guess */
666 patch->is_delete = 0;
669 * Some things may not have the old name in the
670 * rest of the headers anywhere (pure mode changes,
671 * or removing or adding empty files), so we get
672 * the default name from the header.
674 patch->def_name = git_header_name(line, len);
679 for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {
680 static const struct opentry {
682 int (*fn)(const char *, struct patch *);
684 { "@@ -", gitdiff_hdrend },
685 { "--- ", gitdiff_oldname },
686 { "+++ ", gitdiff_newname },
687 { "old mode ", gitdiff_oldmode },
688 { "new mode ", gitdiff_newmode },
689 { "deleted file mode ", gitdiff_delete },
690 { "new file mode ", gitdiff_newfile },
691 { "copy from ", gitdiff_copysrc },
692 { "copy to ", gitdiff_copydst },
693 { "rename old ", gitdiff_renamesrc },
694 { "rename new ", gitdiff_renamedst },
695 { "rename from ", gitdiff_renamesrc },
696 { "rename to ", gitdiff_renamedst },
697 { "similarity index ", gitdiff_similarity },
698 { "dissimilarity index ", gitdiff_dissimilarity },
699 { "index ", gitdiff_index },
700 { "", gitdiff_unrecognized },
704 len = linelen(line, size);
705 if (!len || line[len-1] != '\n')
707 for (i = 0; i < ARRAY_SIZE(optable); i++) {
708 const struct opentry *p = optable + i;
709 int oplen = strlen(p->str);
710 if (len < oplen || memcmp(p->str, line, oplen))
712 if (p->fn(line + oplen, patch) < 0)
721 static int parse_num(const char *line, unsigned long *p)
727 *p = strtoul(line, &ptr, 10);
731 static int parse_range(const char *line, int len, int offset, const char *expect,
732 unsigned long *p1, unsigned long *p2)
736 if (offset < 0 || offset >= len)
741 digits = parse_num(line, p1);
751 digits = parse_num(line+1, p2);
763 if (memcmp(line, expect, ex))
770 * Parse a unified diff fragment header of the
771 * form "@@ -a,b +c,d @@"
773 static int parse_fragment_header(char *line, int len, struct fragment *fragment)
777 if (!len || line[len-1] != '\n')
780 /* Figure out the number of lines in a fragment */
781 offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);
782 offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);
787 static int find_header(char *line, unsigned long size, int *hdrsize, struct patch *patch)
789 unsigned long offset, len;
791 patch->is_rename = patch->is_copy = 0;
792 patch->is_new = patch->is_delete = -1;
793 patch->old_mode = patch->new_mode = 0;
794 patch->old_name = patch->new_name = NULL;
795 for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {
796 unsigned long nextlen;
798 len = linelen(line, size);
802 /* Testing this early allows us to take a few shortcuts.. */
807 * Make sure we don't find any unconnected patch fragments.
808 * That's a sign that we didn't find a header, and that a
809 * patch has become corrupted/broken up.
811 if (!memcmp("@@ -", line, 4)) {
812 struct fragment dummy;
813 if (parse_fragment_header(line, len, &dummy) < 0)
815 error("patch fragment without header at line %d: %.*s", linenr, (int)len-1, line);
822 * Git patch? It might not have a real patch, just a rename
823 * or mode change, so we handle that specially
825 if (!memcmp("diff --git ", line, 11)) {
826 int git_hdr_len = parse_git_header(line, len, size, patch);
827 if (git_hdr_len <= len)
829 if (!patch->old_name && !patch->new_name) {
830 if (!patch->def_name)
831 die("git diff header lacks filename information (line %d)", linenr);
832 patch->old_name = patch->new_name = patch->def_name;
834 *hdrsize = git_hdr_len;
838 /** --- followed by +++ ? */
839 if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4))
843 * We only accept unified patches, so we want it to
844 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
847 nextlen = linelen(line + len, size - len);
848 if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))
851 /* Ok, we'll consider it a patch */
852 parse_traditional_patch(line, line+len, patch);
853 *hdrsize = len + nextlen;
860 static void check_whitespace(const char *line, int len)
862 const char *err = "Adds trailing whitespace";
867 * We know len is at least two, since we have a '+' and we
868 * checked that the last character was a '\n' before calling
869 * this function. That is, an addition of an empty line would
870 * check the '+' here. Sneaky...
872 if (isspace(line[len-2]))
876 * Make sure that there is no space followed by a tab in
879 err = "Space in indent is followed by a tab";
880 for (i = 1; i < len; i++) {
881 if (line[i] == '\t') {
885 else if (line[i] == ' ')
894 if (squelch_whitespace_errors &&
895 squelch_whitespace_errors < whitespace_error)
898 fprintf(stderr, "%s.\n%s:%d:%.*s\n",
899 err, patch_input_file, linenr, len-2, line+1);
904 * Parse a unified diff. Note that this really needs to parse each
905 * fragment separately, since the only way to know the difference
906 * between a "---" that is part of a patch, and a "---" that starts
907 * the next patch is to look at the line counts..
909 static int parse_fragment(char *line, unsigned long size, struct patch *patch, struct fragment *fragment)
912 int len = linelen(line, size), offset;
913 unsigned long oldlines, newlines;
914 unsigned long leading, trailing;
916 offset = parse_fragment_header(line, len, fragment);
919 oldlines = fragment->oldlines;
920 newlines = fragment->newlines;
924 /* Parse the thing.. */
931 offset += len, size -= len, line += len, linenr++) {
932 if (!oldlines && !newlines)
934 len = linelen(line, size);
935 if (!len || line[len-1] != '\n')
940 case '\n': /* newer GNU diff, an empty context line */
944 if (!deleted && !added)
954 if (new_whitespace != nowarn_whitespace)
955 check_whitespace(line, len);
961 /* We allow "\ No newline at end of file". Depending
962 * on locale settings when the patch was produced we
963 * don't know what this line looks like. The only
964 * thing we do know is that it begins with "\ ".
965 * Checking for 12 is just for sanity check -- any
966 * l10n of "\ No newline..." is at least that long.
969 if (len < 12 || memcmp(line, "\\ ", 2))
974 if (oldlines || newlines)
976 fragment->leading = leading;
977 fragment->trailing = trailing;
979 /* If a fragment ends with an incomplete line, we failed to include
980 * it in the above loop because we hit oldlines == newlines == 0
983 if (12 < size && !memcmp(line, "\\ ", 2))
984 offset += linelen(line, size);
986 patch->lines_added += added;
987 patch->lines_deleted += deleted;
989 if (0 < patch->is_new && oldlines)
990 return error("new file depends on old contents");
991 if (0 < patch->is_delete && newlines)
992 return error("deleted file still has contents");
996 static int parse_single_patch(char *line, unsigned long size, struct patch *patch)
998 unsigned long offset = 0;
999 unsigned long oldlines = 0, newlines = 0, context = 0;
1000 struct fragment **fragp = &patch->fragments;
1002 while (size > 4 && !memcmp(line, "@@ -", 4)) {
1003 struct fragment *fragment;
1006 fragment = xcalloc(1, sizeof(*fragment));
1007 len = parse_fragment(line, size, patch, fragment);
1009 die("corrupt patch at line %d", linenr);
1010 fragment->patch = line;
1011 fragment->size = len;
1012 oldlines += fragment->oldlines;
1013 newlines += fragment->newlines;
1014 context += fragment->leading + fragment->trailing;
1017 fragp = &fragment->next;
1025 * If something was removed (i.e. we have old-lines) it cannot
1026 * be creation, and if something was added it cannot be
1027 * deletion. However, the reverse is not true; --unified=0
1028 * patches that only add are not necessarily creation even
1029 * though they do not have any old lines, and ones that only
1030 * delete are not necessarily deletion.
1032 * Unfortunately, a real creation/deletion patch do _not_ have
1033 * any context line by definition, so we cannot safely tell it
1034 * apart with --unified=0 insanity. At least if the patch has
1035 * more than one hunk it is not creation or deletion.
1037 if (patch->is_new < 0 &&
1038 (oldlines || (patch->fragments && patch->fragments->next)))
1040 if (patch->is_delete < 0 &&
1041 (newlines || (patch->fragments && patch->fragments->next)))
1042 patch->is_delete = 0;
1043 if (!unidiff_zero || context) {
1044 /* If the user says the patch is not generated with
1045 * --unified=0, or if we have seen context lines,
1046 * then not having oldlines means the patch is creation,
1047 * and not having newlines means the patch is deletion.
1049 if (patch->is_new < 0 && !oldlines) {
1051 patch->old_name = NULL;
1053 if (patch->is_delete < 0 && !newlines) {
1054 patch->is_delete = 1;
1055 patch->new_name = NULL;
1059 if (0 < patch->is_new && oldlines)
1060 die("new file %s depends on old contents", patch->new_name);
1061 if (0 < patch->is_delete && newlines)
1062 die("deleted file %s still has contents", patch->old_name);
1063 if (!patch->is_delete && !newlines && context)
1064 fprintf(stderr, "** warning: file %s becomes empty but "
1065 "is not deleted\n", patch->new_name);
1070 static inline int metadata_changes(struct patch *patch)
1072 return patch->is_rename > 0 ||
1073 patch->is_copy > 0 ||
1074 patch->is_new > 0 ||
1076 (patch->old_mode && patch->new_mode &&
1077 patch->old_mode != patch->new_mode);
1080 static char *inflate_it(const void *data, unsigned long size,
1081 unsigned long inflated_size)
1087 memset(&stream, 0, sizeof(stream));
1089 stream.next_in = (unsigned char *)data;
1090 stream.avail_in = size;
1091 stream.next_out = out = xmalloc(inflated_size);
1092 stream.avail_out = inflated_size;
1093 inflateInit(&stream);
1094 st = inflate(&stream, Z_FINISH);
1095 if ((st != Z_STREAM_END) || stream.total_out != inflated_size) {
1102 static struct fragment *parse_binary_hunk(char **buf_p,
1103 unsigned long *sz_p,
1107 /* Expect a line that begins with binary patch method ("literal"
1108 * or "delta"), followed by the length of data before deflating.
1109 * a sequence of 'length-byte' followed by base-85 encoded data
1110 * should follow, terminated by a newline.
1112 * Each 5-byte sequence of base-85 encodes up to 4 bytes,
1113 * and we would limit the patch line to 66 characters,
1114 * so one line can fit up to 13 groups that would decode
1115 * to 52 bytes max. The length byte 'A'-'Z' corresponds
1116 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
1119 unsigned long size = *sz_p;
1120 char *buffer = *buf_p;
1122 unsigned long origlen;
1125 struct fragment *frag;
1127 llen = linelen(buffer, size);
1132 if (!strncmp(buffer, "delta ", 6)) {
1133 patch_method = BINARY_DELTA_DEFLATED;
1134 origlen = strtoul(buffer + 6, NULL, 10);
1136 else if (!strncmp(buffer, "literal ", 8)) {
1137 patch_method = BINARY_LITERAL_DEFLATED;
1138 origlen = strtoul(buffer + 8, NULL, 10);
1146 int byte_length, max_byte_length, newsize;
1147 llen = linelen(buffer, size);
1151 /* consume the blank line */
1156 /* Minimum line is "A00000\n" which is 7-byte long,
1157 * and the line length must be multiple of 5 plus 2.
1159 if ((llen < 7) || (llen-2) % 5)
1161 max_byte_length = (llen - 2) / 5 * 4;
1162 byte_length = *buffer;
1163 if ('A' <= byte_length && byte_length <= 'Z')
1164 byte_length = byte_length - 'A' + 1;
1165 else if ('a' <= byte_length && byte_length <= 'z')
1166 byte_length = byte_length - 'a' + 27;
1169 /* if the input length was not multiple of 4, we would
1170 * have filler at the end but the filler should never
1173 if (max_byte_length < byte_length ||
1174 byte_length <= max_byte_length - 4)
1176 newsize = hunk_size + byte_length;
1177 data = xrealloc(data, newsize);
1178 if (decode_85(data + hunk_size, buffer + 1, byte_length))
1180 hunk_size = newsize;
1185 frag = xcalloc(1, sizeof(*frag));
1186 frag->patch = inflate_it(data, hunk_size, origlen);
1190 frag->size = origlen;
1194 frag->binary_patch_method = patch_method;
1200 error("corrupt binary patch at line %d: %.*s",
1201 linenr-1, llen-1, buffer);
1205 static int parse_binary(char *buffer, unsigned long size, struct patch *patch)
1207 /* We have read "GIT binary patch\n"; what follows is a line
1208 * that says the patch method (currently, either "literal" or
1209 * "delta") and the length of data before deflating; a
1210 * sequence of 'length-byte' followed by base-85 encoded data
1213 * When a binary patch is reversible, there is another binary
1214 * hunk in the same format, starting with patch method (either
1215 * "literal" or "delta") with the length of data, and a sequence
1216 * of length-byte + base-85 encoded data, terminated with another
1217 * empty line. This data, when applied to the postimage, produces
1220 struct fragment *forward;
1221 struct fragment *reverse;
1225 forward = parse_binary_hunk(&buffer, &size, &status, &used);
1226 if (!forward && !status)
1227 /* there has to be one hunk (forward hunk) */
1228 return error("unrecognized binary patch at line %d", linenr-1);
1230 /* otherwise we already gave an error message */
1233 reverse = parse_binary_hunk(&buffer, &size, &status, &used_1);
1237 /* not having reverse hunk is not an error, but having
1238 * a corrupt reverse hunk is.
1240 free((void*) forward->patch);
1244 forward->next = reverse;
1245 patch->fragments = forward;
1246 patch->is_binary = 1;
1250 static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
1252 int hdrsize, patchsize;
1253 int offset = find_header(buffer, size, &hdrsize, patch);
1258 patchsize = parse_single_patch(buffer + offset + hdrsize, size - offset - hdrsize, patch);
1261 static const char *binhdr[] = {
1266 static const char git_binary[] = "GIT binary patch\n";
1268 int hd = hdrsize + offset;
1269 unsigned long llen = linelen(buffer + hd, size - hd);
1271 if (llen == sizeof(git_binary) - 1 &&
1272 !memcmp(git_binary, buffer + hd, llen)) {
1275 used = parse_binary(buffer + hd + llen,
1276 size - hd - llen, patch);
1278 patchsize = used + llen;
1282 else if (!memcmp(" differ\n", buffer + hd + llen - 8, 8)) {
1283 for (i = 0; binhdr[i]; i++) {
1284 int len = strlen(binhdr[i]);
1285 if (len < size - hd &&
1286 !memcmp(binhdr[i], buffer + hd, len)) {
1288 patch->is_binary = 1;
1295 /* Empty patch cannot be applied if it is a text patch
1296 * without metadata change. A binary patch appears
1299 if ((apply || check) &&
1300 (!patch->is_binary && !metadata_changes(patch)))
1301 die("patch with only garbage at line %d", linenr);
1304 return offset + hdrsize + patchsize;
1307 #define swap(a,b) myswap((a),(b),sizeof(a))
1309 #define myswap(a, b, size) do { \
1310 unsigned char mytmp[size]; \
1311 memcpy(mytmp, &a, size); \
1312 memcpy(&a, &b, size); \
1313 memcpy(&b, mytmp, size); \
1316 static void reverse_patches(struct patch *p)
1318 for (; p; p = p->next) {
1319 struct fragment *frag = p->fragments;
1321 swap(p->new_name, p->old_name);
1322 swap(p->new_mode, p->old_mode);
1323 swap(p->is_new, p->is_delete);
1324 swap(p->lines_added, p->lines_deleted);
1325 swap(p->old_sha1_prefix, p->new_sha1_prefix);
1327 for (; frag; frag = frag->next) {
1328 swap(frag->newpos, frag->oldpos);
1329 swap(frag->newlines, frag->oldlines);
1334 static const char pluses[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
1335 static const char minuses[]= "----------------------------------------------------------------------";
1337 static void show_stats(struct patch *patch)
1339 const char *prefix = "";
1340 char *name = patch->new_name;
1342 int len, max, add, del, total;
1345 name = patch->old_name;
1347 if (0 < (len = quote_c_style(name, NULL, NULL, 0))) {
1348 qname = xmalloc(len + 1);
1349 quote_c_style(name, qname, NULL, 0);
1354 * "scale" the filename
1365 slash = strchr(name, '/');
1372 * scale the add/delete
1378 add = patch->lines_added;
1379 del = patch->lines_deleted;
1382 if (max_change > 0) {
1383 total = (total * max + max_change / 2) / max_change;
1384 add = (add * max + max_change / 2) / max_change;
1387 if (patch->is_binary)
1388 printf(" %s%-*s | Bin\n", prefix, len, name);
1390 printf(" %s%-*s |%5d %.*s%.*s\n", prefix,
1391 len, name, patch->lines_added + patch->lines_deleted,
1392 add, pluses, del, minuses);
1396 static int read_old_data(struct stat *st, const char *path, void *buf, unsigned long size)
1401 switch (st->st_mode & S_IFMT) {
1403 return readlink(path, buf, size);
1405 fd = open(path, O_RDONLY);
1407 return error("unable to open %s", path);
1410 int ret = xread(fd, (char *) buf + got, size - got);
1423 static int find_offset(const char *buf, unsigned long size, const char *fragment, unsigned long fragsize, int line, int *lines)
1426 unsigned long start, backwards, forwards;
1428 if (fragsize > size)
1433 unsigned long offset = 0;
1435 while (offset + fragsize <= size) {
1436 if (buf[offset++] == '\n') {
1444 /* Exact line number? */
1445 if (!memcmp(buf + start, fragment, fragsize))
1449 * There's probably some smart way to do this, but I'll leave
1450 * that to the smart and beautiful people. I'm simple and stupid.
1454 for (i = 0; ; i++) {
1461 if (forwards + fragsize > size)
1467 } while (backwards && buf[backwards-1] != '\n');
1470 while (forwards + fragsize <= size) {
1471 if (buf[forwards++] == '\n')
1477 if (try + fragsize > size)
1479 if (memcmp(buf + try, fragment, fragsize))
1489 * We should start searching forward and backward.
1494 static void remove_first_line(const char **rbuf, int *rsize)
1496 const char *buf = *rbuf;
1498 unsigned long offset;
1500 while (offset <= size) {
1501 if (buf[offset++] == '\n')
1504 *rsize = size - offset;
1505 *rbuf = buf + offset;
1508 static void remove_last_line(const char **rbuf, int *rsize)
1510 const char *buf = *rbuf;
1512 unsigned long offset;
1514 while (offset > 0) {
1515 if (buf[--offset] == '\n')
1518 *rsize = offset + 1;
1521 struct buffer_desc {
1524 unsigned long alloc;
1527 static int apply_line(char *output, const char *patch, int plen)
1529 /* plen is number of bytes to be copied from patch,
1530 * starting at patch+1 (patch[0] is '+'). Typically
1531 * patch[plen] is '\n', unless this is the incomplete
1535 int add_nl_to_tail = 0;
1537 int last_tab_in_indent = -1;
1538 int last_space_in_indent = -1;
1539 int need_fix_leading_space = 0;
1542 if ((new_whitespace != strip_whitespace) || !whitespace_error) {
1543 memcpy(output, patch + 1, plen);
1547 if (1 < plen && isspace(patch[plen-1])) {
1548 if (patch[plen] == '\n')
1551 while (0 < plen && isspace(patch[plen]))
1556 for (i = 1; i < plen; i++) {
1559 last_tab_in_indent = i;
1560 if (0 <= last_space_in_indent)
1561 need_fix_leading_space = 1;
1564 last_space_in_indent = i;
1570 if (need_fix_leading_space) {
1571 /* between patch[1..last_tab_in_indent] strip the
1572 * funny spaces, updating them to tab as needed.
1574 for (i = 1; i < last_tab_in_indent; i++, plen--) {
1578 else if ((i % 8) == 0)
1582 i = last_tab_in_indent;
1587 memcpy(output, patch + i, plen);
1589 output[plen++] = '\n';
1591 applied_after_stripping++;
1592 return output + plen - buf;
1595 static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag, int inaccurate_eof)
1597 int match_beginning, match_end;
1598 char *buf = desc->buffer;
1599 const char *patch = frag->patch;
1600 int offset, size = frag->size;
1601 char *old = xmalloc(size);
1602 char *new = xmalloc(size);
1603 const char *oldlines, *newlines;
1604 int oldsize = 0, newsize = 0;
1605 unsigned long leading, trailing;
1610 int len = linelen(patch, size);
1617 * "plen" is how much of the line we should use for
1618 * the actual patch data. Normally we just remove the
1619 * first character on the line, but if the line is
1620 * followed by "\ No newline", then we also remove the
1621 * last one (which is the newline, of course).
1624 if (len < size && patch[len] == '\\')
1627 if (apply_in_reverse) {
1630 else if (first == '+')
1635 /* Newer GNU diff, empty context line */
1637 /* ... followed by '\No newline'; nothing */
1639 old[oldsize++] = '\n';
1640 new[newsize++] = '\n';
1644 memcpy(old + oldsize, patch + 1, plen);
1648 /* Fall-through for ' ' */
1650 if (first != '+' || !no_add)
1651 newsize += apply_line(new + newsize, patch,
1654 case '@': case '\\':
1655 /* Ignore it, we already handled it */
1664 if (inaccurate_eof && oldsize > 0 && old[oldsize - 1] == '\n' &&
1665 newsize > 0 && new[newsize - 1] == '\n') {
1672 leading = frag->leading;
1673 trailing = frag->trailing;
1676 * If we don't have any leading/trailing data in the patch,
1677 * we want it to match at the beginning/end of the file.
1679 * But that would break if the patch is generated with
1680 * --unified=0; sane people wouldn't do that to cause us
1681 * trouble, but we try to please not so sane ones as well.
1684 match_beginning = (!leading && !frag->oldpos);
1688 match_beginning = !leading && (frag->oldpos == 1);
1689 match_end = !trailing;
1695 offset = find_offset(buf, desc->size,
1696 oldlines, oldsize, pos, &lines);
1697 if (match_end && offset + oldsize != desc->size)
1699 if (match_beginning && offset)
1702 int diff = newsize - oldsize;
1703 unsigned long size = desc->size + diff;
1704 unsigned long alloc = desc->alloc;
1706 /* Warn if it was necessary to reduce the number
1709 if ((leading != frag->leading) ||
1710 (trailing != frag->trailing))
1711 fprintf(stderr, "Context reduced to (%ld/%ld)"
1712 " to apply fragment at %d\n",
1713 leading, trailing, pos + lines);
1716 alloc = size + 8192;
1717 desc->alloc = alloc;
1718 buf = xrealloc(buf, alloc);
1722 memmove(buf + offset + newsize,
1723 buf + offset + oldsize,
1724 size - offset - newsize);
1725 memcpy(buf + offset, newlines, newsize);
1731 /* Am I at my context limits? */
1732 if ((leading <= p_context) && (trailing <= p_context))
1734 if (match_beginning || match_end) {
1735 match_beginning = match_end = 0;
1738 /* Reduce the number of context lines
1739 * Reduce both leading and trailing if they are equal
1740 * otherwise just reduce the larger context.
1742 if (leading >= trailing) {
1743 remove_first_line(&oldlines, &oldsize);
1744 remove_first_line(&newlines, &newsize);
1748 if (trailing > leading) {
1749 remove_last_line(&oldlines, &oldsize);
1750 remove_last_line(&newlines, &newsize);
1760 static int apply_binary_fragment(struct buffer_desc *desc, struct patch *patch)
1762 unsigned long dst_size;
1763 struct fragment *fragment = patch->fragments;
1767 /* Binary patch is irreversible without the optional second hunk */
1768 if (apply_in_reverse) {
1769 if (!fragment->next)
1770 return error("cannot reverse-apply a binary patch "
1771 "without the reverse hunk to '%s'",
1773 ? patch->new_name : patch->old_name);
1774 fragment = fragment->next;
1776 data = (void*) fragment->patch;
1777 switch (fragment->binary_patch_method) {
1778 case BINARY_DELTA_DEFLATED:
1779 result = patch_delta(desc->buffer, desc->size,
1784 desc->buffer = result;
1786 case BINARY_LITERAL_DEFLATED:
1788 desc->buffer = data;
1789 dst_size = fragment->size;
1794 desc->size = desc->alloc = dst_size;
1798 static int apply_binary(struct buffer_desc *desc, struct patch *patch)
1800 const char *name = patch->old_name ? patch->old_name : patch->new_name;
1801 unsigned char sha1[20];
1803 /* For safety, we require patch index line to contain
1804 * full 40-byte textual SHA1 for old and new, at least for now.
1806 if (strlen(patch->old_sha1_prefix) != 40 ||
1807 strlen(patch->new_sha1_prefix) != 40 ||
1808 get_sha1_hex(patch->old_sha1_prefix, sha1) ||
1809 get_sha1_hex(patch->new_sha1_prefix, sha1))
1810 return error("cannot apply binary patch to '%s' "
1811 "without full index line", name);
1813 if (patch->old_name) {
1814 /* See if the old one matches what the patch
1817 hash_sha1_file(desc->buffer, desc->size, blob_type, sha1);
1818 if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))
1819 return error("the patch applies to '%s' (%s), "
1820 "which does not match the "
1821 "current contents.",
1822 name, sha1_to_hex(sha1));
1825 /* Otherwise, the old one must be empty. */
1827 return error("the patch applies to an empty "
1828 "'%s' but it is not empty", name);
1831 get_sha1_hex(patch->new_sha1_prefix, sha1);
1832 if (is_null_sha1(sha1)) {
1834 desc->alloc = desc->size = 0;
1835 desc->buffer = NULL;
1836 return 0; /* deletion patch */
1839 if (has_sha1_file(sha1)) {
1840 /* We already have the postimage */
1845 desc->buffer = read_sha1_file(sha1, type, &size);
1847 return error("the necessary postimage %s for "
1848 "'%s' cannot be read",
1849 patch->new_sha1_prefix, name);
1850 desc->alloc = desc->size = size;
1853 /* We have verified desc matches the preimage;
1854 * apply the patch data to it, which is stored
1855 * in the patch->fragments->{patch,size}.
1857 if (apply_binary_fragment(desc, patch))
1858 return error("binary patch does not apply to '%s'",
1861 /* verify that the result matches */
1862 hash_sha1_file(desc->buffer, desc->size, blob_type, sha1);
1863 if (strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))
1864 return error("binary patch to '%s' creates incorrect result (expecting %s, got %s)", name, patch->new_sha1_prefix, sha1_to_hex(sha1));
1870 static int apply_fragments(struct buffer_desc *desc, struct patch *patch)
1872 struct fragment *frag = patch->fragments;
1873 const char *name = patch->old_name ? patch->old_name : patch->new_name;
1875 if (patch->is_binary)
1876 return apply_binary(desc, patch);
1879 if (apply_one_fragment(desc, frag, patch->inaccurate_eof)) {
1880 error("patch failed: %s:%ld", name, frag->oldpos);
1881 if (!apply_with_reject)
1890 static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *ce)
1893 unsigned long size, alloc;
1894 struct buffer_desc desc;
1902 buf = read_sha1_file(ce->sha1, type, &size);
1904 return error("read of %s failed",
1909 else if (patch->old_name) {
1911 alloc = size + 8192;
1912 buf = xmalloc(alloc);
1913 if (read_old_data(st, patch->old_name, buf, alloc) != size)
1914 return error("read of %s failed", patch->old_name);
1921 if (apply_fragments(&desc, patch) < 0)
1922 return -1; /* note with --reject this succeeds. */
1924 /* NUL terminate the result */
1925 if (desc.alloc <= desc.size)
1926 desc.buffer = xrealloc(desc.buffer, desc.size + 1);
1927 desc.buffer[desc.size] = 0;
1929 patch->result = desc.buffer;
1930 patch->resultsize = desc.size;
1932 if (0 < patch->is_delete && patch->resultsize)
1933 return error("removal patch leaves file contents");
1938 static int check_patch(struct patch *patch, struct patch *prev_patch)
1941 const char *old_name = patch->old_name;
1942 const char *new_name = patch->new_name;
1943 const char *name = old_name ? old_name : new_name;
1944 struct cache_entry *ce = NULL;
1947 patch->rejected = 1; /* we will drop this after we succeed */
1951 unsigned st_mode = 0;
1954 stat_ret = lstat(old_name, &st);
1956 int pos = cache_name_pos(old_name, strlen(old_name));
1958 return error("%s: does not exist in index",
1960 ce = active_cache[pos];
1962 struct checkout costate;
1963 if (errno != ENOENT)
1964 return error("%s: %s", old_name,
1967 costate.base_dir = "";
1968 costate.base_dir_len = 0;
1971 costate.not_new = 0;
1972 costate.refresh_cache = 1;
1973 if (checkout_entry(ce,
1976 lstat(old_name, &st))
1980 changed = ce_match_stat(ce, &st, 1);
1982 return error("%s: does not match index",
1985 st_mode = ntohl(ce->ce_mode);
1987 else if (stat_ret < 0)
1988 return error("%s: %s", old_name, strerror(errno));
1991 st_mode = ntohl(create_ce_mode(st.st_mode));
1993 if (patch->is_new < 0)
1995 if (!patch->old_mode)
1996 patch->old_mode = st_mode;
1997 if ((st_mode ^ patch->old_mode) & S_IFMT)
1998 return error("%s: wrong type", old_name);
1999 if (st_mode != patch->old_mode)
2000 fprintf(stderr, "warning: %s has type %o, expected %o\n",
2001 old_name, st_mode, patch->old_mode);
2004 if (new_name && prev_patch && 0 < prev_patch->is_delete &&
2005 !strcmp(prev_patch->old_name, new_name))
2006 /* A type-change diff is always split into a patch to
2007 * delete old, immediately followed by a patch to
2008 * create new (see diff.c::run_diff()); in such a case
2009 * it is Ok that the entry to be deleted by the
2010 * previous patch is still in the working tree and in
2018 ((0 < patch->is_new) | (0 < patch->is_rename) | patch->is_copy)) {
2020 cache_name_pos(new_name, strlen(new_name)) >= 0 &&
2022 return error("%s: already exists in index", new_name);
2025 if (!lstat(new_name, &nst)) {
2026 if (S_ISDIR(nst.st_mode) || ok_if_exists)
2029 return error("%s: already exists in working directory", new_name);
2031 else if ((errno != ENOENT) && (errno != ENOTDIR))
2032 return error("%s: %s", new_name, strerror(errno));
2034 if (!patch->new_mode) {
2035 if (0 < patch->is_new)
2036 patch->new_mode = S_IFREG | 0644;
2038 patch->new_mode = patch->old_mode;
2042 if (new_name && old_name) {
2043 int same = !strcmp(old_name, new_name);
2044 if (!patch->new_mode)
2045 patch->new_mode = patch->old_mode;
2046 if ((patch->old_mode ^ patch->new_mode) & S_IFMT)
2047 return error("new mode (%o) of %s does not match old mode (%o)%s%s",
2048 patch->new_mode, new_name, patch->old_mode,
2049 same ? "" : " of ", same ? "" : old_name);
2052 if (apply_data(patch, &st, ce) < 0)
2053 return error("%s: patch does not apply", name);
2054 patch->rejected = 0;
2058 static int check_patch_list(struct patch *patch)
2060 struct patch *prev_patch = NULL;
2063 for (prev_patch = NULL; patch ; patch = patch->next) {
2064 if (apply_verbosely)
2065 say_patch_name(stderr,
2066 "Checking patch ", patch, "...\n");
2067 err |= check_patch(patch, prev_patch);
2073 static void show_index_list(struct patch *list)
2075 struct patch *patch;
2077 /* Once we start supporting the reverse patch, it may be
2078 * worth showing the new sha1 prefix, but until then...
2080 for (patch = list; patch; patch = patch->next) {
2081 const unsigned char *sha1_ptr;
2082 unsigned char sha1[20];
2085 name = patch->old_name ? patch->old_name : patch->new_name;
2086 if (0 < patch->is_new)
2087 sha1_ptr = null_sha1;
2088 else if (get_sha1(patch->old_sha1_prefix, sha1))
2089 die("sha1 information is lacking or useless (%s).",
2094 printf("%06o %s ",patch->old_mode, sha1_to_hex(sha1_ptr));
2095 if (line_termination && quote_c_style(name, NULL, NULL, 0))
2096 quote_c_style(name, NULL, stdout, 0);
2098 fputs(name, stdout);
2099 putchar(line_termination);
2103 static void stat_patch_list(struct patch *patch)
2105 int files, adds, dels;
2107 for (files = adds = dels = 0 ; patch ; patch = patch->next) {
2109 adds += patch->lines_added;
2110 dels += patch->lines_deleted;
2114 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files, adds, dels);
2117 static void numstat_patch_list(struct patch *patch)
2119 for ( ; patch; patch = patch->next) {
2121 name = patch->new_name ? patch->new_name : patch->old_name;
2122 if (patch->is_binary)
2126 patch->lines_added, patch->lines_deleted);
2127 if (line_termination && quote_c_style(name, NULL, NULL, 0))
2128 quote_c_style(name, NULL, stdout, 0);
2130 fputs(name, stdout);
2131 putchar(line_termination);
2135 static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)
2138 printf(" %s mode %06o %s\n", newdelete, mode, name);
2140 printf(" %s %s\n", newdelete, name);
2143 static void show_mode_change(struct patch *p, int show_name)
2145 if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {
2147 printf(" mode change %06o => %06o %s\n",
2148 p->old_mode, p->new_mode, p->new_name);
2150 printf(" mode change %06o => %06o\n",
2151 p->old_mode, p->new_mode);
2155 static void show_rename_copy(struct patch *p)
2157 const char *renamecopy = p->is_rename ? "rename" : "copy";
2158 const char *old, *new;
2160 /* Find common prefix */
2164 const char *slash_old, *slash_new;
2165 slash_old = strchr(old, '/');
2166 slash_new = strchr(new, '/');
2169 slash_old - old != slash_new - new ||
2170 memcmp(old, new, slash_new - new))
2172 old = slash_old + 1;
2173 new = slash_new + 1;
2175 /* p->old_name thru old is the common prefix, and old and new
2176 * through the end of names are renames
2178 if (old != p->old_name)
2179 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
2180 (int)(old - p->old_name), p->old_name,
2181 old, new, p->score);
2183 printf(" %s %s => %s (%d%%)\n", renamecopy,
2184 p->old_name, p->new_name, p->score);
2185 show_mode_change(p, 0);
2188 static void summary_patch_list(struct patch *patch)
2192 for (p = patch; p; p = p->next) {
2194 show_file_mode_name("create", p->new_mode, p->new_name);
2195 else if (p->is_delete)
2196 show_file_mode_name("delete", p->old_mode, p->old_name);
2198 if (p->is_rename || p->is_copy)
2199 show_rename_copy(p);
2202 printf(" rewrite %s (%d%%)\n",
2203 p->new_name, p->score);
2204 show_mode_change(p, 0);
2207 show_mode_change(p, 1);
2213 static void patch_stats(struct patch *patch)
2215 int lines = patch->lines_added + patch->lines_deleted;
2217 if (lines > max_change)
2219 if (patch->old_name) {
2220 int len = quote_c_style(patch->old_name, NULL, NULL, 0);
2222 len = strlen(patch->old_name);
2226 if (patch->new_name) {
2227 int len = quote_c_style(patch->new_name, NULL, NULL, 0);
2229 len = strlen(patch->new_name);
2235 static void remove_file(struct patch *patch)
2238 if (remove_file_from_cache(patch->old_name) < 0)
2239 die("unable to remove %s from index", patch->old_name);
2240 cache_tree_invalidate_path(active_cache_tree, patch->old_name);
2243 unlink(patch->old_name);
2246 static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size)
2249 struct cache_entry *ce;
2250 int namelen = strlen(path);
2251 unsigned ce_size = cache_entry_size(namelen);
2256 ce = xcalloc(1, ce_size);
2257 memcpy(ce->name, path, namelen);
2258 ce->ce_mode = create_ce_mode(mode);
2259 ce->ce_flags = htons(namelen);
2261 if (lstat(path, &st) < 0)
2262 die("unable to stat newly created file %s", path);
2263 fill_stat_cache_info(ce, &st);
2265 if (write_sha1_file(buf, size, blob_type, ce->sha1) < 0)
2266 die("unable to create backing store for newly created file %s", path);
2267 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)
2268 die("unable to add cache entry for %s", path);
2271 static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)
2276 /* Although buf:size is counted string, it also is NUL
2279 return symlink(buf, path);
2280 fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);
2284 int written = xwrite(fd, buf, size);
2286 die("writing file %s: %s", path, strerror(errno));
2288 die("out of space writing file %s", path);
2293 die("closing file %s: %s", path, strerror(errno));
2298 * We optimistically assume that the directories exist,
2299 * which is true 99% of the time anyway. If they don't,
2300 * we create them and try again.
2302 static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size)
2306 if (!try_create_file(path, mode, buf, size))
2309 if (errno == ENOENT) {
2310 if (safe_create_leading_directories(path))
2312 if (!try_create_file(path, mode, buf, size))
2316 if (errno == EEXIST || errno == EACCES) {
2317 /* We may be trying to create a file where a directory
2322 if (!lstat(path, &st) && S_ISDIR(st.st_mode) && !rmdir(path))
2326 if (errno == EEXIST) {
2327 unsigned int nr = getpid();
2330 const char *newpath;
2331 newpath = mkpath("%s~%u", path, nr);
2332 if (!try_create_file(newpath, mode, buf, size)) {
2333 if (!rename(newpath, path))
2338 if (errno != EEXIST)
2343 die("unable to write file %s mode %o", path, mode);
2346 static void create_file(struct patch *patch)
2348 char *path = patch->new_name;
2349 unsigned mode = patch->new_mode;
2350 unsigned long size = patch->resultsize;
2351 char *buf = patch->result;
2354 mode = S_IFREG | 0644;
2355 create_one_file(path, mode, buf, size);
2356 add_index_file(path, mode, buf, size);
2357 cache_tree_invalidate_path(active_cache_tree, path);
2360 /* phase zero is to remove, phase one is to create */
2361 static void write_out_one_result(struct patch *patch, int phase)
2363 if (patch->is_delete > 0) {
2368 if (patch->is_new > 0 || patch->is_copy) {
2374 * Rename or modification boils down to the same
2375 * thing: remove the old, write the new
2383 static int write_out_one_reject(struct patch *patch)
2386 char namebuf[PATH_MAX];
2387 struct fragment *frag;
2390 for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) {
2391 if (!frag->rejected)
2397 if (apply_verbosely)
2398 say_patch_name(stderr,
2399 "Applied patch ", patch, " cleanly.\n");
2403 /* This should not happen, because a removal patch that leaves
2404 * contents are marked "rejected" at the patch level.
2406 if (!patch->new_name)
2407 die("internal error");
2409 /* Say this even without --verbose */
2410 say_patch_name(stderr, "Applying patch ", patch, " with");
2411 fprintf(stderr, " %d rejects...\n", cnt);
2413 cnt = strlen(patch->new_name);
2414 if (ARRAY_SIZE(namebuf) <= cnt + 5) {
2415 cnt = ARRAY_SIZE(namebuf) - 5;
2417 "warning: truncating .rej filename to %.*s.rej",
2418 cnt - 1, patch->new_name);
2420 memcpy(namebuf, patch->new_name, cnt);
2421 memcpy(namebuf + cnt, ".rej", 5);
2423 rej = fopen(namebuf, "w");
2425 return error("cannot open %s: %s", namebuf, strerror(errno));
2427 /* Normal git tools never deal with .rej, so do not pretend
2428 * this is a git patch by saying --git nor give extended
2429 * headers. While at it, maybe please "kompare" that wants
2430 * the trailing TAB and some garbage at the end of line ;-).
2432 fprintf(rej, "diff a/%s b/%s\t(rejected hunks)\n",
2433 patch->new_name, patch->new_name);
2434 for (cnt = 1, frag = patch->fragments;
2436 cnt++, frag = frag->next) {
2437 if (!frag->rejected) {
2438 fprintf(stderr, "Hunk #%d applied cleanly.\n", cnt);
2441 fprintf(stderr, "Rejected hunk #%d.\n", cnt);
2442 fprintf(rej, "%.*s", frag->size, frag->patch);
2443 if (frag->patch[frag->size-1] != '\n')
2450 static int write_out_results(struct patch *list, int skipped_patch)
2456 if (!list && !skipped_patch)
2457 return error("No changes");
2459 for (phase = 0; phase < 2; phase++) {
2465 write_out_one_result(l, phase);
2466 if (phase == 1 && write_out_one_reject(l))
2475 static struct lock_file lock_file;
2477 static struct excludes {
2478 struct excludes *next;
2482 static int use_patch(struct patch *p)
2484 const char *pathname = p->new_name ? p->new_name : p->old_name;
2485 struct excludes *x = excludes;
2487 if (fnmatch(x->path, pathname, 0) == 0)
2491 if (0 < prefix_length) {
2492 int pathlen = strlen(pathname);
2493 if (pathlen <= prefix_length ||
2494 memcmp(prefix, pathname, prefix_length))
2500 static int apply_patch(int fd, const char *filename, int inaccurate_eof)
2502 unsigned long offset, size;
2503 char *buffer = read_patch_file(fd, &size);
2504 struct patch *list = NULL, **listp = &list;
2505 int skipped_patch = 0;
2507 patch_input_file = filename;
2512 struct patch *patch;
2515 patch = xcalloc(1, sizeof(*patch));
2516 patch->inaccurate_eof = inaccurate_eof;
2517 nr = parse_chunk(buffer + offset, size, patch);
2520 if (apply_in_reverse)
2521 reverse_patches(patch);
2522 if (use_patch(patch)) {
2525 listp = &patch->next;
2527 /* perhaps free it a bit better? */
2535 if (whitespace_error && (new_whitespace == error_on_whitespace))
2538 write_index = check_index && apply;
2539 if (write_index && newfd < 0)
2540 newfd = hold_lock_file_for_update(&lock_file,
2541 get_index_file(), 1);
2543 if (read_cache() < 0)
2544 die("unable to read index file");
2547 if ((check || apply) &&
2548 check_patch_list(list) < 0 &&
2552 if (apply && write_out_results(list, skipped_patch))
2555 if (show_index_info)
2556 show_index_list(list);
2559 stat_patch_list(list);
2562 numstat_patch_list(list);
2565 summary_patch_list(list);
2571 static int git_apply_config(const char *var, const char *value)
2573 if (!strcmp(var, "apply.whitespace")) {
2574 apply_default_whitespace = xstrdup(value);
2577 return git_default_config(var, value);
2581 int cmd_apply(int argc, const char **argv, const char *prefix)
2585 int inaccurate_eof = 0;
2588 const char *whitespace_option = NULL;
2590 for (i = 1; i < argc; i++) {
2591 const char *arg = argv[i];
2595 if (!strcmp(arg, "-")) {
2596 errs |= apply_patch(0, "<stdin>", inaccurate_eof);
2600 if (!strncmp(arg, "--exclude=", 10)) {
2601 struct excludes *x = xmalloc(sizeof(*x));
2607 if (!strncmp(arg, "-p", 2)) {
2608 p_value = atoi(arg + 2);
2611 if (!strcmp(arg, "--no-add")) {
2615 if (!strcmp(arg, "--stat")) {
2620 if (!strcmp(arg, "--allow-binary-replacement") ||
2621 !strcmp(arg, "--binary")) {
2622 continue; /* now no-op */
2624 if (!strcmp(arg, "--numstat")) {
2629 if (!strcmp(arg, "--summary")) {
2634 if (!strcmp(arg, "--check")) {
2639 if (!strcmp(arg, "--index")) {
2643 if (!strcmp(arg, "--cached")) {
2648 if (!strcmp(arg, "--apply")) {
2652 if (!strcmp(arg, "--index-info")) {
2654 show_index_info = 1;
2657 if (!strcmp(arg, "-z")) {
2658 line_termination = 0;
2661 if (!strncmp(arg, "-C", 2)) {
2662 p_context = strtoul(arg + 2, &end, 0);
2664 die("unrecognized context count '%s'", arg + 2);
2667 if (!strncmp(arg, "--whitespace=", 13)) {
2668 whitespace_option = arg + 13;
2669 parse_whitespace_option(arg + 13);
2672 if (!strcmp(arg, "-R") || !strcmp(arg, "--reverse")) {
2673 apply_in_reverse = 1;
2676 if (!strcmp(arg, "--unidiff-zero")) {
2680 if (!strcmp(arg, "--reject")) {
2681 apply = apply_with_reject = apply_verbosely = 1;
2684 if (!strcmp(arg, "--verbose")) {
2685 apply_verbosely = 1;
2688 if (!strcmp(arg, "--inaccurate-eof")) {
2693 if (check_index && prefix_length < 0) {
2694 prefix = setup_git_directory();
2695 prefix_length = prefix ? strlen(prefix) : 0;
2696 git_config(git_apply_config);
2697 if (!whitespace_option && apply_default_whitespace)
2698 parse_whitespace_option(apply_default_whitespace);
2700 if (0 < prefix_length)
2701 arg = prefix_filename(prefix, prefix_length, arg);
2703 fd = open(arg, O_RDONLY);
2707 set_default_whitespace_mode(whitespace_option);
2708 errs |= apply_patch(fd, arg, inaccurate_eof);
2711 set_default_whitespace_mode(whitespace_option);
2713 errs |= apply_patch(0, "<stdin>", inaccurate_eof);
2714 if (whitespace_error) {
2715 if (squelch_whitespace_errors &&
2716 squelch_whitespace_errors < whitespace_error) {
2718 whitespace_error - squelch_whitespace_errors;
2719 fprintf(stderr, "warning: squelched %d "
2720 "whitespace error%s\n",
2722 squelched == 1 ? "" : "s");
2724 if (new_whitespace == error_on_whitespace)
2725 die("%d line%s add%s trailing whitespaces.",
2727 whitespace_error == 1 ? "" : "s",
2728 whitespace_error == 1 ? "s" : "");
2729 if (applied_after_stripping)
2730 fprintf(stderr, "warning: %d line%s applied after"
2731 " stripping trailing whitespaces.\n",
2732 applied_after_stripping,
2733 applied_after_stripping == 1 ? "" : "s");
2734 else if (whitespace_error)
2735 fprintf(stderr, "warning: %d line%s add%s trailing"
2738 whitespace_error == 1 ? "" : "s",
2739 whitespace_error == 1 ? "s" : "");
2743 if (write_cache(newfd, active_cache, active_nr) ||
2744 close(newfd) || commit_lock_file(&lock_file))
2745 die("Unable to write new index file");