4 * Copyright (C) Linus Torvalds, 2005
6 * This applies patches on top of some (arbitrary) version of the SCM.
10 #include "cache-tree.h"
15 #include "string-list.h"
19 * --check turns on checking that the working tree matches the
20 * files that are being modified, but doesn't apply the patch
21 * --stat does just a diffstat, and doesn't actually apply
22 * --numstat does numeric diffstat, and doesn't actually apply
23 * --index-info shows the old and new index info for paths if available.
24 * --index updates the cache as well.
25 * --cached updates only the cache without ever touching the working tree.
27 static const char *prefix
;
28 static int prefix_length
= -1;
29 static int newfd
= -1;
31 static int unidiff_zero
;
32 static int p_value
= 1;
33 static int p_value_known
;
34 static int check_index
;
35 static int update_index
;
42 static int apply_in_reverse
;
43 static int apply_with_reject
;
44 static int apply_verbosely
;
46 static const char *fake_ancestor
;
47 static int line_termination
= '\n';
48 static unsigned long p_context
= ULONG_MAX
;
49 static const char apply_usage
[] =
50 "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|fix|error|error-all>] <patch>...";
52 static enum ws_error_action
{
57 } ws_error_action
= warn_on_ws_error
;
58 static int whitespace_error
;
59 static int squelch_whitespace_errors
= 5;
60 static int applied_after_fixing_ws
;
61 static const char *patch_input_file
;
62 static const char *root
;
65 static void parse_whitespace_option(const char *option
)
68 ws_error_action
= warn_on_ws_error
;
71 if (!strcmp(option
, "warn")) {
72 ws_error_action
= warn_on_ws_error
;
75 if (!strcmp(option
, "nowarn")) {
76 ws_error_action
= nowarn_ws_error
;
79 if (!strcmp(option
, "error")) {
80 ws_error_action
= die_on_ws_error
;
83 if (!strcmp(option
, "error-all")) {
84 ws_error_action
= die_on_ws_error
;
85 squelch_whitespace_errors
= 0;
88 if (!strcmp(option
, "strip") || !strcmp(option
, "fix")) {
89 ws_error_action
= correct_ws_error
;
92 die("unrecognized whitespace option '%s'", option
);
95 static void set_default_whitespace_mode(const char *whitespace_option
)
97 if (!whitespace_option
&& !apply_default_whitespace
)
98 ws_error_action
= (apply
? warn_on_ws_error
: nowarn_ws_error
);
102 * For "diff-stat" like behaviour, we keep track of the biggest change
103 * we've seen, and the longest filename. That allows us to do simple
106 static int max_change
, max_len
;
109 * Various "current state", notably line numbers and what
110 * file (and how) we're patching right now.. The "is_xxxx"
111 * things are flags, where -1 means "don't know yet".
113 static int linenr
= 1;
116 * This represents one "hunk" from a patch, starting with
117 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The
118 * patch text is pointed at by patch, and its byte length
119 * is stored in size. leading and trailing are the number
123 unsigned long leading
, trailing
;
124 unsigned long oldpos
, oldlines
;
125 unsigned long newpos
, newlines
;
130 struct fragment
*next
;
134 * When dealing with a binary patch, we reuse "leading" field
135 * to store the type of the binary hunk, either deflated "delta"
136 * or deflated "literal".
138 #define binary_patch_method leading
139 #define BINARY_DELTA_DEFLATED 1
140 #define BINARY_LITERAL_DEFLATED 2
143 * This represents a "patch" to a file, both metainfo changes
144 * such as creation/deletion, filemode and content changes represented
145 * as a series of fragments.
148 char *new_name
, *old_name
, *def_name
;
149 unsigned int old_mode
, new_mode
;
150 int is_new
, is_delete
; /* -1 = unknown, 0 = false, 1 = true */
153 unsigned long deflate_origlen
;
154 int lines_added
, lines_deleted
;
156 unsigned int is_toplevel_relative
:1;
157 unsigned int inaccurate_eof
:1;
158 unsigned int is_binary
:1;
159 unsigned int is_copy
:1;
160 unsigned int is_rename
:1;
161 unsigned int recount
:1;
162 struct fragment
*fragments
;
165 char old_sha1_prefix
[41];
166 char new_sha1_prefix
[41];
171 * A line in a file, len-bytes long (includes the terminating LF,
172 * except for an incomplete line at the end if the file ends with
173 * one), and its contents hashes to 'hash'.
179 #define LINE_COMMON 1
183 * This represents a "file", which is an array of "lines".
190 struct line
*line_allocated
;
195 * Records filenames that have been touched, in order to handle
196 * the case where more than one patches touch the same file.
199 static struct string_list fn_table
;
201 static uint32_t hash_line(const char *cp
, size_t len
)
205 for (i
= 0, h
= 0; i
< len
; i
++) {
206 if (!isspace(cp
[i
])) {
207 h
= h
* 3 + (cp
[i
] & 0xff);
213 static void add_line_info(struct image
*img
, const char *bol
, size_t len
, unsigned flag
)
215 ALLOC_GROW(img
->line_allocated
, img
->nr
+ 1, img
->alloc
);
216 img
->line_allocated
[img
->nr
].len
= len
;
217 img
->line_allocated
[img
->nr
].hash
= hash_line(bol
, len
);
218 img
->line_allocated
[img
->nr
].flag
= flag
;
222 static void prepare_image(struct image
*image
, char *buf
, size_t len
,
223 int prepare_linetable
)
227 memset(image
, 0, sizeof(*image
));
231 if (!prepare_linetable
)
234 ep
= image
->buf
+ image
->len
;
238 for (next
= cp
; next
< ep
&& *next
!= '\n'; next
++)
242 add_line_info(image
, cp
, next
- cp
, 0);
245 image
->line
= image
->line_allocated
;
248 static void clear_image(struct image
*image
)
255 static void say_patch_name(FILE *output
, const char *pre
,
256 struct patch
*patch
, const char *post
)
259 if (patch
->old_name
&& patch
->new_name
&&
260 strcmp(patch
->old_name
, patch
->new_name
)) {
261 quote_c_style(patch
->old_name
, NULL
, output
, 0);
262 fputs(" => ", output
);
263 quote_c_style(patch
->new_name
, NULL
, output
, 0);
265 const char *n
= patch
->new_name
;
268 quote_c_style(n
, NULL
, output
, 0);
273 #define CHUNKSIZE (8192)
276 static void read_patch_file(struct strbuf
*sb
, int fd
)
278 if (strbuf_read(sb
, fd
, 0) < 0)
279 die("git apply: read returned %s", strerror(errno
));
282 * Make sure that we have some slop in the buffer
283 * so that we can do speculative "memcmp" etc, and
284 * see to it that it is NUL-filled.
286 strbuf_grow(sb
, SLOP
);
287 memset(sb
->buf
+ sb
->len
, 0, SLOP
);
290 static unsigned long linelen(const char *buffer
, unsigned long size
)
292 unsigned long len
= 0;
295 if (*buffer
++ == '\n')
301 static int is_dev_null(const char *str
)
303 return !memcmp("/dev/null", str
, 9) && isspace(str
[9]);
309 static int name_terminate(const char *name
, int namelen
, int c
, int terminate
)
311 if (c
== ' ' && !(terminate
& TERM_SPACE
))
313 if (c
== '\t' && !(terminate
& TERM_TAB
))
319 static char *find_name(const char *line
, char *def
, int p_value
, int terminate
)
322 const char *start
= line
;
328 * Proposed "new-style" GNU patch/diff format; see
329 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
331 strbuf_init(&name
, 0);
332 if (!unquote_c_style(&name
, line
, NULL
)) {
335 for (cp
= name
.buf
; p_value
; p_value
--) {
336 cp
= strchr(cp
, '/');
342 /* name can later be freed, so we need
343 * to memmove, not just return cp
345 strbuf_remove(&name
, 0, cp
- name
.buf
);
348 strbuf_insert(&name
, 0, root
, root_len
);
349 return strbuf_detach(&name
, NULL
);
352 strbuf_release(&name
);
361 if (name_terminate(start
, line
-start
, c
, terminate
))
365 if (c
== '/' && !--p_value
)
375 * Generally we prefer the shorter name, especially
376 * if the other one is just a variation of that with
377 * something else tacked on to the end (ie "file.orig"
381 int deflen
= strlen(def
);
382 if (deflen
< len
&& !strncmp(start
, def
, deflen
))
388 char *ret
= xmalloc(root_len
+ len
+ 1);
390 memcpy(ret
+ root_len
, start
, len
);
391 ret
[root_len
+ len
] = '\0';
395 return xmemdupz(start
, len
);
398 static int count_slashes(const char *cp
)
410 * Given the string after "--- " or "+++ ", guess the appropriate
411 * p_value for the given patch.
413 static int guess_p_value(const char *nameline
)
418 if (is_dev_null(nameline
))
420 name
= find_name(nameline
, NULL
, 0, TERM_SPACE
| TERM_TAB
);
423 cp
= strchr(name
, '/');
428 * Does it begin with "a/$our-prefix" and such? Then this is
429 * very likely to apply to our directory.
431 if (!strncmp(name
, prefix
, prefix_length
))
432 val
= count_slashes(prefix
);
435 if (!strncmp(cp
, prefix
, prefix_length
))
436 val
= count_slashes(prefix
) + 1;
444 * Get the name etc info from the ---/+++ lines of a traditional patch header
446 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
447 * files, we can happily check the index for a match, but for creating a
448 * new file we should try to match whatever "patch" does. I have no idea.
450 static void parse_traditional_patch(const char *first
, const char *second
, struct patch
*patch
)
454 first
+= 4; /* skip "--- " */
455 second
+= 4; /* skip "+++ " */
456 if (!p_value_known
) {
458 p
= guess_p_value(first
);
459 q
= guess_p_value(second
);
461 if (0 <= p
&& p
== q
) {
466 if (is_dev_null(first
)) {
468 patch
->is_delete
= 0;
469 name
= find_name(second
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
470 patch
->new_name
= name
;
471 } else if (is_dev_null(second
)) {
473 patch
->is_delete
= 1;
474 name
= find_name(first
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
475 patch
->old_name
= name
;
477 name
= find_name(first
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
478 name
= find_name(second
, name
, p_value
, TERM_SPACE
| TERM_TAB
);
479 patch
->old_name
= patch
->new_name
= name
;
482 die("unable to find filename in patch at line %d", linenr
);
485 static int gitdiff_hdrend(const char *line
, struct patch
*patch
)
491 * We're anal about diff header consistency, to make
492 * sure that we don't end up having strange ambiguous
493 * patches floating around.
495 * As a result, gitdiff_{old|new}name() will check
496 * their names against any previous information, just
499 static char *gitdiff_verify_name(const char *line
, int isnull
, char *orig_name
, const char *oldnew
)
501 if (!orig_name
&& !isnull
)
502 return find_name(line
, NULL
, p_value
, TERM_TAB
);
511 die("git apply: bad git-diff - expected /dev/null, got %s on line %d", name
, linenr
);
512 another
= find_name(line
, NULL
, p_value
, TERM_TAB
);
513 if (!another
|| memcmp(another
, name
, len
))
514 die("git apply: bad git-diff - inconsistent %s filename on line %d", oldnew
, linenr
);
519 /* expect "/dev/null" */
520 if (memcmp("/dev/null", line
, 9) || line
[9] != '\n')
521 die("git apply: bad git-diff - expected /dev/null on line %d", linenr
);
526 static int gitdiff_oldname(const char *line
, struct patch
*patch
)
528 patch
->old_name
= gitdiff_verify_name(line
, patch
->is_new
, patch
->old_name
, "old");
532 static int gitdiff_newname(const char *line
, struct patch
*patch
)
534 patch
->new_name
= gitdiff_verify_name(line
, patch
->is_delete
, patch
->new_name
, "new");
538 static int gitdiff_oldmode(const char *line
, struct patch
*patch
)
540 patch
->old_mode
= strtoul(line
, NULL
, 8);
544 static int gitdiff_newmode(const char *line
, struct patch
*patch
)
546 patch
->new_mode
= strtoul(line
, NULL
, 8);
550 static int gitdiff_delete(const char *line
, struct patch
*patch
)
552 patch
->is_delete
= 1;
553 patch
->old_name
= patch
->def_name
;
554 return gitdiff_oldmode(line
, patch
);
557 static int gitdiff_newfile(const char *line
, struct patch
*patch
)
560 patch
->new_name
= patch
->def_name
;
561 return gitdiff_newmode(line
, patch
);
564 static int gitdiff_copysrc(const char *line
, struct patch
*patch
)
567 patch
->old_name
= find_name(line
, NULL
, 0, 0);
571 static int gitdiff_copydst(const char *line
, struct patch
*patch
)
574 patch
->new_name
= find_name(line
, NULL
, 0, 0);
578 static int gitdiff_renamesrc(const char *line
, struct patch
*patch
)
580 patch
->is_rename
= 1;
581 patch
->old_name
= find_name(line
, NULL
, 0, 0);
585 static int gitdiff_renamedst(const char *line
, struct patch
*patch
)
587 patch
->is_rename
= 1;
588 patch
->new_name
= find_name(line
, NULL
, 0, 0);
592 static int gitdiff_similarity(const char *line
, struct patch
*patch
)
594 if ((patch
->score
= strtoul(line
, NULL
, 10)) == ULONG_MAX
)
599 static int gitdiff_dissimilarity(const char *line
, struct patch
*patch
)
601 if ((patch
->score
= strtoul(line
, NULL
, 10)) == ULONG_MAX
)
606 static int gitdiff_index(const char *line
, struct patch
*patch
)
609 * index line is N hexadecimal, "..", N hexadecimal,
610 * and optional space with octal mode.
612 const char *ptr
, *eol
;
615 ptr
= strchr(line
, '.');
616 if (!ptr
|| ptr
[1] != '.' || 40 < ptr
- line
)
619 memcpy(patch
->old_sha1_prefix
, line
, len
);
620 patch
->old_sha1_prefix
[len
] = 0;
623 ptr
= strchr(line
, ' ');
624 eol
= strchr(line
, '\n');
626 if (!ptr
|| eol
< ptr
)
632 memcpy(patch
->new_sha1_prefix
, line
, len
);
633 patch
->new_sha1_prefix
[len
] = 0;
635 patch
->new_mode
= patch
->old_mode
= strtoul(ptr
+1, NULL
, 8);
640 * This is normal for a diff that doesn't change anything: we'll fall through
641 * into the next diff. Tell the parser to break out.
643 static int gitdiff_unrecognized(const char *line
, struct patch
*patch
)
648 static const char *stop_at_slash(const char *line
, int llen
)
652 for (i
= 0; i
< llen
; i
++) {
661 * This is to extract the same name that appears on "diff --git"
662 * line. We do not find and return anything if it is a rename
663 * patch, and it is OK because we will find the name elsewhere.
664 * We need to reliably find name only when it is mode-change only,
665 * creation or deletion of an empty file. In any of these cases,
666 * both sides are the same name under a/ and b/ respectively.
668 static char *git_header_name(char *line
, int llen
)
671 const char *second
= NULL
;
674 line
+= strlen("diff --git ");
675 llen
-= strlen("diff --git ");
682 strbuf_init(&first
, 0);
685 if (unquote_c_style(&first
, line
, &second
))
688 /* advance to the first slash */
689 cp
= stop_at_slash(first
.buf
, first
.len
);
690 /* we do not accept absolute paths */
691 if (!cp
|| cp
== first
.buf
)
693 strbuf_remove(&first
, 0, cp
+ 1 - first
.buf
);
696 * second points at one past closing dq of name.
697 * find the second name.
699 while ((second
< line
+ llen
) && isspace(*second
))
702 if (line
+ llen
<= second
)
704 if (*second
== '"') {
705 if (unquote_c_style(&sp
, second
, NULL
))
707 cp
= stop_at_slash(sp
.buf
, sp
.len
);
708 if (!cp
|| cp
== sp
.buf
)
710 /* They must match, otherwise ignore */
711 if (strcmp(cp
+ 1, first
.buf
))
714 return strbuf_detach(&first
, NULL
);
717 /* unquoted second */
718 cp
= stop_at_slash(second
, line
+ llen
- second
);
719 if (!cp
|| cp
== second
)
722 if (line
+ llen
- cp
!= first
.len
+ 1 ||
723 memcmp(first
.buf
, cp
, first
.len
))
725 return strbuf_detach(&first
, NULL
);
728 strbuf_release(&first
);
733 /* unquoted first name */
734 name
= stop_at_slash(line
, llen
);
735 if (!name
|| name
== line
)
740 * since the first name is unquoted, a dq if exists must be
741 * the beginning of the second name.
743 for (second
= name
; second
< line
+ llen
; second
++) {
744 if (*second
== '"') {
749 if (unquote_c_style(&sp
, second
, NULL
))
752 np
= stop_at_slash(sp
.buf
, sp
.len
);
753 if (!np
|| np
== sp
.buf
)
757 len
= sp
.buf
+ sp
.len
- np
;
758 if (len
< second
- name
&&
759 !strncmp(np
, name
, len
) &&
760 isspace(name
[len
])) {
762 strbuf_remove(&sp
, 0, np
- sp
.buf
);
763 return strbuf_detach(&sp
, NULL
);
773 * Accept a name only if it shows up twice, exactly the same
776 for (len
= 0 ; ; len
++) {
791 if (second
[len
] == '\n' && !memcmp(name
, second
, len
)) {
792 return xmemdupz(name
, len
);
798 /* Verify that we recognize the lines following a git header */
799 static int parse_git_header(char *line
, int len
, unsigned int size
, struct patch
*patch
)
801 unsigned long offset
;
803 /* A git diff has explicit new/delete information, so we don't guess */
805 patch
->is_delete
= 0;
808 * Some things may not have the old name in the
809 * rest of the headers anywhere (pure mode changes,
810 * or removing or adding empty files), so we get
811 * the default name from the header.
813 patch
->def_name
= git_header_name(line
, len
);
814 if (patch
->def_name
&& root
) {
815 char *s
= xmalloc(root_len
+ strlen(patch
->def_name
) + 1);
817 strcpy(s
+ root_len
, patch
->def_name
);
818 free(patch
->def_name
);
825 for (offset
= len
; size
> 0 ; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
826 static const struct opentry
{
828 int (*fn
)(const char *, struct patch
*);
830 { "@@ -", gitdiff_hdrend
},
831 { "--- ", gitdiff_oldname
},
832 { "+++ ", gitdiff_newname
},
833 { "old mode ", gitdiff_oldmode
},
834 { "new mode ", gitdiff_newmode
},
835 { "deleted file mode ", gitdiff_delete
},
836 { "new file mode ", gitdiff_newfile
},
837 { "copy from ", gitdiff_copysrc
},
838 { "copy to ", gitdiff_copydst
},
839 { "rename old ", gitdiff_renamesrc
},
840 { "rename new ", gitdiff_renamedst
},
841 { "rename from ", gitdiff_renamesrc
},
842 { "rename to ", gitdiff_renamedst
},
843 { "similarity index ", gitdiff_similarity
},
844 { "dissimilarity index ", gitdiff_dissimilarity
},
845 { "index ", gitdiff_index
},
846 { "", gitdiff_unrecognized
},
850 len
= linelen(line
, size
);
851 if (!len
|| line
[len
-1] != '\n')
853 for (i
= 0; i
< ARRAY_SIZE(optable
); i
++) {
854 const struct opentry
*p
= optable
+ i
;
855 int oplen
= strlen(p
->str
);
856 if (len
< oplen
|| memcmp(p
->str
, line
, oplen
))
858 if (p
->fn(line
+ oplen
, patch
) < 0)
867 static int parse_num(const char *line
, unsigned long *p
)
873 *p
= strtoul(line
, &ptr
, 10);
877 static int parse_range(const char *line
, int len
, int offset
, const char *expect
,
878 unsigned long *p1
, unsigned long *p2
)
882 if (offset
< 0 || offset
>= len
)
887 digits
= parse_num(line
, p1
);
897 digits
= parse_num(line
+1, p2
);
909 if (memcmp(line
, expect
, ex
))
915 static void recount_diff(char *line
, int size
, struct fragment
*fragment
)
917 int oldlines
= 0, newlines
= 0, ret
= 0;
920 warning("recount: ignore empty hunk");
925 int len
= linelen(line
, size
);
945 ret
= size
< 3 || prefixcmp(line
, "@@ ");
948 ret
= size
< 5 || prefixcmp(line
, "diff ");
955 warning("recount: unexpected line: %.*s",
956 (int)linelen(line
, size
), line
);
961 fragment
->oldlines
= oldlines
;
962 fragment
->newlines
= newlines
;
966 * Parse a unified diff fragment header of the
967 * form "@@ -a,b +c,d @@"
969 static int parse_fragment_header(char *line
, int len
, struct fragment
*fragment
)
973 if (!len
|| line
[len
-1] != '\n')
976 /* Figure out the number of lines in a fragment */
977 offset
= parse_range(line
, len
, 4, " +", &fragment
->oldpos
, &fragment
->oldlines
);
978 offset
= parse_range(line
, len
, offset
, " @@", &fragment
->newpos
, &fragment
->newlines
);
983 static int find_header(char *line
, unsigned long size
, int *hdrsize
, struct patch
*patch
)
985 unsigned long offset
, len
;
987 patch
->is_toplevel_relative
= 0;
988 patch
->is_rename
= patch
->is_copy
= 0;
989 patch
->is_new
= patch
->is_delete
= -1;
990 patch
->old_mode
= patch
->new_mode
= 0;
991 patch
->old_name
= patch
->new_name
= NULL
;
992 for (offset
= 0; size
> 0; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
993 unsigned long nextlen
;
995 len
= linelen(line
, size
);
999 /* Testing this early allows us to take a few shortcuts.. */
1004 * Make sure we don't find any unconnected patch fragments.
1005 * That's a sign that we didn't find a header, and that a
1006 * patch has become corrupted/broken up.
1008 if (!memcmp("@@ -", line
, 4)) {
1009 struct fragment dummy
;
1010 if (parse_fragment_header(line
, len
, &dummy
) < 0)
1012 die("patch fragment without header at line %d: %.*s",
1013 linenr
, (int)len
-1, line
);
1020 * Git patch? It might not have a real patch, just a rename
1021 * or mode change, so we handle that specially
1023 if (!memcmp("diff --git ", line
, 11)) {
1024 int git_hdr_len
= parse_git_header(line
, len
, size
, patch
);
1025 if (git_hdr_len
<= len
)
1027 if (!patch
->old_name
&& !patch
->new_name
) {
1028 if (!patch
->def_name
)
1029 die("git diff header lacks filename information (line %d)", linenr
);
1030 patch
->old_name
= patch
->new_name
= patch
->def_name
;
1032 patch
->is_toplevel_relative
= 1;
1033 *hdrsize
= git_hdr_len
;
1037 /* --- followed by +++ ? */
1038 if (memcmp("--- ", line
, 4) || memcmp("+++ ", line
+ len
, 4))
1042 * We only accept unified patches, so we want it to
1043 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
1044 * minimum ("@@ -0,0 +1 @@\n" is the shortest).
1046 nextlen
= linelen(line
+ len
, size
- len
);
1047 if (size
< nextlen
+ 14 || memcmp("@@ -", line
+ len
+ nextlen
, 4))
1050 /* Ok, we'll consider it a patch */
1051 parse_traditional_patch(line
, line
+len
, patch
);
1052 *hdrsize
= len
+ nextlen
;
1059 static void record_ws_error(unsigned result
, const char *line
, int len
, int linenr
)
1067 if (squelch_whitespace_errors
&&
1068 squelch_whitespace_errors
< whitespace_error
)
1071 err
= whitespace_error_string(result
);
1072 fprintf(stderr
, "%s:%d: %s.\n%.*s\n",
1073 patch_input_file
, linenr
, err
, len
, line
);
1077 static void check_whitespace(const char *line
, int len
, unsigned ws_rule
)
1079 unsigned result
= ws_check(line
+ 1, len
- 1, ws_rule
);
1081 record_ws_error(result
, line
+ 1, len
- 2, linenr
);
1085 * Parse a unified diff. Note that this really needs to parse each
1086 * fragment separately, since the only way to know the difference
1087 * between a "---" that is part of a patch, and a "---" that starts
1088 * the next patch is to look at the line counts..
1090 static int parse_fragment(char *line
, unsigned long size
,
1091 struct patch
*patch
, struct fragment
*fragment
)
1094 int len
= linelen(line
, size
), offset
;
1095 unsigned long oldlines
, newlines
;
1096 unsigned long leading
, trailing
;
1098 offset
= parse_fragment_header(line
, len
, fragment
);
1101 if (offset
> 0 && patch
->recount
)
1102 recount_diff(line
+ offset
, size
- offset
, fragment
);
1103 oldlines
= fragment
->oldlines
;
1104 newlines
= fragment
->newlines
;
1108 /* Parse the thing.. */
1112 added
= deleted
= 0;
1115 offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
1116 if (!oldlines
&& !newlines
)
1118 len
= linelen(line
, size
);
1119 if (!len
|| line
[len
-1] != '\n')
1124 case '\n': /* newer GNU diff, an empty context line */
1128 if (!deleted
&& !added
)
1133 if (apply_in_reverse
&&
1134 ws_error_action
!= nowarn_ws_error
)
1135 check_whitespace(line
, len
, patch
->ws_rule
);
1141 if (!apply_in_reverse
&&
1142 ws_error_action
!= nowarn_ws_error
)
1143 check_whitespace(line
, len
, patch
->ws_rule
);
1150 * We allow "\ No newline at end of file". Depending
1151 * on locale settings when the patch was produced we
1152 * don't know what this line looks like. The only
1153 * thing we do know is that it begins with "\ ".
1154 * Checking for 12 is just for sanity check -- any
1155 * l10n of "\ No newline..." is at least that long.
1158 if (len
< 12 || memcmp(line
, "\\ ", 2))
1163 if (oldlines
|| newlines
)
1165 fragment
->leading
= leading
;
1166 fragment
->trailing
= trailing
;
1169 * If a fragment ends with an incomplete line, we failed to include
1170 * it in the above loop because we hit oldlines == newlines == 0
1173 if (12 < size
&& !memcmp(line
, "\\ ", 2))
1174 offset
+= linelen(line
, size
);
1176 patch
->lines_added
+= added
;
1177 patch
->lines_deleted
+= deleted
;
1179 if (0 < patch
->is_new
&& oldlines
)
1180 return error("new file depends on old contents");
1181 if (0 < patch
->is_delete
&& newlines
)
1182 return error("deleted file still has contents");
1186 static int parse_single_patch(char *line
, unsigned long size
, struct patch
*patch
)
1188 unsigned long offset
= 0;
1189 unsigned long oldlines
= 0, newlines
= 0, context
= 0;
1190 struct fragment
**fragp
= &patch
->fragments
;
1192 while (size
> 4 && !memcmp(line
, "@@ -", 4)) {
1193 struct fragment
*fragment
;
1196 fragment
= xcalloc(1, sizeof(*fragment
));
1197 fragment
->linenr
= linenr
;
1198 len
= parse_fragment(line
, size
, patch
, fragment
);
1200 die("corrupt patch at line %d", linenr
);
1201 fragment
->patch
= line
;
1202 fragment
->size
= len
;
1203 oldlines
+= fragment
->oldlines
;
1204 newlines
+= fragment
->newlines
;
1205 context
+= fragment
->leading
+ fragment
->trailing
;
1208 fragp
= &fragment
->next
;
1216 * If something was removed (i.e. we have old-lines) it cannot
1217 * be creation, and if something was added it cannot be
1218 * deletion. However, the reverse is not true; --unified=0
1219 * patches that only add are not necessarily creation even
1220 * though they do not have any old lines, and ones that only
1221 * delete are not necessarily deletion.
1223 * Unfortunately, a real creation/deletion patch do _not_ have
1224 * any context line by definition, so we cannot safely tell it
1225 * apart with --unified=0 insanity. At least if the patch has
1226 * more than one hunk it is not creation or deletion.
1228 if (patch
->is_new
< 0 &&
1229 (oldlines
|| (patch
->fragments
&& patch
->fragments
->next
)))
1231 if (patch
->is_delete
< 0 &&
1232 (newlines
|| (patch
->fragments
&& patch
->fragments
->next
)))
1233 patch
->is_delete
= 0;
1235 if (0 < patch
->is_new
&& oldlines
)
1236 die("new file %s depends on old contents", patch
->new_name
);
1237 if (0 < patch
->is_delete
&& newlines
)
1238 die("deleted file %s still has contents", patch
->old_name
);
1239 if (!patch
->is_delete
&& !newlines
&& context
)
1240 fprintf(stderr
, "** warning: file %s becomes empty but "
1241 "is not deleted\n", patch
->new_name
);
1246 static inline int metadata_changes(struct patch
*patch
)
1248 return patch
->is_rename
> 0 ||
1249 patch
->is_copy
> 0 ||
1250 patch
->is_new
> 0 ||
1252 (patch
->old_mode
&& patch
->new_mode
&&
1253 patch
->old_mode
!= patch
->new_mode
);
1256 static char *inflate_it(const void *data
, unsigned long size
,
1257 unsigned long inflated_size
)
1263 memset(&stream
, 0, sizeof(stream
));
1265 stream
.next_in
= (unsigned char *)data
;
1266 stream
.avail_in
= size
;
1267 stream
.next_out
= out
= xmalloc(inflated_size
);
1268 stream
.avail_out
= inflated_size
;
1269 inflateInit(&stream
);
1270 st
= inflate(&stream
, Z_FINISH
);
1271 if ((st
!= Z_STREAM_END
) || stream
.total_out
!= inflated_size
) {
1278 static struct fragment
*parse_binary_hunk(char **buf_p
,
1279 unsigned long *sz_p
,
1284 * Expect a line that begins with binary patch method ("literal"
1285 * or "delta"), followed by the length of data before deflating.
1286 * a sequence of 'length-byte' followed by base-85 encoded data
1287 * should follow, terminated by a newline.
1289 * Each 5-byte sequence of base-85 encodes up to 4 bytes,
1290 * and we would limit the patch line to 66 characters,
1291 * so one line can fit up to 13 groups that would decode
1292 * to 52 bytes max. The length byte 'A'-'Z' corresponds
1293 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
1296 unsigned long size
= *sz_p
;
1297 char *buffer
= *buf_p
;
1299 unsigned long origlen
;
1302 struct fragment
*frag
;
1304 llen
= linelen(buffer
, size
);
1309 if (!prefixcmp(buffer
, "delta ")) {
1310 patch_method
= BINARY_DELTA_DEFLATED
;
1311 origlen
= strtoul(buffer
+ 6, NULL
, 10);
1313 else if (!prefixcmp(buffer
, "literal ")) {
1314 patch_method
= BINARY_LITERAL_DEFLATED
;
1315 origlen
= strtoul(buffer
+ 8, NULL
, 10);
1323 int byte_length
, max_byte_length
, newsize
;
1324 llen
= linelen(buffer
, size
);
1328 /* consume the blank line */
1334 * Minimum line is "A00000\n" which is 7-byte long,
1335 * and the line length must be multiple of 5 plus 2.
1337 if ((llen
< 7) || (llen
-2) % 5)
1339 max_byte_length
= (llen
- 2) / 5 * 4;
1340 byte_length
= *buffer
;
1341 if ('A' <= byte_length
&& byte_length
<= 'Z')
1342 byte_length
= byte_length
- 'A' + 1;
1343 else if ('a' <= byte_length
&& byte_length
<= 'z')
1344 byte_length
= byte_length
- 'a' + 27;
1347 /* if the input length was not multiple of 4, we would
1348 * have filler at the end but the filler should never
1351 if (max_byte_length
< byte_length
||
1352 byte_length
<= max_byte_length
- 4)
1354 newsize
= hunk_size
+ byte_length
;
1355 data
= xrealloc(data
, newsize
);
1356 if (decode_85(data
+ hunk_size
, buffer
+ 1, byte_length
))
1358 hunk_size
= newsize
;
1363 frag
= xcalloc(1, sizeof(*frag
));
1364 frag
->patch
= inflate_it(data
, hunk_size
, origlen
);
1368 frag
->size
= origlen
;
1372 frag
->binary_patch_method
= patch_method
;
1378 error("corrupt binary patch at line %d: %.*s",
1379 linenr
-1, llen
-1, buffer
);
1383 static int parse_binary(char *buffer
, unsigned long size
, struct patch
*patch
)
1386 * We have read "GIT binary patch\n"; what follows is a line
1387 * that says the patch method (currently, either "literal" or
1388 * "delta") and the length of data before deflating; a
1389 * sequence of 'length-byte' followed by base-85 encoded data
1392 * When a binary patch is reversible, there is another binary
1393 * hunk in the same format, starting with patch method (either
1394 * "literal" or "delta") with the length of data, and a sequence
1395 * of length-byte + base-85 encoded data, terminated with another
1396 * empty line. This data, when applied to the postimage, produces
1399 struct fragment
*forward
;
1400 struct fragment
*reverse
;
1404 forward
= parse_binary_hunk(&buffer
, &size
, &status
, &used
);
1405 if (!forward
&& !status
)
1406 /* there has to be one hunk (forward hunk) */
1407 return error("unrecognized binary patch at line %d", linenr
-1);
1409 /* otherwise we already gave an error message */
1412 reverse
= parse_binary_hunk(&buffer
, &size
, &status
, &used_1
);
1417 * Not having reverse hunk is not an error, but having
1418 * a corrupt reverse hunk is.
1420 free((void*) forward
->patch
);
1424 forward
->next
= reverse
;
1425 patch
->fragments
= forward
;
1426 patch
->is_binary
= 1;
1430 static int parse_chunk(char *buffer
, unsigned long size
, struct patch
*patch
)
1432 int hdrsize
, patchsize
;
1433 int offset
= find_header(buffer
, size
, &hdrsize
, patch
);
1438 patch
->ws_rule
= whitespace_rule(patch
->new_name
1442 patchsize
= parse_single_patch(buffer
+ offset
+ hdrsize
,
1443 size
- offset
- hdrsize
, patch
);
1446 static const char *binhdr
[] = {
1451 static const char git_binary
[] = "GIT binary patch\n";
1453 int hd
= hdrsize
+ offset
;
1454 unsigned long llen
= linelen(buffer
+ hd
, size
- hd
);
1456 if (llen
== sizeof(git_binary
) - 1 &&
1457 !memcmp(git_binary
, buffer
+ hd
, llen
)) {
1460 used
= parse_binary(buffer
+ hd
+ llen
,
1461 size
- hd
- llen
, patch
);
1463 patchsize
= used
+ llen
;
1467 else if (!memcmp(" differ\n", buffer
+ hd
+ llen
- 8, 8)) {
1468 for (i
= 0; binhdr
[i
]; i
++) {
1469 int len
= strlen(binhdr
[i
]);
1470 if (len
< size
- hd
&&
1471 !memcmp(binhdr
[i
], buffer
+ hd
, len
)) {
1473 patch
->is_binary
= 1;
1480 /* Empty patch cannot be applied if it is a text patch
1481 * without metadata change. A binary patch appears
1484 if ((apply
|| check
) &&
1485 (!patch
->is_binary
&& !metadata_changes(patch
)))
1486 die("patch with only garbage at line %d", linenr
);
1489 return offset
+ hdrsize
+ patchsize
;
1492 #define swap(a,b) myswap((a),(b),sizeof(a))
1494 #define myswap(a, b, size) do { \
1495 unsigned char mytmp[size]; \
1496 memcpy(mytmp, &a, size); \
1497 memcpy(&a, &b, size); \
1498 memcpy(&b, mytmp, size); \
1501 static void reverse_patches(struct patch
*p
)
1503 for (; p
; p
= p
->next
) {
1504 struct fragment
*frag
= p
->fragments
;
1506 swap(p
->new_name
, p
->old_name
);
1507 swap(p
->new_mode
, p
->old_mode
);
1508 swap(p
->is_new
, p
->is_delete
);
1509 swap(p
->lines_added
, p
->lines_deleted
);
1510 swap(p
->old_sha1_prefix
, p
->new_sha1_prefix
);
1512 for (; frag
; frag
= frag
->next
) {
1513 swap(frag
->newpos
, frag
->oldpos
);
1514 swap(frag
->newlines
, frag
->oldlines
);
1519 static const char pluses
[] =
1520 "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
1521 static const char minuses
[]=
1522 "----------------------------------------------------------------------";
1524 static void show_stats(struct patch
*patch
)
1526 struct strbuf qname
;
1527 char *cp
= patch
->new_name
? patch
->new_name
: patch
->old_name
;
1530 strbuf_init(&qname
, 0);
1531 quote_c_style(cp
, &qname
, NULL
, 0);
1534 * "scale" the filename
1540 if (qname
.len
> max
) {
1541 cp
= strchr(qname
.buf
+ qname
.len
+ 3 - max
, '/');
1543 cp
= qname
.buf
+ qname
.len
+ 3 - max
;
1544 strbuf_splice(&qname
, 0, cp
- qname
.buf
, "...", 3);
1547 if (patch
->is_binary
) {
1548 printf(" %-*s | Bin\n", max
, qname
.buf
);
1549 strbuf_release(&qname
);
1553 printf(" %-*s |", max
, qname
.buf
);
1554 strbuf_release(&qname
);
1557 * scale the add/delete
1559 max
= max
+ max_change
> 70 ? 70 - max
: max_change
;
1560 add
= patch
->lines_added
;
1561 del
= patch
->lines_deleted
;
1563 if (max_change
> 0) {
1564 int total
= ((add
+ del
) * max
+ max_change
/ 2) / max_change
;
1565 add
= (add
* max
+ max_change
/ 2) / max_change
;
1568 printf("%5d %.*s%.*s\n", patch
->lines_added
+ patch
->lines_deleted
,
1569 add
, pluses
, del
, minuses
);
1572 static int read_old_data(struct stat
*st
, const char *path
, struct strbuf
*buf
)
1574 switch (st
->st_mode
& S_IFMT
) {
1576 strbuf_grow(buf
, st
->st_size
);
1577 if (readlink(path
, buf
->buf
, st
->st_size
) != st
->st_size
)
1579 strbuf_setlen(buf
, st
->st_size
);
1582 if (strbuf_read_file(buf
, path
, st
->st_size
) != st
->st_size
)
1583 return error("unable to open or read %s", path
);
1584 convert_to_git(path
, buf
->buf
, buf
->len
, buf
, 0);
1591 static void update_pre_post_images(struct image
*preimage
,
1592 struct image
*postimage
,
1597 char *new, *old
, *fixed
;
1598 struct image fixed_preimage
;
1601 * Update the preimage with whitespace fixes. Note that we
1602 * are not losing preimage->buf -- apply_one_fragment() will
1605 prepare_image(&fixed_preimage
, buf
, len
, 1);
1606 assert(fixed_preimage
.nr
== preimage
->nr
);
1607 for (i
= 0; i
< preimage
->nr
; i
++)
1608 fixed_preimage
.line
[i
].flag
= preimage
->line
[i
].flag
;
1609 free(preimage
->line_allocated
);
1610 *preimage
= fixed_preimage
;
1613 * Adjust the common context lines in postimage, in place.
1614 * This is possible because whitespace fixing does not make
1617 new = old
= postimage
->buf
;
1618 fixed
= preimage
->buf
;
1619 for (i
= ctx
= 0; i
< postimage
->nr
; i
++) {
1620 size_t len
= postimage
->line
[i
].len
;
1621 if (!(postimage
->line
[i
].flag
& LINE_COMMON
)) {
1622 /* an added line -- no counterparts in preimage */
1623 memmove(new, old
, len
);
1629 /* a common context -- skip it in the original postimage */
1632 /* and find the corresponding one in the fixed preimage */
1633 while (ctx
< preimage
->nr
&&
1634 !(preimage
->line
[ctx
].flag
& LINE_COMMON
)) {
1635 fixed
+= preimage
->line
[ctx
].len
;
1638 if (preimage
->nr
<= ctx
)
1641 /* and copy it in, while fixing the line length */
1642 len
= preimage
->line
[ctx
].len
;
1643 memcpy(new, fixed
, len
);
1646 postimage
->line
[i
].len
= len
;
1650 /* Fix the length of the whole thing */
1651 postimage
->len
= new - postimage
->buf
;
1654 static int match_fragment(struct image
*img
,
1655 struct image
*preimage
,
1656 struct image
*postimage
,
1660 int match_beginning
, int match_end
)
1663 char *fixed_buf
, *buf
, *orig
, *target
;
1665 if (preimage
->nr
+ try_lno
> img
->nr
)
1668 if (match_beginning
&& try_lno
)
1671 if (match_end
&& preimage
->nr
+ try_lno
!= img
->nr
)
1674 /* Quick hash check */
1675 for (i
= 0; i
< preimage
->nr
; i
++)
1676 if (preimage
->line
[i
].hash
!= img
->line
[try_lno
+ i
].hash
)
1680 * Do we have an exact match? If we were told to match
1681 * at the end, size must be exactly at try+fragsize,
1682 * otherwise try+fragsize must be still within the preimage,
1683 * and either case, the old piece should match the preimage
1687 ? (try + preimage
->len
== img
->len
)
1688 : (try + preimage
->len
<= img
->len
)) &&
1689 !memcmp(img
->buf
+ try, preimage
->buf
, preimage
->len
))
1692 if (ws_error_action
!= correct_ws_error
)
1696 * The hunk does not apply byte-by-byte, but the hash says
1697 * it might with whitespace fuzz.
1699 fixed_buf
= xmalloc(preimage
->len
+ 1);
1701 orig
= preimage
->buf
;
1702 target
= img
->buf
+ try;
1703 for (i
= 0; i
< preimage
->nr
; i
++) {
1704 size_t fixlen
; /* length after fixing the preimage */
1705 size_t oldlen
= preimage
->line
[i
].len
;
1706 size_t tgtlen
= img
->line
[try_lno
+ i
].len
;
1707 size_t tgtfixlen
; /* length after fixing the target line */
1708 char tgtfixbuf
[1024], *tgtfix
;
1711 /* Try fixing the line in the preimage */
1712 fixlen
= ws_fix_copy(buf
, orig
, oldlen
, ws_rule
, NULL
);
1714 /* Try fixing the line in the target */
1715 if (sizeof(tgtfixbuf
) > tgtlen
)
1718 tgtfix
= xmalloc(tgtlen
);
1719 tgtfixlen
= ws_fix_copy(tgtfix
, target
, tgtlen
, ws_rule
, NULL
);
1722 * If they match, either the preimage was based on
1723 * a version before our tree fixed whitespace breakage,
1724 * or we are lacking a whitespace-fix patch the tree
1725 * the preimage was based on already had (i.e. target
1726 * has whitespace breakage, the preimage doesn't).
1727 * In either case, we are fixing the whitespace breakages
1728 * so we might as well take the fix together with their
1731 match
= (tgtfixlen
== fixlen
&& !memcmp(tgtfix
, buf
, fixlen
));
1733 if (tgtfix
!= tgtfixbuf
)
1744 * Yes, the preimage is based on an older version that still
1745 * has whitespace breakages unfixed, and fixing them makes the
1746 * hunk match. Update the context lines in the postimage.
1748 update_pre_post_images(preimage
, postimage
,
1749 fixed_buf
, buf
- fixed_buf
);
1757 static int find_pos(struct image
*img
,
1758 struct image
*preimage
,
1759 struct image
*postimage
,
1762 int match_beginning
, int match_end
)
1765 unsigned long backwards
, forwards
, try;
1766 int backwards_lno
, forwards_lno
, try_lno
;
1768 if (preimage
->nr
> img
->nr
)
1772 * If match_begining or match_end is specified, there is no
1773 * point starting from a wrong line that will never match and
1774 * wander around and wait for a match at the specified end.
1776 if (match_beginning
)
1779 line
= img
->nr
- preimage
->nr
;
1785 for (i
= 0; i
< line
; i
++)
1786 try += img
->line
[i
].len
;
1789 * There's probably some smart way to do this, but I'll leave
1790 * that to the smart and beautiful people. I'm simple and stupid.
1793 backwards_lno
= line
;
1795 forwards_lno
= line
;
1798 for (i
= 0; ; i
++) {
1799 if (match_fragment(img
, preimage
, postimage
,
1800 try, try_lno
, ws_rule
,
1801 match_beginning
, match_end
))
1805 if (backwards_lno
== 0 && forwards_lno
== img
->nr
)
1809 if (backwards_lno
== 0) {
1814 backwards
-= img
->line
[backwards_lno
].len
;
1816 try_lno
= backwards_lno
;
1818 if (forwards_lno
== img
->nr
) {
1822 forwards
+= img
->line
[forwards_lno
].len
;
1825 try_lno
= forwards_lno
;
1832 static void remove_first_line(struct image
*img
)
1834 img
->buf
+= img
->line
[0].len
;
1835 img
->len
-= img
->line
[0].len
;
1840 static void remove_last_line(struct image
*img
)
1842 img
->len
-= img
->line
[--img
->nr
].len
;
1845 static void update_image(struct image
*img
,
1847 struct image
*preimage
,
1848 struct image
*postimage
)
1851 * remove the copy of preimage at offset in img
1852 * and replace it with postimage
1855 size_t remove_count
, insert_count
, applied_at
= 0;
1858 for (i
= 0; i
< applied_pos
; i
++)
1859 applied_at
+= img
->line
[i
].len
;
1862 for (i
= 0; i
< preimage
->nr
; i
++)
1863 remove_count
+= img
->line
[applied_pos
+ i
].len
;
1864 insert_count
= postimage
->len
;
1866 /* Adjust the contents */
1867 result
= xmalloc(img
->len
+ insert_count
- remove_count
+ 1);
1868 memcpy(result
, img
->buf
, applied_at
);
1869 memcpy(result
+ applied_at
, postimage
->buf
, postimage
->len
);
1870 memcpy(result
+ applied_at
+ postimage
->len
,
1871 img
->buf
+ (applied_at
+ remove_count
),
1872 img
->len
- (applied_at
+ remove_count
));
1875 img
->len
+= insert_count
- remove_count
;
1876 result
[img
->len
] = '\0';
1878 /* Adjust the line table */
1879 nr
= img
->nr
+ postimage
->nr
- preimage
->nr
;
1880 if (preimage
->nr
< postimage
->nr
) {
1882 * NOTE: this knows that we never call remove_first_line()
1883 * on anything other than pre/post image.
1885 img
->line
= xrealloc(img
->line
, nr
* sizeof(*img
->line
));
1886 img
->line_allocated
= img
->line
;
1888 if (preimage
->nr
!= postimage
->nr
)
1889 memmove(img
->line
+ applied_pos
+ postimage
->nr
,
1890 img
->line
+ applied_pos
+ preimage
->nr
,
1891 (img
->nr
- (applied_pos
+ preimage
->nr
)) *
1892 sizeof(*img
->line
));
1893 memcpy(img
->line
+ applied_pos
,
1895 postimage
->nr
* sizeof(*img
->line
));
1899 static int apply_one_fragment(struct image
*img
, struct fragment
*frag
,
1900 int inaccurate_eof
, unsigned ws_rule
)
1902 int match_beginning
, match_end
;
1903 const char *patch
= frag
->patch
;
1904 int size
= frag
->size
;
1905 char *old
, *new, *oldlines
, *newlines
;
1906 int new_blank_lines_at_end
= 0;
1907 int found_new_blank_lines_at_end
= 0;
1908 int hunk_linenr
= frag
->linenr
;
1909 unsigned long leading
, trailing
;
1910 int pos
, applied_pos
;
1911 struct image preimage
;
1912 struct image postimage
;
1914 memset(&preimage
, 0, sizeof(preimage
));
1915 memset(&postimage
, 0, sizeof(postimage
));
1916 oldlines
= xmalloc(size
);
1917 newlines
= xmalloc(size
);
1923 int len
= linelen(patch
, size
);
1925 int added_blank_line
= 0;
1926 int is_blank_context
= 0;
1932 * "plen" is how much of the line we should use for
1933 * the actual patch data. Normally we just remove the
1934 * first character on the line, but if the line is
1935 * followed by "\ No newline", then we also remove the
1936 * last one (which is the newline, of course).
1939 if (len
< size
&& patch
[len
] == '\\')
1942 if (apply_in_reverse
) {
1945 else if (first
== '+')
1951 /* Newer GNU diff, empty context line */
1953 /* ... followed by '\No newline'; nothing */
1957 add_line_info(&preimage
, "\n", 1, LINE_COMMON
);
1958 add_line_info(&postimage
, "\n", 1, LINE_COMMON
);
1959 is_blank_context
= 1;
1962 if (plen
&& patch
[1] == '\n')
1963 is_blank_context
= 1;
1965 memcpy(old
, patch
+ 1, plen
);
1966 add_line_info(&preimage
, old
, plen
,
1967 (first
== ' ' ? LINE_COMMON
: 0));
1971 /* Fall-through for ' ' */
1973 /* --no-add does not add new lines */
1974 if (first
== '+' && no_add
)
1978 !whitespace_error
||
1979 ws_error_action
!= correct_ws_error
) {
1980 memcpy(new, patch
+ 1, plen
);
1984 added
= ws_fix_copy(new, patch
+ 1, plen
, ws_rule
, &applied_after_fixing_ws
);
1986 add_line_info(&postimage
, new, added
,
1987 (first
== '+' ? 0 : LINE_COMMON
));
1990 added
== 1 && new[-1] == '\n')
1991 added_blank_line
= 1;
1993 case '@': case '\\':
1994 /* Ignore it, we already handled it */
1997 if (apply_verbosely
)
1998 error("invalid start of line: '%c'", first
);
2001 if (added_blank_line
) {
2002 if (!new_blank_lines_at_end
)
2003 found_new_blank_lines_at_end
= hunk_linenr
;
2004 new_blank_lines_at_end
++;
2006 else if (is_blank_context
)
2009 new_blank_lines_at_end
= 0;
2014 if (inaccurate_eof
&&
2015 old
> oldlines
&& old
[-1] == '\n' &&
2016 new > newlines
&& new[-1] == '\n') {
2021 leading
= frag
->leading
;
2022 trailing
= frag
->trailing
;
2025 * A hunk to change lines at the beginning would begin with
2027 * but we need to be careful. -U0 that inserts before the second
2028 * line also has this pattern.
2030 * And a hunk to add to an empty file would begin with
2033 * In other words, a hunk that is (frag->oldpos <= 1) with or
2034 * without leading context must match at the beginning.
2036 match_beginning
= (!frag
->oldpos
||
2037 (frag
->oldpos
== 1 && !unidiff_zero
));
2040 * A hunk without trailing lines must match at the end.
2041 * However, we simply cannot tell if a hunk must match end
2042 * from the lack of trailing lines if the patch was generated
2043 * with unidiff without any context.
2045 match_end
= !unidiff_zero
&& !trailing
;
2047 pos
= frag
->newpos
? (frag
->newpos
- 1) : 0;
2048 preimage
.buf
= oldlines
;
2049 preimage
.len
= old
- oldlines
;
2050 postimage
.buf
= newlines
;
2051 postimage
.len
= new - newlines
;
2052 preimage
.line
= preimage
.line_allocated
;
2053 postimage
.line
= postimage
.line_allocated
;
2057 applied_pos
= find_pos(img
, &preimage
, &postimage
, pos
,
2058 ws_rule
, match_beginning
, match_end
);
2060 if (applied_pos
>= 0)
2063 /* Am I at my context limits? */
2064 if ((leading
<= p_context
) && (trailing
<= p_context
))
2066 if (match_beginning
|| match_end
) {
2067 match_beginning
= match_end
= 0;
2072 * Reduce the number of context lines; reduce both
2073 * leading and trailing if they are equal otherwise
2074 * just reduce the larger context.
2076 if (leading
>= trailing
) {
2077 remove_first_line(&preimage
);
2078 remove_first_line(&postimage
);
2082 if (trailing
> leading
) {
2083 remove_last_line(&preimage
);
2084 remove_last_line(&postimage
);
2089 if (applied_pos
>= 0) {
2090 if (new_blank_lines_at_end
&&
2091 preimage
.nr
+ applied_pos
== img
->nr
&&
2092 (ws_rule
& WS_BLANK_AT_EOF
) &&
2093 ws_error_action
!= nowarn_ws_error
) {
2094 record_ws_error(WS_BLANK_AT_EOF
, "+", 1,
2095 found_new_blank_lines_at_end
);
2096 if (ws_error_action
== correct_ws_error
) {
2097 while (new_blank_lines_at_end
--)
2098 remove_last_line(&postimage
);
2101 * We would want to prevent write_out_results()
2102 * from taking place in apply_patch() that follows
2103 * the callchain led us here, which is:
2104 * apply_patch->check_patch_list->check_patch->
2105 * apply_data->apply_fragments->apply_one_fragment
2107 if (ws_error_action
== die_on_ws_error
)
2112 * Warn if it was necessary to reduce the number
2115 if ((leading
!= frag
->leading
) ||
2116 (trailing
!= frag
->trailing
))
2117 fprintf(stderr
, "Context reduced to (%ld/%ld)"
2118 " to apply fragment at %d\n",
2119 leading
, trailing
, applied_pos
+1);
2120 update_image(img
, applied_pos
, &preimage
, &postimage
);
2122 if (apply_verbosely
)
2123 error("while searching for:\n%.*s",
2124 (int)(old
- oldlines
), oldlines
);
2129 free(preimage
.line_allocated
);
2130 free(postimage
.line_allocated
);
2132 return (applied_pos
< 0);
2135 static int apply_binary_fragment(struct image
*img
, struct patch
*patch
)
2137 struct fragment
*fragment
= patch
->fragments
;
2141 /* Binary patch is irreversible without the optional second hunk */
2142 if (apply_in_reverse
) {
2143 if (!fragment
->next
)
2144 return error("cannot reverse-apply a binary patch "
2145 "without the reverse hunk to '%s'",
2147 ? patch
->new_name
: patch
->old_name
);
2148 fragment
= fragment
->next
;
2150 switch (fragment
->binary_patch_method
) {
2151 case BINARY_DELTA_DEFLATED
:
2152 dst
= patch_delta(img
->buf
, img
->len
, fragment
->patch
,
2153 fragment
->size
, &len
);
2160 case BINARY_LITERAL_DEFLATED
:
2162 img
->len
= fragment
->size
;
2163 img
->buf
= xmalloc(img
->len
+1);
2164 memcpy(img
->buf
, fragment
->patch
, img
->len
);
2165 img
->buf
[img
->len
] = '\0';
2171 static int apply_binary(struct image
*img
, struct patch
*patch
)
2173 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
2174 unsigned char sha1
[20];
2177 * For safety, we require patch index line to contain
2178 * full 40-byte textual SHA1 for old and new, at least for now.
2180 if (strlen(patch
->old_sha1_prefix
) != 40 ||
2181 strlen(patch
->new_sha1_prefix
) != 40 ||
2182 get_sha1_hex(patch
->old_sha1_prefix
, sha1
) ||
2183 get_sha1_hex(patch
->new_sha1_prefix
, sha1
))
2184 return error("cannot apply binary patch to '%s' "
2185 "without full index line", name
);
2187 if (patch
->old_name
) {
2189 * See if the old one matches what the patch
2192 hash_sha1_file(img
->buf
, img
->len
, blob_type
, sha1
);
2193 if (strcmp(sha1_to_hex(sha1
), patch
->old_sha1_prefix
))
2194 return error("the patch applies to '%s' (%s), "
2195 "which does not match the "
2196 "current contents.",
2197 name
, sha1_to_hex(sha1
));
2200 /* Otherwise, the old one must be empty. */
2202 return error("the patch applies to an empty "
2203 "'%s' but it is not empty", name
);
2206 get_sha1_hex(patch
->new_sha1_prefix
, sha1
);
2207 if (is_null_sha1(sha1
)) {
2209 return 0; /* deletion patch */
2212 if (has_sha1_file(sha1
)) {
2213 /* We already have the postimage */
2214 enum object_type type
;
2218 result
= read_sha1_file(sha1
, &type
, &size
);
2220 return error("the necessary postimage %s for "
2221 "'%s' cannot be read",
2222 patch
->new_sha1_prefix
, name
);
2228 * We have verified buf matches the preimage;
2229 * apply the patch data to it, which is stored
2230 * in the patch->fragments->{patch,size}.
2232 if (apply_binary_fragment(img
, patch
))
2233 return error("binary patch does not apply to '%s'",
2236 /* verify that the result matches */
2237 hash_sha1_file(img
->buf
, img
->len
, blob_type
, sha1
);
2238 if (strcmp(sha1_to_hex(sha1
), patch
->new_sha1_prefix
))
2239 return error("binary patch to '%s' creates incorrect result (expecting %s, got %s)",
2240 name
, patch
->new_sha1_prefix
, sha1_to_hex(sha1
));
2246 static int apply_fragments(struct image
*img
, struct patch
*patch
)
2248 struct fragment
*frag
= patch
->fragments
;
2249 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
2250 unsigned ws_rule
= patch
->ws_rule
;
2251 unsigned inaccurate_eof
= patch
->inaccurate_eof
;
2253 if (patch
->is_binary
)
2254 return apply_binary(img
, patch
);
2257 if (apply_one_fragment(img
, frag
, inaccurate_eof
, ws_rule
)) {
2258 error("patch failed: %s:%ld", name
, frag
->oldpos
);
2259 if (!apply_with_reject
)
2268 static int read_file_or_gitlink(struct cache_entry
*ce
, struct strbuf
*buf
)
2273 if (S_ISGITLINK(ce
->ce_mode
)) {
2274 strbuf_grow(buf
, 100);
2275 strbuf_addf(buf
, "Subproject commit %s\n", sha1_to_hex(ce
->sha1
));
2277 enum object_type type
;
2281 result
= read_sha1_file(ce
->sha1
, &type
, &sz
);
2284 /* XXX read_sha1_file NUL-terminates */
2285 strbuf_attach(buf
, result
, sz
, sz
+ 1);
2290 static struct patch
*in_fn_table(const char *name
)
2292 struct string_list_item
*item
;
2297 item
= string_list_lookup(name
, &fn_table
);
2299 return (struct patch
*)item
->util
;
2304 static void add_to_fn_table(struct patch
*patch
)
2306 struct string_list_item
*item
;
2309 * Always add new_name unless patch is a deletion
2310 * This should cover the cases for normal diffs,
2311 * file creations and copies
2313 if (patch
->new_name
!= NULL
) {
2314 item
= string_list_insert(patch
->new_name
, &fn_table
);
2319 * store a failure on rename/deletion cases because
2320 * later chunks shouldn't patch old names
2322 if ((patch
->new_name
== NULL
) || (patch
->is_rename
)) {
2323 item
= string_list_insert(patch
->old_name
, &fn_table
);
2324 item
->util
= (struct patch
*) -1;
2328 static int apply_data(struct patch
*patch
, struct stat
*st
, struct cache_entry
*ce
)
2334 struct patch
*tpatch
;
2336 strbuf_init(&buf
, 0);
2338 if (!(patch
->is_copy
|| patch
->is_rename
) &&
2339 ((tpatch
= in_fn_table(patch
->old_name
)) != NULL
)) {
2340 if (tpatch
== (struct patch
*) -1) {
2341 return error("patch %s has been renamed/deleted",
2344 /* We have a patched copy in memory use that */
2345 strbuf_add(&buf
, tpatch
->result
, tpatch
->resultsize
);
2346 } else if (cached
) {
2347 if (read_file_or_gitlink(ce
, &buf
))
2348 return error("read of %s failed", patch
->old_name
);
2349 } else if (patch
->old_name
) {
2350 if (S_ISGITLINK(patch
->old_mode
)) {
2352 read_file_or_gitlink(ce
, &buf
);
2355 * There is no way to apply subproject
2356 * patch without looking at the index.
2358 patch
->fragments
= NULL
;
2361 if (read_old_data(st
, patch
->old_name
, &buf
))
2362 return error("read of %s failed", patch
->old_name
);
2366 img
= strbuf_detach(&buf
, &len
);
2367 prepare_image(&image
, img
, len
, !patch
->is_binary
);
2369 if (apply_fragments(&image
, patch
) < 0)
2370 return -1; /* note with --reject this succeeds. */
2371 patch
->result
= image
.buf
;
2372 patch
->resultsize
= image
.len
;
2373 add_to_fn_table(patch
);
2374 free(image
.line_allocated
);
2376 if (0 < patch
->is_delete
&& patch
->resultsize
)
2377 return error("removal patch leaves file contents");
2382 static int check_to_create_blob(const char *new_name
, int ok_if_exists
)
2385 if (!lstat(new_name
, &nst
)) {
2386 if (S_ISDIR(nst
.st_mode
) || ok_if_exists
)
2389 * A leading component of new_name might be a symlink
2390 * that is going to be removed with this patch, but
2391 * still pointing at somewhere that has the path.
2392 * In such a case, path "new_name" does not exist as
2393 * far as git is concerned.
2395 if (has_symlink_leading_path(strlen(new_name
), new_name
))
2398 return error("%s: already exists in working directory", new_name
);
2400 else if ((errno
!= ENOENT
) && (errno
!= ENOTDIR
))
2401 return error("%s: %s", new_name
, strerror(errno
));
2405 static int verify_index_match(struct cache_entry
*ce
, struct stat
*st
)
2407 if (S_ISGITLINK(ce
->ce_mode
)) {
2408 if (!S_ISDIR(st
->st_mode
))
2412 return ce_match_stat(ce
, st
, CE_MATCH_IGNORE_VALID
);
2415 static int check_preimage(struct patch
*patch
, struct cache_entry
**ce
, struct stat
*st
)
2417 const char *old_name
= patch
->old_name
;
2418 struct patch
*tpatch
= NULL
;
2420 unsigned st_mode
= 0;
2423 * Make sure that we do not have local modifications from the
2424 * index when we are looking at the index. Also make sure
2425 * we have the preimage file to be patched in the work tree,
2426 * unless --cached, which tells git to apply only in the index.
2431 assert(patch
->is_new
<= 0);
2433 if (!(patch
->is_copy
|| patch
->is_rename
) &&
2434 (tpatch
= in_fn_table(old_name
)) != NULL
) {
2435 if (tpatch
== (struct patch
*) -1) {
2436 return error("%s: has been deleted/renamed", old_name
);
2438 st_mode
= tpatch
->new_mode
;
2439 } else if (!cached
) {
2440 stat_ret
= lstat(old_name
, st
);
2441 if (stat_ret
&& errno
!= ENOENT
)
2442 return error("%s: %s", old_name
, strerror(errno
));
2445 if (check_index
&& !tpatch
) {
2446 int pos
= cache_name_pos(old_name
, strlen(old_name
));
2448 if (patch
->is_new
< 0)
2450 return error("%s: does not exist in index", old_name
);
2452 *ce
= active_cache
[pos
];
2454 struct checkout costate
;
2456 costate
.base_dir
= "";
2457 costate
.base_dir_len
= 0;
2460 costate
.not_new
= 0;
2461 costate
.refresh_cache
= 1;
2462 if (checkout_entry(*ce
, &costate
, NULL
) ||
2463 lstat(old_name
, st
))
2466 if (!cached
&& verify_index_match(*ce
, st
))
2467 return error("%s: does not match index", old_name
);
2469 st_mode
= (*ce
)->ce_mode
;
2470 } else if (stat_ret
< 0) {
2471 if (patch
->is_new
< 0)
2473 return error("%s: %s", old_name
, strerror(errno
));
2476 if (!cached
&& !tpatch
)
2477 st_mode
= ce_mode_from_stat(*ce
, st
->st_mode
);
2479 if (patch
->is_new
< 0)
2481 if (!patch
->old_mode
)
2482 patch
->old_mode
= st_mode
;
2483 if ((st_mode
^ patch
->old_mode
) & S_IFMT
)
2484 return error("%s: wrong type", old_name
);
2485 if (st_mode
!= patch
->old_mode
)
2486 fprintf(stderr
, "warning: %s has type %o, expected %o\n",
2487 old_name
, st_mode
, patch
->old_mode
);
2492 patch
->is_delete
= 0;
2493 patch
->old_name
= NULL
;
2497 static int check_patch(struct patch
*patch
)
2500 const char *old_name
= patch
->old_name
;
2501 const char *new_name
= patch
->new_name
;
2502 const char *name
= old_name
? old_name
: new_name
;
2503 struct cache_entry
*ce
= NULL
;
2507 patch
->rejected
= 1; /* we will drop this after we succeed */
2509 status
= check_preimage(patch
, &ce
, &st
);
2512 old_name
= patch
->old_name
;
2514 if (in_fn_table(new_name
) == (struct patch
*) -1)
2516 * A type-change diff is always split into a patch to
2517 * delete old, immediately followed by a patch to
2518 * create new (see diff.c::run_diff()); in such a case
2519 * it is Ok that the entry to be deleted by the
2520 * previous patch is still in the working tree and in
2528 ((0 < patch
->is_new
) | (0 < patch
->is_rename
) | patch
->is_copy
)) {
2530 cache_name_pos(new_name
, strlen(new_name
)) >= 0 &&
2532 return error("%s: already exists in index", new_name
);
2534 int err
= check_to_create_blob(new_name
, ok_if_exists
);
2538 if (!patch
->new_mode
) {
2539 if (0 < patch
->is_new
)
2540 patch
->new_mode
= S_IFREG
| 0644;
2542 patch
->new_mode
= patch
->old_mode
;
2546 if (new_name
&& old_name
) {
2547 int same
= !strcmp(old_name
, new_name
);
2548 if (!patch
->new_mode
)
2549 patch
->new_mode
= patch
->old_mode
;
2550 if ((patch
->old_mode
^ patch
->new_mode
) & S_IFMT
)
2551 return error("new mode (%o) of %s does not match old mode (%o)%s%s",
2552 patch
->new_mode
, new_name
, patch
->old_mode
,
2553 same
? "" : " of ", same
? "" : old_name
);
2556 if (apply_data(patch
, &st
, ce
) < 0)
2557 return error("%s: patch does not apply", name
);
2558 patch
->rejected
= 0;
2562 static int check_patch_list(struct patch
*patch
)
2567 if (apply_verbosely
)
2568 say_patch_name(stderr
,
2569 "Checking patch ", patch
, "...\n");
2570 err
|= check_patch(patch
);
2571 patch
= patch
->next
;
2576 /* This function tries to read the sha1 from the current index */
2577 static int get_current_sha1(const char *path
, unsigned char *sha1
)
2581 if (read_cache() < 0)
2583 pos
= cache_name_pos(path
, strlen(path
));
2586 hashcpy(sha1
, active_cache
[pos
]->sha1
);
2590 /* Build an index that contains the just the files needed for a 3way merge */
2591 static void build_fake_ancestor(struct patch
*list
, const char *filename
)
2593 struct patch
*patch
;
2594 struct index_state result
= { 0 };
2597 /* Once we start supporting the reverse patch, it may be
2598 * worth showing the new sha1 prefix, but until then...
2600 for (patch
= list
; patch
; patch
= patch
->next
) {
2601 const unsigned char *sha1_ptr
;
2602 unsigned char sha1
[20];
2603 struct cache_entry
*ce
;
2606 name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
2607 if (0 < patch
->is_new
)
2609 else if (get_sha1(patch
->old_sha1_prefix
, sha1
))
2610 /* git diff has no index line for mode/type changes */
2611 if (!patch
->lines_added
&& !patch
->lines_deleted
) {
2612 if (get_current_sha1(patch
->new_name
, sha1
) ||
2613 get_current_sha1(patch
->old_name
, sha1
))
2614 die("mode change for %s, which is not "
2615 "in current HEAD", name
);
2618 die("sha1 information is lacking or useless "
2623 ce
= make_cache_entry(patch
->old_mode
, sha1_ptr
, name
, 0, 0);
2625 die("make_cache_entry failed for path '%s'", name
);
2626 if (add_index_entry(&result
, ce
, ADD_CACHE_OK_TO_ADD
))
2627 die ("Could not add %s to temporary index", name
);
2630 fd
= open(filename
, O_WRONLY
| O_CREAT
, 0666);
2631 if (fd
< 0 || write_index(&result
, fd
) || close(fd
))
2632 die ("Could not write temporary index to %s", filename
);
2634 discard_index(&result
);
2637 static void stat_patch_list(struct patch
*patch
)
2639 int files
, adds
, dels
;
2641 for (files
= adds
= dels
= 0 ; patch
; patch
= patch
->next
) {
2643 adds
+= patch
->lines_added
;
2644 dels
+= patch
->lines_deleted
;
2648 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files
, adds
, dels
);
2651 static void numstat_patch_list(struct patch
*patch
)
2653 for ( ; patch
; patch
= patch
->next
) {
2655 name
= patch
->new_name
? patch
->new_name
: patch
->old_name
;
2656 if (patch
->is_binary
)
2659 printf("%d\t%d\t", patch
->lines_added
, patch
->lines_deleted
);
2660 write_name_quoted(name
, stdout
, line_termination
);
2664 static void show_file_mode_name(const char *newdelete
, unsigned int mode
, const char *name
)
2667 printf(" %s mode %06o %s\n", newdelete
, mode
, name
);
2669 printf(" %s %s\n", newdelete
, name
);
2672 static void show_mode_change(struct patch
*p
, int show_name
)
2674 if (p
->old_mode
&& p
->new_mode
&& p
->old_mode
!= p
->new_mode
) {
2676 printf(" mode change %06o => %06o %s\n",
2677 p
->old_mode
, p
->new_mode
, p
->new_name
);
2679 printf(" mode change %06o => %06o\n",
2680 p
->old_mode
, p
->new_mode
);
2684 static void show_rename_copy(struct patch
*p
)
2686 const char *renamecopy
= p
->is_rename
? "rename" : "copy";
2687 const char *old
, *new;
2689 /* Find common prefix */
2693 const char *slash_old
, *slash_new
;
2694 slash_old
= strchr(old
, '/');
2695 slash_new
= strchr(new, '/');
2698 slash_old
- old
!= slash_new
- new ||
2699 memcmp(old
, new, slash_new
- new))
2701 old
= slash_old
+ 1;
2702 new = slash_new
+ 1;
2704 /* p->old_name thru old is the common prefix, and old and new
2705 * through the end of names are renames
2707 if (old
!= p
->old_name
)
2708 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy
,
2709 (int)(old
- p
->old_name
), p
->old_name
,
2710 old
, new, p
->score
);
2712 printf(" %s %s => %s (%d%%)\n", renamecopy
,
2713 p
->old_name
, p
->new_name
, p
->score
);
2714 show_mode_change(p
, 0);
2717 static void summary_patch_list(struct patch
*patch
)
2721 for (p
= patch
; p
; p
= p
->next
) {
2723 show_file_mode_name("create", p
->new_mode
, p
->new_name
);
2724 else if (p
->is_delete
)
2725 show_file_mode_name("delete", p
->old_mode
, p
->old_name
);
2727 if (p
->is_rename
|| p
->is_copy
)
2728 show_rename_copy(p
);
2731 printf(" rewrite %s (%d%%)\n",
2732 p
->new_name
, p
->score
);
2733 show_mode_change(p
, 0);
2736 show_mode_change(p
, 1);
2742 static void patch_stats(struct patch
*patch
)
2744 int lines
= patch
->lines_added
+ patch
->lines_deleted
;
2746 if (lines
> max_change
)
2748 if (patch
->old_name
) {
2749 int len
= quote_c_style(patch
->old_name
, NULL
, NULL
, 0);
2751 len
= strlen(patch
->old_name
);
2755 if (patch
->new_name
) {
2756 int len
= quote_c_style(patch
->new_name
, NULL
, NULL
, 0);
2758 len
= strlen(patch
->new_name
);
2764 static void remove_file(struct patch
*patch
, int rmdir_empty
)
2767 if (remove_file_from_cache(patch
->old_name
) < 0)
2768 die("unable to remove %s from index", patch
->old_name
);
2771 if (S_ISGITLINK(patch
->old_mode
)) {
2772 if (rmdir(patch
->old_name
))
2773 warning("unable to remove submodule %s",
2775 } else if (!unlink(patch
->old_name
) && rmdir_empty
) {
2776 remove_path(patch
->old_name
);
2781 static void add_index_file(const char *path
, unsigned mode
, void *buf
, unsigned long size
)
2784 struct cache_entry
*ce
;
2785 int namelen
= strlen(path
);
2786 unsigned ce_size
= cache_entry_size(namelen
);
2791 ce
= xcalloc(1, ce_size
);
2792 memcpy(ce
->name
, path
, namelen
);
2793 ce
->ce_mode
= create_ce_mode(mode
);
2794 ce
->ce_flags
= namelen
;
2795 if (S_ISGITLINK(mode
)) {
2796 const char *s
= buf
;
2798 if (get_sha1_hex(s
+ strlen("Subproject commit "), ce
->sha1
))
2799 die("corrupt patch for subproject %s", path
);
2802 if (lstat(path
, &st
) < 0)
2803 die("unable to stat newly created file %s",
2805 fill_stat_cache_info(ce
, &st
);
2807 if (write_sha1_file(buf
, size
, blob_type
, ce
->sha1
) < 0)
2808 die("unable to create backing store for newly created file %s", path
);
2810 if (add_cache_entry(ce
, ADD_CACHE_OK_TO_ADD
) < 0)
2811 die("unable to add cache entry for %s", path
);
2814 static int try_create_file(const char *path
, unsigned int mode
, const char *buf
, unsigned long size
)
2819 if (S_ISGITLINK(mode
)) {
2821 if (!lstat(path
, &st
) && S_ISDIR(st
.st_mode
))
2823 return mkdir(path
, 0777);
2826 if (has_symlinks
&& S_ISLNK(mode
))
2827 /* Although buf:size is counted string, it also is NUL
2830 return symlink(buf
, path
);
2832 fd
= open(path
, O_CREAT
| O_EXCL
| O_WRONLY
, (mode
& 0100) ? 0777 : 0666);
2836 strbuf_init(&nbuf
, 0);
2837 if (convert_to_working_tree(path
, buf
, size
, &nbuf
)) {
2841 write_or_die(fd
, buf
, size
);
2842 strbuf_release(&nbuf
);
2845 die("closing file %s: %s", path
, strerror(errno
));
2850 * We optimistically assume that the directories exist,
2851 * which is true 99% of the time anyway. If they don't,
2852 * we create them and try again.
2854 static void create_one_file(char *path
, unsigned mode
, const char *buf
, unsigned long size
)
2858 if (!try_create_file(path
, mode
, buf
, size
))
2861 if (errno
== ENOENT
) {
2862 if (safe_create_leading_directories(path
))
2864 if (!try_create_file(path
, mode
, buf
, size
))
2868 if (errno
== EEXIST
|| errno
== EACCES
) {
2869 /* We may be trying to create a file where a directory
2873 if (!lstat(path
, &st
) && (!S_ISDIR(st
.st_mode
) || !rmdir(path
)))
2877 if (errno
== EEXIST
) {
2878 unsigned int nr
= getpid();
2881 char newpath
[PATH_MAX
];
2882 mksnpath(newpath
, sizeof(newpath
), "%s~%u", path
, nr
);
2883 if (!try_create_file(newpath
, mode
, buf
, size
)) {
2884 if (!rename(newpath
, path
))
2889 if (errno
!= EEXIST
)
2894 die("unable to write file %s mode %o", path
, mode
);
2897 static void create_file(struct patch
*patch
)
2899 char *path
= patch
->new_name
;
2900 unsigned mode
= patch
->new_mode
;
2901 unsigned long size
= patch
->resultsize
;
2902 char *buf
= patch
->result
;
2905 mode
= S_IFREG
| 0644;
2906 create_one_file(path
, mode
, buf
, size
);
2907 add_index_file(path
, mode
, buf
, size
);
2910 /* phase zero is to remove, phase one is to create */
2911 static void write_out_one_result(struct patch
*patch
, int phase
)
2913 if (patch
->is_delete
> 0) {
2915 remove_file(patch
, 1);
2918 if (patch
->is_new
> 0 || patch
->is_copy
) {
2924 * Rename or modification boils down to the same
2925 * thing: remove the old, write the new
2928 remove_file(patch
, patch
->is_rename
);
2933 static int write_out_one_reject(struct patch
*patch
)
2936 char namebuf
[PATH_MAX
];
2937 struct fragment
*frag
;
2940 for (cnt
= 0, frag
= patch
->fragments
; frag
; frag
= frag
->next
) {
2941 if (!frag
->rejected
)
2947 if (apply_verbosely
)
2948 say_patch_name(stderr
,
2949 "Applied patch ", patch
, " cleanly.\n");
2953 /* This should not happen, because a removal patch that leaves
2954 * contents are marked "rejected" at the patch level.
2956 if (!patch
->new_name
)
2957 die("internal error");
2959 /* Say this even without --verbose */
2960 say_patch_name(stderr
, "Applying patch ", patch
, " with");
2961 fprintf(stderr
, " %d rejects...\n", cnt
);
2963 cnt
= strlen(patch
->new_name
);
2964 if (ARRAY_SIZE(namebuf
) <= cnt
+ 5) {
2965 cnt
= ARRAY_SIZE(namebuf
) - 5;
2967 "warning: truncating .rej filename to %.*s.rej",
2968 cnt
- 1, patch
->new_name
);
2970 memcpy(namebuf
, patch
->new_name
, cnt
);
2971 memcpy(namebuf
+ cnt
, ".rej", 5);
2973 rej
= fopen(namebuf
, "w");
2975 return error("cannot open %s: %s", namebuf
, strerror(errno
));
2977 /* Normal git tools never deal with .rej, so do not pretend
2978 * this is a git patch by saying --git nor give extended
2979 * headers. While at it, maybe please "kompare" that wants
2980 * the trailing TAB and some garbage at the end of line ;-).
2982 fprintf(rej
, "diff a/%s b/%s\t(rejected hunks)\n",
2983 patch
->new_name
, patch
->new_name
);
2984 for (cnt
= 1, frag
= patch
->fragments
;
2986 cnt
++, frag
= frag
->next
) {
2987 if (!frag
->rejected
) {
2988 fprintf(stderr
, "Hunk #%d applied cleanly.\n", cnt
);
2991 fprintf(stderr
, "Rejected hunk #%d.\n", cnt
);
2992 fprintf(rej
, "%.*s", frag
->size
, frag
->patch
);
2993 if (frag
->patch
[frag
->size
-1] != '\n')
3000 static int write_out_results(struct patch
*list
, int skipped_patch
)
3006 if (!list
&& !skipped_patch
)
3007 return error("No changes");
3009 for (phase
= 0; phase
< 2; phase
++) {
3015 write_out_one_result(l
, phase
);
3016 if (phase
== 1 && write_out_one_reject(l
))
3025 static struct lock_file lock_file
;
3027 static struct excludes
{
3028 struct excludes
*next
;
3032 static int use_patch(struct patch
*p
)
3034 const char *pathname
= p
->new_name
? p
->new_name
: p
->old_name
;
3035 struct excludes
*x
= excludes
;
3037 if (fnmatch(x
->path
, pathname
, 0) == 0)
3041 if (0 < prefix_length
) {
3042 int pathlen
= strlen(pathname
);
3043 if (pathlen
<= prefix_length
||
3044 memcmp(prefix
, pathname
, prefix_length
))
3050 static void prefix_one(char **name
)
3052 char *old_name
= *name
;
3055 *name
= xstrdup(prefix_filename(prefix
, prefix_length
, *name
));
3059 static void prefix_patches(struct patch
*p
)
3061 if (!prefix
|| p
->is_toplevel_relative
)
3063 for ( ; p
; p
= p
->next
) {
3064 if (p
->new_name
== p
->old_name
) {
3065 char *prefixed
= p
->new_name
;
3066 prefix_one(&prefixed
);
3067 p
->new_name
= p
->old_name
= prefixed
;
3070 prefix_one(&p
->new_name
);
3071 prefix_one(&p
->old_name
);
3076 #define INACCURATE_EOF (1<<0)
3077 #define RECOUNT (1<<1)
3079 static int apply_patch(int fd
, const char *filename
, int options
)
3083 struct patch
*list
= NULL
, **listp
= &list
;
3084 int skipped_patch
= 0;
3086 /* FIXME - memory leak when using multiple patch files as inputs */
3087 memset(&fn_table
, 0, sizeof(struct string_list
));
3088 strbuf_init(&buf
, 0);
3089 patch_input_file
= filename
;
3090 read_patch_file(&buf
, fd
);
3092 while (offset
< buf
.len
) {
3093 struct patch
*patch
;
3096 patch
= xcalloc(1, sizeof(*patch
));
3097 patch
->inaccurate_eof
= !!(options
& INACCURATE_EOF
);
3098 patch
->recount
= !!(options
& RECOUNT
);
3099 nr
= parse_chunk(buf
.buf
+ offset
, buf
.len
- offset
, patch
);
3102 if (apply_in_reverse
)
3103 reverse_patches(patch
);
3105 prefix_patches(patch
);
3106 if (use_patch(patch
)) {
3109 listp
= &patch
->next
;
3112 /* perhaps free it a bit better? */
3119 if (whitespace_error
&& (ws_error_action
== die_on_ws_error
))
3122 update_index
= check_index
&& apply
;
3123 if (update_index
&& newfd
< 0)
3124 newfd
= hold_locked_index(&lock_file
, 1);
3127 if (read_cache() < 0)
3128 die("unable to read index file");
3131 if ((check
|| apply
) &&
3132 check_patch_list(list
) < 0 &&
3136 if (apply
&& write_out_results(list
, skipped_patch
))
3140 build_fake_ancestor(list
, fake_ancestor
);
3143 stat_patch_list(list
);
3146 numstat_patch_list(list
);
3149 summary_patch_list(list
);
3151 strbuf_release(&buf
);
3155 static int git_apply_config(const char *var
, const char *value
, void *cb
)
3157 if (!strcmp(var
, "apply.whitespace"))
3158 return git_config_string(&apply_default_whitespace
, var
, value
);
3159 return git_default_config(var
, value
, cb
);
3163 int cmd_apply(int argc
, const char **argv
, const char *unused_prefix
)
3171 const char *whitespace_option
= NULL
;
3173 prefix
= setup_git_directory_gently(&is_not_gitdir
);
3174 prefix_length
= prefix
? strlen(prefix
) : 0;
3175 git_config(git_apply_config
, NULL
);
3176 if (apply_default_whitespace
)
3177 parse_whitespace_option(apply_default_whitespace
);
3179 for (i
= 1; i
< argc
; i
++) {
3180 const char *arg
= argv
[i
];
3184 if (!strcmp(arg
, "-")) {
3185 errs
|= apply_patch(0, "<stdin>", options
);
3189 if (!prefixcmp(arg
, "--exclude=")) {
3190 struct excludes
*x
= xmalloc(sizeof(*x
));
3196 if (!prefixcmp(arg
, "-p")) {
3197 p_value
= atoi(arg
+ 2);
3201 if (!strcmp(arg
, "--no-add")) {
3205 if (!strcmp(arg
, "--stat")) {
3210 if (!strcmp(arg
, "--allow-binary-replacement") ||
3211 !strcmp(arg
, "--binary")) {
3212 continue; /* now no-op */
3214 if (!strcmp(arg
, "--numstat")) {
3219 if (!strcmp(arg
, "--summary")) {
3224 if (!strcmp(arg
, "--check")) {
3229 if (!strcmp(arg
, "--index")) {
3231 die("--index outside a repository");
3235 if (!strcmp(arg
, "--cached")) {
3237 die("--cached outside a repository");
3242 if (!strcmp(arg
, "--apply")) {
3246 if (!strcmp(arg
, "--build-fake-ancestor")) {
3249 die ("need a filename");
3250 fake_ancestor
= argv
[i
];
3253 if (!strcmp(arg
, "-z")) {
3254 line_termination
= 0;
3257 if (!prefixcmp(arg
, "-C")) {
3258 p_context
= strtoul(arg
+ 2, &end
, 0);
3260 die("unrecognized context count '%s'", arg
+ 2);
3263 if (!prefixcmp(arg
, "--whitespace=")) {
3264 whitespace_option
= arg
+ 13;
3265 parse_whitespace_option(arg
+ 13);
3268 if (!strcmp(arg
, "-R") || !strcmp(arg
, "--reverse")) {
3269 apply_in_reverse
= 1;
3272 if (!strcmp(arg
, "--unidiff-zero")) {
3276 if (!strcmp(arg
, "--reject")) {
3277 apply
= apply_with_reject
= apply_verbosely
= 1;
3280 if (!strcmp(arg
, "-v") || !strcmp(arg
, "--verbose")) {
3281 apply_verbosely
= 1;
3284 if (!strcmp(arg
, "--inaccurate-eof")) {
3285 options
|= INACCURATE_EOF
;
3288 if (!strcmp(arg
, "--recount")) {
3292 if (!prefixcmp(arg
, "--directory=")) {
3293 arg
+= strlen("--directory=");
3294 root_len
= strlen(arg
);
3295 if (root_len
&& arg
[root_len
- 1] != '/') {
3297 root
= new_root
= xmalloc(root_len
+ 2);
3298 strcpy(new_root
, arg
);
3299 strcpy(new_root
+ root_len
++, "/");
3304 if (0 < prefix_length
)
3305 arg
= prefix_filename(prefix
, prefix_length
, arg
);
3307 fd
= open(arg
, O_RDONLY
);
3309 die("can't open patch '%s': %s", arg
, strerror(errno
));
3311 set_default_whitespace_mode(whitespace_option
);
3312 errs
|= apply_patch(fd
, arg
, options
);
3315 set_default_whitespace_mode(whitespace_option
);
3317 errs
|= apply_patch(0, "<stdin>", options
);
3318 if (whitespace_error
) {
3319 if (squelch_whitespace_errors
&&
3320 squelch_whitespace_errors
< whitespace_error
) {
3322 whitespace_error
- squelch_whitespace_errors
;
3323 fprintf(stderr
, "warning: squelched %d "
3324 "whitespace error%s\n",
3326 squelched
== 1 ? "" : "s");
3328 if (ws_error_action
== die_on_ws_error
)
3329 die("%d line%s add%s whitespace errors.",
3331 whitespace_error
== 1 ? "" : "s",
3332 whitespace_error
== 1 ? "s" : "");
3333 if (applied_after_fixing_ws
&& apply
)
3334 fprintf(stderr
, "warning: %d line%s applied after"
3335 " fixing whitespace errors.\n",
3336 applied_after_fixing_ws
,
3337 applied_after_fixing_ws
== 1 ? "" : "s");
3338 else if (whitespace_error
)
3339 fprintf(stderr
, "warning: %d line%s add%s whitespace errors.\n",
3341 whitespace_error
== 1 ? "" : "s",
3342 whitespace_error
== 1 ? "s" : "");
3346 if (write_cache(newfd
, active_cache
, active_nr
) ||
3347 commit_locked_index(&lock_file
))
3348 die("Unable to write new index file");