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
= nowarn
;
43 static int whitespace_error
= 0;
44 static const char *patch_input_file
= NULL
;
47 * For "diff-stat" like behaviour, we keep track of the biggest change
48 * we've seen, and the longest filename. That allows us to do simple
51 static int max_change
, max_len
;
54 * Various "current state", notably line numbers and what
55 * file (and how) we're patching right now.. The "is_xxxx"
56 * things are flags, where -1 means "don't know yet".
58 static int linenr
= 1;
61 unsigned long oldpos
, oldlines
;
62 unsigned long newpos
, newlines
;
65 struct fragment
*next
;
69 char *new_name
, *old_name
, *def_name
;
70 unsigned int old_mode
, new_mode
;
71 int is_rename
, is_copy
, is_new
, is_delete
, is_binary
;
72 int lines_added
, lines_deleted
;
74 struct fragment
*fragments
;
76 unsigned long resultsize
;
77 char old_sha1_prefix
[41];
78 char new_sha1_prefix
[41];
82 #define CHUNKSIZE (8192)
85 static void *read_patch_file(int fd
, unsigned long *sizep
)
87 unsigned long size
= 0, alloc
= CHUNKSIZE
;
88 void *buffer
= xmalloc(alloc
);
91 int nr
= alloc
- size
;
94 buffer
= xrealloc(buffer
, alloc
);
97 nr
= xread(fd
, buffer
+ size
, nr
);
101 die("git-apply: read returned %s", strerror(errno
));
107 * Make sure that we have some slop in the buffer
108 * so that we can do speculative "memcmp" etc, and
109 * see to it that it is NUL-filled.
111 if (alloc
< size
+ SLOP
)
112 buffer
= xrealloc(buffer
, size
+ SLOP
);
113 memset(buffer
+ size
, 0, SLOP
);
117 static unsigned long linelen(const char *buffer
, unsigned long size
)
119 unsigned long len
= 0;
122 if (*buffer
++ == '\n')
128 static int is_dev_null(const char *str
)
130 return !memcmp("/dev/null", str
, 9) && isspace(str
[9]);
136 static int name_terminate(const char *name
, int namelen
, int c
, int terminate
)
138 if (c
== ' ' && !(terminate
& TERM_SPACE
))
140 if (c
== '\t' && !(terminate
& TERM_TAB
))
146 static char * find_name(const char *line
, char *def
, int p_value
, int terminate
)
149 const char *start
= line
;
153 /* Proposed "new-style" GNU patch/diff format; see
154 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
156 name
= unquote_c_style(line
, NULL
);
160 cp
= strchr(name
, '/');
167 /* name can later be freed, so we need
168 * to memmove, not just return cp
170 memmove(name
, cp
, strlen(cp
) + 1);
187 if (name_terminate(start
, line
-start
, c
, terminate
))
191 if (c
== '/' && !--p_value
)
201 * Generally we prefer the shorter name, especially
202 * if the other one is just a variation of that with
203 * something else tacked on to the end (ie "file.orig"
207 int deflen
= strlen(def
);
208 if (deflen
< len
&& !strncmp(start
, def
, deflen
))
212 name
= xmalloc(len
+ 1);
213 memcpy(name
, start
, len
);
220 * Get the name etc info from the --/+++ lines of a traditional patch header
222 * NOTE! This hardcodes "-p1" behaviour in filename detection.
224 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
225 * files, we can happily check the index for a match, but for creating a
226 * new file we should try to match whatever "patch" does. I have no idea.
228 static void parse_traditional_patch(const char *first
, const char *second
, struct patch
*patch
)
232 first
+= 4; // skip "--- "
233 second
+= 4; // skip "+++ "
234 if (is_dev_null(first
)) {
236 patch
->is_delete
= 0;
237 name
= find_name(second
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
238 patch
->new_name
= name
;
239 } else if (is_dev_null(second
)) {
241 patch
->is_delete
= 1;
242 name
= find_name(first
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
243 patch
->old_name
= name
;
245 name
= find_name(first
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
246 name
= find_name(second
, name
, p_value
, TERM_SPACE
| TERM_TAB
);
247 patch
->old_name
= patch
->new_name
= name
;
250 die("unable to find filename in patch at line %d", linenr
);
253 static int gitdiff_hdrend(const char *line
, struct patch
*patch
)
259 * We're anal about diff header consistency, to make
260 * sure that we don't end up having strange ambiguous
261 * patches floating around.
263 * As a result, gitdiff_{old|new}name() will check
264 * their names against any previous information, just
267 static char *gitdiff_verify_name(const char *line
, int isnull
, char *orig_name
, const char *oldnew
)
269 if (!orig_name
&& !isnull
)
270 return find_name(line
, NULL
, 1, 0);
279 die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name
, linenr
);
280 another
= find_name(line
, NULL
, 1, 0);
281 if (!another
|| memcmp(another
, name
, len
))
282 die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew
, linenr
);
287 /* expect "/dev/null" */
288 if (memcmp("/dev/null", line
, 9) || line
[9] != '\n')
289 die("git-apply: bad git-diff - expected /dev/null on line %d", linenr
);
294 static int gitdiff_oldname(const char *line
, struct patch
*patch
)
296 patch
->old_name
= gitdiff_verify_name(line
, patch
->is_new
, patch
->old_name
, "old");
300 static int gitdiff_newname(const char *line
, struct patch
*patch
)
302 patch
->new_name
= gitdiff_verify_name(line
, patch
->is_delete
, patch
->new_name
, "new");
306 static int gitdiff_oldmode(const char *line
, struct patch
*patch
)
308 patch
->old_mode
= strtoul(line
, NULL
, 8);
312 static int gitdiff_newmode(const char *line
, struct patch
*patch
)
314 patch
->new_mode
= strtoul(line
, NULL
, 8);
318 static int gitdiff_delete(const char *line
, struct patch
*patch
)
320 patch
->is_delete
= 1;
321 patch
->old_name
= patch
->def_name
;
322 return gitdiff_oldmode(line
, patch
);
325 static int gitdiff_newfile(const char *line
, struct patch
*patch
)
328 patch
->new_name
= patch
->def_name
;
329 return gitdiff_newmode(line
, patch
);
332 static int gitdiff_copysrc(const char *line
, struct patch
*patch
)
335 patch
->old_name
= find_name(line
, NULL
, 0, 0);
339 static int gitdiff_copydst(const char *line
, struct patch
*patch
)
342 patch
->new_name
= find_name(line
, NULL
, 0, 0);
346 static int gitdiff_renamesrc(const char *line
, struct patch
*patch
)
348 patch
->is_rename
= 1;
349 patch
->old_name
= find_name(line
, NULL
, 0, 0);
353 static int gitdiff_renamedst(const char *line
, struct patch
*patch
)
355 patch
->is_rename
= 1;
356 patch
->new_name
= find_name(line
, NULL
, 0, 0);
360 static int gitdiff_similarity(const char *line
, struct patch
*patch
)
362 if ((patch
->score
= strtoul(line
, NULL
, 10)) == ULONG_MAX
)
367 static int gitdiff_dissimilarity(const char *line
, struct patch
*patch
)
369 if ((patch
->score
= strtoul(line
, NULL
, 10)) == ULONG_MAX
)
374 static int gitdiff_index(const char *line
, struct patch
*patch
)
376 /* index line is N hexadecimal, "..", N hexadecimal,
377 * and optional space with octal mode.
379 const char *ptr
, *eol
;
382 ptr
= strchr(line
, '.');
383 if (!ptr
|| ptr
[1] != '.' || 40 < ptr
- line
)
386 memcpy(patch
->old_sha1_prefix
, line
, len
);
387 patch
->old_sha1_prefix
[len
] = 0;
390 ptr
= strchr(line
, ' ');
391 eol
= strchr(line
, '\n');
393 if (!ptr
|| eol
< ptr
)
399 memcpy(patch
->new_sha1_prefix
, line
, len
);
400 patch
->new_sha1_prefix
[len
] = 0;
402 patch
->new_mode
= patch
->old_mode
= strtoul(ptr
+1, NULL
, 8);
407 * This is normal for a diff that doesn't change anything: we'll fall through
408 * into the next diff. Tell the parser to break out.
410 static int gitdiff_unrecognized(const char *line
, struct patch
*patch
)
415 static const char *stop_at_slash(const char *line
, int llen
)
419 for (i
= 0; i
< llen
; i
++) {
427 /* This is to extract the same name that appears on "diff --git"
428 * line. We do not find and return anything if it is a rename
429 * patch, and it is OK because we will find the name elsewhere.
430 * We need to reliably find name only when it is mode-change only,
431 * creation or deletion of an empty file. In any of these cases,
432 * both sides are the same name under a/ and b/ respectively.
434 static char *git_header_name(char *line
, int llen
)
438 const char *second
= NULL
;
440 line
+= strlen("diff --git ");
441 llen
-= strlen("diff --git ");
445 char *first
= unquote_c_style(line
, &second
);
449 /* advance to the first slash */
450 cp
= stop_at_slash(first
, strlen(first
));
451 if (!cp
|| cp
== first
) {
452 /* we do not accept absolute paths */
458 memmove(first
, cp
+1, len
+1); /* including NUL */
460 /* second points at one past closing dq of name.
461 * find the second name.
463 while ((second
< line
+ llen
) && isspace(*second
))
466 if (line
+ llen
<= second
)
467 goto free_first_and_fail
;
468 if (*second
== '"') {
469 char *sp
= unquote_c_style(second
, NULL
);
471 goto free_first_and_fail
;
472 cp
= stop_at_slash(sp
, strlen(sp
));
473 if (!cp
|| cp
== sp
) {
476 goto free_first_and_fail
;
478 /* They must match, otherwise ignore */
479 if (strcmp(cp
+1, first
))
480 goto free_both_and_fail
;
485 /* unquoted second */
486 cp
= stop_at_slash(second
, line
+ llen
- second
);
487 if (!cp
|| cp
== second
)
488 goto free_first_and_fail
;
490 if (line
+ llen
- cp
!= len
+ 1 ||
491 memcmp(first
, cp
, len
))
492 goto free_first_and_fail
;
496 /* unquoted first name */
497 name
= stop_at_slash(line
, llen
);
498 if (!name
|| name
== line
)
503 /* since the first name is unquoted, a dq if exists must be
504 * the beginning of the second name.
506 for (second
= name
; second
< line
+ llen
; second
++) {
507 if (*second
== '"') {
508 const char *cp
= second
;
510 char *sp
= unquote_c_style(second
, NULL
);
514 np
= stop_at_slash(sp
, strlen(sp
));
515 if (!np
|| np
== sp
) {
516 free_second_and_fail
:
522 if (len
< cp
- name
&&
523 !strncmp(np
, name
, len
) &&
524 isspace(name
[len
])) {
526 memmove(sp
, np
, len
+ 1);
529 goto free_second_and_fail
;
534 * Accept a name only if it shows up twice, exactly the same
537 for (len
= 0 ; ; len
++) {
554 if (second
[len
] == '\n' && !memcmp(name
, second
, len
)) {
555 char *ret
= xmalloc(len
+ 1);
556 memcpy(ret
, name
, len
);
565 /* Verify that we recognize the lines following a git header */
566 static int parse_git_header(char *line
, int len
, unsigned int size
, struct patch
*patch
)
568 unsigned long offset
;
570 /* A git diff has explicit new/delete information, so we don't guess */
572 patch
->is_delete
= 0;
575 * Some things may not have the old name in the
576 * rest of the headers anywhere (pure mode changes,
577 * or removing or adding empty files), so we get
578 * the default name from the header.
580 patch
->def_name
= git_header_name(line
, len
);
585 for (offset
= len
; size
> 0 ; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
586 static const struct opentry
{
588 int (*fn
)(const char *, struct patch
*);
590 { "@@ -", gitdiff_hdrend
},
591 { "--- ", gitdiff_oldname
},
592 { "+++ ", gitdiff_newname
},
593 { "old mode ", gitdiff_oldmode
},
594 { "new mode ", gitdiff_newmode
},
595 { "deleted file mode ", gitdiff_delete
},
596 { "new file mode ", gitdiff_newfile
},
597 { "copy from ", gitdiff_copysrc
},
598 { "copy to ", gitdiff_copydst
},
599 { "rename old ", gitdiff_renamesrc
},
600 { "rename new ", gitdiff_renamedst
},
601 { "rename from ", gitdiff_renamesrc
},
602 { "rename to ", gitdiff_renamedst
},
603 { "similarity index ", gitdiff_similarity
},
604 { "dissimilarity index ", gitdiff_dissimilarity
},
605 { "index ", gitdiff_index
},
606 { "", gitdiff_unrecognized
},
610 len
= linelen(line
, size
);
611 if (!len
|| line
[len
-1] != '\n')
613 for (i
= 0; i
< sizeof(optable
) / sizeof(optable
[0]); i
++) {
614 const struct opentry
*p
= optable
+ i
;
615 int oplen
= strlen(p
->str
);
616 if (len
< oplen
|| memcmp(p
->str
, line
, oplen
))
618 if (p
->fn(line
+ oplen
, patch
) < 0)
627 static int parse_num(const char *line
, unsigned long *p
)
633 *p
= strtoul(line
, &ptr
, 10);
637 static int parse_range(const char *line
, int len
, int offset
, const char *expect
,
638 unsigned long *p1
, unsigned long *p2
)
642 if (offset
< 0 || offset
>= len
)
647 digits
= parse_num(line
, p1
);
657 digits
= parse_num(line
+1, p2
);
669 if (memcmp(line
, expect
, ex
))
676 * Parse a unified diff fragment header of the
677 * form "@@ -a,b +c,d @@"
679 static int parse_fragment_header(char *line
, int len
, struct fragment
*fragment
)
683 if (!len
|| line
[len
-1] != '\n')
686 /* Figure out the number of lines in a fragment */
687 offset
= parse_range(line
, len
, 4, " +", &fragment
->oldpos
, &fragment
->oldlines
);
688 offset
= parse_range(line
, len
, offset
, " @@", &fragment
->newpos
, &fragment
->newlines
);
693 static int find_header(char *line
, unsigned long size
, int *hdrsize
, struct patch
*patch
)
695 unsigned long offset
, len
;
697 patch
->is_rename
= patch
->is_copy
= 0;
698 patch
->is_new
= patch
->is_delete
= -1;
699 patch
->old_mode
= patch
->new_mode
= 0;
700 patch
->old_name
= patch
->new_name
= NULL
;
701 for (offset
= 0; size
> 0; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
702 unsigned long nextlen
;
704 len
= linelen(line
, size
);
708 /* Testing this early allows us to take a few shortcuts.. */
713 * Make sure we don't find any unconnected patch fragmants.
714 * That's a sign that we didn't find a header, and that a
715 * patch has become corrupted/broken up.
717 if (!memcmp("@@ -", line
, 4)) {
718 struct fragment dummy
;
719 if (parse_fragment_header(line
, len
, &dummy
) < 0)
721 error("patch fragment without header at line %d: %.*s", linenr
, (int)len
-1, line
);
728 * Git patch? It might not have a real patch, just a rename
729 * or mode change, so we handle that specially
731 if (!memcmp("diff --git ", line
, 11)) {
732 int git_hdr_len
= parse_git_header(line
, len
, size
, patch
);
733 if (git_hdr_len
<= len
)
735 if (!patch
->old_name
&& !patch
->new_name
) {
736 if (!patch
->def_name
)
737 die("git diff header lacks filename information (line %d)", linenr
);
738 patch
->old_name
= patch
->new_name
= patch
->def_name
;
740 *hdrsize
= git_hdr_len
;
744 /** --- followed by +++ ? */
745 if (memcmp("--- ", line
, 4) || memcmp("+++ ", line
+ len
, 4))
749 * We only accept unified patches, so we want it to
750 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
753 nextlen
= linelen(line
+ len
, size
- len
);
754 if (size
< nextlen
+ 14 || memcmp("@@ -", line
+ len
+ nextlen
, 4))
757 /* Ok, we'll consider it a patch */
758 parse_traditional_patch(line
, line
+len
, patch
);
759 *hdrsize
= len
+ nextlen
;
767 * Parse a unified diff. Note that this really needs
768 * to parse each fragment separately, since the only
769 * way to know the difference between a "---" that is
770 * part of a patch, and a "---" that starts the next
771 * patch is to look at the line counts..
773 static int parse_fragment(char *line
, unsigned long size
, struct patch
*patch
, struct fragment
*fragment
)
776 int len
= linelen(line
, size
), offset
;
777 unsigned long oldlines
, newlines
;
779 offset
= parse_fragment_header(line
, len
, fragment
);
782 oldlines
= fragment
->oldlines
;
783 newlines
= fragment
->newlines
;
785 if (patch
->is_new
< 0) {
786 patch
->is_new
= !oldlines
;
788 patch
->old_name
= NULL
;
790 if (patch
->is_delete
< 0) {
791 patch
->is_delete
= !newlines
;
793 patch
->new_name
= NULL
;
796 if (patch
->is_new
!= !oldlines
)
797 return error("new file depends on old contents");
798 if (patch
->is_delete
!= !newlines
) {
800 return error("deleted file still has contents");
801 fprintf(stderr
, "** warning: file %s becomes empty but is not deleted\n", patch
->new_name
);
804 /* Parse the thing.. */
809 for (offset
= len
; size
> 0; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
810 if (!oldlines
&& !newlines
)
812 len
= linelen(line
, size
);
813 if (!len
|| line
[len
-1] != '\n')
828 * We know len is at least two, since we have a '+' and
829 * we checked that the last character was a '\n' above.
830 * That is, an addition of an empty line would check
831 * the '+' here. Sneaky...
833 if ((new_whitespace
!= nowarn
) &&
834 isspace(line
[len
-2])) {
835 fprintf(stderr
, "Added whitespace\n");
836 fprintf(stderr
, "%s:%d:%.*s\n",
838 linenr
, len
-2, line
+1);
839 whitespace_error
= 1;
845 /* We allow "\ No newline at end of file". Depending
846 * on locale settings when the patch was produced we
847 * don't know what this line looks like. The only
848 * thing we do know is that it begins with "\ ".
849 * Checking for 12 is just for sanity check -- any
850 * l10n of "\ No newline..." is at least that long.
853 if (len
< 12 || memcmp(line
, "\\ ", 2))
858 /* If a fragment ends with an incomplete line, we failed to include
859 * it in the above loop because we hit oldlines == newlines == 0
862 if (12 < size
&& !memcmp(line
, "\\ ", 2))
863 offset
+= linelen(line
, size
);
865 patch
->lines_added
+= added
;
866 patch
->lines_deleted
+= deleted
;
870 static int parse_single_patch(char *line
, unsigned long size
, struct patch
*patch
)
872 unsigned long offset
= 0;
873 struct fragment
**fragp
= &patch
->fragments
;
875 while (size
> 4 && !memcmp(line
, "@@ -", 4)) {
876 struct fragment
*fragment
;
879 fragment
= xmalloc(sizeof(*fragment
));
880 memset(fragment
, 0, sizeof(*fragment
));
881 len
= parse_fragment(line
, size
, patch
, fragment
);
883 die("corrupt patch at line %d", linenr
);
885 fragment
->patch
= line
;
886 fragment
->size
= len
;
889 fragp
= &fragment
->next
;
898 static inline int metadata_changes(struct patch
*patch
)
900 return patch
->is_rename
> 0 ||
901 patch
->is_copy
> 0 ||
904 (patch
->old_mode
&& patch
->new_mode
&&
905 patch
->old_mode
!= patch
->new_mode
);
908 static int parse_chunk(char *buffer
, unsigned long size
, struct patch
*patch
)
910 int hdrsize
, patchsize
;
911 int offset
= find_header(buffer
, size
, &hdrsize
, patch
);
916 patchsize
= parse_single_patch(buffer
+ offset
+ hdrsize
, size
- offset
- hdrsize
, patch
);
919 static const char *binhdr
[] = {
925 int hd
= hdrsize
+ offset
;
926 unsigned long llen
= linelen(buffer
+ hd
, size
- hd
);
928 if (!memcmp(" differ\n", buffer
+ hd
+ llen
- 8, 8))
929 for (i
= 0; binhdr
[i
]; i
++) {
930 int len
= strlen(binhdr
[i
]);
931 if (len
< size
- hd
&&
932 !memcmp(binhdr
[i
], buffer
+ hd
, len
)) {
933 patch
->is_binary
= 1;
938 /* Empty patch cannot be applied if:
939 * - it is a binary patch and we do not do binary_replace, or
940 * - text patch without metadata change
942 if ((apply
|| check
) &&
944 ? !allow_binary_replacement
945 : !metadata_changes(patch
)))
946 die("patch with only garbage at line %d", linenr
);
949 return offset
+ hdrsize
+ patchsize
;
952 static const char pluses
[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
953 static const char minuses
[]= "----------------------------------------------------------------------";
955 static void show_stats(struct patch
*patch
)
957 const char *prefix
= "";
958 char *name
= patch
->new_name
;
960 int len
, max
, add
, del
, total
;
963 name
= patch
->old_name
;
965 if (0 < (len
= quote_c_style(name
, NULL
, NULL
, 0))) {
966 qname
= xmalloc(len
+ 1);
967 quote_c_style(name
, qname
, NULL
, 0);
972 * "scale" the filename
983 slash
= strchr(name
, '/');
990 * scale the add/delete
996 add
= patch
->lines_added
;
997 del
= patch
->lines_deleted
;
1000 if (max_change
> 0) {
1001 total
= (total
* max
+ max_change
/ 2) / max_change
;
1002 add
= (add
* max
+ max_change
/ 2) / max_change
;
1005 if (patch
->is_binary
)
1006 printf(" %s%-*s | Bin\n", prefix
, len
, name
);
1008 printf(" %s%-*s |%5d %.*s%.*s\n", prefix
,
1009 len
, name
, patch
->lines_added
+ patch
->lines_deleted
,
1010 add
, pluses
, del
, minuses
);
1015 static int read_old_data(struct stat
*st
, const char *path
, void *buf
, unsigned long size
)
1020 switch (st
->st_mode
& S_IFMT
) {
1022 return readlink(path
, buf
, size
);
1024 fd
= open(path
, O_RDONLY
);
1026 return error("unable to open %s", path
);
1029 int ret
= xread(fd
, buf
+ got
, size
- got
);
1042 static int find_offset(const char *buf
, unsigned long size
, const char *fragment
, unsigned long fragsize
, int line
)
1045 unsigned long start
, backwards
, forwards
;
1047 if (fragsize
> size
)
1052 unsigned long offset
= 0;
1054 while (offset
+ fragsize
<= size
) {
1055 if (buf
[offset
++] == '\n') {
1063 /* Exact line number? */
1064 if (!memcmp(buf
+ start
, fragment
, fragsize
))
1068 * There's probably some smart way to do this, but I'll leave
1069 * that to the smart and beautiful people. I'm simple and stupid.
1073 for (i
= 0; ; i
++) {
1080 if (forwards
+ fragsize
> size
)
1086 } while (backwards
&& buf
[backwards
-1] != '\n');
1089 while (forwards
+ fragsize
<= size
) {
1090 if (buf
[forwards
++] == '\n')
1096 if (try + fragsize
> size
)
1098 if (memcmp(buf
+ try, fragment
, fragsize
))
1107 * We should start searching forward and backward.
1112 struct buffer_desc
{
1115 unsigned long alloc
;
1118 static int apply_line(char *output
, const char *patch
, int plen
)
1120 /* plen is number of bytes to be copied from patch,
1121 * starting at patch+1 (patch[0] is '+'). Typically
1122 * patch[plen] is '\n'.
1124 int add_nl_to_tail
= 0;
1125 if ((new_whitespace
== strip_and_apply
) &&
1126 1 < plen
&& isspace(patch
[plen
-1])) {
1127 if (patch
[plen
] == '\n')
1130 while (0 < plen
&& isspace(patch
[plen
]))
1133 memcpy(output
, patch
+ 1, plen
);
1135 output
[plen
++] = '\n';
1139 static int apply_one_fragment(struct buffer_desc
*desc
, struct fragment
*frag
)
1141 char *buf
= desc
->buffer
;
1142 const char *patch
= frag
->patch
;
1143 int offset
, size
= frag
->size
;
1144 char *old
= xmalloc(size
);
1145 char *new = xmalloc(size
);
1146 int oldsize
= 0, newsize
= 0;
1149 int len
= linelen(patch
, size
);
1156 * "plen" is how much of the line we should use for
1157 * the actual patch data. Normally we just remove the
1158 * first character on the line, but if the line is
1159 * followed by "\ No newline", then we also remove the
1160 * last one (which is the newline, of course).
1163 if (len
< size
&& patch
[len
] == '\\')
1168 memcpy(old
+ oldsize
, patch
+ 1, plen
);
1172 /* Fall-through for ' ' */
1174 if (*patch
!= '+' || !no_add
)
1175 newsize
+= apply_line(new + newsize
, patch
,
1178 case '@': case '\\':
1179 /* Ignore it, we already handled it */
1188 #ifdef NO_ACCURATE_DIFF
1189 if (oldsize
> 0 && old
[oldsize
- 1] == '\n' &&
1190 newsize
> 0 && new[newsize
- 1] == '\n') {
1196 offset
= find_offset(buf
, desc
->size
, old
, oldsize
, frag
->newpos
);
1198 int diff
= newsize
- oldsize
;
1199 unsigned long size
= desc
->size
+ diff
;
1200 unsigned long alloc
= desc
->alloc
;
1203 alloc
= size
+ 8192;
1204 desc
->alloc
= alloc
;
1205 buf
= xrealloc(buf
, alloc
);
1209 memmove(buf
+ offset
+ newsize
, buf
+ offset
+ oldsize
, size
- offset
- newsize
);
1210 memcpy(buf
+ offset
, new, newsize
);
1219 static int apply_fragments(struct buffer_desc
*desc
, struct patch
*patch
)
1221 struct fragment
*frag
= patch
->fragments
;
1222 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
1224 if (patch
->is_binary
) {
1225 unsigned char sha1
[20];
1227 if (!allow_binary_replacement
)
1228 return error("cannot apply binary patch to '%s' "
1229 "without --allow-binary-replacement",
1232 /* For safety, we require patch index line to contain
1233 * full 40-byte textual SHA1 for old and new, at least for now.
1235 if (strlen(patch
->old_sha1_prefix
) != 40 ||
1236 strlen(patch
->new_sha1_prefix
) != 40 ||
1237 get_sha1_hex(patch
->old_sha1_prefix
, sha1
) ||
1238 get_sha1_hex(patch
->new_sha1_prefix
, sha1
))
1239 return error("cannot apply binary patch to '%s' "
1240 "without full index line", name
);
1242 if (patch
->old_name
) {
1243 unsigned char hdr
[50];
1246 /* See if the old one matches what the patch
1249 write_sha1_file_prepare(desc
->buffer
, desc
->size
,
1250 "blob", sha1
, hdr
, &hdrlen
);
1251 if (strcmp(sha1_to_hex(sha1
), patch
->old_sha1_prefix
))
1252 return error("the patch applies to '%s' (%s), "
1253 "which does not match the "
1254 "current contents.",
1255 name
, sha1_to_hex(sha1
));
1258 /* Otherwise, the old one must be empty. */
1260 return error("the patch applies to an empty "
1261 "'%s' but it is not empty", name
);
1264 /* For now, we do not record post-image data in the patch,
1265 * and require the object already present in the recipient's
1270 desc
->alloc
= desc
->size
= 0;
1272 get_sha1_hex(patch
->new_sha1_prefix
, sha1
);
1274 if (memcmp(sha1
, null_sha1
, 20)) {
1278 desc
->buffer
= read_sha1_file(sha1
, type
, &size
);
1280 return error("the necessary postimage %s for "
1281 "'%s' does not exist",
1282 patch
->new_sha1_prefix
, name
);
1283 desc
->alloc
= desc
->size
= size
;
1290 if (apply_one_fragment(desc
, frag
) < 0)
1291 return error("patch failed: %s:%ld",
1292 name
, frag
->oldpos
);
1298 static int apply_data(struct patch
*patch
, struct stat
*st
)
1301 unsigned long size
, alloc
;
1302 struct buffer_desc desc
;
1307 if (patch
->old_name
) {
1309 alloc
= size
+ 8192;
1310 buf
= xmalloc(alloc
);
1311 if (read_old_data(st
, patch
->old_name
, buf
, alloc
) != size
)
1312 return error("read of %s failed", patch
->old_name
);
1318 if (apply_fragments(&desc
, patch
) < 0)
1320 patch
->result
= desc
.buffer
;
1321 patch
->resultsize
= desc
.size
;
1323 if (patch
->is_delete
&& patch
->resultsize
)
1324 return error("removal patch leaves file contents");
1329 static int check_patch(struct patch
*patch
)
1332 const char *old_name
= patch
->old_name
;
1333 const char *new_name
= patch
->new_name
;
1334 const char *name
= old_name
? old_name
: new_name
;
1338 int stat_ret
= lstat(old_name
, &st
);
1341 int pos
= cache_name_pos(old_name
, strlen(old_name
));
1343 return error("%s: does not exist in index",
1346 struct checkout costate
;
1347 if (errno
!= ENOENT
)
1348 return error("%s: %s", old_name
,
1351 costate
.base_dir
= "";
1352 costate
.base_dir_len
= 0;
1355 costate
.not_new
= 0;
1356 costate
.refresh_cache
= 1;
1357 if (checkout_entry(active_cache
[pos
],
1359 lstat(old_name
, &st
))
1363 changed
= ce_match_stat(active_cache
[pos
], &st
, 1);
1365 return error("%s: does not match index",
1368 else if (stat_ret
< 0)
1369 return error("%s: %s", old_name
, strerror(errno
));
1371 if (patch
->is_new
< 0)
1373 st
.st_mode
= ntohl(create_ce_mode(st
.st_mode
));
1374 if (!patch
->old_mode
)
1375 patch
->old_mode
= st
.st_mode
;
1376 if ((st
.st_mode
^ patch
->old_mode
) & S_IFMT
)
1377 return error("%s: wrong type", old_name
);
1378 if (st
.st_mode
!= patch
->old_mode
)
1379 fprintf(stderr
, "warning: %s has type %o, expected %o\n",
1380 old_name
, st
.st_mode
, patch
->old_mode
);
1383 if (new_name
&& (patch
->is_new
| patch
->is_rename
| patch
->is_copy
)) {
1384 if (check_index
&& cache_name_pos(new_name
, strlen(new_name
)) >= 0)
1385 return error("%s: already exists in index", new_name
);
1386 if (!lstat(new_name
, &st
))
1387 return error("%s: already exists in working directory", new_name
);
1388 if (errno
!= ENOENT
)
1389 return error("%s: %s", new_name
, strerror(errno
));
1390 if (!patch
->new_mode
) {
1392 patch
->new_mode
= S_IFREG
| 0644;
1394 patch
->new_mode
= patch
->old_mode
;
1398 if (new_name
&& old_name
) {
1399 int same
= !strcmp(old_name
, new_name
);
1400 if (!patch
->new_mode
)
1401 patch
->new_mode
= patch
->old_mode
;
1402 if ((patch
->old_mode
^ patch
->new_mode
) & S_IFMT
)
1403 return error("new mode (%o) of %s does not match old mode (%o)%s%s",
1404 patch
->new_mode
, new_name
, patch
->old_mode
,
1405 same
? "" : " of ", same
? "" : old_name
);
1408 if (apply_data(patch
, &st
) < 0)
1409 return error("%s: patch does not apply", name
);
1413 static int check_patch_list(struct patch
*patch
)
1417 for (;patch
; patch
= patch
->next
)
1418 error
|= check_patch(patch
);
1422 static inline int is_null_sha1(const unsigned char *sha1
)
1424 return !memcmp(sha1
, null_sha1
, 20);
1427 static void show_index_list(struct patch
*list
)
1429 struct patch
*patch
;
1431 /* Once we start supporting the reverse patch, it may be
1432 * worth showing the new sha1 prefix, but until then...
1434 for (patch
= list
; patch
; patch
= patch
->next
) {
1435 const unsigned char *sha1_ptr
;
1436 unsigned char sha1
[20];
1439 name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
1441 sha1_ptr
= null_sha1
;
1442 else if (get_sha1(patch
->old_sha1_prefix
, sha1
))
1443 die("sha1 information is lacking or useless (%s).",
1448 printf("%06o %s ",patch
->old_mode
, sha1_to_hex(sha1_ptr
));
1449 if (line_termination
&& quote_c_style(name
, NULL
, NULL
, 0))
1450 quote_c_style(name
, NULL
, stdout
, 0);
1452 fputs(name
, stdout
);
1453 putchar(line_termination
);
1457 static void stat_patch_list(struct patch
*patch
)
1459 int files
, adds
, dels
;
1461 for (files
= adds
= dels
= 0 ; patch
; patch
= patch
->next
) {
1463 adds
+= patch
->lines_added
;
1464 dels
+= patch
->lines_deleted
;
1468 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files
, adds
, dels
);
1471 static void numstat_patch_list(struct patch
*patch
)
1473 for ( ; patch
; patch
= patch
->next
) {
1475 name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
1476 printf("%d\t%d\t", patch
->lines_added
, patch
->lines_deleted
);
1477 if (line_termination
&& quote_c_style(name
, NULL
, NULL
, 0))
1478 quote_c_style(name
, NULL
, stdout
, 0);
1480 fputs(name
, stdout
);
1485 static void show_file_mode_name(const char *newdelete
, unsigned int mode
, const char *name
)
1488 printf(" %s mode %06o %s\n", newdelete
, mode
, name
);
1490 printf(" %s %s\n", newdelete
, name
);
1493 static void show_mode_change(struct patch
*p
, int show_name
)
1495 if (p
->old_mode
&& p
->new_mode
&& p
->old_mode
!= p
->new_mode
) {
1497 printf(" mode change %06o => %06o %s\n",
1498 p
->old_mode
, p
->new_mode
, p
->new_name
);
1500 printf(" mode change %06o => %06o\n",
1501 p
->old_mode
, p
->new_mode
);
1505 static void show_rename_copy(struct patch
*p
)
1507 const char *renamecopy
= p
->is_rename
? "rename" : "copy";
1508 const char *old
, *new;
1510 /* Find common prefix */
1514 const char *slash_old
, *slash_new
;
1515 slash_old
= strchr(old
, '/');
1516 slash_new
= strchr(new, '/');
1519 slash_old
- old
!= slash_new
- new ||
1520 memcmp(old
, new, slash_new
- new))
1522 old
= slash_old
+ 1;
1523 new = slash_new
+ 1;
1525 /* p->old_name thru old is the common prefix, and old and new
1526 * through the end of names are renames
1528 if (old
!= p
->old_name
)
1529 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy
,
1530 (int)(old
- p
->old_name
), p
->old_name
,
1531 old
, new, p
->score
);
1533 printf(" %s %s => %s (%d%%)\n", renamecopy
,
1534 p
->old_name
, p
->new_name
, p
->score
);
1535 show_mode_change(p
, 0);
1538 static void summary_patch_list(struct patch
*patch
)
1542 for (p
= patch
; p
; p
= p
->next
) {
1544 show_file_mode_name("create", p
->new_mode
, p
->new_name
);
1545 else if (p
->is_delete
)
1546 show_file_mode_name("delete", p
->old_mode
, p
->old_name
);
1548 if (p
->is_rename
|| p
->is_copy
)
1549 show_rename_copy(p
);
1552 printf(" rewrite %s (%d%%)\n",
1553 p
->new_name
, p
->score
);
1554 show_mode_change(p
, 0);
1557 show_mode_change(p
, 1);
1563 static void patch_stats(struct patch
*patch
)
1565 int lines
= patch
->lines_added
+ patch
->lines_deleted
;
1567 if (lines
> max_change
)
1569 if (patch
->old_name
) {
1570 int len
= quote_c_style(patch
->old_name
, NULL
, NULL
, 0);
1572 len
= strlen(patch
->old_name
);
1576 if (patch
->new_name
) {
1577 int len
= quote_c_style(patch
->new_name
, NULL
, NULL
, 0);
1579 len
= strlen(patch
->new_name
);
1585 static void remove_file(struct patch
*patch
)
1588 if (remove_file_from_cache(patch
->old_name
) < 0)
1589 die("unable to remove %s from index", patch
->old_name
);
1591 unlink(patch
->old_name
);
1594 static void add_index_file(const char *path
, unsigned mode
, void *buf
, unsigned long size
)
1597 struct cache_entry
*ce
;
1598 int namelen
= strlen(path
);
1599 unsigned ce_size
= cache_entry_size(namelen
);
1604 ce
= xmalloc(ce_size
);
1605 memset(ce
, 0, ce_size
);
1606 memcpy(ce
->name
, path
, namelen
);
1607 ce
->ce_mode
= create_ce_mode(mode
);
1608 ce
->ce_flags
= htons(namelen
);
1609 if (lstat(path
, &st
) < 0)
1610 die("unable to stat newly created file %s", path
);
1611 fill_stat_cache_info(ce
, &st
);
1612 if (write_sha1_file(buf
, size
, "blob", ce
->sha1
) < 0)
1613 die("unable to create backing store for newly created file %s", path
);
1614 if (add_cache_entry(ce
, ADD_CACHE_OK_TO_ADD
) < 0)
1615 die("unable to add cache entry for %s", path
);
1618 static int try_create_file(const char *path
, unsigned int mode
, const char *buf
, unsigned long size
)
1623 return symlink(buf
, path
);
1624 fd
= open(path
, O_CREAT
| O_EXCL
| O_WRONLY
, (mode
& 0100) ? 0777 : 0666);
1628 int written
= xwrite(fd
, buf
, size
);
1630 die("writing file %s: %s", path
, strerror(errno
));
1632 die("out of space writing file %s", path
);
1637 die("closing file %s: %s", path
, strerror(errno
));
1642 * We optimistically assume that the directories exist,
1643 * which is true 99% of the time anyway. If they don't,
1644 * we create them and try again.
1646 static void create_one_file(char *path
, unsigned mode
, const char *buf
, unsigned long size
)
1648 if (!try_create_file(path
, mode
, buf
, size
))
1651 if (errno
== ENOENT
) {
1652 if (safe_create_leading_directories(path
))
1654 if (!try_create_file(path
, mode
, buf
, size
))
1658 if (errno
== EEXIST
) {
1659 unsigned int nr
= getpid();
1662 const char *newpath
;
1663 newpath
= mkpath("%s~%u", path
, nr
);
1664 if (!try_create_file(newpath
, mode
, buf
, size
)) {
1665 if (!rename(newpath
, path
))
1670 if (errno
!= EEXIST
)
1675 die("unable to write file %s mode %o", path
, mode
);
1678 static void create_file(struct patch
*patch
)
1680 char *path
= patch
->new_name
;
1681 unsigned mode
= patch
->new_mode
;
1682 unsigned long size
= patch
->resultsize
;
1683 char *buf
= patch
->result
;
1686 mode
= S_IFREG
| 0644;
1687 create_one_file(path
, mode
, buf
, size
);
1688 add_index_file(path
, mode
, buf
, size
);
1691 static void write_out_one_result(struct patch
*patch
)
1693 if (patch
->is_delete
> 0) {
1697 if (patch
->is_new
> 0 || patch
->is_copy
) {
1702 * Rename or modification boils down to the same
1703 * thing: remove the old, write the new
1709 static void write_out_results(struct patch
*list
, int skipped_patch
)
1711 if (!list
&& !skipped_patch
)
1715 write_out_one_result(list
);
1720 static struct cache_file cache_file
;
1722 static struct excludes
{
1723 struct excludes
*next
;
1727 static int use_patch(struct patch
*p
)
1729 const char *pathname
= p
->new_name
? p
->new_name
: p
->old_name
;
1730 struct excludes
*x
= excludes
;
1732 if (fnmatch(x
->path
, pathname
, 0) == 0)
1736 if (0 < prefix_length
) {
1737 int pathlen
= strlen(pathname
);
1738 if (pathlen
<= prefix_length
||
1739 memcmp(prefix
, pathname
, prefix_length
))
1745 static int apply_patch(int fd
, const char *filename
)
1748 unsigned long offset
, size
;
1749 char *buffer
= read_patch_file(fd
, &size
);
1750 struct patch
*list
= NULL
, **listp
= &list
;
1751 int skipped_patch
= 0;
1753 patch_input_file
= filename
;
1758 struct patch
*patch
;
1761 patch
= xmalloc(sizeof(*patch
));
1762 memset(patch
, 0, sizeof(*patch
));
1763 nr
= parse_chunk(buffer
+ offset
, size
, patch
);
1766 if (use_patch(patch
)) {
1769 listp
= &patch
->next
;
1771 /* perhaps free it a bit better? */
1780 if (whitespace_error
&& (new_whitespace
== error_on_whitespace
))
1783 write_index
= check_index
&& apply
;
1785 newfd
= hold_index_file_for_update(&cache_file
, get_index_file());
1787 if (read_cache() < 0)
1788 die("unable to read index file");
1791 if ((check
|| apply
) && check_patch_list(list
) < 0)
1795 write_out_results(list
, skipped_patch
);
1798 if (write_cache(newfd
, active_cache
, active_nr
) ||
1799 commit_index_file(&cache_file
))
1800 die("Unable to write new cachefile");
1803 if (show_index_info
)
1804 show_index_list(list
);
1807 stat_patch_list(list
);
1810 numstat_patch_list(list
);
1813 summary_patch_list(list
);
1819 int main(int argc
, char **argv
)
1824 for (i
= 1; i
< argc
; i
++) {
1825 const char *arg
= argv
[i
];
1828 if (!strcmp(arg
, "-")) {
1829 apply_patch(0, "<stdin>");
1833 if (!strncmp(arg
, "--exclude=", 10)) {
1834 struct excludes
*x
= xmalloc(sizeof(*x
));
1840 if (!strncmp(arg
, "-p", 2)) {
1841 p_value
= atoi(arg
+ 2);
1844 if (!strcmp(arg
, "--no-add")) {
1848 if (!strcmp(arg
, "--stat")) {
1853 if (!strcmp(arg
, "--allow-binary-replacement")) {
1854 allow_binary_replacement
= 1;
1857 if (!strcmp(arg
, "--numstat")) {
1862 if (!strcmp(arg
, "--summary")) {
1867 if (!strcmp(arg
, "--check")) {
1872 if (!strcmp(arg
, "--index")) {
1876 if (!strcmp(arg
, "--apply")) {
1880 if (!strcmp(arg
, "--index-info")) {
1882 show_index_info
= 1;
1885 if (!strcmp(arg
, "-z")) {
1886 line_termination
= 0;
1889 if (!strncmp(arg
, "--whitespace=", 13)) {
1890 if (!strcmp(arg
+13, "warn")) {
1891 new_whitespace
= warn_on_whitespace
;
1894 if (!strcmp(arg
+13, "error")) {
1895 new_whitespace
= error_on_whitespace
;
1898 if (!strcmp(arg
+13, "strip")) {
1899 new_whitespace
= strip_and_apply
;
1902 die("unrecognixed whitespace option '%s'", arg
+13);
1905 if (check_index
&& prefix_length
< 0) {
1906 prefix
= setup_git_directory();
1907 prefix_length
= prefix
? strlen(prefix
) : 0;
1908 git_config(git_default_config
);
1910 if (0 < prefix_length
)
1911 arg
= prefix_filename(prefix
, prefix_length
, arg
);
1913 fd
= open(arg
, O_RDONLY
);
1917 apply_patch(fd
, arg
);
1921 apply_patch(0, "<stdin>");
1922 if (whitespace_error
&& new_whitespace
== error_on_whitespace
)