4 * Copyright (C) Linus Torvalds, 2005
6 * This applies patches on top of some (arbitrary) version of the SCM.
11 #include "cache-tree.h"
18 * --check turns on checking that the working tree matches the
19 * files that are being modified, but doesn't apply the patch
20 * --stat does just a diffstat, and doesn't actually apply
21 * --numstat does numeric diffstat, and doesn't actually apply
22 * --index-info shows the old and new index info for paths if available.
23 * --index updates the cache as well.
24 * --cached updates only the cache without ever touching the working tree.
26 static const char *prefix
;
27 static int prefix_length
= -1;
28 static int newfd
= -1;
30 static int p_value
= 1;
31 static int allow_binary_replacement
= 0;
32 static int check_index
= 0;
33 static int write_index
= 0;
34 static int cached
= 0;
35 static int diffstat
= 0;
36 static int numstat
= 0;
37 static int summary
= 0;
40 static int no_add
= 0;
41 static int show_index_info
= 0;
42 static int line_termination
= '\n';
43 static unsigned long p_context
= -1;
44 static const char apply_usage
[] =
45 "git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--cached] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM] [-CNUM] [--whitespace=<nowarn|warn|error|error-all|strip>] <patch>...";
47 static enum whitespace_eol
{
52 } new_whitespace
= warn_on_whitespace
;
53 static int whitespace_error
= 0;
54 static int squelch_whitespace_errors
= 5;
55 static int applied_after_stripping
= 0;
56 static const char *patch_input_file
= NULL
;
58 static void parse_whitespace_option(const char *option
)
61 new_whitespace
= warn_on_whitespace
;
64 if (!strcmp(option
, "warn")) {
65 new_whitespace
= warn_on_whitespace
;
68 if (!strcmp(option
, "nowarn")) {
69 new_whitespace
= nowarn_whitespace
;
72 if (!strcmp(option
, "error")) {
73 new_whitespace
= error_on_whitespace
;
76 if (!strcmp(option
, "error-all")) {
77 new_whitespace
= error_on_whitespace
;
78 squelch_whitespace_errors
= 0;
81 if (!strcmp(option
, "strip")) {
82 new_whitespace
= strip_whitespace
;
85 die("unrecognized whitespace option '%s'", option
);
88 static void set_default_whitespace_mode(const char *whitespace_option
)
90 if (!whitespace_option
&& !apply_default_whitespace
) {
91 new_whitespace
= (apply
98 * For "diff-stat" like behaviour, we keep track of the biggest change
99 * we've seen, and the longest filename. That allows us to do simple
102 static int max_change
, max_len
;
105 * Various "current state", notably line numbers and what
106 * file (and how) we're patching right now.. The "is_xxxx"
107 * things are flags, where -1 means "don't know yet".
109 static int linenr
= 1;
112 unsigned long leading
, trailing
;
113 unsigned long oldpos
, oldlines
;
114 unsigned long newpos
, newlines
;
117 struct fragment
*next
;
121 char *new_name
, *old_name
, *def_name
;
122 unsigned int old_mode
, new_mode
;
123 int is_rename
, is_copy
, is_new
, is_delete
, is_binary
;
124 #define BINARY_DELTA_DEFLATED 1
125 #define BINARY_LITERAL_DEFLATED 2
126 unsigned long deflate_origlen
;
127 int lines_added
, lines_deleted
;
129 int inaccurate_eof
:1;
130 struct fragment
*fragments
;
132 unsigned long resultsize
;
133 char old_sha1_prefix
[41];
134 char new_sha1_prefix
[41];
138 #define CHUNKSIZE (8192)
141 static void *read_patch_file(int fd
, unsigned long *sizep
)
143 unsigned long size
= 0, alloc
= CHUNKSIZE
;
144 void *buffer
= xmalloc(alloc
);
147 int nr
= alloc
- size
;
150 buffer
= xrealloc(buffer
, alloc
);
153 nr
= xread(fd
, (char *) buffer
+ size
, nr
);
157 die("git-apply: read returned %s", strerror(errno
));
163 * Make sure that we have some slop in the buffer
164 * so that we can do speculative "memcmp" etc, and
165 * see to it that it is NUL-filled.
167 if (alloc
< size
+ SLOP
)
168 buffer
= xrealloc(buffer
, size
+ SLOP
);
169 memset((char *) buffer
+ size
, 0, SLOP
);
173 static unsigned long linelen(const char *buffer
, unsigned long size
)
175 unsigned long len
= 0;
178 if (*buffer
++ == '\n')
184 static int is_dev_null(const char *str
)
186 return !memcmp("/dev/null", str
, 9) && isspace(str
[9]);
192 static int name_terminate(const char *name
, int namelen
, int c
, int terminate
)
194 if (c
== ' ' && !(terminate
& TERM_SPACE
))
196 if (c
== '\t' && !(terminate
& TERM_TAB
))
202 static char * find_name(const char *line
, char *def
, int p_value
, int terminate
)
205 const char *start
= line
;
209 /* Proposed "new-style" GNU patch/diff format; see
210 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
212 name
= unquote_c_style(line
, NULL
);
216 cp
= strchr(name
, '/');
223 /* name can later be freed, so we need
224 * to memmove, not just return cp
226 memmove(name
, cp
, strlen(cp
) + 1);
243 if (name_terminate(start
, line
-start
, c
, terminate
))
247 if (c
== '/' && !--p_value
)
257 * Generally we prefer the shorter name, especially
258 * if the other one is just a variation of that with
259 * something else tacked on to the end (ie "file.orig"
263 int deflen
= strlen(def
);
264 if (deflen
< len
&& !strncmp(start
, def
, deflen
))
268 name
= xmalloc(len
+ 1);
269 memcpy(name
, start
, len
);
276 * Get the name etc info from the --/+++ lines of a traditional patch header
278 * NOTE! This hardcodes "-p1" behaviour in filename detection.
280 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
281 * files, we can happily check the index for a match, but for creating a
282 * new file we should try to match whatever "patch" does. I have no idea.
284 static void parse_traditional_patch(const char *first
, const char *second
, struct patch
*patch
)
288 first
+= 4; /* skip "--- " */
289 second
+= 4; /* skip "+++ " */
290 if (is_dev_null(first
)) {
292 patch
->is_delete
= 0;
293 name
= find_name(second
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
294 patch
->new_name
= name
;
295 } else if (is_dev_null(second
)) {
297 patch
->is_delete
= 1;
298 name
= find_name(first
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
299 patch
->old_name
= name
;
301 name
= find_name(first
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
302 name
= find_name(second
, name
, p_value
, TERM_SPACE
| TERM_TAB
);
303 patch
->old_name
= patch
->new_name
= name
;
306 die("unable to find filename in patch at line %d", linenr
);
309 static int gitdiff_hdrend(const char *line
, struct patch
*patch
)
315 * We're anal about diff header consistency, to make
316 * sure that we don't end up having strange ambiguous
317 * patches floating around.
319 * As a result, gitdiff_{old|new}name() will check
320 * their names against any previous information, just
323 static char *gitdiff_verify_name(const char *line
, int isnull
, char *orig_name
, const char *oldnew
)
325 if (!orig_name
&& !isnull
)
326 return find_name(line
, NULL
, 1, 0);
335 die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name
, linenr
);
336 another
= find_name(line
, NULL
, 1, 0);
337 if (!another
|| memcmp(another
, name
, len
))
338 die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew
, linenr
);
343 /* expect "/dev/null" */
344 if (memcmp("/dev/null", line
, 9) || line
[9] != '\n')
345 die("git-apply: bad git-diff - expected /dev/null on line %d", linenr
);
350 static int gitdiff_oldname(const char *line
, struct patch
*patch
)
352 patch
->old_name
= gitdiff_verify_name(line
, patch
->is_new
, patch
->old_name
, "old");
356 static int gitdiff_newname(const char *line
, struct patch
*patch
)
358 patch
->new_name
= gitdiff_verify_name(line
, patch
->is_delete
, patch
->new_name
, "new");
362 static int gitdiff_oldmode(const char *line
, struct patch
*patch
)
364 patch
->old_mode
= strtoul(line
, NULL
, 8);
368 static int gitdiff_newmode(const char *line
, struct patch
*patch
)
370 patch
->new_mode
= strtoul(line
, NULL
, 8);
374 static int gitdiff_delete(const char *line
, struct patch
*patch
)
376 patch
->is_delete
= 1;
377 patch
->old_name
= patch
->def_name
;
378 return gitdiff_oldmode(line
, patch
);
381 static int gitdiff_newfile(const char *line
, struct patch
*patch
)
384 patch
->new_name
= patch
->def_name
;
385 return gitdiff_newmode(line
, patch
);
388 static int gitdiff_copysrc(const char *line
, struct patch
*patch
)
391 patch
->old_name
= find_name(line
, NULL
, 0, 0);
395 static int gitdiff_copydst(const char *line
, struct patch
*patch
)
398 patch
->new_name
= find_name(line
, NULL
, 0, 0);
402 static int gitdiff_renamesrc(const char *line
, struct patch
*patch
)
404 patch
->is_rename
= 1;
405 patch
->old_name
= find_name(line
, NULL
, 0, 0);
409 static int gitdiff_renamedst(const char *line
, struct patch
*patch
)
411 patch
->is_rename
= 1;
412 patch
->new_name
= find_name(line
, NULL
, 0, 0);
416 static int gitdiff_similarity(const char *line
, struct patch
*patch
)
418 if ((patch
->score
= strtoul(line
, NULL
, 10)) == ULONG_MAX
)
423 static int gitdiff_dissimilarity(const char *line
, struct patch
*patch
)
425 if ((patch
->score
= strtoul(line
, NULL
, 10)) == ULONG_MAX
)
430 static int gitdiff_index(const char *line
, struct patch
*patch
)
432 /* index line is N hexadecimal, "..", N hexadecimal,
433 * and optional space with octal mode.
435 const char *ptr
, *eol
;
438 ptr
= strchr(line
, '.');
439 if (!ptr
|| ptr
[1] != '.' || 40 < ptr
- line
)
442 memcpy(patch
->old_sha1_prefix
, line
, len
);
443 patch
->old_sha1_prefix
[len
] = 0;
446 ptr
= strchr(line
, ' ');
447 eol
= strchr(line
, '\n');
449 if (!ptr
|| eol
< ptr
)
455 memcpy(patch
->new_sha1_prefix
, line
, len
);
456 patch
->new_sha1_prefix
[len
] = 0;
458 patch
->new_mode
= patch
->old_mode
= strtoul(ptr
+1, NULL
, 8);
463 * This is normal for a diff that doesn't change anything: we'll fall through
464 * into the next diff. Tell the parser to break out.
466 static int gitdiff_unrecognized(const char *line
, struct patch
*patch
)
471 static const char *stop_at_slash(const char *line
, int llen
)
475 for (i
= 0; i
< llen
; i
++) {
483 /* This is to extract the same name that appears on "diff --git"
484 * line. We do not find and return anything if it is a rename
485 * patch, and it is OK because we will find the name elsewhere.
486 * We need to reliably find name only when it is mode-change only,
487 * creation or deletion of an empty file. In any of these cases,
488 * both sides are the same name under a/ and b/ respectively.
490 static char *git_header_name(char *line
, int llen
)
494 const char *second
= NULL
;
496 line
+= strlen("diff --git ");
497 llen
-= strlen("diff --git ");
501 char *first
= unquote_c_style(line
, &second
);
505 /* advance to the first slash */
506 cp
= stop_at_slash(first
, strlen(first
));
507 if (!cp
|| cp
== first
) {
508 /* we do not accept absolute paths */
514 memmove(first
, cp
+1, len
+1); /* including NUL */
516 /* second points at one past closing dq of name.
517 * find the second name.
519 while ((second
< line
+ llen
) && isspace(*second
))
522 if (line
+ llen
<= second
)
523 goto free_first_and_fail
;
524 if (*second
== '"') {
525 char *sp
= unquote_c_style(second
, NULL
);
527 goto free_first_and_fail
;
528 cp
= stop_at_slash(sp
, strlen(sp
));
529 if (!cp
|| cp
== sp
) {
532 goto free_first_and_fail
;
534 /* They must match, otherwise ignore */
535 if (strcmp(cp
+1, first
))
536 goto free_both_and_fail
;
541 /* unquoted second */
542 cp
= stop_at_slash(second
, line
+ llen
- second
);
543 if (!cp
|| cp
== second
)
544 goto free_first_and_fail
;
546 if (line
+ llen
- cp
!= len
+ 1 ||
547 memcmp(first
, cp
, len
))
548 goto free_first_and_fail
;
552 /* unquoted first name */
553 name
= stop_at_slash(line
, llen
);
554 if (!name
|| name
== line
)
559 /* since the first name is unquoted, a dq if exists must be
560 * the beginning of the second name.
562 for (second
= name
; second
< line
+ llen
; second
++) {
563 if (*second
== '"') {
564 const char *cp
= second
;
566 char *sp
= unquote_c_style(second
, NULL
);
570 np
= stop_at_slash(sp
, strlen(sp
));
571 if (!np
|| np
== sp
) {
572 free_second_and_fail
:
578 if (len
< cp
- name
&&
579 !strncmp(np
, name
, len
) &&
580 isspace(name
[len
])) {
582 memmove(sp
, np
, len
+ 1);
585 goto free_second_and_fail
;
590 * Accept a name only if it shows up twice, exactly the same
593 for (len
= 0 ; ; len
++) {
610 if (second
[len
] == '\n' && !memcmp(name
, second
, len
)) {
611 char *ret
= xmalloc(len
+ 1);
612 memcpy(ret
, name
, len
);
621 /* Verify that we recognize the lines following a git header */
622 static int parse_git_header(char *line
, int len
, unsigned int size
, struct patch
*patch
)
624 unsigned long offset
;
626 /* A git diff has explicit new/delete information, so we don't guess */
628 patch
->is_delete
= 0;
631 * Some things may not have the old name in the
632 * rest of the headers anywhere (pure mode changes,
633 * or removing or adding empty files), so we get
634 * the default name from the header.
636 patch
->def_name
= git_header_name(line
, len
);
641 for (offset
= len
; size
> 0 ; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
642 static const struct opentry
{
644 int (*fn
)(const char *, struct patch
*);
646 { "@@ -", gitdiff_hdrend
},
647 { "--- ", gitdiff_oldname
},
648 { "+++ ", gitdiff_newname
},
649 { "old mode ", gitdiff_oldmode
},
650 { "new mode ", gitdiff_newmode
},
651 { "deleted file mode ", gitdiff_delete
},
652 { "new file mode ", gitdiff_newfile
},
653 { "copy from ", gitdiff_copysrc
},
654 { "copy to ", gitdiff_copydst
},
655 { "rename old ", gitdiff_renamesrc
},
656 { "rename new ", gitdiff_renamedst
},
657 { "rename from ", gitdiff_renamesrc
},
658 { "rename to ", gitdiff_renamedst
},
659 { "similarity index ", gitdiff_similarity
},
660 { "dissimilarity index ", gitdiff_dissimilarity
},
661 { "index ", gitdiff_index
},
662 { "", gitdiff_unrecognized
},
666 len
= linelen(line
, size
);
667 if (!len
|| line
[len
-1] != '\n')
669 for (i
= 0; i
< ARRAY_SIZE(optable
); i
++) {
670 const struct opentry
*p
= optable
+ i
;
671 int oplen
= strlen(p
->str
);
672 if (len
< oplen
|| memcmp(p
->str
, line
, oplen
))
674 if (p
->fn(line
+ oplen
, patch
) < 0)
683 static int parse_num(const char *line
, unsigned long *p
)
689 *p
= strtoul(line
, &ptr
, 10);
693 static int parse_range(const char *line
, int len
, int offset
, const char *expect
,
694 unsigned long *p1
, unsigned long *p2
)
698 if (offset
< 0 || offset
>= len
)
703 digits
= parse_num(line
, p1
);
713 digits
= parse_num(line
+1, p2
);
725 if (memcmp(line
, expect
, ex
))
732 * Parse a unified diff fragment header of the
733 * form "@@ -a,b +c,d @@"
735 static int parse_fragment_header(char *line
, int len
, struct fragment
*fragment
)
739 if (!len
|| line
[len
-1] != '\n')
742 /* Figure out the number of lines in a fragment */
743 offset
= parse_range(line
, len
, 4, " +", &fragment
->oldpos
, &fragment
->oldlines
);
744 offset
= parse_range(line
, len
, offset
, " @@", &fragment
->newpos
, &fragment
->newlines
);
749 static int find_header(char *line
, unsigned long size
, int *hdrsize
, struct patch
*patch
)
751 unsigned long offset
, len
;
753 patch
->is_rename
= patch
->is_copy
= 0;
754 patch
->is_new
= patch
->is_delete
= -1;
755 patch
->old_mode
= patch
->new_mode
= 0;
756 patch
->old_name
= patch
->new_name
= NULL
;
757 for (offset
= 0; size
> 0; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
758 unsigned long nextlen
;
760 len
= linelen(line
, size
);
764 /* Testing this early allows us to take a few shortcuts.. */
769 * Make sure we don't find any unconnected patch fragments.
770 * That's a sign that we didn't find a header, and that a
771 * patch has become corrupted/broken up.
773 if (!memcmp("@@ -", line
, 4)) {
774 struct fragment dummy
;
775 if (parse_fragment_header(line
, len
, &dummy
) < 0)
777 error("patch fragment without header at line %d: %.*s", linenr
, (int)len
-1, line
);
784 * Git patch? It might not have a real patch, just a rename
785 * or mode change, so we handle that specially
787 if (!memcmp("diff --git ", line
, 11)) {
788 int git_hdr_len
= parse_git_header(line
, len
, size
, patch
);
789 if (git_hdr_len
<= len
)
791 if (!patch
->old_name
&& !patch
->new_name
) {
792 if (!patch
->def_name
)
793 die("git diff header lacks filename information (line %d)", linenr
);
794 patch
->old_name
= patch
->new_name
= patch
->def_name
;
796 *hdrsize
= git_hdr_len
;
800 /** --- followed by +++ ? */
801 if (memcmp("--- ", line
, 4) || memcmp("+++ ", line
+ len
, 4))
805 * We only accept unified patches, so we want it to
806 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
809 nextlen
= linelen(line
+ len
, size
- len
);
810 if (size
< nextlen
+ 14 || memcmp("@@ -", line
+ len
+ nextlen
, 4))
813 /* Ok, we'll consider it a patch */
814 parse_traditional_patch(line
, line
+len
, patch
);
815 *hdrsize
= len
+ nextlen
;
823 * Parse a unified diff. Note that this really needs
824 * to parse each fragment separately, since the only
825 * way to know the difference between a "---" that is
826 * part of a patch, and a "---" that starts the next
827 * patch is to look at the line counts..
829 static int parse_fragment(char *line
, unsigned long size
, struct patch
*patch
, struct fragment
*fragment
)
832 int len
= linelen(line
, size
), offset
;
833 unsigned long oldlines
, newlines
;
834 unsigned long leading
, trailing
;
836 offset
= parse_fragment_header(line
, len
, fragment
);
839 oldlines
= fragment
->oldlines
;
840 newlines
= fragment
->newlines
;
844 if (patch
->is_new
< 0) {
845 patch
->is_new
= !oldlines
;
847 patch
->old_name
= NULL
;
849 if (patch
->is_delete
< 0) {
850 patch
->is_delete
= !newlines
;
852 patch
->new_name
= NULL
;
855 if (patch
->is_new
&& oldlines
)
856 return error("new file depends on old contents");
857 if (patch
->is_delete
!= !newlines
) {
859 return error("deleted file still has contents");
860 fprintf(stderr
, "** warning: file %s becomes empty but is not deleted\n", patch
->new_name
);
863 /* Parse the thing.. */
868 for (offset
= len
; size
> 0; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
869 if (!oldlines
&& !newlines
)
871 len
= linelen(line
, size
);
872 if (!len
|| line
[len
-1] != '\n')
880 if (!deleted
&& !added
)
891 * We know len is at least two, since we have a '+' and
892 * we checked that the last character was a '\n' above.
893 * That is, an addition of an empty line would check
894 * the '+' here. Sneaky...
896 if ((new_whitespace
!= nowarn_whitespace
) &&
897 isspace(line
[len
-2])) {
899 if (squelch_whitespace_errors
&&
900 squelch_whitespace_errors
<
904 fprintf(stderr
, "Adds trailing whitespace.\n%s:%d:%.*s\n",
906 linenr
, len
-2, line
+1);
914 /* We allow "\ No newline at end of file". Depending
915 * on locale settings when the patch was produced we
916 * don't know what this line looks like. The only
917 * thing we do know is that it begins with "\ ".
918 * Checking for 12 is just for sanity check -- any
919 * l10n of "\ No newline..." is at least that long.
922 if (len
< 12 || memcmp(line
, "\\ ", 2))
927 if (oldlines
|| newlines
)
929 fragment
->leading
= leading
;
930 fragment
->trailing
= trailing
;
932 /* If a fragment ends with an incomplete line, we failed to include
933 * it in the above loop because we hit oldlines == newlines == 0
936 if (12 < size
&& !memcmp(line
, "\\ ", 2))
937 offset
+= linelen(line
, size
);
939 patch
->lines_added
+= added
;
940 patch
->lines_deleted
+= deleted
;
944 static int parse_single_patch(char *line
, unsigned long size
, struct patch
*patch
)
946 unsigned long offset
= 0;
947 struct fragment
**fragp
= &patch
->fragments
;
949 while (size
> 4 && !memcmp(line
, "@@ -", 4)) {
950 struct fragment
*fragment
;
953 fragment
= xcalloc(1, sizeof(*fragment
));
954 len
= parse_fragment(line
, size
, patch
, fragment
);
956 die("corrupt patch at line %d", linenr
);
958 fragment
->patch
= line
;
959 fragment
->size
= len
;
962 fragp
= &fragment
->next
;
971 static inline int metadata_changes(struct patch
*patch
)
973 return patch
->is_rename
> 0 ||
974 patch
->is_copy
> 0 ||
977 (patch
->old_mode
&& patch
->new_mode
&&
978 patch
->old_mode
!= patch
->new_mode
);
981 static int parse_binary(char *buffer
, unsigned long size
, struct patch
*patch
)
983 /* We have read "GIT binary patch\n"; what follows is a line
984 * that says the patch method (currently, either "deflated
985 * literal" or "deflated delta") and the length of data before
986 * deflating; a sequence of 'length-byte' followed by base-85
987 * encoded data follows.
989 * Each 5-byte sequence of base-85 encodes up to 4 bytes,
990 * and we would limit the patch line to 66 characters,
991 * so one line can fit up to 13 groups that would decode
992 * to 52 bytes max. The length byte 'A'-'Z' corresponds
993 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
994 * The end of binary is signaled with an empty line.
997 struct fragment
*fragment
;
1000 patch
->fragments
= fragment
= xcalloc(1, sizeof(*fragment
));
1002 /* Grab the type of patch */
1003 llen
= linelen(buffer
, size
);
1007 if (!strncmp(buffer
, "delta ", 6)) {
1008 patch
->is_binary
= BINARY_DELTA_DEFLATED
;
1009 patch
->deflate_origlen
= strtoul(buffer
+ 6, NULL
, 10);
1011 else if (!strncmp(buffer
, "literal ", 8)) {
1012 patch
->is_binary
= BINARY_LITERAL_DEFLATED
;
1013 patch
->deflate_origlen
= strtoul(buffer
+ 8, NULL
, 10);
1016 return error("unrecognized binary patch at line %d: %.*s",
1017 linenr
-1, llen
-1, buffer
);
1020 int byte_length
, max_byte_length
, newsize
;
1021 llen
= linelen(buffer
, size
);
1026 /* Minimum line is "A00000\n" which is 7-byte long,
1027 * and the line length must be multiple of 5 plus 2.
1029 if ((llen
< 7) || (llen
-2) % 5)
1031 max_byte_length
= (llen
- 2) / 5 * 4;
1032 byte_length
= *buffer
;
1033 if ('A' <= byte_length
&& byte_length
<= 'Z')
1034 byte_length
= byte_length
- 'A' + 1;
1035 else if ('a' <= byte_length
&& byte_length
<= 'z')
1036 byte_length
= byte_length
- 'a' + 27;
1039 /* if the input length was not multiple of 4, we would
1040 * have filler at the end but the filler should never
1043 if (max_byte_length
< byte_length
||
1044 byte_length
<= max_byte_length
- 4)
1046 newsize
= fragment
->size
+ byte_length
;
1047 data
= xrealloc(data
, newsize
);
1048 if (decode_85(data
+ fragment
->size
,
1052 fragment
->size
= newsize
;
1056 fragment
->patch
= data
;
1059 return error("corrupt binary patch at line %d: %.*s",
1060 linenr
-1, llen
-1, buffer
);
1063 static int parse_chunk(char *buffer
, unsigned long size
, struct patch
*patch
)
1065 int hdrsize
, patchsize
;
1066 int offset
= find_header(buffer
, size
, &hdrsize
, patch
);
1071 patchsize
= parse_single_patch(buffer
+ offset
+ hdrsize
, size
- offset
- hdrsize
, patch
);
1074 static const char *binhdr
[] = {
1079 static const char git_binary
[] = "GIT binary patch\n";
1081 int hd
= hdrsize
+ offset
;
1082 unsigned long llen
= linelen(buffer
+ hd
, size
- hd
);
1084 if (llen
== sizeof(git_binary
) - 1 &&
1085 !memcmp(git_binary
, buffer
+ hd
, llen
)) {
1088 used
= parse_binary(buffer
+ hd
+ llen
,
1089 size
- hd
- llen
, patch
);
1091 patchsize
= used
+ llen
;
1095 else if (!memcmp(" differ\n", buffer
+ hd
+ llen
- 8, 8)) {
1096 for (i
= 0; binhdr
[i
]; i
++) {
1097 int len
= strlen(binhdr
[i
]);
1098 if (len
< size
- hd
&&
1099 !memcmp(binhdr
[i
], buffer
+ hd
, len
)) {
1101 patch
->is_binary
= 1;
1108 /* Empty patch cannot be applied if:
1109 * - it is a binary patch and we do not do binary_replace, or
1110 * - text patch without metadata change
1112 if ((apply
|| check
) &&
1114 ? !allow_binary_replacement
1115 : !metadata_changes(patch
)))
1116 die("patch with only garbage at line %d", linenr
);
1119 return offset
+ hdrsize
+ patchsize
;
1122 static const char pluses
[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
1123 static const char minuses
[]= "----------------------------------------------------------------------";
1125 static void show_stats(struct patch
*patch
)
1127 const char *prefix
= "";
1128 char *name
= patch
->new_name
;
1130 int len
, max
, add
, del
, total
;
1133 name
= patch
->old_name
;
1135 if (0 < (len
= quote_c_style(name
, NULL
, NULL
, 0))) {
1136 qname
= xmalloc(len
+ 1);
1137 quote_c_style(name
, qname
, NULL
, 0);
1142 * "scale" the filename
1153 slash
= strchr(name
, '/');
1160 * scale the add/delete
1166 add
= patch
->lines_added
;
1167 del
= patch
->lines_deleted
;
1170 if (max_change
> 0) {
1171 total
= (total
* max
+ max_change
/ 2) / max_change
;
1172 add
= (add
* max
+ max_change
/ 2) / max_change
;
1175 if (patch
->is_binary
)
1176 printf(" %s%-*s | Bin\n", prefix
, len
, name
);
1178 printf(" %s%-*s |%5d %.*s%.*s\n", prefix
,
1179 len
, name
, patch
->lines_added
+ patch
->lines_deleted
,
1180 add
, pluses
, del
, minuses
);
1185 static int read_old_data(struct stat
*st
, const char *path
, void *buf
, unsigned long size
)
1190 switch (st
->st_mode
& S_IFMT
) {
1192 return readlink(path
, buf
, size
);
1194 fd
= open(path
, O_RDONLY
);
1196 return error("unable to open %s", path
);
1199 int ret
= xread(fd
, (char *) buf
+ got
, size
- got
);
1212 static int find_offset(const char *buf
, unsigned long size
, const char *fragment
, unsigned long fragsize
, int line
, int *lines
)
1215 unsigned long start
, backwards
, forwards
;
1217 if (fragsize
> size
)
1222 unsigned long offset
= 0;
1224 while (offset
+ fragsize
<= size
) {
1225 if (buf
[offset
++] == '\n') {
1233 /* Exact line number? */
1234 if (!memcmp(buf
+ start
, fragment
, fragsize
))
1238 * There's probably some smart way to do this, but I'll leave
1239 * that to the smart and beautiful people. I'm simple and stupid.
1243 for (i
= 0; ; i
++) {
1250 if (forwards
+ fragsize
> size
)
1256 } while (backwards
&& buf
[backwards
-1] != '\n');
1259 while (forwards
+ fragsize
<= size
) {
1260 if (buf
[forwards
++] == '\n')
1266 if (try + fragsize
> size
)
1268 if (memcmp(buf
+ try, fragment
, fragsize
))
1278 * We should start searching forward and backward.
1283 static void remove_first_line(const char **rbuf
, int *rsize
)
1285 const char *buf
= *rbuf
;
1287 unsigned long offset
;
1289 while (offset
<= size
) {
1290 if (buf
[offset
++] == '\n')
1293 *rsize
= size
- offset
;
1294 *rbuf
= buf
+ offset
;
1297 static void remove_last_line(const char **rbuf
, int *rsize
)
1299 const char *buf
= *rbuf
;
1301 unsigned long offset
;
1303 while (offset
> 0) {
1304 if (buf
[--offset
] == '\n')
1307 *rsize
= offset
+ 1;
1310 struct buffer_desc
{
1313 unsigned long alloc
;
1316 static int apply_line(char *output
, const char *patch
, int plen
)
1318 /* plen is number of bytes to be copied from patch,
1319 * starting at patch+1 (patch[0] is '+'). Typically
1320 * patch[plen] is '\n'.
1322 int add_nl_to_tail
= 0;
1323 if ((new_whitespace
== strip_whitespace
) &&
1324 1 < plen
&& isspace(patch
[plen
-1])) {
1325 if (patch
[plen
] == '\n')
1328 while (0 < plen
&& isspace(patch
[plen
]))
1330 applied_after_stripping
++;
1332 memcpy(output
, patch
+ 1, plen
);
1334 output
[plen
++] = '\n';
1338 static int apply_one_fragment(struct buffer_desc
*desc
, struct fragment
*frag
,
1341 int match_beginning
, match_end
;
1342 char *buf
= desc
->buffer
;
1343 const char *patch
= frag
->patch
;
1344 int offset
, size
= frag
->size
;
1345 char *old
= xmalloc(size
);
1346 char *new = xmalloc(size
);
1347 const char *oldlines
, *newlines
;
1348 int oldsize
= 0, newsize
= 0;
1349 unsigned long leading
, trailing
;
1353 int len
= linelen(patch
, size
);
1360 * "plen" is how much of the line we should use for
1361 * the actual patch data. Normally we just remove the
1362 * first character on the line, but if the line is
1363 * followed by "\ No newline", then we also remove the
1364 * last one (which is the newline, of course).
1367 if (len
< size
&& patch
[len
] == '\\')
1372 memcpy(old
+ oldsize
, patch
+ 1, plen
);
1376 /* Fall-through for ' ' */
1378 if (*patch
!= '+' || !no_add
)
1379 newsize
+= apply_line(new + newsize
, patch
,
1382 case '@': case '\\':
1383 /* Ignore it, we already handled it */
1392 if (inaccurate_eof
&& oldsize
> 0 && old
[oldsize
- 1] == '\n' &&
1393 newsize
> 0 && new[newsize
- 1] == '\n') {
1400 leading
= frag
->leading
;
1401 trailing
= frag
->trailing
;
1404 * If we don't have any leading/trailing data in the patch,
1405 * we want it to match at the beginning/end of the file.
1407 match_beginning
= !leading
&& (frag
->oldpos
== 1);
1408 match_end
= !trailing
;
1413 offset
= find_offset(buf
, desc
->size
, oldlines
, oldsize
, pos
, &lines
);
1414 if (match_end
&& offset
+ oldsize
!= desc
->size
)
1416 if (match_beginning
&& offset
)
1419 int diff
= newsize
- oldsize
;
1420 unsigned long size
= desc
->size
+ diff
;
1421 unsigned long alloc
= desc
->alloc
;
1423 /* Warn if it was necessary to reduce the number
1426 if ((leading
!= frag
->leading
) || (trailing
!= frag
->trailing
))
1427 fprintf(stderr
, "Context reduced to (%ld/%ld) to apply fragment at %d\n",
1428 leading
, trailing
, pos
+ lines
);
1431 alloc
= size
+ 8192;
1432 desc
->alloc
= alloc
;
1433 buf
= xrealloc(buf
, alloc
);
1437 memmove(buf
+ offset
+ newsize
, buf
+ offset
+ oldsize
, size
- offset
- newsize
);
1438 memcpy(buf
+ offset
, newlines
, newsize
);
1444 /* Am I at my context limits? */
1445 if ((leading
<= p_context
) && (trailing
<= p_context
))
1447 if (match_beginning
|| match_end
) {
1448 match_beginning
= match_end
= 0;
1451 /* Reduce the number of context lines
1452 * Reduce both leading and trailing if they are equal
1453 * otherwise just reduce the larger context.
1455 if (leading
>= trailing
) {
1456 remove_first_line(&oldlines
, &oldsize
);
1457 remove_first_line(&newlines
, &newsize
);
1461 if (trailing
> leading
) {
1462 remove_last_line(&oldlines
, &oldsize
);
1463 remove_last_line(&newlines
, &newsize
);
1473 static char *inflate_it(const void *data
, unsigned long size
,
1474 unsigned long inflated_size
)
1480 memset(&stream
, 0, sizeof(stream
));
1482 stream
.next_in
= (unsigned char *)data
;
1483 stream
.avail_in
= size
;
1484 stream
.next_out
= out
= xmalloc(inflated_size
);
1485 stream
.avail_out
= inflated_size
;
1486 inflateInit(&stream
);
1487 st
= inflate(&stream
, Z_FINISH
);
1488 if ((st
!= Z_STREAM_END
) || stream
.total_out
!= inflated_size
) {
1495 static int apply_binary_fragment(struct buffer_desc
*desc
, struct patch
*patch
)
1497 unsigned long dst_size
;
1498 struct fragment
*fragment
= patch
->fragments
;
1502 data
= inflate_it(fragment
->patch
, fragment
->size
,
1503 patch
->deflate_origlen
);
1505 return error("corrupt patch data");
1506 switch (patch
->is_binary
) {
1507 case BINARY_DELTA_DEFLATED
:
1508 result
= patch_delta(desc
->buffer
, desc
->size
,
1510 patch
->deflate_origlen
,
1513 desc
->buffer
= result
;
1516 case BINARY_LITERAL_DEFLATED
:
1518 desc
->buffer
= data
;
1519 dst_size
= patch
->deflate_origlen
;
1524 desc
->size
= desc
->alloc
= dst_size
;
1528 static int apply_binary(struct buffer_desc
*desc
, struct patch
*patch
)
1530 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
1531 unsigned char sha1
[20];
1532 unsigned char hdr
[50];
1535 if (!allow_binary_replacement
)
1536 return error("cannot apply binary patch to '%s' "
1537 "without --allow-binary-replacement",
1540 /* For safety, we require patch index line to contain
1541 * full 40-byte textual SHA1 for old and new, at least for now.
1543 if (strlen(patch
->old_sha1_prefix
) != 40 ||
1544 strlen(patch
->new_sha1_prefix
) != 40 ||
1545 get_sha1_hex(patch
->old_sha1_prefix
, sha1
) ||
1546 get_sha1_hex(patch
->new_sha1_prefix
, sha1
))
1547 return error("cannot apply binary patch to '%s' "
1548 "without full index line", name
);
1550 if (patch
->old_name
) {
1551 /* See if the old one matches what the patch
1554 write_sha1_file_prepare(desc
->buffer
, desc
->size
,
1555 blob_type
, sha1
, hdr
, &hdrlen
);
1556 if (strcmp(sha1_to_hex(sha1
), patch
->old_sha1_prefix
))
1557 return error("the patch applies to '%s' (%s), "
1558 "which does not match the "
1559 "current contents.",
1560 name
, sha1_to_hex(sha1
));
1563 /* Otherwise, the old one must be empty. */
1565 return error("the patch applies to an empty "
1566 "'%s' but it is not empty", name
);
1569 get_sha1_hex(patch
->new_sha1_prefix
, sha1
);
1570 if (!memcmp(sha1
, null_sha1
, 20)) {
1572 desc
->alloc
= desc
->size
= 0;
1573 desc
->buffer
= NULL
;
1574 return 0; /* deletion patch */
1577 if (has_sha1_file(sha1
)) {
1578 /* We already have the postimage */
1583 desc
->buffer
= read_sha1_file(sha1
, type
, &size
);
1585 return error("the necessary postimage %s for "
1586 "'%s' cannot be read",
1587 patch
->new_sha1_prefix
, name
);
1588 desc
->alloc
= desc
->size
= size
;
1591 /* We have verified desc matches the preimage;
1592 * apply the patch data to it, which is stored
1593 * in the patch->fragments->{patch,size}.
1595 if (apply_binary_fragment(desc
, patch
))
1596 return error("binary patch does not apply to '%s'",
1599 /* verify that the result matches */
1600 write_sha1_file_prepare(desc
->buffer
, desc
->size
, blob_type
,
1601 sha1
, hdr
, &hdrlen
);
1602 if (strcmp(sha1_to_hex(sha1
), patch
->new_sha1_prefix
))
1603 return error("binary patch to '%s' creates incorrect result", name
);
1609 static int apply_fragments(struct buffer_desc
*desc
, struct patch
*patch
)
1611 struct fragment
*frag
= patch
->fragments
;
1612 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
1614 if (patch
->is_binary
)
1615 return apply_binary(desc
, patch
);
1618 if (apply_one_fragment(desc
, frag
, patch
->inaccurate_eof
) < 0)
1619 return error("patch failed: %s:%ld",
1620 name
, frag
->oldpos
);
1626 static int apply_data(struct patch
*patch
, struct stat
*st
, struct cache_entry
*ce
)
1629 unsigned long size
, alloc
;
1630 struct buffer_desc desc
;
1638 buf
= read_sha1_file(ce
->sha1
, type
, &size
);
1640 return error("read of %s failed",
1645 else if (patch
->old_name
) {
1647 alloc
= size
+ 8192;
1648 buf
= xmalloc(alloc
);
1649 if (read_old_data(st
, patch
->old_name
, buf
, alloc
) != size
)
1650 return error("read of %s failed", patch
->old_name
);
1656 if (apply_fragments(&desc
, patch
) < 0)
1658 patch
->result
= desc
.buffer
;
1659 patch
->resultsize
= desc
.size
;
1661 if (patch
->is_delete
&& patch
->resultsize
)
1662 return error("removal patch leaves file contents");
1667 static int check_patch(struct patch
*patch
)
1670 const char *old_name
= patch
->old_name
;
1671 const char *new_name
= patch
->new_name
;
1672 const char *name
= old_name
? old_name
: new_name
;
1673 struct cache_entry
*ce
= NULL
;
1678 unsigned st_mode
= 0;
1681 stat_ret
= lstat(old_name
, &st
);
1683 int pos
= cache_name_pos(old_name
, strlen(old_name
));
1685 return error("%s: does not exist in index",
1687 ce
= active_cache
[pos
];
1689 struct checkout costate
;
1690 if (errno
!= ENOENT
)
1691 return error("%s: %s", old_name
,
1694 costate
.base_dir
= "";
1695 costate
.base_dir_len
= 0;
1698 costate
.not_new
= 0;
1699 costate
.refresh_cache
= 1;
1700 if (checkout_entry(ce
,
1703 lstat(old_name
, &st
))
1707 changed
= ce_match_stat(ce
, &st
, 1);
1709 return error("%s: does not match index",
1712 st_mode
= ntohl(ce
->ce_mode
);
1714 else if (stat_ret
< 0)
1715 return error("%s: %s", old_name
, strerror(errno
));
1718 st_mode
= ntohl(create_ce_mode(st
.st_mode
));
1720 if (patch
->is_new
< 0)
1722 if (!patch
->old_mode
)
1723 patch
->old_mode
= st_mode
;
1724 if ((st_mode
^ patch
->old_mode
) & S_IFMT
)
1725 return error("%s: wrong type", old_name
);
1726 if (st_mode
!= patch
->old_mode
)
1727 fprintf(stderr
, "warning: %s has type %o, expected %o\n",
1728 old_name
, st_mode
, patch
->old_mode
);
1731 if (new_name
&& (patch
->is_new
| patch
->is_rename
| patch
->is_copy
)) {
1732 if (check_index
&& cache_name_pos(new_name
, strlen(new_name
)) >= 0)
1733 return error("%s: already exists in index", new_name
);
1736 if (!lstat(new_name
, &nst
)) {
1737 if (S_ISDIR(nst
.st_mode
))
1740 return error("%s: already exists in working directory", new_name
);
1742 else if ((errno
!= ENOENT
) && (errno
!= ENOTDIR
))
1743 return error("%s: %s", new_name
, strerror(errno
));
1745 if (!patch
->new_mode
) {
1747 patch
->new_mode
= S_IFREG
| 0644;
1749 patch
->new_mode
= patch
->old_mode
;
1753 if (new_name
&& old_name
) {
1754 int same
= !strcmp(old_name
, new_name
);
1755 if (!patch
->new_mode
)
1756 patch
->new_mode
= patch
->old_mode
;
1757 if ((patch
->old_mode
^ patch
->new_mode
) & S_IFMT
)
1758 return error("new mode (%o) of %s does not match old mode (%o)%s%s",
1759 patch
->new_mode
, new_name
, patch
->old_mode
,
1760 same
? "" : " of ", same
? "" : old_name
);
1763 if (apply_data(patch
, &st
, ce
) < 0)
1764 return error("%s: patch does not apply", name
);
1768 static int check_patch_list(struct patch
*patch
)
1772 for (;patch
; patch
= patch
->next
)
1773 error
|= check_patch(patch
);
1777 static inline int is_null_sha1(const unsigned char *sha1
)
1779 return !memcmp(sha1
, null_sha1
, 20);
1782 static void show_index_list(struct patch
*list
)
1784 struct patch
*patch
;
1786 /* Once we start supporting the reverse patch, it may be
1787 * worth showing the new sha1 prefix, but until then...
1789 for (patch
= list
; patch
; patch
= patch
->next
) {
1790 const unsigned char *sha1_ptr
;
1791 unsigned char sha1
[20];
1794 name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
1796 sha1_ptr
= null_sha1
;
1797 else if (get_sha1(patch
->old_sha1_prefix
, sha1
))
1798 die("sha1 information is lacking or useless (%s).",
1803 printf("%06o %s ",patch
->old_mode
, sha1_to_hex(sha1_ptr
));
1804 if (line_termination
&& quote_c_style(name
, NULL
, NULL
, 0))
1805 quote_c_style(name
, NULL
, stdout
, 0);
1807 fputs(name
, stdout
);
1808 putchar(line_termination
);
1812 static void stat_patch_list(struct patch
*patch
)
1814 int files
, adds
, dels
;
1816 for (files
= adds
= dels
= 0 ; patch
; patch
= patch
->next
) {
1818 adds
+= patch
->lines_added
;
1819 dels
+= patch
->lines_deleted
;
1823 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files
, adds
, dels
);
1826 static void numstat_patch_list(struct patch
*patch
)
1828 for ( ; patch
; patch
= patch
->next
) {
1830 name
= patch
->new_name
? patch
->new_name
: patch
->old_name
;
1831 printf("%d\t%d\t", patch
->lines_added
, patch
->lines_deleted
);
1832 if (line_termination
&& quote_c_style(name
, NULL
, NULL
, 0))
1833 quote_c_style(name
, NULL
, stdout
, 0);
1835 fputs(name
, stdout
);
1840 static void show_file_mode_name(const char *newdelete
, unsigned int mode
, const char *name
)
1843 printf(" %s mode %06o %s\n", newdelete
, mode
, name
);
1845 printf(" %s %s\n", newdelete
, name
);
1848 static void show_mode_change(struct patch
*p
, int show_name
)
1850 if (p
->old_mode
&& p
->new_mode
&& p
->old_mode
!= p
->new_mode
) {
1852 printf(" mode change %06o => %06o %s\n",
1853 p
->old_mode
, p
->new_mode
, p
->new_name
);
1855 printf(" mode change %06o => %06o\n",
1856 p
->old_mode
, p
->new_mode
);
1860 static void show_rename_copy(struct patch
*p
)
1862 const char *renamecopy
= p
->is_rename
? "rename" : "copy";
1863 const char *old
, *new;
1865 /* Find common prefix */
1869 const char *slash_old
, *slash_new
;
1870 slash_old
= strchr(old
, '/');
1871 slash_new
= strchr(new, '/');
1874 slash_old
- old
!= slash_new
- new ||
1875 memcmp(old
, new, slash_new
- new))
1877 old
= slash_old
+ 1;
1878 new = slash_new
+ 1;
1880 /* p->old_name thru old is the common prefix, and old and new
1881 * through the end of names are renames
1883 if (old
!= p
->old_name
)
1884 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy
,
1885 (int)(old
- p
->old_name
), p
->old_name
,
1886 old
, new, p
->score
);
1888 printf(" %s %s => %s (%d%%)\n", renamecopy
,
1889 p
->old_name
, p
->new_name
, p
->score
);
1890 show_mode_change(p
, 0);
1893 static void summary_patch_list(struct patch
*patch
)
1897 for (p
= patch
; p
; p
= p
->next
) {
1899 show_file_mode_name("create", p
->new_mode
, p
->new_name
);
1900 else if (p
->is_delete
)
1901 show_file_mode_name("delete", p
->old_mode
, p
->old_name
);
1903 if (p
->is_rename
|| p
->is_copy
)
1904 show_rename_copy(p
);
1907 printf(" rewrite %s (%d%%)\n",
1908 p
->new_name
, p
->score
);
1909 show_mode_change(p
, 0);
1912 show_mode_change(p
, 1);
1918 static void patch_stats(struct patch
*patch
)
1920 int lines
= patch
->lines_added
+ patch
->lines_deleted
;
1922 if (lines
> max_change
)
1924 if (patch
->old_name
) {
1925 int len
= quote_c_style(patch
->old_name
, NULL
, NULL
, 0);
1927 len
= strlen(patch
->old_name
);
1931 if (patch
->new_name
) {
1932 int len
= quote_c_style(patch
->new_name
, NULL
, NULL
, 0);
1934 len
= strlen(patch
->new_name
);
1940 static void remove_file(struct patch
*patch
)
1943 if (remove_file_from_cache(patch
->old_name
) < 0)
1944 die("unable to remove %s from index", patch
->old_name
);
1945 cache_tree_invalidate_path(active_cache_tree
, patch
->old_name
);
1948 unlink(patch
->old_name
);
1951 static void add_index_file(const char *path
, unsigned mode
, void *buf
, unsigned long size
)
1954 struct cache_entry
*ce
;
1955 int namelen
= strlen(path
);
1956 unsigned ce_size
= cache_entry_size(namelen
);
1961 ce
= xcalloc(1, ce_size
);
1962 memcpy(ce
->name
, path
, namelen
);
1963 ce
->ce_mode
= create_ce_mode(mode
);
1964 ce
->ce_flags
= htons(namelen
);
1966 if (lstat(path
, &st
) < 0)
1967 die("unable to stat newly created file %s", path
);
1968 fill_stat_cache_info(ce
, &st
);
1970 if (write_sha1_file(buf
, size
, blob_type
, ce
->sha1
) < 0)
1971 die("unable to create backing store for newly created file %s", path
);
1972 if (add_cache_entry(ce
, ADD_CACHE_OK_TO_ADD
) < 0)
1973 die("unable to add cache entry for %s", path
);
1976 static int try_create_file(const char *path
, unsigned int mode
, const char *buf
, unsigned long size
)
1981 return symlink(buf
, path
);
1982 fd
= open(path
, O_CREAT
| O_EXCL
| O_WRONLY
, (mode
& 0100) ? 0777 : 0666);
1986 int written
= xwrite(fd
, buf
, size
);
1988 die("writing file %s: %s", path
, strerror(errno
));
1990 die("out of space writing file %s", path
);
1995 die("closing file %s: %s", path
, strerror(errno
));
2000 * We optimistically assume that the directories exist,
2001 * which is true 99% of the time anyway. If they don't,
2002 * we create them and try again.
2004 static void create_one_file(char *path
, unsigned mode
, const char *buf
, unsigned long size
)
2008 if (!try_create_file(path
, mode
, buf
, size
))
2011 if (errno
== ENOENT
) {
2012 if (safe_create_leading_directories(path
))
2014 if (!try_create_file(path
, mode
, buf
, size
))
2018 if (errno
== EEXIST
) {
2019 /* We may be trying to create a file where a directory
2024 if (!lstat(path
, &st
) && S_ISDIR(st
.st_mode
) && !rmdir(path
))
2028 if (errno
== EEXIST
) {
2029 unsigned int nr
= getpid();
2032 const char *newpath
;
2033 newpath
= mkpath("%s~%u", path
, nr
);
2034 if (!try_create_file(newpath
, mode
, buf
, size
)) {
2035 if (!rename(newpath
, path
))
2040 if (errno
!= EEXIST
)
2045 die("unable to write file %s mode %o", path
, mode
);
2048 static void create_file(struct patch
*patch
)
2050 char *path
= patch
->new_name
;
2051 unsigned mode
= patch
->new_mode
;
2052 unsigned long size
= patch
->resultsize
;
2053 char *buf
= patch
->result
;
2056 mode
= S_IFREG
| 0644;
2057 create_one_file(path
, mode
, buf
, size
);
2058 add_index_file(path
, mode
, buf
, size
);
2059 cache_tree_invalidate_path(active_cache_tree
, path
);
2062 /* phase zero is to remove, phase one is to create */
2063 static void write_out_one_result(struct patch
*patch
, int phase
)
2065 if (patch
->is_delete
> 0) {
2070 if (patch
->is_new
> 0 || patch
->is_copy
) {
2076 * Rename or modification boils down to the same
2077 * thing: remove the old, write the new
2085 static void write_out_results(struct patch
*list
, int skipped_patch
)
2089 if (!list
&& !skipped_patch
)
2092 for (phase
= 0; phase
< 2; phase
++) {
2093 struct patch
*l
= list
;
2095 write_out_one_result(l
, phase
);
2101 static struct lock_file lock_file
;
2103 static struct excludes
{
2104 struct excludes
*next
;
2108 static int use_patch(struct patch
*p
)
2110 const char *pathname
= p
->new_name
? p
->new_name
: p
->old_name
;
2111 struct excludes
*x
= excludes
;
2113 if (fnmatch(x
->path
, pathname
, 0) == 0)
2117 if (0 < prefix_length
) {
2118 int pathlen
= strlen(pathname
);
2119 if (pathlen
<= prefix_length
||
2120 memcmp(prefix
, pathname
, prefix_length
))
2126 static int apply_patch(int fd
, const char *filename
, int inaccurate_eof
)
2128 unsigned long offset
, size
;
2129 char *buffer
= read_patch_file(fd
, &size
);
2130 struct patch
*list
= NULL
, **listp
= &list
;
2131 int skipped_patch
= 0;
2133 patch_input_file
= filename
;
2138 struct patch
*patch
;
2141 patch
= xcalloc(1, sizeof(*patch
));
2142 patch
->inaccurate_eof
= inaccurate_eof
;
2143 nr
= parse_chunk(buffer
+ offset
, size
, patch
);
2146 if (use_patch(patch
)) {
2149 listp
= &patch
->next
;
2151 /* perhaps free it a bit better? */
2159 if (whitespace_error
&& (new_whitespace
== error_on_whitespace
))
2162 write_index
= check_index
&& apply
;
2163 if (write_index
&& newfd
< 0) {
2164 newfd
= hold_lock_file_for_update(&lock_file
,
2167 die("unable to create new index file");
2170 if (read_cache() < 0)
2171 die("unable to read index file");
2174 if ((check
|| apply
) && check_patch_list(list
) < 0)
2178 write_out_results(list
, skipped_patch
);
2180 if (show_index_info
)
2181 show_index_list(list
);
2184 stat_patch_list(list
);
2187 numstat_patch_list(list
);
2190 summary_patch_list(list
);
2196 static int git_apply_config(const char *var
, const char *value
)
2198 if (!strcmp(var
, "apply.whitespace")) {
2199 apply_default_whitespace
= strdup(value
);
2202 return git_default_config(var
, value
);
2206 int cmd_apply(int argc
, const char **argv
, char **envp
)
2210 int inaccurate_eof
= 0;
2212 const char *whitespace_option
= NULL
;
2214 for (i
= 1; i
< argc
; i
++) {
2215 const char *arg
= argv
[i
];
2219 if (!strcmp(arg
, "-")) {
2220 apply_patch(0, "<stdin>", inaccurate_eof
);
2224 if (!strncmp(arg
, "--exclude=", 10)) {
2225 struct excludes
*x
= xmalloc(sizeof(*x
));
2231 if (!strncmp(arg
, "-p", 2)) {
2232 p_value
= atoi(arg
+ 2);
2235 if (!strcmp(arg
, "--no-add")) {
2239 if (!strcmp(arg
, "--stat")) {
2244 if (!strcmp(arg
, "--allow-binary-replacement") ||
2245 !strcmp(arg
, "--binary")) {
2246 allow_binary_replacement
= 1;
2249 if (!strcmp(arg
, "--numstat")) {
2254 if (!strcmp(arg
, "--summary")) {
2259 if (!strcmp(arg
, "--check")) {
2264 if (!strcmp(arg
, "--index")) {
2268 if (!strcmp(arg
, "--cached")) {
2273 if (!strcmp(arg
, "--apply")) {
2277 if (!strcmp(arg
, "--index-info")) {
2279 show_index_info
= 1;
2282 if (!strcmp(arg
, "-z")) {
2283 line_termination
= 0;
2286 if (!strncmp(arg
, "-C", 2)) {
2287 p_context
= strtoul(arg
+ 2, &end
, 0);
2289 die("unrecognized context count '%s'", arg
+ 2);
2292 if (!strncmp(arg
, "--whitespace=", 13)) {
2293 whitespace_option
= arg
+ 13;
2294 parse_whitespace_option(arg
+ 13);
2297 if (!strcmp(arg
, "--inaccurate-eof")) {
2302 if (check_index
&& prefix_length
< 0) {
2303 prefix
= setup_git_directory();
2304 prefix_length
= prefix
? strlen(prefix
) : 0;
2305 git_config(git_apply_config
);
2306 if (!whitespace_option
&& apply_default_whitespace
)
2307 parse_whitespace_option(apply_default_whitespace
);
2309 if (0 < prefix_length
)
2310 arg
= prefix_filename(prefix
, prefix_length
, arg
);
2312 fd
= open(arg
, O_RDONLY
);
2316 set_default_whitespace_mode(whitespace_option
);
2317 apply_patch(fd
, arg
, inaccurate_eof
);
2320 set_default_whitespace_mode(whitespace_option
);
2322 apply_patch(0, "<stdin>", inaccurate_eof
);
2323 if (whitespace_error
) {
2324 if (squelch_whitespace_errors
&&
2325 squelch_whitespace_errors
< whitespace_error
) {
2327 whitespace_error
- squelch_whitespace_errors
;
2328 fprintf(stderr
, "warning: squelched %d whitespace error%s\n",
2330 squelched
== 1 ? "" : "s");
2332 if (new_whitespace
== error_on_whitespace
)
2333 die("%d line%s add%s trailing whitespaces.",
2335 whitespace_error
== 1 ? "" : "s",
2336 whitespace_error
== 1 ? "s" : "");
2337 if (applied_after_stripping
)
2338 fprintf(stderr
, "warning: %d line%s applied after"
2339 " stripping trailing whitespaces.\n",
2340 applied_after_stripping
,
2341 applied_after_stripping
== 1 ? "" : "s");
2342 else if (whitespace_error
)
2343 fprintf(stderr
, "warning: %d line%s add%s trailing"
2346 whitespace_error
== 1 ? "" : "s",
2347 whitespace_error
== 1 ? "s" : "");
2351 if (write_cache(newfd
, active_cache
, active_nr
) ||
2352 close(newfd
) || commit_lock_file(&lock_file
))
2353 die("Unable to write new index file");