4 * Copyright (C) Linus Torvalds, 2005
6 * This applies patches on top of some (arbitrary) version of the SCM.
16 #include "xdiff-interface.h"
19 #include "parse-options.h"
24 static void git_apply_config(void)
26 git_config_get_string_const("apply.whitespace", &apply_default_whitespace
);
27 git_config_get_string_const("apply.ignorewhitespace", &apply_default_ignorewhitespace
);
28 git_config(git_default_config
, NULL
);
31 static int parse_whitespace_option(struct apply_state
*state
, const char *option
)
34 state
->ws_error_action
= warn_on_ws_error
;
37 if (!strcmp(option
, "warn")) {
38 state
->ws_error_action
= warn_on_ws_error
;
41 if (!strcmp(option
, "nowarn")) {
42 state
->ws_error_action
= nowarn_ws_error
;
45 if (!strcmp(option
, "error")) {
46 state
->ws_error_action
= die_on_ws_error
;
49 if (!strcmp(option
, "error-all")) {
50 state
->ws_error_action
= die_on_ws_error
;
51 state
->squelch_whitespace_errors
= 0;
54 if (!strcmp(option
, "strip") || !strcmp(option
, "fix")) {
55 state
->ws_error_action
= correct_ws_error
;
58 return error(_("unrecognized whitespace option '%s'"), option
);
61 static int parse_ignorewhitespace_option(struct apply_state
*state
,
64 if (!option
|| !strcmp(option
, "no") ||
65 !strcmp(option
, "false") || !strcmp(option
, "never") ||
66 !strcmp(option
, "none")) {
67 state
->ws_ignore_action
= ignore_ws_none
;
70 if (!strcmp(option
, "change")) {
71 state
->ws_ignore_action
= ignore_ws_change
;
74 return error(_("unrecognized whitespace ignore option '%s'"), option
);
77 int init_apply_state(struct apply_state
*state
,
80 memset(state
, 0, sizeof(*state
));
81 state
->prefix
= prefix
;
83 state
->line_termination
= '\n';
85 state
->p_context
= UINT_MAX
;
86 state
->squelch_whitespace_errors
= 5;
87 state
->ws_error_action
= warn_on_ws_error
;
88 state
->ws_ignore_action
= ignore_ws_none
;
90 string_list_init(&state
->fn_table
, 0);
91 string_list_init(&state
->limit_by_name
, 0);
92 string_list_init(&state
->symlink_changes
, 0);
93 strbuf_init(&state
->root
, 0);
96 if (apply_default_whitespace
&& parse_whitespace_option(state
, apply_default_whitespace
))
98 if (apply_default_ignorewhitespace
&& parse_ignorewhitespace_option(state
, apply_default_ignorewhitespace
))
103 void clear_apply_state(struct apply_state
*state
)
105 string_list_clear(&state
->limit_by_name
, 0);
106 string_list_clear(&state
->symlink_changes
, 0);
107 strbuf_release(&state
->root
);
109 /* &state->fn_table is cleared at the end of apply_patch() */
112 static void mute_routine(const char *msg
, va_list params
)
117 int check_apply_state(struct apply_state
*state
, int force_apply
)
119 int is_not_gitdir
= !startup_info
->have_repository
;
121 if (state
->apply_with_reject
&& state
->threeway
)
122 return error(_("--reject and --3way cannot be used together."));
123 if (state
->cached
&& state
->threeway
)
124 return error(_("--cached and --3way cannot be used together."));
125 if (state
->threeway
) {
127 return error(_("--3way outside a repository"));
128 state
->check_index
= 1;
130 if (state
->apply_with_reject
) {
132 if (state
->apply_verbosity
== verbosity_normal
)
133 state
->apply_verbosity
= verbosity_verbose
;
135 if (!force_apply
&& (state
->diffstat
|| state
->numstat
|| state
->summary
|| state
->check
|| state
->fake_ancestor
))
137 if (state
->check_index
&& is_not_gitdir
)
138 return error(_("--index outside a repository"));
141 return error(_("--cached outside a repository"));
142 state
->check_index
= 1;
144 if (state
->ita_only
&& (state
->check_index
|| is_not_gitdir
))
146 if (state
->check_index
)
147 state
->unsafe_paths
= 0;
149 if (state
->apply_verbosity
<= verbosity_silent
) {
150 state
->saved_error_routine
= get_error_routine();
151 state
->saved_warn_routine
= get_warn_routine();
152 set_error_routine(mute_routine
);
153 set_warn_routine(mute_routine
);
159 static void set_default_whitespace_mode(struct apply_state
*state
)
161 if (!state
->whitespace_option
&& !apply_default_whitespace
)
162 state
->ws_error_action
= (state
->apply
? warn_on_ws_error
: nowarn_ws_error
);
166 * This represents one "hunk" from a patch, starting with
167 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The
168 * patch text is pointed at by patch, and its byte length
169 * is stored in size. leading and trailing are the number
173 unsigned long leading
, trailing
;
174 unsigned long oldpos
, oldlines
;
175 unsigned long newpos
, newlines
;
177 * 'patch' is usually borrowed from buf in apply_patch(),
178 * but some codepaths store an allocated buffer.
181 unsigned free_patch
:1,
185 struct fragment
*next
;
189 * When dealing with a binary patch, we reuse "leading" field
190 * to store the type of the binary hunk, either deflated "delta"
191 * or deflated "literal".
193 #define binary_patch_method leading
194 #define BINARY_DELTA_DEFLATED 1
195 #define BINARY_LITERAL_DEFLATED 2
198 * This represents a "patch" to a file, both metainfo changes
199 * such as creation/deletion, filemode and content changes represented
200 * as a series of fragments.
203 char *new_name
, *old_name
, *def_name
;
204 unsigned int old_mode
, new_mode
;
205 int is_new
, is_delete
; /* -1 = unknown, 0 = false, 1 = true */
208 int lines_added
, lines_deleted
;
210 int extension_linenr
; /* first line specifying delete/new/rename/copy */
211 unsigned int is_toplevel_relative
:1;
212 unsigned int inaccurate_eof
:1;
213 unsigned int is_binary
:1;
214 unsigned int is_copy
:1;
215 unsigned int is_rename
:1;
216 unsigned int recount
:1;
217 unsigned int conflicted_threeway
:1;
218 unsigned int direct_to_threeway
:1;
219 unsigned int crlf_in_old
:1;
220 struct fragment
*fragments
;
223 char old_sha1_prefix
[41];
224 char new_sha1_prefix
[41];
227 /* three-way fallback result */
228 struct object_id threeway_stage
[3];
231 static void free_fragment_list(struct fragment
*list
)
234 struct fragment
*next
= list
->next
;
235 if (list
->free_patch
)
236 free((char *)list
->patch
);
242 static void free_patch(struct patch
*patch
)
244 free_fragment_list(patch
->fragments
);
245 free(patch
->def_name
);
246 free(patch
->old_name
);
247 free(patch
->new_name
);
252 static void free_patch_list(struct patch
*list
)
255 struct patch
*next
= list
->next
;
262 * A line in a file, len-bytes long (includes the terminating LF,
263 * except for an incomplete line at the end if the file ends with
264 * one), and its contents hashes to 'hash'.
270 #define LINE_COMMON 1
271 #define LINE_PATCHED 2
275 * This represents a "file", which is an array of "lines".
282 struct line
*line_allocated
;
286 static uint32_t hash_line(const char *cp
, size_t len
)
290 for (i
= 0, h
= 0; i
< len
; i
++) {
291 if (!isspace(cp
[i
])) {
292 h
= h
* 3 + (cp
[i
] & 0xff);
299 * Compare lines s1 of length n1 and s2 of length n2, ignoring
300 * whitespace difference. Returns 1 if they match, 0 otherwise
302 static int fuzzy_matchlines(const char *s1
, size_t n1
,
303 const char *s2
, size_t n2
)
305 const char *end1
= s1
+ n1
;
306 const char *end2
= s2
+ n2
;
308 /* ignore line endings */
309 while (s1
< end1
&& (end1
[-1] == '\r' || end1
[-1] == '\n'))
311 while (s2
< end2
&& (end2
[-1] == '\r' || end2
[-1] == '\n'))
314 while (s1
< end1
&& s2
< end2
) {
317 * Skip whitespace. We check on both buffers
318 * because we don't want "a b" to match "ab".
322 while (s1
< end1
&& isspace(*s1
))
324 while (s2
< end2
&& isspace(*s2
))
326 } else if (*s1
++ != *s2
++)
330 /* If we reached the end on one side only, lines don't match. */
331 return s1
== end1
&& s2
== end2
;
334 static void add_line_info(struct image
*img
, const char *bol
, size_t len
, unsigned flag
)
336 ALLOC_GROW(img
->line_allocated
, img
->nr
+ 1, img
->alloc
);
337 img
->line_allocated
[img
->nr
].len
= len
;
338 img
->line_allocated
[img
->nr
].hash
= hash_line(bol
, len
);
339 img
->line_allocated
[img
->nr
].flag
= flag
;
344 * "buf" has the file contents to be patched (read from various sources).
345 * attach it to "image" and add line-based index to it.
346 * "image" now owns the "buf".
348 static void prepare_image(struct image
*image
, char *buf
, size_t len
,
349 int prepare_linetable
)
353 memset(image
, 0, sizeof(*image
));
357 if (!prepare_linetable
)
360 ep
= image
->buf
+ image
->len
;
364 for (next
= cp
; next
< ep
&& *next
!= '\n'; next
++)
368 add_line_info(image
, cp
, next
- cp
, 0);
371 image
->line
= image
->line_allocated
;
374 static void clear_image(struct image
*image
)
377 free(image
->line_allocated
);
378 memset(image
, 0, sizeof(*image
));
381 /* fmt must contain _one_ %s and no other substitution */
382 static void say_patch_name(FILE *output
, const char *fmt
, struct patch
*patch
)
384 struct strbuf sb
= STRBUF_INIT
;
386 if (patch
->old_name
&& patch
->new_name
&&
387 strcmp(patch
->old_name
, patch
->new_name
)) {
388 quote_c_style(patch
->old_name
, &sb
, NULL
, 0);
389 strbuf_addstr(&sb
, " => ");
390 quote_c_style(patch
->new_name
, &sb
, NULL
, 0);
392 const char *n
= patch
->new_name
;
395 quote_c_style(n
, &sb
, NULL
, 0);
397 fprintf(output
, fmt
, sb
.buf
);
404 static int read_patch_file(struct strbuf
*sb
, int fd
)
406 if (strbuf_read(sb
, fd
, 0) < 0)
407 return error_errno("git apply: failed to read");
410 * Make sure that we have some slop in the buffer
411 * so that we can do speculative "memcmp" etc, and
412 * see to it that it is NUL-filled.
414 strbuf_grow(sb
, SLOP
);
415 memset(sb
->buf
+ sb
->len
, 0, SLOP
);
419 static unsigned long linelen(const char *buffer
, unsigned long size
)
421 unsigned long len
= 0;
424 if (*buffer
++ == '\n')
430 static int is_dev_null(const char *str
)
432 return skip_prefix(str
, "/dev/null", &str
) && isspace(*str
);
438 static int name_terminate(int c
, int terminate
)
440 if (c
== ' ' && !(terminate
& TERM_SPACE
))
442 if (c
== '\t' && !(terminate
& TERM_TAB
))
448 /* remove double slashes to make --index work with such filenames */
449 static char *squash_slash(char *name
)
457 if ((name
[j
++] = name
[i
++]) == '/')
458 while (name
[i
] == '/')
465 static char *find_name_gnu(struct apply_state
*state
,
470 struct strbuf name
= STRBUF_INIT
;
474 * Proposed "new-style" GNU patch/diff format; see
475 * http://marc.info/?l=git&m=112927316408690&w=2
477 if (unquote_c_style(&name
, line
, NULL
)) {
478 strbuf_release(&name
);
482 for (cp
= name
.buf
; p_value
; p_value
--) {
483 cp
= strchr(cp
, '/');
485 strbuf_release(&name
);
491 strbuf_remove(&name
, 0, cp
- name
.buf
);
493 strbuf_insert(&name
, 0, state
->root
.buf
, state
->root
.len
);
494 return squash_slash(strbuf_detach(&name
, NULL
));
497 static size_t sane_tz_len(const char *line
, size_t len
)
501 if (len
< strlen(" +0500") || line
[len
-strlen(" +0500")] != ' ')
503 tz
= line
+ len
- strlen(" +0500");
505 if (tz
[1] != '+' && tz
[1] != '-')
508 for (p
= tz
+ 2; p
!= line
+ len
; p
++)
512 return line
+ len
- tz
;
515 static size_t tz_with_colon_len(const char *line
, size_t len
)
519 if (len
< strlen(" +08:00") || line
[len
- strlen(":00")] != ':')
521 tz
= line
+ len
- strlen(" +08:00");
523 if (tz
[0] != ' ' || (tz
[1] != '+' && tz
[1] != '-'))
526 if (!isdigit(*p
++) || !isdigit(*p
++) || *p
++ != ':' ||
527 !isdigit(*p
++) || !isdigit(*p
++))
530 return line
+ len
- tz
;
533 static size_t date_len(const char *line
, size_t len
)
535 const char *date
, *p
;
537 if (len
< strlen("72-02-05") || line
[len
-strlen("-05")] != '-')
539 p
= date
= line
+ len
- strlen("72-02-05");
541 if (!isdigit(*p
++) || !isdigit(*p
++) || *p
++ != '-' ||
542 !isdigit(*p
++) || !isdigit(*p
++) || *p
++ != '-' ||
543 !isdigit(*p
++) || !isdigit(*p
++)) /* Not a date. */
546 if (date
- line
>= strlen("19") &&
547 isdigit(date
[-1]) && isdigit(date
[-2])) /* 4-digit year */
548 date
-= strlen("19");
550 return line
+ len
- date
;
553 static size_t short_time_len(const char *line
, size_t len
)
555 const char *time
, *p
;
557 if (len
< strlen(" 07:01:32") || line
[len
-strlen(":32")] != ':')
559 p
= time
= line
+ len
- strlen(" 07:01:32");
561 /* Permit 1-digit hours? */
563 !isdigit(*p
++) || !isdigit(*p
++) || *p
++ != ':' ||
564 !isdigit(*p
++) || !isdigit(*p
++) || *p
++ != ':' ||
565 !isdigit(*p
++) || !isdigit(*p
++)) /* Not a time. */
568 return line
+ len
- time
;
571 static size_t fractional_time_len(const char *line
, size_t len
)
576 /* Expected format: 19:41:17.620000023 */
577 if (!len
|| !isdigit(line
[len
- 1]))
581 /* Fractional seconds. */
582 while (p
> line
&& isdigit(*p
))
587 /* Hours, minutes, and whole seconds. */
588 n
= short_time_len(line
, p
- line
);
592 return line
+ len
- p
+ n
;
595 static size_t trailing_spaces_len(const char *line
, size_t len
)
599 /* Expected format: ' ' x (1 or more) */
600 if (!len
|| line
[len
- 1] != ' ')
607 return line
+ len
- (p
+ 1);
614 static size_t diff_timestamp_len(const char *line
, size_t len
)
616 const char *end
= line
+ len
;
620 * Posix: 2010-07-05 19:41:17
621 * GNU: 2010-07-05 19:41:17.620000023 -0500
624 if (!isdigit(end
[-1]))
627 n
= sane_tz_len(line
, end
- line
);
629 n
= tz_with_colon_len(line
, end
- line
);
632 n
= short_time_len(line
, end
- line
);
634 n
= fractional_time_len(line
, end
- line
);
637 n
= date_len(line
, end
- line
);
638 if (!n
) /* No date. Too bad. */
642 if (end
== line
) /* No space before date. */
644 if (end
[-1] == '\t') { /* Success! */
646 return line
+ len
- end
;
648 if (end
[-1] != ' ') /* No space before date. */
651 /* Whitespace damage. */
652 end
-= trailing_spaces_len(line
, end
- line
);
653 return line
+ len
- end
;
656 static char *find_name_common(struct apply_state
*state
,
664 const char *start
= NULL
;
668 while (line
!= end
) {
671 if (!end
&& isspace(c
)) {
674 if (name_terminate(c
, terminate
))
678 if (c
== '/' && !--p_value
)
682 return squash_slash(xstrdup_or_null(def
));
685 return squash_slash(xstrdup_or_null(def
));
688 * Generally we prefer the shorter name, especially
689 * if the other one is just a variation of that with
690 * something else tacked on to the end (ie "file.orig"
694 int deflen
= strlen(def
);
695 if (deflen
< len
&& !strncmp(start
, def
, deflen
))
696 return squash_slash(xstrdup(def
));
699 if (state
->root
.len
) {
700 char *ret
= xstrfmt("%s%.*s", state
->root
.buf
, len
, start
);
701 return squash_slash(ret
);
704 return squash_slash(xmemdupz(start
, len
));
707 static char *find_name(struct apply_state
*state
,
714 char *name
= find_name_gnu(state
, line
, def
, p_value
);
719 return find_name_common(state
, line
, def
, p_value
, NULL
, terminate
);
722 static char *find_name_traditional(struct apply_state
*state
,
731 char *name
= find_name_gnu(state
, line
, def
, p_value
);
736 len
= strchrnul(line
, '\n') - line
;
737 date_len
= diff_timestamp_len(line
, len
);
739 return find_name_common(state
, line
, def
, p_value
, NULL
, TERM_TAB
);
742 return find_name_common(state
, line
, def
, p_value
, line
+ len
, 0);
746 * Given the string after "--- " or "+++ ", guess the appropriate
747 * p_value for the given patch.
749 static int guess_p_value(struct apply_state
*state
, const char *nameline
)
754 if (is_dev_null(nameline
))
756 name
= find_name_traditional(state
, nameline
, NULL
, 0);
759 cp
= strchr(name
, '/');
762 else if (state
->prefix
) {
764 * Does it begin with "a/$our-prefix" and such? Then this is
765 * very likely to apply to our directory.
767 if (starts_with(name
, state
->prefix
))
768 val
= count_slashes(state
->prefix
);
771 if (starts_with(cp
, state
->prefix
))
772 val
= count_slashes(state
->prefix
) + 1;
780 * Does the ---/+++ line have the POSIX timestamp after the last HT?
781 * GNU diff puts epoch there to signal a creation/deletion event. Is
782 * this such a timestamp?
784 static int has_epoch_timestamp(const char *nameline
)
787 * We are only interested in epoch timestamp; any non-zero
788 * fraction cannot be one, hence "(\.0+)?" in the regexp below.
789 * For the same reason, the date must be either 1969-12-31 or
790 * 1970-01-01, and the seconds part must be "00".
792 const char stamp_regexp
[] =
793 "^[0-2][0-9]:([0-5][0-9]):00(\\.0+)?"
795 "([-+][0-2][0-9]:?[0-5][0-9])\n";
796 const char *timestamp
= NULL
, *cp
, *colon
;
797 static regex_t
*stamp
;
799 int zoneoffset
, epoch_hour
, hour
, minute
;
802 for (cp
= nameline
; *cp
!= '\n'; cp
++) {
810 * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31
811 * (west of GMT) or 1970-01-01 (east of GMT)
813 if (skip_prefix(timestamp
, "1969-12-31 ", ×tamp
))
815 else if (skip_prefix(timestamp
, "1970-01-01 ", ×tamp
))
821 stamp
= xmalloc(sizeof(*stamp
));
822 if (regcomp(stamp
, stamp_regexp
, REG_EXTENDED
)) {
823 warning(_("Cannot prepare timestamp regexp %s"),
829 status
= regexec(stamp
, timestamp
, ARRAY_SIZE(m
), m
, 0);
831 if (status
!= REG_NOMATCH
)
832 warning(_("regexec returned %d for input: %s"),
837 hour
= strtol(timestamp
, NULL
, 10);
838 minute
= strtol(timestamp
+ m
[1].rm_so
, NULL
, 10);
840 zoneoffset
= strtol(timestamp
+ m
[3].rm_so
+ 1, (char **) &colon
, 10);
842 zoneoffset
= zoneoffset
* 60 + strtol(colon
+ 1, NULL
, 10);
844 zoneoffset
= (zoneoffset
/ 100) * 60 + (zoneoffset
% 100);
845 if (timestamp
[m
[3].rm_so
] == '-')
846 zoneoffset
= -zoneoffset
;
848 return hour
* 60 + minute
- zoneoffset
== epoch_hour
* 60;
852 * Get the name etc info from the ---/+++ lines of a traditional patch header
854 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
855 * files, we can happily check the index for a match, but for creating a
856 * new file we should try to match whatever "patch" does. I have no idea.
858 static int parse_traditional_patch(struct apply_state
*state
,
865 first
+= 4; /* skip "--- " */
866 second
+= 4; /* skip "+++ " */
867 if (!state
->p_value_known
) {
869 p
= guess_p_value(state
, first
);
870 q
= guess_p_value(state
, second
);
872 if (0 <= p
&& p
== q
) {
874 state
->p_value_known
= 1;
877 if (is_dev_null(first
)) {
879 patch
->is_delete
= 0;
880 name
= find_name_traditional(state
, second
, NULL
, state
->p_value
);
881 patch
->new_name
= name
;
882 } else if (is_dev_null(second
)) {
884 patch
->is_delete
= 1;
885 name
= find_name_traditional(state
, first
, NULL
, state
->p_value
);
886 patch
->old_name
= name
;
889 first_name
= find_name_traditional(state
, first
, NULL
, state
->p_value
);
890 name
= find_name_traditional(state
, second
, first_name
, state
->p_value
);
892 if (has_epoch_timestamp(first
)) {
894 patch
->is_delete
= 0;
895 patch
->new_name
= name
;
896 } else if (has_epoch_timestamp(second
)) {
898 patch
->is_delete
= 1;
899 patch
->old_name
= name
;
901 patch
->old_name
= name
;
902 patch
->new_name
= xstrdup_or_null(name
);
906 return error(_("unable to find filename in patch at line %d"), state
->linenr
);
911 static int gitdiff_hdrend(struct apply_state
*state
,
919 * We're anal about diff header consistency, to make
920 * sure that we don't end up having strange ambiguous
921 * patches floating around.
923 * As a result, gitdiff_{old|new}name() will check
924 * their names against any previous information, just
927 #define DIFF_OLD_NAME 0
928 #define DIFF_NEW_NAME 1
930 static int gitdiff_verify_name(struct apply_state
*state
,
936 if (!*name
&& !isnull
) {
937 *name
= find_name(state
, line
, NULL
, state
->p_value
, TERM_TAB
);
944 return error(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"),
945 *name
, state
->linenr
);
946 another
= find_name(state
, line
, NULL
, state
->p_value
, TERM_TAB
);
947 if (!another
|| strcmp(another
, *name
)) {
949 return error((side
== DIFF_NEW_NAME
) ?
950 _("git apply: bad git-diff - inconsistent new filename on line %d") :
951 _("git apply: bad git-diff - inconsistent old filename on line %d"), state
->linenr
);
955 if (!is_dev_null(line
))
956 return error(_("git apply: bad git-diff - expected /dev/null on line %d"), state
->linenr
);
962 static int gitdiff_oldname(struct apply_state
*state
,
966 return gitdiff_verify_name(state
, line
,
967 patch
->is_new
, &patch
->old_name
,
971 static int gitdiff_newname(struct apply_state
*state
,
975 return gitdiff_verify_name(state
, line
,
976 patch
->is_delete
, &patch
->new_name
,
980 static int parse_mode_line(const char *line
, int linenr
, unsigned int *mode
)
983 *mode
= strtoul(line
, &end
, 8);
984 if (end
== line
|| !isspace(*end
))
985 return error(_("invalid mode on line %d: %s"), linenr
, line
);
989 static int gitdiff_oldmode(struct apply_state
*state
,
993 return parse_mode_line(line
, state
->linenr
, &patch
->old_mode
);
996 static int gitdiff_newmode(struct apply_state
*state
,
1000 return parse_mode_line(line
, state
->linenr
, &patch
->new_mode
);
1003 static int gitdiff_delete(struct apply_state
*state
,
1005 struct patch
*patch
)
1007 patch
->is_delete
= 1;
1008 free(patch
->old_name
);
1009 patch
->old_name
= xstrdup_or_null(patch
->def_name
);
1010 return gitdiff_oldmode(state
, line
, patch
);
1013 static int gitdiff_newfile(struct apply_state
*state
,
1015 struct patch
*patch
)
1018 free(patch
->new_name
);
1019 patch
->new_name
= xstrdup_or_null(patch
->def_name
);
1020 return gitdiff_newmode(state
, line
, patch
);
1023 static int gitdiff_copysrc(struct apply_state
*state
,
1025 struct patch
*patch
)
1028 free(patch
->old_name
);
1029 patch
->old_name
= find_name(state
, line
, NULL
, state
->p_value
? state
->p_value
- 1 : 0, 0);
1033 static int gitdiff_copydst(struct apply_state
*state
,
1035 struct patch
*patch
)
1038 free(patch
->new_name
);
1039 patch
->new_name
= find_name(state
, line
, NULL
, state
->p_value
? state
->p_value
- 1 : 0, 0);
1043 static int gitdiff_renamesrc(struct apply_state
*state
,
1045 struct patch
*patch
)
1047 patch
->is_rename
= 1;
1048 free(patch
->old_name
);
1049 patch
->old_name
= find_name(state
, line
, NULL
, state
->p_value
? state
->p_value
- 1 : 0, 0);
1053 static int gitdiff_renamedst(struct apply_state
*state
,
1055 struct patch
*patch
)
1057 patch
->is_rename
= 1;
1058 free(patch
->new_name
);
1059 patch
->new_name
= find_name(state
, line
, NULL
, state
->p_value
? state
->p_value
- 1 : 0, 0);
1063 static int gitdiff_similarity(struct apply_state
*state
,
1065 struct patch
*patch
)
1067 unsigned long val
= strtoul(line
, NULL
, 10);
1073 static int gitdiff_dissimilarity(struct apply_state
*state
,
1075 struct patch
*patch
)
1077 unsigned long val
= strtoul(line
, NULL
, 10);
1083 static int gitdiff_index(struct apply_state
*state
,
1085 struct patch
*patch
)
1088 * index line is N hexadecimal, "..", N hexadecimal,
1089 * and optional space with octal mode.
1091 const char *ptr
, *eol
;
1094 ptr
= strchr(line
, '.');
1095 if (!ptr
|| ptr
[1] != '.' || 40 < ptr
- line
)
1098 memcpy(patch
->old_sha1_prefix
, line
, len
);
1099 patch
->old_sha1_prefix
[len
] = 0;
1102 ptr
= strchr(line
, ' ');
1103 eol
= strchrnul(line
, '\n');
1105 if (!ptr
|| eol
< ptr
)
1111 memcpy(patch
->new_sha1_prefix
, line
, len
);
1112 patch
->new_sha1_prefix
[len
] = 0;
1114 return gitdiff_oldmode(state
, ptr
+ 1, patch
);
1119 * This is normal for a diff that doesn't change anything: we'll fall through
1120 * into the next diff. Tell the parser to break out.
1122 static int gitdiff_unrecognized(struct apply_state
*state
,
1124 struct patch
*patch
)
1130 * Skip p_value leading components from "line"; as we do not accept
1131 * absolute paths, return NULL in that case.
1133 static const char *skip_tree_prefix(struct apply_state
*state
,
1140 if (!state
->p_value
)
1141 return (llen
&& line
[0] == '/') ? NULL
: line
;
1143 nslash
= state
->p_value
;
1144 for (i
= 0; i
< llen
; i
++) {
1146 if (ch
== '/' && --nslash
<= 0)
1147 return (i
== 0) ? NULL
: &line
[i
+ 1];
1153 * This is to extract the same name that appears on "diff --git"
1154 * line. We do not find and return anything if it is a rename
1155 * patch, and it is OK because we will find the name elsewhere.
1156 * We need to reliably find name only when it is mode-change only,
1157 * creation or deletion of an empty file. In any of these cases,
1158 * both sides are the same name under a/ and b/ respectively.
1160 static char *git_header_name(struct apply_state
*state
,
1165 const char *second
= NULL
;
1166 size_t len
, line_len
;
1168 line
+= strlen("diff --git ");
1169 llen
-= strlen("diff --git ");
1173 struct strbuf first
= STRBUF_INIT
;
1174 struct strbuf sp
= STRBUF_INIT
;
1176 if (unquote_c_style(&first
, line
, &second
))
1177 goto free_and_fail1
;
1179 /* strip the a/b prefix including trailing slash */
1180 cp
= skip_tree_prefix(state
, first
.buf
, first
.len
);
1182 goto free_and_fail1
;
1183 strbuf_remove(&first
, 0, cp
- first
.buf
);
1186 * second points at one past closing dq of name.
1187 * find the second name.
1189 while ((second
< line
+ llen
) && isspace(*second
))
1192 if (line
+ llen
<= second
)
1193 goto free_and_fail1
;
1194 if (*second
== '"') {
1195 if (unquote_c_style(&sp
, second
, NULL
))
1196 goto free_and_fail1
;
1197 cp
= skip_tree_prefix(state
, sp
.buf
, sp
.len
);
1199 goto free_and_fail1
;
1200 /* They must match, otherwise ignore */
1201 if (strcmp(cp
, first
.buf
))
1202 goto free_and_fail1
;
1203 strbuf_release(&sp
);
1204 return strbuf_detach(&first
, NULL
);
1207 /* unquoted second */
1208 cp
= skip_tree_prefix(state
, second
, line
+ llen
- second
);
1210 goto free_and_fail1
;
1211 if (line
+ llen
- cp
!= first
.len
||
1212 memcmp(first
.buf
, cp
, first
.len
))
1213 goto free_and_fail1
;
1214 return strbuf_detach(&first
, NULL
);
1217 strbuf_release(&first
);
1218 strbuf_release(&sp
);
1222 /* unquoted first name */
1223 name
= skip_tree_prefix(state
, line
, llen
);
1228 * since the first name is unquoted, a dq if exists must be
1229 * the beginning of the second name.
1231 for (second
= name
; second
< line
+ llen
; second
++) {
1232 if (*second
== '"') {
1233 struct strbuf sp
= STRBUF_INIT
;
1236 if (unquote_c_style(&sp
, second
, NULL
))
1237 goto free_and_fail2
;
1239 np
= skip_tree_prefix(state
, sp
.buf
, sp
.len
);
1241 goto free_and_fail2
;
1243 len
= sp
.buf
+ sp
.len
- np
;
1244 if (len
< second
- name
&&
1245 !strncmp(np
, name
, len
) &&
1246 isspace(name
[len
])) {
1248 strbuf_remove(&sp
, 0, np
- sp
.buf
);
1249 return strbuf_detach(&sp
, NULL
);
1253 strbuf_release(&sp
);
1259 * Accept a name only if it shows up twice, exactly the same
1262 second
= strchr(name
, '\n');
1265 line_len
= second
- name
;
1266 for (len
= 0 ; ; len
++) {
1267 switch (name
[len
]) {
1272 case '\t': case ' ':
1274 * Is this the separator between the preimage
1275 * and the postimage pathname? Again, we are
1276 * only interested in the case where there is
1277 * no rename, as this is only to set def_name
1278 * and a rename patch has the names elsewhere
1279 * in an unambiguous form.
1282 return NULL
; /* no postimage name */
1283 second
= skip_tree_prefix(state
, name
+ len
+ 1,
1284 line_len
- (len
+ 1));
1288 * Does len bytes starting at "name" and "second"
1289 * (that are separated by one HT or SP we just
1290 * found) exactly match?
1292 if (second
[len
] == '\n' && !strncmp(name
, second
, len
))
1293 return xmemdupz(name
, len
);
1298 static int check_header_line(struct apply_state
*state
, struct patch
*patch
)
1300 int extensions
= (patch
->is_delete
== 1) + (patch
->is_new
== 1) +
1301 (patch
->is_rename
== 1) + (patch
->is_copy
== 1);
1303 return error(_("inconsistent header lines %d and %d"),
1304 patch
->extension_linenr
, state
->linenr
);
1305 if (extensions
&& !patch
->extension_linenr
)
1306 patch
->extension_linenr
= state
->linenr
;
1310 /* Verify that we recognize the lines following a git header */
1311 static int parse_git_header(struct apply_state
*state
,
1315 struct patch
*patch
)
1317 unsigned long offset
;
1319 /* A git diff has explicit new/delete information, so we don't guess */
1321 patch
->is_delete
= 0;
1324 * Some things may not have the old name in the
1325 * rest of the headers anywhere (pure mode changes,
1326 * or removing or adding empty files), so we get
1327 * the default name from the header.
1329 patch
->def_name
= git_header_name(state
, line
, len
);
1330 if (patch
->def_name
&& state
->root
.len
) {
1331 char *s
= xstrfmt("%s%s", state
->root
.buf
, patch
->def_name
);
1332 free(patch
->def_name
);
1333 patch
->def_name
= s
;
1339 for (offset
= len
; size
> 0 ; offset
+= len
, size
-= len
, line
+= len
, state
->linenr
++) {
1340 static const struct opentry
{
1342 int (*fn
)(struct apply_state
*, const char *, struct patch
*);
1344 { "@@ -", gitdiff_hdrend
},
1345 { "--- ", gitdiff_oldname
},
1346 { "+++ ", gitdiff_newname
},
1347 { "old mode ", gitdiff_oldmode
},
1348 { "new mode ", gitdiff_newmode
},
1349 { "deleted file mode ", gitdiff_delete
},
1350 { "new file mode ", gitdiff_newfile
},
1351 { "copy from ", gitdiff_copysrc
},
1352 { "copy to ", gitdiff_copydst
},
1353 { "rename old ", gitdiff_renamesrc
},
1354 { "rename new ", gitdiff_renamedst
},
1355 { "rename from ", gitdiff_renamesrc
},
1356 { "rename to ", gitdiff_renamedst
},
1357 { "similarity index ", gitdiff_similarity
},
1358 { "dissimilarity index ", gitdiff_dissimilarity
},
1359 { "index ", gitdiff_index
},
1360 { "", gitdiff_unrecognized
},
1364 len
= linelen(line
, size
);
1365 if (!len
|| line
[len
-1] != '\n')
1367 for (i
= 0; i
< ARRAY_SIZE(optable
); i
++) {
1368 const struct opentry
*p
= optable
+ i
;
1369 int oplen
= strlen(p
->str
);
1371 if (len
< oplen
|| memcmp(p
->str
, line
, oplen
))
1373 res
= p
->fn(state
, line
+ oplen
, patch
);
1376 if (check_header_line(state
, patch
))
1387 static int parse_num(const char *line
, unsigned long *p
)
1391 if (!isdigit(*line
))
1393 *p
= strtoul(line
, &ptr
, 10);
1397 static int parse_range(const char *line
, int len
, int offset
, const char *expect
,
1398 unsigned long *p1
, unsigned long *p2
)
1402 if (offset
< 0 || offset
>= len
)
1407 digits
= parse_num(line
, p1
);
1417 digits
= parse_num(line
+1, p2
);
1426 ex
= strlen(expect
);
1429 if (memcmp(line
, expect
, ex
))
1435 static void recount_diff(const char *line
, int size
, struct fragment
*fragment
)
1437 int oldlines
= 0, newlines
= 0, ret
= 0;
1440 warning("recount: ignore empty hunk");
1445 int len
= linelen(line
, size
);
1453 case ' ': case '\n':
1465 ret
= size
< 3 || !starts_with(line
, "@@ ");
1468 ret
= size
< 5 || !starts_with(line
, "diff ");
1475 warning(_("recount: unexpected line: %.*s"),
1476 (int)linelen(line
, size
), line
);
1481 fragment
->oldlines
= oldlines
;
1482 fragment
->newlines
= newlines
;
1486 * Parse a unified diff fragment header of the
1487 * form "@@ -a,b +c,d @@"
1489 static int parse_fragment_header(const char *line
, int len
, struct fragment
*fragment
)
1493 if (!len
|| line
[len
-1] != '\n')
1496 /* Figure out the number of lines in a fragment */
1497 offset
= parse_range(line
, len
, 4, " +", &fragment
->oldpos
, &fragment
->oldlines
);
1498 offset
= parse_range(line
, len
, offset
, " @@", &fragment
->newpos
, &fragment
->newlines
);
1504 * Find file diff header
1507 * -1 if no header was found
1508 * -128 in case of error
1509 * the size of the header in bytes (called "offset") otherwise
1511 static int find_header(struct apply_state
*state
,
1515 struct patch
*patch
)
1517 unsigned long offset
, len
;
1519 patch
->is_toplevel_relative
= 0;
1520 patch
->is_rename
= patch
->is_copy
= 0;
1521 patch
->is_new
= patch
->is_delete
= -1;
1522 patch
->old_mode
= patch
->new_mode
= 0;
1523 patch
->old_name
= patch
->new_name
= NULL
;
1524 for (offset
= 0; size
> 0; offset
+= len
, size
-= len
, line
+= len
, state
->linenr
++) {
1525 unsigned long nextlen
;
1527 len
= linelen(line
, size
);
1531 /* Testing this early allows us to take a few shortcuts.. */
1536 * Make sure we don't find any unconnected patch fragments.
1537 * That's a sign that we didn't find a header, and that a
1538 * patch has become corrupted/broken up.
1540 if (!memcmp("@@ -", line
, 4)) {
1541 struct fragment dummy
;
1542 if (parse_fragment_header(line
, len
, &dummy
) < 0)
1544 error(_("patch fragment without header at line %d: %.*s"),
1545 state
->linenr
, (int)len
-1, line
);
1553 * Git patch? It might not have a real patch, just a rename
1554 * or mode change, so we handle that specially
1556 if (!memcmp("diff --git ", line
, 11)) {
1557 int git_hdr_len
= parse_git_header(state
, line
, len
, size
, patch
);
1558 if (git_hdr_len
< 0)
1560 if (git_hdr_len
<= len
)
1562 if (!patch
->old_name
&& !patch
->new_name
) {
1563 if (!patch
->def_name
) {
1564 error(Q_("git diff header lacks filename information when removing "
1565 "%d leading pathname component (line %d)",
1566 "git diff header lacks filename information when removing "
1567 "%d leading pathname components (line %d)",
1569 state
->p_value
, state
->linenr
);
1572 patch
->old_name
= xstrdup(patch
->def_name
);
1573 patch
->new_name
= xstrdup(patch
->def_name
);
1575 if ((!patch
->new_name
&& !patch
->is_delete
) ||
1576 (!patch
->old_name
&& !patch
->is_new
)) {
1577 error(_("git diff header lacks filename information "
1578 "(line %d)"), state
->linenr
);
1581 patch
->is_toplevel_relative
= 1;
1582 *hdrsize
= git_hdr_len
;
1586 /* --- followed by +++ ? */
1587 if (memcmp("--- ", line
, 4) || memcmp("+++ ", line
+ len
, 4))
1591 * We only accept unified patches, so we want it to
1592 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
1593 * minimum ("@@ -0,0 +1 @@\n" is the shortest).
1595 nextlen
= linelen(line
+ len
, size
- len
);
1596 if (size
< nextlen
+ 14 || memcmp("@@ -", line
+ len
+ nextlen
, 4))
1599 /* Ok, we'll consider it a patch */
1600 if (parse_traditional_patch(state
, line
, line
+len
, patch
))
1602 *hdrsize
= len
+ nextlen
;
1609 static void record_ws_error(struct apply_state
*state
,
1620 state
->whitespace_error
++;
1621 if (state
->squelch_whitespace_errors
&&
1622 state
->squelch_whitespace_errors
< state
->whitespace_error
)
1625 err
= whitespace_error_string(result
);
1626 if (state
->apply_verbosity
> verbosity_silent
)
1627 fprintf(stderr
, "%s:%d: %s.\n%.*s\n",
1628 state
->patch_input_file
, linenr
, err
, len
, line
);
1632 static void check_whitespace(struct apply_state
*state
,
1637 unsigned result
= ws_check(line
+ 1, len
- 1, ws_rule
);
1639 record_ws_error(state
, result
, line
+ 1, len
- 2, state
->linenr
);
1643 * Check if the patch has context lines with CRLF or
1644 * the patch wants to remove lines with CRLF.
1646 static void check_old_for_crlf(struct patch
*patch
, const char *line
, int len
)
1648 if (len
>= 2 && line
[len
-1] == '\n' && line
[len
-2] == '\r') {
1649 patch
->ws_rule
|= WS_CR_AT_EOL
;
1650 patch
->crlf_in_old
= 1;
1656 * Parse a unified diff. Note that this really needs to parse each
1657 * fragment separately, since the only way to know the difference
1658 * between a "---" that is part of a patch, and a "---" that starts
1659 * the next patch is to look at the line counts..
1661 static int parse_fragment(struct apply_state
*state
,
1664 struct patch
*patch
,
1665 struct fragment
*fragment
)
1668 int len
= linelen(line
, size
), offset
;
1669 unsigned long oldlines
, newlines
;
1670 unsigned long leading
, trailing
;
1672 offset
= parse_fragment_header(line
, len
, fragment
);
1675 if (offset
> 0 && patch
->recount
)
1676 recount_diff(line
+ offset
, size
- offset
, fragment
);
1677 oldlines
= fragment
->oldlines
;
1678 newlines
= fragment
->newlines
;
1682 /* Parse the thing.. */
1686 added
= deleted
= 0;
1689 offset
+= len
, size
-= len
, line
+= len
, state
->linenr
++) {
1690 if (!oldlines
&& !newlines
)
1692 len
= linelen(line
, size
);
1693 if (!len
|| line
[len
-1] != '\n')
1698 case '\n': /* newer GNU diff, an empty context line */
1702 if (!deleted
&& !added
)
1705 check_old_for_crlf(patch
, line
, len
);
1706 if (!state
->apply_in_reverse
&&
1707 state
->ws_error_action
== correct_ws_error
)
1708 check_whitespace(state
, line
, len
, patch
->ws_rule
);
1711 if (!state
->apply_in_reverse
)
1712 check_old_for_crlf(patch
, line
, len
);
1713 if (state
->apply_in_reverse
&&
1714 state
->ws_error_action
!= nowarn_ws_error
)
1715 check_whitespace(state
, line
, len
, patch
->ws_rule
);
1721 if (state
->apply_in_reverse
)
1722 check_old_for_crlf(patch
, line
, len
);
1723 if (!state
->apply_in_reverse
&&
1724 state
->ws_error_action
!= nowarn_ws_error
)
1725 check_whitespace(state
, line
, len
, patch
->ws_rule
);
1732 * We allow "\ No newline at end of file". Depending
1733 * on locale settings when the patch was produced we
1734 * don't know what this line looks like. The only
1735 * thing we do know is that it begins with "\ ".
1736 * Checking for 12 is just for sanity check -- any
1737 * l10n of "\ No newline..." is at least that long.
1740 if (len
< 12 || memcmp(line
, "\\ ", 2))
1745 if (oldlines
|| newlines
)
1747 if (!deleted
&& !added
)
1750 fragment
->leading
= leading
;
1751 fragment
->trailing
= trailing
;
1754 * If a fragment ends with an incomplete line, we failed to include
1755 * it in the above loop because we hit oldlines == newlines == 0
1758 if (12 < size
&& !memcmp(line
, "\\ ", 2))
1759 offset
+= linelen(line
, size
);
1761 patch
->lines_added
+= added
;
1762 patch
->lines_deleted
+= deleted
;
1764 if (0 < patch
->is_new
&& oldlines
)
1765 return error(_("new file depends on old contents"));
1766 if (0 < patch
->is_delete
&& newlines
)
1767 return error(_("deleted file still has contents"));
1772 * We have seen "diff --git a/... b/..." header (or a traditional patch
1773 * header). Read hunks that belong to this patch into fragments and hang
1774 * them to the given patch structure.
1776 * The (fragment->patch, fragment->size) pair points into the memory given
1777 * by the caller, not a copy, when we return.
1780 * -1 in case of error,
1781 * the number of bytes in the patch otherwise.
1783 static int parse_single_patch(struct apply_state
*state
,
1786 struct patch
*patch
)
1788 unsigned long offset
= 0;
1789 unsigned long oldlines
= 0, newlines
= 0, context
= 0;
1790 struct fragment
**fragp
= &patch
->fragments
;
1792 while (size
> 4 && !memcmp(line
, "@@ -", 4)) {
1793 struct fragment
*fragment
;
1796 fragment
= xcalloc(1, sizeof(*fragment
));
1797 fragment
->linenr
= state
->linenr
;
1798 len
= parse_fragment(state
, line
, size
, patch
, fragment
);
1801 return error(_("corrupt patch at line %d"), state
->linenr
);
1803 fragment
->patch
= line
;
1804 fragment
->size
= len
;
1805 oldlines
+= fragment
->oldlines
;
1806 newlines
+= fragment
->newlines
;
1807 context
+= fragment
->leading
+ fragment
->trailing
;
1810 fragp
= &fragment
->next
;
1818 * If something was removed (i.e. we have old-lines) it cannot
1819 * be creation, and if something was added it cannot be
1820 * deletion. However, the reverse is not true; --unified=0
1821 * patches that only add are not necessarily creation even
1822 * though they do not have any old lines, and ones that only
1823 * delete are not necessarily deletion.
1825 * Unfortunately, a real creation/deletion patch do _not_ have
1826 * any context line by definition, so we cannot safely tell it
1827 * apart with --unified=0 insanity. At least if the patch has
1828 * more than one hunk it is not creation or deletion.
1830 if (patch
->is_new
< 0 &&
1831 (oldlines
|| (patch
->fragments
&& patch
->fragments
->next
)))
1833 if (patch
->is_delete
< 0 &&
1834 (newlines
|| (patch
->fragments
&& patch
->fragments
->next
)))
1835 patch
->is_delete
= 0;
1837 if (0 < patch
->is_new
&& oldlines
)
1838 return error(_("new file %s depends on old contents"), patch
->new_name
);
1839 if (0 < patch
->is_delete
&& newlines
)
1840 return error(_("deleted file %s still has contents"), patch
->old_name
);
1841 if (!patch
->is_delete
&& !newlines
&& context
&& state
->apply_verbosity
> verbosity_silent
)
1844 "file %s becomes empty but is not deleted"),
1850 static inline int metadata_changes(struct patch
*patch
)
1852 return patch
->is_rename
> 0 ||
1853 patch
->is_copy
> 0 ||
1854 patch
->is_new
> 0 ||
1856 (patch
->old_mode
&& patch
->new_mode
&&
1857 patch
->old_mode
!= patch
->new_mode
);
1860 static char *inflate_it(const void *data
, unsigned long size
,
1861 unsigned long inflated_size
)
1867 memset(&stream
, 0, sizeof(stream
));
1869 stream
.next_in
= (unsigned char *)data
;
1870 stream
.avail_in
= size
;
1871 stream
.next_out
= out
= xmalloc(inflated_size
);
1872 stream
.avail_out
= inflated_size
;
1873 git_inflate_init(&stream
);
1874 st
= git_inflate(&stream
, Z_FINISH
);
1875 git_inflate_end(&stream
);
1876 if ((st
!= Z_STREAM_END
) || stream
.total_out
!= inflated_size
) {
1884 * Read a binary hunk and return a new fragment; fragment->patch
1885 * points at an allocated memory that the caller must free, so
1886 * it is marked as "->free_patch = 1".
1888 static struct fragment
*parse_binary_hunk(struct apply_state
*state
,
1890 unsigned long *sz_p
,
1895 * Expect a line that begins with binary patch method ("literal"
1896 * or "delta"), followed by the length of data before deflating.
1897 * a sequence of 'length-byte' followed by base-85 encoded data
1898 * should follow, terminated by a newline.
1900 * Each 5-byte sequence of base-85 encodes up to 4 bytes,
1901 * and we would limit the patch line to 66 characters,
1902 * so one line can fit up to 13 groups that would decode
1903 * to 52 bytes max. The length byte 'A'-'Z' corresponds
1904 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
1907 unsigned long size
= *sz_p
;
1908 char *buffer
= *buf_p
;
1910 unsigned long origlen
;
1913 struct fragment
*frag
;
1915 llen
= linelen(buffer
, size
);
1920 if (starts_with(buffer
, "delta ")) {
1921 patch_method
= BINARY_DELTA_DEFLATED
;
1922 origlen
= strtoul(buffer
+ 6, NULL
, 10);
1924 else if (starts_with(buffer
, "literal ")) {
1925 patch_method
= BINARY_LITERAL_DEFLATED
;
1926 origlen
= strtoul(buffer
+ 8, NULL
, 10);
1934 int byte_length
, max_byte_length
, newsize
;
1935 llen
= linelen(buffer
, size
);
1939 /* consume the blank line */
1945 * Minimum line is "A00000\n" which is 7-byte long,
1946 * and the line length must be multiple of 5 plus 2.
1948 if ((llen
< 7) || (llen
-2) % 5)
1950 max_byte_length
= (llen
- 2) / 5 * 4;
1951 byte_length
= *buffer
;
1952 if ('A' <= byte_length
&& byte_length
<= 'Z')
1953 byte_length
= byte_length
- 'A' + 1;
1954 else if ('a' <= byte_length
&& byte_length
<= 'z')
1955 byte_length
= byte_length
- 'a' + 27;
1958 /* if the input length was not multiple of 4, we would
1959 * have filler at the end but the filler should never
1962 if (max_byte_length
< byte_length
||
1963 byte_length
<= max_byte_length
- 4)
1965 newsize
= hunk_size
+ byte_length
;
1966 data
= xrealloc(data
, newsize
);
1967 if (decode_85(data
+ hunk_size
, buffer
+ 1, byte_length
))
1969 hunk_size
= newsize
;
1974 frag
= xcalloc(1, sizeof(*frag
));
1975 frag
->patch
= inflate_it(data
, hunk_size
, origlen
);
1976 frag
->free_patch
= 1;
1980 frag
->size
= origlen
;
1984 frag
->binary_patch_method
= patch_method
;
1990 error(_("corrupt binary patch at line %d: %.*s"),
1991 state
->linenr
-1, llen
-1, buffer
);
1997 * -1 in case of error,
1998 * the length of the parsed binary patch otherwise
2000 static int parse_binary(struct apply_state
*state
,
2003 struct patch
*patch
)
2006 * We have read "GIT binary patch\n"; what follows is a line
2007 * that says the patch method (currently, either "literal" or
2008 * "delta") and the length of data before deflating; a
2009 * sequence of 'length-byte' followed by base-85 encoded data
2012 * When a binary patch is reversible, there is another binary
2013 * hunk in the same format, starting with patch method (either
2014 * "literal" or "delta") with the length of data, and a sequence
2015 * of length-byte + base-85 encoded data, terminated with another
2016 * empty line. This data, when applied to the postimage, produces
2019 struct fragment
*forward
;
2020 struct fragment
*reverse
;
2024 forward
= parse_binary_hunk(state
, &buffer
, &size
, &status
, &used
);
2025 if (!forward
&& !status
)
2026 /* there has to be one hunk (forward hunk) */
2027 return error(_("unrecognized binary patch at line %d"), state
->linenr
-1);
2029 /* otherwise we already gave an error message */
2032 reverse
= parse_binary_hunk(state
, &buffer
, &size
, &status
, &used_1
);
2037 * Not having reverse hunk is not an error, but having
2038 * a corrupt reverse hunk is.
2040 free((void*) forward
->patch
);
2044 forward
->next
= reverse
;
2045 patch
->fragments
= forward
;
2046 patch
->is_binary
= 1;
2050 static void prefix_one(struct apply_state
*state
, char **name
)
2052 char *old_name
= *name
;
2055 *name
= prefix_filename(state
->prefix
, *name
);
2059 static void prefix_patch(struct apply_state
*state
, struct patch
*p
)
2061 if (!state
->prefix
|| p
->is_toplevel_relative
)
2063 prefix_one(state
, &p
->new_name
);
2064 prefix_one(state
, &p
->old_name
);
2071 static void add_name_limit(struct apply_state
*state
,
2075 struct string_list_item
*it
;
2077 it
= string_list_append(&state
->limit_by_name
, name
);
2078 it
->util
= exclude
? NULL
: (void *) 1;
2081 static int use_patch(struct apply_state
*state
, struct patch
*p
)
2083 const char *pathname
= p
->new_name
? p
->new_name
: p
->old_name
;
2086 /* Paths outside are not touched regardless of "--include" */
2087 if (state
->prefix
&& *state
->prefix
) {
2089 if (!skip_prefix(pathname
, state
->prefix
, &rest
) || !*rest
)
2093 /* See if it matches any of exclude/include rule */
2094 for (i
= 0; i
< state
->limit_by_name
.nr
; i
++) {
2095 struct string_list_item
*it
= &state
->limit_by_name
.items
[i
];
2096 if (!wildmatch(it
->string
, pathname
, 0))
2097 return (it
->util
!= NULL
);
2101 * If we had any include, a path that does not match any rule is
2102 * not used. Otherwise, we saw bunch of exclude rules (or none)
2103 * and such a path is used.
2105 return !state
->has_include
;
2109 * Read the patch text in "buffer" that extends for "size" bytes; stop
2110 * reading after seeing a single patch (i.e. changes to a single file).
2111 * Create fragments (i.e. patch hunks) and hang them to the given patch.
2114 * -1 if no header was found or parse_binary() failed,
2115 * -128 on another error,
2116 * the number of bytes consumed otherwise,
2117 * so that the caller can call us again for the next patch.
2119 static int parse_chunk(struct apply_state
*state
, char *buffer
, unsigned long size
, struct patch
*patch
)
2121 int hdrsize
, patchsize
;
2122 int offset
= find_header(state
, buffer
, size
, &hdrsize
, patch
);
2127 prefix_patch(state
, patch
);
2129 if (!use_patch(state
, patch
))
2132 patch
->ws_rule
= whitespace_rule(patch
->new_name
2136 patchsize
= parse_single_patch(state
,
2137 buffer
+ offset
+ hdrsize
,
2138 size
- offset
- hdrsize
,
2145 static const char git_binary
[] = "GIT binary patch\n";
2146 int hd
= hdrsize
+ offset
;
2147 unsigned long llen
= linelen(buffer
+ hd
, size
- hd
);
2149 if (llen
== sizeof(git_binary
) - 1 &&
2150 !memcmp(git_binary
, buffer
+ hd
, llen
)) {
2153 used
= parse_binary(state
, buffer
+ hd
+ llen
,
2154 size
- hd
- llen
, patch
);
2158 patchsize
= used
+ llen
;
2162 else if (!memcmp(" differ\n", buffer
+ hd
+ llen
- 8, 8)) {
2163 static const char *binhdr
[] = {
2169 for (i
= 0; binhdr
[i
]; i
++) {
2170 int len
= strlen(binhdr
[i
]);
2171 if (len
< size
- hd
&&
2172 !memcmp(binhdr
[i
], buffer
+ hd
, len
)) {
2174 patch
->is_binary
= 1;
2181 /* Empty patch cannot be applied if it is a text patch
2182 * without metadata change. A binary patch appears
2185 if ((state
->apply
|| state
->check
) &&
2186 (!patch
->is_binary
&& !metadata_changes(patch
))) {
2187 error(_("patch with only garbage at line %d"), state
->linenr
);
2192 return offset
+ hdrsize
+ patchsize
;
2195 static void reverse_patches(struct patch
*p
)
2197 for (; p
; p
= p
->next
) {
2198 struct fragment
*frag
= p
->fragments
;
2200 SWAP(p
->new_name
, p
->old_name
);
2201 SWAP(p
->new_mode
, p
->old_mode
);
2202 SWAP(p
->is_new
, p
->is_delete
);
2203 SWAP(p
->lines_added
, p
->lines_deleted
);
2204 SWAP(p
->old_sha1_prefix
, p
->new_sha1_prefix
);
2206 for (; frag
; frag
= frag
->next
) {
2207 SWAP(frag
->newpos
, frag
->oldpos
);
2208 SWAP(frag
->newlines
, frag
->oldlines
);
2213 static const char pluses
[] =
2214 "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
2215 static const char minuses
[]=
2216 "----------------------------------------------------------------------";
2218 static void show_stats(struct apply_state
*state
, struct patch
*patch
)
2220 struct strbuf qname
= STRBUF_INIT
;
2221 char *cp
= patch
->new_name
? patch
->new_name
: patch
->old_name
;
2224 quote_c_style(cp
, &qname
, NULL
, 0);
2227 * "scale" the filename
2229 max
= state
->max_len
;
2233 if (qname
.len
> max
) {
2234 cp
= strchr(qname
.buf
+ qname
.len
+ 3 - max
, '/');
2236 cp
= qname
.buf
+ qname
.len
+ 3 - max
;
2237 strbuf_splice(&qname
, 0, cp
- qname
.buf
, "...", 3);
2240 if (patch
->is_binary
) {
2241 printf(" %-*s | Bin\n", max
, qname
.buf
);
2242 strbuf_release(&qname
);
2246 printf(" %-*s |", max
, qname
.buf
);
2247 strbuf_release(&qname
);
2250 * scale the add/delete
2252 max
= max
+ state
->max_change
> 70 ? 70 - max
: state
->max_change
;
2253 add
= patch
->lines_added
;
2254 del
= patch
->lines_deleted
;
2256 if (state
->max_change
> 0) {
2257 int total
= ((add
+ del
) * max
+ state
->max_change
/ 2) / state
->max_change
;
2258 add
= (add
* max
+ state
->max_change
/ 2) / state
->max_change
;
2261 printf("%5d %.*s%.*s\n", patch
->lines_added
+ patch
->lines_deleted
,
2262 add
, pluses
, del
, minuses
);
2265 static int read_old_data(struct stat
*st
, struct patch
*patch
,
2266 const char *path
, struct strbuf
*buf
)
2268 int conv_flags
= patch
->crlf_in_old
?
2269 CONV_EOL_KEEP_CRLF
: CONV_EOL_RENORMALIZE
;
2270 switch (st
->st_mode
& S_IFMT
) {
2272 if (strbuf_readlink(buf
, path
, st
->st_size
) < 0)
2273 return error(_("unable to read symlink %s"), path
);
2276 if (strbuf_read_file(buf
, path
, st
->st_size
) != st
->st_size
)
2277 return error(_("unable to open or read %s"), path
);
2279 * "git apply" without "--index/--cached" should never look
2280 * at the index; the target file may not have been added to
2281 * the index yet, and we may not even be in any Git repository.
2282 * Pass NULL to convert_to_git() to stress this; the function
2283 * should never look at the index when explicit crlf option
2286 convert_to_git(NULL
, path
, buf
->buf
, buf
->len
, buf
, conv_flags
);
2294 * Update the preimage, and the common lines in postimage,
2295 * from buffer buf of length len. If postlen is 0 the postimage
2296 * is updated in place, otherwise it's updated on a new buffer
2300 static void update_pre_post_images(struct image
*preimage
,
2301 struct image
*postimage
,
2303 size_t len
, size_t postlen
)
2305 int i
, ctx
, reduced
;
2306 char *new_buf
, *old_buf
, *fixed
;
2307 struct image fixed_preimage
;
2310 * Update the preimage with whitespace fixes. Note that we
2311 * are not losing preimage->buf -- apply_one_fragment() will
2314 prepare_image(&fixed_preimage
, buf
, len
, 1);
2316 ? fixed_preimage
.nr
== preimage
->nr
2317 : fixed_preimage
.nr
<= preimage
->nr
);
2318 for (i
= 0; i
< fixed_preimage
.nr
; i
++)
2319 fixed_preimage
.line
[i
].flag
= preimage
->line
[i
].flag
;
2320 free(preimage
->line_allocated
);
2321 *preimage
= fixed_preimage
;
2324 * Adjust the common context lines in postimage. This can be
2325 * done in-place when we are shrinking it with whitespace
2326 * fixing, but needs a new buffer when ignoring whitespace or
2327 * expanding leading tabs to spaces.
2329 * We trust the caller to tell us if the update can be done
2330 * in place (postlen==0) or not.
2332 old_buf
= postimage
->buf
;
2334 new_buf
= postimage
->buf
= xmalloc(postlen
);
2337 fixed
= preimage
->buf
;
2339 for (i
= reduced
= ctx
= 0; i
< postimage
->nr
; i
++) {
2340 size_t l_len
= postimage
->line
[i
].len
;
2341 if (!(postimage
->line
[i
].flag
& LINE_COMMON
)) {
2342 /* an added line -- no counterparts in preimage */
2343 memmove(new_buf
, old_buf
, l_len
);
2349 /* a common context -- skip it in the original postimage */
2352 /* and find the corresponding one in the fixed preimage */
2353 while (ctx
< preimage
->nr
&&
2354 !(preimage
->line
[ctx
].flag
& LINE_COMMON
)) {
2355 fixed
+= preimage
->line
[ctx
].len
;
2360 * preimage is expected to run out, if the caller
2361 * fixed addition of trailing blank lines.
2363 if (preimage
->nr
<= ctx
) {
2368 /* and copy it in, while fixing the line length */
2369 l_len
= preimage
->line
[ctx
].len
;
2370 memcpy(new_buf
, fixed
, l_len
);
2373 postimage
->line
[i
].len
= l_len
;
2378 ? postlen
< new_buf
- postimage
->buf
2379 : postimage
->len
< new_buf
- postimage
->buf
)
2380 BUG("caller miscounted postlen: asked %d, orig = %d, used = %d",
2381 (int)postlen
, (int) postimage
->len
, (int)(new_buf
- postimage
->buf
));
2383 /* Fix the length of the whole thing */
2384 postimage
->len
= new_buf
- postimage
->buf
;
2385 postimage
->nr
-= reduced
;
2388 static int line_by_line_fuzzy_match(struct image
*img
,
2389 struct image
*preimage
,
2390 struct image
*postimage
,
2391 unsigned long current
,
2398 size_t postlen
= postimage
->len
;
2403 struct strbuf fixed
;
2407 for (i
= 0; i
< preimage_limit
; i
++) {
2408 size_t prelen
= preimage
->line
[i
].len
;
2409 size_t imglen
= img
->line
[current_lno
+i
].len
;
2411 if (!fuzzy_matchlines(img
->buf
+ current
+ imgoff
, imglen
,
2412 preimage
->buf
+ preoff
, prelen
))
2414 if (preimage
->line
[i
].flag
& LINE_COMMON
)
2415 postlen
+= imglen
- prelen
;
2421 * Ok, the preimage matches with whitespace fuzz.
2423 * imgoff now holds the true length of the target that
2424 * matches the preimage before the end of the file.
2426 * Count the number of characters in the preimage that fall
2427 * beyond the end of the file and make sure that all of them
2428 * are whitespace characters. (This can only happen if
2429 * we are removing blank lines at the end of the file.)
2431 buf
= preimage_eof
= preimage
->buf
+ preoff
;
2432 for ( ; i
< preimage
->nr
; i
++)
2433 preoff
+= preimage
->line
[i
].len
;
2434 preimage_end
= preimage
->buf
+ preoff
;
2435 for ( ; buf
< preimage_end
; buf
++)
2440 * Update the preimage and the common postimage context
2441 * lines to use the same whitespace as the target.
2442 * If whitespace is missing in the target (i.e.
2443 * if the preimage extends beyond the end of the file),
2444 * use the whitespace from the preimage.
2446 extra_chars
= preimage_end
- preimage_eof
;
2447 strbuf_init(&fixed
, imgoff
+ extra_chars
);
2448 strbuf_add(&fixed
, img
->buf
+ current
, imgoff
);
2449 strbuf_add(&fixed
, preimage_eof
, extra_chars
);
2450 fixed_buf
= strbuf_detach(&fixed
, &fixed_len
);
2451 update_pre_post_images(preimage
, postimage
,
2452 fixed_buf
, fixed_len
, postlen
);
2456 static int match_fragment(struct apply_state
*state
,
2458 struct image
*preimage
,
2459 struct image
*postimage
,
2460 unsigned long current
,
2463 int match_beginning
, int match_end
)
2466 char *fixed_buf
, *buf
, *orig
, *target
;
2467 struct strbuf fixed
;
2468 size_t fixed_len
, postlen
;
2471 if (preimage
->nr
+ current_lno
<= img
->nr
) {
2473 * The hunk falls within the boundaries of img.
2475 preimage_limit
= preimage
->nr
;
2476 if (match_end
&& (preimage
->nr
+ current_lno
!= img
->nr
))
2478 } else if (state
->ws_error_action
== correct_ws_error
&&
2479 (ws_rule
& WS_BLANK_AT_EOF
)) {
2481 * This hunk extends beyond the end of img, and we are
2482 * removing blank lines at the end of the file. This
2483 * many lines from the beginning of the preimage must
2484 * match with img, and the remainder of the preimage
2487 preimage_limit
= img
->nr
- current_lno
;
2490 * The hunk extends beyond the end of the img and
2491 * we are not removing blanks at the end, so we
2492 * should reject the hunk at this position.
2497 if (match_beginning
&& current_lno
)
2500 /* Quick hash check */
2501 for (i
= 0; i
< preimage_limit
; i
++)
2502 if ((img
->line
[current_lno
+ i
].flag
& LINE_PATCHED
) ||
2503 (preimage
->line
[i
].hash
!= img
->line
[current_lno
+ i
].hash
))
2506 if (preimage_limit
== preimage
->nr
) {
2508 * Do we have an exact match? If we were told to match
2509 * at the end, size must be exactly at current+fragsize,
2510 * otherwise current+fragsize must be still within the preimage,
2511 * and either case, the old piece should match the preimage
2515 ? (current
+ preimage
->len
== img
->len
)
2516 : (current
+ preimage
->len
<= img
->len
)) &&
2517 !memcmp(img
->buf
+ current
, preimage
->buf
, preimage
->len
))
2521 * The preimage extends beyond the end of img, so
2522 * there cannot be an exact match.
2524 * There must be one non-blank context line that match
2525 * a line before the end of img.
2529 buf
= preimage
->buf
;
2531 for (i
= 0; i
< preimage_limit
; i
++)
2532 buf_end
+= preimage
->line
[i
].len
;
2534 for ( ; buf
< buf_end
; buf
++)
2542 * No exact match. If we are ignoring whitespace, run a line-by-line
2543 * fuzzy matching. We collect all the line length information because
2544 * we need it to adjust whitespace if we match.
2546 if (state
->ws_ignore_action
== ignore_ws_change
)
2547 return line_by_line_fuzzy_match(img
, preimage
, postimage
,
2548 current
, current_lno
, preimage_limit
);
2550 if (state
->ws_error_action
!= correct_ws_error
)
2554 * The hunk does not apply byte-by-byte, but the hash says
2555 * it might with whitespace fuzz. We weren't asked to
2556 * ignore whitespace, we were asked to correct whitespace
2557 * errors, so let's try matching after whitespace correction.
2559 * While checking the preimage against the target, whitespace
2560 * errors in both fixed, we count how large the corresponding
2561 * postimage needs to be. The postimage prepared by
2562 * apply_one_fragment() has whitespace errors fixed on added
2563 * lines already, but the common lines were propagated as-is,
2564 * which may become longer when their whitespace errors are
2568 /* First count added lines in postimage */
2570 for (i
= 0; i
< postimage
->nr
; i
++) {
2571 if (!(postimage
->line
[i
].flag
& LINE_COMMON
))
2572 postlen
+= postimage
->line
[i
].len
;
2576 * The preimage may extend beyond the end of the file,
2577 * but in this loop we will only handle the part of the
2578 * preimage that falls within the file.
2580 strbuf_init(&fixed
, preimage
->len
+ 1);
2581 orig
= preimage
->buf
;
2582 target
= img
->buf
+ current
;
2583 for (i
= 0; i
< preimage_limit
; i
++) {
2584 size_t oldlen
= preimage
->line
[i
].len
;
2585 size_t tgtlen
= img
->line
[current_lno
+ i
].len
;
2586 size_t fixstart
= fixed
.len
;
2587 struct strbuf tgtfix
;
2590 /* Try fixing the line in the preimage */
2591 ws_fix_copy(&fixed
, orig
, oldlen
, ws_rule
, NULL
);
2593 /* Try fixing the line in the target */
2594 strbuf_init(&tgtfix
, tgtlen
);
2595 ws_fix_copy(&tgtfix
, target
, tgtlen
, ws_rule
, NULL
);
2598 * If they match, either the preimage was based on
2599 * a version before our tree fixed whitespace breakage,
2600 * or we are lacking a whitespace-fix patch the tree
2601 * the preimage was based on already had (i.e. target
2602 * has whitespace breakage, the preimage doesn't).
2603 * In either case, we are fixing the whitespace breakages
2604 * so we might as well take the fix together with their
2607 match
= (tgtfix
.len
== fixed
.len
- fixstart
&&
2608 !memcmp(tgtfix
.buf
, fixed
.buf
+ fixstart
,
2609 fixed
.len
- fixstart
));
2611 /* Add the length if this is common with the postimage */
2612 if (preimage
->line
[i
].flag
& LINE_COMMON
)
2613 postlen
+= tgtfix
.len
;
2615 strbuf_release(&tgtfix
);
2625 * Now handle the lines in the preimage that falls beyond the
2626 * end of the file (if any). They will only match if they are
2627 * empty or only contain whitespace (if WS_BLANK_AT_EOL is
2630 for ( ; i
< preimage
->nr
; i
++) {
2631 size_t fixstart
= fixed
.len
; /* start of the fixed preimage */
2632 size_t oldlen
= preimage
->line
[i
].len
;
2635 /* Try fixing the line in the preimage */
2636 ws_fix_copy(&fixed
, orig
, oldlen
, ws_rule
, NULL
);
2638 for (j
= fixstart
; j
< fixed
.len
; j
++)
2639 if (!isspace(fixed
.buf
[j
]))
2646 * Yes, the preimage is based on an older version that still
2647 * has whitespace breakages unfixed, and fixing them makes the
2648 * hunk match. Update the context lines in the postimage.
2650 fixed_buf
= strbuf_detach(&fixed
, &fixed_len
);
2651 if (postlen
< postimage
->len
)
2653 update_pre_post_images(preimage
, postimage
,
2654 fixed_buf
, fixed_len
, postlen
);
2658 strbuf_release(&fixed
);
2662 static int find_pos(struct apply_state
*state
,
2664 struct image
*preimage
,
2665 struct image
*postimage
,
2668 int match_beginning
, int match_end
)
2671 unsigned long backwards
, forwards
, current
;
2672 int backwards_lno
, forwards_lno
, current_lno
;
2675 * If match_beginning or match_end is specified, there is no
2676 * point starting from a wrong line that will never match and
2677 * wander around and wait for a match at the specified end.
2679 if (match_beginning
)
2682 line
= img
->nr
- preimage
->nr
;
2685 * Because the comparison is unsigned, the following test
2686 * will also take care of a negative line number that can
2687 * result when match_end and preimage is larger than the target.
2689 if ((size_t) line
> img
->nr
)
2693 for (i
= 0; i
< line
; i
++)
2694 current
+= img
->line
[i
].len
;
2697 * There's probably some smart way to do this, but I'll leave
2698 * that to the smart and beautiful people. I'm simple and stupid.
2700 backwards
= current
;
2701 backwards_lno
= line
;
2703 forwards_lno
= line
;
2706 for (i
= 0; ; i
++) {
2707 if (match_fragment(state
, img
, preimage
, postimage
,
2708 current
, current_lno
, ws_rule
,
2709 match_beginning
, match_end
))
2713 if (backwards_lno
== 0 && forwards_lno
== img
->nr
)
2717 if (backwards_lno
== 0) {
2722 backwards
-= img
->line
[backwards_lno
].len
;
2723 current
= backwards
;
2724 current_lno
= backwards_lno
;
2726 if (forwards_lno
== img
->nr
) {
2730 forwards
+= img
->line
[forwards_lno
].len
;
2733 current_lno
= forwards_lno
;
2740 static void remove_first_line(struct image
*img
)
2742 img
->buf
+= img
->line
[0].len
;
2743 img
->len
-= img
->line
[0].len
;
2748 static void remove_last_line(struct image
*img
)
2750 img
->len
-= img
->line
[--img
->nr
].len
;
2754 * The change from "preimage" and "postimage" has been found to
2755 * apply at applied_pos (counts in line numbers) in "img".
2756 * Update "img" to remove "preimage" and replace it with "postimage".
2758 static void update_image(struct apply_state
*state
,
2761 struct image
*preimage
,
2762 struct image
*postimage
)
2765 * remove the copy of preimage at offset in img
2766 * and replace it with postimage
2769 size_t remove_count
, insert_count
, applied_at
= 0;
2774 * If we are removing blank lines at the end of img,
2775 * the preimage may extend beyond the end.
2776 * If that is the case, we must be careful only to
2777 * remove the part of the preimage that falls within
2778 * the boundaries of img. Initialize preimage_limit
2779 * to the number of lines in the preimage that falls
2780 * within the boundaries.
2782 preimage_limit
= preimage
->nr
;
2783 if (preimage_limit
> img
->nr
- applied_pos
)
2784 preimage_limit
= img
->nr
- applied_pos
;
2786 for (i
= 0; i
< applied_pos
; i
++)
2787 applied_at
+= img
->line
[i
].len
;
2790 for (i
= 0; i
< preimage_limit
; i
++)
2791 remove_count
+= img
->line
[applied_pos
+ i
].len
;
2792 insert_count
= postimage
->len
;
2794 /* Adjust the contents */
2795 result
= xmalloc(st_add3(st_sub(img
->len
, remove_count
), insert_count
, 1));
2796 memcpy(result
, img
->buf
, applied_at
);
2797 memcpy(result
+ applied_at
, postimage
->buf
, postimage
->len
);
2798 memcpy(result
+ applied_at
+ postimage
->len
,
2799 img
->buf
+ (applied_at
+ remove_count
),
2800 img
->len
- (applied_at
+ remove_count
));
2803 img
->len
+= insert_count
- remove_count
;
2804 result
[img
->len
] = '\0';
2806 /* Adjust the line table */
2807 nr
= img
->nr
+ postimage
->nr
- preimage_limit
;
2808 if (preimage_limit
< postimage
->nr
) {
2810 * NOTE: this knows that we never call remove_first_line()
2811 * on anything other than pre/post image.
2813 REALLOC_ARRAY(img
->line
, nr
);
2814 img
->line_allocated
= img
->line
;
2816 if (preimage_limit
!= postimage
->nr
)
2817 MOVE_ARRAY(img
->line
+ applied_pos
+ postimage
->nr
,
2818 img
->line
+ applied_pos
+ preimage_limit
,
2819 img
->nr
- (applied_pos
+ preimage_limit
));
2820 COPY_ARRAY(img
->line
+ applied_pos
, postimage
->line
, postimage
->nr
);
2821 if (!state
->allow_overlap
)
2822 for (i
= 0; i
< postimage
->nr
; i
++)
2823 img
->line
[applied_pos
+ i
].flag
|= LINE_PATCHED
;
2828 * Use the patch-hunk text in "frag" to prepare two images (preimage and
2829 * postimage) for the hunk. Find lines that match "preimage" in "img" and
2830 * replace the part of "img" with "postimage" text.
2832 static int apply_one_fragment(struct apply_state
*state
,
2833 struct image
*img
, struct fragment
*frag
,
2834 int inaccurate_eof
, unsigned ws_rule
,
2837 int match_beginning
, match_end
;
2838 const char *patch
= frag
->patch
;
2839 int size
= frag
->size
;
2840 char *old
, *oldlines
;
2841 struct strbuf newlines
;
2842 int new_blank_lines_at_end
= 0;
2843 int found_new_blank_lines_at_end
= 0;
2844 int hunk_linenr
= frag
->linenr
;
2845 unsigned long leading
, trailing
;
2846 int pos
, applied_pos
;
2847 struct image preimage
;
2848 struct image postimage
;
2850 memset(&preimage
, 0, sizeof(preimage
));
2851 memset(&postimage
, 0, sizeof(postimage
));
2852 oldlines
= xmalloc(size
);
2853 strbuf_init(&newlines
, size
);
2858 int len
= linelen(patch
, size
);
2860 int added_blank_line
= 0;
2861 int is_blank_context
= 0;
2868 * "plen" is how much of the line we should use for
2869 * the actual patch data. Normally we just remove the
2870 * first character on the line, but if the line is
2871 * followed by "\ No newline", then we also remove the
2872 * last one (which is the newline, of course).
2875 if (len
< size
&& patch
[len
] == '\\')
2878 if (state
->apply_in_reverse
) {
2881 else if (first
== '+')
2887 /* Newer GNU diff, empty context line */
2889 /* ... followed by '\No newline'; nothing */
2892 strbuf_addch(&newlines
, '\n');
2893 add_line_info(&preimage
, "\n", 1, LINE_COMMON
);
2894 add_line_info(&postimage
, "\n", 1, LINE_COMMON
);
2895 is_blank_context
= 1;
2898 if (plen
&& (ws_rule
& WS_BLANK_AT_EOF
) &&
2899 ws_blank_line(patch
+ 1, plen
, ws_rule
))
2900 is_blank_context
= 1;
2903 memcpy(old
, patch
+ 1, plen
);
2904 add_line_info(&preimage
, old
, plen
,
2905 (first
== ' ' ? LINE_COMMON
: 0));
2911 /* --no-add does not add new lines */
2912 if (first
== '+' && state
->no_add
)
2915 start
= newlines
.len
;
2917 !state
->whitespace_error
||
2918 state
->ws_error_action
!= correct_ws_error
) {
2919 strbuf_add(&newlines
, patch
+ 1, plen
);
2922 ws_fix_copy(&newlines
, patch
+ 1, plen
, ws_rule
, &state
->applied_after_fixing_ws
);
2924 add_line_info(&postimage
, newlines
.buf
+ start
, newlines
.len
- start
,
2925 (first
== '+' ? 0 : LINE_COMMON
));
2927 (ws_rule
& WS_BLANK_AT_EOF
) &&
2928 ws_blank_line(patch
+ 1, plen
, ws_rule
))
2929 added_blank_line
= 1;
2931 case '@': case '\\':
2932 /* Ignore it, we already handled it */
2935 if (state
->apply_verbosity
> verbosity_normal
)
2936 error(_("invalid start of line: '%c'"), first
);
2940 if (added_blank_line
) {
2941 if (!new_blank_lines_at_end
)
2942 found_new_blank_lines_at_end
= hunk_linenr
;
2943 new_blank_lines_at_end
++;
2945 else if (is_blank_context
)
2948 new_blank_lines_at_end
= 0;
2953 if (inaccurate_eof
&&
2954 old
> oldlines
&& old
[-1] == '\n' &&
2955 newlines
.len
> 0 && newlines
.buf
[newlines
.len
- 1] == '\n') {
2957 strbuf_setlen(&newlines
, newlines
.len
- 1);
2958 preimage
.line_allocated
[preimage
.nr
- 1].len
--;
2959 postimage
.line_allocated
[postimage
.nr
- 1].len
--;
2962 leading
= frag
->leading
;
2963 trailing
= frag
->trailing
;
2966 * A hunk to change lines at the beginning would begin with
2968 * but we need to be careful. -U0 that inserts before the second
2969 * line also has this pattern.
2971 * And a hunk to add to an empty file would begin with
2974 * In other words, a hunk that is (frag->oldpos <= 1) with or
2975 * without leading context must match at the beginning.
2977 match_beginning
= (!frag
->oldpos
||
2978 (frag
->oldpos
== 1 && !state
->unidiff_zero
));
2981 * A hunk without trailing lines must match at the end.
2982 * However, we simply cannot tell if a hunk must match end
2983 * from the lack of trailing lines if the patch was generated
2984 * with unidiff without any context.
2986 match_end
= !state
->unidiff_zero
&& !trailing
;
2988 pos
= frag
->newpos
? (frag
->newpos
- 1) : 0;
2989 preimage
.buf
= oldlines
;
2990 preimage
.len
= old
- oldlines
;
2991 postimage
.buf
= newlines
.buf
;
2992 postimage
.len
= newlines
.len
;
2993 preimage
.line
= preimage
.line_allocated
;
2994 postimage
.line
= postimage
.line_allocated
;
2998 applied_pos
= find_pos(state
, img
, &preimage
, &postimage
, pos
,
2999 ws_rule
, match_beginning
, match_end
);
3001 if (applied_pos
>= 0)
3004 /* Am I at my context limits? */
3005 if ((leading
<= state
->p_context
) && (trailing
<= state
->p_context
))
3007 if (match_beginning
|| match_end
) {
3008 match_beginning
= match_end
= 0;
3013 * Reduce the number of context lines; reduce both
3014 * leading and trailing if they are equal otherwise
3015 * just reduce the larger context.
3017 if (leading
>= trailing
) {
3018 remove_first_line(&preimage
);
3019 remove_first_line(&postimage
);
3023 if (trailing
> leading
) {
3024 remove_last_line(&preimage
);
3025 remove_last_line(&postimage
);
3030 if (applied_pos
>= 0) {
3031 if (new_blank_lines_at_end
&&
3032 preimage
.nr
+ applied_pos
>= img
->nr
&&
3033 (ws_rule
& WS_BLANK_AT_EOF
) &&
3034 state
->ws_error_action
!= nowarn_ws_error
) {
3035 record_ws_error(state
, WS_BLANK_AT_EOF
, "+", 1,
3036 found_new_blank_lines_at_end
);
3037 if (state
->ws_error_action
== correct_ws_error
) {
3038 while (new_blank_lines_at_end
--)
3039 remove_last_line(&postimage
);
3042 * We would want to prevent write_out_results()
3043 * from taking place in apply_patch() that follows
3044 * the callchain led us here, which is:
3045 * apply_patch->check_patch_list->check_patch->
3046 * apply_data->apply_fragments->apply_one_fragment
3048 if (state
->ws_error_action
== die_on_ws_error
)
3052 if (state
->apply_verbosity
> verbosity_normal
&& applied_pos
!= pos
) {
3053 int offset
= applied_pos
- pos
;
3054 if (state
->apply_in_reverse
)
3055 offset
= 0 - offset
;
3057 Q_("Hunk #%d succeeded at %d (offset %d line).",
3058 "Hunk #%d succeeded at %d (offset %d lines).",
3060 nth_fragment
, applied_pos
+ 1, offset
);
3064 * Warn if it was necessary to reduce the number
3067 if ((leading
!= frag
->leading
||
3068 trailing
!= frag
->trailing
) && state
->apply_verbosity
> verbosity_silent
)
3069 fprintf_ln(stderr
, _("Context reduced to (%ld/%ld)"
3070 " to apply fragment at %d"),
3071 leading
, trailing
, applied_pos
+1);
3072 update_image(state
, img
, applied_pos
, &preimage
, &postimage
);
3074 if (state
->apply_verbosity
> verbosity_normal
)
3075 error(_("while searching for:\n%.*s"),
3076 (int)(old
- oldlines
), oldlines
);
3081 strbuf_release(&newlines
);
3082 free(preimage
.line_allocated
);
3083 free(postimage
.line_allocated
);
3085 return (applied_pos
< 0);
3088 static int apply_binary_fragment(struct apply_state
*state
,
3090 struct patch
*patch
)
3092 struct fragment
*fragment
= patch
->fragments
;
3097 return error(_("missing binary patch data for '%s'"),
3102 /* Binary patch is irreversible without the optional second hunk */
3103 if (state
->apply_in_reverse
) {
3104 if (!fragment
->next
)
3105 return error(_("cannot reverse-apply a binary patch "
3106 "without the reverse hunk to '%s'"),
3108 ? patch
->new_name
: patch
->old_name
);
3109 fragment
= fragment
->next
;
3111 switch (fragment
->binary_patch_method
) {
3112 case BINARY_DELTA_DEFLATED
:
3113 dst
= patch_delta(img
->buf
, img
->len
, fragment
->patch
,
3114 fragment
->size
, &len
);
3121 case BINARY_LITERAL_DEFLATED
:
3123 img
->len
= fragment
->size
;
3124 img
->buf
= xmemdupz(fragment
->patch
, img
->len
);
3131 * Replace "img" with the result of applying the binary patch.
3132 * The binary patch data itself in patch->fragment is still kept
3133 * but the preimage prepared by the caller in "img" is freed here
3134 * or in the helper function apply_binary_fragment() this calls.
3136 static int apply_binary(struct apply_state
*state
,
3138 struct patch
*patch
)
3140 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
3141 struct object_id oid
;
3144 * For safety, we require patch index line to contain
3145 * full 40-byte textual SHA1 for old and new, at least for now.
3147 if (strlen(patch
->old_sha1_prefix
) != 40 ||
3148 strlen(patch
->new_sha1_prefix
) != 40 ||
3149 get_oid_hex(patch
->old_sha1_prefix
, &oid
) ||
3150 get_oid_hex(patch
->new_sha1_prefix
, &oid
))
3151 return error(_("cannot apply binary patch to '%s' "
3152 "without full index line"), name
);
3154 if (patch
->old_name
) {
3156 * See if the old one matches what the patch
3159 hash_object_file(img
->buf
, img
->len
, blob_type
, &oid
);
3160 if (strcmp(oid_to_hex(&oid
), patch
->old_sha1_prefix
))
3161 return error(_("the patch applies to '%s' (%s), "
3162 "which does not match the "
3163 "current contents."),
3164 name
, oid_to_hex(&oid
));
3167 /* Otherwise, the old one must be empty. */
3169 return error(_("the patch applies to an empty "
3170 "'%s' but it is not empty"), name
);
3173 get_oid_hex(patch
->new_sha1_prefix
, &oid
);
3174 if (is_null_oid(&oid
)) {
3176 return 0; /* deletion patch */
3179 if (has_sha1_file(oid
.hash
)) {
3180 /* We already have the postimage */
3181 enum object_type type
;
3185 result
= read_object_file(&oid
, &type
, &size
);
3187 return error(_("the necessary postimage %s for "
3188 "'%s' cannot be read"),
3189 patch
->new_sha1_prefix
, name
);
3195 * We have verified buf matches the preimage;
3196 * apply the patch data to it, which is stored
3197 * in the patch->fragments->{patch,size}.
3199 if (apply_binary_fragment(state
, img
, patch
))
3200 return error(_("binary patch does not apply to '%s'"),
3203 /* verify that the result matches */
3204 hash_object_file(img
->buf
, img
->len
, blob_type
, &oid
);
3205 if (strcmp(oid_to_hex(&oid
), patch
->new_sha1_prefix
))
3206 return error(_("binary patch to '%s' creates incorrect result (expecting %s, got %s)"),
3207 name
, patch
->new_sha1_prefix
, oid_to_hex(&oid
));
3213 static int apply_fragments(struct apply_state
*state
, struct image
*img
, struct patch
*patch
)
3215 struct fragment
*frag
= patch
->fragments
;
3216 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
3217 unsigned ws_rule
= patch
->ws_rule
;
3218 unsigned inaccurate_eof
= patch
->inaccurate_eof
;
3221 if (patch
->is_binary
)
3222 return apply_binary(state
, img
, patch
);
3226 if (apply_one_fragment(state
, img
, frag
, inaccurate_eof
, ws_rule
, nth
)) {
3227 error(_("patch failed: %s:%ld"), name
, frag
->oldpos
);
3228 if (!state
->apply_with_reject
)
3237 static int read_blob_object(struct strbuf
*buf
, const struct object_id
*oid
, unsigned mode
)
3239 if (S_ISGITLINK(mode
)) {
3240 strbuf_grow(buf
, 100);
3241 strbuf_addf(buf
, "Subproject commit %s\n", oid_to_hex(oid
));
3243 enum object_type type
;
3247 result
= read_object_file(oid
, &type
, &sz
);
3250 /* XXX read_sha1_file NUL-terminates */
3251 strbuf_attach(buf
, result
, sz
, sz
+ 1);
3256 static int read_file_or_gitlink(const struct cache_entry
*ce
, struct strbuf
*buf
)
3260 return read_blob_object(buf
, &ce
->oid
, ce
->ce_mode
);
3263 static struct patch
*in_fn_table(struct apply_state
*state
, const char *name
)
3265 struct string_list_item
*item
;
3270 item
= string_list_lookup(&state
->fn_table
, name
);
3272 return (struct patch
*)item
->util
;
3278 * item->util in the filename table records the status of the path.
3279 * Usually it points at a patch (whose result records the contents
3280 * of it after applying it), but it could be PATH_WAS_DELETED for a
3281 * path that a previously applied patch has already removed, or
3282 * PATH_TO_BE_DELETED for a path that a later patch would remove.
3284 * The latter is needed to deal with a case where two paths A and B
3285 * are swapped by first renaming A to B and then renaming B to A;
3286 * moving A to B should not be prevented due to presence of B as we
3287 * will remove it in a later patch.
3289 #define PATH_TO_BE_DELETED ((struct patch *) -2)
3290 #define PATH_WAS_DELETED ((struct patch *) -1)
3292 static int to_be_deleted(struct patch
*patch
)
3294 return patch
== PATH_TO_BE_DELETED
;
3297 static int was_deleted(struct patch
*patch
)
3299 return patch
== PATH_WAS_DELETED
;
3302 static void add_to_fn_table(struct apply_state
*state
, struct patch
*patch
)
3304 struct string_list_item
*item
;
3307 * Always add new_name unless patch is a deletion
3308 * This should cover the cases for normal diffs,
3309 * file creations and copies
3311 if (patch
->new_name
!= NULL
) {
3312 item
= string_list_insert(&state
->fn_table
, patch
->new_name
);
3317 * store a failure on rename/deletion cases because
3318 * later chunks shouldn't patch old names
3320 if ((patch
->new_name
== NULL
) || (patch
->is_rename
)) {
3321 item
= string_list_insert(&state
->fn_table
, patch
->old_name
);
3322 item
->util
= PATH_WAS_DELETED
;
3326 static void prepare_fn_table(struct apply_state
*state
, struct patch
*patch
)
3329 * store information about incoming file deletion
3332 if ((patch
->new_name
== NULL
) || (patch
->is_rename
)) {
3333 struct string_list_item
*item
;
3334 item
= string_list_insert(&state
->fn_table
, patch
->old_name
);
3335 item
->util
= PATH_TO_BE_DELETED
;
3337 patch
= patch
->next
;
3341 static int checkout_target(struct index_state
*istate
,
3342 struct cache_entry
*ce
, struct stat
*st
)
3344 struct checkout costate
= CHECKOUT_INIT
;
3346 costate
.refresh_cache
= 1;
3347 costate
.istate
= istate
;
3348 if (checkout_entry(ce
, &costate
, NULL
) || lstat(ce
->name
, st
))
3349 return error(_("cannot checkout %s"), ce
->name
);
3353 static struct patch
*previous_patch(struct apply_state
*state
,
3354 struct patch
*patch
,
3357 struct patch
*previous
;
3360 if (patch
->is_copy
|| patch
->is_rename
)
3361 return NULL
; /* "git" patches do not depend on the order */
3363 previous
= in_fn_table(state
, patch
->old_name
);
3367 if (to_be_deleted(previous
))
3368 return NULL
; /* the deletion hasn't happened yet */
3370 if (was_deleted(previous
))
3376 static int verify_index_match(const struct cache_entry
*ce
, struct stat
*st
)
3378 if (S_ISGITLINK(ce
->ce_mode
)) {
3379 if (!S_ISDIR(st
->st_mode
))
3383 return ce_match_stat(ce
, st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
);
3386 #define SUBMODULE_PATCH_WITHOUT_INDEX 1
3388 static int load_patch_target(struct apply_state
*state
,
3390 const struct cache_entry
*ce
,
3392 struct patch
*patch
,
3394 unsigned expected_mode
)
3396 if (state
->cached
|| state
->check_index
) {
3397 if (read_file_or_gitlink(ce
, buf
))
3398 return error(_("failed to read %s"), name
);
3400 if (S_ISGITLINK(expected_mode
)) {
3402 return read_file_or_gitlink(ce
, buf
);
3404 return SUBMODULE_PATCH_WITHOUT_INDEX
;
3405 } else if (has_symlink_leading_path(name
, strlen(name
))) {
3406 return error(_("reading from '%s' beyond a symbolic link"), name
);
3408 if (read_old_data(st
, patch
, name
, buf
))
3409 return error(_("failed to read %s"), name
);
3416 * We are about to apply "patch"; populate the "image" with the
3417 * current version we have, from the working tree or from the index,
3418 * depending on the situation e.g. --cached/--index. If we are
3419 * applying a non-git patch that incrementally updates the tree,
3420 * we read from the result of a previous diff.
3422 static int load_preimage(struct apply_state
*state
,
3423 struct image
*image
,
3424 struct patch
*patch
, struct stat
*st
,
3425 const struct cache_entry
*ce
)
3427 struct strbuf buf
= STRBUF_INIT
;
3430 struct patch
*previous
;
3433 previous
= previous_patch(state
, patch
, &status
);
3435 return error(_("path %s has been renamed/deleted"),
3438 /* We have a patched copy in memory; use that. */
3439 strbuf_add(&buf
, previous
->result
, previous
->resultsize
);
3441 status
= load_patch_target(state
, &buf
, ce
, st
, patch
,
3442 patch
->old_name
, patch
->old_mode
);
3445 else if (status
== SUBMODULE_PATCH_WITHOUT_INDEX
) {
3447 * There is no way to apply subproject
3448 * patch without looking at the index.
3449 * NEEDSWORK: shouldn't this be flagged
3452 free_fragment_list(patch
->fragments
);
3453 patch
->fragments
= NULL
;
3454 } else if (status
) {
3455 return error(_("failed to read %s"), patch
->old_name
);
3459 img
= strbuf_detach(&buf
, &len
);
3460 prepare_image(image
, img
, len
, !patch
->is_binary
);
3464 static int three_way_merge(struct image
*image
,
3466 const struct object_id
*base
,
3467 const struct object_id
*ours
,
3468 const struct object_id
*theirs
)
3470 mmfile_t base_file
, our_file
, their_file
;
3471 mmbuffer_t result
= { NULL
};
3474 read_mmblob(&base_file
, base
);
3475 read_mmblob(&our_file
, ours
);
3476 read_mmblob(&their_file
, theirs
);
3477 status
= ll_merge(&result
, path
,
3480 &their_file
, "theirs", NULL
);
3481 free(base_file
.ptr
);
3483 free(their_file
.ptr
);
3484 if (status
< 0 || !result
.ptr
) {
3489 image
->buf
= result
.ptr
;
3490 image
->len
= result
.size
;
3496 * When directly falling back to add/add three-way merge, we read from
3497 * the current contents of the new_name. In no cases other than that
3498 * this function will be called.
3500 static int load_current(struct apply_state
*state
,
3501 struct image
*image
,
3502 struct patch
*patch
)
3504 struct strbuf buf
= STRBUF_INIT
;
3509 struct cache_entry
*ce
;
3510 char *name
= patch
->new_name
;
3511 unsigned mode
= patch
->new_mode
;
3514 BUG("patch to %s is not a creation", patch
->old_name
);
3516 pos
= cache_name_pos(name
, strlen(name
));
3518 return error(_("%s: does not exist in index"), name
);
3519 ce
= active_cache
[pos
];
3520 if (lstat(name
, &st
)) {
3521 if (errno
!= ENOENT
)
3522 return error_errno("%s", name
);
3523 if (checkout_target(&the_index
, ce
, &st
))
3526 if (verify_index_match(ce
, &st
))
3527 return error(_("%s: does not match index"), name
);
3529 status
= load_patch_target(state
, &buf
, ce
, &st
, patch
, name
, mode
);
3534 img
= strbuf_detach(&buf
, &len
);
3535 prepare_image(image
, img
, len
, !patch
->is_binary
);
3539 static int try_threeway(struct apply_state
*state
,
3540 struct image
*image
,
3541 struct patch
*patch
,
3543 const struct cache_entry
*ce
)
3545 struct object_id pre_oid
, post_oid
, our_oid
;
3546 struct strbuf buf
= STRBUF_INIT
;
3550 struct image tmp_image
;
3552 /* No point falling back to 3-way merge in these cases */
3553 if (patch
->is_delete
||
3554 S_ISGITLINK(patch
->old_mode
) || S_ISGITLINK(patch
->new_mode
))
3557 /* Preimage the patch was prepared for */
3559 write_object_file("", 0, blob_type
, &pre_oid
);
3560 else if (get_oid(patch
->old_sha1_prefix
, &pre_oid
) ||
3561 read_blob_object(&buf
, &pre_oid
, patch
->old_mode
))
3562 return error(_("repository lacks the necessary blob to fall back on 3-way merge."));
3564 if (state
->apply_verbosity
> verbosity_silent
)
3565 fprintf(stderr
, _("Falling back to three-way merge...\n"));
3567 img
= strbuf_detach(&buf
, &len
);
3568 prepare_image(&tmp_image
, img
, len
, 1);
3569 /* Apply the patch to get the post image */
3570 if (apply_fragments(state
, &tmp_image
, patch
) < 0) {
3571 clear_image(&tmp_image
);
3574 /* post_oid is theirs */
3575 write_object_file(tmp_image
.buf
, tmp_image
.len
, blob_type
, &post_oid
);
3576 clear_image(&tmp_image
);
3578 /* our_oid is ours */
3579 if (patch
->is_new
) {
3580 if (load_current(state
, &tmp_image
, patch
))
3581 return error(_("cannot read the current contents of '%s'"),
3584 if (load_preimage(state
, &tmp_image
, patch
, st
, ce
))
3585 return error(_("cannot read the current contents of '%s'"),
3588 write_object_file(tmp_image
.buf
, tmp_image
.len
, blob_type
, &our_oid
);
3589 clear_image(&tmp_image
);
3591 /* in-core three-way merge between post and our using pre as base */
3592 status
= three_way_merge(image
, patch
->new_name
,
3593 &pre_oid
, &our_oid
, &post_oid
);
3595 if (state
->apply_verbosity
> verbosity_silent
)
3597 _("Failed to fall back on three-way merge...\n"));
3602 patch
->conflicted_threeway
= 1;
3604 oidclr(&patch
->threeway_stage
[0]);
3606 oidcpy(&patch
->threeway_stage
[0], &pre_oid
);
3607 oidcpy(&patch
->threeway_stage
[1], &our_oid
);
3608 oidcpy(&patch
->threeway_stage
[2], &post_oid
);
3609 if (state
->apply_verbosity
> verbosity_silent
)
3611 _("Applied patch to '%s' with conflicts.\n"),
3614 if (state
->apply_verbosity
> verbosity_silent
)
3616 _("Applied patch to '%s' cleanly.\n"),
3622 static int apply_data(struct apply_state
*state
, struct patch
*patch
,
3623 struct stat
*st
, const struct cache_entry
*ce
)
3627 if (load_preimage(state
, &image
, patch
, st
, ce
) < 0)
3630 if (patch
->direct_to_threeway
||
3631 apply_fragments(state
, &image
, patch
) < 0) {
3632 /* Note: with --reject, apply_fragments() returns 0 */
3633 if (!state
->threeway
|| try_threeway(state
, &image
, patch
, st
, ce
) < 0)
3636 patch
->result
= image
.buf
;
3637 patch
->resultsize
= image
.len
;
3638 add_to_fn_table(state
, patch
);
3639 free(image
.line_allocated
);
3641 if (0 < patch
->is_delete
&& patch
->resultsize
)
3642 return error(_("removal patch leaves file contents"));
3648 * If "patch" that we are looking at modifies or deletes what we have,
3649 * we would want it not to lose any local modification we have, either
3650 * in the working tree or in the index.
3652 * This also decides if a non-git patch is a creation patch or a
3653 * modification to an existing empty file. We do not check the state
3654 * of the current tree for a creation patch in this function; the caller
3655 * check_patch() separately makes sure (and errors out otherwise) that
3656 * the path the patch creates does not exist in the current tree.
3658 static int check_preimage(struct apply_state
*state
,
3659 struct patch
*patch
,
3660 struct cache_entry
**ce
,
3663 const char *old_name
= patch
->old_name
;
3664 struct patch
*previous
= NULL
;
3665 int stat_ret
= 0, status
;
3666 unsigned st_mode
= 0;
3671 assert(patch
->is_new
<= 0);
3672 previous
= previous_patch(state
, patch
, &status
);
3675 return error(_("path %s has been renamed/deleted"), old_name
);
3677 st_mode
= previous
->new_mode
;
3678 } else if (!state
->cached
) {
3679 stat_ret
= lstat(old_name
, st
);
3680 if (stat_ret
&& errno
!= ENOENT
)
3681 return error_errno("%s", old_name
);
3684 if (state
->check_index
&& !previous
) {
3685 int pos
= cache_name_pos(old_name
, strlen(old_name
));
3687 if (patch
->is_new
< 0)
3689 return error(_("%s: does not exist in index"), old_name
);
3691 *ce
= active_cache
[pos
];
3693 if (checkout_target(&the_index
, *ce
, st
))
3696 if (!state
->cached
&& verify_index_match(*ce
, st
))
3697 return error(_("%s: does not match index"), old_name
);
3699 st_mode
= (*ce
)->ce_mode
;
3700 } else if (stat_ret
< 0) {
3701 if (patch
->is_new
< 0)
3703 return error_errno("%s", old_name
);
3706 if (!state
->cached
&& !previous
)
3707 st_mode
= ce_mode_from_stat(*ce
, st
->st_mode
);
3709 if (patch
->is_new
< 0)
3711 if (!patch
->old_mode
)
3712 patch
->old_mode
= st_mode
;
3713 if ((st_mode
^ patch
->old_mode
) & S_IFMT
)
3714 return error(_("%s: wrong type"), old_name
);
3715 if (st_mode
!= patch
->old_mode
)
3716 warning(_("%s has type %o, expected %o"),
3717 old_name
, st_mode
, patch
->old_mode
);
3718 if (!patch
->new_mode
&& !patch
->is_delete
)
3719 patch
->new_mode
= st_mode
;
3724 patch
->is_delete
= 0;
3725 FREE_AND_NULL(patch
->old_name
);
3730 #define EXISTS_IN_INDEX 1
3731 #define EXISTS_IN_WORKTREE 2
3733 static int check_to_create(struct apply_state
*state
,
3734 const char *new_name
,
3739 if (state
->check_index
&&
3740 cache_name_pos(new_name
, strlen(new_name
)) >= 0 &&
3742 return EXISTS_IN_INDEX
;
3746 if (!lstat(new_name
, &nst
)) {
3747 if (S_ISDIR(nst
.st_mode
) || ok_if_exists
)
3750 * A leading component of new_name might be a symlink
3751 * that is going to be removed with this patch, but
3752 * still pointing at somewhere that has the path.
3753 * In such a case, path "new_name" does not exist as
3754 * far as git is concerned.
3756 if (has_symlink_leading_path(new_name
, strlen(new_name
)))
3759 return EXISTS_IN_WORKTREE
;
3760 } else if (!is_missing_file_error(errno
)) {
3761 return error_errno("%s", new_name
);
3766 static uintptr_t register_symlink_changes(struct apply_state
*state
,
3770 struct string_list_item
*ent
;
3772 ent
= string_list_lookup(&state
->symlink_changes
, path
);
3774 ent
= string_list_insert(&state
->symlink_changes
, path
);
3775 ent
->util
= (void *)0;
3777 ent
->util
= (void *)(what
| ((uintptr_t)ent
->util
));
3778 return (uintptr_t)ent
->util
;
3781 static uintptr_t check_symlink_changes(struct apply_state
*state
, const char *path
)
3783 struct string_list_item
*ent
;
3785 ent
= string_list_lookup(&state
->symlink_changes
, path
);
3788 return (uintptr_t)ent
->util
;
3791 static void prepare_symlink_changes(struct apply_state
*state
, struct patch
*patch
)
3793 for ( ; patch
; patch
= patch
->next
) {
3794 if ((patch
->old_name
&& S_ISLNK(patch
->old_mode
)) &&
3795 (patch
->is_rename
|| patch
->is_delete
))
3796 /* the symlink at patch->old_name is removed */
3797 register_symlink_changes(state
, patch
->old_name
, APPLY_SYMLINK_GOES_AWAY
);
3799 if (patch
->new_name
&& S_ISLNK(patch
->new_mode
))
3800 /* the symlink at patch->new_name is created or remains */
3801 register_symlink_changes(state
, patch
->new_name
, APPLY_SYMLINK_IN_RESULT
);
3805 static int path_is_beyond_symlink_1(struct apply_state
*state
, struct strbuf
*name
)
3808 unsigned int change
;
3810 while (--name
->len
&& name
->buf
[name
->len
] != '/')
3811 ; /* scan backwards */
3814 name
->buf
[name
->len
] = '\0';
3815 change
= check_symlink_changes(state
, name
->buf
);
3816 if (change
& APPLY_SYMLINK_IN_RESULT
)
3818 if (change
& APPLY_SYMLINK_GOES_AWAY
)
3820 * This cannot be "return 0", because we may
3821 * see a new one created at a higher level.
3825 /* otherwise, check the preimage */
3826 if (state
->check_index
) {
3827 struct cache_entry
*ce
;
3829 ce
= cache_file_exists(name
->buf
, name
->len
, ignore_case
);
3830 if (ce
&& S_ISLNK(ce
->ce_mode
))
3834 if (!lstat(name
->buf
, &st
) && S_ISLNK(st
.st_mode
))
3841 static int path_is_beyond_symlink(struct apply_state
*state
, const char *name_
)
3844 struct strbuf name
= STRBUF_INIT
;
3846 assert(*name_
!= '\0');
3847 strbuf_addstr(&name
, name_
);
3848 ret
= path_is_beyond_symlink_1(state
, &name
);
3849 strbuf_release(&name
);
3854 static int check_unsafe_path(struct patch
*patch
)
3856 const char *old_name
= NULL
;
3857 const char *new_name
= NULL
;
3858 if (patch
->is_delete
)
3859 old_name
= patch
->old_name
;
3860 else if (!patch
->is_new
&& !patch
->is_copy
)
3861 old_name
= patch
->old_name
;
3862 if (!patch
->is_delete
)
3863 new_name
= patch
->new_name
;
3865 if (old_name
&& !verify_path(old_name
, patch
->old_mode
))
3866 return error(_("invalid path '%s'"), old_name
);
3867 if (new_name
&& !verify_path(new_name
, patch
->new_mode
))
3868 return error(_("invalid path '%s'"), new_name
);
3873 * Check and apply the patch in-core; leave the result in patch->result
3874 * for the caller to write it out to the final destination.
3876 static int check_patch(struct apply_state
*state
, struct patch
*patch
)
3879 const char *old_name
= patch
->old_name
;
3880 const char *new_name
= patch
->new_name
;
3881 const char *name
= old_name
? old_name
: new_name
;
3882 struct cache_entry
*ce
= NULL
;
3883 struct patch
*tpatch
;
3887 patch
->rejected
= 1; /* we will drop this after we succeed */
3889 status
= check_preimage(state
, patch
, &ce
, &st
);
3892 old_name
= patch
->old_name
;
3895 * A type-change diff is always split into a patch to delete
3896 * old, immediately followed by a patch to create new (see
3897 * diff.c::run_diff()); in such a case it is Ok that the entry
3898 * to be deleted by the previous patch is still in the working
3899 * tree and in the index.
3901 * A patch to swap-rename between A and B would first rename A
3902 * to B and then rename B to A. While applying the first one,
3903 * the presence of B should not stop A from getting renamed to
3904 * B; ask to_be_deleted() about the later rename. Removal of
3905 * B and rename from A to B is handled the same way by asking
3908 if ((tpatch
= in_fn_table(state
, new_name
)) &&
3909 (was_deleted(tpatch
) || to_be_deleted(tpatch
)))
3915 ((0 < patch
->is_new
) || patch
->is_rename
|| patch
->is_copy
)) {
3916 int err
= check_to_create(state
, new_name
, ok_if_exists
);
3918 if (err
&& state
->threeway
) {
3919 patch
->direct_to_threeway
= 1;
3920 } else switch (err
) {
3923 case EXISTS_IN_INDEX
:
3924 return error(_("%s: already exists in index"), new_name
);
3926 case EXISTS_IN_WORKTREE
:
3927 return error(_("%s: already exists in working directory"),
3933 if (!patch
->new_mode
) {
3934 if (0 < patch
->is_new
)
3935 patch
->new_mode
= S_IFREG
| 0644;
3937 patch
->new_mode
= patch
->old_mode
;
3941 if (new_name
&& old_name
) {
3942 int same
= !strcmp(old_name
, new_name
);
3943 if (!patch
->new_mode
)
3944 patch
->new_mode
= patch
->old_mode
;
3945 if ((patch
->old_mode
^ patch
->new_mode
) & S_IFMT
) {
3947 return error(_("new mode (%o) of %s does not "
3948 "match old mode (%o)"),
3949 patch
->new_mode
, new_name
,
3952 return error(_("new mode (%o) of %s does not "
3953 "match old mode (%o) of %s"),
3954 patch
->new_mode
, new_name
,
3955 patch
->old_mode
, old_name
);
3959 if (!state
->unsafe_paths
&& check_unsafe_path(patch
))
3963 * An attempt to read from or delete a path that is beyond a
3964 * symbolic link will be prevented by load_patch_target() that
3965 * is called at the beginning of apply_data() so we do not
3966 * have to worry about a patch marked with "is_delete" bit
3967 * here. We however need to make sure that the patch result
3968 * is not deposited to a path that is beyond a symbolic link
3971 if (!patch
->is_delete
&& path_is_beyond_symlink(state
, patch
->new_name
))
3972 return error(_("affected file '%s' is beyond a symbolic link"),
3975 if (apply_data(state
, patch
, &st
, ce
) < 0)
3976 return error(_("%s: patch does not apply"), name
);
3977 patch
->rejected
= 0;
3981 static int check_patch_list(struct apply_state
*state
, struct patch
*patch
)
3985 prepare_symlink_changes(state
, patch
);
3986 prepare_fn_table(state
, patch
);
3989 if (state
->apply_verbosity
> verbosity_normal
)
3990 say_patch_name(stderr
,
3991 _("Checking patch %s..."), patch
);
3992 res
= check_patch(state
, patch
);
3996 patch
= patch
->next
;
4001 static int read_apply_cache(struct apply_state
*state
)
4003 if (state
->index_file
)
4004 return read_cache_from(state
->index_file
);
4006 return read_cache();
4009 /* This function tries to read the object name from the current index */
4010 static int get_current_oid(struct apply_state
*state
, const char *path
,
4011 struct object_id
*oid
)
4015 if (read_apply_cache(state
) < 0)
4017 pos
= cache_name_pos(path
, strlen(path
));
4020 oidcpy(oid
, &active_cache
[pos
]->oid
);
4024 static int preimage_oid_in_gitlink_patch(struct patch
*p
, struct object_id
*oid
)
4027 * A usable gitlink patch has only one fragment (hunk) that looks like:
4029 * -Subproject commit <old sha1>
4030 * +Subproject commit <new sha1>
4033 * -Subproject commit <old sha1>
4034 * for a removal patch.
4036 struct fragment
*hunk
= p
->fragments
;
4037 static const char heading
[] = "-Subproject commit ";
4040 if (/* does the patch have only one hunk? */
4041 hunk
&& !hunk
->next
&&
4042 /* is its preimage one line? */
4043 hunk
->oldpos
== 1 && hunk
->oldlines
== 1 &&
4044 /* does preimage begin with the heading? */
4045 (preimage
= memchr(hunk
->patch
, '\n', hunk
->size
)) != NULL
&&
4046 starts_with(++preimage
, heading
) &&
4047 /* does it record full SHA-1? */
4048 !get_oid_hex(preimage
+ sizeof(heading
) - 1, oid
) &&
4049 preimage
[sizeof(heading
) + GIT_SHA1_HEXSZ
- 1] == '\n' &&
4050 /* does the abbreviated name on the index line agree with it? */
4051 starts_with(preimage
+ sizeof(heading
) - 1, p
->old_sha1_prefix
))
4052 return 0; /* it all looks fine */
4054 /* we may have full object name on the index line */
4055 return get_oid_hex(p
->old_sha1_prefix
, oid
);
4058 /* Build an index that contains the just the files needed for a 3way merge */
4059 static int build_fake_ancestor(struct apply_state
*state
, struct patch
*list
)
4061 struct patch
*patch
;
4062 struct index_state result
= { NULL
};
4063 struct lock_file lock
= LOCK_INIT
;
4066 /* Once we start supporting the reverse patch, it may be
4067 * worth showing the new sha1 prefix, but until then...
4069 for (patch
= list
; patch
; patch
= patch
->next
) {
4070 struct object_id oid
;
4071 struct cache_entry
*ce
;
4074 name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
4075 if (0 < patch
->is_new
)
4078 if (S_ISGITLINK(patch
->old_mode
)) {
4079 if (!preimage_oid_in_gitlink_patch(patch
, &oid
))
4080 ; /* ok, the textual part looks sane */
4082 return error(_("sha1 information is lacking or "
4083 "useless for submodule %s"), name
);
4084 } else if (!get_oid_blob(patch
->old_sha1_prefix
, &oid
)) {
4086 } else if (!patch
->lines_added
&& !patch
->lines_deleted
) {
4087 /* mode-only change: update the current */
4088 if (get_current_oid(state
, patch
->old_name
, &oid
))
4089 return error(_("mode change for %s, which is not "
4090 "in current HEAD"), name
);
4092 return error(_("sha1 information is lacking or useless "
4095 ce
= make_cache_entry(patch
->old_mode
, oid
.hash
, name
, 0, 0);
4097 return error(_("make_cache_entry failed for path '%s'"),
4099 if (add_index_entry(&result
, ce
, ADD_CACHE_OK_TO_ADD
)) {
4101 return error(_("could not add %s to temporary index"),
4106 hold_lock_file_for_update(&lock
, state
->fake_ancestor
, LOCK_DIE_ON_ERROR
);
4107 res
= write_locked_index(&result
, &lock
, COMMIT_LOCK
);
4108 discard_index(&result
);
4111 return error(_("could not write temporary index to %s"),
4112 state
->fake_ancestor
);
4117 static void stat_patch_list(struct apply_state
*state
, struct patch
*patch
)
4119 int files
, adds
, dels
;
4121 for (files
= adds
= dels
= 0 ; patch
; patch
= patch
->next
) {
4123 adds
+= patch
->lines_added
;
4124 dels
+= patch
->lines_deleted
;
4125 show_stats(state
, patch
);
4128 print_stat_summary(stdout
, files
, adds
, dels
);
4131 static void numstat_patch_list(struct apply_state
*state
,
4132 struct patch
*patch
)
4134 for ( ; patch
; patch
= patch
->next
) {
4136 name
= patch
->new_name
? patch
->new_name
: patch
->old_name
;
4137 if (patch
->is_binary
)
4140 printf("%d\t%d\t", patch
->lines_added
, patch
->lines_deleted
);
4141 write_name_quoted(name
, stdout
, state
->line_termination
);
4145 static void show_file_mode_name(const char *newdelete
, unsigned int mode
, const char *name
)
4148 printf(" %s mode %06o %s\n", newdelete
, mode
, name
);
4150 printf(" %s %s\n", newdelete
, name
);
4153 static void show_mode_change(struct patch
*p
, int show_name
)
4155 if (p
->old_mode
&& p
->new_mode
&& p
->old_mode
!= p
->new_mode
) {
4157 printf(" mode change %06o => %06o %s\n",
4158 p
->old_mode
, p
->new_mode
, p
->new_name
);
4160 printf(" mode change %06o => %06o\n",
4161 p
->old_mode
, p
->new_mode
);
4165 static void show_rename_copy(struct patch
*p
)
4167 const char *renamecopy
= p
->is_rename
? "rename" : "copy";
4168 const char *old_name
, *new_name
;
4170 /* Find common prefix */
4171 old_name
= p
->old_name
;
4172 new_name
= p
->new_name
;
4174 const char *slash_old
, *slash_new
;
4175 slash_old
= strchr(old_name
, '/');
4176 slash_new
= strchr(new_name
, '/');
4179 slash_old
- old_name
!= slash_new
- new_name
||
4180 memcmp(old_name
, new_name
, slash_new
- new_name
))
4182 old_name
= slash_old
+ 1;
4183 new_name
= slash_new
+ 1;
4185 /* p->old_name thru old_name is the common prefix, and old_name and new_name
4186 * through the end of names are renames
4188 if (old_name
!= p
->old_name
)
4189 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy
,
4190 (int)(old_name
- p
->old_name
), p
->old_name
,
4191 old_name
, new_name
, p
->score
);
4193 printf(" %s %s => %s (%d%%)\n", renamecopy
,
4194 p
->old_name
, p
->new_name
, p
->score
);
4195 show_mode_change(p
, 0);
4198 static void summary_patch_list(struct patch
*patch
)
4202 for (p
= patch
; p
; p
= p
->next
) {
4204 show_file_mode_name("create", p
->new_mode
, p
->new_name
);
4205 else if (p
->is_delete
)
4206 show_file_mode_name("delete", p
->old_mode
, p
->old_name
);
4208 if (p
->is_rename
|| p
->is_copy
)
4209 show_rename_copy(p
);
4212 printf(" rewrite %s (%d%%)\n",
4213 p
->new_name
, p
->score
);
4214 show_mode_change(p
, 0);
4217 show_mode_change(p
, 1);
4223 static void patch_stats(struct apply_state
*state
, struct patch
*patch
)
4225 int lines
= patch
->lines_added
+ patch
->lines_deleted
;
4227 if (lines
> state
->max_change
)
4228 state
->max_change
= lines
;
4229 if (patch
->old_name
) {
4230 int len
= quote_c_style(patch
->old_name
, NULL
, NULL
, 0);
4232 len
= strlen(patch
->old_name
);
4233 if (len
> state
->max_len
)
4234 state
->max_len
= len
;
4236 if (patch
->new_name
) {
4237 int len
= quote_c_style(patch
->new_name
, NULL
, NULL
, 0);
4239 len
= strlen(patch
->new_name
);
4240 if (len
> state
->max_len
)
4241 state
->max_len
= len
;
4245 static int remove_file(struct apply_state
*state
, struct patch
*patch
, int rmdir_empty
)
4247 if (state
->update_index
&& !state
->ita_only
) {
4248 if (remove_file_from_cache(patch
->old_name
) < 0)
4249 return error(_("unable to remove %s from index"), patch
->old_name
);
4251 if (!state
->cached
) {
4252 if (!remove_or_warn(patch
->old_mode
, patch
->old_name
) && rmdir_empty
) {
4253 remove_path(patch
->old_name
);
4259 static int add_index_file(struct apply_state
*state
,
4266 struct cache_entry
*ce
;
4267 int namelen
= strlen(path
);
4268 unsigned ce_size
= cache_entry_size(namelen
);
4270 ce
= xcalloc(1, ce_size
);
4271 memcpy(ce
->name
, path
, namelen
);
4272 ce
->ce_mode
= create_ce_mode(mode
);
4273 ce
->ce_flags
= create_ce_flags(0);
4274 ce
->ce_namelen
= namelen
;
4275 if (state
->ita_only
) {
4276 ce
->ce_flags
|= CE_INTENT_TO_ADD
;
4277 set_object_name_for_intent_to_add_entry(ce
);
4278 } else if (S_ISGITLINK(mode
)) {
4281 if (!skip_prefix(buf
, "Subproject commit ", &s
) ||
4282 get_oid_hex(s
, &ce
->oid
)) {
4284 return error(_("corrupt patch for submodule %s"), path
);
4287 if (!state
->cached
) {
4288 if (lstat(path
, &st
) < 0) {
4290 return error_errno(_("unable to stat newly "
4291 "created file '%s'"),
4294 fill_stat_cache_info(ce
, &st
);
4296 if (write_object_file(buf
, size
, blob_type
, &ce
->oid
) < 0) {
4298 return error(_("unable to create backing store "
4299 "for newly created file %s"), path
);
4302 if (add_cache_entry(ce
, ADD_CACHE_OK_TO_ADD
) < 0) {
4304 return error(_("unable to add cache entry for %s"), path
);
4312 * -1 if an unrecoverable error happened
4313 * 0 if everything went well
4314 * 1 if a recoverable error happened
4316 static int try_create_file(const char *path
, unsigned int mode
, const char *buf
, unsigned long size
)
4319 struct strbuf nbuf
= STRBUF_INIT
;
4321 if (S_ISGITLINK(mode
)) {
4323 if (!lstat(path
, &st
) && S_ISDIR(st
.st_mode
))
4325 return !!mkdir(path
, 0777);
4328 if (has_symlinks
&& S_ISLNK(mode
))
4329 /* Although buf:size is counted string, it also is NUL
4332 return !!symlink(buf
, path
);
4334 fd
= open(path
, O_CREAT
| O_EXCL
| O_WRONLY
, (mode
& 0100) ? 0777 : 0666);
4338 if (convert_to_working_tree(path
, buf
, size
, &nbuf
)) {
4343 res
= write_in_full(fd
, buf
, size
) < 0;
4345 error_errno(_("failed to write to '%s'"), path
);
4346 strbuf_release(&nbuf
);
4348 if (close(fd
) < 0 && !res
)
4349 return error_errno(_("closing file '%s'"), path
);
4351 return res
? -1 : 0;
4355 * We optimistically assume that the directories exist,
4356 * which is true 99% of the time anyway. If they don't,
4357 * we create them and try again.
4363 static int create_one_file(struct apply_state
*state
,
4374 res
= try_create_file(path
, mode
, buf
, size
);
4380 if (errno
== ENOENT
) {
4381 if (safe_create_leading_directories(path
))
4383 res
= try_create_file(path
, mode
, buf
, size
);
4390 if (errno
== EEXIST
|| errno
== EACCES
) {
4391 /* We may be trying to create a file where a directory
4395 if (!lstat(path
, &st
) && (!S_ISDIR(st
.st_mode
) || !rmdir(path
)))
4399 if (errno
== EEXIST
) {
4400 unsigned int nr
= getpid();
4403 char newpath
[PATH_MAX
];
4404 mksnpath(newpath
, sizeof(newpath
), "%s~%u", path
, nr
);
4405 res
= try_create_file(newpath
, mode
, buf
, size
);
4409 if (!rename(newpath
, path
))
4411 unlink_or_warn(newpath
);
4414 if (errno
!= EEXIST
)
4419 return error_errno(_("unable to write file '%s' mode %o"),
4423 static int add_conflicted_stages_file(struct apply_state
*state
,
4424 struct patch
*patch
)
4427 unsigned ce_size
, mode
;
4428 struct cache_entry
*ce
;
4430 if (!state
->update_index
)
4432 namelen
= strlen(patch
->new_name
);
4433 ce_size
= cache_entry_size(namelen
);
4434 mode
= patch
->new_mode
? patch
->new_mode
: (S_IFREG
| 0644);
4436 remove_file_from_cache(patch
->new_name
);
4437 for (stage
= 1; stage
< 4; stage
++) {
4438 if (is_null_oid(&patch
->threeway_stage
[stage
- 1]))
4440 ce
= xcalloc(1, ce_size
);
4441 memcpy(ce
->name
, patch
->new_name
, namelen
);
4442 ce
->ce_mode
= create_ce_mode(mode
);
4443 ce
->ce_flags
= create_ce_flags(stage
);
4444 ce
->ce_namelen
= namelen
;
4445 oidcpy(&ce
->oid
, &patch
->threeway_stage
[stage
- 1]);
4446 if (add_cache_entry(ce
, ADD_CACHE_OK_TO_ADD
) < 0) {
4448 return error(_("unable to add cache entry for %s"),
4456 static int create_file(struct apply_state
*state
, struct patch
*patch
)
4458 char *path
= patch
->new_name
;
4459 unsigned mode
= patch
->new_mode
;
4460 unsigned long size
= patch
->resultsize
;
4461 char *buf
= patch
->result
;
4464 mode
= S_IFREG
| 0644;
4465 if (create_one_file(state
, path
, mode
, buf
, size
))
4468 if (patch
->conflicted_threeway
)
4469 return add_conflicted_stages_file(state
, patch
);
4470 else if (state
->update_index
)
4471 return add_index_file(state
, path
, mode
, buf
, size
);
4475 /* phase zero is to remove, phase one is to create */
4476 static int write_out_one_result(struct apply_state
*state
,
4477 struct patch
*patch
,
4480 if (patch
->is_delete
> 0) {
4482 return remove_file(state
, patch
, 1);
4485 if (patch
->is_new
> 0 || patch
->is_copy
) {
4487 return create_file(state
, patch
);
4491 * Rename or modification boils down to the same
4492 * thing: remove the old, write the new
4495 return remove_file(state
, patch
, patch
->is_rename
);
4497 return create_file(state
, patch
);
4501 static int write_out_one_reject(struct apply_state
*state
, struct patch
*patch
)
4504 char namebuf
[PATH_MAX
];
4505 struct fragment
*frag
;
4507 struct strbuf sb
= STRBUF_INIT
;
4509 for (cnt
= 0, frag
= patch
->fragments
; frag
; frag
= frag
->next
) {
4510 if (!frag
->rejected
)
4516 if (state
->apply_verbosity
> verbosity_normal
)
4517 say_patch_name(stderr
,
4518 _("Applied patch %s cleanly."), patch
);
4522 /* This should not happen, because a removal patch that leaves
4523 * contents are marked "rejected" at the patch level.
4525 if (!patch
->new_name
)
4526 die(_("internal error"));
4528 /* Say this even without --verbose */
4529 strbuf_addf(&sb
, Q_("Applying patch %%s with %d reject...",
4530 "Applying patch %%s with %d rejects...",
4533 if (state
->apply_verbosity
> verbosity_silent
)
4534 say_patch_name(stderr
, sb
.buf
, patch
);
4535 strbuf_release(&sb
);
4537 cnt
= strlen(patch
->new_name
);
4538 if (ARRAY_SIZE(namebuf
) <= cnt
+ 5) {
4539 cnt
= ARRAY_SIZE(namebuf
) - 5;
4540 warning(_("truncating .rej filename to %.*s.rej"),
4541 cnt
- 1, patch
->new_name
);
4543 memcpy(namebuf
, patch
->new_name
, cnt
);
4544 memcpy(namebuf
+ cnt
, ".rej", 5);
4546 rej
= fopen(namebuf
, "w");
4548 return error_errno(_("cannot open %s"), namebuf
);
4550 /* Normal git tools never deal with .rej, so do not pretend
4551 * this is a git patch by saying --git or giving extended
4552 * headers. While at it, maybe please "kompare" that wants
4553 * the trailing TAB and some garbage at the end of line ;-).
4555 fprintf(rej
, "diff a/%s b/%s\t(rejected hunks)\n",
4556 patch
->new_name
, patch
->new_name
);
4557 for (cnt
= 1, frag
= patch
->fragments
;
4559 cnt
++, frag
= frag
->next
) {
4560 if (!frag
->rejected
) {
4561 if (state
->apply_verbosity
> verbosity_silent
)
4562 fprintf_ln(stderr
, _("Hunk #%d applied cleanly."), cnt
);
4565 if (state
->apply_verbosity
> verbosity_silent
)
4566 fprintf_ln(stderr
, _("Rejected hunk #%d."), cnt
);
4567 fprintf(rej
, "%.*s", frag
->size
, frag
->patch
);
4568 if (frag
->patch
[frag
->size
-1] != '\n')
4577 * -1 if an error happened
4578 * 0 if the patch applied cleanly
4579 * 1 if the patch did not apply cleanly
4581 static int write_out_results(struct apply_state
*state
, struct patch
*list
)
4586 struct string_list cpath
= STRING_LIST_INIT_DUP
;
4588 for (phase
= 0; phase
< 2; phase
++) {
4594 if (write_out_one_result(state
, l
, phase
)) {
4595 string_list_clear(&cpath
, 0);
4599 if (write_out_one_reject(state
, l
))
4601 if (l
->conflicted_threeway
) {
4602 string_list_append(&cpath
, l
->new_name
);
4612 struct string_list_item
*item
;
4614 string_list_sort(&cpath
);
4615 if (state
->apply_verbosity
> verbosity_silent
) {
4616 for_each_string_list_item(item
, &cpath
)
4617 fprintf(stderr
, "U %s\n", item
->string
);
4619 string_list_clear(&cpath
, 0);
4628 * Try to apply a patch.
4631 * -128 if a bad error happened (like patch unreadable)
4632 * -1 if patch did not apply and user cannot deal with it
4633 * 0 if the patch applied
4634 * 1 if the patch did not apply but user might fix it
4636 static int apply_patch(struct apply_state
*state
,
4638 const char *filename
,
4642 struct strbuf buf
= STRBUF_INIT
; /* owns the patch text */
4643 struct patch
*list
= NULL
, **listp
= &list
;
4644 int skipped_patch
= 0;
4647 state
->patch_input_file
= filename
;
4648 if (read_patch_file(&buf
, fd
) < 0)
4651 while (offset
< buf
.len
) {
4652 struct patch
*patch
;
4655 patch
= xcalloc(1, sizeof(*patch
));
4656 patch
->inaccurate_eof
= !!(options
& APPLY_OPT_INACCURATE_EOF
);
4657 patch
->recount
= !!(options
& APPLY_OPT_RECOUNT
);
4658 nr
= parse_chunk(state
, buf
.buf
+ offset
, buf
.len
- offset
, patch
);
4667 if (state
->apply_in_reverse
)
4668 reverse_patches(patch
);
4669 if (use_patch(state
, patch
)) {
4670 patch_stats(state
, patch
);
4672 listp
= &patch
->next
;
4675 if (state
->apply_verbosity
> verbosity_normal
)
4676 say_patch_name(stderr
, _("Skipped patch '%s'."), patch
);
4683 if (!list
&& !skipped_patch
) {
4684 error(_("unrecognized input"));
4689 if (state
->whitespace_error
&& (state
->ws_error_action
== die_on_ws_error
))
4692 state
->update_index
= (state
->check_index
|| state
->ita_only
) && state
->apply
;
4693 if (state
->update_index
&& !is_lock_file_locked(&state
->lock_file
)) {
4694 if (state
->index_file
)
4695 hold_lock_file_for_update(&state
->lock_file
,
4699 hold_locked_index(&state
->lock_file
, LOCK_DIE_ON_ERROR
);
4702 if (state
->check_index
&& read_apply_cache(state
) < 0) {
4703 error(_("unable to read index file"));
4708 if (state
->check
|| state
->apply
) {
4709 int r
= check_patch_list(state
, list
);
4714 if (r
< 0 && !state
->apply_with_reject
) {
4721 int write_res
= write_out_results(state
, list
);
4722 if (write_res
< 0) {
4726 if (write_res
> 0) {
4727 /* with --3way, we still need to write the index out */
4728 res
= state
->apply_with_reject
? -1 : 1;
4733 if (state
->fake_ancestor
&&
4734 build_fake_ancestor(state
, list
)) {
4739 if (state
->diffstat
&& state
->apply_verbosity
> verbosity_silent
)
4740 stat_patch_list(state
, list
);
4742 if (state
->numstat
&& state
->apply_verbosity
> verbosity_silent
)
4743 numstat_patch_list(state
, list
);
4745 if (state
->summary
&& state
->apply_verbosity
> verbosity_silent
)
4746 summary_patch_list(list
);
4749 free_patch_list(list
);
4750 strbuf_release(&buf
);
4751 string_list_clear(&state
->fn_table
, 0);
4755 static int apply_option_parse_exclude(const struct option
*opt
,
4756 const char *arg
, int unset
)
4758 struct apply_state
*state
= opt
->value
;
4759 add_name_limit(state
, arg
, 1);
4763 static int apply_option_parse_include(const struct option
*opt
,
4764 const char *arg
, int unset
)
4766 struct apply_state
*state
= opt
->value
;
4767 add_name_limit(state
, arg
, 0);
4768 state
->has_include
= 1;
4772 static int apply_option_parse_p(const struct option
*opt
,
4776 struct apply_state
*state
= opt
->value
;
4777 state
->p_value
= atoi(arg
);
4778 state
->p_value_known
= 1;
4782 static int apply_option_parse_space_change(const struct option
*opt
,
4783 const char *arg
, int unset
)
4785 struct apply_state
*state
= opt
->value
;
4787 state
->ws_ignore_action
= ignore_ws_none
;
4789 state
->ws_ignore_action
= ignore_ws_change
;
4793 static int apply_option_parse_whitespace(const struct option
*opt
,
4794 const char *arg
, int unset
)
4796 struct apply_state
*state
= opt
->value
;
4797 state
->whitespace_option
= arg
;
4798 if (parse_whitespace_option(state
, arg
))
4803 static int apply_option_parse_directory(const struct option
*opt
,
4804 const char *arg
, int unset
)
4806 struct apply_state
*state
= opt
->value
;
4807 strbuf_reset(&state
->root
);
4808 strbuf_addstr(&state
->root
, arg
);
4809 strbuf_complete(&state
->root
, '/');
4813 int apply_all_patches(struct apply_state
*state
,
4823 for (i
= 0; i
< argc
; i
++) {
4824 const char *arg
= argv
[i
];
4825 char *to_free
= NULL
;
4828 if (!strcmp(arg
, "-")) {
4829 res
= apply_patch(state
, 0, "<stdin>", options
);
4836 arg
= to_free
= prefix_filename(state
->prefix
, arg
);
4838 fd
= open(arg
, O_RDONLY
);
4840 error(_("can't open patch '%s': %s"), arg
, strerror(errno
));
4846 set_default_whitespace_mode(state
);
4847 res
= apply_patch(state
, fd
, arg
, options
);
4854 set_default_whitespace_mode(state
);
4856 res
= apply_patch(state
, 0, "<stdin>", options
);
4862 if (state
->whitespace_error
) {
4863 if (state
->squelch_whitespace_errors
&&
4864 state
->squelch_whitespace_errors
< state
->whitespace_error
) {
4866 state
->whitespace_error
- state
->squelch_whitespace_errors
;
4867 warning(Q_("squelched %d whitespace error",
4868 "squelched %d whitespace errors",
4872 if (state
->ws_error_action
== die_on_ws_error
) {
4873 error(Q_("%d line adds whitespace errors.",
4874 "%d lines add whitespace errors.",
4875 state
->whitespace_error
),
4876 state
->whitespace_error
);
4880 if (state
->applied_after_fixing_ws
&& state
->apply
)
4881 warning(Q_("%d line applied after"
4882 " fixing whitespace errors.",
4883 "%d lines applied after"
4884 " fixing whitespace errors.",
4885 state
->applied_after_fixing_ws
),
4886 state
->applied_after_fixing_ws
);
4887 else if (state
->whitespace_error
)
4888 warning(Q_("%d line adds whitespace errors.",
4889 "%d lines add whitespace errors.",
4890 state
->whitespace_error
),
4891 state
->whitespace_error
);
4894 if (state
->update_index
) {
4895 res
= write_locked_index(&the_index
, &state
->lock_file
, COMMIT_LOCK
);
4897 error(_("Unable to write new index file"));
4906 rollback_lock_file(&state
->lock_file
);
4908 if (state
->apply_verbosity
<= verbosity_silent
) {
4909 set_error_routine(state
->saved_error_routine
);
4910 set_warn_routine(state
->saved_warn_routine
);
4915 return (res
== -1 ? 1 : 128);
4918 int apply_parse_options(int argc
, const char **argv
,
4919 struct apply_state
*state
,
4920 int *force_apply
, int *options
,
4921 const char * const *apply_usage
)
4923 struct option builtin_apply_options
[] = {
4924 { OPTION_CALLBACK
, 0, "exclude", state
, N_("path"),
4925 N_("don't apply changes matching the given path"),
4926 0, apply_option_parse_exclude
},
4927 { OPTION_CALLBACK
, 0, "include", state
, N_("path"),
4928 N_("apply changes matching the given path"),
4929 0, apply_option_parse_include
},
4930 { OPTION_CALLBACK
, 'p', NULL
, state
, N_("num"),
4931 N_("remove <num> leading slashes from traditional diff paths"),
4932 0, apply_option_parse_p
},
4933 OPT_BOOL(0, "no-add", &state
->no_add
,
4934 N_("ignore additions made by the patch")),
4935 OPT_BOOL(0, "stat", &state
->diffstat
,
4936 N_("instead of applying the patch, output diffstat for the input")),
4937 OPT_NOOP_NOARG(0, "allow-binary-replacement"),
4938 OPT_NOOP_NOARG(0, "binary"),
4939 OPT_BOOL(0, "numstat", &state
->numstat
,
4940 N_("show number of added and deleted lines in decimal notation")),
4941 OPT_BOOL(0, "summary", &state
->summary
,
4942 N_("instead of applying the patch, output a summary for the input")),
4943 OPT_BOOL(0, "check", &state
->check
,
4944 N_("instead of applying the patch, see if the patch is applicable")),
4945 OPT_BOOL(0, "index", &state
->check_index
,
4946 N_("make sure the patch is applicable to the current index")),
4947 OPT_BOOL('N', "intent-to-add", &state
->ita_only
,
4948 N_("mark new files with `git add --intent-to-add`")),
4949 OPT_BOOL(0, "cached", &state
->cached
,
4950 N_("apply a patch without touching the working tree")),
4951 OPT_BOOL_F(0, "unsafe-paths", &state
->unsafe_paths
,
4952 N_("accept a patch that touches outside the working area"),
4953 PARSE_OPT_NOCOMPLETE
),
4954 OPT_BOOL(0, "apply", force_apply
,
4955 N_("also apply the patch (use with --stat/--summary/--check)")),
4956 OPT_BOOL('3', "3way", &state
->threeway
,
4957 N_( "attempt three-way merge if a patch does not apply")),
4958 OPT_FILENAME(0, "build-fake-ancestor", &state
->fake_ancestor
,
4959 N_("build a temporary index based on embedded index information")),
4960 /* Think twice before adding "--nul" synonym to this */
4961 OPT_SET_INT('z', NULL
, &state
->line_termination
,
4962 N_("paths are separated with NUL character"), '\0'),
4963 OPT_INTEGER('C', NULL
, &state
->p_context
,
4964 N_("ensure at least <n> lines of context match")),
4965 { OPTION_CALLBACK
, 0, "whitespace", state
, N_("action"),
4966 N_("detect new or modified lines that have whitespace errors"),
4967 0, apply_option_parse_whitespace
},
4968 { OPTION_CALLBACK
, 0, "ignore-space-change", state
, NULL
,
4969 N_("ignore changes in whitespace when finding context"),
4970 PARSE_OPT_NOARG
, apply_option_parse_space_change
},
4971 { OPTION_CALLBACK
, 0, "ignore-whitespace", state
, NULL
,
4972 N_("ignore changes in whitespace when finding context"),
4973 PARSE_OPT_NOARG
, apply_option_parse_space_change
},
4974 OPT_BOOL('R', "reverse", &state
->apply_in_reverse
,
4975 N_("apply the patch in reverse")),
4976 OPT_BOOL(0, "unidiff-zero", &state
->unidiff_zero
,
4977 N_("don't expect at least one line of context")),
4978 OPT_BOOL(0, "reject", &state
->apply_with_reject
,
4979 N_("leave the rejected hunks in corresponding *.rej files")),
4980 OPT_BOOL(0, "allow-overlap", &state
->allow_overlap
,
4981 N_("allow overlapping hunks")),
4982 OPT__VERBOSE(&state
->apply_verbosity
, N_("be verbose")),
4983 OPT_BIT(0, "inaccurate-eof", options
,
4984 N_("tolerate incorrectly detected missing new-line at the end of file"),
4985 APPLY_OPT_INACCURATE_EOF
),
4986 OPT_BIT(0, "recount", options
,
4987 N_("do not trust the line counts in the hunk headers"),
4989 { OPTION_CALLBACK
, 0, "directory", state
, N_("root"),
4990 N_("prepend <root> to all filenames"),
4991 0, apply_option_parse_directory
},
4995 return parse_options(argc
, argv
, state
->prefix
, builtin_apply_options
, apply_usage
, 0);