4 * Copyright (C) Linus Torvalds, 2005
6 * This applies patches on top of some (arbitrary) version of the SCM.
13 // --check turns on checking that the working tree matches the
14 // files that are being modified, but doesn't apply the patch
15 // --stat does just a diffstat, and doesn't actually apply
16 // --numstat does numeric diffstat, and doesn't actually apply
17 // --index-info shows the old and new index info for paths if available.
19 static const char *prefix;
20 static int prefix_length = -1;
22 static int allow_binary_replacement = 0;
23 static int check_index = 0;
24 static int write_index = 0;
25 static int diffstat = 0;
26 static int numstat = 0;
27 static int summary = 0;
30 static int no_add = 0;
31 static int show_index_info = 0;
32 static int line_termination = '\n';
33 static const char apply_usage[] =
34 "git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [-z] <patch>...";
37 * For "diff-stat" like behaviour, we keep track of the biggest change
38 * we've seen, and the longest filename. That allows us to do simple
41 static int max_change, max_len;
44 * Various "current state", notably line numbers and what
45 * file (and how) we're patching right now.. The "is_xxxx"
46 * things are flags, where -1 means "don't know yet".
48 static int linenr = 1;
51 unsigned long oldpos, oldlines;
52 unsigned long newpos, newlines;
55 struct fragment *next;
59 char *new_name, *old_name, *def_name;
60 unsigned int old_mode, new_mode;
61 int is_rename, is_copy, is_new, is_delete, is_binary;
62 int lines_added, lines_deleted;
64 struct fragment *fragments;
66 unsigned long resultsize;
67 char old_sha1_prefix[41];
68 char new_sha1_prefix[41];
72 #define CHUNKSIZE (8192)
75 static void *read_patch_file(int fd, unsigned long *sizep)
77 unsigned long size = 0, alloc = CHUNKSIZE;
78 void *buffer = xmalloc(alloc);
81 int nr = alloc - size;
84 buffer = xrealloc(buffer, alloc);
87 nr = read(fd, buffer + size, nr);
93 die("git-apply: read returned %s", strerror(errno));
100 * Make sure that we have some slop in the buffer
101 * so that we can do speculative "memcmp" etc, and
102 * see to it that it is NUL-filled.
104 if (alloc < size + SLOP)
105 buffer = xrealloc(buffer, size + SLOP);
106 memset(buffer + size, 0, SLOP);
110 static unsigned long linelen(const char *buffer, unsigned long size)
112 unsigned long len = 0;
115 if (*buffer++ == '\n')
121 static int is_dev_null(const char *str)
123 return !memcmp("/dev/null", str, 9) && isspace(str[9]);
129 static int name_terminate(const char *name, int namelen, int c, int terminate)
131 if (c == ' ' && !(terminate & TERM_SPACE))
133 if (c == '\t' && !(terminate & TERM_TAB))
139 static char * find_name(const char *line, char *def, int p_value, int terminate)
142 const char *start = line;
146 /* Proposed "new-style" GNU patch/diff format; see
147 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
149 name = unquote_c_style(line, NULL);
153 cp = strchr(name, '/');
160 /* name can later be freed, so we need
161 * to memmove, not just return cp
163 memmove(name, cp, strlen(cp) + 1);
180 if (name_terminate(start, line-start, c, terminate))
184 if (c == '/' && !--p_value)
194 * Generally we prefer the shorter name, especially
195 * if the other one is just a variation of that with
196 * something else tacked on to the end (ie "file.orig"
200 int deflen = strlen(def);
201 if (deflen < len && !strncmp(start, def, deflen))
205 name = xmalloc(len + 1);
206 memcpy(name, start, len);
213 * Get the name etc info from the --/+++ lines of a traditional patch header
215 * NOTE! This hardcodes "-p1" behaviour in filename detection.
217 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
218 * files, we can happily check the index for a match, but for creating a
219 * new file we should try to match whatever "patch" does. I have no idea.
221 static void parse_traditional_patch(const char *first, const char *second, struct patch *patch)
226 first += 4; // skip "--- "
227 second += 4; // skip "+++ "
228 if (is_dev_null(first)) {
230 patch->is_delete = 0;
231 name = find_name(second, NULL, p_value, TERM_SPACE | TERM_TAB);
232 patch->new_name = name;
233 } else if (is_dev_null(second)) {
235 patch->is_delete = 1;
236 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
237 patch->old_name = name;
239 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
240 name = find_name(second, name, p_value, TERM_SPACE | TERM_TAB);
241 patch->old_name = patch->new_name = name;
244 die("unable to find filename in patch at line %d", linenr);
247 static int gitdiff_hdrend(const char *line, struct patch *patch)
253 * We're anal about diff header consistency, to make
254 * sure that we don't end up having strange ambiguous
255 * patches floating around.
257 * As a result, gitdiff_{old|new}name() will check
258 * their names against any previous information, just
261 static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, const char *oldnew)
263 if (!orig_name && !isnull)
264 return find_name(line, NULL, 1, 0);
273 die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr);
274 another = find_name(line, NULL, 1, 0);
275 if (!another || memcmp(another, name, len))
276 die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr);
281 /* expect "/dev/null" */
282 if (memcmp("/dev/null", line, 9) || line[9] != '\n')
283 die("git-apply: bad git-diff - expected /dev/null on line %d", linenr);
288 static int gitdiff_oldname(const char *line, struct patch *patch)
290 patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name, "old");
294 static int gitdiff_newname(const char *line, struct patch *patch)
296 patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name, "new");
300 static int gitdiff_oldmode(const char *line, struct patch *patch)
302 patch->old_mode = strtoul(line, NULL, 8);
306 static int gitdiff_newmode(const char *line, struct patch *patch)
308 patch->new_mode = strtoul(line, NULL, 8);
312 static int gitdiff_delete(const char *line, struct patch *patch)
314 patch->is_delete = 1;
315 patch->old_name = patch->def_name;
316 return gitdiff_oldmode(line, patch);
319 static int gitdiff_newfile(const char *line, struct patch *patch)
322 patch->new_name = patch->def_name;
323 return gitdiff_newmode(line, patch);
326 static int gitdiff_copysrc(const char *line, struct patch *patch)
329 patch->old_name = find_name(line, NULL, 0, 0);
333 static int gitdiff_copydst(const char *line, struct patch *patch)
336 patch->new_name = find_name(line, NULL, 0, 0);
340 static int gitdiff_renamesrc(const char *line, struct patch *patch)
342 patch->is_rename = 1;
343 patch->old_name = find_name(line, NULL, 0, 0);
347 static int gitdiff_renamedst(const char *line, struct patch *patch)
349 patch->is_rename = 1;
350 patch->new_name = find_name(line, NULL, 0, 0);
354 static int gitdiff_similarity(const char *line, struct patch *patch)
356 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
361 static int gitdiff_dissimilarity(const char *line, struct patch *patch)
363 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
368 static int gitdiff_index(const char *line, struct patch *patch)
370 /* index line is N hexadecimal, "..", N hexadecimal,
371 * and optional space with octal mode.
373 const char *ptr, *eol;
376 ptr = strchr(line, '.');
377 if (!ptr || ptr[1] != '.' || 40 < ptr - line)
380 memcpy(patch->old_sha1_prefix, line, len);
381 patch->old_sha1_prefix[len] = 0;
384 ptr = strchr(line, ' ');
385 eol = strchr(line, '\n');
387 if (!ptr || eol < ptr)
393 memcpy(patch->new_sha1_prefix, line, len);
394 patch->new_sha1_prefix[len] = 0;
396 patch->new_mode = patch->old_mode = strtoul(ptr+1, NULL, 8);
401 * This is normal for a diff that doesn't change anything: we'll fall through
402 * into the next diff. Tell the parser to break out.
404 static int gitdiff_unrecognized(const char *line, struct patch *patch)
409 static const char *stop_at_slash(const char *line, int llen)
413 for (i = 0; i < llen; i++) {
421 /* This is to extract the same name that appears on "diff --git"
422 * line. We do not find and return anything if it is a rename
423 * patch, and it is OK because we will find the name elsewhere.
424 * We need to reliably find name only when it is mode-change only,
425 * creation or deletion of an empty file. In any of these cases,
426 * both sides are the same name under a/ and b/ respectively.
428 static char *git_header_name(char *line, int llen)
432 const char *second = NULL;
434 line += strlen("diff --git ");
435 llen -= strlen("diff --git ");
439 char *first = unquote_c_style(line, &second);
443 /* advance to the first slash */
444 cp = stop_at_slash(first, strlen(first));
445 if (!cp || cp == first) {
446 /* we do not accept absolute paths */
452 memmove(first, cp+1, len+1); /* including NUL */
454 /* second points at one past closing dq of name.
455 * find the second name.
457 while ((second < line + llen) && isspace(*second))
460 if (line + llen <= second)
461 goto free_first_and_fail;
462 if (*second == '"') {
463 char *sp = unquote_c_style(second, NULL);
465 goto free_first_and_fail;
466 cp = stop_at_slash(sp, strlen(sp));
467 if (!cp || cp == sp) {
470 goto free_first_and_fail;
472 /* They must match, otherwise ignore */
473 if (strcmp(cp+1, first))
474 goto free_both_and_fail;
479 /* unquoted second */
480 cp = stop_at_slash(second, line + llen - second);
481 if (!cp || cp == second)
482 goto free_first_and_fail;
484 if (line + llen - cp != len + 1 ||
485 memcmp(first, cp, len))
486 goto free_first_and_fail;
490 /* unquoted first name */
491 name = stop_at_slash(line, llen);
492 if (!name || name == line)
497 /* since the first name is unquoted, a dq if exists must be
498 * the beginning of the second name.
500 for (second = name; second < line + llen; second++) {
501 if (*second == '"') {
502 const char *cp = second;
504 char *sp = unquote_c_style(second, NULL);
508 np = stop_at_slash(sp, strlen(sp));
509 if (!np || np == sp) {
510 free_second_and_fail:
516 if (len < cp - name &&
517 !strncmp(np, name, len) &&
518 isspace(name[len])) {
520 memmove(sp, np, len + 1);
523 goto free_second_and_fail;
528 * Accept a name only if it shows up twice, exactly the same
531 for (len = 0 ; ; len++) {
548 if (second[len] == '\n' && !memcmp(name, second, len)) {
549 char *ret = xmalloc(len + 1);
550 memcpy(ret, name, len);
559 /* Verify that we recognize the lines following a git header */
560 static int parse_git_header(char *line, int len, unsigned int size, struct patch *patch)
562 unsigned long offset;
564 /* A git diff has explicit new/delete information, so we don't guess */
566 patch->is_delete = 0;
569 * Some things may not have the old name in the
570 * rest of the headers anywhere (pure mode changes,
571 * or removing or adding empty files), so we get
572 * the default name from the header.
574 patch->def_name = git_header_name(line, len);
579 for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {
580 static const struct opentry {
582 int (*fn)(const char *, struct patch *);
584 { "@@ -", gitdiff_hdrend },
585 { "--- ", gitdiff_oldname },
586 { "+++ ", gitdiff_newname },
587 { "old mode ", gitdiff_oldmode },
588 { "new mode ", gitdiff_newmode },
589 { "deleted file mode ", gitdiff_delete },
590 { "new file mode ", gitdiff_newfile },
591 { "copy from ", gitdiff_copysrc },
592 { "copy to ", gitdiff_copydst },
593 { "rename old ", gitdiff_renamesrc },
594 { "rename new ", gitdiff_renamedst },
595 { "rename from ", gitdiff_renamesrc },
596 { "rename to ", gitdiff_renamedst },
597 { "similarity index ", gitdiff_similarity },
598 { "dissimilarity index ", gitdiff_dissimilarity },
599 { "index ", gitdiff_index },
600 { "", gitdiff_unrecognized },
604 len = linelen(line, size);
605 if (!len || line[len-1] != '\n')
607 for (i = 0; i < sizeof(optable) / sizeof(optable[0]); i++) {
608 const struct opentry *p = optable + i;
609 int oplen = strlen(p->str);
610 if (len < oplen || memcmp(p->str, line, oplen))
612 if (p->fn(line + oplen, patch) < 0)
621 static int parse_num(const char *line, unsigned long *p)
627 *p = strtoul(line, &ptr, 10);
631 static int parse_range(const char *line, int len, int offset, const char *expect,
632 unsigned long *p1, unsigned long *p2)
636 if (offset < 0 || offset >= len)
641 digits = parse_num(line, p1);
651 digits = parse_num(line+1, p2);
663 if (memcmp(line, expect, ex))
670 * Parse a unified diff fragment header of the
671 * form "@@ -a,b +c,d @@"
673 static int parse_fragment_header(char *line, int len, struct fragment *fragment)
677 if (!len || line[len-1] != '\n')
680 /* Figure out the number of lines in a fragment */
681 offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);
682 offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);
687 static int find_header(char *line, unsigned long size, int *hdrsize, struct patch *patch)
689 unsigned long offset, len;
691 patch->is_rename = patch->is_copy = 0;
692 patch->is_new = patch->is_delete = -1;
693 patch->old_mode = patch->new_mode = 0;
694 patch->old_name = patch->new_name = NULL;
695 for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {
696 unsigned long nextlen;
698 len = linelen(line, size);
702 /* Testing this early allows us to take a few shortcuts.. */
707 * Make sure we don't find any unconnected patch fragmants.
708 * That's a sign that we didn't find a header, and that a
709 * patch has become corrupted/broken up.
711 if (!memcmp("@@ -", line, 4)) {
712 struct fragment dummy;
713 if (parse_fragment_header(line, len, &dummy) < 0)
715 error("patch fragment without header at line %d: %.*s", linenr, (int)len-1, line);
722 * Git patch? It might not have a real patch, just a rename
723 * or mode change, so we handle that specially
725 if (!memcmp("diff --git ", line, 11)) {
726 int git_hdr_len = parse_git_header(line, len, size, patch);
727 if (git_hdr_len <= len)
729 if (!patch->old_name && !patch->new_name) {
730 if (!patch->def_name)
731 die("git diff header lacks filename information (line %d)", linenr);
732 patch->old_name = patch->new_name = patch->def_name;
734 *hdrsize = git_hdr_len;
738 /** --- followed by +++ ? */
739 if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4))
743 * We only accept unified patches, so we want it to
744 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
747 nextlen = linelen(line + len, size - len);
748 if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))
751 /* Ok, we'll consider it a patch */
752 parse_traditional_patch(line, line+len, patch);
753 *hdrsize = len + nextlen;
761 * Parse a unified diff. Note that this really needs
762 * to parse each fragment separately, since the only
763 * way to know the difference between a "---" that is
764 * part of a patch, and a "---" that starts the next
765 * patch is to look at the line counts..
767 static int parse_fragment(char *line, unsigned long size, struct patch *patch, struct fragment *fragment)
770 int len = linelen(line, size), offset;
771 unsigned long oldlines, newlines;
773 offset = parse_fragment_header(line, len, fragment);
776 oldlines = fragment->oldlines;
777 newlines = fragment->newlines;
779 if (patch->is_new < 0) {
780 patch->is_new = !oldlines;
782 patch->old_name = NULL;
784 if (patch->is_delete < 0) {
785 patch->is_delete = !newlines;
787 patch->new_name = NULL;
790 if (patch->is_new != !oldlines)
791 return error("new file depends on old contents");
792 if (patch->is_delete != !newlines) {
794 return error("deleted file still has contents");
795 fprintf(stderr, "** warning: file %s becomes empty but is not deleted\n", patch->new_name);
798 /* Parse the thing.. */
803 for (offset = len; size > 0; offset += len, size -= len, line += len, linenr++) {
804 if (!oldlines && !newlines)
806 len = linelen(line, size);
807 if (!len || line[len-1] != '\n')
825 /* We allow "\ No newline at end of file". Depending
826 * on locale settings when the patch was produced we
827 * don't know what this line looks like. The only
828 * thing we do know is that it begins with "\ ".
829 * Checking for 12 is just for sanity check -- any
830 * l10n of "\ No newline..." is at least that long.
833 if (len < 12 || memcmp(line, "\\ ", 2))
838 /* If a fragment ends with an incomplete line, we failed to include
839 * it in the above loop because we hit oldlines == newlines == 0
842 if (12 < size && !memcmp(line, "\\ ", 2))
843 offset += linelen(line, size);
845 patch->lines_added += added;
846 patch->lines_deleted += deleted;
850 static int parse_single_patch(char *line, unsigned long size, struct patch *patch)
852 unsigned long offset = 0;
853 struct fragment **fragp = &patch->fragments;
855 while (size > 4 && !memcmp(line, "@@ -", 4)) {
856 struct fragment *fragment;
859 fragment = xmalloc(sizeof(*fragment));
860 memset(fragment, 0, sizeof(*fragment));
861 len = parse_fragment(line, size, patch, fragment);
863 die("corrupt patch at line %d", linenr);
865 fragment->patch = line;
866 fragment->size = len;
869 fragp = &fragment->next;
878 static inline int metadata_changes(struct patch *patch)
880 return patch->is_rename > 0 ||
881 patch->is_copy > 0 ||
884 (patch->old_mode && patch->new_mode &&
885 patch->old_mode != patch->new_mode);
888 static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
890 int hdrsize, patchsize;
891 int offset = find_header(buffer, size, &hdrsize, patch);
896 patchsize = parse_single_patch(buffer + offset + hdrsize, size - offset - hdrsize, patch);
899 static const char *binhdr[] = {
905 int hd = hdrsize + offset;
906 unsigned long llen = linelen(buffer + hd, size - hd);
908 if (!memcmp(" differ\n", buffer + hd + llen - 8, 8))
909 for (i = 0; binhdr[i]; i++) {
910 int len = strlen(binhdr[i]);
911 if (len < size - hd &&
912 !memcmp(binhdr[i], buffer + hd, len)) {
913 patch->is_binary = 1;
918 /* Empty patch cannot be applied if:
919 * - it is a binary patch and we do not do binary_replace, or
920 * - text patch without metadata change
922 if ((apply || check) &&
924 ? !allow_binary_replacement
925 : !metadata_changes(patch)))
926 die("patch with only garbage at line %d", linenr);
929 return offset + hdrsize + patchsize;
932 static const char pluses[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
933 static const char minuses[]= "----------------------------------------------------------------------";
935 static void show_stats(struct patch *patch)
937 const char *prefix = "";
938 char *name = patch->new_name;
940 int len, max, add, del, total;
943 name = patch->old_name;
945 if (0 < (len = quote_c_style(name, NULL, NULL, 0))) {
946 qname = xmalloc(len + 1);
947 quote_c_style(name, qname, NULL, 0);
952 * "scale" the filename
963 slash = strchr(name, '/');
970 * scale the add/delete
976 add = patch->lines_added;
977 del = patch->lines_deleted;
980 if (max_change > 0) {
981 total = (total * max + max_change / 2) / max_change;
982 add = (add * max + max_change / 2) / max_change;
985 if (patch->is_binary)
986 printf(" %s%-*s | Bin\n", prefix, len, name);
988 printf(" %s%-*s |%5d %.*s%.*s\n", prefix,
989 len, name, patch->lines_added + patch->lines_deleted,
990 add, pluses, del, minuses);
995 static int read_old_data(struct stat *st, const char *path, void *buf, unsigned long size)
1000 switch (st->st_mode & S_IFMT) {
1002 return readlink(path, buf, size);
1004 fd = open(path, O_RDONLY);
1006 return error("unable to open %s", path);
1009 int ret = read(fd, buf + got, size - got);
1011 if (errno == EAGAIN)
1027 static int find_offset(const char *buf, unsigned long size, const char *fragment, unsigned long fragsize, int line)
1030 unsigned long start, backwards, forwards;
1032 if (fragsize > size)
1037 unsigned long offset = 0;
1039 while (offset + fragsize <= size) {
1040 if (buf[offset++] == '\n') {
1048 /* Exact line number? */
1049 if (!memcmp(buf + start, fragment, fragsize))
1053 * There's probably some smart way to do this, but I'll leave
1054 * that to the smart and beautiful people. I'm simple and stupid.
1058 for (i = 0; ; i++) {
1065 if (forwards + fragsize > size)
1071 } while (backwards && buf[backwards-1] != '\n');
1074 while (forwards + fragsize <= size) {
1075 if (buf[forwards++] == '\n')
1081 if (try + fragsize > size)
1083 if (memcmp(buf + try, fragment, fragsize))
1092 * We should start searching forward and backward.
1097 struct buffer_desc {
1100 unsigned long alloc;
1103 static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag)
1105 char *buf = desc->buffer;
1106 const char *patch = frag->patch;
1107 int offset, size = frag->size;
1108 char *old = xmalloc(size);
1109 char *new = xmalloc(size);
1110 int oldsize = 0, newsize = 0;
1113 int len = linelen(patch, size);
1120 * "plen" is how much of the line we should use for
1121 * the actual patch data. Normally we just remove the
1122 * first character on the line, but if the line is
1123 * followed by "\ No newline", then we also remove the
1124 * last one (which is the newline, of course).
1127 if (len < size && patch[len] == '\\')
1132 memcpy(old + oldsize, patch + 1, plen);
1136 /* Fall-through for ' ' */
1138 if (*patch != '+' || !no_add) {
1139 memcpy(new + newsize, patch + 1, plen);
1143 case '@': case '\\':
1144 /* Ignore it, we already handled it */
1153 offset = find_offset(buf, desc->size, old, oldsize, frag->newpos);
1155 int diff = newsize - oldsize;
1156 unsigned long size = desc->size + diff;
1157 unsigned long alloc = desc->alloc;
1160 alloc = size + 8192;
1161 desc->alloc = alloc;
1162 buf = xrealloc(buf, alloc);
1166 memmove(buf + offset + newsize, buf + offset + oldsize, size - offset - newsize);
1167 memcpy(buf + offset, new, newsize);
1176 static int apply_fragments(struct buffer_desc *desc, struct patch *patch)
1178 struct fragment *frag = patch->fragments;
1179 const char *name = patch->old_name ? patch->old_name : patch->new_name;
1181 if (patch->is_binary) {
1182 unsigned char sha1[20];
1184 if (!allow_binary_replacement)
1185 return error("cannot apply binary patch to '%s' "
1186 "without --allow-binary-replacement",
1189 /* For safety, we require patch index line to contain
1190 * full 40-byte textual SHA1 for old and new, at least for now.
1192 if (strlen(patch->old_sha1_prefix) != 40 ||
1193 strlen(patch->new_sha1_prefix) != 40 ||
1194 get_sha1_hex(patch->old_sha1_prefix, sha1) ||
1195 get_sha1_hex(patch->new_sha1_prefix, sha1))
1196 return error("cannot apply binary patch to '%s' "
1197 "without full index line", name);
1199 if (patch->old_name) {
1200 unsigned char hdr[50];
1203 /* See if the old one matches what the patch
1206 write_sha1_file_prepare(desc->buffer, desc->size,
1207 "blob", sha1, hdr, &hdrlen);
1208 if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))
1209 return error("the patch applies to '%s' (%s), "
1210 "which does not match the "
1211 "current contents.",
1212 name, sha1_to_hex(sha1));
1215 /* Otherwise, the old one must be empty. */
1217 return error("the patch applies to an empty "
1218 "'%s' but it is not empty", name);
1221 /* For now, we do not record post-image data in the patch,
1222 * and require the object already present in the recipient's
1227 desc->alloc = desc->size = 0;
1229 get_sha1_hex(patch->new_sha1_prefix, sha1);
1231 if (memcmp(sha1, null_sha1, 20)) {
1235 desc->buffer = read_sha1_file(sha1, type, &size);
1237 return error("the necessary postimage %s for "
1238 "'%s' does not exist",
1239 patch->new_sha1_prefix, name);
1240 desc->alloc = desc->size = size;
1247 if (apply_one_fragment(desc, frag) < 0)
1248 return error("patch failed: %s:%ld",
1249 name, frag->oldpos);
1255 static int apply_data(struct patch *patch, struct stat *st)
1258 unsigned long size, alloc;
1259 struct buffer_desc desc;
1264 if (patch->old_name) {
1266 alloc = size + 8192;
1267 buf = xmalloc(alloc);
1268 if (read_old_data(st, patch->old_name, buf, alloc) != size)
1269 return error("read of %s failed", patch->old_name);
1275 if (apply_fragments(&desc, patch) < 0)
1277 patch->result = desc.buffer;
1278 patch->resultsize = desc.size;
1280 if (patch->is_delete && patch->resultsize)
1281 return error("removal patch leaves file contents");
1286 static int check_patch(struct patch *patch)
1289 const char *old_name = patch->old_name;
1290 const char *new_name = patch->new_name;
1291 const char *name = old_name ? old_name : new_name;
1295 int stat_ret = lstat(old_name, &st);
1298 int pos = cache_name_pos(old_name, strlen(old_name));
1300 return error("%s: does not exist in index",
1303 struct checkout costate;
1304 if (errno != ENOENT)
1305 return error("%s: %s", old_name,
1308 costate.base_dir = "";
1309 costate.base_dir_len = 0;
1312 costate.not_new = 0;
1313 costate.refresh_cache = 1;
1314 if (checkout_entry(active_cache[pos],
1316 lstat(old_name, &st))
1320 changed = ce_match_stat(active_cache[pos], &st);
1322 return error("%s: does not match index",
1325 else if (stat_ret < 0)
1326 return error("%s: %s", old_name, strerror(errno));
1328 if (patch->is_new < 0)
1330 st.st_mode = ntohl(create_ce_mode(st.st_mode));
1331 if (!patch->old_mode)
1332 patch->old_mode = st.st_mode;
1333 if ((st.st_mode ^ patch->old_mode) & S_IFMT)
1334 return error("%s: wrong type", old_name);
1335 if (st.st_mode != patch->old_mode)
1336 fprintf(stderr, "warning: %s has type %o, expected %o\n",
1337 old_name, st.st_mode, patch->old_mode);
1340 if (new_name && (patch->is_new | patch->is_rename | patch->is_copy)) {
1341 if (check_index && cache_name_pos(new_name, strlen(new_name)) >= 0)
1342 return error("%s: already exists in index", new_name);
1343 if (!lstat(new_name, &st))
1344 return error("%s: already exists in working directory", new_name);
1345 if (errno != ENOENT)
1346 return error("%s: %s", new_name, strerror(errno));
1347 if (!patch->new_mode) {
1349 patch->new_mode = S_IFREG | 0644;
1351 patch->new_mode = patch->old_mode;
1355 if (new_name && old_name) {
1356 int same = !strcmp(old_name, new_name);
1357 if (!patch->new_mode)
1358 patch->new_mode = patch->old_mode;
1359 if ((patch->old_mode ^ patch->new_mode) & S_IFMT)
1360 return error("new mode (%o) of %s does not match old mode (%o)%s%s",
1361 patch->new_mode, new_name, patch->old_mode,
1362 same ? "" : " of ", same ? "" : old_name);
1365 if (apply_data(patch, &st) < 0)
1366 return error("%s: patch does not apply", name);
1370 static int check_patch_list(struct patch *patch)
1374 for (;patch ; patch = patch->next)
1375 error |= check_patch(patch);
1379 static inline int is_null_sha1(const unsigned char *sha1)
1381 return !memcmp(sha1, null_sha1, 20);
1384 static void show_index_list(struct patch *list)
1386 struct patch *patch;
1388 /* Once we start supporting the reverse patch, it may be
1389 * worth showing the new sha1 prefix, but until then...
1391 for (patch = list; patch; patch = patch->next) {
1392 const unsigned char *sha1_ptr;
1393 unsigned char sha1[20];
1396 name = patch->old_name ? patch->old_name : patch->new_name;
1398 sha1_ptr = null_sha1;
1399 else if (get_sha1(patch->old_sha1_prefix, sha1))
1400 die("sha1 information is lacking or useless (%s).",
1405 printf("%06o %s ",patch->old_mode, sha1_to_hex(sha1_ptr));
1406 if (line_termination && quote_c_style(name, NULL, NULL, 0))
1407 quote_c_style(name, NULL, stdout, 0);
1409 fputs(name, stdout);
1410 putchar(line_termination);
1414 static void stat_patch_list(struct patch *patch)
1416 int files, adds, dels;
1418 for (files = adds = dels = 0 ; patch ; patch = patch->next) {
1420 adds += patch->lines_added;
1421 dels += patch->lines_deleted;
1425 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files, adds, dels);
1428 static void numstat_patch_list(struct patch *patch)
1430 for ( ; patch; patch = patch->next) {
1432 name = patch->old_name ? patch->old_name : patch->new_name;
1433 printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);
1434 if (line_termination && quote_c_style(name, NULL, NULL, 0))
1435 quote_c_style(name, NULL, stdout, 0);
1437 fputs(name, stdout);
1442 static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)
1445 printf(" %s mode %06o %s\n", newdelete, mode, name);
1447 printf(" %s %s\n", newdelete, name);
1450 static void show_mode_change(struct patch *p, int show_name)
1452 if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {
1454 printf(" mode change %06o => %06o %s\n",
1455 p->old_mode, p->new_mode, p->new_name);
1457 printf(" mode change %06o => %06o\n",
1458 p->old_mode, p->new_mode);
1462 static void show_rename_copy(struct patch *p)
1464 const char *renamecopy = p->is_rename ? "rename" : "copy";
1465 const char *old, *new;
1467 /* Find common prefix */
1471 const char *slash_old, *slash_new;
1472 slash_old = strchr(old, '/');
1473 slash_new = strchr(new, '/');
1476 slash_old - old != slash_new - new ||
1477 memcmp(old, new, slash_new - new))
1479 old = slash_old + 1;
1480 new = slash_new + 1;
1482 /* p->old_name thru old is the common prefix, and old and new
1483 * through the end of names are renames
1485 if (old != p->old_name)
1486 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
1487 (int)(old - p->old_name), p->old_name,
1488 old, new, p->score);
1490 printf(" %s %s => %s (%d%%)\n", renamecopy,
1491 p->old_name, p->new_name, p->score);
1492 show_mode_change(p, 0);
1495 static void summary_patch_list(struct patch *patch)
1499 for (p = patch; p; p = p->next) {
1501 show_file_mode_name("create", p->new_mode, p->new_name);
1502 else if (p->is_delete)
1503 show_file_mode_name("delete", p->old_mode, p->old_name);
1505 if (p->is_rename || p->is_copy)
1506 show_rename_copy(p);
1509 printf(" rewrite %s (%d%%)\n",
1510 p->new_name, p->score);
1511 show_mode_change(p, 0);
1514 show_mode_change(p, 1);
1520 static void patch_stats(struct patch *patch)
1522 int lines = patch->lines_added + patch->lines_deleted;
1524 if (lines > max_change)
1526 if (patch->old_name) {
1527 int len = quote_c_style(patch->old_name, NULL, NULL, 0);
1529 len = strlen(patch->old_name);
1533 if (patch->new_name) {
1534 int len = quote_c_style(patch->new_name, NULL, NULL, 0);
1536 len = strlen(patch->new_name);
1542 static void remove_file(struct patch *patch)
1545 if (remove_file_from_cache(patch->old_name) < 0)
1546 die("unable to remove %s from index", patch->old_name);
1548 unlink(patch->old_name);
1551 static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size)
1554 struct cache_entry *ce;
1555 int namelen = strlen(path);
1556 unsigned ce_size = cache_entry_size(namelen);
1561 ce = xmalloc(ce_size);
1562 memset(ce, 0, ce_size);
1563 memcpy(ce->name, path, namelen);
1564 ce->ce_mode = create_ce_mode(mode);
1565 ce->ce_flags = htons(namelen);
1566 if (lstat(path, &st) < 0)
1567 die("unable to stat newly created file %s", path);
1568 fill_stat_cache_info(ce, &st);
1569 if (write_sha1_file(buf, size, "blob", ce->sha1) < 0)
1570 die("unable to create backing store for newly created file %s", path);
1571 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)
1572 die("unable to add cache entry for %s", path);
1575 static void create_subdirectories(const char *path)
1577 int len = strlen(path);
1578 char *buf = xmalloc(len + 1);
1579 const char *slash = path;
1581 while ((slash = strchr(slash+1, '/')) != NULL) {
1583 memcpy(buf, path, len);
1585 if (mkdir(buf, 0777) < 0) {
1586 if (errno != EEXIST)
1593 static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)
1598 return symlink(buf, path);
1599 fd = open(path, O_CREAT | O_EXCL | O_WRONLY | O_TRUNC, (mode & 0100) ? 0777 : 0666);
1603 int written = write(fd, buf, size);
1605 if (errno == EINTR || errno == EAGAIN)
1607 die("writing file %s: %s", path, strerror(errno));
1610 die("out of space writing file %s", path);
1615 die("closing file %s: %s", path, strerror(errno));
1620 * We optimistically assume that the directories exist,
1621 * which is true 99% of the time anyway. If they don't,
1622 * we create them and try again.
1624 static void create_one_file(const char *path, unsigned mode, const char *buf, unsigned long size)
1626 if (!try_create_file(path, mode, buf, size))
1629 if (errno == ENOENT) {
1630 create_subdirectories(path);
1631 if (!try_create_file(path, mode, buf, size))
1635 if (errno == EEXIST) {
1636 unsigned int nr = getpid();
1639 const char *newpath;
1640 newpath = mkpath("%s~%u", path, nr);
1641 if (!try_create_file(newpath, mode, buf, size)) {
1642 if (!rename(newpath, path))
1647 if (errno != EEXIST)
1651 die("unable to write file %s mode %o", path, mode);
1654 static void create_file(struct patch *patch)
1656 const char *path = patch->new_name;
1657 unsigned mode = patch->new_mode;
1658 unsigned long size = patch->resultsize;
1659 char *buf = patch->result;
1662 mode = S_IFREG | 0644;
1663 create_one_file(path, mode, buf, size);
1664 add_index_file(path, mode, buf, size);
1667 static void write_out_one_result(struct patch *patch)
1669 if (patch->is_delete > 0) {
1673 if (patch->is_new > 0 || patch->is_copy) {
1678 * Rename or modification boils down to the same
1679 * thing: remove the old, write the new
1685 static void write_out_results(struct patch *list, int skipped_patch)
1687 if (!list && !skipped_patch)
1691 write_out_one_result(list);
1696 static struct cache_file cache_file;
1698 static struct excludes {
1699 struct excludes *next;
1703 static int use_patch(struct patch *p)
1705 const char *pathname = p->new_name ? p->new_name : p->old_name;
1706 struct excludes *x = excludes;
1708 if (fnmatch(x->path, pathname, 0) == 0)
1712 if (0 < prefix_length) {
1713 int pathlen = strlen(pathname);
1714 if (pathlen <= prefix_length ||
1715 memcmp(prefix, pathname, prefix_length))
1721 static int apply_patch(int fd)
1724 unsigned long offset, size;
1725 char *buffer = read_patch_file(fd, &size);
1726 struct patch *list = NULL, **listp = &list;
1727 int skipped_patch = 0;
1733 struct patch *patch;
1736 patch = xmalloc(sizeof(*patch));
1737 memset(patch, 0, sizeof(*patch));
1738 nr = parse_chunk(buffer + offset, size, patch);
1741 if (use_patch(patch)) {
1744 listp = &patch->next;
1746 /* perhaps free it a bit better? */
1755 write_index = check_index && apply;
1757 newfd = hold_index_file_for_update(&cache_file, get_index_file());
1759 if (read_cache() < 0)
1760 die("unable to read index file");
1763 if ((check || apply) && check_patch_list(list) < 0)
1767 write_out_results(list, skipped_patch);
1770 if (write_cache(newfd, active_cache, active_nr) ||
1771 commit_index_file(&cache_file))
1772 die("Unable to write new cachefile");
1775 if (show_index_info)
1776 show_index_list(list);
1779 stat_patch_list(list);
1782 numstat_patch_list(list);
1785 summary_patch_list(list);
1791 int main(int argc, char **argv)
1796 for (i = 1; i < argc; i++) {
1797 const char *arg = argv[i];
1800 if (!strcmp(arg, "-")) {
1805 if (!strncmp(arg, "--exclude=", 10)) {
1806 struct excludes *x = xmalloc(sizeof(*x));
1812 if (!strcmp(arg, "--no-add")) {
1816 if (!strcmp(arg, "--stat")) {
1821 if (!strcmp(arg, "--allow-binary-replacement")) {
1822 allow_binary_replacement = 1;
1825 if (!strcmp(arg, "--numstat")) {
1830 if (!strcmp(arg, "--summary")) {
1835 if (!strcmp(arg, "--check")) {
1840 if (!strcmp(arg, "--index")) {
1844 if (!strcmp(arg, "--apply")) {
1848 if (!strcmp(arg, "--index-info")) {
1850 show_index_info = 1;
1853 if (!strcmp(arg, "-z")) {
1854 line_termination = 0;
1858 if (check_index && prefix_length < 0) {
1859 prefix = setup_git_directory();
1860 prefix_length = prefix ? strlen(prefix) : 0;
1861 git_config(git_default_config);
1863 if (0 < prefix_length)
1864 arg = prefix_filename(prefix, prefix_length, arg);
1866 fd = open(arg, O_RDONLY);