4 * Copyright (C) Linus Torvalds, 2005
6 * This applies patches on top of some (arbitrary) version of the SCM.
14 // --check turns on checking that the working tree matches the
15 // files that are being modified, but doesn't apply the patch
16 // --stat does just a diffstat, and doesn't actually apply
17 // --numstat does numeric diffstat, and doesn't actually apply
18 // --index-info shows the old and new index info for paths if available.
20 static const char *prefix;
21 static int prefix_length = -1;
23 static int p_value = 1;
24 static int allow_binary_replacement = 0;
25 static int check_index = 0;
26 static int write_index = 0;
27 static int diffstat = 0;
28 static int numstat = 0;
29 static int summary = 0;
32 static int no_add = 0;
33 static int show_index_info = 0;
34 static int line_termination = '\n';
35 static const char apply_usage[] =
36 "git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM] [--whitespace=<nowarn|warn|error|error-all|strip>] <patch>...";
38 static enum whitespace_eol {
43 } new_whitespace = warn_on_whitespace;
44 static int whitespace_error = 0;
45 static int squelch_whitespace_errors = 5;
46 static int applied_after_stripping = 0;
47 static const char *patch_input_file = NULL;
49 static void parse_whitespace_option(const char *option)
52 new_whitespace = warn_on_whitespace;
55 if (!strcmp(option, "warn")) {
56 new_whitespace = warn_on_whitespace;
59 if (!strcmp(option, "nowarn")) {
60 new_whitespace = nowarn_whitespace;
63 if (!strcmp(option, "error")) {
64 new_whitespace = error_on_whitespace;
67 if (!strcmp(option, "error-all")) {
68 new_whitespace = error_on_whitespace;
69 squelch_whitespace_errors = 0;
72 if (!strcmp(option, "strip")) {
73 new_whitespace = strip_whitespace;
76 die("unrecognized whitespace option '%s'", option);
79 static void set_default_whitespace_mode(const char *whitespace_option)
81 if (!whitespace_option && !apply_default_whitespace) {
82 new_whitespace = (apply
89 * For "diff-stat" like behaviour, we keep track of the biggest change
90 * we've seen, and the longest filename. That allows us to do simple
93 static int max_change, max_len;
96 * Various "current state", notably line numbers and what
97 * file (and how) we're patching right now.. The "is_xxxx"
98 * things are flags, where -1 means "don't know yet".
100 static int linenr = 1;
103 unsigned long oldpos, oldlines;
104 unsigned long newpos, newlines;
107 struct fragment *next;
111 char *new_name, *old_name, *def_name;
112 unsigned int old_mode, new_mode;
113 int is_rename, is_copy, is_new, is_delete, is_binary;
114 int lines_added, lines_deleted;
116 struct fragment *fragments;
118 unsigned long resultsize;
119 char old_sha1_prefix[41];
120 char new_sha1_prefix[41];
124 #define CHUNKSIZE (8192)
127 static void *read_patch_file(int fd, unsigned long *sizep)
129 unsigned long size = 0, alloc = CHUNKSIZE;
130 void *buffer = xmalloc(alloc);
133 int nr = alloc - size;
136 buffer = xrealloc(buffer, alloc);
139 nr = xread(fd, buffer + size, nr);
143 die("git-apply: read returned %s", strerror(errno));
149 * Make sure that we have some slop in the buffer
150 * so that we can do speculative "memcmp" etc, and
151 * see to it that it is NUL-filled.
153 if (alloc < size + SLOP)
154 buffer = xrealloc(buffer, size + SLOP);
155 memset(buffer + size, 0, SLOP);
159 static unsigned long linelen(const char *buffer, unsigned long size)
161 unsigned long len = 0;
164 if (*buffer++ == '\n')
170 static int is_dev_null(const char *str)
172 return !memcmp("/dev/null", str, 9) && isspace(str[9]);
178 static int name_terminate(const char *name, int namelen, int c, int terminate)
180 if (c == ' ' && !(terminate & TERM_SPACE))
182 if (c == '\t' && !(terminate & TERM_TAB))
188 static char * find_name(const char *line, char *def, int p_value, int terminate)
191 const char *start = line;
195 /* Proposed "new-style" GNU patch/diff format; see
196 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
198 name = unquote_c_style(line, NULL);
202 cp = strchr(name, '/');
209 /* name can later be freed, so we need
210 * to memmove, not just return cp
212 memmove(name, cp, strlen(cp) + 1);
229 if (name_terminate(start, line-start, c, terminate))
233 if (c == '/' && !--p_value)
243 * Generally we prefer the shorter name, especially
244 * if the other one is just a variation of that with
245 * something else tacked on to the end (ie "file.orig"
249 int deflen = strlen(def);
250 if (deflen < len && !strncmp(start, def, deflen))
254 name = xmalloc(len + 1);
255 memcpy(name, start, len);
262 * Get the name etc info from the --/+++ lines of a traditional patch header
264 * NOTE! This hardcodes "-p1" behaviour in filename detection.
266 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
267 * files, we can happily check the index for a match, but for creating a
268 * new file we should try to match whatever "patch" does. I have no idea.
270 static void parse_traditional_patch(const char *first, const char *second, struct patch *patch)
274 first += 4; // skip "--- "
275 second += 4; // skip "+++ "
276 if (is_dev_null(first)) {
278 patch->is_delete = 0;
279 name = find_name(second, NULL, p_value, TERM_SPACE | TERM_TAB);
280 patch->new_name = name;
281 } else if (is_dev_null(second)) {
283 patch->is_delete = 1;
284 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
285 patch->old_name = name;
287 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
288 name = find_name(second, name, p_value, TERM_SPACE | TERM_TAB);
289 patch->old_name = patch->new_name = name;
292 die("unable to find filename in patch at line %d", linenr);
295 static int gitdiff_hdrend(const char *line, struct patch *patch)
301 * We're anal about diff header consistency, to make
302 * sure that we don't end up having strange ambiguous
303 * patches floating around.
305 * As a result, gitdiff_{old|new}name() will check
306 * their names against any previous information, just
309 static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, const char *oldnew)
311 if (!orig_name && !isnull)
312 return find_name(line, NULL, 1, 0);
321 die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr);
322 another = find_name(line, NULL, 1, 0);
323 if (!another || memcmp(another, name, len))
324 die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr);
329 /* expect "/dev/null" */
330 if (memcmp("/dev/null", line, 9) || line[9] != '\n')
331 die("git-apply: bad git-diff - expected /dev/null on line %d", linenr);
336 static int gitdiff_oldname(const char *line, struct patch *patch)
338 patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name, "old");
342 static int gitdiff_newname(const char *line, struct patch *patch)
344 patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name, "new");
348 static int gitdiff_oldmode(const char *line, struct patch *patch)
350 patch->old_mode = strtoul(line, NULL, 8);
354 static int gitdiff_newmode(const char *line, struct patch *patch)
356 patch->new_mode = strtoul(line, NULL, 8);
360 static int gitdiff_delete(const char *line, struct patch *patch)
362 patch->is_delete = 1;
363 patch->old_name = patch->def_name;
364 return gitdiff_oldmode(line, patch);
367 static int gitdiff_newfile(const char *line, struct patch *patch)
370 patch->new_name = patch->def_name;
371 return gitdiff_newmode(line, patch);
374 static int gitdiff_copysrc(const char *line, struct patch *patch)
377 patch->old_name = find_name(line, NULL, 0, 0);
381 static int gitdiff_copydst(const char *line, struct patch *patch)
384 patch->new_name = find_name(line, NULL, 0, 0);
388 static int gitdiff_renamesrc(const char *line, struct patch *patch)
390 patch->is_rename = 1;
391 patch->old_name = find_name(line, NULL, 0, 0);
395 static int gitdiff_renamedst(const char *line, struct patch *patch)
397 patch->is_rename = 1;
398 patch->new_name = find_name(line, NULL, 0, 0);
402 static int gitdiff_similarity(const char *line, struct patch *patch)
404 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
409 static int gitdiff_dissimilarity(const char *line, struct patch *patch)
411 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
416 static int gitdiff_index(const char *line, struct patch *patch)
418 /* index line is N hexadecimal, "..", N hexadecimal,
419 * and optional space with octal mode.
421 const char *ptr, *eol;
424 ptr = strchr(line, '.');
425 if (!ptr || ptr[1] != '.' || 40 < ptr - line)
428 memcpy(patch->old_sha1_prefix, line, len);
429 patch->old_sha1_prefix[len] = 0;
432 ptr = strchr(line, ' ');
433 eol = strchr(line, '\n');
435 if (!ptr || eol < ptr)
441 memcpy(patch->new_sha1_prefix, line, len);
442 patch->new_sha1_prefix[len] = 0;
444 patch->new_mode = patch->old_mode = strtoul(ptr+1, NULL, 8);
449 * This is normal for a diff that doesn't change anything: we'll fall through
450 * into the next diff. Tell the parser to break out.
452 static int gitdiff_unrecognized(const char *line, struct patch *patch)
457 static const char *stop_at_slash(const char *line, int llen)
461 for (i = 0; i < llen; i++) {
469 /* This is to extract the same name that appears on "diff --git"
470 * line. We do not find and return anything if it is a rename
471 * patch, and it is OK because we will find the name elsewhere.
472 * We need to reliably find name only when it is mode-change only,
473 * creation or deletion of an empty file. In any of these cases,
474 * both sides are the same name under a/ and b/ respectively.
476 static char *git_header_name(char *line, int llen)
480 const char *second = NULL;
482 line += strlen("diff --git ");
483 llen -= strlen("diff --git ");
487 char *first = unquote_c_style(line, &second);
491 /* advance to the first slash */
492 cp = stop_at_slash(first, strlen(first));
493 if (!cp || cp == first) {
494 /* we do not accept absolute paths */
500 memmove(first, cp+1, len+1); /* including NUL */
502 /* second points at one past closing dq of name.
503 * find the second name.
505 while ((second < line + llen) && isspace(*second))
508 if (line + llen <= second)
509 goto free_first_and_fail;
510 if (*second == '"') {
511 char *sp = unquote_c_style(second, NULL);
513 goto free_first_and_fail;
514 cp = stop_at_slash(sp, strlen(sp));
515 if (!cp || cp == sp) {
518 goto free_first_and_fail;
520 /* They must match, otherwise ignore */
521 if (strcmp(cp+1, first))
522 goto free_both_and_fail;
527 /* unquoted second */
528 cp = stop_at_slash(second, line + llen - second);
529 if (!cp || cp == second)
530 goto free_first_and_fail;
532 if (line + llen - cp != len + 1 ||
533 memcmp(first, cp, len))
534 goto free_first_and_fail;
538 /* unquoted first name */
539 name = stop_at_slash(line, llen);
540 if (!name || name == line)
545 /* since the first name is unquoted, a dq if exists must be
546 * the beginning of the second name.
548 for (second = name; second < line + llen; second++) {
549 if (*second == '"') {
550 const char *cp = second;
552 char *sp = unquote_c_style(second, NULL);
556 np = stop_at_slash(sp, strlen(sp));
557 if (!np || np == sp) {
558 free_second_and_fail:
564 if (len < cp - name &&
565 !strncmp(np, name, len) &&
566 isspace(name[len])) {
568 memmove(sp, np, len + 1);
571 goto free_second_and_fail;
576 * Accept a name only if it shows up twice, exactly the same
579 for (len = 0 ; ; len++) {
596 if (second[len] == '\n' && !memcmp(name, second, len)) {
597 char *ret = xmalloc(len + 1);
598 memcpy(ret, name, len);
607 /* Verify that we recognize the lines following a git header */
608 static int parse_git_header(char *line, int len, unsigned int size, struct patch *patch)
610 unsigned long offset;
612 /* A git diff has explicit new/delete information, so we don't guess */
614 patch->is_delete = 0;
617 * Some things may not have the old name in the
618 * rest of the headers anywhere (pure mode changes,
619 * or removing or adding empty files), so we get
620 * the default name from the header.
622 patch->def_name = git_header_name(line, len);
627 for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {
628 static const struct opentry {
630 int (*fn)(const char *, struct patch *);
632 { "@@ -", gitdiff_hdrend },
633 { "--- ", gitdiff_oldname },
634 { "+++ ", gitdiff_newname },
635 { "old mode ", gitdiff_oldmode },
636 { "new mode ", gitdiff_newmode },
637 { "deleted file mode ", gitdiff_delete },
638 { "new file mode ", gitdiff_newfile },
639 { "copy from ", gitdiff_copysrc },
640 { "copy to ", gitdiff_copydst },
641 { "rename old ", gitdiff_renamesrc },
642 { "rename new ", gitdiff_renamedst },
643 { "rename from ", gitdiff_renamesrc },
644 { "rename to ", gitdiff_renamedst },
645 { "similarity index ", gitdiff_similarity },
646 { "dissimilarity index ", gitdiff_dissimilarity },
647 { "index ", gitdiff_index },
648 { "", gitdiff_unrecognized },
652 len = linelen(line, size);
653 if (!len || line[len-1] != '\n')
655 for (i = 0; i < ARRAY_SIZE(optable); i++) {
656 const struct opentry *p = optable + i;
657 int oplen = strlen(p->str);
658 if (len < oplen || memcmp(p->str, line, oplen))
660 if (p->fn(line + oplen, patch) < 0)
669 static int parse_num(const char *line, unsigned long *p)
675 *p = strtoul(line, &ptr, 10);
679 static int parse_range(const char *line, int len, int offset, const char *expect,
680 unsigned long *p1, unsigned long *p2)
684 if (offset < 0 || offset >= len)
689 digits = parse_num(line, p1);
699 digits = parse_num(line+1, p2);
711 if (memcmp(line, expect, ex))
718 * Parse a unified diff fragment header of the
719 * form "@@ -a,b +c,d @@"
721 static int parse_fragment_header(char *line, int len, struct fragment *fragment)
725 if (!len || line[len-1] != '\n')
728 /* Figure out the number of lines in a fragment */
729 offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);
730 offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);
735 static int find_header(char *line, unsigned long size, int *hdrsize, struct patch *patch)
737 unsigned long offset, len;
739 patch->is_rename = patch->is_copy = 0;
740 patch->is_new = patch->is_delete = -1;
741 patch->old_mode = patch->new_mode = 0;
742 patch->old_name = patch->new_name = NULL;
743 for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {
744 unsigned long nextlen;
746 len = linelen(line, size);
750 /* Testing this early allows us to take a few shortcuts.. */
755 * Make sure we don't find any unconnected patch fragmants.
756 * That's a sign that we didn't find a header, and that a
757 * patch has become corrupted/broken up.
759 if (!memcmp("@@ -", line, 4)) {
760 struct fragment dummy;
761 if (parse_fragment_header(line, len, &dummy) < 0)
763 error("patch fragment without header at line %d: %.*s", linenr, (int)len-1, line);
770 * Git patch? It might not have a real patch, just a rename
771 * or mode change, so we handle that specially
773 if (!memcmp("diff --git ", line, 11)) {
774 int git_hdr_len = parse_git_header(line, len, size, patch);
775 if (git_hdr_len <= len)
777 if (!patch->old_name && !patch->new_name) {
778 if (!patch->def_name)
779 die("git diff header lacks filename information (line %d)", linenr);
780 patch->old_name = patch->new_name = patch->def_name;
782 *hdrsize = git_hdr_len;
786 /** --- followed by +++ ? */
787 if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4))
791 * We only accept unified patches, so we want it to
792 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
795 nextlen = linelen(line + len, size - len);
796 if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))
799 /* Ok, we'll consider it a patch */
800 parse_traditional_patch(line, line+len, patch);
801 *hdrsize = len + nextlen;
809 * Parse a unified diff. Note that this really needs
810 * to parse each fragment separately, since the only
811 * way to know the difference between a "---" that is
812 * part of a patch, and a "---" that starts the next
813 * patch is to look at the line counts..
815 static int parse_fragment(char *line, unsigned long size, struct patch *patch, struct fragment *fragment)
818 int len = linelen(line, size), offset;
819 unsigned long oldlines, newlines;
821 offset = parse_fragment_header(line, len, fragment);
824 oldlines = fragment->oldlines;
825 newlines = fragment->newlines;
827 if (patch->is_new < 0) {
828 patch->is_new = !oldlines;
830 patch->old_name = NULL;
832 if (patch->is_delete < 0) {
833 patch->is_delete = !newlines;
835 patch->new_name = NULL;
838 if (patch->is_new && oldlines)
839 return error("new file depends on old contents");
840 if (patch->is_delete != !newlines) {
842 return error("deleted file still has contents");
843 fprintf(stderr, "** warning: file %s becomes empty but is not deleted\n", patch->new_name);
846 /* Parse the thing.. */
851 for (offset = len; size > 0; offset += len, size -= len, line += len, linenr++) {
852 if (!oldlines && !newlines)
854 len = linelen(line, size);
855 if (!len || line[len-1] != '\n')
870 * We know len is at least two, since we have a '+' and
871 * we checked that the last character was a '\n' above.
872 * That is, an addition of an empty line would check
873 * the '+' here. Sneaky...
875 if ((new_whitespace != nowarn_whitespace) &&
876 isspace(line[len-2])) {
878 if (squelch_whitespace_errors &&
879 squelch_whitespace_errors <
883 fprintf(stderr, "Adds trailing whitespace.\n%s:%d:%.*s\n",
885 linenr, len-2, line+1);
892 /* We allow "\ No newline at end of file". Depending
893 * on locale settings when the patch was produced we
894 * don't know what this line looks like. The only
895 * thing we do know is that it begins with "\ ".
896 * Checking for 12 is just for sanity check -- any
897 * l10n of "\ No newline..." is at least that long.
900 if (len < 12 || memcmp(line, "\\ ", 2))
905 if (oldlines || newlines)
907 /* If a fragment ends with an incomplete line, we failed to include
908 * it in the above loop because we hit oldlines == newlines == 0
911 if (12 < size && !memcmp(line, "\\ ", 2))
912 offset += linelen(line, size);
914 patch->lines_added += added;
915 patch->lines_deleted += deleted;
919 static int parse_single_patch(char *line, unsigned long size, struct patch *patch)
921 unsigned long offset = 0;
922 struct fragment **fragp = &patch->fragments;
924 while (size > 4 && !memcmp(line, "@@ -", 4)) {
925 struct fragment *fragment;
928 fragment = xmalloc(sizeof(*fragment));
929 memset(fragment, 0, sizeof(*fragment));
930 len = parse_fragment(line, size, patch, fragment);
932 die("corrupt patch at line %d", linenr);
934 fragment->patch = line;
935 fragment->size = len;
938 fragp = &fragment->next;
947 static inline int metadata_changes(struct patch *patch)
949 return patch->is_rename > 0 ||
950 patch->is_copy > 0 ||
953 (patch->old_mode && patch->new_mode &&
954 patch->old_mode != patch->new_mode);
957 static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
959 int hdrsize, patchsize;
960 int offset = find_header(buffer, size, &hdrsize, patch);
965 patchsize = parse_single_patch(buffer + offset + hdrsize, size - offset - hdrsize, patch);
968 static const char *binhdr[] = {
974 int hd = hdrsize + offset;
975 unsigned long llen = linelen(buffer + hd, size - hd);
977 if (!memcmp(" differ\n", buffer + hd + llen - 8, 8))
978 for (i = 0; binhdr[i]; i++) {
979 int len = strlen(binhdr[i]);
980 if (len < size - hd &&
981 !memcmp(binhdr[i], buffer + hd, len)) {
982 patch->is_binary = 1;
987 /* Empty patch cannot be applied if:
988 * - it is a binary patch and we do not do binary_replace, or
989 * - text patch without metadata change
991 if ((apply || check) &&
993 ? !allow_binary_replacement
994 : !metadata_changes(patch)))
995 die("patch with only garbage at line %d", linenr);
998 return offset + hdrsize + patchsize;
1001 static const char pluses[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
1002 static const char minuses[]= "----------------------------------------------------------------------";
1004 static void show_stats(struct patch *patch)
1006 const char *prefix = "";
1007 char *name = patch->new_name;
1009 int len, max, add, del, total;
1012 name = patch->old_name;
1014 if (0 < (len = quote_c_style(name, NULL, NULL, 0))) {
1015 qname = xmalloc(len + 1);
1016 quote_c_style(name, qname, NULL, 0);
1021 * "scale" the filename
1032 slash = strchr(name, '/');
1039 * scale the add/delete
1045 add = patch->lines_added;
1046 del = patch->lines_deleted;
1049 if (max_change > 0) {
1050 total = (total * max + max_change / 2) / max_change;
1051 add = (add * max + max_change / 2) / max_change;
1054 if (patch->is_binary)
1055 printf(" %s%-*s | Bin\n", prefix, len, name);
1057 printf(" %s%-*s |%5d %.*s%.*s\n", prefix,
1058 len, name, patch->lines_added + patch->lines_deleted,
1059 add, pluses, del, minuses);
1064 static int read_old_data(struct stat *st, const char *path, void *buf, unsigned long size)
1069 switch (st->st_mode & S_IFMT) {
1071 return readlink(path, buf, size);
1073 fd = open(path, O_RDONLY);
1075 return error("unable to open %s", path);
1078 int ret = xread(fd, buf + got, size - got);
1091 static int find_offset(const char *buf, unsigned long size, const char *fragment, unsigned long fragsize, int line)
1094 unsigned long start, backwards, forwards;
1096 if (fragsize > size)
1101 unsigned long offset = 0;
1103 while (offset + fragsize <= size) {
1104 if (buf[offset++] == '\n') {
1112 /* Exact line number? */
1113 if (!memcmp(buf + start, fragment, fragsize))
1117 * There's probably some smart way to do this, but I'll leave
1118 * that to the smart and beautiful people. I'm simple and stupid.
1122 for (i = 0; ; i++) {
1129 if (forwards + fragsize > size)
1135 } while (backwards && buf[backwards-1] != '\n');
1138 while (forwards + fragsize <= size) {
1139 if (buf[forwards++] == '\n')
1145 if (try + fragsize > size)
1147 if (memcmp(buf + try, fragment, fragsize))
1156 * We should start searching forward and backward.
1161 struct buffer_desc {
1164 unsigned long alloc;
1167 static int apply_line(char *output, const char *patch, int plen)
1169 /* plen is number of bytes to be copied from patch,
1170 * starting at patch+1 (patch[0] is '+'). Typically
1171 * patch[plen] is '\n'.
1173 int add_nl_to_tail = 0;
1174 if ((new_whitespace == strip_whitespace) &&
1175 1 < plen && isspace(patch[plen-1])) {
1176 if (patch[plen] == '\n')
1179 while (0 < plen && isspace(patch[plen]))
1181 applied_after_stripping++;
1183 memcpy(output, patch + 1, plen);
1185 output[plen++] = '\n';
1189 static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag)
1191 char *buf = desc->buffer;
1192 const char *patch = frag->patch;
1193 int offset, size = frag->size;
1194 char *old = xmalloc(size);
1195 char *new = xmalloc(size);
1196 int oldsize = 0, newsize = 0;
1199 int len = linelen(patch, size);
1206 * "plen" is how much of the line we should use for
1207 * the actual patch data. Normally we just remove the
1208 * first character on the line, but if the line is
1209 * followed by "\ No newline", then we also remove the
1210 * last one (which is the newline, of course).
1213 if (len < size && patch[len] == '\\')
1218 memcpy(old + oldsize, patch + 1, plen);
1222 /* Fall-through for ' ' */
1224 if (*patch != '+' || !no_add)
1225 newsize += apply_line(new + newsize, patch,
1228 case '@': case '\\':
1229 /* Ignore it, we already handled it */
1238 #ifdef NO_ACCURATE_DIFF
1239 if (oldsize > 0 && old[oldsize - 1] == '\n' &&
1240 newsize > 0 && new[newsize - 1] == '\n') {
1246 offset = find_offset(buf, desc->size, old, oldsize, frag->newpos);
1248 int diff = newsize - oldsize;
1249 unsigned long size = desc->size + diff;
1250 unsigned long alloc = desc->alloc;
1253 alloc = size + 8192;
1254 desc->alloc = alloc;
1255 buf = xrealloc(buf, alloc);
1259 memmove(buf + offset + newsize, buf + offset + oldsize, size - offset - newsize);
1260 memcpy(buf + offset, new, newsize);
1269 static int apply_fragments(struct buffer_desc *desc, struct patch *patch)
1271 struct fragment *frag = patch->fragments;
1272 const char *name = patch->old_name ? patch->old_name : patch->new_name;
1274 if (patch->is_binary) {
1275 unsigned char sha1[20];
1277 if (!allow_binary_replacement)
1278 return error("cannot apply binary patch to '%s' "
1279 "without --allow-binary-replacement",
1282 /* For safety, we require patch index line to contain
1283 * full 40-byte textual SHA1 for old and new, at least for now.
1285 if (strlen(patch->old_sha1_prefix) != 40 ||
1286 strlen(patch->new_sha1_prefix) != 40 ||
1287 get_sha1_hex(patch->old_sha1_prefix, sha1) ||
1288 get_sha1_hex(patch->new_sha1_prefix, sha1))
1289 return error("cannot apply binary patch to '%s' "
1290 "without full index line", name);
1292 if (patch->old_name) {
1293 unsigned char hdr[50];
1296 /* See if the old one matches what the patch
1299 write_sha1_file_prepare(desc->buffer, desc->size,
1300 blob_type, sha1, hdr, &hdrlen);
1301 if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))
1302 return error("the patch applies to '%s' (%s), "
1303 "which does not match the "
1304 "current contents.",
1305 name, sha1_to_hex(sha1));
1308 /* Otherwise, the old one must be empty. */
1310 return error("the patch applies to an empty "
1311 "'%s' but it is not empty", name);
1314 /* For now, we do not record post-image data in the patch,
1315 * and require the object already present in the recipient's
1320 desc->alloc = desc->size = 0;
1322 get_sha1_hex(patch->new_sha1_prefix, sha1);
1324 if (memcmp(sha1, null_sha1, 20)) {
1328 desc->buffer = read_sha1_file(sha1, type, &size);
1330 return error("the necessary postimage %s for "
1331 "'%s' does not exist",
1332 patch->new_sha1_prefix, name);
1333 desc->alloc = desc->size = size;
1340 if (apply_one_fragment(desc, frag) < 0)
1341 return error("patch failed: %s:%ld",
1342 name, frag->oldpos);
1348 static int apply_data(struct patch *patch, struct stat *st)
1351 unsigned long size, alloc;
1352 struct buffer_desc desc;
1357 if (patch->old_name) {
1359 alloc = size + 8192;
1360 buf = xmalloc(alloc);
1361 if (read_old_data(st, patch->old_name, buf, alloc) != size)
1362 return error("read of %s failed", patch->old_name);
1368 if (apply_fragments(&desc, patch) < 0)
1370 patch->result = desc.buffer;
1371 patch->resultsize = desc.size;
1373 if (patch->is_delete && patch->resultsize)
1374 return error("removal patch leaves file contents");
1379 static int check_patch(struct patch *patch)
1382 const char *old_name = patch->old_name;
1383 const char *new_name = patch->new_name;
1384 const char *name = old_name ? old_name : new_name;
1388 int stat_ret = lstat(old_name, &st);
1391 int pos = cache_name_pos(old_name, strlen(old_name));
1393 return error("%s: does not exist in index",
1396 struct checkout costate;
1397 if (errno != ENOENT)
1398 return error("%s: %s", old_name,
1401 costate.base_dir = "";
1402 costate.base_dir_len = 0;
1405 costate.not_new = 0;
1406 costate.refresh_cache = 1;
1407 if (checkout_entry(active_cache[pos],
1410 lstat(old_name, &st))
1414 changed = ce_match_stat(active_cache[pos], &st, 1);
1416 return error("%s: does not match index",
1419 else if (stat_ret < 0)
1420 return error("%s: %s", old_name, strerror(errno));
1422 if (patch->is_new < 0)
1424 st.st_mode = ntohl(create_ce_mode(st.st_mode));
1425 if (!patch->old_mode)
1426 patch->old_mode = st.st_mode;
1427 if ((st.st_mode ^ patch->old_mode) & S_IFMT)
1428 return error("%s: wrong type", old_name);
1429 if (st.st_mode != patch->old_mode)
1430 fprintf(stderr, "warning: %s has type %o, expected %o\n",
1431 old_name, st.st_mode, patch->old_mode);
1434 if (new_name && (patch->is_new | patch->is_rename | patch->is_copy)) {
1435 if (check_index && cache_name_pos(new_name, strlen(new_name)) >= 0)
1436 return error("%s: already exists in index", new_name);
1437 if (!lstat(new_name, &st))
1438 return error("%s: already exists in working directory", new_name);
1439 if (errno != ENOENT)
1440 return error("%s: %s", new_name, strerror(errno));
1441 if (!patch->new_mode) {
1443 patch->new_mode = S_IFREG | 0644;
1445 patch->new_mode = patch->old_mode;
1449 if (new_name && old_name) {
1450 int same = !strcmp(old_name, new_name);
1451 if (!patch->new_mode)
1452 patch->new_mode = patch->old_mode;
1453 if ((patch->old_mode ^ patch->new_mode) & S_IFMT)
1454 return error("new mode (%o) of %s does not match old mode (%o)%s%s",
1455 patch->new_mode, new_name, patch->old_mode,
1456 same ? "" : " of ", same ? "" : old_name);
1459 if (apply_data(patch, &st) < 0)
1460 return error("%s: patch does not apply", name);
1464 static int check_patch_list(struct patch *patch)
1468 for (;patch ; patch = patch->next)
1469 error |= check_patch(patch);
1473 static inline int is_null_sha1(const unsigned char *sha1)
1475 return !memcmp(sha1, null_sha1, 20);
1478 static void show_index_list(struct patch *list)
1480 struct patch *patch;
1482 /* Once we start supporting the reverse patch, it may be
1483 * worth showing the new sha1 prefix, but until then...
1485 for (patch = list; patch; patch = patch->next) {
1486 const unsigned char *sha1_ptr;
1487 unsigned char sha1[20];
1490 name = patch->old_name ? patch->old_name : patch->new_name;
1492 sha1_ptr = null_sha1;
1493 else if (get_sha1(patch->old_sha1_prefix, sha1))
1494 die("sha1 information is lacking or useless (%s).",
1499 printf("%06o %s ",patch->old_mode, sha1_to_hex(sha1_ptr));
1500 if (line_termination && quote_c_style(name, NULL, NULL, 0))
1501 quote_c_style(name, NULL, stdout, 0);
1503 fputs(name, stdout);
1504 putchar(line_termination);
1508 static void stat_patch_list(struct patch *patch)
1510 int files, adds, dels;
1512 for (files = adds = dels = 0 ; patch ; patch = patch->next) {
1514 adds += patch->lines_added;
1515 dels += patch->lines_deleted;
1519 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files, adds, dels);
1522 static void numstat_patch_list(struct patch *patch)
1524 for ( ; patch; patch = patch->next) {
1526 name = patch->old_name ? patch->old_name : patch->new_name;
1527 printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);
1528 if (line_termination && quote_c_style(name, NULL, NULL, 0))
1529 quote_c_style(name, NULL, stdout, 0);
1531 fputs(name, stdout);
1536 static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)
1539 printf(" %s mode %06o %s\n", newdelete, mode, name);
1541 printf(" %s %s\n", newdelete, name);
1544 static void show_mode_change(struct patch *p, int show_name)
1546 if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {
1548 printf(" mode change %06o => %06o %s\n",
1549 p->old_mode, p->new_mode, p->new_name);
1551 printf(" mode change %06o => %06o\n",
1552 p->old_mode, p->new_mode);
1556 static void show_rename_copy(struct patch *p)
1558 const char *renamecopy = p->is_rename ? "rename" : "copy";
1559 const char *old, *new;
1561 /* Find common prefix */
1565 const char *slash_old, *slash_new;
1566 slash_old = strchr(old, '/');
1567 slash_new = strchr(new, '/');
1570 slash_old - old != slash_new - new ||
1571 memcmp(old, new, slash_new - new))
1573 old = slash_old + 1;
1574 new = slash_new + 1;
1576 /* p->old_name thru old is the common prefix, and old and new
1577 * through the end of names are renames
1579 if (old != p->old_name)
1580 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
1581 (int)(old - p->old_name), p->old_name,
1582 old, new, p->score);
1584 printf(" %s %s => %s (%d%%)\n", renamecopy,
1585 p->old_name, p->new_name, p->score);
1586 show_mode_change(p, 0);
1589 static void summary_patch_list(struct patch *patch)
1593 for (p = patch; p; p = p->next) {
1595 show_file_mode_name("create", p->new_mode, p->new_name);
1596 else if (p->is_delete)
1597 show_file_mode_name("delete", p->old_mode, p->old_name);
1599 if (p->is_rename || p->is_copy)
1600 show_rename_copy(p);
1603 printf(" rewrite %s (%d%%)\n",
1604 p->new_name, p->score);
1605 show_mode_change(p, 0);
1608 show_mode_change(p, 1);
1614 static void patch_stats(struct patch *patch)
1616 int lines = patch->lines_added + patch->lines_deleted;
1618 if (lines > max_change)
1620 if (patch->old_name) {
1621 int len = quote_c_style(patch->old_name, NULL, NULL, 0);
1623 len = strlen(patch->old_name);
1627 if (patch->new_name) {
1628 int len = quote_c_style(patch->new_name, NULL, NULL, 0);
1630 len = strlen(patch->new_name);
1636 static void remove_file(struct patch *patch)
1639 if (remove_file_from_cache(patch->old_name) < 0)
1640 die("unable to remove %s from index", patch->old_name);
1642 unlink(patch->old_name);
1645 static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size)
1648 struct cache_entry *ce;
1649 int namelen = strlen(path);
1650 unsigned ce_size = cache_entry_size(namelen);
1655 ce = xmalloc(ce_size);
1656 memset(ce, 0, ce_size);
1657 memcpy(ce->name, path, namelen);
1658 ce->ce_mode = create_ce_mode(mode);
1659 ce->ce_flags = htons(namelen);
1660 if (lstat(path, &st) < 0)
1661 die("unable to stat newly created file %s", path);
1662 fill_stat_cache_info(ce, &st);
1663 if (write_sha1_file(buf, size, blob_type, ce->sha1) < 0)
1664 die("unable to create backing store for newly created file %s", path);
1665 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)
1666 die("unable to add cache entry for %s", path);
1669 static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)
1674 return symlink(buf, path);
1675 fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);
1679 int written = xwrite(fd, buf, size);
1681 die("writing file %s: %s", path, strerror(errno));
1683 die("out of space writing file %s", path);
1688 die("closing file %s: %s", path, strerror(errno));
1693 * We optimistically assume that the directories exist,
1694 * which is true 99% of the time anyway. If they don't,
1695 * we create them and try again.
1697 static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size)
1699 if (!try_create_file(path, mode, buf, size))
1702 if (errno == ENOENT) {
1703 if (safe_create_leading_directories(path))
1705 if (!try_create_file(path, mode, buf, size))
1709 if (errno == EEXIST) {
1710 unsigned int nr = getpid();
1713 const char *newpath;
1714 newpath = mkpath("%s~%u", path, nr);
1715 if (!try_create_file(newpath, mode, buf, size)) {
1716 if (!rename(newpath, path))
1721 if (errno != EEXIST)
1726 die("unable to write file %s mode %o", path, mode);
1729 static void create_file(struct patch *patch)
1731 char *path = patch->new_name;
1732 unsigned mode = patch->new_mode;
1733 unsigned long size = patch->resultsize;
1734 char *buf = patch->result;
1737 mode = S_IFREG | 0644;
1738 create_one_file(path, mode, buf, size);
1739 add_index_file(path, mode, buf, size);
1742 static void write_out_one_result(struct patch *patch)
1744 if (patch->is_delete > 0) {
1748 if (patch->is_new > 0 || patch->is_copy) {
1753 * Rename or modification boils down to the same
1754 * thing: remove the old, write the new
1760 static void write_out_results(struct patch *list, int skipped_patch)
1762 if (!list && !skipped_patch)
1766 write_out_one_result(list);
1771 static struct cache_file cache_file;
1773 static struct excludes {
1774 struct excludes *next;
1778 static int use_patch(struct patch *p)
1780 const char *pathname = p->new_name ? p->new_name : p->old_name;
1781 struct excludes *x = excludes;
1783 if (fnmatch(x->path, pathname, 0) == 0)
1787 if (0 < prefix_length) {
1788 int pathlen = strlen(pathname);
1789 if (pathlen <= prefix_length ||
1790 memcmp(prefix, pathname, prefix_length))
1796 static int apply_patch(int fd, const char *filename)
1799 unsigned long offset, size;
1800 char *buffer = read_patch_file(fd, &size);
1801 struct patch *list = NULL, **listp = &list;
1802 int skipped_patch = 0;
1804 patch_input_file = filename;
1809 struct patch *patch;
1812 patch = xmalloc(sizeof(*patch));
1813 memset(patch, 0, sizeof(*patch));
1814 nr = parse_chunk(buffer + offset, size, patch);
1817 if (use_patch(patch)) {
1820 listp = &patch->next;
1822 /* perhaps free it a bit better? */
1831 if (whitespace_error && (new_whitespace == error_on_whitespace))
1834 write_index = check_index && apply;
1836 newfd = hold_index_file_for_update(&cache_file, get_index_file());
1838 if (read_cache() < 0)
1839 die("unable to read index file");
1842 if ((check || apply) && check_patch_list(list) < 0)
1846 write_out_results(list, skipped_patch);
1849 if (write_cache(newfd, active_cache, active_nr) ||
1850 commit_index_file(&cache_file))
1851 die("Unable to write new cachefile");
1854 if (show_index_info)
1855 show_index_list(list);
1858 stat_patch_list(list);
1861 numstat_patch_list(list);
1864 summary_patch_list(list);
1870 static int git_apply_config(const char *var, const char *value)
1872 if (!strcmp(var, "apply.whitespace")) {
1873 apply_default_whitespace = strdup(value);
1876 return git_default_config(var, value);
1880 int main(int argc, char **argv)
1884 const char *whitespace_option = NULL;
1886 for (i = 1; i < argc; i++) {
1887 const char *arg = argv[i];
1890 if (!strcmp(arg, "-")) {
1891 apply_patch(0, "<stdin>");
1895 if (!strncmp(arg, "--exclude=", 10)) {
1896 struct excludes *x = xmalloc(sizeof(*x));
1902 if (!strncmp(arg, "-p", 2)) {
1903 p_value = atoi(arg + 2);
1906 if (!strcmp(arg, "--no-add")) {
1910 if (!strcmp(arg, "--stat")) {
1915 if (!strcmp(arg, "--allow-binary-replacement")) {
1916 allow_binary_replacement = 1;
1919 if (!strcmp(arg, "--numstat")) {
1924 if (!strcmp(arg, "--summary")) {
1929 if (!strcmp(arg, "--check")) {
1934 if (!strcmp(arg, "--index")) {
1938 if (!strcmp(arg, "--apply")) {
1942 if (!strcmp(arg, "--index-info")) {
1944 show_index_info = 1;
1947 if (!strcmp(arg, "-z")) {
1948 line_termination = 0;
1951 if (!strncmp(arg, "--whitespace=", 13)) {
1952 whitespace_option = arg + 13;
1953 parse_whitespace_option(arg + 13);
1957 if (check_index && prefix_length < 0) {
1958 prefix = setup_git_directory();
1959 prefix_length = prefix ? strlen(prefix) : 0;
1960 git_config(git_apply_config);
1961 if (!whitespace_option && apply_default_whitespace)
1962 parse_whitespace_option(apply_default_whitespace);
1964 if (0 < prefix_length)
1965 arg = prefix_filename(prefix, prefix_length, arg);
1967 fd = open(arg, O_RDONLY);
1971 set_default_whitespace_mode(whitespace_option);
1972 apply_patch(fd, arg);
1975 set_default_whitespace_mode(whitespace_option);
1977 apply_patch(0, "<stdin>");
1978 if (whitespace_error) {
1979 if (squelch_whitespace_errors &&
1980 squelch_whitespace_errors < whitespace_error) {
1982 whitespace_error - squelch_whitespace_errors;
1983 fprintf(stderr, "warning: squelched %d whitespace error%s\n",
1985 squelched == 1 ? "" : "s");
1987 if (new_whitespace == error_on_whitespace)
1988 die("%d line%s add%s trailing whitespaces.",
1990 whitespace_error == 1 ? "" : "s",
1991 whitespace_error == 1 ? "s" : "");
1992 if (applied_after_stripping)
1993 fprintf(stderr, "warning: %d line%s applied after"
1994 " stripping trailing whitespaces.\n",
1995 applied_after_stripping,
1996 applied_after_stripping == 1 ? "" : "s");
1997 else if (whitespace_error)
1998 fprintf(stderr, "warning: %d line%s add%s trailing"
2001 whitespace_error == 1 ? "" : "s",
2002 whitespace_error == 1 ? "s" : "");