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"
17 #include "parse-options.h"
20 * --check turns on checking that the working tree matches the
21 * files that are being modified, but doesn't apply the patch
22 * --stat does just a diffstat, and doesn't actually apply
23 * --numstat does numeric diffstat, and doesn't actually apply
24 * --index-info shows the old and new index info for paths if available.
25 * --index updates the cache as well.
26 * --cached updates only the cache without ever touching the working tree.
28 static const char *prefix
;
29 static int prefix_length
= -1;
30 static int newfd
= -1;
32 static int unidiff_zero
;
33 static int p_value
= 1;
34 static int p_value_known
;
35 static int check_index
;
36 static int update_index
;
43 static int apply_in_reverse
;
44 static int apply_with_reject
;
45 static int apply_verbosely
;
47 static const char *fake_ancestor
;
48 static int line_termination
= '\n';
49 static unsigned int p_context
= UINT_MAX
;
50 static const char * const apply_usage
[] = {
51 "git apply [options] [<patch>...]",
55 static enum ws_error_action
{
60 } ws_error_action
= warn_on_ws_error
;
61 static int whitespace_error
;
62 static int squelch_whitespace_errors
= 5;
63 static int applied_after_fixing_ws
;
65 static enum ws_ignore
{
68 } ws_ignore_action
= ignore_ws_none
;
71 static const char *patch_input_file
;
72 static const char *root
;
74 static int read_stdin
= 1;
77 static void parse_whitespace_option(const char *option
)
80 ws_error_action
= warn_on_ws_error
;
83 if (!strcmp(option
, "warn")) {
84 ws_error_action
= warn_on_ws_error
;
87 if (!strcmp(option
, "nowarn")) {
88 ws_error_action
= nowarn_ws_error
;
91 if (!strcmp(option
, "error")) {
92 ws_error_action
= die_on_ws_error
;
95 if (!strcmp(option
, "error-all")) {
96 ws_error_action
= die_on_ws_error
;
97 squelch_whitespace_errors
= 0;
100 if (!strcmp(option
, "strip") || !strcmp(option
, "fix")) {
101 ws_error_action
= correct_ws_error
;
104 die("unrecognized whitespace option '%s'", option
);
107 static void parse_ignorewhitespace_option(const char *option
)
109 if (!option
|| !strcmp(option
, "no") ||
110 !strcmp(option
, "false") || !strcmp(option
, "never") ||
111 !strcmp(option
, "none")) {
112 ws_ignore_action
= ignore_ws_none
;
115 if (!strcmp(option
, "change")) {
116 ws_ignore_action
= ignore_ws_change
;
119 die("unrecognized whitespace ignore option '%s'", option
);
122 static void set_default_whitespace_mode(const char *whitespace_option
)
124 if (!whitespace_option
&& !apply_default_whitespace
)
125 ws_error_action
= (apply
? warn_on_ws_error
: nowarn_ws_error
);
129 * For "diff-stat" like behaviour, we keep track of the biggest change
130 * we've seen, and the longest filename. That allows us to do simple
133 static int max_change
, max_len
;
136 * Various "current state", notably line numbers and what
137 * file (and how) we're patching right now.. The "is_xxxx"
138 * things are flags, where -1 means "don't know yet".
140 static int linenr
= 1;
143 * This represents one "hunk" from a patch, starting with
144 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The
145 * patch text is pointed at by patch, and its byte length
146 * is stored in size. leading and trailing are the number
150 unsigned long leading
, trailing
;
151 unsigned long oldpos
, oldlines
;
152 unsigned long newpos
, newlines
;
157 struct fragment
*next
;
161 * When dealing with a binary patch, we reuse "leading" field
162 * to store the type of the binary hunk, either deflated "delta"
163 * or deflated "literal".
165 #define binary_patch_method leading
166 #define BINARY_DELTA_DEFLATED 1
167 #define BINARY_LITERAL_DEFLATED 2
170 * This represents a "patch" to a file, both metainfo changes
171 * such as creation/deletion, filemode and content changes represented
172 * as a series of fragments.
175 char *new_name
, *old_name
, *def_name
;
176 unsigned int old_mode
, new_mode
;
177 int is_new
, is_delete
; /* -1 = unknown, 0 = false, 1 = true */
180 unsigned long deflate_origlen
;
181 int lines_added
, lines_deleted
;
183 unsigned int is_toplevel_relative
:1;
184 unsigned int inaccurate_eof
:1;
185 unsigned int is_binary
:1;
186 unsigned int is_copy
:1;
187 unsigned int is_rename
:1;
188 unsigned int recount
:1;
189 struct fragment
*fragments
;
192 char old_sha1_prefix
[41];
193 char new_sha1_prefix
[41];
198 * A line in a file, len-bytes long (includes the terminating LF,
199 * except for an incomplete line at the end if the file ends with
200 * one), and its contents hashes to 'hash'.
206 #define LINE_COMMON 1
210 * This represents a "file", which is an array of "lines".
217 struct line
*line_allocated
;
222 * Records filenames that have been touched, in order to handle
223 * the case where more than one patches touch the same file.
226 static struct string_list fn_table
;
228 static uint32_t hash_line(const char *cp
, size_t len
)
232 for (i
= 0, h
= 0; i
< len
; i
++) {
233 if (!isspace(cp
[i
])) {
234 h
= h
* 3 + (cp
[i
] & 0xff);
241 * Compare lines s1 of length n1 and s2 of length n2, ignoring
242 * whitespace difference. Returns 1 if they match, 0 otherwise
244 static int fuzzy_matchlines(const char *s1
, size_t n1
,
245 const char *s2
, size_t n2
)
247 const char *last1
= s1
+ n1
- 1;
248 const char *last2
= s2
+ n2
- 1;
251 if (n1
< 0 || n2
< 0)
254 /* ignore line endings */
255 while ((*last1
== '\r') || (*last1
== '\n'))
257 while ((*last2
== '\r') || (*last2
== '\n'))
260 /* skip leading whitespace */
261 while (isspace(*s1
) && (s1
<= last1
))
263 while (isspace(*s2
) && (s2
<= last2
))
265 /* early return if both lines are empty */
266 if ((s1
> last1
) && (s2
> last2
))
269 result
= *s1
++ - *s2
++;
271 * Skip whitespace inside. We check for whitespace on
272 * both buffers because we don't want "a b" to match
275 if (isspace(*s1
) && isspace(*s2
)) {
276 while (isspace(*s1
) && s1
<= last1
)
278 while (isspace(*s2
) && s2
<= last2
)
282 * If we reached the end on one side only,
286 ((s2
> last2
) && (s1
<= last1
)) ||
287 ((s1
> last1
) && (s2
<= last2
)))
289 if ((s1
> last1
) && (s2
> last2
))
296 static void add_line_info(struct image
*img
, const char *bol
, size_t len
, unsigned flag
)
298 ALLOC_GROW(img
->line_allocated
, img
->nr
+ 1, img
->alloc
);
299 img
->line_allocated
[img
->nr
].len
= len
;
300 img
->line_allocated
[img
->nr
].hash
= hash_line(bol
, len
);
301 img
->line_allocated
[img
->nr
].flag
= flag
;
305 static void prepare_image(struct image
*image
, char *buf
, size_t len
,
306 int prepare_linetable
)
310 memset(image
, 0, sizeof(*image
));
314 if (!prepare_linetable
)
317 ep
= image
->buf
+ image
->len
;
321 for (next
= cp
; next
< ep
&& *next
!= '\n'; next
++)
325 add_line_info(image
, cp
, next
- cp
, 0);
328 image
->line
= image
->line_allocated
;
331 static void clear_image(struct image
*image
)
338 static void say_patch_name(FILE *output
, const char *pre
,
339 struct patch
*patch
, const char *post
)
342 if (patch
->old_name
&& patch
->new_name
&&
343 strcmp(patch
->old_name
, patch
->new_name
)) {
344 quote_c_style(patch
->old_name
, NULL
, output
, 0);
345 fputs(" => ", output
);
346 quote_c_style(patch
->new_name
, NULL
, output
, 0);
348 const char *n
= patch
->new_name
;
351 quote_c_style(n
, NULL
, output
, 0);
356 #define CHUNKSIZE (8192)
359 static void read_patch_file(struct strbuf
*sb
, int fd
)
361 if (strbuf_read(sb
, fd
, 0) < 0)
362 die_errno("git apply: failed to read");
365 * Make sure that we have some slop in the buffer
366 * so that we can do speculative "memcmp" etc, and
367 * see to it that it is NUL-filled.
369 strbuf_grow(sb
, SLOP
);
370 memset(sb
->buf
+ sb
->len
, 0, SLOP
);
373 static unsigned long linelen(const char *buffer
, unsigned long size
)
375 unsigned long len
= 0;
378 if (*buffer
++ == '\n')
384 static int is_dev_null(const char *str
)
386 return !memcmp("/dev/null", str
, 9) && isspace(str
[9]);
392 static int name_terminate(const char *name
, int namelen
, int c
, int terminate
)
394 if (c
== ' ' && !(terminate
& TERM_SPACE
))
396 if (c
== '\t' && !(terminate
& TERM_TAB
))
402 /* remove double slashes to make --index work with such filenames */
403 static char *squash_slash(char *name
)
411 if ((name
[j
++] = name
[i
++]) == '/')
412 while (name
[i
] == '/')
419 static char *find_name(const char *line
, char *def
, int p_value
, int terminate
)
422 const char *start
= NULL
;
428 struct strbuf name
= STRBUF_INIT
;
431 * Proposed "new-style" GNU patch/diff format; see
432 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
434 if (!unquote_c_style(&name
, line
, NULL
)) {
437 for (cp
= name
.buf
; p_value
; p_value
--) {
438 cp
= strchr(cp
, '/');
444 /* name can later be freed, so we need
445 * to memmove, not just return cp
447 strbuf_remove(&name
, 0, cp
- name
.buf
);
450 strbuf_insert(&name
, 0, root
, root_len
);
451 return squash_slash(strbuf_detach(&name
, NULL
));
454 strbuf_release(&name
);
463 if (name_terminate(start
, line
-start
, c
, terminate
))
467 if (c
== '/' && !--p_value
)
471 return squash_slash(def
);
474 return squash_slash(def
);
477 * Generally we prefer the shorter name, especially
478 * if the other one is just a variation of that with
479 * something else tacked on to the end (ie "file.orig"
483 int deflen
= strlen(def
);
484 if (deflen
< len
&& !strncmp(start
, def
, deflen
))
485 return squash_slash(def
);
490 char *ret
= xmalloc(root_len
+ len
+ 1);
492 memcpy(ret
+ root_len
, start
, len
);
493 ret
[root_len
+ len
] = '\0';
494 return squash_slash(ret
);
497 return squash_slash(xmemdupz(start
, len
));
500 static int count_slashes(const char *cp
)
512 * Given the string after "--- " or "+++ ", guess the appropriate
513 * p_value for the given patch.
515 static int guess_p_value(const char *nameline
)
520 if (is_dev_null(nameline
))
522 name
= find_name(nameline
, NULL
, 0, TERM_SPACE
| TERM_TAB
);
525 cp
= strchr(name
, '/');
530 * Does it begin with "a/$our-prefix" and such? Then this is
531 * very likely to apply to our directory.
533 if (!strncmp(name
, prefix
, prefix_length
))
534 val
= count_slashes(prefix
);
537 if (!strncmp(cp
, prefix
, prefix_length
))
538 val
= count_slashes(prefix
) + 1;
546 * Does the ---/+++ line has the POSIX timestamp after the last HT?
547 * GNU diff puts epoch there to signal a creation/deletion event. Is
548 * this such a timestamp?
550 static int has_epoch_timestamp(const char *nameline
)
553 * We are only interested in epoch timestamp; any non-zero
554 * fraction cannot be one, hence "(\.0+)?" in the regexp below.
555 * For the same reason, the date must be either 1969-12-31 or
556 * 1970-01-01, and the seconds part must be "00".
558 const char stamp_regexp
[] =
559 "^(1969-12-31|1970-01-01)"
561 "[0-2][0-9]:[0-5][0-9]:00(\\.0+)?"
563 "([-+][0-2][0-9][0-5][0-9])\n";
564 const char *timestamp
= NULL
, *cp
;
565 static regex_t
*stamp
;
571 for (cp
= nameline
; *cp
!= '\n'; cp
++) {
578 stamp
= xmalloc(sizeof(*stamp
));
579 if (regcomp(stamp
, stamp_regexp
, REG_EXTENDED
)) {
580 warning("Cannot prepare timestamp regexp %s",
586 status
= regexec(stamp
, timestamp
, ARRAY_SIZE(m
), m
, 0);
588 if (status
!= REG_NOMATCH
)
589 warning("regexec returned %d for input: %s",
594 zoneoffset
= strtol(timestamp
+ m
[3].rm_so
+ 1, NULL
, 10);
595 zoneoffset
= (zoneoffset
/ 100) * 60 + (zoneoffset
% 100);
596 if (timestamp
[m
[3].rm_so
] == '-')
597 zoneoffset
= -zoneoffset
;
600 * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31
601 * (west of GMT) or 1970-01-01 (east of GMT)
603 if ((zoneoffset
< 0 && memcmp(timestamp
, "1969-12-31", 10)) ||
604 (0 <= zoneoffset
&& memcmp(timestamp
, "1970-01-01", 10)))
607 hourminute
= (strtol(timestamp
+ 11, NULL
, 10) * 60 +
608 strtol(timestamp
+ 14, NULL
, 10) -
611 return ((zoneoffset
< 0 && hourminute
== 1440) ||
612 (0 <= zoneoffset
&& !hourminute
));
616 * Get the name etc info from the ---/+++ lines of a traditional patch header
618 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
619 * files, we can happily check the index for a match, but for creating a
620 * new file we should try to match whatever "patch" does. I have no idea.
622 static void parse_traditional_patch(const char *first
, const char *second
, struct patch
*patch
)
626 first
+= 4; /* skip "--- " */
627 second
+= 4; /* skip "+++ " */
628 if (!p_value_known
) {
630 p
= guess_p_value(first
);
631 q
= guess_p_value(second
);
633 if (0 <= p
&& p
== q
) {
638 if (is_dev_null(first
)) {
640 patch
->is_delete
= 0;
641 name
= find_name(second
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
642 patch
->new_name
= name
;
643 } else if (is_dev_null(second
)) {
645 patch
->is_delete
= 1;
646 name
= find_name(first
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
647 patch
->old_name
= name
;
649 name
= find_name(first
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
650 name
= find_name(second
, name
, p_value
, TERM_SPACE
| TERM_TAB
);
651 if (has_epoch_timestamp(first
)) {
653 patch
->is_delete
= 0;
654 patch
->new_name
= name
;
655 } else if (has_epoch_timestamp(second
)) {
657 patch
->is_delete
= 1;
658 patch
->old_name
= name
;
660 patch
->old_name
= patch
->new_name
= name
;
664 die("unable to find filename in patch at line %d", linenr
);
667 static int gitdiff_hdrend(const char *line
, struct patch
*patch
)
673 * We're anal about diff header consistency, to make
674 * sure that we don't end up having strange ambiguous
675 * patches floating around.
677 * As a result, gitdiff_{old|new}name() will check
678 * their names against any previous information, just
681 static char *gitdiff_verify_name(const char *line
, int isnull
, char *orig_name
, const char *oldnew
)
683 if (!orig_name
&& !isnull
)
684 return find_name(line
, NULL
, p_value
, TERM_TAB
);
693 die("git apply: bad git-diff - expected /dev/null, got %s on line %d", name
, linenr
);
694 another
= find_name(line
, NULL
, p_value
, TERM_TAB
);
695 if (!another
|| memcmp(another
, name
, len
+ 1))
696 die("git apply: bad git-diff - inconsistent %s filename on line %d", oldnew
, linenr
);
701 /* expect "/dev/null" */
702 if (memcmp("/dev/null", line
, 9) || line
[9] != '\n')
703 die("git apply: bad git-diff - expected /dev/null on line %d", linenr
);
708 static int gitdiff_oldname(const char *line
, struct patch
*patch
)
710 patch
->old_name
= gitdiff_verify_name(line
, patch
->is_new
, patch
->old_name
, "old");
714 static int gitdiff_newname(const char *line
, struct patch
*patch
)
716 patch
->new_name
= gitdiff_verify_name(line
, patch
->is_delete
, patch
->new_name
, "new");
720 static int gitdiff_oldmode(const char *line
, struct patch
*patch
)
722 patch
->old_mode
= strtoul(line
, NULL
, 8);
726 static int gitdiff_newmode(const char *line
, struct patch
*patch
)
728 patch
->new_mode
= strtoul(line
, NULL
, 8);
732 static int gitdiff_delete(const char *line
, struct patch
*patch
)
734 patch
->is_delete
= 1;
735 patch
->old_name
= patch
->def_name
;
736 return gitdiff_oldmode(line
, patch
);
739 static int gitdiff_newfile(const char *line
, struct patch
*patch
)
742 patch
->new_name
= patch
->def_name
;
743 return gitdiff_newmode(line
, patch
);
746 static int gitdiff_copysrc(const char *line
, struct patch
*patch
)
749 patch
->old_name
= find_name(line
, NULL
, 0, 0);
753 static int gitdiff_copydst(const char *line
, struct patch
*patch
)
756 patch
->new_name
= find_name(line
, NULL
, 0, 0);
760 static int gitdiff_renamesrc(const char *line
, struct patch
*patch
)
762 patch
->is_rename
= 1;
763 patch
->old_name
= find_name(line
, NULL
, 0, 0);
767 static int gitdiff_renamedst(const char *line
, struct patch
*patch
)
769 patch
->is_rename
= 1;
770 patch
->new_name
= find_name(line
, NULL
, 0, 0);
774 static int gitdiff_similarity(const char *line
, struct patch
*patch
)
776 if ((patch
->score
= strtoul(line
, NULL
, 10)) == ULONG_MAX
)
781 static int gitdiff_dissimilarity(const char *line
, struct patch
*patch
)
783 if ((patch
->score
= strtoul(line
, NULL
, 10)) == ULONG_MAX
)
788 static int gitdiff_index(const char *line
, struct patch
*patch
)
791 * index line is N hexadecimal, "..", N hexadecimal,
792 * and optional space with octal mode.
794 const char *ptr
, *eol
;
797 ptr
= strchr(line
, '.');
798 if (!ptr
|| ptr
[1] != '.' || 40 < ptr
- line
)
801 memcpy(patch
->old_sha1_prefix
, line
, len
);
802 patch
->old_sha1_prefix
[len
] = 0;
805 ptr
= strchr(line
, ' ');
806 eol
= strchr(line
, '\n');
808 if (!ptr
|| eol
< ptr
)
814 memcpy(patch
->new_sha1_prefix
, line
, len
);
815 patch
->new_sha1_prefix
[len
] = 0;
817 patch
->old_mode
= strtoul(ptr
+1, NULL
, 8);
822 * This is normal for a diff that doesn't change anything: we'll fall through
823 * into the next diff. Tell the parser to break out.
825 static int gitdiff_unrecognized(const char *line
, struct patch
*patch
)
830 static const char *stop_at_slash(const char *line
, int llen
)
832 int nslash
= p_value
;
835 for (i
= 0; i
< llen
; i
++) {
837 if (ch
== '/' && --nslash
<= 0)
844 * This is to extract the same name that appears on "diff --git"
845 * line. We do not find and return anything if it is a rename
846 * patch, and it is OK because we will find the name elsewhere.
847 * We need to reliably find name only when it is mode-change only,
848 * creation or deletion of an empty file. In any of these cases,
849 * both sides are the same name under a/ and b/ respectively.
851 static char *git_header_name(char *line
, int llen
)
854 const char *second
= NULL
;
857 line
+= strlen("diff --git ");
858 llen
-= strlen("diff --git ");
862 struct strbuf first
= STRBUF_INIT
;
863 struct strbuf sp
= STRBUF_INIT
;
865 if (unquote_c_style(&first
, line
, &second
))
868 /* advance to the first slash */
869 cp
= stop_at_slash(first
.buf
, first
.len
);
870 /* we do not accept absolute paths */
871 if (!cp
|| cp
== first
.buf
)
873 strbuf_remove(&first
, 0, cp
+ 1 - first
.buf
);
876 * second points at one past closing dq of name.
877 * find the second name.
879 while ((second
< line
+ llen
) && isspace(*second
))
882 if (line
+ llen
<= second
)
884 if (*second
== '"') {
885 if (unquote_c_style(&sp
, second
, NULL
))
887 cp
= stop_at_slash(sp
.buf
, sp
.len
);
888 if (!cp
|| cp
== sp
.buf
)
890 /* They must match, otherwise ignore */
891 if (strcmp(cp
+ 1, first
.buf
))
894 return strbuf_detach(&first
, NULL
);
897 /* unquoted second */
898 cp
= stop_at_slash(second
, line
+ llen
- second
);
899 if (!cp
|| cp
== second
)
902 if (line
+ llen
- cp
!= first
.len
+ 1 ||
903 memcmp(first
.buf
, cp
, first
.len
))
905 return strbuf_detach(&first
, NULL
);
908 strbuf_release(&first
);
913 /* unquoted first name */
914 name
= stop_at_slash(line
, llen
);
915 if (!name
|| name
== line
)
920 * since the first name is unquoted, a dq if exists must be
921 * the beginning of the second name.
923 for (second
= name
; second
< line
+ llen
; second
++) {
924 if (*second
== '"') {
925 struct strbuf sp
= STRBUF_INIT
;
928 if (unquote_c_style(&sp
, second
, NULL
))
931 np
= stop_at_slash(sp
.buf
, sp
.len
);
932 if (!np
|| np
== sp
.buf
)
936 len
= sp
.buf
+ sp
.len
- np
;
937 if (len
< second
- name
&&
938 !strncmp(np
, name
, len
) &&
939 isspace(name
[len
])) {
941 strbuf_remove(&sp
, 0, np
- sp
.buf
);
942 return strbuf_detach(&sp
, NULL
);
952 * Accept a name only if it shows up twice, exactly the same
955 for (len
= 0 ; ; len
++) {
970 if (second
[len
] == '\n' && !memcmp(name
, second
, len
)) {
971 return xmemdupz(name
, len
);
977 /* Verify that we recognize the lines following a git header */
978 static int parse_git_header(char *line
, int len
, unsigned int size
, struct patch
*patch
)
980 unsigned long offset
;
982 /* A git diff has explicit new/delete information, so we don't guess */
984 patch
->is_delete
= 0;
987 * Some things may not have the old name in the
988 * rest of the headers anywhere (pure mode changes,
989 * or removing or adding empty files), so we get
990 * the default name from the header.
992 patch
->def_name
= git_header_name(line
, len
);
993 if (patch
->def_name
&& root
) {
994 char *s
= xmalloc(root_len
+ strlen(patch
->def_name
) + 1);
996 strcpy(s
+ root_len
, patch
->def_name
);
997 free(patch
->def_name
);
1004 for (offset
= len
; size
> 0 ; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
1005 static const struct opentry
{
1007 int (*fn
)(const char *, struct patch
*);
1009 { "@@ -", gitdiff_hdrend
},
1010 { "--- ", gitdiff_oldname
},
1011 { "+++ ", gitdiff_newname
},
1012 { "old mode ", gitdiff_oldmode
},
1013 { "new mode ", gitdiff_newmode
},
1014 { "deleted file mode ", gitdiff_delete
},
1015 { "new file mode ", gitdiff_newfile
},
1016 { "copy from ", gitdiff_copysrc
},
1017 { "copy to ", gitdiff_copydst
},
1018 { "rename old ", gitdiff_renamesrc
},
1019 { "rename new ", gitdiff_renamedst
},
1020 { "rename from ", gitdiff_renamesrc
},
1021 { "rename to ", gitdiff_renamedst
},
1022 { "similarity index ", gitdiff_similarity
},
1023 { "dissimilarity index ", gitdiff_dissimilarity
},
1024 { "index ", gitdiff_index
},
1025 { "", gitdiff_unrecognized
},
1029 len
= linelen(line
, size
);
1030 if (!len
|| line
[len
-1] != '\n')
1032 for (i
= 0; i
< ARRAY_SIZE(optable
); i
++) {
1033 const struct opentry
*p
= optable
+ i
;
1034 int oplen
= strlen(p
->str
);
1035 if (len
< oplen
|| memcmp(p
->str
, line
, oplen
))
1037 if (p
->fn(line
+ oplen
, patch
) < 0)
1046 static int parse_num(const char *line
, unsigned long *p
)
1050 if (!isdigit(*line
))
1052 *p
= strtoul(line
, &ptr
, 10);
1056 static int parse_range(const char *line
, int len
, int offset
, const char *expect
,
1057 unsigned long *p1
, unsigned long *p2
)
1061 if (offset
< 0 || offset
>= len
)
1066 digits
= parse_num(line
, p1
);
1076 digits
= parse_num(line
+1, p2
);
1085 ex
= strlen(expect
);
1088 if (memcmp(line
, expect
, ex
))
1094 static void recount_diff(char *line
, int size
, struct fragment
*fragment
)
1096 int oldlines
= 0, newlines
= 0, ret
= 0;
1099 warning("recount: ignore empty hunk");
1104 int len
= linelen(line
, size
);
1112 case ' ': case '\n':
1124 ret
= size
< 3 || prefixcmp(line
, "@@ ");
1127 ret
= size
< 5 || prefixcmp(line
, "diff ");
1134 warning("recount: unexpected line: %.*s",
1135 (int)linelen(line
, size
), line
);
1140 fragment
->oldlines
= oldlines
;
1141 fragment
->newlines
= newlines
;
1145 * Parse a unified diff fragment header of the
1146 * form "@@ -a,b +c,d @@"
1148 static int parse_fragment_header(char *line
, int len
, struct fragment
*fragment
)
1152 if (!len
|| line
[len
-1] != '\n')
1155 /* Figure out the number of lines in a fragment */
1156 offset
= parse_range(line
, len
, 4, " +", &fragment
->oldpos
, &fragment
->oldlines
);
1157 offset
= parse_range(line
, len
, offset
, " @@", &fragment
->newpos
, &fragment
->newlines
);
1162 static int find_header(char *line
, unsigned long size
, int *hdrsize
, struct patch
*patch
)
1164 unsigned long offset
, len
;
1166 patch
->is_toplevel_relative
= 0;
1167 patch
->is_rename
= patch
->is_copy
= 0;
1168 patch
->is_new
= patch
->is_delete
= -1;
1169 patch
->old_mode
= patch
->new_mode
= 0;
1170 patch
->old_name
= patch
->new_name
= NULL
;
1171 for (offset
= 0; size
> 0; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
1172 unsigned long nextlen
;
1174 len
= linelen(line
, size
);
1178 /* Testing this early allows us to take a few shortcuts.. */
1183 * Make sure we don't find any unconnected patch fragments.
1184 * That's a sign that we didn't find a header, and that a
1185 * patch has become corrupted/broken up.
1187 if (!memcmp("@@ -", line
, 4)) {
1188 struct fragment dummy
;
1189 if (parse_fragment_header(line
, len
, &dummy
) < 0)
1191 die("patch fragment without header at line %d: %.*s",
1192 linenr
, (int)len
-1, line
);
1199 * Git patch? It might not have a real patch, just a rename
1200 * or mode change, so we handle that specially
1202 if (!memcmp("diff --git ", line
, 11)) {
1203 int git_hdr_len
= parse_git_header(line
, len
, size
, patch
);
1204 if (git_hdr_len
<= len
)
1206 if (!patch
->old_name
&& !patch
->new_name
) {
1207 if (!patch
->def_name
)
1208 die("git diff header lacks filename information when removing "
1209 "%d leading pathname components (line %d)" , p_value
, linenr
);
1210 patch
->old_name
= patch
->new_name
= patch
->def_name
;
1212 patch
->is_toplevel_relative
= 1;
1213 *hdrsize
= git_hdr_len
;
1217 /* --- followed by +++ ? */
1218 if (memcmp("--- ", line
, 4) || memcmp("+++ ", line
+ len
, 4))
1222 * We only accept unified patches, so we want it to
1223 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
1224 * minimum ("@@ -0,0 +1 @@\n" is the shortest).
1226 nextlen
= linelen(line
+ len
, size
- len
);
1227 if (size
< nextlen
+ 14 || memcmp("@@ -", line
+ len
+ nextlen
, 4))
1230 /* Ok, we'll consider it a patch */
1231 parse_traditional_patch(line
, line
+len
, patch
);
1232 *hdrsize
= len
+ nextlen
;
1239 static void record_ws_error(unsigned result
, const char *line
, int len
, int linenr
)
1247 if (squelch_whitespace_errors
&&
1248 squelch_whitespace_errors
< whitespace_error
)
1251 err
= whitespace_error_string(result
);
1252 fprintf(stderr
, "%s:%d: %s.\n%.*s\n",
1253 patch_input_file
, linenr
, err
, len
, line
);
1257 static void check_whitespace(const char *line
, int len
, unsigned ws_rule
)
1259 unsigned result
= ws_check(line
+ 1, len
- 1, ws_rule
);
1261 record_ws_error(result
, line
+ 1, len
- 2, linenr
);
1265 * Parse a unified diff. Note that this really needs to parse each
1266 * fragment separately, since the only way to know the difference
1267 * between a "---" that is part of a patch, and a "---" that starts
1268 * the next patch is to look at the line counts..
1270 static int parse_fragment(char *line
, unsigned long size
,
1271 struct patch
*patch
, struct fragment
*fragment
)
1274 int len
= linelen(line
, size
), offset
;
1275 unsigned long oldlines
, newlines
;
1276 unsigned long leading
, trailing
;
1278 offset
= parse_fragment_header(line
, len
, fragment
);
1281 if (offset
> 0 && patch
->recount
)
1282 recount_diff(line
+ offset
, size
- offset
, fragment
);
1283 oldlines
= fragment
->oldlines
;
1284 newlines
= fragment
->newlines
;
1288 /* Parse the thing.. */
1292 added
= deleted
= 0;
1295 offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
1296 if (!oldlines
&& !newlines
)
1298 len
= linelen(line
, size
);
1299 if (!len
|| line
[len
-1] != '\n')
1304 case '\n': /* newer GNU diff, an empty context line */
1308 if (!deleted
&& !added
)
1313 if (apply_in_reverse
&&
1314 ws_error_action
!= nowarn_ws_error
)
1315 check_whitespace(line
, len
, patch
->ws_rule
);
1321 if (!apply_in_reverse
&&
1322 ws_error_action
!= nowarn_ws_error
)
1323 check_whitespace(line
, len
, patch
->ws_rule
);
1330 * We allow "\ No newline at end of file". Depending
1331 * on locale settings when the patch was produced we
1332 * don't know what this line looks like. The only
1333 * thing we do know is that it begins with "\ ".
1334 * Checking for 12 is just for sanity check -- any
1335 * l10n of "\ No newline..." is at least that long.
1338 if (len
< 12 || memcmp(line
, "\\ ", 2))
1343 if (oldlines
|| newlines
)
1345 fragment
->leading
= leading
;
1346 fragment
->trailing
= trailing
;
1349 * If a fragment ends with an incomplete line, we failed to include
1350 * it in the above loop because we hit oldlines == newlines == 0
1353 if (12 < size
&& !memcmp(line
, "\\ ", 2))
1354 offset
+= linelen(line
, size
);
1356 patch
->lines_added
+= added
;
1357 patch
->lines_deleted
+= deleted
;
1359 if (0 < patch
->is_new
&& oldlines
)
1360 return error("new file depends on old contents");
1361 if (0 < patch
->is_delete
&& newlines
)
1362 return error("deleted file still has contents");
1366 static int parse_single_patch(char *line
, unsigned long size
, struct patch
*patch
)
1368 unsigned long offset
= 0;
1369 unsigned long oldlines
= 0, newlines
= 0, context
= 0;
1370 struct fragment
**fragp
= &patch
->fragments
;
1372 while (size
> 4 && !memcmp(line
, "@@ -", 4)) {
1373 struct fragment
*fragment
;
1376 fragment
= xcalloc(1, sizeof(*fragment
));
1377 fragment
->linenr
= linenr
;
1378 len
= parse_fragment(line
, size
, patch
, fragment
);
1380 die("corrupt patch at line %d", linenr
);
1381 fragment
->patch
= line
;
1382 fragment
->size
= len
;
1383 oldlines
+= fragment
->oldlines
;
1384 newlines
+= fragment
->newlines
;
1385 context
+= fragment
->leading
+ fragment
->trailing
;
1388 fragp
= &fragment
->next
;
1396 * If something was removed (i.e. we have old-lines) it cannot
1397 * be creation, and if something was added it cannot be
1398 * deletion. However, the reverse is not true; --unified=0
1399 * patches that only add are not necessarily creation even
1400 * though they do not have any old lines, and ones that only
1401 * delete are not necessarily deletion.
1403 * Unfortunately, a real creation/deletion patch do _not_ have
1404 * any context line by definition, so we cannot safely tell it
1405 * apart with --unified=0 insanity. At least if the patch has
1406 * more than one hunk it is not creation or deletion.
1408 if (patch
->is_new
< 0 &&
1409 (oldlines
|| (patch
->fragments
&& patch
->fragments
->next
)))
1411 if (patch
->is_delete
< 0 &&
1412 (newlines
|| (patch
->fragments
&& patch
->fragments
->next
)))
1413 patch
->is_delete
= 0;
1415 if (0 < patch
->is_new
&& oldlines
)
1416 die("new file %s depends on old contents", patch
->new_name
);
1417 if (0 < patch
->is_delete
&& newlines
)
1418 die("deleted file %s still has contents", patch
->old_name
);
1419 if (!patch
->is_delete
&& !newlines
&& context
)
1420 fprintf(stderr
, "** warning: file %s becomes empty but "
1421 "is not deleted\n", patch
->new_name
);
1426 static inline int metadata_changes(struct patch
*patch
)
1428 return patch
->is_rename
> 0 ||
1429 patch
->is_copy
> 0 ||
1430 patch
->is_new
> 0 ||
1432 (patch
->old_mode
&& patch
->new_mode
&&
1433 patch
->old_mode
!= patch
->new_mode
);
1436 static char *inflate_it(const void *data
, unsigned long size
,
1437 unsigned long inflated_size
)
1443 memset(&stream
, 0, sizeof(stream
));
1445 stream
.next_in
= (unsigned char *)data
;
1446 stream
.avail_in
= size
;
1447 stream
.next_out
= out
= xmalloc(inflated_size
);
1448 stream
.avail_out
= inflated_size
;
1449 git_inflate_init(&stream
);
1450 st
= git_inflate(&stream
, Z_FINISH
);
1451 git_inflate_end(&stream
);
1452 if ((st
!= Z_STREAM_END
) || stream
.total_out
!= inflated_size
) {
1459 static struct fragment
*parse_binary_hunk(char **buf_p
,
1460 unsigned long *sz_p
,
1465 * Expect a line that begins with binary patch method ("literal"
1466 * or "delta"), followed by the length of data before deflating.
1467 * a sequence of 'length-byte' followed by base-85 encoded data
1468 * should follow, terminated by a newline.
1470 * Each 5-byte sequence of base-85 encodes up to 4 bytes,
1471 * and we would limit the patch line to 66 characters,
1472 * so one line can fit up to 13 groups that would decode
1473 * to 52 bytes max. The length byte 'A'-'Z' corresponds
1474 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
1477 unsigned long size
= *sz_p
;
1478 char *buffer
= *buf_p
;
1480 unsigned long origlen
;
1483 struct fragment
*frag
;
1485 llen
= linelen(buffer
, size
);
1490 if (!prefixcmp(buffer
, "delta ")) {
1491 patch_method
= BINARY_DELTA_DEFLATED
;
1492 origlen
= strtoul(buffer
+ 6, NULL
, 10);
1494 else if (!prefixcmp(buffer
, "literal ")) {
1495 patch_method
= BINARY_LITERAL_DEFLATED
;
1496 origlen
= strtoul(buffer
+ 8, NULL
, 10);
1504 int byte_length
, max_byte_length
, newsize
;
1505 llen
= linelen(buffer
, size
);
1509 /* consume the blank line */
1515 * Minimum line is "A00000\n" which is 7-byte long,
1516 * and the line length must be multiple of 5 plus 2.
1518 if ((llen
< 7) || (llen
-2) % 5)
1520 max_byte_length
= (llen
- 2) / 5 * 4;
1521 byte_length
= *buffer
;
1522 if ('A' <= byte_length
&& byte_length
<= 'Z')
1523 byte_length
= byte_length
- 'A' + 1;
1524 else if ('a' <= byte_length
&& byte_length
<= 'z')
1525 byte_length
= byte_length
- 'a' + 27;
1528 /* if the input length was not multiple of 4, we would
1529 * have filler at the end but the filler should never
1532 if (max_byte_length
< byte_length
||
1533 byte_length
<= max_byte_length
- 4)
1535 newsize
= hunk_size
+ byte_length
;
1536 data
= xrealloc(data
, newsize
);
1537 if (decode_85(data
+ hunk_size
, buffer
+ 1, byte_length
))
1539 hunk_size
= newsize
;
1544 frag
= xcalloc(1, sizeof(*frag
));
1545 frag
->patch
= inflate_it(data
, hunk_size
, origlen
);
1549 frag
->size
= origlen
;
1553 frag
->binary_patch_method
= patch_method
;
1559 error("corrupt binary patch at line %d: %.*s",
1560 linenr
-1, llen
-1, buffer
);
1564 static int parse_binary(char *buffer
, unsigned long size
, struct patch
*patch
)
1567 * We have read "GIT binary patch\n"; what follows is a line
1568 * that says the patch method (currently, either "literal" or
1569 * "delta") and the length of data before deflating; a
1570 * sequence of 'length-byte' followed by base-85 encoded data
1573 * When a binary patch is reversible, there is another binary
1574 * hunk in the same format, starting with patch method (either
1575 * "literal" or "delta") with the length of data, and a sequence
1576 * of length-byte + base-85 encoded data, terminated with another
1577 * empty line. This data, when applied to the postimage, produces
1580 struct fragment
*forward
;
1581 struct fragment
*reverse
;
1585 forward
= parse_binary_hunk(&buffer
, &size
, &status
, &used
);
1586 if (!forward
&& !status
)
1587 /* there has to be one hunk (forward hunk) */
1588 return error("unrecognized binary patch at line %d", linenr
-1);
1590 /* otherwise we already gave an error message */
1593 reverse
= parse_binary_hunk(&buffer
, &size
, &status
, &used_1
);
1598 * Not having reverse hunk is not an error, but having
1599 * a corrupt reverse hunk is.
1601 free((void*) forward
->patch
);
1605 forward
->next
= reverse
;
1606 patch
->fragments
= forward
;
1607 patch
->is_binary
= 1;
1611 static int parse_chunk(char *buffer
, unsigned long size
, struct patch
*patch
)
1613 int hdrsize
, patchsize
;
1614 int offset
= find_header(buffer
, size
, &hdrsize
, patch
);
1619 patch
->ws_rule
= whitespace_rule(patch
->new_name
1623 patchsize
= parse_single_patch(buffer
+ offset
+ hdrsize
,
1624 size
- offset
- hdrsize
, patch
);
1627 static const char *binhdr
[] = {
1632 static const char git_binary
[] = "GIT binary patch\n";
1634 int hd
= hdrsize
+ offset
;
1635 unsigned long llen
= linelen(buffer
+ hd
, size
- hd
);
1637 if (llen
== sizeof(git_binary
) - 1 &&
1638 !memcmp(git_binary
, buffer
+ hd
, llen
)) {
1641 used
= parse_binary(buffer
+ hd
+ llen
,
1642 size
- hd
- llen
, patch
);
1644 patchsize
= used
+ llen
;
1648 else if (!memcmp(" differ\n", buffer
+ hd
+ llen
- 8, 8)) {
1649 for (i
= 0; binhdr
[i
]; i
++) {
1650 int len
= strlen(binhdr
[i
]);
1651 if (len
< size
- hd
&&
1652 !memcmp(binhdr
[i
], buffer
+ hd
, len
)) {
1654 patch
->is_binary
= 1;
1661 /* Empty patch cannot be applied if it is a text patch
1662 * without metadata change. A binary patch appears
1665 if ((apply
|| check
) &&
1666 (!patch
->is_binary
&& !metadata_changes(patch
)))
1667 die("patch with only garbage at line %d", linenr
);
1670 return offset
+ hdrsize
+ patchsize
;
1673 #define swap(a,b) myswap((a),(b),sizeof(a))
1675 #define myswap(a, b, size) do { \
1676 unsigned char mytmp[size]; \
1677 memcpy(mytmp, &a, size); \
1678 memcpy(&a, &b, size); \
1679 memcpy(&b, mytmp, size); \
1682 static void reverse_patches(struct patch
*p
)
1684 for (; p
; p
= p
->next
) {
1685 struct fragment
*frag
= p
->fragments
;
1687 swap(p
->new_name
, p
->old_name
);
1688 swap(p
->new_mode
, p
->old_mode
);
1689 swap(p
->is_new
, p
->is_delete
);
1690 swap(p
->lines_added
, p
->lines_deleted
);
1691 swap(p
->old_sha1_prefix
, p
->new_sha1_prefix
);
1693 for (; frag
; frag
= frag
->next
) {
1694 swap(frag
->newpos
, frag
->oldpos
);
1695 swap(frag
->newlines
, frag
->oldlines
);
1700 static const char pluses
[] =
1701 "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
1702 static const char minuses
[]=
1703 "----------------------------------------------------------------------";
1705 static void show_stats(struct patch
*patch
)
1707 struct strbuf qname
= STRBUF_INIT
;
1708 char *cp
= patch
->new_name
? patch
->new_name
: patch
->old_name
;
1711 quote_c_style(cp
, &qname
, NULL
, 0);
1714 * "scale" the filename
1720 if (qname
.len
> max
) {
1721 cp
= strchr(qname
.buf
+ qname
.len
+ 3 - max
, '/');
1723 cp
= qname
.buf
+ qname
.len
+ 3 - max
;
1724 strbuf_splice(&qname
, 0, cp
- qname
.buf
, "...", 3);
1727 if (patch
->is_binary
) {
1728 printf(" %-*s | Bin\n", max
, qname
.buf
);
1729 strbuf_release(&qname
);
1733 printf(" %-*s |", max
, qname
.buf
);
1734 strbuf_release(&qname
);
1737 * scale the add/delete
1739 max
= max
+ max_change
> 70 ? 70 - max
: max_change
;
1740 add
= patch
->lines_added
;
1741 del
= patch
->lines_deleted
;
1743 if (max_change
> 0) {
1744 int total
= ((add
+ del
) * max
+ max_change
/ 2) / max_change
;
1745 add
= (add
* max
+ max_change
/ 2) / max_change
;
1748 printf("%5d %.*s%.*s\n", patch
->lines_added
+ patch
->lines_deleted
,
1749 add
, pluses
, del
, minuses
);
1752 static int read_old_data(struct stat
*st
, const char *path
, struct strbuf
*buf
)
1754 switch (st
->st_mode
& S_IFMT
) {
1756 if (strbuf_readlink(buf
, path
, st
->st_size
) < 0)
1757 return error("unable to read symlink %s", path
);
1760 if (strbuf_read_file(buf
, path
, st
->st_size
) != st
->st_size
)
1761 return error("unable to open or read %s", path
);
1762 convert_to_git(path
, buf
->buf
, buf
->len
, buf
, 0);
1770 * Update the preimage, and the common lines in postimage,
1771 * from buffer buf of length len. If postlen is 0 the postimage
1772 * is updated in place, otherwise it's updated on a new buffer
1776 static void update_pre_post_images(struct image
*preimage
,
1777 struct image
*postimage
,
1779 size_t len
, size_t postlen
)
1782 char *new, *old
, *fixed
;
1783 struct image fixed_preimage
;
1786 * Update the preimage with whitespace fixes. Note that we
1787 * are not losing preimage->buf -- apply_one_fragment() will
1790 prepare_image(&fixed_preimage
, buf
, len
, 1);
1791 assert(fixed_preimage
.nr
== preimage
->nr
);
1792 for (i
= 0; i
< preimage
->nr
; i
++)
1793 fixed_preimage
.line
[i
].flag
= preimage
->line
[i
].flag
;
1794 free(preimage
->line_allocated
);
1795 *preimage
= fixed_preimage
;
1798 * Adjust the common context lines in postimage. This can be
1799 * done in-place when we are just doing whitespace fixing,
1800 * which does not make the string grow, but needs a new buffer
1801 * when ignoring whitespace causes the update, since in this case
1802 * we could have e.g. tabs converted to multiple spaces.
1803 * We trust the caller to tell us if the update can be done
1804 * in place (postlen==0) or not.
1806 old
= postimage
->buf
;
1808 new = postimage
->buf
= xmalloc(postlen
);
1811 fixed
= preimage
->buf
;
1812 for (i
= ctx
= 0; i
< postimage
->nr
; i
++) {
1813 size_t len
= postimage
->line
[i
].len
;
1814 if (!(postimage
->line
[i
].flag
& LINE_COMMON
)) {
1815 /* an added line -- no counterparts in preimage */
1816 memmove(new, old
, len
);
1822 /* a common context -- skip it in the original postimage */
1825 /* and find the corresponding one in the fixed preimage */
1826 while (ctx
< preimage
->nr
&&
1827 !(preimage
->line
[ctx
].flag
& LINE_COMMON
)) {
1828 fixed
+= preimage
->line
[ctx
].len
;
1831 if (preimage
->nr
<= ctx
)
1834 /* and copy it in, while fixing the line length */
1835 len
= preimage
->line
[ctx
].len
;
1836 memcpy(new, fixed
, len
);
1839 postimage
->line
[i
].len
= len
;
1843 /* Fix the length of the whole thing */
1844 postimage
->len
= new - postimage
->buf
;
1847 static int match_fragment(struct image
*img
,
1848 struct image
*preimage
,
1849 struct image
*postimage
,
1853 int match_beginning
, int match_end
)
1856 char *fixed_buf
, *buf
, *orig
, *target
;
1857 struct strbuf fixed
;
1861 if (preimage
->nr
+ try_lno
<= img
->nr
) {
1863 * The hunk falls within the boundaries of img.
1865 preimage_limit
= preimage
->nr
;
1866 if (match_end
&& (preimage
->nr
+ try_lno
!= img
->nr
))
1868 } else if (ws_error_action
== correct_ws_error
&&
1869 (ws_rule
& WS_BLANK_AT_EOF
) && match_end
) {
1871 * This hunk that matches at the end extends beyond
1872 * the end of img, and we are removing blank lines
1873 * at the end of the file. This many lines from the
1874 * beginning of the preimage must match with img, and
1875 * the remainder of the preimage must be blank.
1877 preimage_limit
= img
->nr
- try_lno
;
1880 * The hunk extends beyond the end of the img and
1881 * we are not removing blanks at the end, so we
1882 * should reject the hunk at this position.
1887 if (match_beginning
&& try_lno
)
1890 /* Quick hash check */
1891 for (i
= 0; i
< preimage_limit
; i
++)
1892 if (preimage
->line
[i
].hash
!= img
->line
[try_lno
+ i
].hash
)
1895 if (preimage_limit
== preimage
->nr
) {
1897 * Do we have an exact match? If we were told to match
1898 * at the end, size must be exactly at try+fragsize,
1899 * otherwise try+fragsize must be still within the preimage,
1900 * and either case, the old piece should match the preimage
1904 ? (try + preimage
->len
== img
->len
)
1905 : (try + preimage
->len
<= img
->len
)) &&
1906 !memcmp(img
->buf
+ try, preimage
->buf
, preimage
->len
))
1910 * The preimage extends beyond the end of img, so
1911 * there cannot be an exact match.
1913 * There must be one non-blank context line that match
1914 * a line before the end of img.
1918 buf
= preimage
->buf
;
1920 for (i
= 0; i
< preimage_limit
; i
++)
1921 buf_end
+= preimage
->line
[i
].len
;
1923 for ( ; buf
< buf_end
; buf
++)
1931 * No exact match. If we are ignoring whitespace, run a line-by-line
1932 * fuzzy matching. We collect all the line length information because
1933 * we need it to adjust whitespace if we match.
1935 if (ws_ignore_action
== ignore_ws_change
) {
1938 size_t postlen
= postimage
->len
;
1942 for (i
= 0; i
< preimage_limit
; i
++) {
1943 size_t prelen
= preimage
->line
[i
].len
;
1944 size_t imglen
= img
->line
[try_lno
+i
].len
;
1946 if (!fuzzy_matchlines(img
->buf
+ try + imgoff
, imglen
,
1947 preimage
->buf
+ preoff
, prelen
))
1949 if (preimage
->line
[i
].flag
& LINE_COMMON
)
1950 postlen
+= imglen
- prelen
;
1956 * Ok, the preimage matches with whitespace fuzz.
1958 * imgoff now holds the true length of the target that
1959 * matches the preimage before the end of the file.
1961 * Count the number of characters in the preimage that fall
1962 * beyond the end of the file and make sure that all of them
1963 * are whitespace characters. (This can only happen if
1964 * we are removing blank lines at the end of the file.)
1966 buf
= preimage_eof
= preimage
->buf
+ preoff
;
1967 for ( ; i
< preimage
->nr
; i
++)
1968 preoff
+= preimage
->line
[i
].len
;
1969 preimage_end
= preimage
->buf
+ preoff
;
1970 for ( ; buf
< preimage_end
; buf
++)
1975 * Update the preimage and the common postimage context
1976 * lines to use the same whitespace as the target.
1977 * If whitespace is missing in the target (i.e.
1978 * if the preimage extends beyond the end of the file),
1979 * use the whitespace from the preimage.
1981 extra_chars
= preimage_end
- preimage_eof
;
1982 strbuf_init(&fixed
, imgoff
+ extra_chars
);
1983 strbuf_add(&fixed
, img
->buf
+ try, imgoff
);
1984 strbuf_add(&fixed
, preimage_eof
, extra_chars
);
1985 fixed_buf
= strbuf_detach(&fixed
, &fixed_len
);
1986 update_pre_post_images(preimage
, postimage
,
1987 fixed_buf
, fixed_len
, postlen
);
1991 if (ws_error_action
!= correct_ws_error
)
1995 * The hunk does not apply byte-by-byte, but the hash says
1996 * it might with whitespace fuzz. We haven't been asked to
1997 * ignore whitespace, we were asked to correct whitespace
1998 * errors, so let's try matching after whitespace correction.
2000 * The preimage may extend beyond the end of the file,
2001 * but in this loop we will only handle the part of the
2002 * preimage that falls within the file.
2004 strbuf_init(&fixed
, preimage
->len
+ 1);
2005 orig
= preimage
->buf
;
2006 target
= img
->buf
+ try;
2007 for (i
= 0; i
< preimage_limit
; i
++) {
2008 size_t oldlen
= preimage
->line
[i
].len
;
2009 size_t tgtlen
= img
->line
[try_lno
+ i
].len
;
2010 size_t fixstart
= fixed
.len
;
2011 struct strbuf tgtfix
;
2014 /* Try fixing the line in the preimage */
2015 ws_fix_copy(&fixed
, orig
, oldlen
, ws_rule
, NULL
);
2017 /* Try fixing the line in the target */
2018 strbuf_init(&tgtfix
, tgtlen
);
2019 ws_fix_copy(&tgtfix
, target
, tgtlen
, ws_rule
, NULL
);
2022 * If they match, either the preimage was based on
2023 * a version before our tree fixed whitespace breakage,
2024 * or we are lacking a whitespace-fix patch the tree
2025 * the preimage was based on already had (i.e. target
2026 * has whitespace breakage, the preimage doesn't).
2027 * In either case, we are fixing the whitespace breakages
2028 * so we might as well take the fix together with their
2031 match
= (tgtfix
.len
== fixed
.len
- fixstart
&&
2032 !memcmp(tgtfix
.buf
, fixed
.buf
+ fixstart
,
2033 fixed
.len
- fixstart
));
2035 strbuf_release(&tgtfix
);
2045 * Now handle the lines in the preimage that falls beyond the
2046 * end of the file (if any). They will only match if they are
2047 * empty or only contain whitespace (if WS_BLANK_AT_EOL is
2050 for ( ; i
< preimage
->nr
; i
++) {
2051 size_t fixstart
= fixed
.len
; /* start of the fixed preimage */
2052 size_t oldlen
= preimage
->line
[i
].len
;
2055 /* Try fixing the line in the preimage */
2056 ws_fix_copy(&fixed
, orig
, oldlen
, ws_rule
, NULL
);
2058 for (j
= fixstart
; j
< fixed
.len
; j
++)
2059 if (!isspace(fixed
.buf
[j
]))
2066 * Yes, the preimage is based on an older version that still
2067 * has whitespace breakages unfixed, and fixing them makes the
2068 * hunk match. Update the context lines in the postimage.
2070 fixed_buf
= strbuf_detach(&fixed
, &fixed_len
);
2071 update_pre_post_images(preimage
, postimage
,
2072 fixed_buf
, fixed_len
, 0);
2076 strbuf_release(&fixed
);
2080 static int find_pos(struct image
*img
,
2081 struct image
*preimage
,
2082 struct image
*postimage
,
2085 int match_beginning
, int match_end
)
2088 unsigned long backwards
, forwards
, try;
2089 int backwards_lno
, forwards_lno
, try_lno
;
2092 * If match_beginning or match_end is specified, there is no
2093 * point starting from a wrong line that will never match and
2094 * wander around and wait for a match at the specified end.
2096 if (match_beginning
)
2099 line
= img
->nr
- preimage
->nr
;
2102 * Because the comparison is unsigned, the following test
2103 * will also take care of a negative line number that can
2104 * result when match_end and preimage is larger than the target.
2106 if ((size_t) line
> img
->nr
)
2110 for (i
= 0; i
< line
; i
++)
2111 try += img
->line
[i
].len
;
2114 * There's probably some smart way to do this, but I'll leave
2115 * that to the smart and beautiful people. I'm simple and stupid.
2118 backwards_lno
= line
;
2120 forwards_lno
= line
;
2123 for (i
= 0; ; i
++) {
2124 if (match_fragment(img
, preimage
, postimage
,
2125 try, try_lno
, ws_rule
,
2126 match_beginning
, match_end
))
2130 if (backwards_lno
== 0 && forwards_lno
== img
->nr
)
2134 if (backwards_lno
== 0) {
2139 backwards
-= img
->line
[backwards_lno
].len
;
2141 try_lno
= backwards_lno
;
2143 if (forwards_lno
== img
->nr
) {
2147 forwards
+= img
->line
[forwards_lno
].len
;
2150 try_lno
= forwards_lno
;
2157 static void remove_first_line(struct image
*img
)
2159 img
->buf
+= img
->line
[0].len
;
2160 img
->len
-= img
->line
[0].len
;
2165 static void remove_last_line(struct image
*img
)
2167 img
->len
-= img
->line
[--img
->nr
].len
;
2170 static void update_image(struct image
*img
,
2172 struct image
*preimage
,
2173 struct image
*postimage
)
2176 * remove the copy of preimage at offset in img
2177 * and replace it with postimage
2180 size_t remove_count
, insert_count
, applied_at
= 0;
2185 * If we are removing blank lines at the end of img,
2186 * the preimage may extend beyond the end.
2187 * If that is the case, we must be careful only to
2188 * remove the part of the preimage that falls within
2189 * the boundaries of img. Initialize preimage_limit
2190 * to the number of lines in the preimage that falls
2191 * within the boundaries.
2193 preimage_limit
= preimage
->nr
;
2194 if (preimage_limit
> img
->nr
- applied_pos
)
2195 preimage_limit
= img
->nr
- applied_pos
;
2197 for (i
= 0; i
< applied_pos
; i
++)
2198 applied_at
+= img
->line
[i
].len
;
2201 for (i
= 0; i
< preimage_limit
; i
++)
2202 remove_count
+= img
->line
[applied_pos
+ i
].len
;
2203 insert_count
= postimage
->len
;
2205 /* Adjust the contents */
2206 result
= xmalloc(img
->len
+ insert_count
- remove_count
+ 1);
2207 memcpy(result
, img
->buf
, applied_at
);
2208 memcpy(result
+ applied_at
, postimage
->buf
, postimage
->len
);
2209 memcpy(result
+ applied_at
+ postimage
->len
,
2210 img
->buf
+ (applied_at
+ remove_count
),
2211 img
->len
- (applied_at
+ remove_count
));
2214 img
->len
+= insert_count
- remove_count
;
2215 result
[img
->len
] = '\0';
2217 /* Adjust the line table */
2218 nr
= img
->nr
+ postimage
->nr
- preimage_limit
;
2219 if (preimage_limit
< postimage
->nr
) {
2221 * NOTE: this knows that we never call remove_first_line()
2222 * on anything other than pre/post image.
2224 img
->line
= xrealloc(img
->line
, nr
* sizeof(*img
->line
));
2225 img
->line_allocated
= img
->line
;
2227 if (preimage_limit
!= postimage
->nr
)
2228 memmove(img
->line
+ applied_pos
+ postimage
->nr
,
2229 img
->line
+ applied_pos
+ preimage_limit
,
2230 (img
->nr
- (applied_pos
+ preimage_limit
)) *
2231 sizeof(*img
->line
));
2232 memcpy(img
->line
+ applied_pos
,
2234 postimage
->nr
* sizeof(*img
->line
));
2238 static int apply_one_fragment(struct image
*img
, struct fragment
*frag
,
2239 int inaccurate_eof
, unsigned ws_rule
)
2241 int match_beginning
, match_end
;
2242 const char *patch
= frag
->patch
;
2243 int size
= frag
->size
;
2244 char *old
, *oldlines
;
2245 struct strbuf newlines
;
2246 int new_blank_lines_at_end
= 0;
2247 unsigned long leading
, trailing
;
2248 int pos
, applied_pos
;
2249 struct image preimage
;
2250 struct image postimage
;
2252 memset(&preimage
, 0, sizeof(preimage
));
2253 memset(&postimage
, 0, sizeof(postimage
));
2254 oldlines
= xmalloc(size
);
2255 strbuf_init(&newlines
, size
);
2260 int len
= linelen(patch
, size
);
2262 int added_blank_line
= 0;
2263 int is_blank_context
= 0;
2270 * "plen" is how much of the line we should use for
2271 * the actual patch data. Normally we just remove the
2272 * first character on the line, but if the line is
2273 * followed by "\ No newline", then we also remove the
2274 * last one (which is the newline, of course).
2277 if (len
< size
&& patch
[len
] == '\\')
2280 if (apply_in_reverse
) {
2283 else if (first
== '+')
2289 /* Newer GNU diff, empty context line */
2291 /* ... followed by '\No newline'; nothing */
2294 strbuf_addch(&newlines
, '\n');
2295 add_line_info(&preimage
, "\n", 1, LINE_COMMON
);
2296 add_line_info(&postimage
, "\n", 1, LINE_COMMON
);
2297 is_blank_context
= 1;
2300 if (plen
&& (ws_rule
& WS_BLANK_AT_EOF
) &&
2301 ws_blank_line(patch
+ 1, plen
, ws_rule
))
2302 is_blank_context
= 1;
2304 memcpy(old
, patch
+ 1, plen
);
2305 add_line_info(&preimage
, old
, plen
,
2306 (first
== ' ' ? LINE_COMMON
: 0));
2310 /* Fall-through for ' ' */
2312 /* --no-add does not add new lines */
2313 if (first
== '+' && no_add
)
2316 start
= newlines
.len
;
2318 !whitespace_error
||
2319 ws_error_action
!= correct_ws_error
) {
2320 strbuf_add(&newlines
, patch
+ 1, plen
);
2323 ws_fix_copy(&newlines
, patch
+ 1, plen
, ws_rule
, &applied_after_fixing_ws
);
2325 add_line_info(&postimage
, newlines
.buf
+ start
, newlines
.len
- start
,
2326 (first
== '+' ? 0 : LINE_COMMON
));
2328 (ws_rule
& WS_BLANK_AT_EOF
) &&
2329 ws_blank_line(patch
+ 1, plen
, ws_rule
))
2330 added_blank_line
= 1;
2332 case '@': case '\\':
2333 /* Ignore it, we already handled it */
2336 if (apply_verbosely
)
2337 error("invalid start of line: '%c'", first
);
2340 if (added_blank_line
)
2341 new_blank_lines_at_end
++;
2342 else if (is_blank_context
)
2345 new_blank_lines_at_end
= 0;
2349 if (inaccurate_eof
&&
2350 old
> oldlines
&& old
[-1] == '\n' &&
2351 newlines
.len
> 0 && newlines
.buf
[newlines
.len
- 1] == '\n') {
2353 strbuf_setlen(&newlines
, newlines
.len
- 1);
2356 leading
= frag
->leading
;
2357 trailing
= frag
->trailing
;
2360 * A hunk to change lines at the beginning would begin with
2362 * but we need to be careful. -U0 that inserts before the second
2363 * line also has this pattern.
2365 * And a hunk to add to an empty file would begin with
2368 * In other words, a hunk that is (frag->oldpos <= 1) with or
2369 * without leading context must match at the beginning.
2371 match_beginning
= (!frag
->oldpos
||
2372 (frag
->oldpos
== 1 && !unidiff_zero
));
2375 * A hunk without trailing lines must match at the end.
2376 * However, we simply cannot tell if a hunk must match end
2377 * from the lack of trailing lines if the patch was generated
2378 * with unidiff without any context.
2380 match_end
= !unidiff_zero
&& !trailing
;
2382 pos
= frag
->newpos
? (frag
->newpos
- 1) : 0;
2383 preimage
.buf
= oldlines
;
2384 preimage
.len
= old
- oldlines
;
2385 postimage
.buf
= newlines
.buf
;
2386 postimage
.len
= newlines
.len
;
2387 preimage
.line
= preimage
.line_allocated
;
2388 postimage
.line
= postimage
.line_allocated
;
2392 applied_pos
= find_pos(img
, &preimage
, &postimage
, pos
,
2393 ws_rule
, match_beginning
, match_end
);
2395 if (applied_pos
>= 0)
2398 /* Am I at my context limits? */
2399 if ((leading
<= p_context
) && (trailing
<= p_context
))
2401 if (match_beginning
|| match_end
) {
2402 match_beginning
= match_end
= 0;
2407 * Reduce the number of context lines; reduce both
2408 * leading and trailing if they are equal otherwise
2409 * just reduce the larger context.
2411 if (leading
>= trailing
) {
2412 remove_first_line(&preimage
);
2413 remove_first_line(&postimage
);
2417 if (trailing
> leading
) {
2418 remove_last_line(&preimage
);
2419 remove_last_line(&postimage
);
2424 if (applied_pos
>= 0) {
2425 if (new_blank_lines_at_end
&&
2426 preimage
.nr
+ applied_pos
>= img
->nr
&&
2427 (ws_rule
& WS_BLANK_AT_EOF
) &&
2428 ws_error_action
!= nowarn_ws_error
) {
2429 record_ws_error(WS_BLANK_AT_EOF
, "+", 1, frag
->linenr
);
2430 if (ws_error_action
== correct_ws_error
) {
2431 while (new_blank_lines_at_end
--)
2432 remove_last_line(&postimage
);
2435 * We would want to prevent write_out_results()
2436 * from taking place in apply_patch() that follows
2437 * the callchain led us here, which is:
2438 * apply_patch->check_patch_list->check_patch->
2439 * apply_data->apply_fragments->apply_one_fragment
2441 if (ws_error_action
== die_on_ws_error
)
2446 * Warn if it was necessary to reduce the number
2449 if ((leading
!= frag
->leading
) ||
2450 (trailing
!= frag
->trailing
))
2451 fprintf(stderr
, "Context reduced to (%ld/%ld)"
2452 " to apply fragment at %d\n",
2453 leading
, trailing
, applied_pos
+1);
2454 update_image(img
, applied_pos
, &preimage
, &postimage
);
2456 if (apply_verbosely
)
2457 error("while searching for:\n%.*s",
2458 (int)(old
- oldlines
), oldlines
);
2462 strbuf_release(&newlines
);
2463 free(preimage
.line_allocated
);
2464 free(postimage
.line_allocated
);
2466 return (applied_pos
< 0);
2469 static int apply_binary_fragment(struct image
*img
, struct patch
*patch
)
2471 struct fragment
*fragment
= patch
->fragments
;
2475 /* Binary patch is irreversible without the optional second hunk */
2476 if (apply_in_reverse
) {
2477 if (!fragment
->next
)
2478 return error("cannot reverse-apply a binary patch "
2479 "without the reverse hunk to '%s'",
2481 ? patch
->new_name
: patch
->old_name
);
2482 fragment
= fragment
->next
;
2484 switch (fragment
->binary_patch_method
) {
2485 case BINARY_DELTA_DEFLATED
:
2486 dst
= patch_delta(img
->buf
, img
->len
, fragment
->patch
,
2487 fragment
->size
, &len
);
2494 case BINARY_LITERAL_DEFLATED
:
2496 img
->len
= fragment
->size
;
2497 img
->buf
= xmalloc(img
->len
+1);
2498 memcpy(img
->buf
, fragment
->patch
, img
->len
);
2499 img
->buf
[img
->len
] = '\0';
2505 static int apply_binary(struct image
*img
, struct patch
*patch
)
2507 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
2508 unsigned char sha1
[20];
2511 * For safety, we require patch index line to contain
2512 * full 40-byte textual SHA1 for old and new, at least for now.
2514 if (strlen(patch
->old_sha1_prefix
) != 40 ||
2515 strlen(patch
->new_sha1_prefix
) != 40 ||
2516 get_sha1_hex(patch
->old_sha1_prefix
, sha1
) ||
2517 get_sha1_hex(patch
->new_sha1_prefix
, sha1
))
2518 return error("cannot apply binary patch to '%s' "
2519 "without full index line", name
);
2521 if (patch
->old_name
) {
2523 * See if the old one matches what the patch
2526 hash_sha1_file(img
->buf
, img
->len
, blob_type
, sha1
);
2527 if (strcmp(sha1_to_hex(sha1
), patch
->old_sha1_prefix
))
2528 return error("the patch applies to '%s' (%s), "
2529 "which does not match the "
2530 "current contents.",
2531 name
, sha1_to_hex(sha1
));
2534 /* Otherwise, the old one must be empty. */
2536 return error("the patch applies to an empty "
2537 "'%s' but it is not empty", name
);
2540 get_sha1_hex(patch
->new_sha1_prefix
, sha1
);
2541 if (is_null_sha1(sha1
)) {
2543 return 0; /* deletion patch */
2546 if (has_sha1_file(sha1
)) {
2547 /* We already have the postimage */
2548 enum object_type type
;
2552 result
= read_sha1_file(sha1
, &type
, &size
);
2554 return error("the necessary postimage %s for "
2555 "'%s' cannot be read",
2556 patch
->new_sha1_prefix
, name
);
2562 * We have verified buf matches the preimage;
2563 * apply the patch data to it, which is stored
2564 * in the patch->fragments->{patch,size}.
2566 if (apply_binary_fragment(img
, patch
))
2567 return error("binary patch does not apply to '%s'",
2570 /* verify that the result matches */
2571 hash_sha1_file(img
->buf
, img
->len
, blob_type
, sha1
);
2572 if (strcmp(sha1_to_hex(sha1
), patch
->new_sha1_prefix
))
2573 return error("binary patch to '%s' creates incorrect result (expecting %s, got %s)",
2574 name
, patch
->new_sha1_prefix
, sha1_to_hex(sha1
));
2580 static int apply_fragments(struct image
*img
, struct patch
*patch
)
2582 struct fragment
*frag
= patch
->fragments
;
2583 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
2584 unsigned ws_rule
= patch
->ws_rule
;
2585 unsigned inaccurate_eof
= patch
->inaccurate_eof
;
2587 if (patch
->is_binary
)
2588 return apply_binary(img
, patch
);
2591 if (apply_one_fragment(img
, frag
, inaccurate_eof
, ws_rule
)) {
2592 error("patch failed: %s:%ld", name
, frag
->oldpos
);
2593 if (!apply_with_reject
)
2602 static int read_file_or_gitlink(struct cache_entry
*ce
, struct strbuf
*buf
)
2607 if (S_ISGITLINK(ce
->ce_mode
)) {
2608 strbuf_grow(buf
, 100);
2609 strbuf_addf(buf
, "Subproject commit %s\n", sha1_to_hex(ce
->sha1
));
2611 enum object_type type
;
2615 result
= read_sha1_file(ce
->sha1
, &type
, &sz
);
2618 /* XXX read_sha1_file NUL-terminates */
2619 strbuf_attach(buf
, result
, sz
, sz
+ 1);
2624 static struct patch
*in_fn_table(const char *name
)
2626 struct string_list_item
*item
;
2631 item
= string_list_lookup(name
, &fn_table
);
2633 return (struct patch
*)item
->util
;
2639 * item->util in the filename table records the status of the path.
2640 * Usually it points at a patch (whose result records the contents
2641 * of it after applying it), but it could be PATH_WAS_DELETED for a
2642 * path that a previously applied patch has already removed.
2644 #define PATH_TO_BE_DELETED ((struct patch *) -2)
2645 #define PATH_WAS_DELETED ((struct patch *) -1)
2647 static int to_be_deleted(struct patch
*patch
)
2649 return patch
== PATH_TO_BE_DELETED
;
2652 static int was_deleted(struct patch
*patch
)
2654 return patch
== PATH_WAS_DELETED
;
2657 static void add_to_fn_table(struct patch
*patch
)
2659 struct string_list_item
*item
;
2662 * Always add new_name unless patch is a deletion
2663 * This should cover the cases for normal diffs,
2664 * file creations and copies
2666 if (patch
->new_name
!= NULL
) {
2667 item
= string_list_insert(patch
->new_name
, &fn_table
);
2672 * store a failure on rename/deletion cases because
2673 * later chunks shouldn't patch old names
2675 if ((patch
->new_name
== NULL
) || (patch
->is_rename
)) {
2676 item
= string_list_insert(patch
->old_name
, &fn_table
);
2677 item
->util
= PATH_WAS_DELETED
;
2681 static void prepare_fn_table(struct patch
*patch
)
2684 * store information about incoming file deletion
2687 if ((patch
->new_name
== NULL
) || (patch
->is_rename
)) {
2688 struct string_list_item
*item
;
2689 item
= string_list_insert(patch
->old_name
, &fn_table
);
2690 item
->util
= PATH_TO_BE_DELETED
;
2692 patch
= patch
->next
;
2696 static int apply_data(struct patch
*patch
, struct stat
*st
, struct cache_entry
*ce
)
2698 struct strbuf buf
= STRBUF_INIT
;
2702 struct patch
*tpatch
;
2704 if (!(patch
->is_copy
|| patch
->is_rename
) &&
2705 (tpatch
= in_fn_table(patch
->old_name
)) != NULL
&& !to_be_deleted(tpatch
)) {
2706 if (was_deleted(tpatch
)) {
2707 return error("patch %s has been renamed/deleted",
2710 /* We have a patched copy in memory use that */
2711 strbuf_add(&buf
, tpatch
->result
, tpatch
->resultsize
);
2712 } else if (cached
) {
2713 if (read_file_or_gitlink(ce
, &buf
))
2714 return error("read of %s failed", patch
->old_name
);
2715 } else if (patch
->old_name
) {
2716 if (S_ISGITLINK(patch
->old_mode
)) {
2718 read_file_or_gitlink(ce
, &buf
);
2721 * There is no way to apply subproject
2722 * patch without looking at the index.
2724 patch
->fragments
= NULL
;
2727 if (read_old_data(st
, patch
->old_name
, &buf
))
2728 return error("read of %s failed", patch
->old_name
);
2732 img
= strbuf_detach(&buf
, &len
);
2733 prepare_image(&image
, img
, len
, !patch
->is_binary
);
2735 if (apply_fragments(&image
, patch
) < 0)
2736 return -1; /* note with --reject this succeeds. */
2737 patch
->result
= image
.buf
;
2738 patch
->resultsize
= image
.len
;
2739 add_to_fn_table(patch
);
2740 free(image
.line_allocated
);
2742 if (0 < patch
->is_delete
&& patch
->resultsize
)
2743 return error("removal patch leaves file contents");
2748 static int check_to_create_blob(const char *new_name
, int ok_if_exists
)
2751 if (!lstat(new_name
, &nst
)) {
2752 if (S_ISDIR(nst
.st_mode
) || ok_if_exists
)
2755 * A leading component of new_name might be a symlink
2756 * that is going to be removed with this patch, but
2757 * still pointing at somewhere that has the path.
2758 * In such a case, path "new_name" does not exist as
2759 * far as git is concerned.
2761 if (has_symlink_leading_path(new_name
, strlen(new_name
)))
2764 return error("%s: already exists in working directory", new_name
);
2766 else if ((errno
!= ENOENT
) && (errno
!= ENOTDIR
))
2767 return error("%s: %s", new_name
, strerror(errno
));
2771 static int verify_index_match(struct cache_entry
*ce
, struct stat
*st
)
2773 if (S_ISGITLINK(ce
->ce_mode
)) {
2774 if (!S_ISDIR(st
->st_mode
))
2778 return ce_match_stat(ce
, st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
);
2781 static int check_preimage(struct patch
*patch
, struct cache_entry
**ce
, struct stat
*st
)
2783 const char *old_name
= patch
->old_name
;
2784 struct patch
*tpatch
= NULL
;
2786 unsigned st_mode
= 0;
2789 * Make sure that we do not have local modifications from the
2790 * index when we are looking at the index. Also make sure
2791 * we have the preimage file to be patched in the work tree,
2792 * unless --cached, which tells git to apply only in the index.
2797 assert(patch
->is_new
<= 0);
2799 if (!(patch
->is_copy
|| patch
->is_rename
) &&
2800 (tpatch
= in_fn_table(old_name
)) != NULL
&& !to_be_deleted(tpatch
)) {
2801 if (was_deleted(tpatch
))
2802 return error("%s: has been deleted/renamed", old_name
);
2803 st_mode
= tpatch
->new_mode
;
2804 } else if (!cached
) {
2805 stat_ret
= lstat(old_name
, st
);
2806 if (stat_ret
&& errno
!= ENOENT
)
2807 return error("%s: %s", old_name
, strerror(errno
));
2810 if (to_be_deleted(tpatch
))
2813 if (check_index
&& !tpatch
) {
2814 int pos
= cache_name_pos(old_name
, strlen(old_name
));
2816 if (patch
->is_new
< 0)
2818 return error("%s: does not exist in index", old_name
);
2820 *ce
= active_cache
[pos
];
2822 struct checkout costate
;
2824 memset(&costate
, 0, sizeof(costate
));
2825 costate
.base_dir
= "";
2826 costate
.refresh_cache
= 1;
2827 if (checkout_entry(*ce
, &costate
, NULL
) ||
2828 lstat(old_name
, st
))
2831 if (!cached
&& verify_index_match(*ce
, st
))
2832 return error("%s: does not match index", old_name
);
2834 st_mode
= (*ce
)->ce_mode
;
2835 } else if (stat_ret
< 0) {
2836 if (patch
->is_new
< 0)
2838 return error("%s: %s", old_name
, strerror(errno
));
2841 if (!cached
&& !tpatch
)
2842 st_mode
= ce_mode_from_stat(*ce
, st
->st_mode
);
2844 if (patch
->is_new
< 0)
2846 if (!patch
->old_mode
)
2847 patch
->old_mode
= st_mode
;
2848 if ((st_mode
^ patch
->old_mode
) & S_IFMT
)
2849 return error("%s: wrong type", old_name
);
2850 if (st_mode
!= patch
->old_mode
)
2851 warning("%s has type %o, expected %o",
2852 old_name
, st_mode
, patch
->old_mode
);
2853 if (!patch
->new_mode
&& !patch
->is_delete
)
2854 patch
->new_mode
= st_mode
;
2859 patch
->is_delete
= 0;
2860 patch
->old_name
= NULL
;
2864 static int check_patch(struct patch
*patch
)
2867 const char *old_name
= patch
->old_name
;
2868 const char *new_name
= patch
->new_name
;
2869 const char *name
= old_name
? old_name
: new_name
;
2870 struct cache_entry
*ce
= NULL
;
2871 struct patch
*tpatch
;
2875 patch
->rejected
= 1; /* we will drop this after we succeed */
2877 status
= check_preimage(patch
, &ce
, &st
);
2880 old_name
= patch
->old_name
;
2882 if ((tpatch
= in_fn_table(new_name
)) &&
2883 (was_deleted(tpatch
) || to_be_deleted(tpatch
)))
2885 * A type-change diff is always split into a patch to
2886 * delete old, immediately followed by a patch to
2887 * create new (see diff.c::run_diff()); in such a case
2888 * it is Ok that the entry to be deleted by the
2889 * previous patch is still in the working tree and in
2897 ((0 < patch
->is_new
) | (0 < patch
->is_rename
) | patch
->is_copy
)) {
2899 cache_name_pos(new_name
, strlen(new_name
)) >= 0 &&
2901 return error("%s: already exists in index", new_name
);
2903 int err
= check_to_create_blob(new_name
, ok_if_exists
);
2907 if (!patch
->new_mode
) {
2908 if (0 < patch
->is_new
)
2909 patch
->new_mode
= S_IFREG
| 0644;
2911 patch
->new_mode
= patch
->old_mode
;
2915 if (new_name
&& old_name
) {
2916 int same
= !strcmp(old_name
, new_name
);
2917 if (!patch
->new_mode
)
2918 patch
->new_mode
= patch
->old_mode
;
2919 if ((patch
->old_mode
^ patch
->new_mode
) & S_IFMT
)
2920 return error("new mode (%o) of %s does not match old mode (%o)%s%s",
2921 patch
->new_mode
, new_name
, patch
->old_mode
,
2922 same
? "" : " of ", same
? "" : old_name
);
2925 if (apply_data(patch
, &st
, ce
) < 0)
2926 return error("%s: patch does not apply", name
);
2927 patch
->rejected
= 0;
2931 static int check_patch_list(struct patch
*patch
)
2935 prepare_fn_table(patch
);
2937 if (apply_verbosely
)
2938 say_patch_name(stderr
,
2939 "Checking patch ", patch
, "...\n");
2940 err
|= check_patch(patch
);
2941 patch
= patch
->next
;
2946 /* This function tries to read the sha1 from the current index */
2947 static int get_current_sha1(const char *path
, unsigned char *sha1
)
2951 if (read_cache() < 0)
2953 pos
= cache_name_pos(path
, strlen(path
));
2956 hashcpy(sha1
, active_cache
[pos
]->sha1
);
2960 /* Build an index that contains the just the files needed for a 3way merge */
2961 static void build_fake_ancestor(struct patch
*list
, const char *filename
)
2963 struct patch
*patch
;
2964 struct index_state result
= { NULL
};
2967 /* Once we start supporting the reverse patch, it may be
2968 * worth showing the new sha1 prefix, but until then...
2970 for (patch
= list
; patch
; patch
= patch
->next
) {
2971 const unsigned char *sha1_ptr
;
2972 unsigned char sha1
[20];
2973 struct cache_entry
*ce
;
2976 name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
2977 if (0 < patch
->is_new
)
2979 else if (get_sha1(patch
->old_sha1_prefix
, sha1
))
2980 /* git diff has no index line for mode/type changes */
2981 if (!patch
->lines_added
&& !patch
->lines_deleted
) {
2982 if (get_current_sha1(patch
->new_name
, sha1
) ||
2983 get_current_sha1(patch
->old_name
, sha1
))
2984 die("mode change for %s, which is not "
2985 "in current HEAD", name
);
2988 die("sha1 information is lacking or useless "
2993 ce
= make_cache_entry(patch
->old_mode
, sha1_ptr
, name
, 0, 0);
2995 die("make_cache_entry failed for path '%s'", name
);
2996 if (add_index_entry(&result
, ce
, ADD_CACHE_OK_TO_ADD
))
2997 die ("Could not add %s to temporary index", name
);
3000 fd
= open(filename
, O_WRONLY
| O_CREAT
, 0666);
3001 if (fd
< 0 || write_index(&result
, fd
) || close(fd
))
3002 die ("Could not write temporary index to %s", filename
);
3004 discard_index(&result
);
3007 static void stat_patch_list(struct patch
*patch
)
3009 int files
, adds
, dels
;
3011 for (files
= adds
= dels
= 0 ; patch
; patch
= patch
->next
) {
3013 adds
+= patch
->lines_added
;
3014 dels
+= patch
->lines_deleted
;
3018 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files
, adds
, dels
);
3021 static void numstat_patch_list(struct patch
*patch
)
3023 for ( ; patch
; patch
= patch
->next
) {
3025 name
= patch
->new_name
? patch
->new_name
: patch
->old_name
;
3026 if (patch
->is_binary
)
3029 printf("%d\t%d\t", patch
->lines_added
, patch
->lines_deleted
);
3030 write_name_quoted(name
, stdout
, line_termination
);
3034 static void show_file_mode_name(const char *newdelete
, unsigned int mode
, const char *name
)
3037 printf(" %s mode %06o %s\n", newdelete
, mode
, name
);
3039 printf(" %s %s\n", newdelete
, name
);
3042 static void show_mode_change(struct patch
*p
, int show_name
)
3044 if (p
->old_mode
&& p
->new_mode
&& p
->old_mode
!= p
->new_mode
) {
3046 printf(" mode change %06o => %06o %s\n",
3047 p
->old_mode
, p
->new_mode
, p
->new_name
);
3049 printf(" mode change %06o => %06o\n",
3050 p
->old_mode
, p
->new_mode
);
3054 static void show_rename_copy(struct patch
*p
)
3056 const char *renamecopy
= p
->is_rename
? "rename" : "copy";
3057 const char *old
, *new;
3059 /* Find common prefix */
3063 const char *slash_old
, *slash_new
;
3064 slash_old
= strchr(old
, '/');
3065 slash_new
= strchr(new, '/');
3068 slash_old
- old
!= slash_new
- new ||
3069 memcmp(old
, new, slash_new
- new))
3071 old
= slash_old
+ 1;
3072 new = slash_new
+ 1;
3074 /* p->old_name thru old is the common prefix, and old and new
3075 * through the end of names are renames
3077 if (old
!= p
->old_name
)
3078 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy
,
3079 (int)(old
- p
->old_name
), p
->old_name
,
3080 old
, new, p
->score
);
3082 printf(" %s %s => %s (%d%%)\n", renamecopy
,
3083 p
->old_name
, p
->new_name
, p
->score
);
3084 show_mode_change(p
, 0);
3087 static void summary_patch_list(struct patch
*patch
)
3091 for (p
= patch
; p
; p
= p
->next
) {
3093 show_file_mode_name("create", p
->new_mode
, p
->new_name
);
3094 else if (p
->is_delete
)
3095 show_file_mode_name("delete", p
->old_mode
, p
->old_name
);
3097 if (p
->is_rename
|| p
->is_copy
)
3098 show_rename_copy(p
);
3101 printf(" rewrite %s (%d%%)\n",
3102 p
->new_name
, p
->score
);
3103 show_mode_change(p
, 0);
3106 show_mode_change(p
, 1);
3112 static void patch_stats(struct patch
*patch
)
3114 int lines
= patch
->lines_added
+ patch
->lines_deleted
;
3116 if (lines
> max_change
)
3118 if (patch
->old_name
) {
3119 int len
= quote_c_style(patch
->old_name
, NULL
, NULL
, 0);
3121 len
= strlen(patch
->old_name
);
3125 if (patch
->new_name
) {
3126 int len
= quote_c_style(patch
->new_name
, NULL
, NULL
, 0);
3128 len
= strlen(patch
->new_name
);
3134 static void remove_file(struct patch
*patch
, int rmdir_empty
)
3137 if (remove_file_from_cache(patch
->old_name
) < 0)
3138 die("unable to remove %s from index", patch
->old_name
);
3141 if (!remove_or_warn(patch
->old_mode
, patch
->old_name
) && rmdir_empty
) {
3142 remove_path(patch
->old_name
);
3147 static void add_index_file(const char *path
, unsigned mode
, void *buf
, unsigned long size
)
3150 struct cache_entry
*ce
;
3151 int namelen
= strlen(path
);
3152 unsigned ce_size
= cache_entry_size(namelen
);
3157 ce
= xcalloc(1, ce_size
);
3158 memcpy(ce
->name
, path
, namelen
);
3159 ce
->ce_mode
= create_ce_mode(mode
);
3160 ce
->ce_flags
= namelen
;
3161 if (S_ISGITLINK(mode
)) {
3162 const char *s
= buf
;
3164 if (get_sha1_hex(s
+ strlen("Subproject commit "), ce
->sha1
))
3165 die("corrupt patch for subproject %s", path
);
3168 if (lstat(path
, &st
) < 0)
3169 die_errno("unable to stat newly created file '%s'",
3171 fill_stat_cache_info(ce
, &st
);
3173 if (write_sha1_file(buf
, size
, blob_type
, ce
->sha1
) < 0)
3174 die("unable to create backing store for newly created file %s", path
);
3176 if (add_cache_entry(ce
, ADD_CACHE_OK_TO_ADD
) < 0)
3177 die("unable to add cache entry for %s", path
);
3180 static int try_create_file(const char *path
, unsigned int mode
, const char *buf
, unsigned long size
)
3183 struct strbuf nbuf
= STRBUF_INIT
;
3185 if (S_ISGITLINK(mode
)) {
3187 if (!lstat(path
, &st
) && S_ISDIR(st
.st_mode
))
3189 return mkdir(path
, 0777);
3192 if (has_symlinks
&& S_ISLNK(mode
))
3193 /* Although buf:size is counted string, it also is NUL
3196 return symlink(buf
, path
);
3198 fd
= open(path
, O_CREAT
| O_EXCL
| O_WRONLY
, (mode
& 0100) ? 0777 : 0666);
3202 if (convert_to_working_tree(path
, buf
, size
, &nbuf
)) {
3206 write_or_die(fd
, buf
, size
);
3207 strbuf_release(&nbuf
);
3210 die_errno("closing file '%s'", path
);
3215 * We optimistically assume that the directories exist,
3216 * which is true 99% of the time anyway. If they don't,
3217 * we create them and try again.
3219 static void create_one_file(char *path
, unsigned mode
, const char *buf
, unsigned long size
)
3223 if (!try_create_file(path
, mode
, buf
, size
))
3226 if (errno
== ENOENT
) {
3227 if (safe_create_leading_directories(path
))
3229 if (!try_create_file(path
, mode
, buf
, size
))
3233 if (errno
== EEXIST
|| errno
== EACCES
) {
3234 /* We may be trying to create a file where a directory
3238 if (!lstat(path
, &st
) && (!S_ISDIR(st
.st_mode
) || !rmdir(path
)))
3242 if (errno
== EEXIST
) {
3243 unsigned int nr
= getpid();
3246 char newpath
[PATH_MAX
];
3247 mksnpath(newpath
, sizeof(newpath
), "%s~%u", path
, nr
);
3248 if (!try_create_file(newpath
, mode
, buf
, size
)) {
3249 if (!rename(newpath
, path
))
3251 unlink_or_warn(newpath
);
3254 if (errno
!= EEXIST
)
3259 die_errno("unable to write file '%s' mode %o", path
, mode
);
3262 static void create_file(struct patch
*patch
)
3264 char *path
= patch
->new_name
;
3265 unsigned mode
= patch
->new_mode
;
3266 unsigned long size
= patch
->resultsize
;
3267 char *buf
= patch
->result
;
3270 mode
= S_IFREG
| 0644;
3271 create_one_file(path
, mode
, buf
, size
);
3272 add_index_file(path
, mode
, buf
, size
);
3275 /* phase zero is to remove, phase one is to create */
3276 static void write_out_one_result(struct patch
*patch
, int phase
)
3278 if (patch
->is_delete
> 0) {
3280 remove_file(patch
, 1);
3283 if (patch
->is_new
> 0 || patch
->is_copy
) {
3289 * Rename or modification boils down to the same
3290 * thing: remove the old, write the new
3293 remove_file(patch
, patch
->is_rename
);
3298 static int write_out_one_reject(struct patch
*patch
)
3301 char namebuf
[PATH_MAX
];
3302 struct fragment
*frag
;
3305 for (cnt
= 0, frag
= patch
->fragments
; frag
; frag
= frag
->next
) {
3306 if (!frag
->rejected
)
3312 if (apply_verbosely
)
3313 say_patch_name(stderr
,
3314 "Applied patch ", patch
, " cleanly.\n");
3318 /* This should not happen, because a removal patch that leaves
3319 * contents are marked "rejected" at the patch level.
3321 if (!patch
->new_name
)
3322 die("internal error");
3324 /* Say this even without --verbose */
3325 say_patch_name(stderr
, "Applying patch ", patch
, " with");
3326 fprintf(stderr
, " %d rejects...\n", cnt
);
3328 cnt
= strlen(patch
->new_name
);
3329 if (ARRAY_SIZE(namebuf
) <= cnt
+ 5) {
3330 cnt
= ARRAY_SIZE(namebuf
) - 5;
3331 warning("truncating .rej filename to %.*s.rej",
3332 cnt
- 1, patch
->new_name
);
3334 memcpy(namebuf
, patch
->new_name
, cnt
);
3335 memcpy(namebuf
+ cnt
, ".rej", 5);
3337 rej
= fopen(namebuf
, "w");
3339 return error("cannot open %s: %s", namebuf
, strerror(errno
));
3341 /* Normal git tools never deal with .rej, so do not pretend
3342 * this is a git patch by saying --git nor give extended
3343 * headers. While at it, maybe please "kompare" that wants
3344 * the trailing TAB and some garbage at the end of line ;-).
3346 fprintf(rej
, "diff a/%s b/%s\t(rejected hunks)\n",
3347 patch
->new_name
, patch
->new_name
);
3348 for (cnt
= 1, frag
= patch
->fragments
;
3350 cnt
++, frag
= frag
->next
) {
3351 if (!frag
->rejected
) {
3352 fprintf(stderr
, "Hunk #%d applied cleanly.\n", cnt
);
3355 fprintf(stderr
, "Rejected hunk #%d.\n", cnt
);
3356 fprintf(rej
, "%.*s", frag
->size
, frag
->patch
);
3357 if (frag
->patch
[frag
->size
-1] != '\n')
3364 static int write_out_results(struct patch
*list
, int skipped_patch
)
3370 if (!list
&& !skipped_patch
)
3371 return error("No changes");
3373 for (phase
= 0; phase
< 2; phase
++) {
3379 write_out_one_result(l
, phase
);
3380 if (phase
== 1 && write_out_one_reject(l
))
3389 static struct lock_file lock_file
;
3391 static struct string_list limit_by_name
;
3392 static int has_include
;
3393 static void add_name_limit(const char *name
, int exclude
)
3395 struct string_list_item
*it
;
3397 it
= string_list_append(name
, &limit_by_name
);
3398 it
->util
= exclude
? NULL
: (void *) 1;
3401 static int use_patch(struct patch
*p
)
3403 const char *pathname
= p
->new_name
? p
->new_name
: p
->old_name
;
3406 /* Paths outside are not touched regardless of "--include" */
3407 if (0 < prefix_length
) {
3408 int pathlen
= strlen(pathname
);
3409 if (pathlen
<= prefix_length
||
3410 memcmp(prefix
, pathname
, prefix_length
))
3414 /* See if it matches any of exclude/include rule */
3415 for (i
= 0; i
< limit_by_name
.nr
; i
++) {
3416 struct string_list_item
*it
= &limit_by_name
.items
[i
];
3417 if (!fnmatch(it
->string
, pathname
, 0))
3418 return (it
->util
!= NULL
);
3422 * If we had any include, a path that does not match any rule is
3423 * not used. Otherwise, we saw bunch of exclude rules (or none)
3424 * and such a path is used.
3426 return !has_include
;
3430 static void prefix_one(char **name
)
3432 char *old_name
= *name
;
3435 *name
= xstrdup(prefix_filename(prefix
, prefix_length
, *name
));
3439 static void prefix_patches(struct patch
*p
)
3441 if (!prefix
|| p
->is_toplevel_relative
)
3443 for ( ; p
; p
= p
->next
) {
3444 if (p
->new_name
== p
->old_name
) {
3445 char *prefixed
= p
->new_name
;
3446 prefix_one(&prefixed
);
3447 p
->new_name
= p
->old_name
= prefixed
;
3450 prefix_one(&p
->new_name
);
3451 prefix_one(&p
->old_name
);
3456 #define INACCURATE_EOF (1<<0)
3457 #define RECOUNT (1<<1)
3459 static int apply_patch(int fd
, const char *filename
, int options
)
3462 struct strbuf buf
= STRBUF_INIT
;
3463 struct patch
*list
= NULL
, **listp
= &list
;
3464 int skipped_patch
= 0;
3466 /* FIXME - memory leak when using multiple patch files as inputs */
3467 memset(&fn_table
, 0, sizeof(struct string_list
));
3468 patch_input_file
= filename
;
3469 read_patch_file(&buf
, fd
);
3471 while (offset
< buf
.len
) {
3472 struct patch
*patch
;
3475 patch
= xcalloc(1, sizeof(*patch
));
3476 patch
->inaccurate_eof
= !!(options
& INACCURATE_EOF
);
3477 patch
->recount
= !!(options
& RECOUNT
);
3478 nr
= parse_chunk(buf
.buf
+ offset
, buf
.len
- offset
, patch
);
3481 if (apply_in_reverse
)
3482 reverse_patches(patch
);
3484 prefix_patches(patch
);
3485 if (use_patch(patch
)) {
3488 listp
= &patch
->next
;
3491 /* perhaps free it a bit better? */
3498 if (whitespace_error
&& (ws_error_action
== die_on_ws_error
))
3501 update_index
= check_index
&& apply
;
3502 if (update_index
&& newfd
< 0)
3503 newfd
= hold_locked_index(&lock_file
, 1);
3506 if (read_cache() < 0)
3507 die("unable to read index file");
3510 if ((check
|| apply
) &&
3511 check_patch_list(list
) < 0 &&
3515 if (apply
&& write_out_results(list
, skipped_patch
))
3519 build_fake_ancestor(list
, fake_ancestor
);
3522 stat_patch_list(list
);
3525 numstat_patch_list(list
);
3528 summary_patch_list(list
);
3530 strbuf_release(&buf
);
3534 static int git_apply_config(const char *var
, const char *value
, void *cb
)
3536 if (!strcmp(var
, "apply.whitespace"))
3537 return git_config_string(&apply_default_whitespace
, var
, value
);
3538 else if (!strcmp(var
, "apply.ignorewhitespace"))
3539 return git_config_string(&apply_default_ignorewhitespace
, var
, value
);
3540 return git_default_config(var
, value
, cb
);
3543 static int option_parse_exclude(const struct option
*opt
,
3544 const char *arg
, int unset
)
3546 add_name_limit(arg
, 1);
3550 static int option_parse_include(const struct option
*opt
,
3551 const char *arg
, int unset
)
3553 add_name_limit(arg
, 0);
3558 static int option_parse_p(const struct option
*opt
,
3559 const char *arg
, int unset
)
3561 p_value
= atoi(arg
);
3566 static int option_parse_z(const struct option
*opt
,
3567 const char *arg
, int unset
)
3570 line_termination
= '\n';
3572 line_termination
= 0;
3576 static int option_parse_space_change(const struct option
*opt
,
3577 const char *arg
, int unset
)
3580 ws_ignore_action
= ignore_ws_none
;
3582 ws_ignore_action
= ignore_ws_change
;
3586 static int option_parse_whitespace(const struct option
*opt
,
3587 const char *arg
, int unset
)
3589 const char **whitespace_option
= opt
->value
;
3591 *whitespace_option
= arg
;
3592 parse_whitespace_option(arg
);
3596 static int option_parse_directory(const struct option
*opt
,
3597 const char *arg
, int unset
)
3599 root_len
= strlen(arg
);
3600 if (root_len
&& arg
[root_len
- 1] != '/') {
3602 root
= new_root
= xmalloc(root_len
+ 2);
3603 strcpy(new_root
, arg
);
3604 strcpy(new_root
+ root_len
++, "/");
3610 int cmd_apply(int argc
, const char **argv
, const char *unused_prefix
)
3616 int force_apply
= 0;
3618 const char *whitespace_option
= NULL
;
3620 struct option builtin_apply_options
[] = {
3621 { OPTION_CALLBACK
, 0, "exclude", NULL
, "path",
3622 "don't apply changes matching the given path",
3623 0, option_parse_exclude
},
3624 { OPTION_CALLBACK
, 0, "include", NULL
, "path",
3625 "apply changes matching the given path",
3626 0, option_parse_include
},
3627 { OPTION_CALLBACK
, 'p', NULL
, NULL
, "num",
3628 "remove <num> leading slashes from traditional diff paths",
3629 0, option_parse_p
},
3630 OPT_BOOLEAN(0, "no-add", &no_add
,
3631 "ignore additions made by the patch"),
3632 OPT_BOOLEAN(0, "stat", &diffstat
,
3633 "instead of applying the patch, output diffstat for the input"),
3634 { OPTION_BOOLEAN
, 0, "allow-binary-replacement", &binary
,
3635 NULL
, "old option, now no-op",
3636 PARSE_OPT_HIDDEN
| PARSE_OPT_NOARG
},
3637 { OPTION_BOOLEAN
, 0, "binary", &binary
,
3638 NULL
, "old option, now no-op",
3639 PARSE_OPT_HIDDEN
| PARSE_OPT_NOARG
},
3640 OPT_BOOLEAN(0, "numstat", &numstat
,
3641 "shows number of added and deleted lines in decimal notation"),
3642 OPT_BOOLEAN(0, "summary", &summary
,
3643 "instead of applying the patch, output a summary for the input"),
3644 OPT_BOOLEAN(0, "check", &check
,
3645 "instead of applying the patch, see if the patch is applicable"),
3646 OPT_BOOLEAN(0, "index", &check_index
,
3647 "make sure the patch is applicable to the current index"),
3648 OPT_BOOLEAN(0, "cached", &cached
,
3649 "apply a patch without touching the working tree"),
3650 OPT_BOOLEAN(0, "apply", &force_apply
,
3651 "also apply the patch (use with --stat/--summary/--check)"),
3652 OPT_FILENAME(0, "build-fake-ancestor", &fake_ancestor
,
3653 "build a temporary index based on embedded index information"),
3654 { OPTION_CALLBACK
, 'z', NULL
, NULL
, NULL
,
3655 "paths are separated with NUL character",
3656 PARSE_OPT_NOARG
, option_parse_z
},
3657 OPT_INTEGER('C', NULL
, &p_context
,
3658 "ensure at least <n> lines of context match"),
3659 { OPTION_CALLBACK
, 0, "whitespace", &whitespace_option
, "action",
3660 "detect new or modified lines that have whitespace errors",
3661 0, option_parse_whitespace
},
3662 { OPTION_CALLBACK
, 0, "ignore-space-change", NULL
, NULL
,
3663 "ignore changes in whitespace when finding context",
3664 PARSE_OPT_NOARG
, option_parse_space_change
},
3665 { OPTION_CALLBACK
, 0, "ignore-whitespace", NULL
, NULL
,
3666 "ignore changes in whitespace when finding context",
3667 PARSE_OPT_NOARG
, option_parse_space_change
},
3668 OPT_BOOLEAN('R', "reverse", &apply_in_reverse
,
3669 "apply the patch in reverse"),
3670 OPT_BOOLEAN(0, "unidiff-zero", &unidiff_zero
,
3671 "don't expect at least one line of context"),
3672 OPT_BOOLEAN(0, "reject", &apply_with_reject
,
3673 "leave the rejected hunks in corresponding *.rej files"),
3674 OPT__VERBOSE(&apply_verbosely
),
3675 OPT_BIT(0, "inaccurate-eof", &options
,
3676 "tolerate incorrectly detected missing new-line at the end of file",
3678 OPT_BIT(0, "recount", &options
,
3679 "do not trust the line counts in the hunk headers",
3681 { OPTION_CALLBACK
, 0, "directory", NULL
, "root",
3682 "prepend <root> to all filenames",
3683 0, option_parse_directory
},
3687 prefix
= setup_git_directory_gently(&is_not_gitdir
);
3688 prefix_length
= prefix
? strlen(prefix
) : 0;
3689 git_config(git_apply_config
, NULL
);
3690 if (apply_default_whitespace
)
3691 parse_whitespace_option(apply_default_whitespace
);
3692 if (apply_default_ignorewhitespace
)
3693 parse_ignorewhitespace_option(apply_default_ignorewhitespace
);
3695 argc
= parse_options(argc
, argv
, prefix
, builtin_apply_options
,
3698 if (apply_with_reject
)
3699 apply
= apply_verbosely
= 1;
3700 if (!force_apply
&& (diffstat
|| numstat
|| summary
|| check
|| fake_ancestor
))
3702 if (check_index
&& is_not_gitdir
)
3703 die("--index outside a repository");
3706 die("--cached outside a repository");
3709 for (i
= 0; i
< argc
; i
++) {
3710 const char *arg
= argv
[i
];
3713 if (!strcmp(arg
, "-")) {
3714 errs
|= apply_patch(0, "<stdin>", options
);
3717 } else if (0 < prefix_length
)
3718 arg
= prefix_filename(prefix
, prefix_length
, arg
);
3720 fd
= open(arg
, O_RDONLY
);
3722 die_errno("can't open patch '%s'", arg
);
3724 set_default_whitespace_mode(whitespace_option
);
3725 errs
|= apply_patch(fd
, arg
, options
);
3728 set_default_whitespace_mode(whitespace_option
);
3730 errs
|= apply_patch(0, "<stdin>", options
);
3731 if (whitespace_error
) {
3732 if (squelch_whitespace_errors
&&
3733 squelch_whitespace_errors
< whitespace_error
) {
3735 whitespace_error
- squelch_whitespace_errors
;
3736 warning("squelched %d "
3737 "whitespace error%s",
3739 squelched
== 1 ? "" : "s");
3741 if (ws_error_action
== die_on_ws_error
)
3742 die("%d line%s add%s whitespace errors.",
3744 whitespace_error
== 1 ? "" : "s",
3745 whitespace_error
== 1 ? "s" : "");
3746 if (applied_after_fixing_ws
&& apply
)
3747 warning("%d line%s applied after"
3748 " fixing whitespace errors.",
3749 applied_after_fixing_ws
,
3750 applied_after_fixing_ws
== 1 ? "" : "s");
3751 else if (whitespace_error
)
3752 warning("%d line%s add%s whitespace errors.",
3754 whitespace_error
== 1 ? "" : "s",
3755 whitespace_error
== 1 ? "s" : "");
3759 if (write_cache(newfd
, active_cache
, active_nr
) ||
3760 commit_locked_index(&lock_file
))
3761 die("Unable to write new index file");