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 = xread(fd, buffer + size, nr);
91 die("git-apply: read returned %s", strerror(errno));
97 * Make sure that we have some slop in the buffer
98 * so that we can do speculative "memcmp" etc, and
99 * see to it that it is NUL-filled.
101 if (alloc < size + SLOP)
102 buffer = xrealloc(buffer, size + SLOP);
103 memset(buffer + size, 0, SLOP);
107 static unsigned long linelen(const char *buffer, unsigned long size)
109 unsigned long len = 0;
112 if (*buffer++ == '\n')
118 static int is_dev_null(const char *str)
120 return !memcmp("/dev/null", str, 9) && isspace(str[9]);
126 static int name_terminate(const char *name, int namelen, int c, int terminate)
128 if (c == ' ' && !(terminate & TERM_SPACE))
130 if (c == '\t' && !(terminate & TERM_TAB))
136 static char * find_name(const char *line, char *def, int p_value, int terminate)
139 const char *start = line;
143 /* Proposed "new-style" GNU patch/diff format; see
144 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
146 name = unquote_c_style(line, NULL);
150 cp = strchr(name, '/');
157 /* name can later be freed, so we need
158 * to memmove, not just return cp
160 memmove(name, cp, strlen(cp) + 1);
177 if (name_terminate(start, line-start, c, terminate))
181 if (c == '/' && !--p_value)
191 * Generally we prefer the shorter name, especially
192 * if the other one is just a variation of that with
193 * something else tacked on to the end (ie "file.orig"
197 int deflen = strlen(def);
198 if (deflen < len && !strncmp(start, def, deflen))
202 name = xmalloc(len + 1);
203 memcpy(name, start, len);
210 * Get the name etc info from the --/+++ lines of a traditional patch header
212 * NOTE! This hardcodes "-p1" behaviour in filename detection.
214 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
215 * files, we can happily check the index for a match, but for creating a
216 * new file we should try to match whatever "patch" does. I have no idea.
218 static void parse_traditional_patch(const char *first, const char *second, struct patch *patch)
223 first += 4; // skip "--- "
224 second += 4; // skip "+++ "
225 if (is_dev_null(first)) {
227 patch->is_delete = 0;
228 name = find_name(second, NULL, p_value, TERM_SPACE | TERM_TAB);
229 patch->new_name = name;
230 } else if (is_dev_null(second)) {
232 patch->is_delete = 1;
233 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
234 patch->old_name = name;
236 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
237 name = find_name(second, name, p_value, TERM_SPACE | TERM_TAB);
238 patch->old_name = patch->new_name = name;
241 die("unable to find filename in patch at line %d", linenr);
244 static int gitdiff_hdrend(const char *line, struct patch *patch)
250 * We're anal about diff header consistency, to make
251 * sure that we don't end up having strange ambiguous
252 * patches floating around.
254 * As a result, gitdiff_{old|new}name() will check
255 * their names against any previous information, just
258 static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, const char *oldnew)
260 if (!orig_name && !isnull)
261 return find_name(line, NULL, 1, 0);
270 die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr);
271 another = find_name(line, NULL, 1, 0);
272 if (!another || memcmp(another, name, len))
273 die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr);
278 /* expect "/dev/null" */
279 if (memcmp("/dev/null", line, 9) || line[9] != '\n')
280 die("git-apply: bad git-diff - expected /dev/null on line %d", linenr);
285 static int gitdiff_oldname(const char *line, struct patch *patch)
287 patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name, "old");
291 static int gitdiff_newname(const char *line, struct patch *patch)
293 patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name, "new");
297 static int gitdiff_oldmode(const char *line, struct patch *patch)
299 patch->old_mode = strtoul(line, NULL, 8);
303 static int gitdiff_newmode(const char *line, struct patch *patch)
305 patch->new_mode = strtoul(line, NULL, 8);
309 static int gitdiff_delete(const char *line, struct patch *patch)
311 patch->is_delete = 1;
312 patch->old_name = patch->def_name;
313 return gitdiff_oldmode(line, patch);
316 static int gitdiff_newfile(const char *line, struct patch *patch)
319 patch->new_name = patch->def_name;
320 return gitdiff_newmode(line, patch);
323 static int gitdiff_copysrc(const char *line, struct patch *patch)
326 patch->old_name = find_name(line, NULL, 0, 0);
330 static int gitdiff_copydst(const char *line, struct patch *patch)
333 patch->new_name = find_name(line, NULL, 0, 0);
337 static int gitdiff_renamesrc(const char *line, struct patch *patch)
339 patch->is_rename = 1;
340 patch->old_name = find_name(line, NULL, 0, 0);
344 static int gitdiff_renamedst(const char *line, struct patch *patch)
346 patch->is_rename = 1;
347 patch->new_name = find_name(line, NULL, 0, 0);
351 static int gitdiff_similarity(const char *line, struct patch *patch)
353 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
358 static int gitdiff_dissimilarity(const char *line, struct patch *patch)
360 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
365 static int gitdiff_index(const char *line, struct patch *patch)
367 /* index line is N hexadecimal, "..", N hexadecimal,
368 * and optional space with octal mode.
370 const char *ptr, *eol;
373 ptr = strchr(line, '.');
374 if (!ptr || ptr[1] != '.' || 40 < ptr - line)
377 memcpy(patch->old_sha1_prefix, line, len);
378 patch->old_sha1_prefix[len] = 0;
381 ptr = strchr(line, ' ');
382 eol = strchr(line, '\n');
384 if (!ptr || eol < ptr)
390 memcpy(patch->new_sha1_prefix, line, len);
391 patch->new_sha1_prefix[len] = 0;
393 patch->new_mode = patch->old_mode = strtoul(ptr+1, NULL, 8);
398 * This is normal for a diff that doesn't change anything: we'll fall through
399 * into the next diff. Tell the parser to break out.
401 static int gitdiff_unrecognized(const char *line, struct patch *patch)
406 static const char *stop_at_slash(const char *line, int llen)
410 for (i = 0; i < llen; i++) {
418 /* This is to extract the same name that appears on "diff --git"
419 * line. We do not find and return anything if it is a rename
420 * patch, and it is OK because we will find the name elsewhere.
421 * We need to reliably find name only when it is mode-change only,
422 * creation or deletion of an empty file. In any of these cases,
423 * both sides are the same name under a/ and b/ respectively.
425 static char *git_header_name(char *line, int llen)
429 const char *second = NULL;
431 line += strlen("diff --git ");
432 llen -= strlen("diff --git ");
436 char *first = unquote_c_style(line, &second);
440 /* advance to the first slash */
441 cp = stop_at_slash(first, strlen(first));
442 if (!cp || cp == first) {
443 /* we do not accept absolute paths */
449 memmove(first, cp+1, len+1); /* including NUL */
451 /* second points at one past closing dq of name.
452 * find the second name.
454 while ((second < line + llen) && isspace(*second))
457 if (line + llen <= second)
458 goto free_first_and_fail;
459 if (*second == '"') {
460 char *sp = unquote_c_style(second, NULL);
462 goto free_first_and_fail;
463 cp = stop_at_slash(sp, strlen(sp));
464 if (!cp || cp == sp) {
467 goto free_first_and_fail;
469 /* They must match, otherwise ignore */
470 if (strcmp(cp+1, first))
471 goto free_both_and_fail;
476 /* unquoted second */
477 cp = stop_at_slash(second, line + llen - second);
478 if (!cp || cp == second)
479 goto free_first_and_fail;
481 if (line + llen - cp != len + 1 ||
482 memcmp(first, cp, len))
483 goto free_first_and_fail;
487 /* unquoted first name */
488 name = stop_at_slash(line, llen);
489 if (!name || name == line)
494 /* since the first name is unquoted, a dq if exists must be
495 * the beginning of the second name.
497 for (second = name; second < line + llen; second++) {
498 if (*second == '"') {
499 const char *cp = second;
501 char *sp = unquote_c_style(second, NULL);
505 np = stop_at_slash(sp, strlen(sp));
506 if (!np || np == sp) {
507 free_second_and_fail:
513 if (len < cp - name &&
514 !strncmp(np, name, len) &&
515 isspace(name[len])) {
517 memmove(sp, np, len + 1);
520 goto free_second_and_fail;
525 * Accept a name only if it shows up twice, exactly the same
528 for (len = 0 ; ; len++) {
545 if (second[len] == '\n' && !memcmp(name, second, len)) {
546 char *ret = xmalloc(len + 1);
547 memcpy(ret, name, len);
556 /* Verify that we recognize the lines following a git header */
557 static int parse_git_header(char *line, int len, unsigned int size, struct patch *patch)
559 unsigned long offset;
561 /* A git diff has explicit new/delete information, so we don't guess */
563 patch->is_delete = 0;
566 * Some things may not have the old name in the
567 * rest of the headers anywhere (pure mode changes,
568 * or removing or adding empty files), so we get
569 * the default name from the header.
571 patch->def_name = git_header_name(line, len);
576 for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {
577 static const struct opentry {
579 int (*fn)(const char *, struct patch *);
581 { "@@ -", gitdiff_hdrend },
582 { "--- ", gitdiff_oldname },
583 { "+++ ", gitdiff_newname },
584 { "old mode ", gitdiff_oldmode },
585 { "new mode ", gitdiff_newmode },
586 { "deleted file mode ", gitdiff_delete },
587 { "new file mode ", gitdiff_newfile },
588 { "copy from ", gitdiff_copysrc },
589 { "copy to ", gitdiff_copydst },
590 { "rename old ", gitdiff_renamesrc },
591 { "rename new ", gitdiff_renamedst },
592 { "rename from ", gitdiff_renamesrc },
593 { "rename to ", gitdiff_renamedst },
594 { "similarity index ", gitdiff_similarity },
595 { "dissimilarity index ", gitdiff_dissimilarity },
596 { "index ", gitdiff_index },
597 { "", gitdiff_unrecognized },
601 len = linelen(line, size);
602 if (!len || line[len-1] != '\n')
604 for (i = 0; i < sizeof(optable) / sizeof(optable[0]); i++) {
605 const struct opentry *p = optable + i;
606 int oplen = strlen(p->str);
607 if (len < oplen || memcmp(p->str, line, oplen))
609 if (p->fn(line + oplen, patch) < 0)
618 static int parse_num(const char *line, unsigned long *p)
624 *p = strtoul(line, &ptr, 10);
628 static int parse_range(const char *line, int len, int offset, const char *expect,
629 unsigned long *p1, unsigned long *p2)
633 if (offset < 0 || offset >= len)
638 digits = parse_num(line, p1);
648 digits = parse_num(line+1, p2);
660 if (memcmp(line, expect, ex))
667 * Parse a unified diff fragment header of the
668 * form "@@ -a,b +c,d @@"
670 static int parse_fragment_header(char *line, int len, struct fragment *fragment)
674 if (!len || line[len-1] != '\n')
677 /* Figure out the number of lines in a fragment */
678 offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);
679 offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);
684 static int find_header(char *line, unsigned long size, int *hdrsize, struct patch *patch)
686 unsigned long offset, len;
688 patch->is_rename = patch->is_copy = 0;
689 patch->is_new = patch->is_delete = -1;
690 patch->old_mode = patch->new_mode = 0;
691 patch->old_name = patch->new_name = NULL;
692 for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {
693 unsigned long nextlen;
695 len = linelen(line, size);
699 /* Testing this early allows us to take a few shortcuts.. */
704 * Make sure we don't find any unconnected patch fragmants.
705 * That's a sign that we didn't find a header, and that a
706 * patch has become corrupted/broken up.
708 if (!memcmp("@@ -", line, 4)) {
709 struct fragment dummy;
710 if (parse_fragment_header(line, len, &dummy) < 0)
712 error("patch fragment without header at line %d: %.*s", linenr, (int)len-1, line);
719 * Git patch? It might not have a real patch, just a rename
720 * or mode change, so we handle that specially
722 if (!memcmp("diff --git ", line, 11)) {
723 int git_hdr_len = parse_git_header(line, len, size, patch);
724 if (git_hdr_len <= len)
726 if (!patch->old_name && !patch->new_name) {
727 if (!patch->def_name)
728 die("git diff header lacks filename information (line %d)", linenr);
729 patch->old_name = patch->new_name = patch->def_name;
731 *hdrsize = git_hdr_len;
735 /** --- followed by +++ ? */
736 if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4))
740 * We only accept unified patches, so we want it to
741 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
744 nextlen = linelen(line + len, size - len);
745 if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))
748 /* Ok, we'll consider it a patch */
749 parse_traditional_patch(line, line+len, patch);
750 *hdrsize = len + nextlen;
758 * Parse a unified diff. Note that this really needs
759 * to parse each fragment separately, since the only
760 * way to know the difference between a "---" that is
761 * part of a patch, and a "---" that starts the next
762 * patch is to look at the line counts..
764 static int parse_fragment(char *line, unsigned long size, struct patch *patch, struct fragment *fragment)
767 int len = linelen(line, size), offset;
768 unsigned long oldlines, newlines;
770 offset = parse_fragment_header(line, len, fragment);
773 oldlines = fragment->oldlines;
774 newlines = fragment->newlines;
776 if (patch->is_new < 0) {
777 patch->is_new = !oldlines;
779 patch->old_name = NULL;
781 if (patch->is_delete < 0) {
782 patch->is_delete = !newlines;
784 patch->new_name = NULL;
787 if (patch->is_new != !oldlines)
788 return error("new file depends on old contents");
789 if (patch->is_delete != !newlines) {
791 return error("deleted file still has contents");
792 fprintf(stderr, "** warning: file %s becomes empty but is not deleted\n", patch->new_name);
795 /* Parse the thing.. */
800 for (offset = len; size > 0; offset += len, size -= len, line += len, linenr++) {
801 if (!oldlines && !newlines)
803 len = linelen(line, size);
804 if (!len || line[len-1] != '\n')
822 /* We allow "\ No newline at end of file". Depending
823 * on locale settings when the patch was produced we
824 * don't know what this line looks like. The only
825 * thing we do know is that it begins with "\ ".
826 * Checking for 12 is just for sanity check -- any
827 * l10n of "\ No newline..." is at least that long.
830 if (len < 12 || memcmp(line, "\\ ", 2))
835 /* If a fragment ends with an incomplete line, we failed to include
836 * it in the above loop because we hit oldlines == newlines == 0
839 if (12 < size && !memcmp(line, "\\ ", 2))
840 offset += linelen(line, size);
842 patch->lines_added += added;
843 patch->lines_deleted += deleted;
847 static int parse_single_patch(char *line, unsigned long size, struct patch *patch)
849 unsigned long offset = 0;
850 struct fragment **fragp = &patch->fragments;
852 while (size > 4 && !memcmp(line, "@@ -", 4)) {
853 struct fragment *fragment;
856 fragment = xmalloc(sizeof(*fragment));
857 memset(fragment, 0, sizeof(*fragment));
858 len = parse_fragment(line, size, patch, fragment);
860 die("corrupt patch at line %d", linenr);
862 fragment->patch = line;
863 fragment->size = len;
866 fragp = &fragment->next;
875 static inline int metadata_changes(struct patch *patch)
877 return patch->is_rename > 0 ||
878 patch->is_copy > 0 ||
881 (patch->old_mode && patch->new_mode &&
882 patch->old_mode != patch->new_mode);
885 static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
887 int hdrsize, patchsize;
888 int offset = find_header(buffer, size, &hdrsize, patch);
893 patchsize = parse_single_patch(buffer + offset + hdrsize, size - offset - hdrsize, patch);
896 static const char *binhdr[] = {
902 int hd = hdrsize + offset;
903 unsigned long llen = linelen(buffer + hd, size - hd);
905 if (!memcmp(" differ\n", buffer + hd + llen - 8, 8))
906 for (i = 0; binhdr[i]; i++) {
907 int len = strlen(binhdr[i]);
908 if (len < size - hd &&
909 !memcmp(binhdr[i], buffer + hd, len)) {
910 patch->is_binary = 1;
915 /* Empty patch cannot be applied if:
916 * - it is a binary patch and we do not do binary_replace, or
917 * - text patch without metadata change
919 if ((apply || check) &&
921 ? !allow_binary_replacement
922 : !metadata_changes(patch)))
923 die("patch with only garbage at line %d", linenr);
926 return offset + hdrsize + patchsize;
929 static const char pluses[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
930 static const char minuses[]= "----------------------------------------------------------------------";
932 static void show_stats(struct patch *patch)
934 const char *prefix = "";
935 char *name = patch->new_name;
937 int len, max, add, del, total;
940 name = patch->old_name;
942 if (0 < (len = quote_c_style(name, NULL, NULL, 0))) {
943 qname = xmalloc(len + 1);
944 quote_c_style(name, qname, NULL, 0);
949 * "scale" the filename
960 slash = strchr(name, '/');
967 * scale the add/delete
973 add = patch->lines_added;
974 del = patch->lines_deleted;
977 if (max_change > 0) {
978 total = (total * max + max_change / 2) / max_change;
979 add = (add * max + max_change / 2) / max_change;
982 if (patch->is_binary)
983 printf(" %s%-*s | Bin\n", prefix, len, name);
985 printf(" %s%-*s |%5d %.*s%.*s\n", prefix,
986 len, name, patch->lines_added + patch->lines_deleted,
987 add, pluses, del, minuses);
992 static int read_old_data(struct stat *st, const char *path, void *buf, unsigned long size)
997 switch (st->st_mode & S_IFMT) {
999 return readlink(path, buf, size);
1001 fd = open(path, O_RDONLY);
1003 return error("unable to open %s", path);
1006 int ret = xread(fd, buf + got, size - got);
1019 static int find_offset(const char *buf, unsigned long size, const char *fragment, unsigned long fragsize, int line)
1022 unsigned long start, backwards, forwards;
1024 if (fragsize > size)
1029 unsigned long offset = 0;
1031 while (offset + fragsize <= size) {
1032 if (buf[offset++] == '\n') {
1040 /* Exact line number? */
1041 if (!memcmp(buf + start, fragment, fragsize))
1045 * There's probably some smart way to do this, but I'll leave
1046 * that to the smart and beautiful people. I'm simple and stupid.
1050 for (i = 0; ; i++) {
1057 if (forwards + fragsize > size)
1063 } while (backwards && buf[backwards-1] != '\n');
1066 while (forwards + fragsize <= size) {
1067 if (buf[forwards++] == '\n')
1073 if (try + fragsize > size)
1075 if (memcmp(buf + try, fragment, fragsize))
1084 * We should start searching forward and backward.
1089 struct buffer_desc {
1092 unsigned long alloc;
1095 static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag)
1097 char *buf = desc->buffer;
1098 const char *patch = frag->patch;
1099 int offset, size = frag->size;
1100 char *old = xmalloc(size);
1101 char *new = xmalloc(size);
1102 int oldsize = 0, newsize = 0;
1105 int len = linelen(patch, size);
1112 * "plen" is how much of the line we should use for
1113 * the actual patch data. Normally we just remove the
1114 * first character on the line, but if the line is
1115 * followed by "\ No newline", then we also remove the
1116 * last one (which is the newline, of course).
1119 if (len < size && patch[len] == '\\')
1124 memcpy(old + oldsize, patch + 1, plen);
1128 /* Fall-through for ' ' */
1130 if (*patch != '+' || !no_add) {
1131 memcpy(new + newsize, patch + 1, plen);
1135 case '@': case '\\':
1136 /* Ignore it, we already handled it */
1145 offset = find_offset(buf, desc->size, old, oldsize, frag->newpos);
1147 int diff = newsize - oldsize;
1148 unsigned long size = desc->size + diff;
1149 unsigned long alloc = desc->alloc;
1152 alloc = size + 8192;
1153 desc->alloc = alloc;
1154 buf = xrealloc(buf, alloc);
1158 memmove(buf + offset + newsize, buf + offset + oldsize, size - offset - newsize);
1159 memcpy(buf + offset, new, newsize);
1168 static int apply_fragments(struct buffer_desc *desc, struct patch *patch)
1170 struct fragment *frag = patch->fragments;
1171 const char *name = patch->old_name ? patch->old_name : patch->new_name;
1173 if (patch->is_binary) {
1174 unsigned char sha1[20];
1176 if (!allow_binary_replacement)
1177 return error("cannot apply binary patch to '%s' "
1178 "without --allow-binary-replacement",
1181 /* For safety, we require patch index line to contain
1182 * full 40-byte textual SHA1 for old and new, at least for now.
1184 if (strlen(patch->old_sha1_prefix) != 40 ||
1185 strlen(patch->new_sha1_prefix) != 40 ||
1186 get_sha1_hex(patch->old_sha1_prefix, sha1) ||
1187 get_sha1_hex(patch->new_sha1_prefix, sha1))
1188 return error("cannot apply binary patch to '%s' "
1189 "without full index line", name);
1191 if (patch->old_name) {
1192 unsigned char hdr[50];
1195 /* See if the old one matches what the patch
1198 write_sha1_file_prepare(desc->buffer, desc->size,
1199 "blob", sha1, hdr, &hdrlen);
1200 if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))
1201 return error("the patch applies to '%s' (%s), "
1202 "which does not match the "
1203 "current contents.",
1204 name, sha1_to_hex(sha1));
1207 /* Otherwise, the old one must be empty. */
1209 return error("the patch applies to an empty "
1210 "'%s' but it is not empty", name);
1213 /* For now, we do not record post-image data in the patch,
1214 * and require the object already present in the recipient's
1219 desc->alloc = desc->size = 0;
1221 get_sha1_hex(patch->new_sha1_prefix, sha1);
1223 if (memcmp(sha1, null_sha1, 20)) {
1227 desc->buffer = read_sha1_file(sha1, type, &size);
1229 return error("the necessary postimage %s for "
1230 "'%s' does not exist",
1231 patch->new_sha1_prefix, name);
1232 desc->alloc = desc->size = size;
1239 if (apply_one_fragment(desc, frag) < 0)
1240 return error("patch failed: %s:%ld",
1241 name, frag->oldpos);
1247 static int apply_data(struct patch *patch, struct stat *st)
1250 unsigned long size, alloc;
1251 struct buffer_desc desc;
1256 if (patch->old_name) {
1258 alloc = size + 8192;
1259 buf = xmalloc(alloc);
1260 if (read_old_data(st, patch->old_name, buf, alloc) != size)
1261 return error("read of %s failed", patch->old_name);
1267 if (apply_fragments(&desc, patch) < 0)
1269 patch->result = desc.buffer;
1270 patch->resultsize = desc.size;
1272 if (patch->is_delete && patch->resultsize)
1273 return error("removal patch leaves file contents");
1278 static int check_patch(struct patch *patch)
1281 const char *old_name = patch->old_name;
1282 const char *new_name = patch->new_name;
1283 const char *name = old_name ? old_name : new_name;
1287 int stat_ret = lstat(old_name, &st);
1290 int pos = cache_name_pos(old_name, strlen(old_name));
1292 return error("%s: does not exist in index",
1295 struct checkout costate;
1296 if (errno != ENOENT)
1297 return error("%s: %s", old_name,
1300 costate.base_dir = "";
1301 costate.base_dir_len = 0;
1304 costate.not_new = 0;
1305 costate.refresh_cache = 1;
1306 if (checkout_entry(active_cache[pos],
1308 lstat(old_name, &st))
1312 changed = ce_match_stat(active_cache[pos], &st);
1314 return error("%s: does not match index",
1317 else if (stat_ret < 0)
1318 return error("%s: %s", old_name, strerror(errno));
1320 if (patch->is_new < 0)
1322 st.st_mode = ntohl(create_ce_mode(st.st_mode));
1323 if (!patch->old_mode)
1324 patch->old_mode = st.st_mode;
1325 if ((st.st_mode ^ patch->old_mode) & S_IFMT)
1326 return error("%s: wrong type", old_name);
1327 if (st.st_mode != patch->old_mode)
1328 fprintf(stderr, "warning: %s has type %o, expected %o\n",
1329 old_name, st.st_mode, patch->old_mode);
1332 if (new_name && (patch->is_new | patch->is_rename | patch->is_copy)) {
1333 if (check_index && cache_name_pos(new_name, strlen(new_name)) >= 0)
1334 return error("%s: already exists in index", new_name);
1335 if (!lstat(new_name, &st))
1336 return error("%s: already exists in working directory", new_name);
1337 if (errno != ENOENT)
1338 return error("%s: %s", new_name, strerror(errno));
1339 if (!patch->new_mode) {
1341 patch->new_mode = S_IFREG | 0644;
1343 patch->new_mode = patch->old_mode;
1347 if (new_name && old_name) {
1348 int same = !strcmp(old_name, new_name);
1349 if (!patch->new_mode)
1350 patch->new_mode = patch->old_mode;
1351 if ((patch->old_mode ^ patch->new_mode) & S_IFMT)
1352 return error("new mode (%o) of %s does not match old mode (%o)%s%s",
1353 patch->new_mode, new_name, patch->old_mode,
1354 same ? "" : " of ", same ? "" : old_name);
1357 if (apply_data(patch, &st) < 0)
1358 return error("%s: patch does not apply", name);
1362 static int check_patch_list(struct patch *patch)
1366 for (;patch ; patch = patch->next)
1367 error |= check_patch(patch);
1371 static inline int is_null_sha1(const unsigned char *sha1)
1373 return !memcmp(sha1, null_sha1, 20);
1376 static void show_index_list(struct patch *list)
1378 struct patch *patch;
1380 /* Once we start supporting the reverse patch, it may be
1381 * worth showing the new sha1 prefix, but until then...
1383 for (patch = list; patch; patch = patch->next) {
1384 const unsigned char *sha1_ptr;
1385 unsigned char sha1[20];
1388 name = patch->old_name ? patch->old_name : patch->new_name;
1390 sha1_ptr = null_sha1;
1391 else if (get_sha1(patch->old_sha1_prefix, sha1))
1392 die("sha1 information is lacking or useless (%s).",
1397 printf("%06o %s ",patch->old_mode, sha1_to_hex(sha1_ptr));
1398 if (line_termination && quote_c_style(name, NULL, NULL, 0))
1399 quote_c_style(name, NULL, stdout, 0);
1401 fputs(name, stdout);
1402 putchar(line_termination);
1406 static void stat_patch_list(struct patch *patch)
1408 int files, adds, dels;
1410 for (files = adds = dels = 0 ; patch ; patch = patch->next) {
1412 adds += patch->lines_added;
1413 dels += patch->lines_deleted;
1417 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files, adds, dels);
1420 static void numstat_patch_list(struct patch *patch)
1422 for ( ; patch; patch = patch->next) {
1424 name = patch->old_name ? patch->old_name : patch->new_name;
1425 printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);
1426 if (line_termination && quote_c_style(name, NULL, NULL, 0))
1427 quote_c_style(name, NULL, stdout, 0);
1429 fputs(name, stdout);
1434 static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)
1437 printf(" %s mode %06o %s\n", newdelete, mode, name);
1439 printf(" %s %s\n", newdelete, name);
1442 static void show_mode_change(struct patch *p, int show_name)
1444 if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {
1446 printf(" mode change %06o => %06o %s\n",
1447 p->old_mode, p->new_mode, p->new_name);
1449 printf(" mode change %06o => %06o\n",
1450 p->old_mode, p->new_mode);
1454 static void show_rename_copy(struct patch *p)
1456 const char *renamecopy = p->is_rename ? "rename" : "copy";
1457 const char *old, *new;
1459 /* Find common prefix */
1463 const char *slash_old, *slash_new;
1464 slash_old = strchr(old, '/');
1465 slash_new = strchr(new, '/');
1468 slash_old - old != slash_new - new ||
1469 memcmp(old, new, slash_new - new))
1471 old = slash_old + 1;
1472 new = slash_new + 1;
1474 /* p->old_name thru old is the common prefix, and old and new
1475 * through the end of names are renames
1477 if (old != p->old_name)
1478 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
1479 (int)(old - p->old_name), p->old_name,
1480 old, new, p->score);
1482 printf(" %s %s => %s (%d%%)\n", renamecopy,
1483 p->old_name, p->new_name, p->score);
1484 show_mode_change(p, 0);
1487 static void summary_patch_list(struct patch *patch)
1491 for (p = patch; p; p = p->next) {
1493 show_file_mode_name("create", p->new_mode, p->new_name);
1494 else if (p->is_delete)
1495 show_file_mode_name("delete", p->old_mode, p->old_name);
1497 if (p->is_rename || p->is_copy)
1498 show_rename_copy(p);
1501 printf(" rewrite %s (%d%%)\n",
1502 p->new_name, p->score);
1503 show_mode_change(p, 0);
1506 show_mode_change(p, 1);
1512 static void patch_stats(struct patch *patch)
1514 int lines = patch->lines_added + patch->lines_deleted;
1516 if (lines > max_change)
1518 if (patch->old_name) {
1519 int len = quote_c_style(patch->old_name, NULL, NULL, 0);
1521 len = strlen(patch->old_name);
1525 if (patch->new_name) {
1526 int len = quote_c_style(patch->new_name, NULL, NULL, 0);
1528 len = strlen(patch->new_name);
1534 static void remove_file(struct patch *patch)
1537 if (remove_file_from_cache(patch->old_name) < 0)
1538 die("unable to remove %s from index", patch->old_name);
1540 unlink(patch->old_name);
1543 static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size)
1546 struct cache_entry *ce;
1547 int namelen = strlen(path);
1548 unsigned ce_size = cache_entry_size(namelen);
1553 ce = xmalloc(ce_size);
1554 memset(ce, 0, ce_size);
1555 memcpy(ce->name, path, namelen);
1556 ce->ce_mode = create_ce_mode(mode);
1557 ce->ce_flags = htons(namelen);
1558 if (lstat(path, &st) < 0)
1559 die("unable to stat newly created file %s", path);
1560 fill_stat_cache_info(ce, &st);
1561 if (write_sha1_file(buf, size, "blob", ce->sha1) < 0)
1562 die("unable to create backing store for newly created file %s", path);
1563 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)
1564 die("unable to add cache entry for %s", path);
1567 static void create_subdirectories(const char *path)
1569 int len = strlen(path);
1570 char *buf = xmalloc(len + 1);
1571 const char *slash = path;
1573 while ((slash = strchr(slash+1, '/')) != NULL) {
1575 memcpy(buf, path, len);
1577 if (mkdir(buf, 0777) < 0) {
1578 if (errno != EEXIST)
1585 static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)
1590 return symlink(buf, path);
1591 fd = open(path, O_CREAT | O_EXCL | O_WRONLY | O_TRUNC, (mode & 0100) ? 0777 : 0666);
1595 int written = xwrite(fd, buf, size);
1597 die("writing file %s: %s", path, strerror(errno));
1599 die("out of space writing file %s", path);
1604 die("closing file %s: %s", path, strerror(errno));
1609 * We optimistically assume that the directories exist,
1610 * which is true 99% of the time anyway. If they don't,
1611 * we create them and try again.
1613 static void create_one_file(const char *path, unsigned mode, const char *buf, unsigned long size)
1615 if (!try_create_file(path, mode, buf, size))
1618 if (errno == ENOENT) {
1619 create_subdirectories(path);
1620 if (!try_create_file(path, mode, buf, size))
1624 if (errno == EEXIST) {
1625 unsigned int nr = getpid();
1628 const char *newpath;
1629 newpath = mkpath("%s~%u", path, nr);
1630 if (!try_create_file(newpath, mode, buf, size)) {
1631 if (!rename(newpath, path))
1636 if (errno != EEXIST)
1640 die("unable to write file %s mode %o", path, mode);
1643 static void create_file(struct patch *patch)
1645 const char *path = patch->new_name;
1646 unsigned mode = patch->new_mode;
1647 unsigned long size = patch->resultsize;
1648 char *buf = patch->result;
1651 mode = S_IFREG | 0644;
1652 create_one_file(path, mode, buf, size);
1653 add_index_file(path, mode, buf, size);
1656 static void write_out_one_result(struct patch *patch)
1658 if (patch->is_delete > 0) {
1662 if (patch->is_new > 0 || patch->is_copy) {
1667 * Rename or modification boils down to the same
1668 * thing: remove the old, write the new
1674 static void write_out_results(struct patch *list, int skipped_patch)
1676 if (!list && !skipped_patch)
1680 write_out_one_result(list);
1685 static struct cache_file cache_file;
1687 static struct excludes {
1688 struct excludes *next;
1692 static int use_patch(struct patch *p)
1694 const char *pathname = p->new_name ? p->new_name : p->old_name;
1695 struct excludes *x = excludes;
1697 if (fnmatch(x->path, pathname, 0) == 0)
1701 if (0 < prefix_length) {
1702 int pathlen = strlen(pathname);
1703 if (pathlen <= prefix_length ||
1704 memcmp(prefix, pathname, prefix_length))
1710 static int apply_patch(int fd)
1713 unsigned long offset, size;
1714 char *buffer = read_patch_file(fd, &size);
1715 struct patch *list = NULL, **listp = &list;
1716 int skipped_patch = 0;
1722 struct patch *patch;
1725 patch = xmalloc(sizeof(*patch));
1726 memset(patch, 0, sizeof(*patch));
1727 nr = parse_chunk(buffer + offset, size, patch);
1730 if (use_patch(patch)) {
1733 listp = &patch->next;
1735 /* perhaps free it a bit better? */
1744 write_index = check_index && apply;
1746 newfd = hold_index_file_for_update(&cache_file, get_index_file());
1748 if (read_cache() < 0)
1749 die("unable to read index file");
1752 if ((check || apply) && check_patch_list(list) < 0)
1756 write_out_results(list, skipped_patch);
1759 if (write_cache(newfd, active_cache, active_nr) ||
1760 commit_index_file(&cache_file))
1761 die("Unable to write new cachefile");
1764 if (show_index_info)
1765 show_index_list(list);
1768 stat_patch_list(list);
1771 numstat_patch_list(list);
1774 summary_patch_list(list);
1780 int main(int argc, char **argv)
1785 for (i = 1; i < argc; i++) {
1786 const char *arg = argv[i];
1789 if (!strcmp(arg, "-")) {
1794 if (!strncmp(arg, "--exclude=", 10)) {
1795 struct excludes *x = xmalloc(sizeof(*x));
1801 if (!strcmp(arg, "--no-add")) {
1805 if (!strcmp(arg, "--stat")) {
1810 if (!strcmp(arg, "--allow-binary-replacement")) {
1811 allow_binary_replacement = 1;
1814 if (!strcmp(arg, "--numstat")) {
1819 if (!strcmp(arg, "--summary")) {
1824 if (!strcmp(arg, "--check")) {
1829 if (!strcmp(arg, "--index")) {
1833 if (!strcmp(arg, "--apply")) {
1837 if (!strcmp(arg, "--index-info")) {
1839 show_index_info = 1;
1842 if (!strcmp(arg, "-z")) {
1843 line_termination = 0;
1847 if (check_index && prefix_length < 0) {
1848 prefix = setup_git_directory();
1849 prefix_length = prefix ? strlen(prefix) : 0;
1850 git_config(git_default_config);
1852 if (0 < prefix_length)
1853 arg = prefix_filename(prefix, prefix_length, arg);
1855 fd = open(arg, O_RDONLY);