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 p_value
= 1;
23 static int allow_binary_replacement
= 0;
24 static int check_index
= 0;
25 static int write_index
= 0;
26 static int diffstat
= 0;
27 static int numstat
= 0;
28 static int summary
= 0;
31 static int no_add
= 0;
32 static int show_index_info
= 0;
33 static int line_termination
= '\n';
34 static const char apply_usage
[] =
35 "git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM] [--whitespace=<nowarn|warn|error|error-all|strip>] <patch>...";
37 static enum whitespace_eol
{
42 } new_whitespace
= warn_on_whitespace
;
43 static int whitespace_error
= 0;
44 static int squelch_whitespace_errors
= 5;
45 static int applied_after_stripping
= 0;
46 static const char *patch_input_file
= NULL
;
48 static void parse_whitespace_option(const char *option
)
51 new_whitespace
= warn_on_whitespace
;
54 if (!strcmp(option
, "warn")) {
55 new_whitespace
= warn_on_whitespace
;
58 if (!strcmp(option
, "nowarn")) {
59 new_whitespace
= nowarn_whitespace
;
62 if (!strcmp(option
, "error")) {
63 new_whitespace
= error_on_whitespace
;
66 if (!strcmp(option
, "error-all")) {
67 new_whitespace
= error_on_whitespace
;
68 squelch_whitespace_errors
= 0;
71 if (!strcmp(option
, "strip")) {
72 new_whitespace
= strip_whitespace
;
75 die("unrecognized whitespace option '%s'", option
);
78 static void set_default_whitespace_mode(const char *whitespace_option
)
80 if (!whitespace_option
&& !apply_default_whitespace
) {
81 new_whitespace
= (apply
88 * For "diff-stat" like behaviour, we keep track of the biggest change
89 * we've seen, and the longest filename. That allows us to do simple
92 static int max_change
, max_len
;
95 * Various "current state", notably line numbers and what
96 * file (and how) we're patching right now.. The "is_xxxx"
97 * things are flags, where -1 means "don't know yet".
99 static int linenr
= 1;
102 unsigned long oldpos
, oldlines
;
103 unsigned long newpos
, newlines
;
106 struct fragment
*next
;
110 char *new_name
, *old_name
, *def_name
;
111 unsigned int old_mode
, new_mode
;
112 int is_rename
, is_copy
, is_new
, is_delete
, is_binary
;
113 int lines_added
, lines_deleted
;
115 struct fragment
*fragments
;
117 unsigned long resultsize
;
118 char old_sha1_prefix
[41];
119 char new_sha1_prefix
[41];
123 #define CHUNKSIZE (8192)
126 static void *read_patch_file(int fd
, unsigned long *sizep
)
128 unsigned long size
= 0, alloc
= CHUNKSIZE
;
129 void *buffer
= xmalloc(alloc
);
132 int nr
= alloc
- size
;
135 buffer
= xrealloc(buffer
, alloc
);
138 nr
= xread(fd
, buffer
+ size
, nr
);
142 die("git-apply: read returned %s", strerror(errno
));
148 * Make sure that we have some slop in the buffer
149 * so that we can do speculative "memcmp" etc, and
150 * see to it that it is NUL-filled.
152 if (alloc
< size
+ SLOP
)
153 buffer
= xrealloc(buffer
, size
+ SLOP
);
154 memset(buffer
+ size
, 0, SLOP
);
158 static unsigned long linelen(const char *buffer
, unsigned long size
)
160 unsigned long len
= 0;
163 if (*buffer
++ == '\n')
169 static int is_dev_null(const char *str
)
171 return !memcmp("/dev/null", str
, 9) && isspace(str
[9]);
177 static int name_terminate(const char *name
, int namelen
, int c
, int terminate
)
179 if (c
== ' ' && !(terminate
& TERM_SPACE
))
181 if (c
== '\t' && !(terminate
& TERM_TAB
))
187 static char * find_name(const char *line
, char *def
, int p_value
, int terminate
)
190 const char *start
= line
;
194 /* Proposed "new-style" GNU patch/diff format; see
195 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
197 name
= unquote_c_style(line
, NULL
);
201 cp
= strchr(name
, '/');
208 /* name can later be freed, so we need
209 * to memmove, not just return cp
211 memmove(name
, cp
, strlen(cp
) + 1);
228 if (name_terminate(start
, line
-start
, c
, terminate
))
232 if (c
== '/' && !--p_value
)
242 * Generally we prefer the shorter name, especially
243 * if the other one is just a variation of that with
244 * something else tacked on to the end (ie "file.orig"
248 int deflen
= strlen(def
);
249 if (deflen
< len
&& !strncmp(start
, def
, deflen
))
253 name
= xmalloc(len
+ 1);
254 memcpy(name
, start
, len
);
261 * Get the name etc info from the --/+++ lines of a traditional patch header
263 * NOTE! This hardcodes "-p1" behaviour in filename detection.
265 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
266 * files, we can happily check the index for a match, but for creating a
267 * new file we should try to match whatever "patch" does. I have no idea.
269 static void parse_traditional_patch(const char *first
, const char *second
, struct patch
*patch
)
273 first
+= 4; // skip "--- "
274 second
+= 4; // skip "+++ "
275 if (is_dev_null(first
)) {
277 patch
->is_delete
= 0;
278 name
= find_name(second
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
279 patch
->new_name
= name
;
280 } else if (is_dev_null(second
)) {
282 patch
->is_delete
= 1;
283 name
= find_name(first
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
284 patch
->old_name
= name
;
286 name
= find_name(first
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
287 name
= find_name(second
, name
, p_value
, TERM_SPACE
| TERM_TAB
);
288 patch
->old_name
= patch
->new_name
= name
;
291 die("unable to find filename in patch at line %d", linenr
);
294 static int gitdiff_hdrend(const char *line
, struct patch
*patch
)
300 * We're anal about diff header consistency, to make
301 * sure that we don't end up having strange ambiguous
302 * patches floating around.
304 * As a result, gitdiff_{old|new}name() will check
305 * their names against any previous information, just
308 static char *gitdiff_verify_name(const char *line
, int isnull
, char *orig_name
, const char *oldnew
)
310 if (!orig_name
&& !isnull
)
311 return find_name(line
, NULL
, 1, 0);
320 die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name
, linenr
);
321 another
= find_name(line
, NULL
, 1, 0);
322 if (!another
|| memcmp(another
, name
, len
))
323 die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew
, linenr
);
328 /* expect "/dev/null" */
329 if (memcmp("/dev/null", line
, 9) || line
[9] != '\n')
330 die("git-apply: bad git-diff - expected /dev/null on line %d", linenr
);
335 static int gitdiff_oldname(const char *line
, struct patch
*patch
)
337 patch
->old_name
= gitdiff_verify_name(line
, patch
->is_new
, patch
->old_name
, "old");
341 static int gitdiff_newname(const char *line
, struct patch
*patch
)
343 patch
->new_name
= gitdiff_verify_name(line
, patch
->is_delete
, patch
->new_name
, "new");
347 static int gitdiff_oldmode(const char *line
, struct patch
*patch
)
349 patch
->old_mode
= strtoul(line
, NULL
, 8);
353 static int gitdiff_newmode(const char *line
, struct patch
*patch
)
355 patch
->new_mode
= strtoul(line
, NULL
, 8);
359 static int gitdiff_delete(const char *line
, struct patch
*patch
)
361 patch
->is_delete
= 1;
362 patch
->old_name
= patch
->def_name
;
363 return gitdiff_oldmode(line
, patch
);
366 static int gitdiff_newfile(const char *line
, struct patch
*patch
)
369 patch
->new_name
= patch
->def_name
;
370 return gitdiff_newmode(line
, patch
);
373 static int gitdiff_copysrc(const char *line
, struct patch
*patch
)
376 patch
->old_name
= find_name(line
, NULL
, 0, 0);
380 static int gitdiff_copydst(const char *line
, struct patch
*patch
)
383 patch
->new_name
= find_name(line
, NULL
, 0, 0);
387 static int gitdiff_renamesrc(const char *line
, struct patch
*patch
)
389 patch
->is_rename
= 1;
390 patch
->old_name
= find_name(line
, NULL
, 0, 0);
394 static int gitdiff_renamedst(const char *line
, struct patch
*patch
)
396 patch
->is_rename
= 1;
397 patch
->new_name
= find_name(line
, NULL
, 0, 0);
401 static int gitdiff_similarity(const char *line
, struct patch
*patch
)
403 if ((patch
->score
= strtoul(line
, NULL
, 10)) == ULONG_MAX
)
408 static int gitdiff_dissimilarity(const char *line
, struct patch
*patch
)
410 if ((patch
->score
= strtoul(line
, NULL
, 10)) == ULONG_MAX
)
415 static int gitdiff_index(const char *line
, struct patch
*patch
)
417 /* index line is N hexadecimal, "..", N hexadecimal,
418 * and optional space with octal mode.
420 const char *ptr
, *eol
;
423 ptr
= strchr(line
, '.');
424 if (!ptr
|| ptr
[1] != '.' || 40 < ptr
- line
)
427 memcpy(patch
->old_sha1_prefix
, line
, len
);
428 patch
->old_sha1_prefix
[len
] = 0;
431 ptr
= strchr(line
, ' ');
432 eol
= strchr(line
, '\n');
434 if (!ptr
|| eol
< ptr
)
440 memcpy(patch
->new_sha1_prefix
, line
, len
);
441 patch
->new_sha1_prefix
[len
] = 0;
443 patch
->new_mode
= patch
->old_mode
= strtoul(ptr
+1, NULL
, 8);
448 * This is normal for a diff that doesn't change anything: we'll fall through
449 * into the next diff. Tell the parser to break out.
451 static int gitdiff_unrecognized(const char *line
, struct patch
*patch
)
456 static const char *stop_at_slash(const char *line
, int llen
)
460 for (i
= 0; i
< llen
; i
++) {
468 /* This is to extract the same name that appears on "diff --git"
469 * line. We do not find and return anything if it is a rename
470 * patch, and it is OK because we will find the name elsewhere.
471 * We need to reliably find name only when it is mode-change only,
472 * creation or deletion of an empty file. In any of these cases,
473 * both sides are the same name under a/ and b/ respectively.
475 static char *git_header_name(char *line
, int llen
)
479 const char *second
= NULL
;
481 line
+= strlen("diff --git ");
482 llen
-= strlen("diff --git ");
486 char *first
= unquote_c_style(line
, &second
);
490 /* advance to the first slash */
491 cp
= stop_at_slash(first
, strlen(first
));
492 if (!cp
|| cp
== first
) {
493 /* we do not accept absolute paths */
499 memmove(first
, cp
+1, len
+1); /* including NUL */
501 /* second points at one past closing dq of name.
502 * find the second name.
504 while ((second
< line
+ llen
) && isspace(*second
))
507 if (line
+ llen
<= second
)
508 goto free_first_and_fail
;
509 if (*second
== '"') {
510 char *sp
= unquote_c_style(second
, NULL
);
512 goto free_first_and_fail
;
513 cp
= stop_at_slash(sp
, strlen(sp
));
514 if (!cp
|| cp
== sp
) {
517 goto free_first_and_fail
;
519 /* They must match, otherwise ignore */
520 if (strcmp(cp
+1, first
))
521 goto free_both_and_fail
;
526 /* unquoted second */
527 cp
= stop_at_slash(second
, line
+ llen
- second
);
528 if (!cp
|| cp
== second
)
529 goto free_first_and_fail
;
531 if (line
+ llen
- cp
!= len
+ 1 ||
532 memcmp(first
, cp
, len
))
533 goto free_first_and_fail
;
537 /* unquoted first name */
538 name
= stop_at_slash(line
, llen
);
539 if (!name
|| name
== line
)
544 /* since the first name is unquoted, a dq if exists must be
545 * the beginning of the second name.
547 for (second
= name
; second
< line
+ llen
; second
++) {
548 if (*second
== '"') {
549 const char *cp
= second
;
551 char *sp
= unquote_c_style(second
, NULL
);
555 np
= stop_at_slash(sp
, strlen(sp
));
556 if (!np
|| np
== sp
) {
557 free_second_and_fail
:
563 if (len
< cp
- name
&&
564 !strncmp(np
, name
, len
) &&
565 isspace(name
[len
])) {
567 memmove(sp
, np
, len
+ 1);
570 goto free_second_and_fail
;
575 * Accept a name only if it shows up twice, exactly the same
578 for (len
= 0 ; ; len
++) {
595 if (second
[len
] == '\n' && !memcmp(name
, second
, len
)) {
596 char *ret
= xmalloc(len
+ 1);
597 memcpy(ret
, name
, len
);
606 /* Verify that we recognize the lines following a git header */
607 static int parse_git_header(char *line
, int len
, unsigned int size
, struct patch
*patch
)
609 unsigned long offset
;
611 /* A git diff has explicit new/delete information, so we don't guess */
613 patch
->is_delete
= 0;
616 * Some things may not have the old name in the
617 * rest of the headers anywhere (pure mode changes,
618 * or removing or adding empty files), so we get
619 * the default name from the header.
621 patch
->def_name
= git_header_name(line
, len
);
626 for (offset
= len
; size
> 0 ; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
627 static const struct opentry
{
629 int (*fn
)(const char *, struct patch
*);
631 { "@@ -", gitdiff_hdrend
},
632 { "--- ", gitdiff_oldname
},
633 { "+++ ", gitdiff_newname
},
634 { "old mode ", gitdiff_oldmode
},
635 { "new mode ", gitdiff_newmode
},
636 { "deleted file mode ", gitdiff_delete
},
637 { "new file mode ", gitdiff_newfile
},
638 { "copy from ", gitdiff_copysrc
},
639 { "copy to ", gitdiff_copydst
},
640 { "rename old ", gitdiff_renamesrc
},
641 { "rename new ", gitdiff_renamedst
},
642 { "rename from ", gitdiff_renamesrc
},
643 { "rename to ", gitdiff_renamedst
},
644 { "similarity index ", gitdiff_similarity
},
645 { "dissimilarity index ", gitdiff_dissimilarity
},
646 { "index ", gitdiff_index
},
647 { "", gitdiff_unrecognized
},
651 len
= linelen(line
, size
);
652 if (!len
|| line
[len
-1] != '\n')
654 for (i
= 0; i
< sizeof(optable
) / sizeof(optable
[0]); i
++) {
655 const struct opentry
*p
= optable
+ i
;
656 int oplen
= strlen(p
->str
);
657 if (len
< oplen
|| memcmp(p
->str
, line
, oplen
))
659 if (p
->fn(line
+ oplen
, patch
) < 0)
668 static int parse_num(const char *line
, unsigned long *p
)
674 *p
= strtoul(line
, &ptr
, 10);
678 static int parse_range(const char *line
, int len
, int offset
, const char *expect
,
679 unsigned long *p1
, unsigned long *p2
)
683 if (offset
< 0 || offset
>= len
)
688 digits
= parse_num(line
, p1
);
698 digits
= parse_num(line
+1, p2
);
710 if (memcmp(line
, expect
, ex
))
717 * Parse a unified diff fragment header of the
718 * form "@@ -a,b +c,d @@"
720 static int parse_fragment_header(char *line
, int len
, struct fragment
*fragment
)
724 if (!len
|| line
[len
-1] != '\n')
727 /* Figure out the number of lines in a fragment */
728 offset
= parse_range(line
, len
, 4, " +", &fragment
->oldpos
, &fragment
->oldlines
);
729 offset
= parse_range(line
, len
, offset
, " @@", &fragment
->newpos
, &fragment
->newlines
);
734 static int find_header(char *line
, unsigned long size
, int *hdrsize
, struct patch
*patch
)
736 unsigned long offset
, len
;
738 patch
->is_rename
= patch
->is_copy
= 0;
739 patch
->is_new
= patch
->is_delete
= -1;
740 patch
->old_mode
= patch
->new_mode
= 0;
741 patch
->old_name
= patch
->new_name
= NULL
;
742 for (offset
= 0; size
> 0; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
743 unsigned long nextlen
;
745 len
= linelen(line
, size
);
749 /* Testing this early allows us to take a few shortcuts.. */
754 * Make sure we don't find any unconnected patch fragmants.
755 * That's a sign that we didn't find a header, and that a
756 * patch has become corrupted/broken up.
758 if (!memcmp("@@ -", line
, 4)) {
759 struct fragment dummy
;
760 if (parse_fragment_header(line
, len
, &dummy
) < 0)
762 error("patch fragment without header at line %d: %.*s", linenr
, (int)len
-1, line
);
769 * Git patch? It might not have a real patch, just a rename
770 * or mode change, so we handle that specially
772 if (!memcmp("diff --git ", line
, 11)) {
773 int git_hdr_len
= parse_git_header(line
, len
, size
, patch
);
774 if (git_hdr_len
<= len
)
776 if (!patch
->old_name
&& !patch
->new_name
) {
777 if (!patch
->def_name
)
778 die("git diff header lacks filename information (line %d)", linenr
);
779 patch
->old_name
= patch
->new_name
= patch
->def_name
;
781 *hdrsize
= git_hdr_len
;
785 /** --- followed by +++ ? */
786 if (memcmp("--- ", line
, 4) || memcmp("+++ ", line
+ len
, 4))
790 * We only accept unified patches, so we want it to
791 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
794 nextlen
= linelen(line
+ len
, size
- len
);
795 if (size
< nextlen
+ 14 || memcmp("@@ -", line
+ len
+ nextlen
, 4))
798 /* Ok, we'll consider it a patch */
799 parse_traditional_patch(line
, line
+len
, patch
);
800 *hdrsize
= len
+ nextlen
;
808 * Parse a unified diff. Note that this really needs
809 * to parse each fragment separately, since the only
810 * way to know the difference between a "---" that is
811 * part of a patch, and a "---" that starts the next
812 * patch is to look at the line counts..
814 static int parse_fragment(char *line
, unsigned long size
, struct patch
*patch
, struct fragment
*fragment
)
817 int len
= linelen(line
, size
), offset
;
818 unsigned long oldlines
, newlines
;
820 offset
= parse_fragment_header(line
, len
, fragment
);
823 oldlines
= fragment
->oldlines
;
824 newlines
= fragment
->newlines
;
826 if (patch
->is_new
< 0) {
827 patch
->is_new
= !oldlines
;
829 patch
->old_name
= NULL
;
831 if (patch
->is_delete
< 0) {
832 patch
->is_delete
= !newlines
;
834 patch
->new_name
= NULL
;
837 if (patch
->is_new
!= !oldlines
)
838 return error("new file depends on old contents");
839 if (patch
->is_delete
!= !newlines
) {
841 return error("deleted file still has contents");
842 fprintf(stderr
, "** warning: file %s becomes empty but is not deleted\n", patch
->new_name
);
845 /* Parse the thing.. */
850 for (offset
= len
; size
> 0; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
851 if (!oldlines
&& !newlines
)
853 len
= linelen(line
, size
);
854 if (!len
|| line
[len
-1] != '\n')
869 * We know len is at least two, since we have a '+' and
870 * we checked that the last character was a '\n' above.
871 * That is, an addition of an empty line would check
872 * the '+' here. Sneaky...
874 if ((new_whitespace
!= nowarn_whitespace
) &&
875 isspace(line
[len
-2])) {
877 if (squelch_whitespace_errors
&&
878 squelch_whitespace_errors
<
882 fprintf(stderr
, "Adds trailing whitespace.\n%s:%d:%.*s\n",
884 linenr
, len
-2, line
+1);
891 /* We allow "\ No newline at end of file". Depending
892 * on locale settings when the patch was produced we
893 * don't know what this line looks like. The only
894 * thing we do know is that it begins with "\ ".
895 * Checking for 12 is just for sanity check -- any
896 * l10n of "\ No newline..." is at least that long.
899 if (len
< 12 || memcmp(line
, "\\ ", 2))
904 /* If a fragment ends with an incomplete line, we failed to include
905 * it in the above loop because we hit oldlines == newlines == 0
908 if (12 < size
&& !memcmp(line
, "\\ ", 2))
909 offset
+= linelen(line
, size
);
911 patch
->lines_added
+= added
;
912 patch
->lines_deleted
+= deleted
;
916 static int parse_single_patch(char *line
, unsigned long size
, struct patch
*patch
)
918 unsigned long offset
= 0;
919 struct fragment
**fragp
= &patch
->fragments
;
921 while (size
> 4 && !memcmp(line
, "@@ -", 4)) {
922 struct fragment
*fragment
;
925 fragment
= xmalloc(sizeof(*fragment
));
926 memset(fragment
, 0, sizeof(*fragment
));
927 len
= parse_fragment(line
, size
, patch
, fragment
);
929 die("corrupt patch at line %d", linenr
);
931 fragment
->patch
= line
;
932 fragment
->size
= len
;
935 fragp
= &fragment
->next
;
944 static inline int metadata_changes(struct patch
*patch
)
946 return patch
->is_rename
> 0 ||
947 patch
->is_copy
> 0 ||
950 (patch
->old_mode
&& patch
->new_mode
&&
951 patch
->old_mode
!= patch
->new_mode
);
954 static int parse_chunk(char *buffer
, unsigned long size
, struct patch
*patch
)
956 int hdrsize
, patchsize
;
957 int offset
= find_header(buffer
, size
, &hdrsize
, patch
);
962 patchsize
= parse_single_patch(buffer
+ offset
+ hdrsize
, size
- offset
- hdrsize
, patch
);
965 static const char *binhdr
[] = {
971 int hd
= hdrsize
+ offset
;
972 unsigned long llen
= linelen(buffer
+ hd
, size
- hd
);
974 if (!memcmp(" differ\n", buffer
+ hd
+ llen
- 8, 8))
975 for (i
= 0; binhdr
[i
]; i
++) {
976 int len
= strlen(binhdr
[i
]);
977 if (len
< size
- hd
&&
978 !memcmp(binhdr
[i
], buffer
+ hd
, len
)) {
979 patch
->is_binary
= 1;
984 /* Empty patch cannot be applied if:
985 * - it is a binary patch and we do not do binary_replace, or
986 * - text patch without metadata change
988 if ((apply
|| check
) &&
990 ? !allow_binary_replacement
991 : !metadata_changes(patch
)))
992 die("patch with only garbage at line %d", linenr
);
995 return offset
+ hdrsize
+ patchsize
;
998 static const char pluses
[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
999 static const char minuses
[]= "----------------------------------------------------------------------";
1001 static void show_stats(struct patch
*patch
)
1003 const char *prefix
= "";
1004 char *name
= patch
->new_name
;
1006 int len
, max
, add
, del
, total
;
1009 name
= patch
->old_name
;
1011 if (0 < (len
= quote_c_style(name
, NULL
, NULL
, 0))) {
1012 qname
= xmalloc(len
+ 1);
1013 quote_c_style(name
, qname
, NULL
, 0);
1018 * "scale" the filename
1029 slash
= strchr(name
, '/');
1036 * scale the add/delete
1042 add
= patch
->lines_added
;
1043 del
= patch
->lines_deleted
;
1046 if (max_change
> 0) {
1047 total
= (total
* max
+ max_change
/ 2) / max_change
;
1048 add
= (add
* max
+ max_change
/ 2) / max_change
;
1051 if (patch
->is_binary
)
1052 printf(" %s%-*s | Bin\n", prefix
, len
, name
);
1054 printf(" %s%-*s |%5d %.*s%.*s\n", prefix
,
1055 len
, name
, patch
->lines_added
+ patch
->lines_deleted
,
1056 add
, pluses
, del
, minuses
);
1061 static int read_old_data(struct stat
*st
, const char *path
, void *buf
, unsigned long size
)
1066 switch (st
->st_mode
& S_IFMT
) {
1068 return readlink(path
, buf
, size
);
1070 fd
= open(path
, O_RDONLY
);
1072 return error("unable to open %s", path
);
1075 int ret
= xread(fd
, buf
+ got
, size
- got
);
1088 static int find_offset(const char *buf
, unsigned long size
, const char *fragment
, unsigned long fragsize
, int line
)
1091 unsigned long start
, backwards
, forwards
;
1093 if (fragsize
> size
)
1098 unsigned long offset
= 0;
1100 while (offset
+ fragsize
<= size
) {
1101 if (buf
[offset
++] == '\n') {
1109 /* Exact line number? */
1110 if (!memcmp(buf
+ start
, fragment
, fragsize
))
1114 * There's probably some smart way to do this, but I'll leave
1115 * that to the smart and beautiful people. I'm simple and stupid.
1119 for (i
= 0; ; i
++) {
1126 if (forwards
+ fragsize
> size
)
1132 } while (backwards
&& buf
[backwards
-1] != '\n');
1135 while (forwards
+ fragsize
<= size
) {
1136 if (buf
[forwards
++] == '\n')
1142 if (try + fragsize
> size
)
1144 if (memcmp(buf
+ try, fragment
, fragsize
))
1153 * We should start searching forward and backward.
1158 struct buffer_desc
{
1161 unsigned long alloc
;
1164 static int apply_line(char *output
, const char *patch
, int plen
)
1166 /* plen is number of bytes to be copied from patch,
1167 * starting at patch+1 (patch[0] is '+'). Typically
1168 * patch[plen] is '\n'.
1170 int add_nl_to_tail
= 0;
1171 if ((new_whitespace
== strip_whitespace
) &&
1172 1 < plen
&& isspace(patch
[plen
-1])) {
1173 if (patch
[plen
] == '\n')
1176 while (0 < plen
&& isspace(patch
[plen
]))
1178 applied_after_stripping
++;
1180 memcpy(output
, patch
+ 1, plen
);
1182 output
[plen
++] = '\n';
1186 static int apply_one_fragment(struct buffer_desc
*desc
, struct fragment
*frag
)
1188 char *buf
= desc
->buffer
;
1189 const char *patch
= frag
->patch
;
1190 int offset
, size
= frag
->size
;
1191 char *old
= xmalloc(size
);
1192 char *new = xmalloc(size
);
1193 int oldsize
= 0, newsize
= 0;
1196 int len
= linelen(patch
, size
);
1203 * "plen" is how much of the line we should use for
1204 * the actual patch data. Normally we just remove the
1205 * first character on the line, but if the line is
1206 * followed by "\ No newline", then we also remove the
1207 * last one (which is the newline, of course).
1210 if (len
< size
&& patch
[len
] == '\\')
1215 memcpy(old
+ oldsize
, patch
+ 1, plen
);
1219 /* Fall-through for ' ' */
1221 if (*patch
!= '+' || !no_add
)
1222 newsize
+= apply_line(new + newsize
, patch
,
1225 case '@': case '\\':
1226 /* Ignore it, we already handled it */
1235 #ifdef NO_ACCURATE_DIFF
1236 if (oldsize
> 0 && old
[oldsize
- 1] == '\n' &&
1237 newsize
> 0 && new[newsize
- 1] == '\n') {
1243 offset
= find_offset(buf
, desc
->size
, old
, oldsize
, frag
->newpos
);
1245 int diff
= newsize
- oldsize
;
1246 unsigned long size
= desc
->size
+ diff
;
1247 unsigned long alloc
= desc
->alloc
;
1250 alloc
= size
+ 8192;
1251 desc
->alloc
= alloc
;
1252 buf
= xrealloc(buf
, alloc
);
1256 memmove(buf
+ offset
+ newsize
, buf
+ offset
+ oldsize
, size
- offset
- newsize
);
1257 memcpy(buf
+ offset
, new, newsize
);
1266 static int apply_fragments(struct buffer_desc
*desc
, struct patch
*patch
)
1268 struct fragment
*frag
= patch
->fragments
;
1269 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
1271 if (patch
->is_binary
) {
1272 unsigned char sha1
[20];
1274 if (!allow_binary_replacement
)
1275 return error("cannot apply binary patch to '%s' "
1276 "without --allow-binary-replacement",
1279 /* For safety, we require patch index line to contain
1280 * full 40-byte textual SHA1 for old and new, at least for now.
1282 if (strlen(patch
->old_sha1_prefix
) != 40 ||
1283 strlen(patch
->new_sha1_prefix
) != 40 ||
1284 get_sha1_hex(patch
->old_sha1_prefix
, sha1
) ||
1285 get_sha1_hex(patch
->new_sha1_prefix
, sha1
))
1286 return error("cannot apply binary patch to '%s' "
1287 "without full index line", name
);
1289 if (patch
->old_name
) {
1290 unsigned char hdr
[50];
1293 /* See if the old one matches what the patch
1296 write_sha1_file_prepare(desc
->buffer
, desc
->size
,
1297 "blob", sha1
, hdr
, &hdrlen
);
1298 if (strcmp(sha1_to_hex(sha1
), patch
->old_sha1_prefix
))
1299 return error("the patch applies to '%s' (%s), "
1300 "which does not match the "
1301 "current contents.",
1302 name
, sha1_to_hex(sha1
));
1305 /* Otherwise, the old one must be empty. */
1307 return error("the patch applies to an empty "
1308 "'%s' but it is not empty", name
);
1311 /* For now, we do not record post-image data in the patch,
1312 * and require the object already present in the recipient's
1317 desc
->alloc
= desc
->size
= 0;
1319 get_sha1_hex(patch
->new_sha1_prefix
, sha1
);
1321 if (memcmp(sha1
, null_sha1
, 20)) {
1325 desc
->buffer
= read_sha1_file(sha1
, type
, &size
);
1327 return error("the necessary postimage %s for "
1328 "'%s' does not exist",
1329 patch
->new_sha1_prefix
, name
);
1330 desc
->alloc
= desc
->size
= size
;
1337 if (apply_one_fragment(desc
, frag
) < 0)
1338 return error("patch failed: %s:%ld",
1339 name
, frag
->oldpos
);
1345 static int apply_data(struct patch
*patch
, struct stat
*st
)
1348 unsigned long size
, alloc
;
1349 struct buffer_desc desc
;
1354 if (patch
->old_name
) {
1356 alloc
= size
+ 8192;
1357 buf
= xmalloc(alloc
);
1358 if (read_old_data(st
, patch
->old_name
, buf
, alloc
) != size
)
1359 return error("read of %s failed", patch
->old_name
);
1365 if (apply_fragments(&desc
, patch
) < 0)
1367 patch
->result
= desc
.buffer
;
1368 patch
->resultsize
= desc
.size
;
1370 if (patch
->is_delete
&& patch
->resultsize
)
1371 return error("removal patch leaves file contents");
1376 static int check_patch(struct patch
*patch
)
1379 const char *old_name
= patch
->old_name
;
1380 const char *new_name
= patch
->new_name
;
1381 const char *name
= old_name
? old_name
: new_name
;
1385 int stat_ret
= lstat(old_name
, &st
);
1388 int pos
= cache_name_pos(old_name
, strlen(old_name
));
1390 return error("%s: does not exist in index",
1393 struct checkout costate
;
1394 if (errno
!= ENOENT
)
1395 return error("%s: %s", old_name
,
1398 costate
.base_dir
= "";
1399 costate
.base_dir_len
= 0;
1402 costate
.not_new
= 0;
1403 costate
.refresh_cache
= 1;
1404 if (checkout_entry(active_cache
[pos
],
1406 lstat(old_name
, &st
))
1410 changed
= ce_match_stat(active_cache
[pos
], &st
, 1);
1412 return error("%s: does not match index",
1415 else if (stat_ret
< 0)
1416 return error("%s: %s", old_name
, strerror(errno
));
1418 if (patch
->is_new
< 0)
1420 st
.st_mode
= ntohl(create_ce_mode(st
.st_mode
));
1421 if (!patch
->old_mode
)
1422 patch
->old_mode
= st
.st_mode
;
1423 if ((st
.st_mode
^ patch
->old_mode
) & S_IFMT
)
1424 return error("%s: wrong type", old_name
);
1425 if (st
.st_mode
!= patch
->old_mode
)
1426 fprintf(stderr
, "warning: %s has type %o, expected %o\n",
1427 old_name
, st
.st_mode
, patch
->old_mode
);
1430 if (new_name
&& (patch
->is_new
| patch
->is_rename
| patch
->is_copy
)) {
1431 if (check_index
&& cache_name_pos(new_name
, strlen(new_name
)) >= 0)
1432 return error("%s: already exists in index", new_name
);
1433 if (!lstat(new_name
, &st
))
1434 return error("%s: already exists in working directory", new_name
);
1435 if (errno
!= ENOENT
)
1436 return error("%s: %s", new_name
, strerror(errno
));
1437 if (!patch
->new_mode
) {
1439 patch
->new_mode
= S_IFREG
| 0644;
1441 patch
->new_mode
= patch
->old_mode
;
1445 if (new_name
&& old_name
) {
1446 int same
= !strcmp(old_name
, new_name
);
1447 if (!patch
->new_mode
)
1448 patch
->new_mode
= patch
->old_mode
;
1449 if ((patch
->old_mode
^ patch
->new_mode
) & S_IFMT
)
1450 return error("new mode (%o) of %s does not match old mode (%o)%s%s",
1451 patch
->new_mode
, new_name
, patch
->old_mode
,
1452 same
? "" : " of ", same
? "" : old_name
);
1455 if (apply_data(patch
, &st
) < 0)
1456 return error("%s: patch does not apply", name
);
1460 static int check_patch_list(struct patch
*patch
)
1464 for (;patch
; patch
= patch
->next
)
1465 error
|= check_patch(patch
);
1469 static inline int is_null_sha1(const unsigned char *sha1
)
1471 return !memcmp(sha1
, null_sha1
, 20);
1474 static void show_index_list(struct patch
*list
)
1476 struct patch
*patch
;
1478 /* Once we start supporting the reverse patch, it may be
1479 * worth showing the new sha1 prefix, but until then...
1481 for (patch
= list
; patch
; patch
= patch
->next
) {
1482 const unsigned char *sha1_ptr
;
1483 unsigned char sha1
[20];
1486 name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
1488 sha1_ptr
= null_sha1
;
1489 else if (get_sha1(patch
->old_sha1_prefix
, sha1
))
1490 die("sha1 information is lacking or useless (%s).",
1495 printf("%06o %s ",patch
->old_mode
, sha1_to_hex(sha1_ptr
));
1496 if (line_termination
&& quote_c_style(name
, NULL
, NULL
, 0))
1497 quote_c_style(name
, NULL
, stdout
, 0);
1499 fputs(name
, stdout
);
1500 putchar(line_termination
);
1504 static void stat_patch_list(struct patch
*patch
)
1506 int files
, adds
, dels
;
1508 for (files
= adds
= dels
= 0 ; patch
; patch
= patch
->next
) {
1510 adds
+= patch
->lines_added
;
1511 dels
+= patch
->lines_deleted
;
1515 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files
, adds
, dels
);
1518 static void numstat_patch_list(struct patch
*patch
)
1520 for ( ; patch
; patch
= patch
->next
) {
1522 name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
1523 printf("%d\t%d\t", patch
->lines_added
, patch
->lines_deleted
);
1524 if (line_termination
&& quote_c_style(name
, NULL
, NULL
, 0))
1525 quote_c_style(name
, NULL
, stdout
, 0);
1527 fputs(name
, stdout
);
1532 static void show_file_mode_name(const char *newdelete
, unsigned int mode
, const char *name
)
1535 printf(" %s mode %06o %s\n", newdelete
, mode
, name
);
1537 printf(" %s %s\n", newdelete
, name
);
1540 static void show_mode_change(struct patch
*p
, int show_name
)
1542 if (p
->old_mode
&& p
->new_mode
&& p
->old_mode
!= p
->new_mode
) {
1544 printf(" mode change %06o => %06o %s\n",
1545 p
->old_mode
, p
->new_mode
, p
->new_name
);
1547 printf(" mode change %06o => %06o\n",
1548 p
->old_mode
, p
->new_mode
);
1552 static void show_rename_copy(struct patch
*p
)
1554 const char *renamecopy
= p
->is_rename
? "rename" : "copy";
1555 const char *old
, *new;
1557 /* Find common prefix */
1561 const char *slash_old
, *slash_new
;
1562 slash_old
= strchr(old
, '/');
1563 slash_new
= strchr(new, '/');
1566 slash_old
- old
!= slash_new
- new ||
1567 memcmp(old
, new, slash_new
- new))
1569 old
= slash_old
+ 1;
1570 new = slash_new
+ 1;
1572 /* p->old_name thru old is the common prefix, and old and new
1573 * through the end of names are renames
1575 if (old
!= p
->old_name
)
1576 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy
,
1577 (int)(old
- p
->old_name
), p
->old_name
,
1578 old
, new, p
->score
);
1580 printf(" %s %s => %s (%d%%)\n", renamecopy
,
1581 p
->old_name
, p
->new_name
, p
->score
);
1582 show_mode_change(p
, 0);
1585 static void summary_patch_list(struct patch
*patch
)
1589 for (p
= patch
; p
; p
= p
->next
) {
1591 show_file_mode_name("create", p
->new_mode
, p
->new_name
);
1592 else if (p
->is_delete
)
1593 show_file_mode_name("delete", p
->old_mode
, p
->old_name
);
1595 if (p
->is_rename
|| p
->is_copy
)
1596 show_rename_copy(p
);
1599 printf(" rewrite %s (%d%%)\n",
1600 p
->new_name
, p
->score
);
1601 show_mode_change(p
, 0);
1604 show_mode_change(p
, 1);
1610 static void patch_stats(struct patch
*patch
)
1612 int lines
= patch
->lines_added
+ patch
->lines_deleted
;
1614 if (lines
> max_change
)
1616 if (patch
->old_name
) {
1617 int len
= quote_c_style(patch
->old_name
, NULL
, NULL
, 0);
1619 len
= strlen(patch
->old_name
);
1623 if (patch
->new_name
) {
1624 int len
= quote_c_style(patch
->new_name
, NULL
, NULL
, 0);
1626 len
= strlen(patch
->new_name
);
1632 static void remove_file(struct patch
*patch
)
1635 if (remove_file_from_cache(patch
->old_name
) < 0)
1636 die("unable to remove %s from index", patch
->old_name
);
1638 unlink(patch
->old_name
);
1641 static void add_index_file(const char *path
, unsigned mode
, void *buf
, unsigned long size
)
1644 struct cache_entry
*ce
;
1645 int namelen
= strlen(path
);
1646 unsigned ce_size
= cache_entry_size(namelen
);
1651 ce
= xmalloc(ce_size
);
1652 memset(ce
, 0, ce_size
);
1653 memcpy(ce
->name
, path
, namelen
);
1654 ce
->ce_mode
= create_ce_mode(mode
);
1655 ce
->ce_flags
= htons(namelen
);
1656 if (lstat(path
, &st
) < 0)
1657 die("unable to stat newly created file %s", path
);
1658 fill_stat_cache_info(ce
, &st
);
1659 if (write_sha1_file(buf
, size
, "blob", ce
->sha1
) < 0)
1660 die("unable to create backing store for newly created file %s", path
);
1661 if (add_cache_entry(ce
, ADD_CACHE_OK_TO_ADD
) < 0)
1662 die("unable to add cache entry for %s", path
);
1665 static int try_create_file(const char *path
, unsigned int mode
, const char *buf
, unsigned long size
)
1670 return symlink(buf
, path
);
1671 fd
= open(path
, O_CREAT
| O_EXCL
| O_WRONLY
, (mode
& 0100) ? 0777 : 0666);
1675 int written
= xwrite(fd
, buf
, size
);
1677 die("writing file %s: %s", path
, strerror(errno
));
1679 die("out of space writing file %s", path
);
1684 die("closing file %s: %s", path
, strerror(errno
));
1689 * We optimistically assume that the directories exist,
1690 * which is true 99% of the time anyway. If they don't,
1691 * we create them and try again.
1693 static void create_one_file(char *path
, unsigned mode
, const char *buf
, unsigned long size
)
1695 if (!try_create_file(path
, mode
, buf
, size
))
1698 if (errno
== ENOENT
) {
1699 if (safe_create_leading_directories(path
))
1701 if (!try_create_file(path
, mode
, buf
, size
))
1705 if (errno
== EEXIST
) {
1706 unsigned int nr
= getpid();
1709 const char *newpath
;
1710 newpath
= mkpath("%s~%u", path
, nr
);
1711 if (!try_create_file(newpath
, mode
, buf
, size
)) {
1712 if (!rename(newpath
, path
))
1717 if (errno
!= EEXIST
)
1722 die("unable to write file %s mode %o", path
, mode
);
1725 static void create_file(struct patch
*patch
)
1727 char *path
= patch
->new_name
;
1728 unsigned mode
= patch
->new_mode
;
1729 unsigned long size
= patch
->resultsize
;
1730 char *buf
= patch
->result
;
1733 mode
= S_IFREG
| 0644;
1734 create_one_file(path
, mode
, buf
, size
);
1735 add_index_file(path
, mode
, buf
, size
);
1738 static void write_out_one_result(struct patch
*patch
)
1740 if (patch
->is_delete
> 0) {
1744 if (patch
->is_new
> 0 || patch
->is_copy
) {
1749 * Rename or modification boils down to the same
1750 * thing: remove the old, write the new
1756 static void write_out_results(struct patch
*list
, int skipped_patch
)
1758 if (!list
&& !skipped_patch
)
1762 write_out_one_result(list
);
1767 static struct cache_file cache_file
;
1769 static struct excludes
{
1770 struct excludes
*next
;
1774 static int use_patch(struct patch
*p
)
1776 const char *pathname
= p
->new_name
? p
->new_name
: p
->old_name
;
1777 struct excludes
*x
= excludes
;
1779 if (fnmatch(x
->path
, pathname
, 0) == 0)
1783 if (0 < prefix_length
) {
1784 int pathlen
= strlen(pathname
);
1785 if (pathlen
<= prefix_length
||
1786 memcmp(prefix
, pathname
, prefix_length
))
1792 static int apply_patch(int fd
, const char *filename
)
1795 unsigned long offset
, size
;
1796 char *buffer
= read_patch_file(fd
, &size
);
1797 struct patch
*list
= NULL
, **listp
= &list
;
1798 int skipped_patch
= 0;
1800 patch_input_file
= filename
;
1805 struct patch
*patch
;
1808 patch
= xmalloc(sizeof(*patch
));
1809 memset(patch
, 0, sizeof(*patch
));
1810 nr
= parse_chunk(buffer
+ offset
, size
, patch
);
1813 if (use_patch(patch
)) {
1816 listp
= &patch
->next
;
1818 /* perhaps free it a bit better? */
1827 if (whitespace_error
&& (new_whitespace
== error_on_whitespace
))
1830 write_index
= check_index
&& apply
;
1832 newfd
= hold_index_file_for_update(&cache_file
, get_index_file());
1834 if (read_cache() < 0)
1835 die("unable to read index file");
1838 if ((check
|| apply
) && check_patch_list(list
) < 0)
1842 write_out_results(list
, skipped_patch
);
1845 if (write_cache(newfd
, active_cache
, active_nr
) ||
1846 commit_index_file(&cache_file
))
1847 die("Unable to write new cachefile");
1850 if (show_index_info
)
1851 show_index_list(list
);
1854 stat_patch_list(list
);
1857 numstat_patch_list(list
);
1860 summary_patch_list(list
);
1866 static int git_apply_config(const char *var
, const char *value
)
1868 if (!strcmp(var
, "apply.whitespace")) {
1869 apply_default_whitespace
= strdup(value
);
1872 return git_default_config(var
, value
);
1876 int main(int argc
, char **argv
)
1880 const char *whitespace_option
= NULL
;
1882 for (i
= 1; i
< argc
; i
++) {
1883 const char *arg
= argv
[i
];
1886 if (!strcmp(arg
, "-")) {
1887 apply_patch(0, "<stdin>");
1891 if (!strncmp(arg
, "--exclude=", 10)) {
1892 struct excludes
*x
= xmalloc(sizeof(*x
));
1898 if (!strncmp(arg
, "-p", 2)) {
1899 p_value
= atoi(arg
+ 2);
1902 if (!strcmp(arg
, "--no-add")) {
1906 if (!strcmp(arg
, "--stat")) {
1911 if (!strcmp(arg
, "--allow-binary-replacement")) {
1912 allow_binary_replacement
= 1;
1915 if (!strcmp(arg
, "--numstat")) {
1920 if (!strcmp(arg
, "--summary")) {
1925 if (!strcmp(arg
, "--check")) {
1930 if (!strcmp(arg
, "--index")) {
1934 if (!strcmp(arg
, "--apply")) {
1938 if (!strcmp(arg
, "--index-info")) {
1940 show_index_info
= 1;
1943 if (!strcmp(arg
, "-z")) {
1944 line_termination
= 0;
1947 if (!strncmp(arg
, "--whitespace=", 13)) {
1948 whitespace_option
= arg
+ 13;
1949 parse_whitespace_option(arg
+ 13);
1953 if (check_index
&& prefix_length
< 0) {
1954 prefix
= setup_git_directory();
1955 prefix_length
= prefix
? strlen(prefix
) : 0;
1956 git_config(git_apply_config
);
1957 if (!whitespace_option
&& apply_default_whitespace
)
1958 parse_whitespace_option(apply_default_whitespace
);
1960 if (0 < prefix_length
)
1961 arg
= prefix_filename(prefix
, prefix_length
, arg
);
1963 fd
= open(arg
, O_RDONLY
);
1967 set_default_whitespace_mode(whitespace_option
);
1968 apply_patch(fd
, arg
);
1971 set_default_whitespace_mode(whitespace_option
);
1973 apply_patch(0, "<stdin>");
1974 if (whitespace_error
) {
1975 if (squelch_whitespace_errors
&&
1976 squelch_whitespace_errors
< whitespace_error
) {
1978 whitespace_error
- squelch_whitespace_errors
;
1979 fprintf(stderr
, "warning: squelched %d whitespace error%s\n",
1981 squelched
== 1 ? "" : "s");
1983 if (new_whitespace
== error_on_whitespace
)
1984 die("%d line%s add%s trailing whitespaces.",
1986 whitespace_error
== 1 ? "" : "s",
1987 whitespace_error
== 1 ? "s" : "");
1988 if (applied_after_stripping
)
1989 fprintf(stderr
, "warning: %d line%s applied after"
1990 " stripping trailing whitespaces.\n",
1991 applied_after_stripping
,
1992 applied_after_stripping
== 1 ? "" : "s");
1993 else if (whitespace_error
)
1994 fprintf(stderr
, "warning: %d line%s add%s trailing"
1997 whitespace_error
== 1 ? "" : "s",
1998 whitespace_error
== 1 ? "s" : "");