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] <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
);
79 * For "diff-stat" like behaviour, we keep track of the biggest change
80 * we've seen, and the longest filename. That allows us to do simple
83 static int max_change
, max_len
;
86 * Various "current state", notably line numbers and what
87 * file (and how) we're patching right now.. The "is_xxxx"
88 * things are flags, where -1 means "don't know yet".
90 static int linenr
= 1;
93 unsigned long oldpos
, oldlines
;
94 unsigned long newpos
, newlines
;
97 struct fragment
*next
;
101 char *new_name
, *old_name
, *def_name
;
102 unsigned int old_mode
, new_mode
;
103 int is_rename
, is_copy
, is_new
, is_delete
, is_binary
;
104 int lines_added
, lines_deleted
;
106 struct fragment
*fragments
;
108 unsigned long resultsize
;
109 char old_sha1_prefix
[41];
110 char new_sha1_prefix
[41];
114 #define CHUNKSIZE (8192)
117 static void *read_patch_file(int fd
, unsigned long *sizep
)
119 unsigned long size
= 0, alloc
= CHUNKSIZE
;
120 void *buffer
= xmalloc(alloc
);
123 int nr
= alloc
- size
;
126 buffer
= xrealloc(buffer
, alloc
);
129 nr
= xread(fd
, buffer
+ size
, nr
);
133 die("git-apply: read returned %s", strerror(errno
));
139 * Make sure that we have some slop in the buffer
140 * so that we can do speculative "memcmp" etc, and
141 * see to it that it is NUL-filled.
143 if (alloc
< size
+ SLOP
)
144 buffer
= xrealloc(buffer
, size
+ SLOP
);
145 memset(buffer
+ size
, 0, SLOP
);
149 static unsigned long linelen(const char *buffer
, unsigned long size
)
151 unsigned long len
= 0;
154 if (*buffer
++ == '\n')
160 static int is_dev_null(const char *str
)
162 return !memcmp("/dev/null", str
, 9) && isspace(str
[9]);
168 static int name_terminate(const char *name
, int namelen
, int c
, int terminate
)
170 if (c
== ' ' && !(terminate
& TERM_SPACE
))
172 if (c
== '\t' && !(terminate
& TERM_TAB
))
178 static char * find_name(const char *line
, char *def
, int p_value
, int terminate
)
181 const char *start
= line
;
185 /* Proposed "new-style" GNU patch/diff format; see
186 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
188 name
= unquote_c_style(line
, NULL
);
192 cp
= strchr(name
, '/');
199 /* name can later be freed, so we need
200 * to memmove, not just return cp
202 memmove(name
, cp
, strlen(cp
) + 1);
219 if (name_terminate(start
, line
-start
, c
, terminate
))
223 if (c
== '/' && !--p_value
)
233 * Generally we prefer the shorter name, especially
234 * if the other one is just a variation of that with
235 * something else tacked on to the end (ie "file.orig"
239 int deflen
= strlen(def
);
240 if (deflen
< len
&& !strncmp(start
, def
, deflen
))
244 name
= xmalloc(len
+ 1);
245 memcpy(name
, start
, len
);
252 * Get the name etc info from the --/+++ lines of a traditional patch header
254 * NOTE! This hardcodes "-p1" behaviour in filename detection.
256 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
257 * files, we can happily check the index for a match, but for creating a
258 * new file we should try to match whatever "patch" does. I have no idea.
260 static void parse_traditional_patch(const char *first
, const char *second
, struct patch
*patch
)
264 first
+= 4; // skip "--- "
265 second
+= 4; // skip "+++ "
266 if (is_dev_null(first
)) {
268 patch
->is_delete
= 0;
269 name
= find_name(second
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
270 patch
->new_name
= name
;
271 } else if (is_dev_null(second
)) {
273 patch
->is_delete
= 1;
274 name
= find_name(first
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
275 patch
->old_name
= name
;
277 name
= find_name(first
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
278 name
= find_name(second
, name
, p_value
, TERM_SPACE
| TERM_TAB
);
279 patch
->old_name
= patch
->new_name
= name
;
282 die("unable to find filename in patch at line %d", linenr
);
285 static int gitdiff_hdrend(const char *line
, struct patch
*patch
)
291 * We're anal about diff header consistency, to make
292 * sure that we don't end up having strange ambiguous
293 * patches floating around.
295 * As a result, gitdiff_{old|new}name() will check
296 * their names against any previous information, just
299 static char *gitdiff_verify_name(const char *line
, int isnull
, char *orig_name
, const char *oldnew
)
301 if (!orig_name
&& !isnull
)
302 return find_name(line
, NULL
, 1, 0);
311 die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name
, linenr
);
312 another
= find_name(line
, NULL
, 1, 0);
313 if (!another
|| memcmp(another
, name
, len
))
314 die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew
, linenr
);
319 /* expect "/dev/null" */
320 if (memcmp("/dev/null", line
, 9) || line
[9] != '\n')
321 die("git-apply: bad git-diff - expected /dev/null on line %d", linenr
);
326 static int gitdiff_oldname(const char *line
, struct patch
*patch
)
328 patch
->old_name
= gitdiff_verify_name(line
, patch
->is_new
, patch
->old_name
, "old");
332 static int gitdiff_newname(const char *line
, struct patch
*patch
)
334 patch
->new_name
= gitdiff_verify_name(line
, patch
->is_delete
, patch
->new_name
, "new");
338 static int gitdiff_oldmode(const char *line
, struct patch
*patch
)
340 patch
->old_mode
= strtoul(line
, NULL
, 8);
344 static int gitdiff_newmode(const char *line
, struct patch
*patch
)
346 patch
->new_mode
= strtoul(line
, NULL
, 8);
350 static int gitdiff_delete(const char *line
, struct patch
*patch
)
352 patch
->is_delete
= 1;
353 patch
->old_name
= patch
->def_name
;
354 return gitdiff_oldmode(line
, patch
);
357 static int gitdiff_newfile(const char *line
, struct patch
*patch
)
360 patch
->new_name
= patch
->def_name
;
361 return gitdiff_newmode(line
, patch
);
364 static int gitdiff_copysrc(const char *line
, struct patch
*patch
)
367 patch
->old_name
= find_name(line
, NULL
, 0, 0);
371 static int gitdiff_copydst(const char *line
, struct patch
*patch
)
374 patch
->new_name
= find_name(line
, NULL
, 0, 0);
378 static int gitdiff_renamesrc(const char *line
, struct patch
*patch
)
380 patch
->is_rename
= 1;
381 patch
->old_name
= find_name(line
, NULL
, 0, 0);
385 static int gitdiff_renamedst(const char *line
, struct patch
*patch
)
387 patch
->is_rename
= 1;
388 patch
->new_name
= find_name(line
, NULL
, 0, 0);
392 static int gitdiff_similarity(const char *line
, struct patch
*patch
)
394 if ((patch
->score
= strtoul(line
, NULL
, 10)) == ULONG_MAX
)
399 static int gitdiff_dissimilarity(const char *line
, struct patch
*patch
)
401 if ((patch
->score
= strtoul(line
, NULL
, 10)) == ULONG_MAX
)
406 static int gitdiff_index(const char *line
, struct patch
*patch
)
408 /* index line is N hexadecimal, "..", N hexadecimal,
409 * and optional space with octal mode.
411 const char *ptr
, *eol
;
414 ptr
= strchr(line
, '.');
415 if (!ptr
|| ptr
[1] != '.' || 40 < ptr
- line
)
418 memcpy(patch
->old_sha1_prefix
, line
, len
);
419 patch
->old_sha1_prefix
[len
] = 0;
422 ptr
= strchr(line
, ' ');
423 eol
= strchr(line
, '\n');
425 if (!ptr
|| eol
< ptr
)
431 memcpy(patch
->new_sha1_prefix
, line
, len
);
432 patch
->new_sha1_prefix
[len
] = 0;
434 patch
->new_mode
= patch
->old_mode
= strtoul(ptr
+1, NULL
, 8);
439 * This is normal for a diff that doesn't change anything: we'll fall through
440 * into the next diff. Tell the parser to break out.
442 static int gitdiff_unrecognized(const char *line
, struct patch
*patch
)
447 static const char *stop_at_slash(const char *line
, int llen
)
451 for (i
= 0; i
< llen
; i
++) {
459 /* This is to extract the same name that appears on "diff --git"
460 * line. We do not find and return anything if it is a rename
461 * patch, and it is OK because we will find the name elsewhere.
462 * We need to reliably find name only when it is mode-change only,
463 * creation or deletion of an empty file. In any of these cases,
464 * both sides are the same name under a/ and b/ respectively.
466 static char *git_header_name(char *line
, int llen
)
470 const char *second
= NULL
;
472 line
+= strlen("diff --git ");
473 llen
-= strlen("diff --git ");
477 char *first
= unquote_c_style(line
, &second
);
481 /* advance to the first slash */
482 cp
= stop_at_slash(first
, strlen(first
));
483 if (!cp
|| cp
== first
) {
484 /* we do not accept absolute paths */
490 memmove(first
, cp
+1, len
+1); /* including NUL */
492 /* second points at one past closing dq of name.
493 * find the second name.
495 while ((second
< line
+ llen
) && isspace(*second
))
498 if (line
+ llen
<= second
)
499 goto free_first_and_fail
;
500 if (*second
== '"') {
501 char *sp
= unquote_c_style(second
, NULL
);
503 goto free_first_and_fail
;
504 cp
= stop_at_slash(sp
, strlen(sp
));
505 if (!cp
|| cp
== sp
) {
508 goto free_first_and_fail
;
510 /* They must match, otherwise ignore */
511 if (strcmp(cp
+1, first
))
512 goto free_both_and_fail
;
517 /* unquoted second */
518 cp
= stop_at_slash(second
, line
+ llen
- second
);
519 if (!cp
|| cp
== second
)
520 goto free_first_and_fail
;
522 if (line
+ llen
- cp
!= len
+ 1 ||
523 memcmp(first
, cp
, len
))
524 goto free_first_and_fail
;
528 /* unquoted first name */
529 name
= stop_at_slash(line
, llen
);
530 if (!name
|| name
== line
)
535 /* since the first name is unquoted, a dq if exists must be
536 * the beginning of the second name.
538 for (second
= name
; second
< line
+ llen
; second
++) {
539 if (*second
== '"') {
540 const char *cp
= second
;
542 char *sp
= unquote_c_style(second
, NULL
);
546 np
= stop_at_slash(sp
, strlen(sp
));
547 if (!np
|| np
== sp
) {
548 free_second_and_fail
:
554 if (len
< cp
- name
&&
555 !strncmp(np
, name
, len
) &&
556 isspace(name
[len
])) {
558 memmove(sp
, np
, len
+ 1);
561 goto free_second_and_fail
;
566 * Accept a name only if it shows up twice, exactly the same
569 for (len
= 0 ; ; len
++) {
586 if (second
[len
] == '\n' && !memcmp(name
, second
, len
)) {
587 char *ret
= xmalloc(len
+ 1);
588 memcpy(ret
, name
, len
);
597 /* Verify that we recognize the lines following a git header */
598 static int parse_git_header(char *line
, int len
, unsigned int size
, struct patch
*patch
)
600 unsigned long offset
;
602 /* A git diff has explicit new/delete information, so we don't guess */
604 patch
->is_delete
= 0;
607 * Some things may not have the old name in the
608 * rest of the headers anywhere (pure mode changes,
609 * or removing or adding empty files), so we get
610 * the default name from the header.
612 patch
->def_name
= git_header_name(line
, len
);
617 for (offset
= len
; size
> 0 ; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
618 static const struct opentry
{
620 int (*fn
)(const char *, struct patch
*);
622 { "@@ -", gitdiff_hdrend
},
623 { "--- ", gitdiff_oldname
},
624 { "+++ ", gitdiff_newname
},
625 { "old mode ", gitdiff_oldmode
},
626 { "new mode ", gitdiff_newmode
},
627 { "deleted file mode ", gitdiff_delete
},
628 { "new file mode ", gitdiff_newfile
},
629 { "copy from ", gitdiff_copysrc
},
630 { "copy to ", gitdiff_copydst
},
631 { "rename old ", gitdiff_renamesrc
},
632 { "rename new ", gitdiff_renamedst
},
633 { "rename from ", gitdiff_renamesrc
},
634 { "rename to ", gitdiff_renamedst
},
635 { "similarity index ", gitdiff_similarity
},
636 { "dissimilarity index ", gitdiff_dissimilarity
},
637 { "index ", gitdiff_index
},
638 { "", gitdiff_unrecognized
},
642 len
= linelen(line
, size
);
643 if (!len
|| line
[len
-1] != '\n')
645 for (i
= 0; i
< sizeof(optable
) / sizeof(optable
[0]); i
++) {
646 const struct opentry
*p
= optable
+ i
;
647 int oplen
= strlen(p
->str
);
648 if (len
< oplen
|| memcmp(p
->str
, line
, oplen
))
650 if (p
->fn(line
+ oplen
, patch
) < 0)
659 static int parse_num(const char *line
, unsigned long *p
)
665 *p
= strtoul(line
, &ptr
, 10);
669 static int parse_range(const char *line
, int len
, int offset
, const char *expect
,
670 unsigned long *p1
, unsigned long *p2
)
674 if (offset
< 0 || offset
>= len
)
679 digits
= parse_num(line
, p1
);
689 digits
= parse_num(line
+1, p2
);
701 if (memcmp(line
, expect
, ex
))
708 * Parse a unified diff fragment header of the
709 * form "@@ -a,b +c,d @@"
711 static int parse_fragment_header(char *line
, int len
, struct fragment
*fragment
)
715 if (!len
|| line
[len
-1] != '\n')
718 /* Figure out the number of lines in a fragment */
719 offset
= parse_range(line
, len
, 4, " +", &fragment
->oldpos
, &fragment
->oldlines
);
720 offset
= parse_range(line
, len
, offset
, " @@", &fragment
->newpos
, &fragment
->newlines
);
725 static int find_header(char *line
, unsigned long size
, int *hdrsize
, struct patch
*patch
)
727 unsigned long offset
, len
;
729 patch
->is_rename
= patch
->is_copy
= 0;
730 patch
->is_new
= patch
->is_delete
= -1;
731 patch
->old_mode
= patch
->new_mode
= 0;
732 patch
->old_name
= patch
->new_name
= NULL
;
733 for (offset
= 0; size
> 0; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
734 unsigned long nextlen
;
736 len
= linelen(line
, size
);
740 /* Testing this early allows us to take a few shortcuts.. */
745 * Make sure we don't find any unconnected patch fragmants.
746 * That's a sign that we didn't find a header, and that a
747 * patch has become corrupted/broken up.
749 if (!memcmp("@@ -", line
, 4)) {
750 struct fragment dummy
;
751 if (parse_fragment_header(line
, len
, &dummy
) < 0)
753 error("patch fragment without header at line %d: %.*s", linenr
, (int)len
-1, line
);
760 * Git patch? It might not have a real patch, just a rename
761 * or mode change, so we handle that specially
763 if (!memcmp("diff --git ", line
, 11)) {
764 int git_hdr_len
= parse_git_header(line
, len
, size
, patch
);
765 if (git_hdr_len
<= len
)
767 if (!patch
->old_name
&& !patch
->new_name
) {
768 if (!patch
->def_name
)
769 die("git diff header lacks filename information (line %d)", linenr
);
770 patch
->old_name
= patch
->new_name
= patch
->def_name
;
772 *hdrsize
= git_hdr_len
;
776 /** --- followed by +++ ? */
777 if (memcmp("--- ", line
, 4) || memcmp("+++ ", line
+ len
, 4))
781 * We only accept unified patches, so we want it to
782 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
785 nextlen
= linelen(line
+ len
, size
- len
);
786 if (size
< nextlen
+ 14 || memcmp("@@ -", line
+ len
+ nextlen
, 4))
789 /* Ok, we'll consider it a patch */
790 parse_traditional_patch(line
, line
+len
, patch
);
791 *hdrsize
= len
+ nextlen
;
799 * Parse a unified diff. Note that this really needs
800 * to parse each fragment separately, since the only
801 * way to know the difference between a "---" that is
802 * part of a patch, and a "---" that starts the next
803 * patch is to look at the line counts..
805 static int parse_fragment(char *line
, unsigned long size
, struct patch
*patch
, struct fragment
*fragment
)
808 int len
= linelen(line
, size
), offset
;
809 unsigned long oldlines
, newlines
;
811 offset
= parse_fragment_header(line
, len
, fragment
);
814 oldlines
= fragment
->oldlines
;
815 newlines
= fragment
->newlines
;
817 if (patch
->is_new
< 0) {
818 patch
->is_new
= !oldlines
;
820 patch
->old_name
= NULL
;
822 if (patch
->is_delete
< 0) {
823 patch
->is_delete
= !newlines
;
825 patch
->new_name
= NULL
;
828 if (patch
->is_new
!= !oldlines
)
829 return error("new file depends on old contents");
830 if (patch
->is_delete
!= !newlines
) {
832 return error("deleted file still has contents");
833 fprintf(stderr
, "** warning: file %s becomes empty but is not deleted\n", patch
->new_name
);
836 /* Parse the thing.. */
841 for (offset
= len
; size
> 0; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
842 if (!oldlines
&& !newlines
)
844 len
= linelen(line
, size
);
845 if (!len
|| line
[len
-1] != '\n')
860 * We know len is at least two, since we have a '+' and
861 * we checked that the last character was a '\n' above.
862 * That is, an addition of an empty line would check
863 * the '+' here. Sneaky...
865 if ((new_whitespace
!= nowarn_whitespace
) &&
866 isspace(line
[len
-2])) {
868 if (squelch_whitespace_errors
&&
869 squelch_whitespace_errors
<
873 fprintf(stderr
, "Adds trailing whitespace.\n%s:%d:%.*s\n",
875 linenr
, len
-2, line
+1);
882 /* We allow "\ No newline at end of file". Depending
883 * on locale settings when the patch was produced we
884 * don't know what this line looks like. The only
885 * thing we do know is that it begins with "\ ".
886 * Checking for 12 is just for sanity check -- any
887 * l10n of "\ No newline..." is at least that long.
890 if (len
< 12 || memcmp(line
, "\\ ", 2))
895 /* If a fragment ends with an incomplete line, we failed to include
896 * it in the above loop because we hit oldlines == newlines == 0
899 if (12 < size
&& !memcmp(line
, "\\ ", 2))
900 offset
+= linelen(line
, size
);
902 patch
->lines_added
+= added
;
903 patch
->lines_deleted
+= deleted
;
907 static int parse_single_patch(char *line
, unsigned long size
, struct patch
*patch
)
909 unsigned long offset
= 0;
910 struct fragment
**fragp
= &patch
->fragments
;
912 while (size
> 4 && !memcmp(line
, "@@ -", 4)) {
913 struct fragment
*fragment
;
916 fragment
= xmalloc(sizeof(*fragment
));
917 memset(fragment
, 0, sizeof(*fragment
));
918 len
= parse_fragment(line
, size
, patch
, fragment
);
920 die("corrupt patch at line %d", linenr
);
922 fragment
->patch
= line
;
923 fragment
->size
= len
;
926 fragp
= &fragment
->next
;
935 static inline int metadata_changes(struct patch
*patch
)
937 return patch
->is_rename
> 0 ||
938 patch
->is_copy
> 0 ||
941 (patch
->old_mode
&& patch
->new_mode
&&
942 patch
->old_mode
!= patch
->new_mode
);
945 static int parse_chunk(char *buffer
, unsigned long size
, struct patch
*patch
)
947 int hdrsize
, patchsize
;
948 int offset
= find_header(buffer
, size
, &hdrsize
, patch
);
953 patchsize
= parse_single_patch(buffer
+ offset
+ hdrsize
, size
- offset
- hdrsize
, patch
);
956 static const char *binhdr
[] = {
962 int hd
= hdrsize
+ offset
;
963 unsigned long llen
= linelen(buffer
+ hd
, size
- hd
);
965 if (!memcmp(" differ\n", buffer
+ hd
+ llen
- 8, 8))
966 for (i
= 0; binhdr
[i
]; i
++) {
967 int len
= strlen(binhdr
[i
]);
968 if (len
< size
- hd
&&
969 !memcmp(binhdr
[i
], buffer
+ hd
, len
)) {
970 patch
->is_binary
= 1;
975 /* Empty patch cannot be applied if:
976 * - it is a binary patch and we do not do binary_replace, or
977 * - text patch without metadata change
979 if ((apply
|| check
) &&
981 ? !allow_binary_replacement
982 : !metadata_changes(patch
)))
983 die("patch with only garbage at line %d", linenr
);
986 return offset
+ hdrsize
+ patchsize
;
989 static const char pluses
[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
990 static const char minuses
[]= "----------------------------------------------------------------------";
992 static void show_stats(struct patch
*patch
)
994 const char *prefix
= "";
995 char *name
= patch
->new_name
;
997 int len
, max
, add
, del
, total
;
1000 name
= patch
->old_name
;
1002 if (0 < (len
= quote_c_style(name
, NULL
, NULL
, 0))) {
1003 qname
= xmalloc(len
+ 1);
1004 quote_c_style(name
, qname
, NULL
, 0);
1009 * "scale" the filename
1020 slash
= strchr(name
, '/');
1027 * scale the add/delete
1033 add
= patch
->lines_added
;
1034 del
= patch
->lines_deleted
;
1037 if (max_change
> 0) {
1038 total
= (total
* max
+ max_change
/ 2) / max_change
;
1039 add
= (add
* max
+ max_change
/ 2) / max_change
;
1042 if (patch
->is_binary
)
1043 printf(" %s%-*s | Bin\n", prefix
, len
, name
);
1045 printf(" %s%-*s |%5d %.*s%.*s\n", prefix
,
1046 len
, name
, patch
->lines_added
+ patch
->lines_deleted
,
1047 add
, pluses
, del
, minuses
);
1052 static int read_old_data(struct stat
*st
, const char *path
, void *buf
, unsigned long size
)
1057 switch (st
->st_mode
& S_IFMT
) {
1059 return readlink(path
, buf
, size
);
1061 fd
= open(path
, O_RDONLY
);
1063 return error("unable to open %s", path
);
1066 int ret
= xread(fd
, buf
+ got
, size
- got
);
1079 static int find_offset(const char *buf
, unsigned long size
, const char *fragment
, unsigned long fragsize
, int line
)
1082 unsigned long start
, backwards
, forwards
;
1084 if (fragsize
> size
)
1089 unsigned long offset
= 0;
1091 while (offset
+ fragsize
<= size
) {
1092 if (buf
[offset
++] == '\n') {
1100 /* Exact line number? */
1101 if (!memcmp(buf
+ start
, fragment
, fragsize
))
1105 * There's probably some smart way to do this, but I'll leave
1106 * that to the smart and beautiful people. I'm simple and stupid.
1110 for (i
= 0; ; i
++) {
1117 if (forwards
+ fragsize
> size
)
1123 } while (backwards
&& buf
[backwards
-1] != '\n');
1126 while (forwards
+ fragsize
<= size
) {
1127 if (buf
[forwards
++] == '\n')
1133 if (try + fragsize
> size
)
1135 if (memcmp(buf
+ try, fragment
, fragsize
))
1144 * We should start searching forward and backward.
1149 struct buffer_desc
{
1152 unsigned long alloc
;
1155 static int apply_line(char *output
, const char *patch
, int plen
)
1157 /* plen is number of bytes to be copied from patch,
1158 * starting at patch+1 (patch[0] is '+'). Typically
1159 * patch[plen] is '\n'.
1161 int add_nl_to_tail
= 0;
1162 if ((new_whitespace
== strip_whitespace
) &&
1163 1 < plen
&& isspace(patch
[plen
-1])) {
1164 if (patch
[plen
] == '\n')
1167 while (0 < plen
&& isspace(patch
[plen
]))
1169 applied_after_stripping
++;
1171 memcpy(output
, patch
+ 1, plen
);
1173 output
[plen
++] = '\n';
1177 static int apply_one_fragment(struct buffer_desc
*desc
, struct fragment
*frag
)
1179 char *buf
= desc
->buffer
;
1180 const char *patch
= frag
->patch
;
1181 int offset
, size
= frag
->size
;
1182 char *old
= xmalloc(size
);
1183 char *new = xmalloc(size
);
1184 int oldsize
= 0, newsize
= 0;
1187 int len
= linelen(patch
, size
);
1194 * "plen" is how much of the line we should use for
1195 * the actual patch data. Normally we just remove the
1196 * first character on the line, but if the line is
1197 * followed by "\ No newline", then we also remove the
1198 * last one (which is the newline, of course).
1201 if (len
< size
&& patch
[len
] == '\\')
1206 memcpy(old
+ oldsize
, patch
+ 1, plen
);
1210 /* Fall-through for ' ' */
1212 if (*patch
!= '+' || !no_add
)
1213 newsize
+= apply_line(new + newsize
, patch
,
1216 case '@': case '\\':
1217 /* Ignore it, we already handled it */
1226 #ifdef NO_ACCURATE_DIFF
1227 if (oldsize
> 0 && old
[oldsize
- 1] == '\n' &&
1228 newsize
> 0 && new[newsize
- 1] == '\n') {
1234 offset
= find_offset(buf
, desc
->size
, old
, oldsize
, frag
->newpos
);
1236 int diff
= newsize
- oldsize
;
1237 unsigned long size
= desc
->size
+ diff
;
1238 unsigned long alloc
= desc
->alloc
;
1241 alloc
= size
+ 8192;
1242 desc
->alloc
= alloc
;
1243 buf
= xrealloc(buf
, alloc
);
1247 memmove(buf
+ offset
+ newsize
, buf
+ offset
+ oldsize
, size
- offset
- newsize
);
1248 memcpy(buf
+ offset
, new, newsize
);
1257 static int apply_fragments(struct buffer_desc
*desc
, struct patch
*patch
)
1259 struct fragment
*frag
= patch
->fragments
;
1260 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
1262 if (patch
->is_binary
) {
1263 unsigned char sha1
[20];
1265 if (!allow_binary_replacement
)
1266 return error("cannot apply binary patch to '%s' "
1267 "without --allow-binary-replacement",
1270 /* For safety, we require patch index line to contain
1271 * full 40-byte textual SHA1 for old and new, at least for now.
1273 if (strlen(patch
->old_sha1_prefix
) != 40 ||
1274 strlen(patch
->new_sha1_prefix
) != 40 ||
1275 get_sha1_hex(patch
->old_sha1_prefix
, sha1
) ||
1276 get_sha1_hex(patch
->new_sha1_prefix
, sha1
))
1277 return error("cannot apply binary patch to '%s' "
1278 "without full index line", name
);
1280 if (patch
->old_name
) {
1281 unsigned char hdr
[50];
1284 /* See if the old one matches what the patch
1287 write_sha1_file_prepare(desc
->buffer
, desc
->size
,
1288 "blob", sha1
, hdr
, &hdrlen
);
1289 if (strcmp(sha1_to_hex(sha1
), patch
->old_sha1_prefix
))
1290 return error("the patch applies to '%s' (%s), "
1291 "which does not match the "
1292 "current contents.",
1293 name
, sha1_to_hex(sha1
));
1296 /* Otherwise, the old one must be empty. */
1298 return error("the patch applies to an empty "
1299 "'%s' but it is not empty", name
);
1302 /* For now, we do not record post-image data in the patch,
1303 * and require the object already present in the recipient's
1308 desc
->alloc
= desc
->size
= 0;
1310 get_sha1_hex(patch
->new_sha1_prefix
, sha1
);
1312 if (memcmp(sha1
, null_sha1
, 20)) {
1316 desc
->buffer
= read_sha1_file(sha1
, type
, &size
);
1318 return error("the necessary postimage %s for "
1319 "'%s' does not exist",
1320 patch
->new_sha1_prefix
, name
);
1321 desc
->alloc
= desc
->size
= size
;
1328 if (apply_one_fragment(desc
, frag
) < 0)
1329 return error("patch failed: %s:%ld",
1330 name
, frag
->oldpos
);
1336 static int apply_data(struct patch
*patch
, struct stat
*st
)
1339 unsigned long size
, alloc
;
1340 struct buffer_desc desc
;
1345 if (patch
->old_name
) {
1347 alloc
= size
+ 8192;
1348 buf
= xmalloc(alloc
);
1349 if (read_old_data(st
, patch
->old_name
, buf
, alloc
) != size
)
1350 return error("read of %s failed", patch
->old_name
);
1356 if (apply_fragments(&desc
, patch
) < 0)
1358 patch
->result
= desc
.buffer
;
1359 patch
->resultsize
= desc
.size
;
1361 if (patch
->is_delete
&& patch
->resultsize
)
1362 return error("removal patch leaves file contents");
1367 static int check_patch(struct patch
*patch
)
1370 const char *old_name
= patch
->old_name
;
1371 const char *new_name
= patch
->new_name
;
1372 const char *name
= old_name
? old_name
: new_name
;
1376 int stat_ret
= lstat(old_name
, &st
);
1379 int pos
= cache_name_pos(old_name
, strlen(old_name
));
1381 return error("%s: does not exist in index",
1384 struct checkout costate
;
1385 if (errno
!= ENOENT
)
1386 return error("%s: %s", old_name
,
1389 costate
.base_dir
= "";
1390 costate
.base_dir_len
= 0;
1393 costate
.not_new
= 0;
1394 costate
.refresh_cache
= 1;
1395 if (checkout_entry(active_cache
[pos
],
1397 lstat(old_name
, &st
))
1401 changed
= ce_match_stat(active_cache
[pos
], &st
, 1);
1403 return error("%s: does not match index",
1406 else if (stat_ret
< 0)
1407 return error("%s: %s", old_name
, strerror(errno
));
1409 if (patch
->is_new
< 0)
1411 st
.st_mode
= ntohl(create_ce_mode(st
.st_mode
));
1412 if (!patch
->old_mode
)
1413 patch
->old_mode
= st
.st_mode
;
1414 if ((st
.st_mode
^ patch
->old_mode
) & S_IFMT
)
1415 return error("%s: wrong type", old_name
);
1416 if (st
.st_mode
!= patch
->old_mode
)
1417 fprintf(stderr
, "warning: %s has type %o, expected %o\n",
1418 old_name
, st
.st_mode
, patch
->old_mode
);
1421 if (new_name
&& (patch
->is_new
| patch
->is_rename
| patch
->is_copy
)) {
1422 if (check_index
&& cache_name_pos(new_name
, strlen(new_name
)) >= 0)
1423 return error("%s: already exists in index", new_name
);
1424 if (!lstat(new_name
, &st
))
1425 return error("%s: already exists in working directory", new_name
);
1426 if (errno
!= ENOENT
)
1427 return error("%s: %s", new_name
, strerror(errno
));
1428 if (!patch
->new_mode
) {
1430 patch
->new_mode
= S_IFREG
| 0644;
1432 patch
->new_mode
= patch
->old_mode
;
1436 if (new_name
&& old_name
) {
1437 int same
= !strcmp(old_name
, new_name
);
1438 if (!patch
->new_mode
)
1439 patch
->new_mode
= patch
->old_mode
;
1440 if ((patch
->old_mode
^ patch
->new_mode
) & S_IFMT
)
1441 return error("new mode (%o) of %s does not match old mode (%o)%s%s",
1442 patch
->new_mode
, new_name
, patch
->old_mode
,
1443 same
? "" : " of ", same
? "" : old_name
);
1446 if (apply_data(patch
, &st
) < 0)
1447 return error("%s: patch does not apply", name
);
1451 static int check_patch_list(struct patch
*patch
)
1455 for (;patch
; patch
= patch
->next
)
1456 error
|= check_patch(patch
);
1460 static inline int is_null_sha1(const unsigned char *sha1
)
1462 return !memcmp(sha1
, null_sha1
, 20);
1465 static void show_index_list(struct patch
*list
)
1467 struct patch
*patch
;
1469 /* Once we start supporting the reverse patch, it may be
1470 * worth showing the new sha1 prefix, but until then...
1472 for (patch
= list
; patch
; patch
= patch
->next
) {
1473 const unsigned char *sha1_ptr
;
1474 unsigned char sha1
[20];
1477 name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
1479 sha1_ptr
= null_sha1
;
1480 else if (get_sha1(patch
->old_sha1_prefix
, sha1
))
1481 die("sha1 information is lacking or useless (%s).",
1486 printf("%06o %s ",patch
->old_mode
, sha1_to_hex(sha1_ptr
));
1487 if (line_termination
&& quote_c_style(name
, NULL
, NULL
, 0))
1488 quote_c_style(name
, NULL
, stdout
, 0);
1490 fputs(name
, stdout
);
1491 putchar(line_termination
);
1495 static void stat_patch_list(struct patch
*patch
)
1497 int files
, adds
, dels
;
1499 for (files
= adds
= dels
= 0 ; patch
; patch
= patch
->next
) {
1501 adds
+= patch
->lines_added
;
1502 dels
+= patch
->lines_deleted
;
1506 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files
, adds
, dels
);
1509 static void numstat_patch_list(struct patch
*patch
)
1511 for ( ; patch
; patch
= patch
->next
) {
1513 name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
1514 printf("%d\t%d\t", patch
->lines_added
, patch
->lines_deleted
);
1515 if (line_termination
&& quote_c_style(name
, NULL
, NULL
, 0))
1516 quote_c_style(name
, NULL
, stdout
, 0);
1518 fputs(name
, stdout
);
1523 static void show_file_mode_name(const char *newdelete
, unsigned int mode
, const char *name
)
1526 printf(" %s mode %06o %s\n", newdelete
, mode
, name
);
1528 printf(" %s %s\n", newdelete
, name
);
1531 static void show_mode_change(struct patch
*p
, int show_name
)
1533 if (p
->old_mode
&& p
->new_mode
&& p
->old_mode
!= p
->new_mode
) {
1535 printf(" mode change %06o => %06o %s\n",
1536 p
->old_mode
, p
->new_mode
, p
->new_name
);
1538 printf(" mode change %06o => %06o\n",
1539 p
->old_mode
, p
->new_mode
);
1543 static void show_rename_copy(struct patch
*p
)
1545 const char *renamecopy
= p
->is_rename
? "rename" : "copy";
1546 const char *old
, *new;
1548 /* Find common prefix */
1552 const char *slash_old
, *slash_new
;
1553 slash_old
= strchr(old
, '/');
1554 slash_new
= strchr(new, '/');
1557 slash_old
- old
!= slash_new
- new ||
1558 memcmp(old
, new, slash_new
- new))
1560 old
= slash_old
+ 1;
1561 new = slash_new
+ 1;
1563 /* p->old_name thru old is the common prefix, and old and new
1564 * through the end of names are renames
1566 if (old
!= p
->old_name
)
1567 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy
,
1568 (int)(old
- p
->old_name
), p
->old_name
,
1569 old
, new, p
->score
);
1571 printf(" %s %s => %s (%d%%)\n", renamecopy
,
1572 p
->old_name
, p
->new_name
, p
->score
);
1573 show_mode_change(p
, 0);
1576 static void summary_patch_list(struct patch
*patch
)
1580 for (p
= patch
; p
; p
= p
->next
) {
1582 show_file_mode_name("create", p
->new_mode
, p
->new_name
);
1583 else if (p
->is_delete
)
1584 show_file_mode_name("delete", p
->old_mode
, p
->old_name
);
1586 if (p
->is_rename
|| p
->is_copy
)
1587 show_rename_copy(p
);
1590 printf(" rewrite %s (%d%%)\n",
1591 p
->new_name
, p
->score
);
1592 show_mode_change(p
, 0);
1595 show_mode_change(p
, 1);
1601 static void patch_stats(struct patch
*patch
)
1603 int lines
= patch
->lines_added
+ patch
->lines_deleted
;
1605 if (lines
> max_change
)
1607 if (patch
->old_name
) {
1608 int len
= quote_c_style(patch
->old_name
, NULL
, NULL
, 0);
1610 len
= strlen(patch
->old_name
);
1614 if (patch
->new_name
) {
1615 int len
= quote_c_style(patch
->new_name
, NULL
, NULL
, 0);
1617 len
= strlen(patch
->new_name
);
1623 static void remove_file(struct patch
*patch
)
1626 if (remove_file_from_cache(patch
->old_name
) < 0)
1627 die("unable to remove %s from index", patch
->old_name
);
1629 unlink(patch
->old_name
);
1632 static void add_index_file(const char *path
, unsigned mode
, void *buf
, unsigned long size
)
1635 struct cache_entry
*ce
;
1636 int namelen
= strlen(path
);
1637 unsigned ce_size
= cache_entry_size(namelen
);
1642 ce
= xmalloc(ce_size
);
1643 memset(ce
, 0, ce_size
);
1644 memcpy(ce
->name
, path
, namelen
);
1645 ce
->ce_mode
= create_ce_mode(mode
);
1646 ce
->ce_flags
= htons(namelen
);
1647 if (lstat(path
, &st
) < 0)
1648 die("unable to stat newly created file %s", path
);
1649 fill_stat_cache_info(ce
, &st
);
1650 if (write_sha1_file(buf
, size
, "blob", ce
->sha1
) < 0)
1651 die("unable to create backing store for newly created file %s", path
);
1652 if (add_cache_entry(ce
, ADD_CACHE_OK_TO_ADD
) < 0)
1653 die("unable to add cache entry for %s", path
);
1656 static int try_create_file(const char *path
, unsigned int mode
, const char *buf
, unsigned long size
)
1661 return symlink(buf
, path
);
1662 fd
= open(path
, O_CREAT
| O_EXCL
| O_WRONLY
, (mode
& 0100) ? 0777 : 0666);
1666 int written
= xwrite(fd
, buf
, size
);
1668 die("writing file %s: %s", path
, strerror(errno
));
1670 die("out of space writing file %s", path
);
1675 die("closing file %s: %s", path
, strerror(errno
));
1680 * We optimistically assume that the directories exist,
1681 * which is true 99% of the time anyway. If they don't,
1682 * we create them and try again.
1684 static void create_one_file(char *path
, unsigned mode
, const char *buf
, unsigned long size
)
1686 if (!try_create_file(path
, mode
, buf
, size
))
1689 if (errno
== ENOENT
) {
1690 if (safe_create_leading_directories(path
))
1692 if (!try_create_file(path
, mode
, buf
, size
))
1696 if (errno
== EEXIST
) {
1697 unsigned int nr
= getpid();
1700 const char *newpath
;
1701 newpath
= mkpath("%s~%u", path
, nr
);
1702 if (!try_create_file(newpath
, mode
, buf
, size
)) {
1703 if (!rename(newpath
, path
))
1708 if (errno
!= EEXIST
)
1713 die("unable to write file %s mode %o", path
, mode
);
1716 static void create_file(struct patch
*patch
)
1718 char *path
= patch
->new_name
;
1719 unsigned mode
= patch
->new_mode
;
1720 unsigned long size
= patch
->resultsize
;
1721 char *buf
= patch
->result
;
1724 mode
= S_IFREG
| 0644;
1725 create_one_file(path
, mode
, buf
, size
);
1726 add_index_file(path
, mode
, buf
, size
);
1729 static void write_out_one_result(struct patch
*patch
)
1731 if (patch
->is_delete
> 0) {
1735 if (patch
->is_new
> 0 || patch
->is_copy
) {
1740 * Rename or modification boils down to the same
1741 * thing: remove the old, write the new
1747 static void write_out_results(struct patch
*list
, int skipped_patch
)
1749 if (!list
&& !skipped_patch
)
1753 write_out_one_result(list
);
1758 static struct cache_file cache_file
;
1760 static struct excludes
{
1761 struct excludes
*next
;
1765 static int use_patch(struct patch
*p
)
1767 const char *pathname
= p
->new_name
? p
->new_name
: p
->old_name
;
1768 struct excludes
*x
= excludes
;
1770 if (fnmatch(x
->path
, pathname
, 0) == 0)
1774 if (0 < prefix_length
) {
1775 int pathlen
= strlen(pathname
);
1776 if (pathlen
<= prefix_length
||
1777 memcmp(prefix
, pathname
, prefix_length
))
1783 static int apply_patch(int fd
, const char *filename
)
1786 unsigned long offset
, size
;
1787 char *buffer
= read_patch_file(fd
, &size
);
1788 struct patch
*list
= NULL
, **listp
= &list
;
1789 int skipped_patch
= 0;
1791 patch_input_file
= filename
;
1796 struct patch
*patch
;
1799 patch
= xmalloc(sizeof(*patch
));
1800 memset(patch
, 0, sizeof(*patch
));
1801 nr
= parse_chunk(buffer
+ offset
, size
, patch
);
1804 if (use_patch(patch
)) {
1807 listp
= &patch
->next
;
1809 /* perhaps free it a bit better? */
1818 if (whitespace_error
&& (new_whitespace
== error_on_whitespace
))
1821 write_index
= check_index
&& apply
;
1823 newfd
= hold_index_file_for_update(&cache_file
, get_index_file());
1825 if (read_cache() < 0)
1826 die("unable to read index file");
1829 if ((check
|| apply
) && check_patch_list(list
) < 0)
1833 write_out_results(list
, skipped_patch
);
1836 if (write_cache(newfd
, active_cache
, active_nr
) ||
1837 commit_index_file(&cache_file
))
1838 die("Unable to write new cachefile");
1841 if (show_index_info
)
1842 show_index_list(list
);
1845 stat_patch_list(list
);
1848 numstat_patch_list(list
);
1851 summary_patch_list(list
);
1857 static int git_apply_config(const char *var
, const char *value
)
1859 if (!strcmp(var
, "apply.whitespace")) {
1860 apply_default_whitespace
= strdup(value
);
1863 return git_default_config(var
, value
);
1867 int main(int argc
, char **argv
)
1871 const char *whitespace_option
= NULL
;
1873 for (i
= 1; i
< argc
; i
++) {
1874 const char *arg
= argv
[i
];
1877 if (!strcmp(arg
, "-")) {
1878 apply_patch(0, "<stdin>");
1882 if (!strncmp(arg
, "--exclude=", 10)) {
1883 struct excludes
*x
= xmalloc(sizeof(*x
));
1889 if (!strncmp(arg
, "-p", 2)) {
1890 p_value
= atoi(arg
+ 2);
1893 if (!strcmp(arg
, "--no-add")) {
1897 if (!strcmp(arg
, "--stat")) {
1902 if (!strcmp(arg
, "--allow-binary-replacement")) {
1903 allow_binary_replacement
= 1;
1906 if (!strcmp(arg
, "--numstat")) {
1911 if (!strcmp(arg
, "--summary")) {
1916 if (!strcmp(arg
, "--check")) {
1921 if (!strcmp(arg
, "--index")) {
1925 if (!strcmp(arg
, "--apply")) {
1929 if (!strcmp(arg
, "--index-info")) {
1931 show_index_info
= 1;
1934 if (!strcmp(arg
, "-z")) {
1935 line_termination
= 0;
1938 if (!strncmp(arg
, "--whitespace=", 13)) {
1939 whitespace_option
= arg
+ 13;
1940 parse_whitespace_option(arg
+ 13);
1944 if (check_index
&& prefix_length
< 0) {
1945 prefix
= setup_git_directory();
1946 prefix_length
= prefix
? strlen(prefix
) : 0;
1947 git_config(git_apply_config
);
1948 if (!whitespace_option
&& apply_default_whitespace
)
1949 parse_whitespace_option(apply_default_whitespace
);
1951 if (0 < prefix_length
)
1952 arg
= prefix_filename(prefix
, prefix_length
, arg
);
1954 fd
= open(arg
, O_RDONLY
);
1958 apply_patch(fd
, arg
);
1962 apply_patch(0, "<stdin>");
1963 if (whitespace_error
) {
1964 if (squelch_whitespace_errors
&&
1965 squelch_whitespace_errors
< whitespace_error
) {
1967 whitespace_error
- squelch_whitespace_errors
;
1968 fprintf(stderr
, "warning: squelched %d whitespace error%s\n",
1970 squelched
== 1 ? "" : "s");
1972 if (new_whitespace
== error_on_whitespace
)
1973 die("%d line%s add%s trailing whitespaces.",
1975 whitespace_error
== 1 ? "" : "s",
1976 whitespace_error
== 1 ? "s" : "");
1977 if (applied_after_stripping
)
1978 fprintf(stderr
, "warning: %d line%s applied after"
1979 " stripping trailing whitespaces.\n",
1980 applied_after_stripping
,
1981 applied_after_stripping
== 1 ? "" : "s");
1982 else if (whitespace_error
)
1983 fprintf(stderr
, "warning: %d line%s add%s trailing"
1986 whitespace_error
== 1 ? "" : "s",
1987 whitespace_error
== 1 ? "s" : "");