4 * Copyright (C) Linus Torvalds, 2005
6 * This applies patches on top of some (arbitrary) version of the SCM.
10 #include "cache-tree.h"
17 * --check turns on checking that the working tree matches the
18 * files that are being modified, but doesn't apply the patch
19 * --stat does just a diffstat, and doesn't actually apply
20 * --numstat does numeric diffstat, and doesn't actually apply
21 * --index-info shows the old and new index info for paths if available.
22 * --index updates the cache as well.
23 * --cached updates only the cache without ever touching the working tree.
25 static const char *prefix
;
26 static int prefix_length
= -1;
27 static int newfd
= -1;
29 static int unidiff_zero
;
30 static int p_value
= 1;
31 static int check_index
;
32 static int write_index
;
39 static int apply_in_reverse
;
40 static int apply_with_reject
;
41 static int apply_verbosely
;
43 static int show_index_info
;
44 static int line_termination
= '\n';
45 static unsigned long p_context
= ULONG_MAX
;
46 static const char apply_usage
[] =
47 "git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--cached] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [--reverse] [--reject] [--verbose] [-z] [-pNUM] [-CNUM] [--whitespace=<nowarn|warn|error|error-all|strip>] <patch>...";
49 static enum whitespace_eol
{
54 } new_whitespace
= warn_on_whitespace
;
55 static int whitespace_error
;
56 static int squelch_whitespace_errors
= 5;
57 static int applied_after_stripping
;
58 static const char *patch_input_file
;
60 static void parse_whitespace_option(const char *option
)
63 new_whitespace
= warn_on_whitespace
;
66 if (!strcmp(option
, "warn")) {
67 new_whitespace
= warn_on_whitespace
;
70 if (!strcmp(option
, "nowarn")) {
71 new_whitespace
= nowarn_whitespace
;
74 if (!strcmp(option
, "error")) {
75 new_whitespace
= error_on_whitespace
;
78 if (!strcmp(option
, "error-all")) {
79 new_whitespace
= error_on_whitespace
;
80 squelch_whitespace_errors
= 0;
83 if (!strcmp(option
, "strip")) {
84 new_whitespace
= strip_whitespace
;
87 die("unrecognized whitespace option '%s'", option
);
90 static void set_default_whitespace_mode(const char *whitespace_option
)
92 if (!whitespace_option
&& !apply_default_whitespace
) {
93 new_whitespace
= (apply
100 * For "diff-stat" like behaviour, we keep track of the biggest change
101 * we've seen, and the longest filename. That allows us to do simple
104 static int max_change
, max_len
;
107 * Various "current state", notably line numbers and what
108 * file (and how) we're patching right now.. The "is_xxxx"
109 * things are flags, where -1 means "don't know yet".
111 static int linenr
= 1;
114 * This represents one "hunk" from a patch, starting with
115 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The
116 * patch text is pointed at by patch, and its byte length
117 * is stored in size. leading and trailing are the number
121 unsigned long leading
, trailing
;
122 unsigned long oldpos
, oldlines
;
123 unsigned long newpos
, newlines
;
127 struct fragment
*next
;
131 * When dealing with a binary patch, we reuse "leading" field
132 * to store the type of the binary hunk, either deflated "delta"
133 * or deflated "literal".
135 #define binary_patch_method leading
136 #define BINARY_DELTA_DEFLATED 1
137 #define BINARY_LITERAL_DEFLATED 2
140 char *new_name
, *old_name
, *def_name
;
141 unsigned int old_mode
, new_mode
;
142 int is_new
, is_delete
; /* -1 = unknown, 0 = false, 1 = true */
144 unsigned long deflate_origlen
;
145 int lines_added
, lines_deleted
;
147 unsigned int inaccurate_eof
:1;
148 unsigned int is_binary
:1;
149 unsigned int is_copy
:1;
150 unsigned int is_rename
:1;
151 struct fragment
*fragments
;
153 unsigned long resultsize
;
154 char old_sha1_prefix
[41];
155 char new_sha1_prefix
[41];
159 static void say_patch_name(FILE *output
, const char *pre
, struct patch
*patch
, const char *post
)
162 if (patch
->old_name
&& patch
->new_name
&&
163 strcmp(patch
->old_name
, patch
->new_name
)) {
164 write_name_quoted(NULL
, 0, patch
->old_name
, 1, output
);
165 fputs(" => ", output
);
166 write_name_quoted(NULL
, 0, patch
->new_name
, 1, output
);
169 const char *n
= patch
->new_name
;
172 write_name_quoted(NULL
, 0, n
, 1, output
);
177 #define CHUNKSIZE (8192)
180 static void *read_patch_file(int fd
, unsigned long *sizep
)
182 unsigned long size
= 0, alloc
= CHUNKSIZE
;
183 void *buffer
= xmalloc(alloc
);
186 int nr
= alloc
- size
;
189 buffer
= xrealloc(buffer
, alloc
);
192 nr
= xread(fd
, (char *) buffer
+ size
, nr
);
196 die("git-apply: read returned %s", strerror(errno
));
202 * Make sure that we have some slop in the buffer
203 * so that we can do speculative "memcmp" etc, and
204 * see to it that it is NUL-filled.
206 if (alloc
< size
+ SLOP
)
207 buffer
= xrealloc(buffer
, size
+ SLOP
);
208 memset((char *) buffer
+ size
, 0, SLOP
);
212 static unsigned long linelen(const char *buffer
, unsigned long size
)
214 unsigned long len
= 0;
217 if (*buffer
++ == '\n')
223 static int is_dev_null(const char *str
)
225 return !memcmp("/dev/null", str
, 9) && isspace(str
[9]);
231 static int name_terminate(const char *name
, int namelen
, int c
, int terminate
)
233 if (c
== ' ' && !(terminate
& TERM_SPACE
))
235 if (c
== '\t' && !(terminate
& TERM_TAB
))
241 static char * find_name(const char *line
, char *def
, int p_value
, int terminate
)
244 const char *start
= line
;
248 /* Proposed "new-style" GNU patch/diff format; see
249 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
251 name
= unquote_c_style(line
, NULL
);
255 cp
= strchr(name
, '/');
262 /* name can later be freed, so we need
263 * to memmove, not just return cp
265 memmove(name
, cp
, strlen(cp
) + 1);
282 if (name_terminate(start
, line
-start
, c
, terminate
))
286 if (c
== '/' && !--p_value
)
296 * Generally we prefer the shorter name, especially
297 * if the other one is just a variation of that with
298 * something else tacked on to the end (ie "file.orig"
302 int deflen
= strlen(def
);
303 if (deflen
< len
&& !strncmp(start
, def
, deflen
))
307 name
= xmalloc(len
+ 1);
308 memcpy(name
, start
, len
);
315 * Get the name etc info from the --/+++ lines of a traditional patch header
317 * NOTE! This hardcodes "-p1" behaviour in filename detection.
319 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
320 * files, we can happily check the index for a match, but for creating a
321 * new file we should try to match whatever "patch" does. I have no idea.
323 static void parse_traditional_patch(const char *first
, const char *second
, struct patch
*patch
)
327 first
+= 4; /* skip "--- " */
328 second
+= 4; /* skip "+++ " */
329 if (is_dev_null(first
)) {
331 patch
->is_delete
= 0;
332 name
= find_name(second
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
333 patch
->new_name
= name
;
334 } else if (is_dev_null(second
)) {
336 patch
->is_delete
= 1;
337 name
= find_name(first
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
338 patch
->old_name
= name
;
340 name
= find_name(first
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
341 name
= find_name(second
, name
, p_value
, TERM_SPACE
| TERM_TAB
);
342 patch
->old_name
= patch
->new_name
= name
;
345 die("unable to find filename in patch at line %d", linenr
);
348 static int gitdiff_hdrend(const char *line
, struct patch
*patch
)
354 * We're anal about diff header consistency, to make
355 * sure that we don't end up having strange ambiguous
356 * patches floating around.
358 * As a result, gitdiff_{old|new}name() will check
359 * their names against any previous information, just
362 static char *gitdiff_verify_name(const char *line
, int isnull
, char *orig_name
, const char *oldnew
)
364 if (!orig_name
&& !isnull
)
365 return find_name(line
, NULL
, 1, TERM_TAB
);
374 die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name
, linenr
);
375 another
= find_name(line
, NULL
, 1, TERM_TAB
);
376 if (!another
|| memcmp(another
, name
, len
))
377 die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew
, linenr
);
382 /* expect "/dev/null" */
383 if (memcmp("/dev/null", line
, 9) || line
[9] != '\n')
384 die("git-apply: bad git-diff - expected /dev/null on line %d", linenr
);
389 static int gitdiff_oldname(const char *line
, struct patch
*patch
)
391 patch
->old_name
= gitdiff_verify_name(line
, patch
->is_new
, patch
->old_name
, "old");
395 static int gitdiff_newname(const char *line
, struct patch
*patch
)
397 patch
->new_name
= gitdiff_verify_name(line
, patch
->is_delete
, patch
->new_name
, "new");
401 static int gitdiff_oldmode(const char *line
, struct patch
*patch
)
403 patch
->old_mode
= strtoul(line
, NULL
, 8);
407 static int gitdiff_newmode(const char *line
, struct patch
*patch
)
409 patch
->new_mode
= strtoul(line
, NULL
, 8);
413 static int gitdiff_delete(const char *line
, struct patch
*patch
)
415 patch
->is_delete
= 1;
416 patch
->old_name
= patch
->def_name
;
417 return gitdiff_oldmode(line
, patch
);
420 static int gitdiff_newfile(const char *line
, struct patch
*patch
)
423 patch
->new_name
= patch
->def_name
;
424 return gitdiff_newmode(line
, patch
);
427 static int gitdiff_copysrc(const char *line
, struct patch
*patch
)
430 patch
->old_name
= find_name(line
, NULL
, 0, 0);
434 static int gitdiff_copydst(const char *line
, struct patch
*patch
)
437 patch
->new_name
= find_name(line
, NULL
, 0, 0);
441 static int gitdiff_renamesrc(const char *line
, struct patch
*patch
)
443 patch
->is_rename
= 1;
444 patch
->old_name
= find_name(line
, NULL
, 0, 0);
448 static int gitdiff_renamedst(const char *line
, struct patch
*patch
)
450 patch
->is_rename
= 1;
451 patch
->new_name
= find_name(line
, NULL
, 0, 0);
455 static int gitdiff_similarity(const char *line
, struct patch
*patch
)
457 if ((patch
->score
= strtoul(line
, NULL
, 10)) == ULONG_MAX
)
462 static int gitdiff_dissimilarity(const char *line
, struct patch
*patch
)
464 if ((patch
->score
= strtoul(line
, NULL
, 10)) == ULONG_MAX
)
469 static int gitdiff_index(const char *line
, struct patch
*patch
)
471 /* index line is N hexadecimal, "..", N hexadecimal,
472 * and optional space with octal mode.
474 const char *ptr
, *eol
;
477 ptr
= strchr(line
, '.');
478 if (!ptr
|| ptr
[1] != '.' || 40 < ptr
- line
)
481 memcpy(patch
->old_sha1_prefix
, line
, len
);
482 patch
->old_sha1_prefix
[len
] = 0;
485 ptr
= strchr(line
, ' ');
486 eol
= strchr(line
, '\n');
488 if (!ptr
|| eol
< ptr
)
494 memcpy(patch
->new_sha1_prefix
, line
, len
);
495 patch
->new_sha1_prefix
[len
] = 0;
497 patch
->new_mode
= patch
->old_mode
= strtoul(ptr
+1, NULL
, 8);
502 * This is normal for a diff that doesn't change anything: we'll fall through
503 * into the next diff. Tell the parser to break out.
505 static int gitdiff_unrecognized(const char *line
, struct patch
*patch
)
510 static const char *stop_at_slash(const char *line
, int llen
)
514 for (i
= 0; i
< llen
; i
++) {
522 /* This is to extract the same name that appears on "diff --git"
523 * line. We do not find and return anything if it is a rename
524 * patch, and it is OK because we will find the name elsewhere.
525 * We need to reliably find name only when it is mode-change only,
526 * creation or deletion of an empty file. In any of these cases,
527 * both sides are the same name under a/ and b/ respectively.
529 static char *git_header_name(char *line
, int llen
)
533 const char *second
= NULL
;
535 line
+= strlen("diff --git ");
536 llen
-= strlen("diff --git ");
540 char *first
= unquote_c_style(line
, &second
);
544 /* advance to the first slash */
545 cp
= stop_at_slash(first
, strlen(first
));
546 if (!cp
|| cp
== first
) {
547 /* we do not accept absolute paths */
553 memmove(first
, cp
+1, len
+1); /* including NUL */
555 /* second points at one past closing dq of name.
556 * find the second name.
558 while ((second
< line
+ llen
) && isspace(*second
))
561 if (line
+ llen
<= second
)
562 goto free_first_and_fail
;
563 if (*second
== '"') {
564 char *sp
= unquote_c_style(second
, NULL
);
566 goto free_first_and_fail
;
567 cp
= stop_at_slash(sp
, strlen(sp
));
568 if (!cp
|| cp
== sp
) {
571 goto free_first_and_fail
;
573 /* They must match, otherwise ignore */
574 if (strcmp(cp
+1, first
))
575 goto free_both_and_fail
;
580 /* unquoted second */
581 cp
= stop_at_slash(second
, line
+ llen
- second
);
582 if (!cp
|| cp
== second
)
583 goto free_first_and_fail
;
585 if (line
+ llen
- cp
!= len
+ 1 ||
586 memcmp(first
, cp
, len
))
587 goto free_first_and_fail
;
591 /* unquoted first name */
592 name
= stop_at_slash(line
, llen
);
593 if (!name
|| name
== line
)
598 /* since the first name is unquoted, a dq if exists must be
599 * the beginning of the second name.
601 for (second
= name
; second
< line
+ llen
; second
++) {
602 if (*second
== '"') {
603 const char *cp
= second
;
605 char *sp
= unquote_c_style(second
, NULL
);
609 np
= stop_at_slash(sp
, strlen(sp
));
610 if (!np
|| np
== sp
) {
611 free_second_and_fail
:
617 if (len
< cp
- name
&&
618 !strncmp(np
, name
, len
) &&
619 isspace(name
[len
])) {
621 memmove(sp
, np
, len
+ 1);
624 goto free_second_and_fail
;
629 * Accept a name only if it shows up twice, exactly the same
632 for (len
= 0 ; ; len
++) {
647 if (second
[len
] == '\n' && !memcmp(name
, second
, len
)) {
648 char *ret
= xmalloc(len
+ 1);
649 memcpy(ret
, name
, len
);
658 /* Verify that we recognize the lines following a git header */
659 static int parse_git_header(char *line
, int len
, unsigned int size
, struct patch
*patch
)
661 unsigned long offset
;
663 /* A git diff has explicit new/delete information, so we don't guess */
665 patch
->is_delete
= 0;
668 * Some things may not have the old name in the
669 * rest of the headers anywhere (pure mode changes,
670 * or removing or adding empty files), so we get
671 * the default name from the header.
673 patch
->def_name
= git_header_name(line
, len
);
678 for (offset
= len
; size
> 0 ; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
679 static const struct opentry
{
681 int (*fn
)(const char *, struct patch
*);
683 { "@@ -", gitdiff_hdrend
},
684 { "--- ", gitdiff_oldname
},
685 { "+++ ", gitdiff_newname
},
686 { "old mode ", gitdiff_oldmode
},
687 { "new mode ", gitdiff_newmode
},
688 { "deleted file mode ", gitdiff_delete
},
689 { "new file mode ", gitdiff_newfile
},
690 { "copy from ", gitdiff_copysrc
},
691 { "copy to ", gitdiff_copydst
},
692 { "rename old ", gitdiff_renamesrc
},
693 { "rename new ", gitdiff_renamedst
},
694 { "rename from ", gitdiff_renamesrc
},
695 { "rename to ", gitdiff_renamedst
},
696 { "similarity index ", gitdiff_similarity
},
697 { "dissimilarity index ", gitdiff_dissimilarity
},
698 { "index ", gitdiff_index
},
699 { "", gitdiff_unrecognized
},
703 len
= linelen(line
, size
);
704 if (!len
|| line
[len
-1] != '\n')
706 for (i
= 0; i
< ARRAY_SIZE(optable
); i
++) {
707 const struct opentry
*p
= optable
+ i
;
708 int oplen
= strlen(p
->str
);
709 if (len
< oplen
|| memcmp(p
->str
, line
, oplen
))
711 if (p
->fn(line
+ oplen
, patch
) < 0)
720 static int parse_num(const char *line
, unsigned long *p
)
726 *p
= strtoul(line
, &ptr
, 10);
730 static int parse_range(const char *line
, int len
, int offset
, const char *expect
,
731 unsigned long *p1
, unsigned long *p2
)
735 if (offset
< 0 || offset
>= len
)
740 digits
= parse_num(line
, p1
);
750 digits
= parse_num(line
+1, p2
);
762 if (memcmp(line
, expect
, ex
))
769 * Parse a unified diff fragment header of the
770 * form "@@ -a,b +c,d @@"
772 static int parse_fragment_header(char *line
, int len
, struct fragment
*fragment
)
776 if (!len
|| line
[len
-1] != '\n')
779 /* Figure out the number of lines in a fragment */
780 offset
= parse_range(line
, len
, 4, " +", &fragment
->oldpos
, &fragment
->oldlines
);
781 offset
= parse_range(line
, len
, offset
, " @@", &fragment
->newpos
, &fragment
->newlines
);
786 static int find_header(char *line
, unsigned long size
, int *hdrsize
, struct patch
*patch
)
788 unsigned long offset
, len
;
790 patch
->is_rename
= patch
->is_copy
= 0;
791 patch
->is_new
= patch
->is_delete
= -1;
792 patch
->old_mode
= patch
->new_mode
= 0;
793 patch
->old_name
= patch
->new_name
= NULL
;
794 for (offset
= 0; size
> 0; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
795 unsigned long nextlen
;
797 len
= linelen(line
, size
);
801 /* Testing this early allows us to take a few shortcuts.. */
806 * Make sure we don't find any unconnected patch fragments.
807 * That's a sign that we didn't find a header, and that a
808 * patch has become corrupted/broken up.
810 if (!memcmp("@@ -", line
, 4)) {
811 struct fragment dummy
;
812 if (parse_fragment_header(line
, len
, &dummy
) < 0)
814 die("patch fragment without header at line %d: %.*s",
815 linenr
, (int)len
-1, line
);
822 * Git patch? It might not have a real patch, just a rename
823 * or mode change, so we handle that specially
825 if (!memcmp("diff --git ", line
, 11)) {
826 int git_hdr_len
= parse_git_header(line
, len
, size
, patch
);
827 if (git_hdr_len
<= len
)
829 if (!patch
->old_name
&& !patch
->new_name
) {
830 if (!patch
->def_name
)
831 die("git diff header lacks filename information (line %d)", linenr
);
832 patch
->old_name
= patch
->new_name
= patch
->def_name
;
834 *hdrsize
= git_hdr_len
;
838 /** --- followed by +++ ? */
839 if (memcmp("--- ", line
, 4) || memcmp("+++ ", line
+ len
, 4))
843 * We only accept unified patches, so we want it to
844 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
847 nextlen
= linelen(line
+ len
, size
- len
);
848 if (size
< nextlen
+ 14 || memcmp("@@ -", line
+ len
+ nextlen
, 4))
851 /* Ok, we'll consider it a patch */
852 parse_traditional_patch(line
, line
+len
, patch
);
853 *hdrsize
= len
+ nextlen
;
860 static void check_whitespace(const char *line
, int len
)
862 const char *err
= "Adds trailing whitespace";
867 * We know len is at least two, since we have a '+' and we
868 * checked that the last character was a '\n' before calling
869 * this function. That is, an addition of an empty line would
870 * check the '+' here. Sneaky...
872 if (isspace(line
[len
-2]))
876 * Make sure that there is no space followed by a tab in
879 err
= "Space in indent is followed by a tab";
880 for (i
= 1; i
< len
; i
++) {
881 if (line
[i
] == '\t') {
885 else if (line
[i
] == ' ')
894 if (squelch_whitespace_errors
&&
895 squelch_whitespace_errors
< whitespace_error
)
898 fprintf(stderr
, "%s.\n%s:%d:%.*s\n",
899 err
, patch_input_file
, linenr
, len
-2, line
+1);
904 * Parse a unified diff. Note that this really needs to parse each
905 * fragment separately, since the only way to know the difference
906 * between a "---" that is part of a patch, and a "---" that starts
907 * the next patch is to look at the line counts..
909 static int parse_fragment(char *line
, unsigned long size
, struct patch
*patch
, struct fragment
*fragment
)
912 int len
= linelen(line
, size
), offset
;
913 unsigned long oldlines
, newlines
;
914 unsigned long leading
, trailing
;
916 offset
= parse_fragment_header(line
, len
, fragment
);
919 oldlines
= fragment
->oldlines
;
920 newlines
= fragment
->newlines
;
924 /* Parse the thing.. */
931 offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
932 if (!oldlines
&& !newlines
)
934 len
= linelen(line
, size
);
935 if (!len
|| line
[len
-1] != '\n')
940 case '\n': /* newer GNU diff, an empty context line */
944 if (!deleted
&& !added
)
954 if (new_whitespace
!= nowarn_whitespace
)
955 check_whitespace(line
, len
);
961 /* We allow "\ No newline at end of file". Depending
962 * on locale settings when the patch was produced we
963 * don't know what this line looks like. The only
964 * thing we do know is that it begins with "\ ".
965 * Checking for 12 is just for sanity check -- any
966 * l10n of "\ No newline..." is at least that long.
969 if (len
< 12 || memcmp(line
, "\\ ", 2))
974 if (oldlines
|| newlines
)
976 fragment
->leading
= leading
;
977 fragment
->trailing
= trailing
;
979 /* If a fragment ends with an incomplete line, we failed to include
980 * it in the above loop because we hit oldlines == newlines == 0
983 if (12 < size
&& !memcmp(line
, "\\ ", 2))
984 offset
+= linelen(line
, size
);
986 patch
->lines_added
+= added
;
987 patch
->lines_deleted
+= deleted
;
989 if (0 < patch
->is_new
&& oldlines
)
990 return error("new file depends on old contents");
991 if (0 < patch
->is_delete
&& newlines
)
992 return error("deleted file still has contents");
996 static int parse_single_patch(char *line
, unsigned long size
, struct patch
*patch
)
998 unsigned long offset
= 0;
999 unsigned long oldlines
= 0, newlines
= 0, context
= 0;
1000 struct fragment
**fragp
= &patch
->fragments
;
1002 while (size
> 4 && !memcmp(line
, "@@ -", 4)) {
1003 struct fragment
*fragment
;
1006 fragment
= xcalloc(1, sizeof(*fragment
));
1007 len
= parse_fragment(line
, size
, patch
, fragment
);
1009 die("corrupt patch at line %d", linenr
);
1010 fragment
->patch
= line
;
1011 fragment
->size
= len
;
1012 oldlines
+= fragment
->oldlines
;
1013 newlines
+= fragment
->newlines
;
1014 context
+= fragment
->leading
+ fragment
->trailing
;
1017 fragp
= &fragment
->next
;
1025 * If something was removed (i.e. we have old-lines) it cannot
1026 * be creation, and if something was added it cannot be
1027 * deletion. However, the reverse is not true; --unified=0
1028 * patches that only add are not necessarily creation even
1029 * though they do not have any old lines, and ones that only
1030 * delete are not necessarily deletion.
1032 * Unfortunately, a real creation/deletion patch do _not_ have
1033 * any context line by definition, so we cannot safely tell it
1034 * apart with --unified=0 insanity. At least if the patch has
1035 * more than one hunk it is not creation or deletion.
1037 if (patch
->is_new
< 0 &&
1038 (oldlines
|| (patch
->fragments
&& patch
->fragments
->next
)))
1040 if (patch
->is_delete
< 0 &&
1041 (newlines
|| (patch
->fragments
&& patch
->fragments
->next
)))
1042 patch
->is_delete
= 0;
1043 if (!unidiff_zero
|| context
) {
1044 /* If the user says the patch is not generated with
1045 * --unified=0, or if we have seen context lines,
1046 * then not having oldlines means the patch is creation,
1047 * and not having newlines means the patch is deletion.
1049 if (patch
->is_new
< 0 && !oldlines
) {
1051 patch
->old_name
= NULL
;
1053 if (patch
->is_delete
< 0 && !newlines
) {
1054 patch
->is_delete
= 1;
1055 patch
->new_name
= NULL
;
1059 if (0 < patch
->is_new
&& oldlines
)
1060 die("new file %s depends on old contents", patch
->new_name
);
1061 if (0 < patch
->is_delete
&& newlines
)
1062 die("deleted file %s still has contents", patch
->old_name
);
1063 if (!patch
->is_delete
&& !newlines
&& context
)
1064 fprintf(stderr
, "** warning: file %s becomes empty but "
1065 "is not deleted\n", patch
->new_name
);
1070 static inline int metadata_changes(struct patch
*patch
)
1072 return patch
->is_rename
> 0 ||
1073 patch
->is_copy
> 0 ||
1074 patch
->is_new
> 0 ||
1076 (patch
->old_mode
&& patch
->new_mode
&&
1077 patch
->old_mode
!= patch
->new_mode
);
1080 static char *inflate_it(const void *data
, unsigned long size
,
1081 unsigned long inflated_size
)
1087 memset(&stream
, 0, sizeof(stream
));
1089 stream
.next_in
= (unsigned char *)data
;
1090 stream
.avail_in
= size
;
1091 stream
.next_out
= out
= xmalloc(inflated_size
);
1092 stream
.avail_out
= inflated_size
;
1093 inflateInit(&stream
);
1094 st
= inflate(&stream
, Z_FINISH
);
1095 if ((st
!= Z_STREAM_END
) || stream
.total_out
!= inflated_size
) {
1102 static struct fragment
*parse_binary_hunk(char **buf_p
,
1103 unsigned long *sz_p
,
1107 /* Expect a line that begins with binary patch method ("literal"
1108 * or "delta"), followed by the length of data before deflating.
1109 * a sequence of 'length-byte' followed by base-85 encoded data
1110 * should follow, terminated by a newline.
1112 * Each 5-byte sequence of base-85 encodes up to 4 bytes,
1113 * and we would limit the patch line to 66 characters,
1114 * so one line can fit up to 13 groups that would decode
1115 * to 52 bytes max. The length byte 'A'-'Z' corresponds
1116 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
1119 unsigned long size
= *sz_p
;
1120 char *buffer
= *buf_p
;
1122 unsigned long origlen
;
1125 struct fragment
*frag
;
1127 llen
= linelen(buffer
, size
);
1132 if (!strncmp(buffer
, "delta ", 6)) {
1133 patch_method
= BINARY_DELTA_DEFLATED
;
1134 origlen
= strtoul(buffer
+ 6, NULL
, 10);
1136 else if (!strncmp(buffer
, "literal ", 8)) {
1137 patch_method
= BINARY_LITERAL_DEFLATED
;
1138 origlen
= strtoul(buffer
+ 8, NULL
, 10);
1146 int byte_length
, max_byte_length
, newsize
;
1147 llen
= linelen(buffer
, size
);
1151 /* consume the blank line */
1156 /* Minimum line is "A00000\n" which is 7-byte long,
1157 * and the line length must be multiple of 5 plus 2.
1159 if ((llen
< 7) || (llen
-2) % 5)
1161 max_byte_length
= (llen
- 2) / 5 * 4;
1162 byte_length
= *buffer
;
1163 if ('A' <= byte_length
&& byte_length
<= 'Z')
1164 byte_length
= byte_length
- 'A' + 1;
1165 else if ('a' <= byte_length
&& byte_length
<= 'z')
1166 byte_length
= byte_length
- 'a' + 27;
1169 /* if the input length was not multiple of 4, we would
1170 * have filler at the end but the filler should never
1173 if (max_byte_length
< byte_length
||
1174 byte_length
<= max_byte_length
- 4)
1176 newsize
= hunk_size
+ byte_length
;
1177 data
= xrealloc(data
, newsize
);
1178 if (decode_85(data
+ hunk_size
, buffer
+ 1, byte_length
))
1180 hunk_size
= newsize
;
1185 frag
= xcalloc(1, sizeof(*frag
));
1186 frag
->patch
= inflate_it(data
, hunk_size
, origlen
);
1190 frag
->size
= origlen
;
1194 frag
->binary_patch_method
= patch_method
;
1200 error("corrupt binary patch at line %d: %.*s",
1201 linenr
-1, llen
-1, buffer
);
1205 static int parse_binary(char *buffer
, unsigned long size
, struct patch
*patch
)
1207 /* We have read "GIT binary patch\n"; what follows is a line
1208 * that says the patch method (currently, either "literal" or
1209 * "delta") and the length of data before deflating; a
1210 * sequence of 'length-byte' followed by base-85 encoded data
1213 * When a binary patch is reversible, there is another binary
1214 * hunk in the same format, starting with patch method (either
1215 * "literal" or "delta") with the length of data, and a sequence
1216 * of length-byte + base-85 encoded data, terminated with another
1217 * empty line. This data, when applied to the postimage, produces
1220 struct fragment
*forward
;
1221 struct fragment
*reverse
;
1225 forward
= parse_binary_hunk(&buffer
, &size
, &status
, &used
);
1226 if (!forward
&& !status
)
1227 /* there has to be one hunk (forward hunk) */
1228 return error("unrecognized binary patch at line %d", linenr
-1);
1230 /* otherwise we already gave an error message */
1233 reverse
= parse_binary_hunk(&buffer
, &size
, &status
, &used_1
);
1237 /* not having reverse hunk is not an error, but having
1238 * a corrupt reverse hunk is.
1240 free((void*) forward
->patch
);
1244 forward
->next
= reverse
;
1245 patch
->fragments
= forward
;
1246 patch
->is_binary
= 1;
1250 static int parse_chunk(char *buffer
, unsigned long size
, struct patch
*patch
)
1252 int hdrsize
, patchsize
;
1253 int offset
= find_header(buffer
, size
, &hdrsize
, patch
);
1258 patchsize
= parse_single_patch(buffer
+ offset
+ hdrsize
, size
- offset
- hdrsize
, patch
);
1261 static const char *binhdr
[] = {
1266 static const char git_binary
[] = "GIT binary patch\n";
1268 int hd
= hdrsize
+ offset
;
1269 unsigned long llen
= linelen(buffer
+ hd
, size
- hd
);
1271 if (llen
== sizeof(git_binary
) - 1 &&
1272 !memcmp(git_binary
, buffer
+ hd
, llen
)) {
1275 used
= parse_binary(buffer
+ hd
+ llen
,
1276 size
- hd
- llen
, patch
);
1278 patchsize
= used
+ llen
;
1282 else if (!memcmp(" differ\n", buffer
+ hd
+ llen
- 8, 8)) {
1283 for (i
= 0; binhdr
[i
]; i
++) {
1284 int len
= strlen(binhdr
[i
]);
1285 if (len
< size
- hd
&&
1286 !memcmp(binhdr
[i
], buffer
+ hd
, len
)) {
1288 patch
->is_binary
= 1;
1295 /* Empty patch cannot be applied if it is a text patch
1296 * without metadata change. A binary patch appears
1299 if ((apply
|| check
) &&
1300 (!patch
->is_binary
&& !metadata_changes(patch
)))
1301 die("patch with only garbage at line %d", linenr
);
1304 return offset
+ hdrsize
+ patchsize
;
1307 #define swap(a,b) myswap((a),(b),sizeof(a))
1309 #define myswap(a, b, size) do { \
1310 unsigned char mytmp[size]; \
1311 memcpy(mytmp, &a, size); \
1312 memcpy(&a, &b, size); \
1313 memcpy(&b, mytmp, size); \
1316 static void reverse_patches(struct patch
*p
)
1318 for (; p
; p
= p
->next
) {
1319 struct fragment
*frag
= p
->fragments
;
1321 swap(p
->new_name
, p
->old_name
);
1322 swap(p
->new_mode
, p
->old_mode
);
1323 swap(p
->is_new
, p
->is_delete
);
1324 swap(p
->lines_added
, p
->lines_deleted
);
1325 swap(p
->old_sha1_prefix
, p
->new_sha1_prefix
);
1327 for (; frag
; frag
= frag
->next
) {
1328 swap(frag
->newpos
, frag
->oldpos
);
1329 swap(frag
->newlines
, frag
->oldlines
);
1334 static const char pluses
[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
1335 static const char minuses
[]= "----------------------------------------------------------------------";
1337 static void show_stats(struct patch
*patch
)
1339 const char *prefix
= "";
1340 char *name
= patch
->new_name
;
1342 int len
, max
, add
, del
, total
;
1345 name
= patch
->old_name
;
1347 if (0 < (len
= quote_c_style(name
, NULL
, NULL
, 0))) {
1348 qname
= xmalloc(len
+ 1);
1349 quote_c_style(name
, qname
, NULL
, 0);
1354 * "scale" the filename
1365 slash
= strchr(name
, '/');
1372 * scale the add/delete
1378 add
= patch
->lines_added
;
1379 del
= patch
->lines_deleted
;
1382 if (max_change
> 0) {
1383 total
= (total
* max
+ max_change
/ 2) / max_change
;
1384 add
= (add
* max
+ max_change
/ 2) / max_change
;
1387 if (patch
->is_binary
)
1388 printf(" %s%-*s | Bin\n", prefix
, len
, name
);
1390 printf(" %s%-*s |%5d %.*s%.*s\n", prefix
,
1391 len
, name
, patch
->lines_added
+ patch
->lines_deleted
,
1392 add
, pluses
, del
, minuses
);
1396 static int read_old_data(struct stat
*st
, const char *path
, char **buf_p
, unsigned long *alloc_p
, unsigned long *size_p
)
1400 unsigned long nsize
;
1402 unsigned long size
= *size_p
;
1405 switch (st
->st_mode
& S_IFMT
) {
1407 return readlink(path
, buf
, size
) != size
;
1409 fd
= open(path
, O_RDONLY
);
1411 return error("unable to open %s", path
);
1414 int ret
= xread(fd
, buf
+ got
, size
- got
);
1422 if (convert_to_git(path
, &nbuf
, &nsize
)) {
1434 static int find_offset(const char *buf
, unsigned long size
, const char *fragment
, unsigned long fragsize
, int line
, int *lines
)
1437 unsigned long start
, backwards
, forwards
;
1439 if (fragsize
> size
)
1444 unsigned long offset
= 0;
1446 while (offset
+ fragsize
<= size
) {
1447 if (buf
[offset
++] == '\n') {
1455 /* Exact line number? */
1456 if (!memcmp(buf
+ start
, fragment
, fragsize
))
1460 * There's probably some smart way to do this, but I'll leave
1461 * that to the smart and beautiful people. I'm simple and stupid.
1465 for (i
= 0; ; i
++) {
1472 if (forwards
+ fragsize
> size
)
1478 } while (backwards
&& buf
[backwards
-1] != '\n');
1481 while (forwards
+ fragsize
<= size
) {
1482 if (buf
[forwards
++] == '\n')
1488 if (try + fragsize
> size
)
1490 if (memcmp(buf
+ try, fragment
, fragsize
))
1500 * We should start searching forward and backward.
1505 static void remove_first_line(const char **rbuf
, int *rsize
)
1507 const char *buf
= *rbuf
;
1509 unsigned long offset
;
1511 while (offset
<= size
) {
1512 if (buf
[offset
++] == '\n')
1515 *rsize
= size
- offset
;
1516 *rbuf
= buf
+ offset
;
1519 static void remove_last_line(const char **rbuf
, int *rsize
)
1521 const char *buf
= *rbuf
;
1523 unsigned long offset
;
1525 while (offset
> 0) {
1526 if (buf
[--offset
] == '\n')
1529 *rsize
= offset
+ 1;
1532 struct buffer_desc
{
1535 unsigned long alloc
;
1538 static int apply_line(char *output
, const char *patch
, int plen
)
1540 /* plen is number of bytes to be copied from patch,
1541 * starting at patch+1 (patch[0] is '+'). Typically
1542 * patch[plen] is '\n', unless this is the incomplete
1546 int add_nl_to_tail
= 0;
1548 int last_tab_in_indent
= -1;
1549 int last_space_in_indent
= -1;
1550 int need_fix_leading_space
= 0;
1553 if ((new_whitespace
!= strip_whitespace
) || !whitespace_error
) {
1554 memcpy(output
, patch
+ 1, plen
);
1558 if (1 < plen
&& isspace(patch
[plen
-1])) {
1559 if (patch
[plen
] == '\n')
1562 while (0 < plen
&& isspace(patch
[plen
]))
1567 for (i
= 1; i
< plen
; i
++) {
1570 last_tab_in_indent
= i
;
1571 if (0 <= last_space_in_indent
)
1572 need_fix_leading_space
= 1;
1575 last_space_in_indent
= i
;
1581 if (need_fix_leading_space
) {
1582 /* between patch[1..last_tab_in_indent] strip the
1583 * funny spaces, updating them to tab as needed.
1585 for (i
= 1; i
< last_tab_in_indent
; i
++, plen
--) {
1589 else if ((i
% 8) == 0)
1593 i
= last_tab_in_indent
;
1598 memcpy(output
, patch
+ i
, plen
);
1600 output
[plen
++] = '\n';
1602 applied_after_stripping
++;
1603 return output
+ plen
- buf
;
1606 static int apply_one_fragment(struct buffer_desc
*desc
, struct fragment
*frag
, int inaccurate_eof
)
1608 int match_beginning
, match_end
;
1609 char *buf
= desc
->buffer
;
1610 const char *patch
= frag
->patch
;
1611 int offset
, size
= frag
->size
;
1612 char *old
= xmalloc(size
);
1613 char *new = xmalloc(size
);
1614 const char *oldlines
, *newlines
;
1615 int oldsize
= 0, newsize
= 0;
1616 unsigned long leading
, trailing
;
1621 int len
= linelen(patch
, size
);
1628 * "plen" is how much of the line we should use for
1629 * the actual patch data. Normally we just remove the
1630 * first character on the line, but if the line is
1631 * followed by "\ No newline", then we also remove the
1632 * last one (which is the newline, of course).
1635 if (len
< size
&& patch
[len
] == '\\')
1638 if (apply_in_reverse
) {
1641 else if (first
== '+')
1646 /* Newer GNU diff, empty context line */
1648 /* ... followed by '\No newline'; nothing */
1650 old
[oldsize
++] = '\n';
1651 new[newsize
++] = '\n';
1655 memcpy(old
+ oldsize
, patch
+ 1, plen
);
1659 /* Fall-through for ' ' */
1661 if (first
!= '+' || !no_add
)
1662 newsize
+= apply_line(new + newsize
, patch
,
1665 case '@': case '\\':
1666 /* Ignore it, we already handled it */
1675 if (inaccurate_eof
&& oldsize
> 0 && old
[oldsize
- 1] == '\n' &&
1676 newsize
> 0 && new[newsize
- 1] == '\n') {
1683 leading
= frag
->leading
;
1684 trailing
= frag
->trailing
;
1687 * If we don't have any leading/trailing data in the patch,
1688 * we want it to match at the beginning/end of the file.
1690 * But that would break if the patch is generated with
1691 * --unified=0; sane people wouldn't do that to cause us
1692 * trouble, but we try to please not so sane ones as well.
1695 match_beginning
= (!leading
&& !frag
->oldpos
);
1699 match_beginning
= !leading
&& (frag
->oldpos
== 1);
1700 match_end
= !trailing
;
1706 offset
= find_offset(buf
, desc
->size
,
1707 oldlines
, oldsize
, pos
, &lines
);
1708 if (match_end
&& offset
+ oldsize
!= desc
->size
)
1710 if (match_beginning
&& offset
)
1713 int diff
= newsize
- oldsize
;
1714 unsigned long size
= desc
->size
+ diff
;
1715 unsigned long alloc
= desc
->alloc
;
1717 /* Warn if it was necessary to reduce the number
1720 if ((leading
!= frag
->leading
) ||
1721 (trailing
!= frag
->trailing
))
1722 fprintf(stderr
, "Context reduced to (%ld/%ld)"
1723 " to apply fragment at %d\n",
1724 leading
, trailing
, pos
+ lines
);
1727 alloc
= size
+ 8192;
1728 desc
->alloc
= alloc
;
1729 buf
= xrealloc(buf
, alloc
);
1733 memmove(buf
+ offset
+ newsize
,
1734 buf
+ offset
+ oldsize
,
1735 size
- offset
- newsize
);
1736 memcpy(buf
+ offset
, newlines
, newsize
);
1742 /* Am I at my context limits? */
1743 if ((leading
<= p_context
) && (trailing
<= p_context
))
1745 if (match_beginning
|| match_end
) {
1746 match_beginning
= match_end
= 0;
1749 /* Reduce the number of context lines
1750 * Reduce both leading and trailing if they are equal
1751 * otherwise just reduce the larger context.
1753 if (leading
>= trailing
) {
1754 remove_first_line(&oldlines
, &oldsize
);
1755 remove_first_line(&newlines
, &newsize
);
1759 if (trailing
> leading
) {
1760 remove_last_line(&oldlines
, &oldsize
);
1761 remove_last_line(&newlines
, &newsize
);
1771 static int apply_binary_fragment(struct buffer_desc
*desc
, struct patch
*patch
)
1773 unsigned long dst_size
;
1774 struct fragment
*fragment
= patch
->fragments
;
1778 /* Binary patch is irreversible without the optional second hunk */
1779 if (apply_in_reverse
) {
1780 if (!fragment
->next
)
1781 return error("cannot reverse-apply a binary patch "
1782 "without the reverse hunk to '%s'",
1784 ? patch
->new_name
: patch
->old_name
);
1785 fragment
= fragment
->next
;
1787 data
= (void*) fragment
->patch
;
1788 switch (fragment
->binary_patch_method
) {
1789 case BINARY_DELTA_DEFLATED
:
1790 result
= patch_delta(desc
->buffer
, desc
->size
,
1795 desc
->buffer
= result
;
1797 case BINARY_LITERAL_DEFLATED
:
1799 desc
->buffer
= data
;
1800 dst_size
= fragment
->size
;
1805 desc
->size
= desc
->alloc
= dst_size
;
1809 static int apply_binary(struct buffer_desc
*desc
, struct patch
*patch
)
1811 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
1812 unsigned char sha1
[20];
1814 /* For safety, we require patch index line to contain
1815 * full 40-byte textual SHA1 for old and new, at least for now.
1817 if (strlen(patch
->old_sha1_prefix
) != 40 ||
1818 strlen(patch
->new_sha1_prefix
) != 40 ||
1819 get_sha1_hex(patch
->old_sha1_prefix
, sha1
) ||
1820 get_sha1_hex(patch
->new_sha1_prefix
, sha1
))
1821 return error("cannot apply binary patch to '%s' "
1822 "without full index line", name
);
1824 if (patch
->old_name
) {
1825 /* See if the old one matches what the patch
1828 hash_sha1_file(desc
->buffer
, desc
->size
, blob_type
, sha1
);
1829 if (strcmp(sha1_to_hex(sha1
), patch
->old_sha1_prefix
))
1830 return error("the patch applies to '%s' (%s), "
1831 "which does not match the "
1832 "current contents.",
1833 name
, sha1_to_hex(sha1
));
1836 /* Otherwise, the old one must be empty. */
1838 return error("the patch applies to an empty "
1839 "'%s' but it is not empty", name
);
1842 get_sha1_hex(patch
->new_sha1_prefix
, sha1
);
1843 if (is_null_sha1(sha1
)) {
1845 desc
->alloc
= desc
->size
= 0;
1846 desc
->buffer
= NULL
;
1847 return 0; /* deletion patch */
1850 if (has_sha1_file(sha1
)) {
1851 /* We already have the postimage */
1856 desc
->buffer
= read_sha1_file(sha1
, type
, &size
);
1858 return error("the necessary postimage %s for "
1859 "'%s' cannot be read",
1860 patch
->new_sha1_prefix
, name
);
1861 desc
->alloc
= desc
->size
= size
;
1864 /* We have verified desc matches the preimage;
1865 * apply the patch data to it, which is stored
1866 * in the patch->fragments->{patch,size}.
1868 if (apply_binary_fragment(desc
, patch
))
1869 return error("binary patch does not apply to '%s'",
1872 /* verify that the result matches */
1873 hash_sha1_file(desc
->buffer
, desc
->size
, blob_type
, sha1
);
1874 if (strcmp(sha1_to_hex(sha1
), patch
->new_sha1_prefix
))
1875 return error("binary patch to '%s' creates incorrect result (expecting %s, got %s)", name
, patch
->new_sha1_prefix
, sha1_to_hex(sha1
));
1881 static int apply_fragments(struct buffer_desc
*desc
, struct patch
*patch
)
1883 struct fragment
*frag
= patch
->fragments
;
1884 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
1886 if (patch
->is_binary
)
1887 return apply_binary(desc
, patch
);
1890 if (apply_one_fragment(desc
, frag
, patch
->inaccurate_eof
)) {
1891 error("patch failed: %s:%ld", name
, frag
->oldpos
);
1892 if (!apply_with_reject
)
1901 static int apply_data(struct patch
*patch
, struct stat
*st
, struct cache_entry
*ce
)
1904 unsigned long size
, alloc
;
1905 struct buffer_desc desc
;
1913 buf
= read_sha1_file(ce
->sha1
, type
, &size
);
1915 return error("read of %s failed",
1920 else if (patch
->old_name
) {
1922 alloc
= size
+ 8192;
1923 buf
= xmalloc(alloc
);
1924 if (read_old_data(st
, patch
->old_name
, &buf
, &alloc
, &size
))
1925 return error("read of %s failed", patch
->old_name
);
1932 if (apply_fragments(&desc
, patch
) < 0)
1933 return -1; /* note with --reject this succeeds. */
1935 /* NUL terminate the result */
1936 if (desc
.alloc
<= desc
.size
)
1937 desc
.buffer
= xrealloc(desc
.buffer
, desc
.size
+ 1);
1938 desc
.buffer
[desc
.size
] = 0;
1940 patch
->result
= desc
.buffer
;
1941 patch
->resultsize
= desc
.size
;
1943 if (0 < patch
->is_delete
&& patch
->resultsize
)
1944 return error("removal patch leaves file contents");
1949 static int check_patch(struct patch
*patch
, struct patch
*prev_patch
)
1952 const char *old_name
= patch
->old_name
;
1953 const char *new_name
= patch
->new_name
;
1954 const char *name
= old_name
? old_name
: new_name
;
1955 struct cache_entry
*ce
= NULL
;
1958 patch
->rejected
= 1; /* we will drop this after we succeed */
1962 unsigned st_mode
= 0;
1965 stat_ret
= lstat(old_name
, &st
);
1967 int pos
= cache_name_pos(old_name
, strlen(old_name
));
1969 return error("%s: does not exist in index",
1971 ce
= active_cache
[pos
];
1973 struct checkout costate
;
1974 if (errno
!= ENOENT
)
1975 return error("%s: %s", old_name
,
1978 costate
.base_dir
= "";
1979 costate
.base_dir_len
= 0;
1982 costate
.not_new
= 0;
1983 costate
.refresh_cache
= 1;
1984 if (checkout_entry(ce
,
1987 lstat(old_name
, &st
))
1991 changed
= ce_match_stat(ce
, &st
, 1);
1993 return error("%s: does not match index",
1996 st_mode
= ntohl(ce
->ce_mode
);
1998 else if (stat_ret
< 0)
1999 return error("%s: %s", old_name
, strerror(errno
));
2002 st_mode
= ntohl(create_ce_mode(st
.st_mode
));
2004 if (patch
->is_new
< 0)
2006 if (!patch
->old_mode
)
2007 patch
->old_mode
= st_mode
;
2008 if ((st_mode
^ patch
->old_mode
) & S_IFMT
)
2009 return error("%s: wrong type", old_name
);
2010 if (st_mode
!= patch
->old_mode
)
2011 fprintf(stderr
, "warning: %s has type %o, expected %o\n",
2012 old_name
, st_mode
, patch
->old_mode
);
2015 if (new_name
&& prev_patch
&& 0 < prev_patch
->is_delete
&&
2016 !strcmp(prev_patch
->old_name
, new_name
))
2017 /* A type-change diff is always split into a patch to
2018 * delete old, immediately followed by a patch to
2019 * create new (see diff.c::run_diff()); in such a case
2020 * it is Ok that the entry to be deleted by the
2021 * previous patch is still in the working tree and in
2029 ((0 < patch
->is_new
) | (0 < patch
->is_rename
) | patch
->is_copy
)) {
2031 cache_name_pos(new_name
, strlen(new_name
)) >= 0 &&
2033 return error("%s: already exists in index", new_name
);
2036 if (!lstat(new_name
, &nst
)) {
2037 if (S_ISDIR(nst
.st_mode
) || ok_if_exists
)
2040 return error("%s: already exists in working directory", new_name
);
2042 else if ((errno
!= ENOENT
) && (errno
!= ENOTDIR
))
2043 return error("%s: %s", new_name
, strerror(errno
));
2045 if (!patch
->new_mode
) {
2046 if (0 < patch
->is_new
)
2047 patch
->new_mode
= S_IFREG
| 0644;
2049 patch
->new_mode
= patch
->old_mode
;
2053 if (new_name
&& old_name
) {
2054 int same
= !strcmp(old_name
, new_name
);
2055 if (!patch
->new_mode
)
2056 patch
->new_mode
= patch
->old_mode
;
2057 if ((patch
->old_mode
^ patch
->new_mode
) & S_IFMT
)
2058 return error("new mode (%o) of %s does not match old mode (%o)%s%s",
2059 patch
->new_mode
, new_name
, patch
->old_mode
,
2060 same
? "" : " of ", same
? "" : old_name
);
2063 if (apply_data(patch
, &st
, ce
) < 0)
2064 return error("%s: patch does not apply", name
);
2065 patch
->rejected
= 0;
2069 static int check_patch_list(struct patch
*patch
)
2071 struct patch
*prev_patch
= NULL
;
2074 for (prev_patch
= NULL
; patch
; patch
= patch
->next
) {
2075 if (apply_verbosely
)
2076 say_patch_name(stderr
,
2077 "Checking patch ", patch
, "...\n");
2078 err
|= check_patch(patch
, prev_patch
);
2084 static void show_index_list(struct patch
*list
)
2086 struct patch
*patch
;
2088 /* Once we start supporting the reverse patch, it may be
2089 * worth showing the new sha1 prefix, but until then...
2091 for (patch
= list
; patch
; patch
= patch
->next
) {
2092 const unsigned char *sha1_ptr
;
2093 unsigned char sha1
[20];
2096 name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
2097 if (0 < patch
->is_new
)
2098 sha1_ptr
= null_sha1
;
2099 else if (get_sha1(patch
->old_sha1_prefix
, sha1
))
2100 die("sha1 information is lacking or useless (%s).",
2105 printf("%06o %s ",patch
->old_mode
, sha1_to_hex(sha1_ptr
));
2106 if (line_termination
&& quote_c_style(name
, NULL
, NULL
, 0))
2107 quote_c_style(name
, NULL
, stdout
, 0);
2109 fputs(name
, stdout
);
2110 putchar(line_termination
);
2114 static void stat_patch_list(struct patch
*patch
)
2116 int files
, adds
, dels
;
2118 for (files
= adds
= dels
= 0 ; patch
; patch
= patch
->next
) {
2120 adds
+= patch
->lines_added
;
2121 dels
+= patch
->lines_deleted
;
2125 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files
, adds
, dels
);
2128 static void numstat_patch_list(struct patch
*patch
)
2130 for ( ; patch
; patch
= patch
->next
) {
2132 name
= patch
->new_name
? patch
->new_name
: patch
->old_name
;
2133 if (patch
->is_binary
)
2137 patch
->lines_added
, patch
->lines_deleted
);
2138 if (line_termination
&& quote_c_style(name
, NULL
, NULL
, 0))
2139 quote_c_style(name
, NULL
, stdout
, 0);
2141 fputs(name
, stdout
);
2142 putchar(line_termination
);
2146 static void show_file_mode_name(const char *newdelete
, unsigned int mode
, const char *name
)
2149 printf(" %s mode %06o %s\n", newdelete
, mode
, name
);
2151 printf(" %s %s\n", newdelete
, name
);
2154 static void show_mode_change(struct patch
*p
, int show_name
)
2156 if (p
->old_mode
&& p
->new_mode
&& p
->old_mode
!= p
->new_mode
) {
2158 printf(" mode change %06o => %06o %s\n",
2159 p
->old_mode
, p
->new_mode
, p
->new_name
);
2161 printf(" mode change %06o => %06o\n",
2162 p
->old_mode
, p
->new_mode
);
2166 static void show_rename_copy(struct patch
*p
)
2168 const char *renamecopy
= p
->is_rename
? "rename" : "copy";
2169 const char *old
, *new;
2171 /* Find common prefix */
2175 const char *slash_old
, *slash_new
;
2176 slash_old
= strchr(old
, '/');
2177 slash_new
= strchr(new, '/');
2180 slash_old
- old
!= slash_new
- new ||
2181 memcmp(old
, new, slash_new
- new))
2183 old
= slash_old
+ 1;
2184 new = slash_new
+ 1;
2186 /* p->old_name thru old is the common prefix, and old and new
2187 * through the end of names are renames
2189 if (old
!= p
->old_name
)
2190 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy
,
2191 (int)(old
- p
->old_name
), p
->old_name
,
2192 old
, new, p
->score
);
2194 printf(" %s %s => %s (%d%%)\n", renamecopy
,
2195 p
->old_name
, p
->new_name
, p
->score
);
2196 show_mode_change(p
, 0);
2199 static void summary_patch_list(struct patch
*patch
)
2203 for (p
= patch
; p
; p
= p
->next
) {
2205 show_file_mode_name("create", p
->new_mode
, p
->new_name
);
2206 else if (p
->is_delete
)
2207 show_file_mode_name("delete", p
->old_mode
, p
->old_name
);
2209 if (p
->is_rename
|| p
->is_copy
)
2210 show_rename_copy(p
);
2213 printf(" rewrite %s (%d%%)\n",
2214 p
->new_name
, p
->score
);
2215 show_mode_change(p
, 0);
2218 show_mode_change(p
, 1);
2224 static void patch_stats(struct patch
*patch
)
2226 int lines
= patch
->lines_added
+ patch
->lines_deleted
;
2228 if (lines
> max_change
)
2230 if (patch
->old_name
) {
2231 int len
= quote_c_style(patch
->old_name
, NULL
, NULL
, 0);
2233 len
= strlen(patch
->old_name
);
2237 if (patch
->new_name
) {
2238 int len
= quote_c_style(patch
->new_name
, NULL
, NULL
, 0);
2240 len
= strlen(patch
->new_name
);
2246 static void remove_file(struct patch
*patch
)
2249 if (remove_file_from_cache(patch
->old_name
) < 0)
2250 die("unable to remove %s from index", patch
->old_name
);
2251 cache_tree_invalidate_path(active_cache_tree
, patch
->old_name
);
2254 if (!unlink(patch
->old_name
)) {
2255 char *name
= xstrdup(patch
->old_name
);
2256 char *end
= strrchr(name
, '/');
2261 end
= strrchr(name
, '/');
2268 static void add_index_file(const char *path
, unsigned mode
, void *buf
, unsigned long size
)
2271 struct cache_entry
*ce
;
2272 int namelen
= strlen(path
);
2273 unsigned ce_size
= cache_entry_size(namelen
);
2278 ce
= xcalloc(1, ce_size
);
2279 memcpy(ce
->name
, path
, namelen
);
2280 ce
->ce_mode
= create_ce_mode(mode
);
2281 ce
->ce_flags
= htons(namelen
);
2283 if (lstat(path
, &st
) < 0)
2284 die("unable to stat newly created file %s", path
);
2285 fill_stat_cache_info(ce
, &st
);
2287 if (write_sha1_file(buf
, size
, blob_type
, ce
->sha1
) < 0)
2288 die("unable to create backing store for newly created file %s", path
);
2289 if (add_cache_entry(ce
, ADD_CACHE_OK_TO_ADD
) < 0)
2290 die("unable to add cache entry for %s", path
);
2293 static int try_create_file(const char *path
, unsigned int mode
, const char *buf
, unsigned long size
)
2297 unsigned long nsize
;
2300 /* Although buf:size is counted string, it also is NUL
2303 return symlink(buf
, path
);
2305 nbuf
= (char *) buf
;
2306 if (convert_to_working_tree(path
, &nbuf
, &nsize
)) {
2312 fd
= open(path
, O_CREAT
| O_EXCL
| O_WRONLY
, (mode
& 0100) ? 0777 : 0666);
2316 int written
= xwrite(fd
, buf
, size
);
2318 die("writing file %s: %s", path
, strerror(errno
));
2320 die("out of space writing file %s", path
);
2325 die("closing file %s: %s", path
, strerror(errno
));
2330 * We optimistically assume that the directories exist,
2331 * which is true 99% of the time anyway. If they don't,
2332 * we create them and try again.
2334 static void create_one_file(char *path
, unsigned mode
, const char *buf
, unsigned long size
)
2338 if (!try_create_file(path
, mode
, buf
, size
))
2341 if (errno
== ENOENT
) {
2342 if (safe_create_leading_directories(path
))
2344 if (!try_create_file(path
, mode
, buf
, size
))
2348 if (errno
== EEXIST
|| errno
== EACCES
) {
2349 /* We may be trying to create a file where a directory
2354 if (!lstat(path
, &st
) && S_ISDIR(st
.st_mode
) && !rmdir(path
))
2358 if (errno
== EEXIST
) {
2359 unsigned int nr
= getpid();
2362 const char *newpath
;
2363 newpath
= mkpath("%s~%u", path
, nr
);
2364 if (!try_create_file(newpath
, mode
, buf
, size
)) {
2365 if (!rename(newpath
, path
))
2370 if (errno
!= EEXIST
)
2375 die("unable to write file %s mode %o", path
, mode
);
2378 static void create_file(struct patch
*patch
)
2380 char *path
= patch
->new_name
;
2381 unsigned mode
= patch
->new_mode
;
2382 unsigned long size
= patch
->resultsize
;
2383 char *buf
= patch
->result
;
2386 mode
= S_IFREG
| 0644;
2387 create_one_file(path
, mode
, buf
, size
);
2388 add_index_file(path
, mode
, buf
, size
);
2389 cache_tree_invalidate_path(active_cache_tree
, path
);
2392 /* phase zero is to remove, phase one is to create */
2393 static void write_out_one_result(struct patch
*patch
, int phase
)
2395 if (patch
->is_delete
> 0) {
2400 if (patch
->is_new
> 0 || patch
->is_copy
) {
2406 * Rename or modification boils down to the same
2407 * thing: remove the old, write the new
2415 static int write_out_one_reject(struct patch
*patch
)
2418 char namebuf
[PATH_MAX
];
2419 struct fragment
*frag
;
2422 for (cnt
= 0, frag
= patch
->fragments
; frag
; frag
= frag
->next
) {
2423 if (!frag
->rejected
)
2429 if (apply_verbosely
)
2430 say_patch_name(stderr
,
2431 "Applied patch ", patch
, " cleanly.\n");
2435 /* This should not happen, because a removal patch that leaves
2436 * contents are marked "rejected" at the patch level.
2438 if (!patch
->new_name
)
2439 die("internal error");
2441 /* Say this even without --verbose */
2442 say_patch_name(stderr
, "Applying patch ", patch
, " with");
2443 fprintf(stderr
, " %d rejects...\n", cnt
);
2445 cnt
= strlen(patch
->new_name
);
2446 if (ARRAY_SIZE(namebuf
) <= cnt
+ 5) {
2447 cnt
= ARRAY_SIZE(namebuf
) - 5;
2449 "warning: truncating .rej filename to %.*s.rej",
2450 cnt
- 1, patch
->new_name
);
2452 memcpy(namebuf
, patch
->new_name
, cnt
);
2453 memcpy(namebuf
+ cnt
, ".rej", 5);
2455 rej
= fopen(namebuf
, "w");
2457 return error("cannot open %s: %s", namebuf
, strerror(errno
));
2459 /* Normal git tools never deal with .rej, so do not pretend
2460 * this is a git patch by saying --git nor give extended
2461 * headers. While at it, maybe please "kompare" that wants
2462 * the trailing TAB and some garbage at the end of line ;-).
2464 fprintf(rej
, "diff a/%s b/%s\t(rejected hunks)\n",
2465 patch
->new_name
, patch
->new_name
);
2466 for (cnt
= 1, frag
= patch
->fragments
;
2468 cnt
++, frag
= frag
->next
) {
2469 if (!frag
->rejected
) {
2470 fprintf(stderr
, "Hunk #%d applied cleanly.\n", cnt
);
2473 fprintf(stderr
, "Rejected hunk #%d.\n", cnt
);
2474 fprintf(rej
, "%.*s", frag
->size
, frag
->patch
);
2475 if (frag
->patch
[frag
->size
-1] != '\n')
2482 static int write_out_results(struct patch
*list
, int skipped_patch
)
2488 if (!list
&& !skipped_patch
)
2489 return error("No changes");
2491 for (phase
= 0; phase
< 2; phase
++) {
2497 write_out_one_result(l
, phase
);
2498 if (phase
== 1 && write_out_one_reject(l
))
2507 static struct lock_file lock_file
;
2509 static struct excludes
{
2510 struct excludes
*next
;
2514 static int use_patch(struct patch
*p
)
2516 const char *pathname
= p
->new_name
? p
->new_name
: p
->old_name
;
2517 struct excludes
*x
= excludes
;
2519 if (fnmatch(x
->path
, pathname
, 0) == 0)
2523 if (0 < prefix_length
) {
2524 int pathlen
= strlen(pathname
);
2525 if (pathlen
<= prefix_length
||
2526 memcmp(prefix
, pathname
, prefix_length
))
2532 static int apply_patch(int fd
, const char *filename
, int inaccurate_eof
)
2534 unsigned long offset
, size
;
2535 char *buffer
= read_patch_file(fd
, &size
);
2536 struct patch
*list
= NULL
, **listp
= &list
;
2537 int skipped_patch
= 0;
2539 patch_input_file
= filename
;
2544 struct patch
*patch
;
2547 patch
= xcalloc(1, sizeof(*patch
));
2548 patch
->inaccurate_eof
= inaccurate_eof
;
2549 nr
= parse_chunk(buffer
+ offset
, size
, patch
);
2552 if (apply_in_reverse
)
2553 reverse_patches(patch
);
2554 if (use_patch(patch
)) {
2557 listp
= &patch
->next
;
2559 /* perhaps free it a bit better? */
2567 if (whitespace_error
&& (new_whitespace
== error_on_whitespace
))
2570 write_index
= check_index
&& apply
;
2571 if (write_index
&& newfd
< 0)
2572 newfd
= hold_lock_file_for_update(&lock_file
,
2573 get_index_file(), 1);
2575 if (read_cache() < 0)
2576 die("unable to read index file");
2579 if ((check
|| apply
) &&
2580 check_patch_list(list
) < 0 &&
2584 if (apply
&& write_out_results(list
, skipped_patch
))
2587 if (show_index_info
)
2588 show_index_list(list
);
2591 stat_patch_list(list
);
2594 numstat_patch_list(list
);
2597 summary_patch_list(list
);
2603 static int git_apply_config(const char *var
, const char *value
)
2605 if (!strcmp(var
, "apply.whitespace")) {
2606 apply_default_whitespace
= xstrdup(value
);
2609 return git_default_config(var
, value
);
2613 int cmd_apply(int argc
, const char **argv
, const char *unused_prefix
)
2617 int inaccurate_eof
= 0;
2620 const char *whitespace_option
= NULL
;
2623 for (i
= 1; i
< argc
; i
++) {
2624 const char *arg
= argv
[i
];
2628 if (!strcmp(arg
, "-")) {
2629 errs
|= apply_patch(0, "<stdin>", inaccurate_eof
);
2633 if (!strncmp(arg
, "--exclude=", 10)) {
2634 struct excludes
*x
= xmalloc(sizeof(*x
));
2640 if (!strncmp(arg
, "-p", 2)) {
2641 p_value
= atoi(arg
+ 2);
2644 if (!strcmp(arg
, "--no-add")) {
2648 if (!strcmp(arg
, "--stat")) {
2653 if (!strcmp(arg
, "--allow-binary-replacement") ||
2654 !strcmp(arg
, "--binary")) {
2655 continue; /* now no-op */
2657 if (!strcmp(arg
, "--numstat")) {
2662 if (!strcmp(arg
, "--summary")) {
2667 if (!strcmp(arg
, "--check")) {
2672 if (!strcmp(arg
, "--index")) {
2676 if (!strcmp(arg
, "--cached")) {
2681 if (!strcmp(arg
, "--apply")) {
2685 if (!strcmp(arg
, "--index-info")) {
2687 show_index_info
= 1;
2690 if (!strcmp(arg
, "-z")) {
2691 line_termination
= 0;
2694 if (!strncmp(arg
, "-C", 2)) {
2695 p_context
= strtoul(arg
+ 2, &end
, 0);
2697 die("unrecognized context count '%s'", arg
+ 2);
2700 if (!strncmp(arg
, "--whitespace=", 13)) {
2701 whitespace_option
= arg
+ 13;
2702 parse_whitespace_option(arg
+ 13);
2705 if (!strcmp(arg
, "-R") || !strcmp(arg
, "--reverse")) {
2706 apply_in_reverse
= 1;
2709 if (!strcmp(arg
, "--unidiff-zero")) {
2713 if (!strcmp(arg
, "--reject")) {
2714 apply
= apply_with_reject
= apply_verbosely
= 1;
2717 if (!strcmp(arg
, "--verbose")) {
2718 apply_verbosely
= 1;
2721 if (!strcmp(arg
, "--inaccurate-eof")) {
2726 if (check_index
&& prefix_length
< 0) {
2727 prefix
= setup_git_directory();
2728 prefix_length
= prefix
? strlen(prefix
) : 0;
2729 git_config(git_apply_config
);
2730 if (!whitespace_option
&& apply_default_whitespace
)
2731 parse_whitespace_option(apply_default_whitespace
);
2733 if (0 < prefix_length
)
2734 arg
= prefix_filename(prefix
, prefix_length
, arg
);
2736 fd
= open(arg
, O_RDONLY
);
2740 set_default_whitespace_mode(whitespace_option
);
2741 errs
|= apply_patch(fd
, arg
, inaccurate_eof
);
2744 set_default_whitespace_mode(whitespace_option
);
2746 errs
|= apply_patch(0, "<stdin>", inaccurate_eof
);
2747 if (whitespace_error
) {
2748 if (squelch_whitespace_errors
&&
2749 squelch_whitespace_errors
< whitespace_error
) {
2751 whitespace_error
- squelch_whitespace_errors
;
2752 fprintf(stderr
, "warning: squelched %d "
2753 "whitespace error%s\n",
2755 squelched
== 1 ? "" : "s");
2757 if (new_whitespace
== error_on_whitespace
)
2758 die("%d line%s add%s trailing whitespaces.",
2760 whitespace_error
== 1 ? "" : "s",
2761 whitespace_error
== 1 ? "s" : "");
2762 if (applied_after_stripping
)
2763 fprintf(stderr
, "warning: %d line%s applied after"
2764 " stripping trailing whitespaces.\n",
2765 applied_after_stripping
,
2766 applied_after_stripping
== 1 ? "" : "s");
2767 else if (whitespace_error
)
2768 fprintf(stderr
, "warning: %d line%s add%s trailing"
2771 whitespace_error
== 1 ? "" : "s",
2772 whitespace_error
== 1 ? "s" : "");
2776 if (write_cache(newfd
, active_cache
, active_nr
) ||
2777 close(newfd
) || commit_lock_file(&lock_file
))
2778 die("Unable to write new index file");