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 check_index;
32 static int write_index;
39 static int apply_in_reverse;
40 static int apply_with_reject;
41 static int apply_verbosely;
43 static int show_index_info;
44 static int line_termination = '\n';
45 static unsigned long p_context = ULONG_MAX;
46 static const char apply_usage[] =
47 "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>...";
49 static enum whitespace_eol {
54 } new_whitespace = warn_on_whitespace;
55 static int whitespace_error;
56 static int squelch_whitespace_errors = 5;
57 static int applied_after_stripping;
58 static const char *patch_input_file;
60 static void parse_whitespace_option(const char *option)
63 new_whitespace = warn_on_whitespace;
66 if (!strcmp(option, "warn")) {
67 new_whitespace = warn_on_whitespace;
70 if (!strcmp(option, "nowarn")) {
71 new_whitespace = nowarn_whitespace;
74 if (!strcmp(option, "error")) {
75 new_whitespace = error_on_whitespace;
78 if (!strcmp(option, "error-all")) {
79 new_whitespace = error_on_whitespace;
80 squelch_whitespace_errors = 0;
83 if (!strcmp(option, "strip")) {
84 new_whitespace = strip_whitespace;
87 die("unrecognized whitespace option '%s'", option);
90 static void set_default_whitespace_mode(const char *whitespace_option)
92 if (!whitespace_option && !apply_default_whitespace) {
93 new_whitespace = (apply
100 * For "diff-stat" like behaviour, we keep track of the biggest change
101 * we've seen, and the longest filename. That allows us to do simple
104 static int max_change, max_len;
107 * Various "current state", notably line numbers and what
108 * file (and how) we're patching right now.. The "is_xxxx"
109 * things are flags, where -1 means "don't know yet".
111 static int linenr = 1;
114 * This represents one "hunk" from a patch, starting with
115 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The
116 * patch text is pointed at by patch, and its byte length
117 * is stored in size. leading and trailing are the number
121 unsigned long leading, trailing;
122 unsigned long oldpos, oldlines;
123 unsigned long newpos, newlines;
127 struct fragment *next;
131 * When dealing with a binary patch, we reuse "leading" field
132 * to store the type of the binary hunk, either deflated "delta"
133 * or deflated "literal".
135 #define binary_patch_method leading
136 #define BINARY_DELTA_DEFLATED 1
137 #define BINARY_LITERAL_DEFLATED 2
140 char *new_name, *old_name, *def_name;
141 unsigned int old_mode, new_mode;
142 int is_new, is_delete; /* -1 = unknown, 0 = false, 1 = true */
144 unsigned long deflate_origlen;
145 int lines_added, lines_deleted;
147 unsigned int inaccurate_eof:1;
148 unsigned int is_binary:1;
149 unsigned int is_copy:1;
150 unsigned int is_rename:1;
151 struct fragment *fragments;
153 unsigned long resultsize;
154 char old_sha1_prefix[41];
155 char new_sha1_prefix[41];
159 static void say_patch_name(FILE *output, const char *pre, struct patch *patch, const char *post)
162 if (patch->old_name && patch->new_name &&
163 strcmp(patch->old_name, patch->new_name)) {
164 write_name_quoted(NULL, 0, patch->old_name, 1, output);
165 fputs(" => ", output);
166 write_name_quoted(NULL, 0, patch->new_name, 1, output);
169 const char *n = patch->new_name;
172 write_name_quoted(NULL, 0, n, 1, output);
177 #define CHUNKSIZE (8192)
180 static void *read_patch_file(int fd, unsigned long *sizep)
182 unsigned long size = 0, alloc = CHUNKSIZE;
183 void *buffer = xmalloc(alloc);
186 int nr = alloc - size;
189 buffer = xrealloc(buffer, alloc);
192 nr = xread(fd, (char *) buffer + size, nr);
196 die("git-apply: read returned %s", strerror(errno));
202 * Make sure that we have some slop in the buffer
203 * so that we can do speculative "memcmp" etc, and
204 * see to it that it is NUL-filled.
206 if (alloc < size + SLOP)
207 buffer = xrealloc(buffer, size + SLOP);
208 memset((char *) buffer + size, 0, SLOP);
212 static unsigned long linelen(const char *buffer, unsigned long size)
214 unsigned long len = 0;
217 if (*buffer++ == '\n')
223 static int is_dev_null(const char *str)
225 return !memcmp("/dev/null", str, 9) && isspace(str[9]);
231 static int name_terminate(const char *name, int namelen, int c, int terminate)
233 if (c == ' ' && !(terminate & TERM_SPACE))
235 if (c == '\t' && !(terminate & TERM_TAB))
241 static char * find_name(const char *line, char *def, int p_value, int terminate)
244 const char *start = line;
248 /* Proposed "new-style" GNU patch/diff format; see
249 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
251 name = unquote_c_style(line, NULL);
255 cp = strchr(name, '/');
262 /* name can later be freed, so we need
263 * to memmove, not just return cp
265 memmove(name, cp, strlen(cp) + 1);
282 if (name_terminate(start, line-start, c, terminate))
286 if (c == '/' && !--p_value)
296 * Generally we prefer the shorter name, especially
297 * if the other one is just a variation of that with
298 * something else tacked on to the end (ie "file.orig"
302 int deflen = strlen(def);
303 if (deflen < len && !strncmp(start, def, deflen))
307 name = xmalloc(len + 1);
308 memcpy(name, start, len);
315 * Get the name etc info from the --/+++ lines of a traditional patch header
317 * NOTE! This hardcodes "-p1" behaviour in filename detection.
319 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
320 * files, we can happily check the index for a match, but for creating a
321 * new file we should try to match whatever "patch" does. I have no idea.
323 static void parse_traditional_patch(const char *first, const char *second, struct patch *patch)
327 first += 4; /* skip "--- " */
328 second += 4; /* skip "+++ " */
329 if (is_dev_null(first)) {
331 patch->is_delete = 0;
332 name = find_name(second, NULL, p_value, TERM_SPACE | TERM_TAB);
333 patch->new_name = name;
334 } else if (is_dev_null(second)) {
336 patch->is_delete = 1;
337 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
338 patch->old_name = name;
340 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
341 name = find_name(second, name, p_value, TERM_SPACE | TERM_TAB);
342 patch->old_name = patch->new_name = name;
345 die("unable to find filename in patch at line %d", linenr);
348 static int gitdiff_hdrend(const char *line, struct patch *patch)
354 * We're anal about diff header consistency, to make
355 * sure that we don't end up having strange ambiguous
356 * patches floating around.
358 * As a result, gitdiff_{old|new}name() will check
359 * their names against any previous information, just
362 static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, const char *oldnew)
364 if (!orig_name && !isnull)
365 return find_name(line, NULL, 1, TERM_TAB);
374 die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr);
375 another = find_name(line, NULL, 1, TERM_TAB);
376 if (!another || memcmp(another, name, len))
377 die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr);
382 /* expect "/dev/null" */
383 if (memcmp("/dev/null", line, 9) || line[9] != '\n')
384 die("git-apply: bad git-diff - expected /dev/null on line %d", linenr);
389 static int gitdiff_oldname(const char *line, struct patch *patch)
391 patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name, "old");
395 static int gitdiff_newname(const char *line, struct patch *patch)
397 patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name, "new");
401 static int gitdiff_oldmode(const char *line, struct patch *patch)
403 patch->old_mode = strtoul(line, NULL, 8);
407 static int gitdiff_newmode(const char *line, struct patch *patch)
409 patch->new_mode = strtoul(line, NULL, 8);
413 static int gitdiff_delete(const char *line, struct patch *patch)
415 patch->is_delete = 1;
416 patch->old_name = patch->def_name;
417 return gitdiff_oldmode(line, patch);
420 static int gitdiff_newfile(const char *line, struct patch *patch)
423 patch->new_name = patch->def_name;
424 return gitdiff_newmode(line, patch);
427 static int gitdiff_copysrc(const char *line, struct patch *patch)
430 patch->old_name = find_name(line, NULL, 0, 0);
434 static int gitdiff_copydst(const char *line, struct patch *patch)
437 patch->new_name = find_name(line, NULL, 0, 0);
441 static int gitdiff_renamesrc(const char *line, struct patch *patch)
443 patch->is_rename = 1;
444 patch->old_name = find_name(line, NULL, 0, 0);
448 static int gitdiff_renamedst(const char *line, struct patch *patch)
450 patch->is_rename = 1;
451 patch->new_name = find_name(line, NULL, 0, 0);
455 static int gitdiff_similarity(const char *line, struct patch *patch)
457 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
462 static int gitdiff_dissimilarity(const char *line, struct patch *patch)
464 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
469 static int gitdiff_index(const char *line, struct patch *patch)
471 /* index line is N hexadecimal, "..", N hexadecimal,
472 * and optional space with octal mode.
474 const char *ptr, *eol;
477 ptr = strchr(line, '.');
478 if (!ptr || ptr[1] != '.' || 40 < ptr - line)
481 memcpy(patch->old_sha1_prefix, line, len);
482 patch->old_sha1_prefix[len] = 0;
485 ptr = strchr(line, ' ');
486 eol = strchr(line, '\n');
488 if (!ptr || eol < ptr)
494 memcpy(patch->new_sha1_prefix, line, len);
495 patch->new_sha1_prefix[len] = 0;
497 patch->new_mode = patch->old_mode = strtoul(ptr+1, NULL, 8);
502 * This is normal for a diff that doesn't change anything: we'll fall through
503 * into the next diff. Tell the parser to break out.
505 static int gitdiff_unrecognized(const char *line, struct patch *patch)
510 static const char *stop_at_slash(const char *line, int llen)
514 for (i = 0; i < llen; i++) {
522 /* This is to extract the same name that appears on "diff --git"
523 * line. We do not find and return anything if it is a rename
524 * patch, and it is OK because we will find the name elsewhere.
525 * We need to reliably find name only when it is mode-change only,
526 * creation or deletion of an empty file. In any of these cases,
527 * both sides are the same name under a/ and b/ respectively.
529 static char *git_header_name(char *line, int llen)
533 const char *second = NULL;
535 line += strlen("diff --git ");
536 llen -= strlen("diff --git ");
540 char *first = unquote_c_style(line, &second);
544 /* advance to the first slash */
545 cp = stop_at_slash(first, strlen(first));
546 if (!cp || cp == first) {
547 /* we do not accept absolute paths */
553 memmove(first, cp+1, len+1); /* including NUL */
555 /* second points at one past closing dq of name.
556 * find the second name.
558 while ((second < line + llen) && isspace(*second))
561 if (line + llen <= second)
562 goto free_first_and_fail;
563 if (*second == '"') {
564 char *sp = unquote_c_style(second, NULL);
566 goto free_first_and_fail;
567 cp = stop_at_slash(sp, strlen(sp));
568 if (!cp || cp == sp) {
571 goto free_first_and_fail;
573 /* They must match, otherwise ignore */
574 if (strcmp(cp+1, first))
575 goto free_both_and_fail;
580 /* unquoted second */
581 cp = stop_at_slash(second, line + llen - second);
582 if (!cp || cp == second)
583 goto free_first_and_fail;
585 if (line + llen - cp != len + 1 ||
586 memcmp(first, cp, len))
587 goto free_first_and_fail;
591 /* unquoted first name */
592 name = stop_at_slash(line, llen);
593 if (!name || name == line)
598 /* since the first name is unquoted, a dq if exists must be
599 * the beginning of the second name.
601 for (second = name; second < line + llen; second++) {
602 if (*second == '"') {
603 const char *cp = second;
605 char *sp = unquote_c_style(second, NULL);
609 np = stop_at_slash(sp, strlen(sp));
610 if (!np || np == sp) {
611 free_second_and_fail:
617 if (len < cp - name &&
618 !strncmp(np, name, len) &&
619 isspace(name[len])) {
621 memmove(sp, np, len + 1);
624 goto free_second_and_fail;
629 * Accept a name only if it shows up twice, exactly the same
632 for (len = 0 ; ; len++) {
647 if (second[len] == '\n' && !memcmp(name, second, len)) {
648 char *ret = xmalloc(len + 1);
649 memcpy(ret, name, len);
658 /* Verify that we recognize the lines following a git header */
659 static int parse_git_header(char *line, int len, unsigned int size, struct patch *patch)
661 unsigned long offset;
663 /* A git diff has explicit new/delete information, so we don't guess */
665 patch->is_delete = 0;
668 * Some things may not have the old name in the
669 * rest of the headers anywhere (pure mode changes,
670 * or removing or adding empty files), so we get
671 * the default name from the header.
673 patch->def_name = git_header_name(line, len);
678 for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {
679 static const struct opentry {
681 int (*fn)(const char *, struct patch *);
683 { "@@ -", gitdiff_hdrend },
684 { "--- ", gitdiff_oldname },
685 { "+++ ", gitdiff_newname },
686 { "old mode ", gitdiff_oldmode },
687 { "new mode ", gitdiff_newmode },
688 { "deleted file mode ", gitdiff_delete },
689 { "new file mode ", gitdiff_newfile },
690 { "copy from ", gitdiff_copysrc },
691 { "copy to ", gitdiff_copydst },
692 { "rename old ", gitdiff_renamesrc },
693 { "rename new ", gitdiff_renamedst },
694 { "rename from ", gitdiff_renamesrc },
695 { "rename to ", gitdiff_renamedst },
696 { "similarity index ", gitdiff_similarity },
697 { "dissimilarity index ", gitdiff_dissimilarity },
698 { "index ", gitdiff_index },
699 { "", gitdiff_unrecognized },
703 len = linelen(line, size);
704 if (!len || line[len-1] != '\n')
706 for (i = 0; i < ARRAY_SIZE(optable); i++) {
707 const struct opentry *p = optable + i;
708 int oplen = strlen(p->str);
709 if (len < oplen || memcmp(p->str, line, oplen))
711 if (p->fn(line + oplen, patch) < 0)
720 static int parse_num(const char *line, unsigned long *p)
726 *p = strtoul(line, &ptr, 10);
730 static int parse_range(const char *line, int len, int offset, const char *expect,
731 unsigned long *p1, unsigned long *p2)
735 if (offset < 0 || offset >= len)
740 digits = parse_num(line, p1);
750 digits = parse_num(line+1, p2);
762 if (memcmp(line, expect, ex))
769 * Parse a unified diff fragment header of the
770 * form "@@ -a,b +c,d @@"
772 static int parse_fragment_header(char *line, int len, struct fragment *fragment)
776 if (!len || line[len-1] != '\n')
779 /* Figure out the number of lines in a fragment */
780 offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);
781 offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);
786 static int find_header(char *line, unsigned long size, int *hdrsize, struct patch *patch)
788 unsigned long offset, len;
790 patch->is_rename = patch->is_copy = 0;
791 patch->is_new = patch->is_delete = -1;
792 patch->old_mode = patch->new_mode = 0;
793 patch->old_name = patch->new_name = NULL;
794 for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {
795 unsigned long nextlen;
797 len = linelen(line, size);
801 /* Testing this early allows us to take a few shortcuts.. */
806 * Make sure we don't find any unconnected patch fragments.
807 * That's a sign that we didn't find a header, and that a
808 * patch has become corrupted/broken up.
810 if (!memcmp("@@ -", line, 4)) {
811 struct fragment dummy;
812 if (parse_fragment_header(line, len, &dummy) < 0)
814 error("patch fragment without header at line %d: %.*s", linenr, (int)len-1, line);
821 * Git patch? It might not have a real patch, just a rename
822 * or mode change, so we handle that specially
824 if (!memcmp("diff --git ", line, 11)) {
825 int git_hdr_len = parse_git_header(line, len, size, patch);
826 if (git_hdr_len <= len)
828 if (!patch->old_name && !patch->new_name) {
829 if (!patch->def_name)
830 die("git diff header lacks filename information (line %d)", linenr);
831 patch->old_name = patch->new_name = patch->def_name;
833 *hdrsize = git_hdr_len;
837 /** --- followed by +++ ? */
838 if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4))
842 * We only accept unified patches, so we want it to
843 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
846 nextlen = linelen(line + len, size - len);
847 if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))
850 /* Ok, we'll consider it a patch */
851 parse_traditional_patch(line, line+len, patch);
852 *hdrsize = len + nextlen;
859 static void check_whitespace(const char *line, int len)
861 const char *err = "Adds trailing whitespace";
866 * We know len is at least two, since we have a '+' and we
867 * checked that the last character was a '\n' before calling
868 * this function. That is, an addition of an empty line would
869 * check the '+' here. Sneaky...
871 if (isspace(line[len-2]))
875 * Make sure that there is no space followed by a tab in
878 err = "Space in indent is followed by a tab";
879 for (i = 1; i < len; i++) {
880 if (line[i] == '\t') {
884 else if (line[i] == ' ')
893 if (squelch_whitespace_errors &&
894 squelch_whitespace_errors < whitespace_error)
897 fprintf(stderr, "%s.\n%s:%d:%.*s\n",
898 err, patch_input_file, linenr, len-2, line+1);
903 * Parse a unified diff. Note that this really needs to parse each
904 * fragment separately, since the only way to know the difference
905 * between a "---" that is part of a patch, and a "---" that starts
906 * the next patch is to look at the line counts..
908 static int parse_fragment(char *line, unsigned long size, struct patch *patch, struct fragment *fragment)
911 int len = linelen(line, size), offset;
912 unsigned long oldlines, newlines;
913 unsigned long leading, trailing;
915 offset = parse_fragment_header(line, len, fragment);
918 oldlines = fragment->oldlines;
919 newlines = fragment->newlines;
923 /* Parse the thing.. */
930 offset += len, size -= len, line += len, linenr++) {
931 if (!oldlines && !newlines)
933 len = linelen(line, size);
934 if (!len || line[len-1] != '\n')
939 case '\n': /* newer GNU diff, an empty context line */
943 if (!deleted && !added)
953 if (new_whitespace != nowarn_whitespace)
954 check_whitespace(line, len);
960 /* We allow "\ No newline at end of file". Depending
961 * on locale settings when the patch was produced we
962 * don't know what this line looks like. The only
963 * thing we do know is that it begins with "\ ".
964 * Checking for 12 is just for sanity check -- any
965 * l10n of "\ No newline..." is at least that long.
968 if (len < 12 || memcmp(line, "\\ ", 2))
973 if (oldlines || newlines)
975 fragment->leading = leading;
976 fragment->trailing = trailing;
978 /* If a fragment ends with an incomplete line, we failed to include
979 * it in the above loop because we hit oldlines == newlines == 0
982 if (12 < size && !memcmp(line, "\\ ", 2))
983 offset += linelen(line, size);
985 patch->lines_added += added;
986 patch->lines_deleted += deleted;
988 if (0 < patch->is_new && oldlines)
989 return error("new file depends on old contents");
990 if (0 < patch->is_delete && newlines)
991 return error("deleted file still has contents");
995 static int parse_single_patch(char *line, unsigned long size, struct patch *patch)
997 unsigned long offset = 0;
998 unsigned long oldlines = 0, newlines = 0, context = 0;
999 struct fragment **fragp = &patch->fragments;
1001 while (size > 4 && !memcmp(line, "@@ -", 4)) {
1002 struct fragment *fragment;
1005 fragment = xcalloc(1, sizeof(*fragment));
1006 len = parse_fragment(line, size, patch, fragment);
1008 die("corrupt patch at line %d", linenr);
1009 fragment->patch = line;
1010 fragment->size = len;
1011 oldlines += fragment->oldlines;
1012 newlines += fragment->newlines;
1013 context += fragment->leading + fragment->trailing;
1016 fragp = &fragment->next;
1024 * If something was removed (i.e. we have old-lines) it cannot
1025 * be creation, and if something was added it cannot be
1026 * deletion. However, the reverse is not true; --unified=0
1027 * patches that only add are not necessarily creation even
1028 * though they do not have any old lines, and ones that only
1029 * delete are not necessarily deletion.
1031 * Unfortunately, a real creation/deletion patch do _not_ have
1032 * any context line by definition, so we cannot safely tell it
1033 * apart with --unified=0 insanity. At least if the patch has
1034 * more than one hunk it is not creation or deletion.
1036 if (patch->is_new < 0 &&
1037 (oldlines || (patch->fragments && patch->fragments->next)))
1039 if (patch->is_delete < 0 &&
1040 (newlines || (patch->fragments && patch->fragments->next)))
1041 patch->is_delete = 0;
1042 if (!unidiff_zero || context) {
1043 /* If the user says the patch is not generated with
1044 * --unified=0, or if we have seen context lines,
1045 * then not having oldlines means the patch is creation,
1046 * and not having newlines means the patch is deletion.
1048 if (patch->is_new < 0 && !oldlines) {
1050 patch->old_name = NULL;
1052 if (patch->is_delete < 0 && !newlines) {
1053 patch->is_delete = 1;
1054 patch->new_name = NULL;
1058 if (0 < patch->is_new && oldlines)
1059 die("new file %s depends on old contents", patch->new_name);
1060 if (0 < patch->is_delete && newlines)
1061 die("deleted file %s still has contents", patch->old_name);
1062 if (!patch->is_delete && !newlines && context)
1063 fprintf(stderr, "** warning: file %s becomes empty but "
1064 "is not deleted\n", patch->new_name);
1069 static inline int metadata_changes(struct patch *patch)
1071 return patch->is_rename > 0 ||
1072 patch->is_copy > 0 ||
1073 patch->is_new > 0 ||
1075 (patch->old_mode && patch->new_mode &&
1076 patch->old_mode != patch->new_mode);
1079 static char *inflate_it(const void *data, unsigned long size,
1080 unsigned long inflated_size)
1086 memset(&stream, 0, sizeof(stream));
1088 stream.next_in = (unsigned char *)data;
1089 stream.avail_in = size;
1090 stream.next_out = out = xmalloc(inflated_size);
1091 stream.avail_out = inflated_size;
1092 inflateInit(&stream);
1093 st = inflate(&stream, Z_FINISH);
1094 if ((st != Z_STREAM_END) || stream.total_out != inflated_size) {
1101 static struct fragment *parse_binary_hunk(char **buf_p,
1102 unsigned long *sz_p,
1106 /* Expect a line that begins with binary patch method ("literal"
1107 * or "delta"), followed by the length of data before deflating.
1108 * a sequence of 'length-byte' followed by base-85 encoded data
1109 * should follow, terminated by a newline.
1111 * Each 5-byte sequence of base-85 encodes up to 4 bytes,
1112 * and we would limit the patch line to 66 characters,
1113 * so one line can fit up to 13 groups that would decode
1114 * to 52 bytes max. The length byte 'A'-'Z' corresponds
1115 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
1118 unsigned long size = *sz_p;
1119 char *buffer = *buf_p;
1121 unsigned long origlen;
1124 struct fragment *frag;
1126 llen = linelen(buffer, size);
1131 if (!strncmp(buffer, "delta ", 6)) {
1132 patch_method = BINARY_DELTA_DEFLATED;
1133 origlen = strtoul(buffer + 6, NULL, 10);
1135 else if (!strncmp(buffer, "literal ", 8)) {
1136 patch_method = BINARY_LITERAL_DEFLATED;
1137 origlen = strtoul(buffer + 8, NULL, 10);
1145 int byte_length, max_byte_length, newsize;
1146 llen = linelen(buffer, size);
1150 /* consume the blank line */
1155 /* Minimum line is "A00000\n" which is 7-byte long,
1156 * and the line length must be multiple of 5 plus 2.
1158 if ((llen < 7) || (llen-2) % 5)
1160 max_byte_length = (llen - 2) / 5 * 4;
1161 byte_length = *buffer;
1162 if ('A' <= byte_length && byte_length <= 'Z')
1163 byte_length = byte_length - 'A' + 1;
1164 else if ('a' <= byte_length && byte_length <= 'z')
1165 byte_length = byte_length - 'a' + 27;
1168 /* if the input length was not multiple of 4, we would
1169 * have filler at the end but the filler should never
1172 if (max_byte_length < byte_length ||
1173 byte_length <= max_byte_length - 4)
1175 newsize = hunk_size + byte_length;
1176 data = xrealloc(data, newsize);
1177 if (decode_85(data + hunk_size, buffer + 1, byte_length))
1179 hunk_size = newsize;
1184 frag = xcalloc(1, sizeof(*frag));
1185 frag->patch = inflate_it(data, hunk_size, origlen);
1189 frag->size = origlen;
1193 frag->binary_patch_method = patch_method;
1199 error("corrupt binary patch at line %d: %.*s",
1200 linenr-1, llen-1, buffer);
1204 static int parse_binary(char *buffer, unsigned long size, struct patch *patch)
1206 /* We have read "GIT binary patch\n"; what follows is a line
1207 * that says the patch method (currently, either "literal" or
1208 * "delta") and the length of data before deflating; a
1209 * sequence of 'length-byte' followed by base-85 encoded data
1212 * When a binary patch is reversible, there is another binary
1213 * hunk in the same format, starting with patch method (either
1214 * "literal" or "delta") with the length of data, and a sequence
1215 * of length-byte + base-85 encoded data, terminated with another
1216 * empty line. This data, when applied to the postimage, produces
1219 struct fragment *forward;
1220 struct fragment *reverse;
1224 forward = parse_binary_hunk(&buffer, &size, &status, &used);
1225 if (!forward && !status)
1226 /* there has to be one hunk (forward hunk) */
1227 return error("unrecognized binary patch at line %d", linenr-1);
1229 /* otherwise we already gave an error message */
1232 reverse = parse_binary_hunk(&buffer, &size, &status, &used_1);
1236 /* not having reverse hunk is not an error, but having
1237 * a corrupt reverse hunk is.
1239 free((void*) forward->patch);
1243 forward->next = reverse;
1244 patch->fragments = forward;
1245 patch->is_binary = 1;
1249 static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
1251 int hdrsize, patchsize;
1252 int offset = find_header(buffer, size, &hdrsize, patch);
1257 patchsize = parse_single_patch(buffer + offset + hdrsize, size - offset - hdrsize, patch);
1260 static const char *binhdr[] = {
1265 static const char git_binary[] = "GIT binary patch\n";
1267 int hd = hdrsize + offset;
1268 unsigned long llen = linelen(buffer + hd, size - hd);
1270 if (llen == sizeof(git_binary) - 1 &&
1271 !memcmp(git_binary, buffer + hd, llen)) {
1274 used = parse_binary(buffer + hd + llen,
1275 size - hd - llen, patch);
1277 patchsize = used + llen;
1281 else if (!memcmp(" differ\n", buffer + hd + llen - 8, 8)) {
1282 for (i = 0; binhdr[i]; i++) {
1283 int len = strlen(binhdr[i]);
1284 if (len < size - hd &&
1285 !memcmp(binhdr[i], buffer + hd, len)) {
1287 patch->is_binary = 1;
1294 /* Empty patch cannot be applied if it is a text patch
1295 * without metadata change. A binary patch appears
1298 if ((apply || check) &&
1299 (!patch->is_binary && !metadata_changes(patch)))
1300 die("patch with only garbage at line %d", linenr);
1303 return offset + hdrsize + patchsize;
1306 #define swap(a,b) myswap((a),(b),sizeof(a))
1308 #define myswap(a, b, size) do { \
1309 unsigned char mytmp[size]; \
1310 memcpy(mytmp, &a, size); \
1311 memcpy(&a, &b, size); \
1312 memcpy(&b, mytmp, size); \
1315 static void reverse_patches(struct patch *p)
1317 for (; p; p = p->next) {
1318 struct fragment *frag = p->fragments;
1320 swap(p->new_name, p->old_name);
1321 swap(p->new_mode, p->old_mode);
1322 swap(p->is_new, p->is_delete);
1323 swap(p->lines_added, p->lines_deleted);
1324 swap(p->old_sha1_prefix, p->new_sha1_prefix);
1326 for (; frag; frag = frag->next) {
1327 swap(frag->newpos, frag->oldpos);
1328 swap(frag->newlines, frag->oldlines);
1333 static const char pluses[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
1334 static const char minuses[]= "----------------------------------------------------------------------";
1336 static void show_stats(struct patch *patch)
1338 const char *prefix = "";
1339 char *name = patch->new_name;
1341 int len, max, add, del, total;
1344 name = patch->old_name;
1346 if (0 < (len = quote_c_style(name, NULL, NULL, 0))) {
1347 qname = xmalloc(len + 1);
1348 quote_c_style(name, qname, NULL, 0);
1353 * "scale" the filename
1364 slash = strchr(name, '/');
1371 * scale the add/delete
1377 add = patch->lines_added;
1378 del = patch->lines_deleted;
1381 if (max_change > 0) {
1382 total = (total * max + max_change / 2) / max_change;
1383 add = (add * max + max_change / 2) / max_change;
1386 if (patch->is_binary)
1387 printf(" %s%-*s | Bin\n", prefix, len, name);
1389 printf(" %s%-*s |%5d %.*s%.*s\n", prefix,
1390 len, name, patch->lines_added + patch->lines_deleted,
1391 add, pluses, del, minuses);
1395 static int read_old_data(struct stat *st, const char *path, void *buf, unsigned long size)
1400 switch (st->st_mode & S_IFMT) {
1402 return readlink(path, buf, size);
1404 fd = open(path, O_RDONLY);
1406 return error("unable to open %s", path);
1409 int ret = xread(fd, (char *) buf + got, size - got);
1422 static int find_offset(const char *buf, unsigned long size, const char *fragment, unsigned long fragsize, int line, int *lines)
1425 unsigned long start, backwards, forwards;
1427 if (fragsize > size)
1432 unsigned long offset = 0;
1434 while (offset + fragsize <= size) {
1435 if (buf[offset++] == '\n') {
1443 /* Exact line number? */
1444 if (!memcmp(buf + start, fragment, fragsize))
1448 * There's probably some smart way to do this, but I'll leave
1449 * that to the smart and beautiful people. I'm simple and stupid.
1453 for (i = 0; ; i++) {
1460 if (forwards + fragsize > size)
1466 } while (backwards && buf[backwards-1] != '\n');
1469 while (forwards + fragsize <= size) {
1470 if (buf[forwards++] == '\n')
1476 if (try + fragsize > size)
1478 if (memcmp(buf + try, fragment, fragsize))
1488 * We should start searching forward and backward.
1493 static void remove_first_line(const char **rbuf, int *rsize)
1495 const char *buf = *rbuf;
1497 unsigned long offset;
1499 while (offset <= size) {
1500 if (buf[offset++] == '\n')
1503 *rsize = size - offset;
1504 *rbuf = buf + offset;
1507 static void remove_last_line(const char **rbuf, int *rsize)
1509 const char *buf = *rbuf;
1511 unsigned long offset;
1513 while (offset > 0) {
1514 if (buf[--offset] == '\n')
1517 *rsize = offset + 1;
1520 struct buffer_desc {
1523 unsigned long alloc;
1526 static int apply_line(char *output, const char *patch, int plen)
1528 /* plen is number of bytes to be copied from patch,
1529 * starting at patch+1 (patch[0] is '+'). Typically
1530 * patch[plen] is '\n', unless this is the incomplete
1534 int add_nl_to_tail = 0;
1536 int last_tab_in_indent = -1;
1537 int last_space_in_indent = -1;
1538 int need_fix_leading_space = 0;
1541 if ((new_whitespace != strip_whitespace) || !whitespace_error) {
1542 memcpy(output, patch + 1, plen);
1546 if (1 < plen && isspace(patch[plen-1])) {
1547 if (patch[plen] == '\n')
1550 while (0 < plen && isspace(patch[plen]))
1555 for (i = 1; i < plen; i++) {
1558 last_tab_in_indent = i;
1559 if (0 <= last_space_in_indent)
1560 need_fix_leading_space = 1;
1563 last_space_in_indent = i;
1569 if (need_fix_leading_space) {
1570 /* between patch[1..last_tab_in_indent] strip the
1571 * funny spaces, updating them to tab as needed.
1573 for (i = 1; i < last_tab_in_indent; i++, plen--) {
1577 else if ((i % 8) == 0)
1581 i = last_tab_in_indent;
1586 memcpy(output, patch + i, plen);
1588 output[plen++] = '\n';
1590 applied_after_stripping++;
1591 return output + plen - buf;
1594 static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag, int inaccurate_eof)
1596 int match_beginning, match_end;
1597 char *buf = desc->buffer;
1598 const char *patch = frag->patch;
1599 int offset, size = frag->size;
1600 char *old = xmalloc(size);
1601 char *new = xmalloc(size);
1602 const char *oldlines, *newlines;
1603 int oldsize = 0, newsize = 0;
1604 unsigned long leading, trailing;
1609 int len = linelen(patch, size);
1616 * "plen" is how much of the line we should use for
1617 * the actual patch data. Normally we just remove the
1618 * first character on the line, but if the line is
1619 * followed by "\ No newline", then we also remove the
1620 * last one (which is the newline, of course).
1623 if (len < size && patch[len] == '\\')
1626 if (apply_in_reverse) {
1629 else if (first == '+')
1634 /* Newer GNU diff, empty context line */
1636 /* ... followed by '\No newline'; nothing */
1638 old[oldsize++] = '\n';
1639 new[newsize++] = '\n';
1643 memcpy(old + oldsize, patch + 1, plen);
1647 /* Fall-through for ' ' */
1649 if (first != '+' || !no_add)
1650 newsize += apply_line(new + newsize, patch,
1653 case '@': case '\\':
1654 /* Ignore it, we already handled it */
1663 if (inaccurate_eof && oldsize > 0 && old[oldsize - 1] == '\n' &&
1664 newsize > 0 && new[newsize - 1] == '\n') {
1671 leading = frag->leading;
1672 trailing = frag->trailing;
1675 * If we don't have any leading/trailing data in the patch,
1676 * we want it to match at the beginning/end of the file.
1678 * But that would break if the patch is generated with
1679 * --unified=0; sane people wouldn't do that to cause us
1680 * trouble, but we try to please not so sane ones as well.
1683 match_beginning = (!leading && !frag->oldpos);
1687 match_beginning = !leading && (frag->oldpos == 1);
1688 match_end = !trailing;
1694 offset = find_offset(buf, desc->size,
1695 oldlines, oldsize, pos, &lines);
1696 if (match_end && offset + oldsize != desc->size)
1698 if (match_beginning && offset)
1701 int diff = newsize - oldsize;
1702 unsigned long size = desc->size + diff;
1703 unsigned long alloc = desc->alloc;
1705 /* Warn if it was necessary to reduce the number
1708 if ((leading != frag->leading) ||
1709 (trailing != frag->trailing))
1710 fprintf(stderr, "Context reduced to (%ld/%ld)"
1711 " to apply fragment at %d\n",
1712 leading, trailing, pos + lines);
1715 alloc = size + 8192;
1716 desc->alloc = alloc;
1717 buf = xrealloc(buf, alloc);
1721 memmove(buf + offset + newsize,
1722 buf + offset + oldsize,
1723 size - offset - newsize);
1724 memcpy(buf + offset, newlines, newsize);
1730 /* Am I at my context limits? */
1731 if ((leading <= p_context) && (trailing <= p_context))
1733 if (match_beginning || match_end) {
1734 match_beginning = match_end = 0;
1737 /* Reduce the number of context lines
1738 * Reduce both leading and trailing if they are equal
1739 * otherwise just reduce the larger context.
1741 if (leading >= trailing) {
1742 remove_first_line(&oldlines, &oldsize);
1743 remove_first_line(&newlines, &newsize);
1747 if (trailing > leading) {
1748 remove_last_line(&oldlines, &oldsize);
1749 remove_last_line(&newlines, &newsize);
1759 static int apply_binary_fragment(struct buffer_desc *desc, struct patch *patch)
1761 unsigned long dst_size;
1762 struct fragment *fragment = patch->fragments;
1766 /* Binary patch is irreversible without the optional second hunk */
1767 if (apply_in_reverse) {
1768 if (!fragment->next)
1769 return error("cannot reverse-apply a binary patch "
1770 "without the reverse hunk to '%s'",
1772 ? patch->new_name : patch->old_name);
1773 fragment = fragment->next;
1775 data = (void*) fragment->patch;
1776 switch (fragment->binary_patch_method) {
1777 case BINARY_DELTA_DEFLATED:
1778 result = patch_delta(desc->buffer, desc->size,
1783 desc->buffer = result;
1785 case BINARY_LITERAL_DEFLATED:
1787 desc->buffer = data;
1788 dst_size = fragment->size;
1793 desc->size = desc->alloc = dst_size;
1797 static int apply_binary(struct buffer_desc *desc, struct patch *patch)
1799 const char *name = patch->old_name ? patch->old_name : patch->new_name;
1800 unsigned char sha1[20];
1802 /* For safety, we require patch index line to contain
1803 * full 40-byte textual SHA1 for old and new, at least for now.
1805 if (strlen(patch->old_sha1_prefix) != 40 ||
1806 strlen(patch->new_sha1_prefix) != 40 ||
1807 get_sha1_hex(patch->old_sha1_prefix, sha1) ||
1808 get_sha1_hex(patch->new_sha1_prefix, sha1))
1809 return error("cannot apply binary patch to '%s' "
1810 "without full index line", name);
1812 if (patch->old_name) {
1813 /* See if the old one matches what the patch
1816 hash_sha1_file(desc->buffer, desc->size, blob_type, sha1);
1817 if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))
1818 return error("the patch applies to '%s' (%s), "
1819 "which does not match the "
1820 "current contents.",
1821 name, sha1_to_hex(sha1));
1824 /* Otherwise, the old one must be empty. */
1826 return error("the patch applies to an empty "
1827 "'%s' but it is not empty", name);
1830 get_sha1_hex(patch->new_sha1_prefix, sha1);
1831 if (is_null_sha1(sha1)) {
1833 desc->alloc = desc->size = 0;
1834 desc->buffer = NULL;
1835 return 0; /* deletion patch */
1838 if (has_sha1_file(sha1)) {
1839 /* We already have the postimage */
1844 desc->buffer = read_sha1_file(sha1, type, &size);
1846 return error("the necessary postimage %s for "
1847 "'%s' cannot be read",
1848 patch->new_sha1_prefix, name);
1849 desc->alloc = desc->size = size;
1852 /* We have verified desc matches the preimage;
1853 * apply the patch data to it, which is stored
1854 * in the patch->fragments->{patch,size}.
1856 if (apply_binary_fragment(desc, patch))
1857 return error("binary patch does not apply to '%s'",
1860 /* verify that the result matches */
1861 hash_sha1_file(desc->buffer, desc->size, blob_type, sha1);
1862 if (strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))
1863 return error("binary patch to '%s' creates incorrect result (expecting %s, got %s)", name, patch->new_sha1_prefix, sha1_to_hex(sha1));
1869 static int apply_fragments(struct buffer_desc *desc, struct patch *patch)
1871 struct fragment *frag = patch->fragments;
1872 const char *name = patch->old_name ? patch->old_name : patch->new_name;
1874 if (patch->is_binary)
1875 return apply_binary(desc, patch);
1878 if (apply_one_fragment(desc, frag, patch->inaccurate_eof)) {
1879 error("patch failed: %s:%ld", name, frag->oldpos);
1880 if (!apply_with_reject)
1889 static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *ce)
1892 unsigned long size, alloc;
1893 struct buffer_desc desc;
1901 buf = read_sha1_file(ce->sha1, type, &size);
1903 return error("read of %s failed",
1908 else if (patch->old_name) {
1910 alloc = size + 8192;
1911 buf = xmalloc(alloc);
1912 if (read_old_data(st, patch->old_name, buf, alloc) != size)
1913 return error("read of %s failed", patch->old_name);
1920 if (apply_fragments(&desc, patch) < 0)
1921 return -1; /* note with --reject this succeeds. */
1923 /* NUL terminate the result */
1924 if (desc.alloc <= desc.size)
1925 desc.buffer = xrealloc(desc.buffer, desc.size + 1);
1926 desc.buffer[desc.size] = 0;
1928 patch->result = desc.buffer;
1929 patch->resultsize = desc.size;
1931 if (0 < patch->is_delete && patch->resultsize)
1932 return error("removal patch leaves file contents");
1937 static int check_patch(struct patch *patch, struct patch *prev_patch)
1940 const char *old_name = patch->old_name;
1941 const char *new_name = patch->new_name;
1942 const char *name = old_name ? old_name : new_name;
1943 struct cache_entry *ce = NULL;
1946 patch->rejected = 1; /* we will drop this after we succeed */
1950 unsigned st_mode = 0;
1953 stat_ret = lstat(old_name, &st);
1955 int pos = cache_name_pos(old_name, strlen(old_name));
1957 return error("%s: does not exist in index",
1959 ce = active_cache[pos];
1961 struct checkout costate;
1962 if (errno != ENOENT)
1963 return error("%s: %s", old_name,
1966 costate.base_dir = "";
1967 costate.base_dir_len = 0;
1970 costate.not_new = 0;
1971 costate.refresh_cache = 1;
1972 if (checkout_entry(ce,
1975 lstat(old_name, &st))
1979 changed = ce_match_stat(ce, &st, 1);
1981 return error("%s: does not match index",
1984 st_mode = ntohl(ce->ce_mode);
1986 else if (stat_ret < 0)
1987 return error("%s: %s", old_name, strerror(errno));
1990 st_mode = ntohl(create_ce_mode(st.st_mode));
1992 if (patch->is_new < 0)
1994 if (!patch->old_mode)
1995 patch->old_mode = st_mode;
1996 if ((st_mode ^ patch->old_mode) & S_IFMT)
1997 return error("%s: wrong type", old_name);
1998 if (st_mode != patch->old_mode)
1999 fprintf(stderr, "warning: %s has type %o, expected %o\n",
2000 old_name, st_mode, patch->old_mode);
2003 if (new_name && prev_patch && 0 < prev_patch->is_delete &&
2004 !strcmp(prev_patch->old_name, new_name))
2005 /* A type-change diff is always split into a patch to
2006 * delete old, immediately followed by a patch to
2007 * create new (see diff.c::run_diff()); in such a case
2008 * it is Ok that the entry to be deleted by the
2009 * previous patch is still in the working tree and in
2017 ((0 < patch->is_new) | (0 < patch->is_rename) | patch->is_copy)) {
2019 cache_name_pos(new_name, strlen(new_name)) >= 0 &&
2021 return error("%s: already exists in index", new_name);
2024 if (!lstat(new_name, &nst)) {
2025 if (S_ISDIR(nst.st_mode) || ok_if_exists)
2028 return error("%s: already exists in working directory", new_name);
2030 else if ((errno != ENOENT) && (errno != ENOTDIR))
2031 return error("%s: %s", new_name, strerror(errno));
2033 if (!patch->new_mode) {
2034 if (0 < patch->is_new)
2035 patch->new_mode = S_IFREG | 0644;
2037 patch->new_mode = patch->old_mode;
2041 if (new_name && old_name) {
2042 int same = !strcmp(old_name, new_name);
2043 if (!patch->new_mode)
2044 patch->new_mode = patch->old_mode;
2045 if ((patch->old_mode ^ patch->new_mode) & S_IFMT)
2046 return error("new mode (%o) of %s does not match old mode (%o)%s%s",
2047 patch->new_mode, new_name, patch->old_mode,
2048 same ? "" : " of ", same ? "" : old_name);
2051 if (apply_data(patch, &st, ce) < 0)
2052 return error("%s: patch does not apply", name);
2053 patch->rejected = 0;
2057 static int check_patch_list(struct patch *patch)
2059 struct patch *prev_patch = NULL;
2062 for (prev_patch = NULL; patch ; patch = patch->next) {
2063 if (apply_verbosely)
2064 say_patch_name(stderr,
2065 "Checking patch ", patch, "...\n");
2066 err |= check_patch(patch, prev_patch);
2072 static void show_index_list(struct patch *list)
2074 struct patch *patch;
2076 /* Once we start supporting the reverse patch, it may be
2077 * worth showing the new sha1 prefix, but until then...
2079 for (patch = list; patch; patch = patch->next) {
2080 const unsigned char *sha1_ptr;
2081 unsigned char sha1[20];
2084 name = patch->old_name ? patch->old_name : patch->new_name;
2085 if (0 < patch->is_new)
2086 sha1_ptr = null_sha1;
2087 else if (get_sha1(patch->old_sha1_prefix, sha1))
2088 die("sha1 information is lacking or useless (%s).",
2093 printf("%06o %s ",patch->old_mode, sha1_to_hex(sha1_ptr));
2094 if (line_termination && quote_c_style(name, NULL, NULL, 0))
2095 quote_c_style(name, NULL, stdout, 0);
2097 fputs(name, stdout);
2098 putchar(line_termination);
2102 static void stat_patch_list(struct patch *patch)
2104 int files, adds, dels;
2106 for (files = adds = dels = 0 ; patch ; patch = patch->next) {
2108 adds += patch->lines_added;
2109 dels += patch->lines_deleted;
2113 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files, adds, dels);
2116 static void numstat_patch_list(struct patch *patch)
2118 for ( ; patch; patch = patch->next) {
2120 name = patch->new_name ? patch->new_name : patch->old_name;
2121 if (patch->is_binary)
2125 patch->lines_added, patch->lines_deleted);
2126 if (line_termination && quote_c_style(name, NULL, NULL, 0))
2127 quote_c_style(name, NULL, stdout, 0);
2129 fputs(name, stdout);
2130 putchar(line_termination);
2134 static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)
2137 printf(" %s mode %06o %s\n", newdelete, mode, name);
2139 printf(" %s %s\n", newdelete, name);
2142 static void show_mode_change(struct patch *p, int show_name)
2144 if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {
2146 printf(" mode change %06o => %06o %s\n",
2147 p->old_mode, p->new_mode, p->new_name);
2149 printf(" mode change %06o => %06o\n",
2150 p->old_mode, p->new_mode);
2154 static void show_rename_copy(struct patch *p)
2156 const char *renamecopy = p->is_rename ? "rename" : "copy";
2157 const char *old, *new;
2159 /* Find common prefix */
2163 const char *slash_old, *slash_new;
2164 slash_old = strchr(old, '/');
2165 slash_new = strchr(new, '/');
2168 slash_old - old != slash_new - new ||
2169 memcmp(old, new, slash_new - new))
2171 old = slash_old + 1;
2172 new = slash_new + 1;
2174 /* p->old_name thru old is the common prefix, and old and new
2175 * through the end of names are renames
2177 if (old != p->old_name)
2178 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
2179 (int)(old - p->old_name), p->old_name,
2180 old, new, p->score);
2182 printf(" %s %s => %s (%d%%)\n", renamecopy,
2183 p->old_name, p->new_name, p->score);
2184 show_mode_change(p, 0);
2187 static void summary_patch_list(struct patch *patch)
2191 for (p = patch; p; p = p->next) {
2193 show_file_mode_name("create", p->new_mode, p->new_name);
2194 else if (p->is_delete)
2195 show_file_mode_name("delete", p->old_mode, p->old_name);
2197 if (p->is_rename || p->is_copy)
2198 show_rename_copy(p);
2201 printf(" rewrite %s (%d%%)\n",
2202 p->new_name, p->score);
2203 show_mode_change(p, 0);
2206 show_mode_change(p, 1);
2212 static void patch_stats(struct patch *patch)
2214 int lines = patch->lines_added + patch->lines_deleted;
2216 if (lines > max_change)
2218 if (patch->old_name) {
2219 int len = quote_c_style(patch->old_name, NULL, NULL, 0);
2221 len = strlen(patch->old_name);
2225 if (patch->new_name) {
2226 int len = quote_c_style(patch->new_name, NULL, NULL, 0);
2228 len = strlen(patch->new_name);
2234 static void remove_file(struct patch *patch)
2237 if (remove_file_from_cache(patch->old_name) < 0)
2238 die("unable to remove %s from index", patch->old_name);
2239 cache_tree_invalidate_path(active_cache_tree, patch->old_name);
2242 unlink(patch->old_name);
2245 static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size)
2248 struct cache_entry *ce;
2249 int namelen = strlen(path);
2250 unsigned ce_size = cache_entry_size(namelen);
2255 ce = xcalloc(1, ce_size);
2256 memcpy(ce->name, path, namelen);
2257 ce->ce_mode = create_ce_mode(mode);
2258 ce->ce_flags = htons(namelen);
2260 if (lstat(path, &st) < 0)
2261 die("unable to stat newly created file %s", path);
2262 fill_stat_cache_info(ce, &st);
2264 if (write_sha1_file(buf, size, blob_type, ce->sha1) < 0)
2265 die("unable to create backing store for newly created file %s", path);
2266 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)
2267 die("unable to add cache entry for %s", path);
2270 static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)
2275 /* Although buf:size is counted string, it also is NUL
2278 return symlink(buf, path);
2279 fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);
2283 int written = xwrite(fd, buf, size);
2285 die("writing file %s: %s", path, strerror(errno));
2287 die("out of space writing file %s", path);
2292 die("closing file %s: %s", path, strerror(errno));
2297 * We optimistically assume that the directories exist,
2298 * which is true 99% of the time anyway. If they don't,
2299 * we create them and try again.
2301 static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size)
2305 if (!try_create_file(path, mode, buf, size))
2308 if (errno == ENOENT) {
2309 if (safe_create_leading_directories(path))
2311 if (!try_create_file(path, mode, buf, size))
2315 if (errno == EEXIST || errno == EACCES) {
2316 /* We may be trying to create a file where a directory
2321 if (!lstat(path, &st) && S_ISDIR(st.st_mode) && !rmdir(path))
2325 if (errno == EEXIST) {
2326 unsigned int nr = getpid();
2329 const char *newpath;
2330 newpath = mkpath("%s~%u", path, nr);
2331 if (!try_create_file(newpath, mode, buf, size)) {
2332 if (!rename(newpath, path))
2337 if (errno != EEXIST)
2342 die("unable to write file %s mode %o", path, mode);
2345 static void create_file(struct patch *patch)
2347 char *path = patch->new_name;
2348 unsigned mode = patch->new_mode;
2349 unsigned long size = patch->resultsize;
2350 char *buf = patch->result;
2353 mode = S_IFREG | 0644;
2354 create_one_file(path, mode, buf, size);
2355 add_index_file(path, mode, buf, size);
2356 cache_tree_invalidate_path(active_cache_tree, path);
2359 /* phase zero is to remove, phase one is to create */
2360 static void write_out_one_result(struct patch *patch, int phase)
2362 if (patch->is_delete > 0) {
2367 if (patch->is_new > 0 || patch->is_copy) {
2373 * Rename or modification boils down to the same
2374 * thing: remove the old, write the new
2382 static int write_out_one_reject(struct patch *patch)
2385 char namebuf[PATH_MAX];
2386 struct fragment *frag;
2389 for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) {
2390 if (!frag->rejected)
2396 if (apply_verbosely)
2397 say_patch_name(stderr,
2398 "Applied patch ", patch, " cleanly.\n");
2402 /* This should not happen, because a removal patch that leaves
2403 * contents are marked "rejected" at the patch level.
2405 if (!patch->new_name)
2406 die("internal error");
2408 /* Say this even without --verbose */
2409 say_patch_name(stderr, "Applying patch ", patch, " with");
2410 fprintf(stderr, " %d rejects...\n", cnt);
2412 cnt = strlen(patch->new_name);
2413 if (ARRAY_SIZE(namebuf) <= cnt + 5) {
2414 cnt = ARRAY_SIZE(namebuf) - 5;
2416 "warning: truncating .rej filename to %.*s.rej",
2417 cnt - 1, patch->new_name);
2419 memcpy(namebuf, patch->new_name, cnt);
2420 memcpy(namebuf + cnt, ".rej", 5);
2422 rej = fopen(namebuf, "w");
2424 return error("cannot open %s: %s", namebuf, strerror(errno));
2426 /* Normal git tools never deal with .rej, so do not pretend
2427 * this is a git patch by saying --git nor give extended
2428 * headers. While at it, maybe please "kompare" that wants
2429 * the trailing TAB and some garbage at the end of line ;-).
2431 fprintf(rej, "diff a/%s b/%s\t(rejected hunks)\n",
2432 patch->new_name, patch->new_name);
2433 for (cnt = 1, frag = patch->fragments;
2435 cnt++, frag = frag->next) {
2436 if (!frag->rejected) {
2437 fprintf(stderr, "Hunk #%d applied cleanly.\n", cnt);
2440 fprintf(stderr, "Rejected hunk #%d.\n", cnt);
2441 fprintf(rej, "%.*s", frag->size, frag->patch);
2442 if (frag->patch[frag->size-1] != '\n')
2449 static int write_out_results(struct patch *list, int skipped_patch)
2455 if (!list && !skipped_patch)
2456 return error("No changes");
2458 for (phase = 0; phase < 2; phase++) {
2464 write_out_one_result(l, phase);
2465 if (phase == 1 && write_out_one_reject(l))
2474 static struct lock_file lock_file;
2476 static struct excludes {
2477 struct excludes *next;
2481 static int use_patch(struct patch *p)
2483 const char *pathname = p->new_name ? p->new_name : p->old_name;
2484 struct excludes *x = excludes;
2486 if (fnmatch(x->path, pathname, 0) == 0)
2490 if (0 < prefix_length) {
2491 int pathlen = strlen(pathname);
2492 if (pathlen <= prefix_length ||
2493 memcmp(prefix, pathname, prefix_length))
2499 static int apply_patch(int fd, const char *filename, int inaccurate_eof)
2501 unsigned long offset, size;
2502 char *buffer = read_patch_file(fd, &size);
2503 struct patch *list = NULL, **listp = &list;
2504 int skipped_patch = 0;
2506 patch_input_file = filename;
2511 struct patch *patch;
2514 patch = xcalloc(1, sizeof(*patch));
2515 patch->inaccurate_eof = inaccurate_eof;
2516 nr = parse_chunk(buffer + offset, size, patch);
2519 if (apply_in_reverse)
2520 reverse_patches(patch);
2521 if (use_patch(patch)) {
2524 listp = &patch->next;
2526 /* perhaps free it a bit better? */
2534 if (whitespace_error && (new_whitespace == error_on_whitespace))
2537 write_index = check_index && apply;
2538 if (write_index && newfd < 0)
2539 newfd = hold_lock_file_for_update(&lock_file,
2540 get_index_file(), 1);
2542 if (read_cache() < 0)
2543 die("unable to read index file");
2546 if ((check || apply) &&
2547 check_patch_list(list) < 0 &&
2551 if (apply && write_out_results(list, skipped_patch))
2554 if (show_index_info)
2555 show_index_list(list);
2558 stat_patch_list(list);
2561 numstat_patch_list(list);
2564 summary_patch_list(list);
2570 static int git_apply_config(const char *var, const char *value)
2572 if (!strcmp(var, "apply.whitespace")) {
2573 apply_default_whitespace = xstrdup(value);
2576 return git_default_config(var, value);
2580 int cmd_apply(int argc, const char **argv, const char *prefix)
2584 int inaccurate_eof = 0;
2587 const char *whitespace_option = NULL;
2589 for (i = 1; i < argc; i++) {
2590 const char *arg = argv[i];
2594 if (!strcmp(arg, "-")) {
2595 errs |= apply_patch(0, "<stdin>", inaccurate_eof);
2599 if (!strncmp(arg, "--exclude=", 10)) {
2600 struct excludes *x = xmalloc(sizeof(*x));
2606 if (!strncmp(arg, "-p", 2)) {
2607 p_value = atoi(arg + 2);
2610 if (!strcmp(arg, "--no-add")) {
2614 if (!strcmp(arg, "--stat")) {
2619 if (!strcmp(arg, "--allow-binary-replacement") ||
2620 !strcmp(arg, "--binary")) {
2621 continue; /* now no-op */
2623 if (!strcmp(arg, "--numstat")) {
2628 if (!strcmp(arg, "--summary")) {
2633 if (!strcmp(arg, "--check")) {
2638 if (!strcmp(arg, "--index")) {
2642 if (!strcmp(arg, "--cached")) {
2647 if (!strcmp(arg, "--apply")) {
2651 if (!strcmp(arg, "--index-info")) {
2653 show_index_info = 1;
2656 if (!strcmp(arg, "-z")) {
2657 line_termination = 0;
2660 if (!strncmp(arg, "-C", 2)) {
2661 p_context = strtoul(arg + 2, &end, 0);
2663 die("unrecognized context count '%s'", arg + 2);
2666 if (!strncmp(arg, "--whitespace=", 13)) {
2667 whitespace_option = arg + 13;
2668 parse_whitespace_option(arg + 13);
2671 if (!strcmp(arg, "-R") || !strcmp(arg, "--reverse")) {
2672 apply_in_reverse = 1;
2675 if (!strcmp(arg, "--unidiff-zero")) {
2679 if (!strcmp(arg, "--reject")) {
2680 apply = apply_with_reject = apply_verbosely = 1;
2683 if (!strcmp(arg, "--verbose")) {
2684 apply_verbosely = 1;
2687 if (!strcmp(arg, "--inaccurate-eof")) {
2692 if (check_index && prefix_length < 0) {
2693 prefix = setup_git_directory();
2694 prefix_length = prefix ? strlen(prefix) : 0;
2695 git_config(git_apply_config);
2696 if (!whitespace_option && apply_default_whitespace)
2697 parse_whitespace_option(apply_default_whitespace);
2699 if (0 < prefix_length)
2700 arg = prefix_filename(prefix, prefix_length, arg);
2702 fd = open(arg, O_RDONLY);
2706 set_default_whitespace_mode(whitespace_option);
2707 errs |= apply_patch(fd, arg, inaccurate_eof);
2710 set_default_whitespace_mode(whitespace_option);
2712 errs |= apply_patch(0, "<stdin>", inaccurate_eof);
2713 if (whitespace_error) {
2714 if (squelch_whitespace_errors &&
2715 squelch_whitespace_errors < whitespace_error) {
2717 whitespace_error - squelch_whitespace_errors;
2718 fprintf(stderr, "warning: squelched %d "
2719 "whitespace error%s\n",
2721 squelched == 1 ? "" : "s");
2723 if (new_whitespace == error_on_whitespace)
2724 die("%d line%s add%s trailing whitespaces.",
2726 whitespace_error == 1 ? "" : "s",
2727 whitespace_error == 1 ? "s" : "");
2728 if (applied_after_stripping)
2729 fprintf(stderr, "warning: %d line%s applied after"
2730 " stripping trailing whitespaces.\n",
2731 applied_after_stripping,
2732 applied_after_stripping == 1 ? "" : "s");
2733 else if (whitespace_error)
2734 fprintf(stderr, "warning: %d line%s add%s trailing"
2737 whitespace_error == 1 ? "" : "s",
2738 whitespace_error == 1 ? "s" : "");
2742 if (write_cache(newfd, active_cache, active_nr) ||
2743 close(newfd) || commit_lock_file(&lock_file))
2744 die("Unable to write new index file");