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
,
79 struct lock_file
*lock_file
)
81 memset(state
, 0, sizeof(*state
));
82 state
->prefix
= prefix
;
83 state
->prefix_length
= state
->prefix
? strlen(state
->prefix
) : 0;
84 state
->lock_file
= lock_file
;
87 state
->line_termination
= '\n';
89 state
->p_context
= UINT_MAX
;
90 state
->squelch_whitespace_errors
= 5;
91 state
->ws_error_action
= warn_on_ws_error
;
92 state
->ws_ignore_action
= ignore_ws_none
;
94 string_list_init(&state
->fn_table
, 0);
95 string_list_init(&state
->limit_by_name
, 0);
96 string_list_init(&state
->symlink_changes
, 0);
97 strbuf_init(&state
->root
, 0);
100 if (apply_default_whitespace
&& parse_whitespace_option(state
, apply_default_whitespace
))
102 if (apply_default_ignorewhitespace
&& parse_ignorewhitespace_option(state
, apply_default_ignorewhitespace
))
107 void clear_apply_state(struct apply_state
*state
)
109 string_list_clear(&state
->limit_by_name
, 0);
110 string_list_clear(&state
->symlink_changes
, 0);
111 strbuf_release(&state
->root
);
113 /* &state->fn_table is cleared at the end of apply_patch() */
116 static void mute_routine(const char *msg
, va_list params
)
121 int check_apply_state(struct apply_state
*state
, int force_apply
)
123 int is_not_gitdir
= !startup_info
->have_repository
;
125 if (state
->apply_with_reject
&& state
->threeway
)
126 return error(_("--reject and --3way cannot be used together."));
127 if (state
->cached
&& state
->threeway
)
128 return error(_("--cached and --3way cannot be used together."));
129 if (state
->threeway
) {
131 return error(_("--3way outside a repository"));
132 state
->check_index
= 1;
134 if (state
->apply_with_reject
) {
136 if (state
->apply_verbosity
== verbosity_normal
)
137 state
->apply_verbosity
= verbosity_verbose
;
139 if (!force_apply
&& (state
->diffstat
|| state
->numstat
|| state
->summary
|| state
->check
|| state
->fake_ancestor
))
141 if (state
->check_index
&& is_not_gitdir
)
142 return error(_("--index outside a repository"));
145 return error(_("--cached outside a repository"));
146 state
->check_index
= 1;
148 if (state
->check_index
)
149 state
->unsafe_paths
= 0;
150 if (!state
->lock_file
)
151 return error("BUG: state->lock_file should not be NULL");
153 if (state
->apply_verbosity
<= verbosity_silent
) {
154 state
->saved_error_routine
= get_error_routine();
155 state
->saved_warn_routine
= get_warn_routine();
156 set_error_routine(mute_routine
);
157 set_warn_routine(mute_routine
);
163 static void set_default_whitespace_mode(struct apply_state
*state
)
165 if (!state
->whitespace_option
&& !apply_default_whitespace
)
166 state
->ws_error_action
= (state
->apply
? warn_on_ws_error
: nowarn_ws_error
);
170 * This represents one "hunk" from a patch, starting with
171 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The
172 * patch text is pointed at by patch, and its byte length
173 * is stored in size. leading and trailing are the number
177 unsigned long leading
, trailing
;
178 unsigned long oldpos
, oldlines
;
179 unsigned long newpos
, newlines
;
181 * 'patch' is usually borrowed from buf in apply_patch(),
182 * but some codepaths store an allocated buffer.
185 unsigned free_patch
:1,
189 struct fragment
*next
;
193 * When dealing with a binary patch, we reuse "leading" field
194 * to store the type of the binary hunk, either deflated "delta"
195 * or deflated "literal".
197 #define binary_patch_method leading
198 #define BINARY_DELTA_DEFLATED 1
199 #define BINARY_LITERAL_DEFLATED 2
202 * This represents a "patch" to a file, both metainfo changes
203 * such as creation/deletion, filemode and content changes represented
204 * as a series of fragments.
207 char *new_name
, *old_name
, *def_name
;
208 unsigned int old_mode
, new_mode
;
209 int is_new
, is_delete
; /* -1 = unknown, 0 = false, 1 = true */
212 int lines_added
, lines_deleted
;
214 int extension_linenr
; /* first line specifying delete/new/rename/copy */
215 unsigned int is_toplevel_relative
:1;
216 unsigned int inaccurate_eof
:1;
217 unsigned int is_binary
:1;
218 unsigned int is_copy
:1;
219 unsigned int is_rename
:1;
220 unsigned int recount
:1;
221 unsigned int conflicted_threeway
:1;
222 unsigned int direct_to_threeway
:1;
223 unsigned int crlf_in_old
:1;
224 struct fragment
*fragments
;
227 char old_sha1_prefix
[41];
228 char new_sha1_prefix
[41];
231 /* three-way fallback result */
232 struct object_id threeway_stage
[3];
235 static void free_fragment_list(struct fragment
*list
)
238 struct fragment
*next
= list
->next
;
239 if (list
->free_patch
)
240 free((char *)list
->patch
);
246 static void free_patch(struct patch
*patch
)
248 free_fragment_list(patch
->fragments
);
249 free(patch
->def_name
);
250 free(patch
->old_name
);
251 free(patch
->new_name
);
256 static void free_patch_list(struct patch
*list
)
259 struct patch
*next
= list
->next
;
266 * A line in a file, len-bytes long (includes the terminating LF,
267 * except for an incomplete line at the end if the file ends with
268 * one), and its contents hashes to 'hash'.
274 #define LINE_COMMON 1
275 #define LINE_PATCHED 2
279 * This represents a "file", which is an array of "lines".
286 struct line
*line_allocated
;
290 static uint32_t hash_line(const char *cp
, size_t len
)
294 for (i
= 0, h
= 0; i
< len
; i
++) {
295 if (!isspace(cp
[i
])) {
296 h
= h
* 3 + (cp
[i
] & 0xff);
303 * Compare lines s1 of length n1 and s2 of length n2, ignoring
304 * whitespace difference. Returns 1 if they match, 0 otherwise
306 static int fuzzy_matchlines(const char *s1
, size_t n1
,
307 const char *s2
, size_t n2
)
309 const char *last1
= s1
+ n1
- 1;
310 const char *last2
= s2
+ n2
- 1;
313 /* ignore line endings */
314 while ((*last1
== '\r') || (*last1
== '\n'))
316 while ((*last2
== '\r') || (*last2
== '\n'))
319 /* skip leading whitespaces, if both begin with whitespace */
320 if (s1
<= last1
&& s2
<= last2
&& isspace(*s1
) && isspace(*s2
)) {
321 while (isspace(*s1
) && (s1
<= last1
))
323 while (isspace(*s2
) && (s2
<= last2
))
326 /* early return if both lines are empty */
327 if ((s1
> last1
) && (s2
> last2
))
330 result
= *s1
++ - *s2
++;
332 * Skip whitespace inside. We check for whitespace on
333 * both buffers because we don't want "a b" to match
336 if (isspace(*s1
) && isspace(*s2
)) {
337 while (isspace(*s1
) && s1
<= last1
)
339 while (isspace(*s2
) && s2
<= last2
)
343 * If we reached the end on one side only,
347 ((s2
> last2
) && (s1
<= last1
)) ||
348 ((s1
> last1
) && (s2
<= last2
)))
350 if ((s1
> last1
) && (s2
> last2
))
357 static void add_line_info(struct image
*img
, const char *bol
, size_t len
, unsigned flag
)
359 ALLOC_GROW(img
->line_allocated
, img
->nr
+ 1, img
->alloc
);
360 img
->line_allocated
[img
->nr
].len
= len
;
361 img
->line_allocated
[img
->nr
].hash
= hash_line(bol
, len
);
362 img
->line_allocated
[img
->nr
].flag
= flag
;
367 * "buf" has the file contents to be patched (read from various sources).
368 * attach it to "image" and add line-based index to it.
369 * "image" now owns the "buf".
371 static void prepare_image(struct image
*image
, char *buf
, size_t len
,
372 int prepare_linetable
)
376 memset(image
, 0, sizeof(*image
));
380 if (!prepare_linetable
)
383 ep
= image
->buf
+ image
->len
;
387 for (next
= cp
; next
< ep
&& *next
!= '\n'; next
++)
391 add_line_info(image
, cp
, next
- cp
, 0);
394 image
->line
= image
->line_allocated
;
397 static void clear_image(struct image
*image
)
400 free(image
->line_allocated
);
401 memset(image
, 0, sizeof(*image
));
404 /* fmt must contain _one_ %s and no other substitution */
405 static void say_patch_name(FILE *output
, const char *fmt
, struct patch
*patch
)
407 struct strbuf sb
= STRBUF_INIT
;
409 if (patch
->old_name
&& patch
->new_name
&&
410 strcmp(patch
->old_name
, patch
->new_name
)) {
411 quote_c_style(patch
->old_name
, &sb
, NULL
, 0);
412 strbuf_addstr(&sb
, " => ");
413 quote_c_style(patch
->new_name
, &sb
, NULL
, 0);
415 const char *n
= patch
->new_name
;
418 quote_c_style(n
, &sb
, NULL
, 0);
420 fprintf(output
, fmt
, sb
.buf
);
427 static int read_patch_file(struct strbuf
*sb
, int fd
)
429 if (strbuf_read(sb
, fd
, 0) < 0)
430 return error_errno("git apply: failed to read");
433 * Make sure that we have some slop in the buffer
434 * so that we can do speculative "memcmp" etc, and
435 * see to it that it is NUL-filled.
437 strbuf_grow(sb
, SLOP
);
438 memset(sb
->buf
+ sb
->len
, 0, SLOP
);
442 static unsigned long linelen(const char *buffer
, unsigned long size
)
444 unsigned long len
= 0;
447 if (*buffer
++ == '\n')
453 static int is_dev_null(const char *str
)
455 return skip_prefix(str
, "/dev/null", &str
) && isspace(*str
);
461 static int name_terminate(int c
, int terminate
)
463 if (c
== ' ' && !(terminate
& TERM_SPACE
))
465 if (c
== '\t' && !(terminate
& TERM_TAB
))
471 /* remove double slashes to make --index work with such filenames */
472 static char *squash_slash(char *name
)
480 if ((name
[j
++] = name
[i
++]) == '/')
481 while (name
[i
] == '/')
488 static char *find_name_gnu(struct apply_state
*state
,
493 struct strbuf name
= STRBUF_INIT
;
497 * Proposed "new-style" GNU patch/diff format; see
498 * http://marc.info/?l=git&m=112927316408690&w=2
500 if (unquote_c_style(&name
, line
, NULL
)) {
501 strbuf_release(&name
);
505 for (cp
= name
.buf
; p_value
; p_value
--) {
506 cp
= strchr(cp
, '/');
508 strbuf_release(&name
);
514 strbuf_remove(&name
, 0, cp
- name
.buf
);
516 strbuf_insert(&name
, 0, state
->root
.buf
, state
->root
.len
);
517 return squash_slash(strbuf_detach(&name
, NULL
));
520 static size_t sane_tz_len(const char *line
, size_t len
)
524 if (len
< strlen(" +0500") || line
[len
-strlen(" +0500")] != ' ')
526 tz
= line
+ len
- strlen(" +0500");
528 if (tz
[1] != '+' && tz
[1] != '-')
531 for (p
= tz
+ 2; p
!= line
+ len
; p
++)
535 return line
+ len
- tz
;
538 static size_t tz_with_colon_len(const char *line
, size_t len
)
542 if (len
< strlen(" +08:00") || line
[len
- strlen(":00")] != ':')
544 tz
= line
+ len
- strlen(" +08:00");
546 if (tz
[0] != ' ' || (tz
[1] != '+' && tz
[1] != '-'))
549 if (!isdigit(*p
++) || !isdigit(*p
++) || *p
++ != ':' ||
550 !isdigit(*p
++) || !isdigit(*p
++))
553 return line
+ len
- tz
;
556 static size_t date_len(const char *line
, size_t len
)
558 const char *date
, *p
;
560 if (len
< strlen("72-02-05") || line
[len
-strlen("-05")] != '-')
562 p
= date
= line
+ len
- strlen("72-02-05");
564 if (!isdigit(*p
++) || !isdigit(*p
++) || *p
++ != '-' ||
565 !isdigit(*p
++) || !isdigit(*p
++) || *p
++ != '-' ||
566 !isdigit(*p
++) || !isdigit(*p
++)) /* Not a date. */
569 if (date
- line
>= strlen("19") &&
570 isdigit(date
[-1]) && isdigit(date
[-2])) /* 4-digit year */
571 date
-= strlen("19");
573 return line
+ len
- date
;
576 static size_t short_time_len(const char *line
, size_t len
)
578 const char *time
, *p
;
580 if (len
< strlen(" 07:01:32") || line
[len
-strlen(":32")] != ':')
582 p
= time
= line
+ len
- strlen(" 07:01:32");
584 /* Permit 1-digit hours? */
586 !isdigit(*p
++) || !isdigit(*p
++) || *p
++ != ':' ||
587 !isdigit(*p
++) || !isdigit(*p
++) || *p
++ != ':' ||
588 !isdigit(*p
++) || !isdigit(*p
++)) /* Not a time. */
591 return line
+ len
- time
;
594 static size_t fractional_time_len(const char *line
, size_t len
)
599 /* Expected format: 19:41:17.620000023 */
600 if (!len
|| !isdigit(line
[len
- 1]))
604 /* Fractional seconds. */
605 while (p
> line
&& isdigit(*p
))
610 /* Hours, minutes, and whole seconds. */
611 n
= short_time_len(line
, p
- line
);
615 return line
+ len
- p
+ n
;
618 static size_t trailing_spaces_len(const char *line
, size_t len
)
622 /* Expected format: ' ' x (1 or more) */
623 if (!len
|| line
[len
- 1] != ' ')
630 return line
+ len
- (p
+ 1);
637 static size_t diff_timestamp_len(const char *line
, size_t len
)
639 const char *end
= line
+ len
;
643 * Posix: 2010-07-05 19:41:17
644 * GNU: 2010-07-05 19:41:17.620000023 -0500
647 if (!isdigit(end
[-1]))
650 n
= sane_tz_len(line
, end
- line
);
652 n
= tz_with_colon_len(line
, end
- line
);
655 n
= short_time_len(line
, end
- line
);
657 n
= fractional_time_len(line
, end
- line
);
660 n
= date_len(line
, end
- line
);
661 if (!n
) /* No date. Too bad. */
665 if (end
== line
) /* No space before date. */
667 if (end
[-1] == '\t') { /* Success! */
669 return line
+ len
- end
;
671 if (end
[-1] != ' ') /* No space before date. */
674 /* Whitespace damage. */
675 end
-= trailing_spaces_len(line
, end
- line
);
676 return line
+ len
- end
;
679 static char *find_name_common(struct apply_state
*state
,
687 const char *start
= NULL
;
691 while (line
!= end
) {
694 if (!end
&& isspace(c
)) {
697 if (name_terminate(c
, terminate
))
701 if (c
== '/' && !--p_value
)
705 return squash_slash(xstrdup_or_null(def
));
708 return squash_slash(xstrdup_or_null(def
));
711 * Generally we prefer the shorter name, especially
712 * if the other one is just a variation of that with
713 * something else tacked on to the end (ie "file.orig"
717 int deflen
= strlen(def
);
718 if (deflen
< len
&& !strncmp(start
, def
, deflen
))
719 return squash_slash(xstrdup(def
));
722 if (state
->root
.len
) {
723 char *ret
= xstrfmt("%s%.*s", state
->root
.buf
, len
, start
);
724 return squash_slash(ret
);
727 return squash_slash(xmemdupz(start
, len
));
730 static char *find_name(struct apply_state
*state
,
737 char *name
= find_name_gnu(state
, line
, def
, p_value
);
742 return find_name_common(state
, line
, def
, p_value
, NULL
, terminate
);
745 static char *find_name_traditional(struct apply_state
*state
,
754 char *name
= find_name_gnu(state
, line
, def
, p_value
);
759 len
= strchrnul(line
, '\n') - line
;
760 date_len
= diff_timestamp_len(line
, len
);
762 return find_name_common(state
, line
, def
, p_value
, NULL
, TERM_TAB
);
765 return find_name_common(state
, line
, def
, p_value
, line
+ len
, 0);
769 * Given the string after "--- " or "+++ ", guess the appropriate
770 * p_value for the given patch.
772 static int guess_p_value(struct apply_state
*state
, const char *nameline
)
777 if (is_dev_null(nameline
))
779 name
= find_name_traditional(state
, nameline
, NULL
, 0);
782 cp
= strchr(name
, '/');
785 else if (state
->prefix
) {
787 * Does it begin with "a/$our-prefix" and such? Then this is
788 * very likely to apply to our directory.
790 if (!strncmp(name
, state
->prefix
, state
->prefix_length
))
791 val
= count_slashes(state
->prefix
);
794 if (!strncmp(cp
, state
->prefix
, state
->prefix_length
))
795 val
= count_slashes(state
->prefix
) + 1;
803 * Does the ---/+++ line have the POSIX timestamp after the last HT?
804 * GNU diff puts epoch there to signal a creation/deletion event. Is
805 * this such a timestamp?
807 static int has_epoch_timestamp(const char *nameline
)
810 * We are only interested in epoch timestamp; any non-zero
811 * fraction cannot be one, hence "(\.0+)?" in the regexp below.
812 * For the same reason, the date must be either 1969-12-31 or
813 * 1970-01-01, and the seconds part must be "00".
815 const char stamp_regexp
[] =
816 "^(1969-12-31|1970-01-01)"
818 "[0-2][0-9]:[0-5][0-9]:00(\\.0+)?"
820 "([-+][0-2][0-9]:?[0-5][0-9])\n";
821 const char *timestamp
= NULL
, *cp
, *colon
;
822 static regex_t
*stamp
;
828 for (cp
= nameline
; *cp
!= '\n'; cp
++) {
835 stamp
= xmalloc(sizeof(*stamp
));
836 if (regcomp(stamp
, stamp_regexp
, REG_EXTENDED
)) {
837 warning(_("Cannot prepare timestamp regexp %s"),
843 status
= regexec(stamp
, timestamp
, ARRAY_SIZE(m
), m
, 0);
845 if (status
!= REG_NOMATCH
)
846 warning(_("regexec returned %d for input: %s"),
851 zoneoffset
= strtol(timestamp
+ m
[3].rm_so
+ 1, (char **) &colon
, 10);
853 zoneoffset
= zoneoffset
* 60 + strtol(colon
+ 1, NULL
, 10);
855 zoneoffset
= (zoneoffset
/ 100) * 60 + (zoneoffset
% 100);
856 if (timestamp
[m
[3].rm_so
] == '-')
857 zoneoffset
= -zoneoffset
;
860 * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31
861 * (west of GMT) or 1970-01-01 (east of GMT)
863 if ((zoneoffset
< 0 && memcmp(timestamp
, "1969-12-31", 10)) ||
864 (0 <= zoneoffset
&& memcmp(timestamp
, "1970-01-01", 10)))
867 hourminute
= (strtol(timestamp
+ 11, NULL
, 10) * 60 +
868 strtol(timestamp
+ 14, NULL
, 10) -
871 return ((zoneoffset
< 0 && hourminute
== 1440) ||
872 (0 <= zoneoffset
&& !hourminute
));
876 * Get the name etc info from the ---/+++ lines of a traditional patch header
878 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
879 * files, we can happily check the index for a match, but for creating a
880 * new file we should try to match whatever "patch" does. I have no idea.
882 static int parse_traditional_patch(struct apply_state
*state
,
889 first
+= 4; /* skip "--- " */
890 second
+= 4; /* skip "+++ " */
891 if (!state
->p_value_known
) {
893 p
= guess_p_value(state
, first
);
894 q
= guess_p_value(state
, second
);
896 if (0 <= p
&& p
== q
) {
898 state
->p_value_known
= 1;
901 if (is_dev_null(first
)) {
903 patch
->is_delete
= 0;
904 name
= find_name_traditional(state
, second
, NULL
, state
->p_value
);
905 patch
->new_name
= name
;
906 } else if (is_dev_null(second
)) {
908 patch
->is_delete
= 1;
909 name
= find_name_traditional(state
, first
, NULL
, state
->p_value
);
910 patch
->old_name
= name
;
913 first_name
= find_name_traditional(state
, first
, NULL
, state
->p_value
);
914 name
= find_name_traditional(state
, second
, first_name
, state
->p_value
);
916 if (has_epoch_timestamp(first
)) {
918 patch
->is_delete
= 0;
919 patch
->new_name
= name
;
920 } else if (has_epoch_timestamp(second
)) {
922 patch
->is_delete
= 1;
923 patch
->old_name
= name
;
925 patch
->old_name
= name
;
926 patch
->new_name
= xstrdup_or_null(name
);
930 return error(_("unable to find filename in patch at line %d"), state
->linenr
);
935 static int gitdiff_hdrend(struct apply_state
*state
,
943 * We're anal about diff header consistency, to make
944 * sure that we don't end up having strange ambiguous
945 * patches floating around.
947 * As a result, gitdiff_{old|new}name() will check
948 * their names against any previous information, just
951 #define DIFF_OLD_NAME 0
952 #define DIFF_NEW_NAME 1
954 static int gitdiff_verify_name(struct apply_state
*state
,
960 if (!*name
&& !isnull
) {
961 *name
= find_name(state
, line
, NULL
, state
->p_value
, TERM_TAB
);
968 return error(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"),
969 *name
, state
->linenr
);
970 another
= find_name(state
, line
, NULL
, state
->p_value
, TERM_TAB
);
971 if (!another
|| strcmp(another
, *name
)) {
973 return error((side
== DIFF_NEW_NAME
) ?
974 _("git apply: bad git-diff - inconsistent new filename on line %d") :
975 _("git apply: bad git-diff - inconsistent old filename on line %d"), state
->linenr
);
979 if (!starts_with(line
, "/dev/null\n"))
980 return error(_("git apply: bad git-diff - expected /dev/null on line %d"), state
->linenr
);
986 static int gitdiff_oldname(struct apply_state
*state
,
990 return gitdiff_verify_name(state
, line
,
991 patch
->is_new
, &patch
->old_name
,
995 static int gitdiff_newname(struct apply_state
*state
,
999 return gitdiff_verify_name(state
, line
,
1000 patch
->is_delete
, &patch
->new_name
,
1004 static int parse_mode_line(const char *line
, int linenr
, unsigned int *mode
)
1007 *mode
= strtoul(line
, &end
, 8);
1008 if (end
== line
|| !isspace(*end
))
1009 return error(_("invalid mode on line %d: %s"), linenr
, line
);
1013 static int gitdiff_oldmode(struct apply_state
*state
,
1015 struct patch
*patch
)
1017 return parse_mode_line(line
, state
->linenr
, &patch
->old_mode
);
1020 static int gitdiff_newmode(struct apply_state
*state
,
1022 struct patch
*patch
)
1024 return parse_mode_line(line
, state
->linenr
, &patch
->new_mode
);
1027 static int gitdiff_delete(struct apply_state
*state
,
1029 struct patch
*patch
)
1031 patch
->is_delete
= 1;
1032 free(patch
->old_name
);
1033 patch
->old_name
= xstrdup_or_null(patch
->def_name
);
1034 return gitdiff_oldmode(state
, line
, patch
);
1037 static int gitdiff_newfile(struct apply_state
*state
,
1039 struct patch
*patch
)
1042 free(patch
->new_name
);
1043 patch
->new_name
= xstrdup_or_null(patch
->def_name
);
1044 return gitdiff_newmode(state
, line
, patch
);
1047 static int gitdiff_copysrc(struct apply_state
*state
,
1049 struct patch
*patch
)
1052 free(patch
->old_name
);
1053 patch
->old_name
= find_name(state
, line
, NULL
, state
->p_value
? state
->p_value
- 1 : 0, 0);
1057 static int gitdiff_copydst(struct apply_state
*state
,
1059 struct patch
*patch
)
1062 free(patch
->new_name
);
1063 patch
->new_name
= find_name(state
, line
, NULL
, state
->p_value
? state
->p_value
- 1 : 0, 0);
1067 static int gitdiff_renamesrc(struct apply_state
*state
,
1069 struct patch
*patch
)
1071 patch
->is_rename
= 1;
1072 free(patch
->old_name
);
1073 patch
->old_name
= find_name(state
, line
, NULL
, state
->p_value
? state
->p_value
- 1 : 0, 0);
1077 static int gitdiff_renamedst(struct apply_state
*state
,
1079 struct patch
*patch
)
1081 patch
->is_rename
= 1;
1082 free(patch
->new_name
);
1083 patch
->new_name
= find_name(state
, line
, NULL
, state
->p_value
? state
->p_value
- 1 : 0, 0);
1087 static int gitdiff_similarity(struct apply_state
*state
,
1089 struct patch
*patch
)
1091 unsigned long val
= strtoul(line
, NULL
, 10);
1097 static int gitdiff_dissimilarity(struct apply_state
*state
,
1099 struct patch
*patch
)
1101 unsigned long val
= strtoul(line
, NULL
, 10);
1107 static int gitdiff_index(struct apply_state
*state
,
1109 struct patch
*patch
)
1112 * index line is N hexadecimal, "..", N hexadecimal,
1113 * and optional space with octal mode.
1115 const char *ptr
, *eol
;
1118 ptr
= strchr(line
, '.');
1119 if (!ptr
|| ptr
[1] != '.' || 40 < ptr
- line
)
1122 memcpy(patch
->old_sha1_prefix
, line
, len
);
1123 patch
->old_sha1_prefix
[len
] = 0;
1126 ptr
= strchr(line
, ' ');
1127 eol
= strchrnul(line
, '\n');
1129 if (!ptr
|| eol
< ptr
)
1135 memcpy(patch
->new_sha1_prefix
, line
, len
);
1136 patch
->new_sha1_prefix
[len
] = 0;
1138 return gitdiff_oldmode(state
, ptr
+ 1, patch
);
1143 * This is normal for a diff that doesn't change anything: we'll fall through
1144 * into the next diff. Tell the parser to break out.
1146 static int gitdiff_unrecognized(struct apply_state
*state
,
1148 struct patch
*patch
)
1154 * Skip p_value leading components from "line"; as we do not accept
1155 * absolute paths, return NULL in that case.
1157 static const char *skip_tree_prefix(struct apply_state
*state
,
1164 if (!state
->p_value
)
1165 return (llen
&& line
[0] == '/') ? NULL
: line
;
1167 nslash
= state
->p_value
;
1168 for (i
= 0; i
< llen
; i
++) {
1170 if (ch
== '/' && --nslash
<= 0)
1171 return (i
== 0) ? NULL
: &line
[i
+ 1];
1177 * This is to extract the same name that appears on "diff --git"
1178 * line. We do not find and return anything if it is a rename
1179 * patch, and it is OK because we will find the name elsewhere.
1180 * We need to reliably find name only when it is mode-change only,
1181 * creation or deletion of an empty file. In any of these cases,
1182 * both sides are the same name under a/ and b/ respectively.
1184 static char *git_header_name(struct apply_state
*state
,
1189 const char *second
= NULL
;
1190 size_t len
, line_len
;
1192 line
+= strlen("diff --git ");
1193 llen
-= strlen("diff --git ");
1197 struct strbuf first
= STRBUF_INIT
;
1198 struct strbuf sp
= STRBUF_INIT
;
1200 if (unquote_c_style(&first
, line
, &second
))
1201 goto free_and_fail1
;
1203 /* strip the a/b prefix including trailing slash */
1204 cp
= skip_tree_prefix(state
, first
.buf
, first
.len
);
1206 goto free_and_fail1
;
1207 strbuf_remove(&first
, 0, cp
- first
.buf
);
1210 * second points at one past closing dq of name.
1211 * find the second name.
1213 while ((second
< line
+ llen
) && isspace(*second
))
1216 if (line
+ llen
<= second
)
1217 goto free_and_fail1
;
1218 if (*second
== '"') {
1219 if (unquote_c_style(&sp
, second
, NULL
))
1220 goto free_and_fail1
;
1221 cp
= skip_tree_prefix(state
, sp
.buf
, sp
.len
);
1223 goto free_and_fail1
;
1224 /* They must match, otherwise ignore */
1225 if (strcmp(cp
, first
.buf
))
1226 goto free_and_fail1
;
1227 strbuf_release(&sp
);
1228 return strbuf_detach(&first
, NULL
);
1231 /* unquoted second */
1232 cp
= skip_tree_prefix(state
, second
, line
+ llen
- second
);
1234 goto free_and_fail1
;
1235 if (line
+ llen
- cp
!= first
.len
||
1236 memcmp(first
.buf
, cp
, first
.len
))
1237 goto free_and_fail1
;
1238 return strbuf_detach(&first
, NULL
);
1241 strbuf_release(&first
);
1242 strbuf_release(&sp
);
1246 /* unquoted first name */
1247 name
= skip_tree_prefix(state
, line
, llen
);
1252 * since the first name is unquoted, a dq if exists must be
1253 * the beginning of the second name.
1255 for (second
= name
; second
< line
+ llen
; second
++) {
1256 if (*second
== '"') {
1257 struct strbuf sp
= STRBUF_INIT
;
1260 if (unquote_c_style(&sp
, second
, NULL
))
1261 goto free_and_fail2
;
1263 np
= skip_tree_prefix(state
, sp
.buf
, sp
.len
);
1265 goto free_and_fail2
;
1267 len
= sp
.buf
+ sp
.len
- np
;
1268 if (len
< second
- name
&&
1269 !strncmp(np
, name
, len
) &&
1270 isspace(name
[len
])) {
1272 strbuf_remove(&sp
, 0, np
- sp
.buf
);
1273 return strbuf_detach(&sp
, NULL
);
1277 strbuf_release(&sp
);
1283 * Accept a name only if it shows up twice, exactly the same
1286 second
= strchr(name
, '\n');
1289 line_len
= second
- name
;
1290 for (len
= 0 ; ; len
++) {
1291 switch (name
[len
]) {
1296 case '\t': case ' ':
1298 * Is this the separator between the preimage
1299 * and the postimage pathname? Again, we are
1300 * only interested in the case where there is
1301 * no rename, as this is only to set def_name
1302 * and a rename patch has the names elsewhere
1303 * in an unambiguous form.
1306 return NULL
; /* no postimage name */
1307 second
= skip_tree_prefix(state
, name
+ len
+ 1,
1308 line_len
- (len
+ 1));
1312 * Does len bytes starting at "name" and "second"
1313 * (that are separated by one HT or SP we just
1314 * found) exactly match?
1316 if (second
[len
] == '\n' && !strncmp(name
, second
, len
))
1317 return xmemdupz(name
, len
);
1322 static int check_header_line(struct apply_state
*state
, struct patch
*patch
)
1324 int extensions
= (patch
->is_delete
== 1) + (patch
->is_new
== 1) +
1325 (patch
->is_rename
== 1) + (patch
->is_copy
== 1);
1327 return error(_("inconsistent header lines %d and %d"),
1328 patch
->extension_linenr
, state
->linenr
);
1329 if (extensions
&& !patch
->extension_linenr
)
1330 patch
->extension_linenr
= state
->linenr
;
1334 /* Verify that we recognize the lines following a git header */
1335 static int parse_git_header(struct apply_state
*state
,
1339 struct patch
*patch
)
1341 unsigned long offset
;
1343 /* A git diff has explicit new/delete information, so we don't guess */
1345 patch
->is_delete
= 0;
1348 * Some things may not have the old name in the
1349 * rest of the headers anywhere (pure mode changes,
1350 * or removing or adding empty files), so we get
1351 * the default name from the header.
1353 patch
->def_name
= git_header_name(state
, line
, len
);
1354 if (patch
->def_name
&& state
->root
.len
) {
1355 char *s
= xstrfmt("%s%s", state
->root
.buf
, patch
->def_name
);
1356 free(patch
->def_name
);
1357 patch
->def_name
= s
;
1363 for (offset
= len
; size
> 0 ; offset
+= len
, size
-= len
, line
+= len
, state
->linenr
++) {
1364 static const struct opentry
{
1366 int (*fn
)(struct apply_state
*, const char *, struct patch
*);
1368 { "@@ -", gitdiff_hdrend
},
1369 { "--- ", gitdiff_oldname
},
1370 { "+++ ", gitdiff_newname
},
1371 { "old mode ", gitdiff_oldmode
},
1372 { "new mode ", gitdiff_newmode
},
1373 { "deleted file mode ", gitdiff_delete
},
1374 { "new file mode ", gitdiff_newfile
},
1375 { "copy from ", gitdiff_copysrc
},
1376 { "copy to ", gitdiff_copydst
},
1377 { "rename old ", gitdiff_renamesrc
},
1378 { "rename new ", gitdiff_renamedst
},
1379 { "rename from ", gitdiff_renamesrc
},
1380 { "rename to ", gitdiff_renamedst
},
1381 { "similarity index ", gitdiff_similarity
},
1382 { "dissimilarity index ", gitdiff_dissimilarity
},
1383 { "index ", gitdiff_index
},
1384 { "", gitdiff_unrecognized
},
1388 len
= linelen(line
, size
);
1389 if (!len
|| line
[len
-1] != '\n')
1391 for (i
= 0; i
< ARRAY_SIZE(optable
); i
++) {
1392 const struct opentry
*p
= optable
+ i
;
1393 int oplen
= strlen(p
->str
);
1395 if (len
< oplen
|| memcmp(p
->str
, line
, oplen
))
1397 res
= p
->fn(state
, line
+ oplen
, patch
);
1400 if (check_header_line(state
, patch
))
1411 static int parse_num(const char *line
, unsigned long *p
)
1415 if (!isdigit(*line
))
1417 *p
= strtoul(line
, &ptr
, 10);
1421 static int parse_range(const char *line
, int len
, int offset
, const char *expect
,
1422 unsigned long *p1
, unsigned long *p2
)
1426 if (offset
< 0 || offset
>= len
)
1431 digits
= parse_num(line
, p1
);
1441 digits
= parse_num(line
+1, p2
);
1450 ex
= strlen(expect
);
1453 if (memcmp(line
, expect
, ex
))
1459 static void recount_diff(const char *line
, int size
, struct fragment
*fragment
)
1461 int oldlines
= 0, newlines
= 0, ret
= 0;
1464 warning("recount: ignore empty hunk");
1469 int len
= linelen(line
, size
);
1477 case ' ': case '\n':
1489 ret
= size
< 3 || !starts_with(line
, "@@ ");
1492 ret
= size
< 5 || !starts_with(line
, "diff ");
1499 warning(_("recount: unexpected line: %.*s"),
1500 (int)linelen(line
, size
), line
);
1505 fragment
->oldlines
= oldlines
;
1506 fragment
->newlines
= newlines
;
1510 * Parse a unified diff fragment header of the
1511 * form "@@ -a,b +c,d @@"
1513 static int parse_fragment_header(const char *line
, int len
, struct fragment
*fragment
)
1517 if (!len
|| line
[len
-1] != '\n')
1520 /* Figure out the number of lines in a fragment */
1521 offset
= parse_range(line
, len
, 4, " +", &fragment
->oldpos
, &fragment
->oldlines
);
1522 offset
= parse_range(line
, len
, offset
, " @@", &fragment
->newpos
, &fragment
->newlines
);
1528 * Find file diff header
1531 * -1 if no header was found
1532 * -128 in case of error
1533 * the size of the header in bytes (called "offset") otherwise
1535 static int find_header(struct apply_state
*state
,
1539 struct patch
*patch
)
1541 unsigned long offset
, len
;
1543 patch
->is_toplevel_relative
= 0;
1544 patch
->is_rename
= patch
->is_copy
= 0;
1545 patch
->is_new
= patch
->is_delete
= -1;
1546 patch
->old_mode
= patch
->new_mode
= 0;
1547 patch
->old_name
= patch
->new_name
= NULL
;
1548 for (offset
= 0; size
> 0; offset
+= len
, size
-= len
, line
+= len
, state
->linenr
++) {
1549 unsigned long nextlen
;
1551 len
= linelen(line
, size
);
1555 /* Testing this early allows us to take a few shortcuts.. */
1560 * Make sure we don't find any unconnected patch fragments.
1561 * That's a sign that we didn't find a header, and that a
1562 * patch has become corrupted/broken up.
1564 if (!memcmp("@@ -", line
, 4)) {
1565 struct fragment dummy
;
1566 if (parse_fragment_header(line
, len
, &dummy
) < 0)
1568 error(_("patch fragment without header at line %d: %.*s"),
1569 state
->linenr
, (int)len
-1, line
);
1577 * Git patch? It might not have a real patch, just a rename
1578 * or mode change, so we handle that specially
1580 if (!memcmp("diff --git ", line
, 11)) {
1581 int git_hdr_len
= parse_git_header(state
, line
, len
, size
, patch
);
1582 if (git_hdr_len
< 0)
1584 if (git_hdr_len
<= len
)
1586 if (!patch
->old_name
&& !patch
->new_name
) {
1587 if (!patch
->def_name
) {
1588 error(Q_("git diff header lacks filename information when removing "
1589 "%d leading pathname component (line %d)",
1590 "git diff header lacks filename information when removing "
1591 "%d leading pathname components (line %d)",
1593 state
->p_value
, state
->linenr
);
1596 patch
->old_name
= xstrdup(patch
->def_name
);
1597 patch
->new_name
= xstrdup(patch
->def_name
);
1599 if ((!patch
->new_name
&& !patch
->is_delete
) ||
1600 (!patch
->old_name
&& !patch
->is_new
)) {
1601 error(_("git diff header lacks filename information "
1602 "(line %d)"), state
->linenr
);
1605 patch
->is_toplevel_relative
= 1;
1606 *hdrsize
= git_hdr_len
;
1610 /* --- followed by +++ ? */
1611 if (memcmp("--- ", line
, 4) || memcmp("+++ ", line
+ len
, 4))
1615 * We only accept unified patches, so we want it to
1616 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
1617 * minimum ("@@ -0,0 +1 @@\n" is the shortest).
1619 nextlen
= linelen(line
+ len
, size
- len
);
1620 if (size
< nextlen
+ 14 || memcmp("@@ -", line
+ len
+ nextlen
, 4))
1623 /* Ok, we'll consider it a patch */
1624 if (parse_traditional_patch(state
, line
, line
+len
, patch
))
1626 *hdrsize
= len
+ nextlen
;
1633 static void record_ws_error(struct apply_state
*state
,
1644 state
->whitespace_error
++;
1645 if (state
->squelch_whitespace_errors
&&
1646 state
->squelch_whitespace_errors
< state
->whitespace_error
)
1649 err
= whitespace_error_string(result
);
1650 if (state
->apply_verbosity
> verbosity_silent
)
1651 fprintf(stderr
, "%s:%d: %s.\n%.*s\n",
1652 state
->patch_input_file
, linenr
, err
, len
, line
);
1656 static void check_whitespace(struct apply_state
*state
,
1661 unsigned result
= ws_check(line
+ 1, len
- 1, ws_rule
);
1663 record_ws_error(state
, result
, line
+ 1, len
- 2, state
->linenr
);
1667 * Check if the patch has context lines with CRLF or
1668 * the patch wants to remove lines with CRLF.
1670 static void check_old_for_crlf(struct patch
*patch
, const char *line
, int len
)
1672 if (len
>= 2 && line
[len
-1] == '\n' && line
[len
-2] == '\r') {
1673 patch
->ws_rule
|= WS_CR_AT_EOL
;
1674 patch
->crlf_in_old
= 1;
1680 * Parse a unified diff. Note that this really needs to parse each
1681 * fragment separately, since the only way to know the difference
1682 * between a "---" that is part of a patch, and a "---" that starts
1683 * the next patch is to look at the line counts..
1685 static int parse_fragment(struct apply_state
*state
,
1688 struct patch
*patch
,
1689 struct fragment
*fragment
)
1692 int len
= linelen(line
, size
), offset
;
1693 unsigned long oldlines
, newlines
;
1694 unsigned long leading
, trailing
;
1696 offset
= parse_fragment_header(line
, len
, fragment
);
1699 if (offset
> 0 && patch
->recount
)
1700 recount_diff(line
+ offset
, size
- offset
, fragment
);
1701 oldlines
= fragment
->oldlines
;
1702 newlines
= fragment
->newlines
;
1706 /* Parse the thing.. */
1710 added
= deleted
= 0;
1713 offset
+= len
, size
-= len
, line
+= len
, state
->linenr
++) {
1714 if (!oldlines
&& !newlines
)
1716 len
= linelen(line
, size
);
1717 if (!len
|| line
[len
-1] != '\n')
1722 case '\n': /* newer GNU diff, an empty context line */
1726 if (!deleted
&& !added
)
1729 check_old_for_crlf(patch
, line
, len
);
1730 if (!state
->apply_in_reverse
&&
1731 state
->ws_error_action
== correct_ws_error
)
1732 check_whitespace(state
, line
, len
, patch
->ws_rule
);
1735 if (!state
->apply_in_reverse
)
1736 check_old_for_crlf(patch
, line
, len
);
1737 if (state
->apply_in_reverse
&&
1738 state
->ws_error_action
!= nowarn_ws_error
)
1739 check_whitespace(state
, line
, len
, patch
->ws_rule
);
1745 if (state
->apply_in_reverse
)
1746 check_old_for_crlf(patch
, line
, len
);
1747 if (!state
->apply_in_reverse
&&
1748 state
->ws_error_action
!= nowarn_ws_error
)
1749 check_whitespace(state
, line
, len
, patch
->ws_rule
);
1756 * We allow "\ No newline at end of file". Depending
1757 * on locale settings when the patch was produced we
1758 * don't know what this line looks like. The only
1759 * thing we do know is that it begins with "\ ".
1760 * Checking for 12 is just for sanity check -- any
1761 * l10n of "\ No newline..." is at least that long.
1764 if (len
< 12 || memcmp(line
, "\\ ", 2))
1769 if (oldlines
|| newlines
)
1771 if (!deleted
&& !added
)
1774 fragment
->leading
= leading
;
1775 fragment
->trailing
= trailing
;
1778 * If a fragment ends with an incomplete line, we failed to include
1779 * it in the above loop because we hit oldlines == newlines == 0
1782 if (12 < size
&& !memcmp(line
, "\\ ", 2))
1783 offset
+= linelen(line
, size
);
1785 patch
->lines_added
+= added
;
1786 patch
->lines_deleted
+= deleted
;
1788 if (0 < patch
->is_new
&& oldlines
)
1789 return error(_("new file depends on old contents"));
1790 if (0 < patch
->is_delete
&& newlines
)
1791 return error(_("deleted file still has contents"));
1796 * We have seen "diff --git a/... b/..." header (or a traditional patch
1797 * header). Read hunks that belong to this patch into fragments and hang
1798 * them to the given patch structure.
1800 * The (fragment->patch, fragment->size) pair points into the memory given
1801 * by the caller, not a copy, when we return.
1804 * -1 in case of error,
1805 * the number of bytes in the patch otherwise.
1807 static int parse_single_patch(struct apply_state
*state
,
1810 struct patch
*patch
)
1812 unsigned long offset
= 0;
1813 unsigned long oldlines
= 0, newlines
= 0, context
= 0;
1814 struct fragment
**fragp
= &patch
->fragments
;
1816 while (size
> 4 && !memcmp(line
, "@@ -", 4)) {
1817 struct fragment
*fragment
;
1820 fragment
= xcalloc(1, sizeof(*fragment
));
1821 fragment
->linenr
= state
->linenr
;
1822 len
= parse_fragment(state
, line
, size
, patch
, fragment
);
1825 return error(_("corrupt patch at line %d"), state
->linenr
);
1827 fragment
->patch
= line
;
1828 fragment
->size
= len
;
1829 oldlines
+= fragment
->oldlines
;
1830 newlines
+= fragment
->newlines
;
1831 context
+= fragment
->leading
+ fragment
->trailing
;
1834 fragp
= &fragment
->next
;
1842 * If something was removed (i.e. we have old-lines) it cannot
1843 * be creation, and if something was added it cannot be
1844 * deletion. However, the reverse is not true; --unified=0
1845 * patches that only add are not necessarily creation even
1846 * though they do not have any old lines, and ones that only
1847 * delete are not necessarily deletion.
1849 * Unfortunately, a real creation/deletion patch do _not_ have
1850 * any context line by definition, so we cannot safely tell it
1851 * apart with --unified=0 insanity. At least if the patch has
1852 * more than one hunk it is not creation or deletion.
1854 if (patch
->is_new
< 0 &&
1855 (oldlines
|| (patch
->fragments
&& patch
->fragments
->next
)))
1857 if (patch
->is_delete
< 0 &&
1858 (newlines
|| (patch
->fragments
&& patch
->fragments
->next
)))
1859 patch
->is_delete
= 0;
1861 if (0 < patch
->is_new
&& oldlines
)
1862 return error(_("new file %s depends on old contents"), patch
->new_name
);
1863 if (0 < patch
->is_delete
&& newlines
)
1864 return error(_("deleted file %s still has contents"), patch
->old_name
);
1865 if (!patch
->is_delete
&& !newlines
&& context
&& state
->apply_verbosity
> verbosity_silent
)
1868 "file %s becomes empty but is not deleted"),
1874 static inline int metadata_changes(struct patch
*patch
)
1876 return patch
->is_rename
> 0 ||
1877 patch
->is_copy
> 0 ||
1878 patch
->is_new
> 0 ||
1880 (patch
->old_mode
&& patch
->new_mode
&&
1881 patch
->old_mode
!= patch
->new_mode
);
1884 static char *inflate_it(const void *data
, unsigned long size
,
1885 unsigned long inflated_size
)
1891 memset(&stream
, 0, sizeof(stream
));
1893 stream
.next_in
= (unsigned char *)data
;
1894 stream
.avail_in
= size
;
1895 stream
.next_out
= out
= xmalloc(inflated_size
);
1896 stream
.avail_out
= inflated_size
;
1897 git_inflate_init(&stream
);
1898 st
= git_inflate(&stream
, Z_FINISH
);
1899 git_inflate_end(&stream
);
1900 if ((st
!= Z_STREAM_END
) || stream
.total_out
!= inflated_size
) {
1908 * Read a binary hunk and return a new fragment; fragment->patch
1909 * points at an allocated memory that the caller must free, so
1910 * it is marked as "->free_patch = 1".
1912 static struct fragment
*parse_binary_hunk(struct apply_state
*state
,
1914 unsigned long *sz_p
,
1919 * Expect a line that begins with binary patch method ("literal"
1920 * or "delta"), followed by the length of data before deflating.
1921 * a sequence of 'length-byte' followed by base-85 encoded data
1922 * should follow, terminated by a newline.
1924 * Each 5-byte sequence of base-85 encodes up to 4 bytes,
1925 * and we would limit the patch line to 66 characters,
1926 * so one line can fit up to 13 groups that would decode
1927 * to 52 bytes max. The length byte 'A'-'Z' corresponds
1928 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
1931 unsigned long size
= *sz_p
;
1932 char *buffer
= *buf_p
;
1934 unsigned long origlen
;
1937 struct fragment
*frag
;
1939 llen
= linelen(buffer
, size
);
1944 if (starts_with(buffer
, "delta ")) {
1945 patch_method
= BINARY_DELTA_DEFLATED
;
1946 origlen
= strtoul(buffer
+ 6, NULL
, 10);
1948 else if (starts_with(buffer
, "literal ")) {
1949 patch_method
= BINARY_LITERAL_DEFLATED
;
1950 origlen
= strtoul(buffer
+ 8, NULL
, 10);
1958 int byte_length
, max_byte_length
, newsize
;
1959 llen
= linelen(buffer
, size
);
1963 /* consume the blank line */
1969 * Minimum line is "A00000\n" which is 7-byte long,
1970 * and the line length must be multiple of 5 plus 2.
1972 if ((llen
< 7) || (llen
-2) % 5)
1974 max_byte_length
= (llen
- 2) / 5 * 4;
1975 byte_length
= *buffer
;
1976 if ('A' <= byte_length
&& byte_length
<= 'Z')
1977 byte_length
= byte_length
- 'A' + 1;
1978 else if ('a' <= byte_length
&& byte_length
<= 'z')
1979 byte_length
= byte_length
- 'a' + 27;
1982 /* if the input length was not multiple of 4, we would
1983 * have filler at the end but the filler should never
1986 if (max_byte_length
< byte_length
||
1987 byte_length
<= max_byte_length
- 4)
1989 newsize
= hunk_size
+ byte_length
;
1990 data
= xrealloc(data
, newsize
);
1991 if (decode_85(data
+ hunk_size
, buffer
+ 1, byte_length
))
1993 hunk_size
= newsize
;
1998 frag
= xcalloc(1, sizeof(*frag
));
1999 frag
->patch
= inflate_it(data
, hunk_size
, origlen
);
2000 frag
->free_patch
= 1;
2004 frag
->size
= origlen
;
2008 frag
->binary_patch_method
= patch_method
;
2014 error(_("corrupt binary patch at line %d: %.*s"),
2015 state
->linenr
-1, llen
-1, buffer
);
2021 * -1 in case of error,
2022 * the length of the parsed binary patch otherwise
2024 static int parse_binary(struct apply_state
*state
,
2027 struct patch
*patch
)
2030 * We have read "GIT binary patch\n"; what follows is a line
2031 * that says the patch method (currently, either "literal" or
2032 * "delta") and the length of data before deflating; a
2033 * sequence of 'length-byte' followed by base-85 encoded data
2036 * When a binary patch is reversible, there is another binary
2037 * hunk in the same format, starting with patch method (either
2038 * "literal" or "delta") with the length of data, and a sequence
2039 * of length-byte + base-85 encoded data, terminated with another
2040 * empty line. This data, when applied to the postimage, produces
2043 struct fragment
*forward
;
2044 struct fragment
*reverse
;
2048 forward
= parse_binary_hunk(state
, &buffer
, &size
, &status
, &used
);
2049 if (!forward
&& !status
)
2050 /* there has to be one hunk (forward hunk) */
2051 return error(_("unrecognized binary patch at line %d"), state
->linenr
-1);
2053 /* otherwise we already gave an error message */
2056 reverse
= parse_binary_hunk(state
, &buffer
, &size
, &status
, &used_1
);
2061 * Not having reverse hunk is not an error, but having
2062 * a corrupt reverse hunk is.
2064 free((void*) forward
->patch
);
2068 forward
->next
= reverse
;
2069 patch
->fragments
= forward
;
2070 patch
->is_binary
= 1;
2074 static void prefix_one(struct apply_state
*state
, char **name
)
2076 char *old_name
= *name
;
2079 *name
= prefix_filename(state
->prefix
, *name
);
2083 static void prefix_patch(struct apply_state
*state
, struct patch
*p
)
2085 if (!state
->prefix
|| p
->is_toplevel_relative
)
2087 prefix_one(state
, &p
->new_name
);
2088 prefix_one(state
, &p
->old_name
);
2095 static void add_name_limit(struct apply_state
*state
,
2099 struct string_list_item
*it
;
2101 it
= string_list_append(&state
->limit_by_name
, name
);
2102 it
->util
= exclude
? NULL
: (void *) 1;
2105 static int use_patch(struct apply_state
*state
, struct patch
*p
)
2107 const char *pathname
= p
->new_name
? p
->new_name
: p
->old_name
;
2110 /* Paths outside are not touched regardless of "--include" */
2111 if (0 < state
->prefix_length
) {
2112 int pathlen
= strlen(pathname
);
2113 if (pathlen
<= state
->prefix_length
||
2114 memcmp(state
->prefix
, pathname
, state
->prefix_length
))
2118 /* See if it matches any of exclude/include rule */
2119 for (i
= 0; i
< state
->limit_by_name
.nr
; i
++) {
2120 struct string_list_item
*it
= &state
->limit_by_name
.items
[i
];
2121 if (!wildmatch(it
->string
, pathname
, 0))
2122 return (it
->util
!= NULL
);
2126 * If we had any include, a path that does not match any rule is
2127 * not used. Otherwise, we saw bunch of exclude rules (or none)
2128 * and such a path is used.
2130 return !state
->has_include
;
2134 * Read the patch text in "buffer" that extends for "size" bytes; stop
2135 * reading after seeing a single patch (i.e. changes to a single file).
2136 * Create fragments (i.e. patch hunks) and hang them to the given patch.
2139 * -1 if no header was found or parse_binary() failed,
2140 * -128 on another error,
2141 * the number of bytes consumed otherwise,
2142 * so that the caller can call us again for the next patch.
2144 static int parse_chunk(struct apply_state
*state
, char *buffer
, unsigned long size
, struct patch
*patch
)
2146 int hdrsize
, patchsize
;
2147 int offset
= find_header(state
, buffer
, size
, &hdrsize
, patch
);
2152 prefix_patch(state
, patch
);
2154 if (!use_patch(state
, patch
))
2157 patch
->ws_rule
= whitespace_rule(patch
->new_name
2161 patchsize
= parse_single_patch(state
,
2162 buffer
+ offset
+ hdrsize
,
2163 size
- offset
- hdrsize
,
2170 static const char git_binary
[] = "GIT binary patch\n";
2171 int hd
= hdrsize
+ offset
;
2172 unsigned long llen
= linelen(buffer
+ hd
, size
- hd
);
2174 if (llen
== sizeof(git_binary
) - 1 &&
2175 !memcmp(git_binary
, buffer
+ hd
, llen
)) {
2178 used
= parse_binary(state
, buffer
+ hd
+ llen
,
2179 size
- hd
- llen
, patch
);
2183 patchsize
= used
+ llen
;
2187 else if (!memcmp(" differ\n", buffer
+ hd
+ llen
- 8, 8)) {
2188 static const char *binhdr
[] = {
2194 for (i
= 0; binhdr
[i
]; i
++) {
2195 int len
= strlen(binhdr
[i
]);
2196 if (len
< size
- hd
&&
2197 !memcmp(binhdr
[i
], buffer
+ hd
, len
)) {
2199 patch
->is_binary
= 1;
2206 /* Empty patch cannot be applied if it is a text patch
2207 * without metadata change. A binary patch appears
2210 if ((state
->apply
|| state
->check
) &&
2211 (!patch
->is_binary
&& !metadata_changes(patch
))) {
2212 error(_("patch with only garbage at line %d"), state
->linenr
);
2217 return offset
+ hdrsize
+ patchsize
;
2220 static void reverse_patches(struct patch
*p
)
2222 for (; p
; p
= p
->next
) {
2223 struct fragment
*frag
= p
->fragments
;
2225 SWAP(p
->new_name
, p
->old_name
);
2226 SWAP(p
->new_mode
, p
->old_mode
);
2227 SWAP(p
->is_new
, p
->is_delete
);
2228 SWAP(p
->lines_added
, p
->lines_deleted
);
2229 SWAP(p
->old_sha1_prefix
, p
->new_sha1_prefix
);
2231 for (; frag
; frag
= frag
->next
) {
2232 SWAP(frag
->newpos
, frag
->oldpos
);
2233 SWAP(frag
->newlines
, frag
->oldlines
);
2238 static const char pluses
[] =
2239 "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
2240 static const char minuses
[]=
2241 "----------------------------------------------------------------------";
2243 static void show_stats(struct apply_state
*state
, struct patch
*patch
)
2245 struct strbuf qname
= STRBUF_INIT
;
2246 char *cp
= patch
->new_name
? patch
->new_name
: patch
->old_name
;
2249 quote_c_style(cp
, &qname
, NULL
, 0);
2252 * "scale" the filename
2254 max
= state
->max_len
;
2258 if (qname
.len
> max
) {
2259 cp
= strchr(qname
.buf
+ qname
.len
+ 3 - max
, '/');
2261 cp
= qname
.buf
+ qname
.len
+ 3 - max
;
2262 strbuf_splice(&qname
, 0, cp
- qname
.buf
, "...", 3);
2265 if (patch
->is_binary
) {
2266 printf(" %-*s | Bin\n", max
, qname
.buf
);
2267 strbuf_release(&qname
);
2271 printf(" %-*s |", max
, qname
.buf
);
2272 strbuf_release(&qname
);
2275 * scale the add/delete
2277 max
= max
+ state
->max_change
> 70 ? 70 - max
: state
->max_change
;
2278 add
= patch
->lines_added
;
2279 del
= patch
->lines_deleted
;
2281 if (state
->max_change
> 0) {
2282 int total
= ((add
+ del
) * max
+ state
->max_change
/ 2) / state
->max_change
;
2283 add
= (add
* max
+ state
->max_change
/ 2) / state
->max_change
;
2286 printf("%5d %.*s%.*s\n", patch
->lines_added
+ patch
->lines_deleted
,
2287 add
, pluses
, del
, minuses
);
2290 static int read_old_data(struct stat
*st
, struct patch
*patch
,
2291 const char *path
, struct strbuf
*buf
)
2293 enum safe_crlf safe_crlf
= patch
->crlf_in_old
?
2294 SAFE_CRLF_KEEP_CRLF
: SAFE_CRLF_RENORMALIZE
;
2295 switch (st
->st_mode
& S_IFMT
) {
2297 if (strbuf_readlink(buf
, path
, st
->st_size
) < 0)
2298 return error(_("unable to read symlink %s"), path
);
2301 if (strbuf_read_file(buf
, path
, st
->st_size
) != st
->st_size
)
2302 return error(_("unable to open or read %s"), path
);
2304 * "git apply" without "--index/--cached" should never look
2305 * at the index; the target file may not have been added to
2306 * the index yet, and we may not even be in any Git repository.
2307 * Pass NULL to convert_to_git() to stress this; the function
2308 * should never look at the index when explicit crlf option
2311 convert_to_git(NULL
, path
, buf
->buf
, buf
->len
, buf
, safe_crlf
);
2319 * Update the preimage, and the common lines in postimage,
2320 * from buffer buf of length len. If postlen is 0 the postimage
2321 * is updated in place, otherwise it's updated on a new buffer
2325 static void update_pre_post_images(struct image
*preimage
,
2326 struct image
*postimage
,
2328 size_t len
, size_t postlen
)
2330 int i
, ctx
, reduced
;
2331 char *new, *old
, *fixed
;
2332 struct image fixed_preimage
;
2335 * Update the preimage with whitespace fixes. Note that we
2336 * are not losing preimage->buf -- apply_one_fragment() will
2339 prepare_image(&fixed_preimage
, buf
, len
, 1);
2341 ? fixed_preimage
.nr
== preimage
->nr
2342 : fixed_preimage
.nr
<= preimage
->nr
);
2343 for (i
= 0; i
< fixed_preimage
.nr
; i
++)
2344 fixed_preimage
.line
[i
].flag
= preimage
->line
[i
].flag
;
2345 free(preimage
->line_allocated
);
2346 *preimage
= fixed_preimage
;
2349 * Adjust the common context lines in postimage. This can be
2350 * done in-place when we are shrinking it with whitespace
2351 * fixing, but needs a new buffer when ignoring whitespace or
2352 * expanding leading tabs to spaces.
2354 * We trust the caller to tell us if the update can be done
2355 * in place (postlen==0) or not.
2357 old
= postimage
->buf
;
2359 new = postimage
->buf
= xmalloc(postlen
);
2362 fixed
= preimage
->buf
;
2364 for (i
= reduced
= ctx
= 0; i
< postimage
->nr
; i
++) {
2365 size_t l_len
= postimage
->line
[i
].len
;
2366 if (!(postimage
->line
[i
].flag
& LINE_COMMON
)) {
2367 /* an added line -- no counterparts in preimage */
2368 memmove(new, old
, l_len
);
2374 /* a common context -- skip it in the original postimage */
2377 /* and find the corresponding one in the fixed preimage */
2378 while (ctx
< preimage
->nr
&&
2379 !(preimage
->line
[ctx
].flag
& LINE_COMMON
)) {
2380 fixed
+= preimage
->line
[ctx
].len
;
2385 * preimage is expected to run out, if the caller
2386 * fixed addition of trailing blank lines.
2388 if (preimage
->nr
<= ctx
) {
2393 /* and copy it in, while fixing the line length */
2394 l_len
= preimage
->line
[ctx
].len
;
2395 memcpy(new, fixed
, l_len
);
2398 postimage
->line
[i
].len
= l_len
;
2403 ? postlen
< new - postimage
->buf
2404 : postimage
->len
< new - postimage
->buf
)
2405 die("BUG: caller miscounted postlen: asked %d, orig = %d, used = %d",
2406 (int)postlen
, (int) postimage
->len
, (int)(new - postimage
->buf
));
2408 /* Fix the length of the whole thing */
2409 postimage
->len
= new - postimage
->buf
;
2410 postimage
->nr
-= reduced
;
2413 static int line_by_line_fuzzy_match(struct image
*img
,
2414 struct image
*preimage
,
2415 struct image
*postimage
,
2423 size_t postlen
= postimage
->len
;
2428 struct strbuf fixed
;
2432 for (i
= 0; i
< preimage_limit
; i
++) {
2433 size_t prelen
= preimage
->line
[i
].len
;
2434 size_t imglen
= img
->line
[try_lno
+i
].len
;
2436 if (!fuzzy_matchlines(img
->buf
+ try + imgoff
, imglen
,
2437 preimage
->buf
+ preoff
, prelen
))
2439 if (preimage
->line
[i
].flag
& LINE_COMMON
)
2440 postlen
+= imglen
- prelen
;
2446 * Ok, the preimage matches with whitespace fuzz.
2448 * imgoff now holds the true length of the target that
2449 * matches the preimage before the end of the file.
2451 * Count the number of characters in the preimage that fall
2452 * beyond the end of the file and make sure that all of them
2453 * are whitespace characters. (This can only happen if
2454 * we are removing blank lines at the end of the file.)
2456 buf
= preimage_eof
= preimage
->buf
+ preoff
;
2457 for ( ; i
< preimage
->nr
; i
++)
2458 preoff
+= preimage
->line
[i
].len
;
2459 preimage_end
= preimage
->buf
+ preoff
;
2460 for ( ; buf
< preimage_end
; buf
++)
2465 * Update the preimage and the common postimage context
2466 * lines to use the same whitespace as the target.
2467 * If whitespace is missing in the target (i.e.
2468 * if the preimage extends beyond the end of the file),
2469 * use the whitespace from the preimage.
2471 extra_chars
= preimage_end
- preimage_eof
;
2472 strbuf_init(&fixed
, imgoff
+ extra_chars
);
2473 strbuf_add(&fixed
, img
->buf
+ try, imgoff
);
2474 strbuf_add(&fixed
, preimage_eof
, extra_chars
);
2475 fixed_buf
= strbuf_detach(&fixed
, &fixed_len
);
2476 update_pre_post_images(preimage
, postimage
,
2477 fixed_buf
, fixed_len
, postlen
);
2481 static int match_fragment(struct apply_state
*state
,
2483 struct image
*preimage
,
2484 struct image
*postimage
,
2488 int match_beginning
, int match_end
)
2491 char *fixed_buf
, *buf
, *orig
, *target
;
2492 struct strbuf fixed
;
2493 size_t fixed_len
, postlen
;
2496 if (preimage
->nr
+ try_lno
<= img
->nr
) {
2498 * The hunk falls within the boundaries of img.
2500 preimage_limit
= preimage
->nr
;
2501 if (match_end
&& (preimage
->nr
+ try_lno
!= img
->nr
))
2503 } else if (state
->ws_error_action
== correct_ws_error
&&
2504 (ws_rule
& WS_BLANK_AT_EOF
)) {
2506 * This hunk extends beyond the end of img, and we are
2507 * removing blank lines at the end of the file. This
2508 * many lines from the beginning of the preimage must
2509 * match with img, and the remainder of the preimage
2512 preimage_limit
= img
->nr
- try_lno
;
2515 * The hunk extends beyond the end of the img and
2516 * we are not removing blanks at the end, so we
2517 * should reject the hunk at this position.
2522 if (match_beginning
&& try_lno
)
2525 /* Quick hash check */
2526 for (i
= 0; i
< preimage_limit
; i
++)
2527 if ((img
->line
[try_lno
+ i
].flag
& LINE_PATCHED
) ||
2528 (preimage
->line
[i
].hash
!= img
->line
[try_lno
+ i
].hash
))
2531 if (preimage_limit
== preimage
->nr
) {
2533 * Do we have an exact match? If we were told to match
2534 * at the end, size must be exactly at try+fragsize,
2535 * otherwise try+fragsize must be still within the preimage,
2536 * and either case, the old piece should match the preimage
2540 ? (try + preimage
->len
== img
->len
)
2541 : (try + preimage
->len
<= img
->len
)) &&
2542 !memcmp(img
->buf
+ try, preimage
->buf
, preimage
->len
))
2546 * The preimage extends beyond the end of img, so
2547 * there cannot be an exact match.
2549 * There must be one non-blank context line that match
2550 * a line before the end of img.
2554 buf
= preimage
->buf
;
2556 for (i
= 0; i
< preimage_limit
; i
++)
2557 buf_end
+= preimage
->line
[i
].len
;
2559 for ( ; buf
< buf_end
; buf
++)
2567 * No exact match. If we are ignoring whitespace, run a line-by-line
2568 * fuzzy matching. We collect all the line length information because
2569 * we need it to adjust whitespace if we match.
2571 if (state
->ws_ignore_action
== ignore_ws_change
)
2572 return line_by_line_fuzzy_match(img
, preimage
, postimage
,
2573 try, try_lno
, preimage_limit
);
2575 if (state
->ws_error_action
!= correct_ws_error
)
2579 * The hunk does not apply byte-by-byte, but the hash says
2580 * it might with whitespace fuzz. We weren't asked to
2581 * ignore whitespace, we were asked to correct whitespace
2582 * errors, so let's try matching after whitespace correction.
2584 * While checking the preimage against the target, whitespace
2585 * errors in both fixed, we count how large the corresponding
2586 * postimage needs to be. The postimage prepared by
2587 * apply_one_fragment() has whitespace errors fixed on added
2588 * lines already, but the common lines were propagated as-is,
2589 * which may become longer when their whitespace errors are
2593 /* First count added lines in postimage */
2595 for (i
= 0; i
< postimage
->nr
; i
++) {
2596 if (!(postimage
->line
[i
].flag
& LINE_COMMON
))
2597 postlen
+= postimage
->line
[i
].len
;
2601 * The preimage may extend beyond the end of the file,
2602 * but in this loop we will only handle the part of the
2603 * preimage that falls within the file.
2605 strbuf_init(&fixed
, preimage
->len
+ 1);
2606 orig
= preimage
->buf
;
2607 target
= img
->buf
+ try;
2608 for (i
= 0; i
< preimage_limit
; i
++) {
2609 size_t oldlen
= preimage
->line
[i
].len
;
2610 size_t tgtlen
= img
->line
[try_lno
+ i
].len
;
2611 size_t fixstart
= fixed
.len
;
2612 struct strbuf tgtfix
;
2615 /* Try fixing the line in the preimage */
2616 ws_fix_copy(&fixed
, orig
, oldlen
, ws_rule
, NULL
);
2618 /* Try fixing the line in the target */
2619 strbuf_init(&tgtfix
, tgtlen
);
2620 ws_fix_copy(&tgtfix
, target
, tgtlen
, ws_rule
, NULL
);
2623 * If they match, either the preimage was based on
2624 * a version before our tree fixed whitespace breakage,
2625 * or we are lacking a whitespace-fix patch the tree
2626 * the preimage was based on already had (i.e. target
2627 * has whitespace breakage, the preimage doesn't).
2628 * In either case, we are fixing the whitespace breakages
2629 * so we might as well take the fix together with their
2632 match
= (tgtfix
.len
== fixed
.len
- fixstart
&&
2633 !memcmp(tgtfix
.buf
, fixed
.buf
+ fixstart
,
2634 fixed
.len
- fixstart
));
2636 /* Add the length if this is common with the postimage */
2637 if (preimage
->line
[i
].flag
& LINE_COMMON
)
2638 postlen
+= tgtfix
.len
;
2640 strbuf_release(&tgtfix
);
2650 * Now handle the lines in the preimage that falls beyond the
2651 * end of the file (if any). They will only match if they are
2652 * empty or only contain whitespace (if WS_BLANK_AT_EOL is
2655 for ( ; i
< preimage
->nr
; i
++) {
2656 size_t fixstart
= fixed
.len
; /* start of the fixed preimage */
2657 size_t oldlen
= preimage
->line
[i
].len
;
2660 /* Try fixing the line in the preimage */
2661 ws_fix_copy(&fixed
, orig
, oldlen
, ws_rule
, NULL
);
2663 for (j
= fixstart
; j
< fixed
.len
; j
++)
2664 if (!isspace(fixed
.buf
[j
]))
2671 * Yes, the preimage is based on an older version that still
2672 * has whitespace breakages unfixed, and fixing them makes the
2673 * hunk match. Update the context lines in the postimage.
2675 fixed_buf
= strbuf_detach(&fixed
, &fixed_len
);
2676 if (postlen
< postimage
->len
)
2678 update_pre_post_images(preimage
, postimage
,
2679 fixed_buf
, fixed_len
, postlen
);
2683 strbuf_release(&fixed
);
2687 static int find_pos(struct apply_state
*state
,
2689 struct image
*preimage
,
2690 struct image
*postimage
,
2693 int match_beginning
, int match_end
)
2696 unsigned long backwards
, forwards
, try;
2697 int backwards_lno
, forwards_lno
, try_lno
;
2700 * If match_beginning or match_end is specified, there is no
2701 * point starting from a wrong line that will never match and
2702 * wander around and wait for a match at the specified end.
2704 if (match_beginning
)
2707 line
= img
->nr
- preimage
->nr
;
2710 * Because the comparison is unsigned, the following test
2711 * will also take care of a negative line number that can
2712 * result when match_end and preimage is larger than the target.
2714 if ((size_t) line
> img
->nr
)
2718 for (i
= 0; i
< line
; i
++)
2719 try += img
->line
[i
].len
;
2722 * There's probably some smart way to do this, but I'll leave
2723 * that to the smart and beautiful people. I'm simple and stupid.
2726 backwards_lno
= line
;
2728 forwards_lno
= line
;
2731 for (i
= 0; ; i
++) {
2732 if (match_fragment(state
, img
, preimage
, postimage
,
2733 try, try_lno
, ws_rule
,
2734 match_beginning
, match_end
))
2738 if (backwards_lno
== 0 && forwards_lno
== img
->nr
)
2742 if (backwards_lno
== 0) {
2747 backwards
-= img
->line
[backwards_lno
].len
;
2749 try_lno
= backwards_lno
;
2751 if (forwards_lno
== img
->nr
) {
2755 forwards
+= img
->line
[forwards_lno
].len
;
2758 try_lno
= forwards_lno
;
2765 static void remove_first_line(struct image
*img
)
2767 img
->buf
+= img
->line
[0].len
;
2768 img
->len
-= img
->line
[0].len
;
2773 static void remove_last_line(struct image
*img
)
2775 img
->len
-= img
->line
[--img
->nr
].len
;
2779 * The change from "preimage" and "postimage" has been found to
2780 * apply at applied_pos (counts in line numbers) in "img".
2781 * Update "img" to remove "preimage" and replace it with "postimage".
2783 static void update_image(struct apply_state
*state
,
2786 struct image
*preimage
,
2787 struct image
*postimage
)
2790 * remove the copy of preimage at offset in img
2791 * and replace it with postimage
2794 size_t remove_count
, insert_count
, applied_at
= 0;
2799 * If we are removing blank lines at the end of img,
2800 * the preimage may extend beyond the end.
2801 * If that is the case, we must be careful only to
2802 * remove the part of the preimage that falls within
2803 * the boundaries of img. Initialize preimage_limit
2804 * to the number of lines in the preimage that falls
2805 * within the boundaries.
2807 preimage_limit
= preimage
->nr
;
2808 if (preimage_limit
> img
->nr
- applied_pos
)
2809 preimage_limit
= img
->nr
- applied_pos
;
2811 for (i
= 0; i
< applied_pos
; i
++)
2812 applied_at
+= img
->line
[i
].len
;
2815 for (i
= 0; i
< preimage_limit
; i
++)
2816 remove_count
+= img
->line
[applied_pos
+ i
].len
;
2817 insert_count
= postimage
->len
;
2819 /* Adjust the contents */
2820 result
= xmalloc(st_add3(st_sub(img
->len
, remove_count
), insert_count
, 1));
2821 memcpy(result
, img
->buf
, applied_at
);
2822 memcpy(result
+ applied_at
, postimage
->buf
, postimage
->len
);
2823 memcpy(result
+ applied_at
+ postimage
->len
,
2824 img
->buf
+ (applied_at
+ remove_count
),
2825 img
->len
- (applied_at
+ remove_count
));
2828 img
->len
+= insert_count
- remove_count
;
2829 result
[img
->len
] = '\0';
2831 /* Adjust the line table */
2832 nr
= img
->nr
+ postimage
->nr
- preimage_limit
;
2833 if (preimage_limit
< postimage
->nr
) {
2835 * NOTE: this knows that we never call remove_first_line()
2836 * on anything other than pre/post image.
2838 REALLOC_ARRAY(img
->line
, nr
);
2839 img
->line_allocated
= img
->line
;
2841 if (preimage_limit
!= postimage
->nr
)
2842 MOVE_ARRAY(img
->line
+ applied_pos
+ postimage
->nr
,
2843 img
->line
+ applied_pos
+ preimage_limit
,
2844 img
->nr
- (applied_pos
+ preimage_limit
));
2845 COPY_ARRAY(img
->line
+ applied_pos
, postimage
->line
, postimage
->nr
);
2846 if (!state
->allow_overlap
)
2847 for (i
= 0; i
< postimage
->nr
; i
++)
2848 img
->line
[applied_pos
+ i
].flag
|= LINE_PATCHED
;
2853 * Use the patch-hunk text in "frag" to prepare two images (preimage and
2854 * postimage) for the hunk. Find lines that match "preimage" in "img" and
2855 * replace the part of "img" with "postimage" text.
2857 static int apply_one_fragment(struct apply_state
*state
,
2858 struct image
*img
, struct fragment
*frag
,
2859 int inaccurate_eof
, unsigned ws_rule
,
2862 int match_beginning
, match_end
;
2863 const char *patch
= frag
->patch
;
2864 int size
= frag
->size
;
2865 char *old
, *oldlines
;
2866 struct strbuf newlines
;
2867 int new_blank_lines_at_end
= 0;
2868 int found_new_blank_lines_at_end
= 0;
2869 int hunk_linenr
= frag
->linenr
;
2870 unsigned long leading
, trailing
;
2871 int pos
, applied_pos
;
2872 struct image preimage
;
2873 struct image postimage
;
2875 memset(&preimage
, 0, sizeof(preimage
));
2876 memset(&postimage
, 0, sizeof(postimage
));
2877 oldlines
= xmalloc(size
);
2878 strbuf_init(&newlines
, size
);
2883 int len
= linelen(patch
, size
);
2885 int added_blank_line
= 0;
2886 int is_blank_context
= 0;
2893 * "plen" is how much of the line we should use for
2894 * the actual patch data. Normally we just remove the
2895 * first character on the line, but if the line is
2896 * followed by "\ No newline", then we also remove the
2897 * last one (which is the newline, of course).
2900 if (len
< size
&& patch
[len
] == '\\')
2903 if (state
->apply_in_reverse
) {
2906 else if (first
== '+')
2912 /* Newer GNU diff, empty context line */
2914 /* ... followed by '\No newline'; nothing */
2917 strbuf_addch(&newlines
, '\n');
2918 add_line_info(&preimage
, "\n", 1, LINE_COMMON
);
2919 add_line_info(&postimage
, "\n", 1, LINE_COMMON
);
2920 is_blank_context
= 1;
2923 if (plen
&& (ws_rule
& WS_BLANK_AT_EOF
) &&
2924 ws_blank_line(patch
+ 1, plen
, ws_rule
))
2925 is_blank_context
= 1;
2927 memcpy(old
, patch
+ 1, plen
);
2928 add_line_info(&preimage
, old
, plen
,
2929 (first
== ' ' ? LINE_COMMON
: 0));
2933 /* Fall-through for ' ' */
2935 /* --no-add does not add new lines */
2936 if (first
== '+' && state
->no_add
)
2939 start
= newlines
.len
;
2941 !state
->whitespace_error
||
2942 state
->ws_error_action
!= correct_ws_error
) {
2943 strbuf_add(&newlines
, patch
+ 1, plen
);
2946 ws_fix_copy(&newlines
, patch
+ 1, plen
, ws_rule
, &state
->applied_after_fixing_ws
);
2948 add_line_info(&postimage
, newlines
.buf
+ start
, newlines
.len
- start
,
2949 (first
== '+' ? 0 : LINE_COMMON
));
2951 (ws_rule
& WS_BLANK_AT_EOF
) &&
2952 ws_blank_line(patch
+ 1, plen
, ws_rule
))
2953 added_blank_line
= 1;
2955 case '@': case '\\':
2956 /* Ignore it, we already handled it */
2959 if (state
->apply_verbosity
> verbosity_normal
)
2960 error(_("invalid start of line: '%c'"), first
);
2964 if (added_blank_line
) {
2965 if (!new_blank_lines_at_end
)
2966 found_new_blank_lines_at_end
= hunk_linenr
;
2967 new_blank_lines_at_end
++;
2969 else if (is_blank_context
)
2972 new_blank_lines_at_end
= 0;
2977 if (inaccurate_eof
&&
2978 old
> oldlines
&& old
[-1] == '\n' &&
2979 newlines
.len
> 0 && newlines
.buf
[newlines
.len
- 1] == '\n') {
2981 strbuf_setlen(&newlines
, newlines
.len
- 1);
2984 leading
= frag
->leading
;
2985 trailing
= frag
->trailing
;
2988 * A hunk to change lines at the beginning would begin with
2990 * but we need to be careful. -U0 that inserts before the second
2991 * line also has this pattern.
2993 * And a hunk to add to an empty file would begin with
2996 * In other words, a hunk that is (frag->oldpos <= 1) with or
2997 * without leading context must match at the beginning.
2999 match_beginning
= (!frag
->oldpos
||
3000 (frag
->oldpos
== 1 && !state
->unidiff_zero
));
3003 * A hunk without trailing lines must match at the end.
3004 * However, we simply cannot tell if a hunk must match end
3005 * from the lack of trailing lines if the patch was generated
3006 * with unidiff without any context.
3008 match_end
= !state
->unidiff_zero
&& !trailing
;
3010 pos
= frag
->newpos
? (frag
->newpos
- 1) : 0;
3011 preimage
.buf
= oldlines
;
3012 preimage
.len
= old
- oldlines
;
3013 postimage
.buf
= newlines
.buf
;
3014 postimage
.len
= newlines
.len
;
3015 preimage
.line
= preimage
.line_allocated
;
3016 postimage
.line
= postimage
.line_allocated
;
3020 applied_pos
= find_pos(state
, img
, &preimage
, &postimage
, pos
,
3021 ws_rule
, match_beginning
, match_end
);
3023 if (applied_pos
>= 0)
3026 /* Am I at my context limits? */
3027 if ((leading
<= state
->p_context
) && (trailing
<= state
->p_context
))
3029 if (match_beginning
|| match_end
) {
3030 match_beginning
= match_end
= 0;
3035 * Reduce the number of context lines; reduce both
3036 * leading and trailing if they are equal otherwise
3037 * just reduce the larger context.
3039 if (leading
>= trailing
) {
3040 remove_first_line(&preimage
);
3041 remove_first_line(&postimage
);
3045 if (trailing
> leading
) {
3046 remove_last_line(&preimage
);
3047 remove_last_line(&postimage
);
3052 if (applied_pos
>= 0) {
3053 if (new_blank_lines_at_end
&&
3054 preimage
.nr
+ applied_pos
>= img
->nr
&&
3055 (ws_rule
& WS_BLANK_AT_EOF
) &&
3056 state
->ws_error_action
!= nowarn_ws_error
) {
3057 record_ws_error(state
, WS_BLANK_AT_EOF
, "+", 1,
3058 found_new_blank_lines_at_end
);
3059 if (state
->ws_error_action
== correct_ws_error
) {
3060 while (new_blank_lines_at_end
--)
3061 remove_last_line(&postimage
);
3064 * We would want to prevent write_out_results()
3065 * from taking place in apply_patch() that follows
3066 * the callchain led us here, which is:
3067 * apply_patch->check_patch_list->check_patch->
3068 * apply_data->apply_fragments->apply_one_fragment
3070 if (state
->ws_error_action
== die_on_ws_error
)
3074 if (state
->apply_verbosity
> verbosity_normal
&& applied_pos
!= pos
) {
3075 int offset
= applied_pos
- pos
;
3076 if (state
->apply_in_reverse
)
3077 offset
= 0 - offset
;
3079 Q_("Hunk #%d succeeded at %d (offset %d line).",
3080 "Hunk #%d succeeded at %d (offset %d lines).",
3082 nth_fragment
, applied_pos
+ 1, offset
);
3086 * Warn if it was necessary to reduce the number
3089 if ((leading
!= frag
->leading
||
3090 trailing
!= frag
->trailing
) && state
->apply_verbosity
> verbosity_silent
)
3091 fprintf_ln(stderr
, _("Context reduced to (%ld/%ld)"
3092 " to apply fragment at %d"),
3093 leading
, trailing
, applied_pos
+1);
3094 update_image(state
, img
, applied_pos
, &preimage
, &postimage
);
3096 if (state
->apply_verbosity
> verbosity_normal
)
3097 error(_("while searching for:\n%.*s"),
3098 (int)(old
- oldlines
), oldlines
);
3103 strbuf_release(&newlines
);
3104 free(preimage
.line_allocated
);
3105 free(postimage
.line_allocated
);
3107 return (applied_pos
< 0);
3110 static int apply_binary_fragment(struct apply_state
*state
,
3112 struct patch
*patch
)
3114 struct fragment
*fragment
= patch
->fragments
;
3119 return error(_("missing binary patch data for '%s'"),
3124 /* Binary patch is irreversible without the optional second hunk */
3125 if (state
->apply_in_reverse
) {
3126 if (!fragment
->next
)
3127 return error(_("cannot reverse-apply a binary patch "
3128 "without the reverse hunk to '%s'"),
3130 ? patch
->new_name
: patch
->old_name
);
3131 fragment
= fragment
->next
;
3133 switch (fragment
->binary_patch_method
) {
3134 case BINARY_DELTA_DEFLATED
:
3135 dst
= patch_delta(img
->buf
, img
->len
, fragment
->patch
,
3136 fragment
->size
, &len
);
3143 case BINARY_LITERAL_DEFLATED
:
3145 img
->len
= fragment
->size
;
3146 img
->buf
= xmemdupz(fragment
->patch
, img
->len
);
3153 * Replace "img" with the result of applying the binary patch.
3154 * The binary patch data itself in patch->fragment is still kept
3155 * but the preimage prepared by the caller in "img" is freed here
3156 * or in the helper function apply_binary_fragment() this calls.
3158 static int apply_binary(struct apply_state
*state
,
3160 struct patch
*patch
)
3162 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
3163 struct object_id oid
;
3166 * For safety, we require patch index line to contain
3167 * full 40-byte textual SHA1 for old and new, at least for now.
3169 if (strlen(patch
->old_sha1_prefix
) != 40 ||
3170 strlen(patch
->new_sha1_prefix
) != 40 ||
3171 get_oid_hex(patch
->old_sha1_prefix
, &oid
) ||
3172 get_oid_hex(patch
->new_sha1_prefix
, &oid
))
3173 return error(_("cannot apply binary patch to '%s' "
3174 "without full index line"), name
);
3176 if (patch
->old_name
) {
3178 * See if the old one matches what the patch
3181 hash_sha1_file(img
->buf
, img
->len
, blob_type
, oid
.hash
);
3182 if (strcmp(oid_to_hex(&oid
), patch
->old_sha1_prefix
))
3183 return error(_("the patch applies to '%s' (%s), "
3184 "which does not match the "
3185 "current contents."),
3186 name
, oid_to_hex(&oid
));
3189 /* Otherwise, the old one must be empty. */
3191 return error(_("the patch applies to an empty "
3192 "'%s' but it is not empty"), name
);
3195 get_oid_hex(patch
->new_sha1_prefix
, &oid
);
3196 if (is_null_oid(&oid
)) {
3198 return 0; /* deletion patch */
3201 if (has_sha1_file(oid
.hash
)) {
3202 /* We already have the postimage */
3203 enum object_type type
;
3207 result
= read_sha1_file(oid
.hash
, &type
, &size
);
3209 return error(_("the necessary postimage %s for "
3210 "'%s' cannot be read"),
3211 patch
->new_sha1_prefix
, name
);
3217 * We have verified buf matches the preimage;
3218 * apply the patch data to it, which is stored
3219 * in the patch->fragments->{patch,size}.
3221 if (apply_binary_fragment(state
, img
, patch
))
3222 return error(_("binary patch does not apply to '%s'"),
3225 /* verify that the result matches */
3226 hash_sha1_file(img
->buf
, img
->len
, blob_type
, oid
.hash
);
3227 if (strcmp(oid_to_hex(&oid
), patch
->new_sha1_prefix
))
3228 return error(_("binary patch to '%s' creates incorrect result (expecting %s, got %s)"),
3229 name
, patch
->new_sha1_prefix
, oid_to_hex(&oid
));
3235 static int apply_fragments(struct apply_state
*state
, struct image
*img
, struct patch
*patch
)
3237 struct fragment
*frag
= patch
->fragments
;
3238 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
3239 unsigned ws_rule
= patch
->ws_rule
;
3240 unsigned inaccurate_eof
= patch
->inaccurate_eof
;
3243 if (patch
->is_binary
)
3244 return apply_binary(state
, img
, patch
);
3248 if (apply_one_fragment(state
, img
, frag
, inaccurate_eof
, ws_rule
, nth
)) {
3249 error(_("patch failed: %s:%ld"), name
, frag
->oldpos
);
3250 if (!state
->apply_with_reject
)
3259 static int read_blob_object(struct strbuf
*buf
, const struct object_id
*oid
, unsigned mode
)
3261 if (S_ISGITLINK(mode
)) {
3262 strbuf_grow(buf
, 100);
3263 strbuf_addf(buf
, "Subproject commit %s\n", oid_to_hex(oid
));
3265 enum object_type type
;
3269 result
= read_sha1_file(oid
->hash
, &type
, &sz
);
3272 /* XXX read_sha1_file NUL-terminates */
3273 strbuf_attach(buf
, result
, sz
, sz
+ 1);
3278 static int read_file_or_gitlink(const struct cache_entry
*ce
, struct strbuf
*buf
)
3282 return read_blob_object(buf
, &ce
->oid
, ce
->ce_mode
);
3285 static struct patch
*in_fn_table(struct apply_state
*state
, const char *name
)
3287 struct string_list_item
*item
;
3292 item
= string_list_lookup(&state
->fn_table
, name
);
3294 return (struct patch
*)item
->util
;
3300 * item->util in the filename table records the status of the path.
3301 * Usually it points at a patch (whose result records the contents
3302 * of it after applying it), but it could be PATH_WAS_DELETED for a
3303 * path that a previously applied patch has already removed, or
3304 * PATH_TO_BE_DELETED for a path that a later patch would remove.
3306 * The latter is needed to deal with a case where two paths A and B
3307 * are swapped by first renaming A to B and then renaming B to A;
3308 * moving A to B should not be prevented due to presence of B as we
3309 * will remove it in a later patch.
3311 #define PATH_TO_BE_DELETED ((struct patch *) -2)
3312 #define PATH_WAS_DELETED ((struct patch *) -1)
3314 static int to_be_deleted(struct patch
*patch
)
3316 return patch
== PATH_TO_BE_DELETED
;
3319 static int was_deleted(struct patch
*patch
)
3321 return patch
== PATH_WAS_DELETED
;
3324 static void add_to_fn_table(struct apply_state
*state
, struct patch
*patch
)
3326 struct string_list_item
*item
;
3329 * Always add new_name unless patch is a deletion
3330 * This should cover the cases for normal diffs,
3331 * file creations and copies
3333 if (patch
->new_name
!= NULL
) {
3334 item
= string_list_insert(&state
->fn_table
, patch
->new_name
);
3339 * store a failure on rename/deletion cases because
3340 * later chunks shouldn't patch old names
3342 if ((patch
->new_name
== NULL
) || (patch
->is_rename
)) {
3343 item
= string_list_insert(&state
->fn_table
, patch
->old_name
);
3344 item
->util
= PATH_WAS_DELETED
;
3348 static void prepare_fn_table(struct apply_state
*state
, struct patch
*patch
)
3351 * store information about incoming file deletion
3354 if ((patch
->new_name
== NULL
) || (patch
->is_rename
)) {
3355 struct string_list_item
*item
;
3356 item
= string_list_insert(&state
->fn_table
, patch
->old_name
);
3357 item
->util
= PATH_TO_BE_DELETED
;
3359 patch
= patch
->next
;
3363 static int checkout_target(struct index_state
*istate
,
3364 struct cache_entry
*ce
, struct stat
*st
)
3366 struct checkout costate
= CHECKOUT_INIT
;
3368 costate
.refresh_cache
= 1;
3369 costate
.istate
= istate
;
3370 if (checkout_entry(ce
, &costate
, NULL
) || lstat(ce
->name
, st
))
3371 return error(_("cannot checkout %s"), ce
->name
);
3375 static struct patch
*previous_patch(struct apply_state
*state
,
3376 struct patch
*patch
,
3379 struct patch
*previous
;
3382 if (patch
->is_copy
|| patch
->is_rename
)
3383 return NULL
; /* "git" patches do not depend on the order */
3385 previous
= in_fn_table(state
, patch
->old_name
);
3389 if (to_be_deleted(previous
))
3390 return NULL
; /* the deletion hasn't happened yet */
3392 if (was_deleted(previous
))
3398 static int verify_index_match(const struct cache_entry
*ce
, struct stat
*st
)
3400 if (S_ISGITLINK(ce
->ce_mode
)) {
3401 if (!S_ISDIR(st
->st_mode
))
3405 return ce_match_stat(ce
, st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
);
3408 #define SUBMODULE_PATCH_WITHOUT_INDEX 1
3410 static int load_patch_target(struct apply_state
*state
,
3412 const struct cache_entry
*ce
,
3414 struct patch
*patch
,
3416 unsigned expected_mode
)
3418 if (state
->cached
|| state
->check_index
) {
3419 if (read_file_or_gitlink(ce
, buf
))
3420 return error(_("failed to read %s"), name
);
3422 if (S_ISGITLINK(expected_mode
)) {
3424 return read_file_or_gitlink(ce
, buf
);
3426 return SUBMODULE_PATCH_WITHOUT_INDEX
;
3427 } else if (has_symlink_leading_path(name
, strlen(name
))) {
3428 return error(_("reading from '%s' beyond a symbolic link"), name
);
3430 if (read_old_data(st
, patch
, name
, buf
))
3431 return error(_("failed to read %s"), name
);
3438 * We are about to apply "patch"; populate the "image" with the
3439 * current version we have, from the working tree or from the index,
3440 * depending on the situation e.g. --cached/--index. If we are
3441 * applying a non-git patch that incrementally updates the tree,
3442 * we read from the result of a previous diff.
3444 static int load_preimage(struct apply_state
*state
,
3445 struct image
*image
,
3446 struct patch
*patch
, struct stat
*st
,
3447 const struct cache_entry
*ce
)
3449 struct strbuf buf
= STRBUF_INIT
;
3452 struct patch
*previous
;
3455 previous
= previous_patch(state
, patch
, &status
);
3457 return error(_("path %s has been renamed/deleted"),
3460 /* We have a patched copy in memory; use that. */
3461 strbuf_add(&buf
, previous
->result
, previous
->resultsize
);
3463 status
= load_patch_target(state
, &buf
, ce
, st
, patch
,
3464 patch
->old_name
, patch
->old_mode
);
3467 else if (status
== SUBMODULE_PATCH_WITHOUT_INDEX
) {
3469 * There is no way to apply subproject
3470 * patch without looking at the index.
3471 * NEEDSWORK: shouldn't this be flagged
3474 free_fragment_list(patch
->fragments
);
3475 patch
->fragments
= NULL
;
3476 } else if (status
) {
3477 return error(_("failed to read %s"), patch
->old_name
);
3481 img
= strbuf_detach(&buf
, &len
);
3482 prepare_image(image
, img
, len
, !patch
->is_binary
);
3486 static int three_way_merge(struct image
*image
,
3488 const struct object_id
*base
,
3489 const struct object_id
*ours
,
3490 const struct object_id
*theirs
)
3492 mmfile_t base_file
, our_file
, their_file
;
3493 mmbuffer_t result
= { NULL
};
3496 read_mmblob(&base_file
, base
);
3497 read_mmblob(&our_file
, ours
);
3498 read_mmblob(&their_file
, theirs
);
3499 status
= ll_merge(&result
, path
,
3502 &their_file
, "theirs", NULL
);
3503 free(base_file
.ptr
);
3505 free(their_file
.ptr
);
3506 if (status
< 0 || !result
.ptr
) {
3511 image
->buf
= result
.ptr
;
3512 image
->len
= result
.size
;
3518 * When directly falling back to add/add three-way merge, we read from
3519 * the current contents of the new_name. In no cases other than that
3520 * this function will be called.
3522 static int load_current(struct apply_state
*state
,
3523 struct image
*image
,
3524 struct patch
*patch
)
3526 struct strbuf buf
= STRBUF_INIT
;
3531 struct cache_entry
*ce
;
3532 char *name
= patch
->new_name
;
3533 unsigned mode
= patch
->new_mode
;
3536 die("BUG: patch to %s is not a creation", patch
->old_name
);
3538 pos
= cache_name_pos(name
, strlen(name
));
3540 return error(_("%s: does not exist in index"), name
);
3541 ce
= active_cache
[pos
];
3542 if (lstat(name
, &st
)) {
3543 if (errno
!= ENOENT
)
3544 return error_errno("%s", name
);
3545 if (checkout_target(&the_index
, ce
, &st
))
3548 if (verify_index_match(ce
, &st
))
3549 return error(_("%s: does not match index"), name
);
3551 status
= load_patch_target(state
, &buf
, ce
, &st
, patch
, name
, mode
);
3556 img
= strbuf_detach(&buf
, &len
);
3557 prepare_image(image
, img
, len
, !patch
->is_binary
);
3561 static int try_threeway(struct apply_state
*state
,
3562 struct image
*image
,
3563 struct patch
*patch
,
3565 const struct cache_entry
*ce
)
3567 struct object_id pre_oid
, post_oid
, our_oid
;
3568 struct strbuf buf
= STRBUF_INIT
;
3572 struct image tmp_image
;
3574 /* No point falling back to 3-way merge in these cases */
3575 if (patch
->is_delete
||
3576 S_ISGITLINK(patch
->old_mode
) || S_ISGITLINK(patch
->new_mode
))
3579 /* Preimage the patch was prepared for */
3581 write_sha1_file("", 0, blob_type
, pre_oid
.hash
);
3582 else if (get_sha1(patch
->old_sha1_prefix
, pre_oid
.hash
) ||
3583 read_blob_object(&buf
, &pre_oid
, patch
->old_mode
))
3584 return error(_("repository lacks the necessary blob to fall back on 3-way merge."));
3586 if (state
->apply_verbosity
> verbosity_silent
)
3587 fprintf(stderr
, _("Falling back to three-way merge...\n"));
3589 img
= strbuf_detach(&buf
, &len
);
3590 prepare_image(&tmp_image
, img
, len
, 1);
3591 /* Apply the patch to get the post image */
3592 if (apply_fragments(state
, &tmp_image
, patch
) < 0) {
3593 clear_image(&tmp_image
);
3596 /* post_oid is theirs */
3597 write_sha1_file(tmp_image
.buf
, tmp_image
.len
, blob_type
, post_oid
.hash
);
3598 clear_image(&tmp_image
);
3600 /* our_oid is ours */
3601 if (patch
->is_new
) {
3602 if (load_current(state
, &tmp_image
, patch
))
3603 return error(_("cannot read the current contents of '%s'"),
3606 if (load_preimage(state
, &tmp_image
, patch
, st
, ce
))
3607 return error(_("cannot read the current contents of '%s'"),
3610 write_sha1_file(tmp_image
.buf
, tmp_image
.len
, blob_type
, our_oid
.hash
);
3611 clear_image(&tmp_image
);
3613 /* in-core three-way merge between post and our using pre as base */
3614 status
= three_way_merge(image
, patch
->new_name
,
3615 &pre_oid
, &our_oid
, &post_oid
);
3617 if (state
->apply_verbosity
> verbosity_silent
)
3619 _("Failed to fall back on three-way merge...\n"));
3624 patch
->conflicted_threeway
= 1;
3626 oidclr(&patch
->threeway_stage
[0]);
3628 oidcpy(&patch
->threeway_stage
[0], &pre_oid
);
3629 oidcpy(&patch
->threeway_stage
[1], &our_oid
);
3630 oidcpy(&patch
->threeway_stage
[2], &post_oid
);
3631 if (state
->apply_verbosity
> verbosity_silent
)
3633 _("Applied patch to '%s' with conflicts.\n"),
3636 if (state
->apply_verbosity
> verbosity_silent
)
3638 _("Applied patch to '%s' cleanly.\n"),
3644 static int apply_data(struct apply_state
*state
, struct patch
*patch
,
3645 struct stat
*st
, const struct cache_entry
*ce
)
3649 if (load_preimage(state
, &image
, patch
, st
, ce
) < 0)
3652 if (patch
->direct_to_threeway
||
3653 apply_fragments(state
, &image
, patch
) < 0) {
3654 /* Note: with --reject, apply_fragments() returns 0 */
3655 if (!state
->threeway
|| try_threeway(state
, &image
, patch
, st
, ce
) < 0)
3658 patch
->result
= image
.buf
;
3659 patch
->resultsize
= image
.len
;
3660 add_to_fn_table(state
, patch
);
3661 free(image
.line_allocated
);
3663 if (0 < patch
->is_delete
&& patch
->resultsize
)
3664 return error(_("removal patch leaves file contents"));
3670 * If "patch" that we are looking at modifies or deletes what we have,
3671 * we would want it not to lose any local modification we have, either
3672 * in the working tree or in the index.
3674 * This also decides if a non-git patch is a creation patch or a
3675 * modification to an existing empty file. We do not check the state
3676 * of the current tree for a creation patch in this function; the caller
3677 * check_patch() separately makes sure (and errors out otherwise) that
3678 * the path the patch creates does not exist in the current tree.
3680 static int check_preimage(struct apply_state
*state
,
3681 struct patch
*patch
,
3682 struct cache_entry
**ce
,
3685 const char *old_name
= patch
->old_name
;
3686 struct patch
*previous
= NULL
;
3687 int stat_ret
= 0, status
;
3688 unsigned st_mode
= 0;
3693 assert(patch
->is_new
<= 0);
3694 previous
= previous_patch(state
, patch
, &status
);
3697 return error(_("path %s has been renamed/deleted"), old_name
);
3699 st_mode
= previous
->new_mode
;
3700 } else if (!state
->cached
) {
3701 stat_ret
= lstat(old_name
, st
);
3702 if (stat_ret
&& errno
!= ENOENT
)
3703 return error_errno("%s", old_name
);
3706 if (state
->check_index
&& !previous
) {
3707 int pos
= cache_name_pos(old_name
, strlen(old_name
));
3709 if (patch
->is_new
< 0)
3711 return error(_("%s: does not exist in index"), old_name
);
3713 *ce
= active_cache
[pos
];
3715 if (checkout_target(&the_index
, *ce
, st
))
3718 if (!state
->cached
&& verify_index_match(*ce
, st
))
3719 return error(_("%s: does not match index"), old_name
);
3721 st_mode
= (*ce
)->ce_mode
;
3722 } else if (stat_ret
< 0) {
3723 if (patch
->is_new
< 0)
3725 return error_errno("%s", old_name
);
3728 if (!state
->cached
&& !previous
)
3729 st_mode
= ce_mode_from_stat(*ce
, st
->st_mode
);
3731 if (patch
->is_new
< 0)
3733 if (!patch
->old_mode
)
3734 patch
->old_mode
= st_mode
;
3735 if ((st_mode
^ patch
->old_mode
) & S_IFMT
)
3736 return error(_("%s: wrong type"), old_name
);
3737 if (st_mode
!= patch
->old_mode
)
3738 warning(_("%s has type %o, expected %o"),
3739 old_name
, st_mode
, patch
->old_mode
);
3740 if (!patch
->new_mode
&& !patch
->is_delete
)
3741 patch
->new_mode
= st_mode
;
3746 patch
->is_delete
= 0;
3747 FREE_AND_NULL(patch
->old_name
);
3752 #define EXISTS_IN_INDEX 1
3753 #define EXISTS_IN_WORKTREE 2
3755 static int check_to_create(struct apply_state
*state
,
3756 const char *new_name
,
3761 if (state
->check_index
&&
3762 cache_name_pos(new_name
, strlen(new_name
)) >= 0 &&
3764 return EXISTS_IN_INDEX
;
3768 if (!lstat(new_name
, &nst
)) {
3769 if (S_ISDIR(nst
.st_mode
) || ok_if_exists
)
3772 * A leading component of new_name might be a symlink
3773 * that is going to be removed with this patch, but
3774 * still pointing at somewhere that has the path.
3775 * In such a case, path "new_name" does not exist as
3776 * far as git is concerned.
3778 if (has_symlink_leading_path(new_name
, strlen(new_name
)))
3781 return EXISTS_IN_WORKTREE
;
3782 } else if (!is_missing_file_error(errno
)) {
3783 return error_errno("%s", new_name
);
3788 static uintptr_t register_symlink_changes(struct apply_state
*state
,
3792 struct string_list_item
*ent
;
3794 ent
= string_list_lookup(&state
->symlink_changes
, path
);
3796 ent
= string_list_insert(&state
->symlink_changes
, path
);
3797 ent
->util
= (void *)0;
3799 ent
->util
= (void *)(what
| ((uintptr_t)ent
->util
));
3800 return (uintptr_t)ent
->util
;
3803 static uintptr_t check_symlink_changes(struct apply_state
*state
, const char *path
)
3805 struct string_list_item
*ent
;
3807 ent
= string_list_lookup(&state
->symlink_changes
, path
);
3810 return (uintptr_t)ent
->util
;
3813 static void prepare_symlink_changes(struct apply_state
*state
, struct patch
*patch
)
3815 for ( ; patch
; patch
= patch
->next
) {
3816 if ((patch
->old_name
&& S_ISLNK(patch
->old_mode
)) &&
3817 (patch
->is_rename
|| patch
->is_delete
))
3818 /* the symlink at patch->old_name is removed */
3819 register_symlink_changes(state
, patch
->old_name
, APPLY_SYMLINK_GOES_AWAY
);
3821 if (patch
->new_name
&& S_ISLNK(patch
->new_mode
))
3822 /* the symlink at patch->new_name is created or remains */
3823 register_symlink_changes(state
, patch
->new_name
, APPLY_SYMLINK_IN_RESULT
);
3827 static int path_is_beyond_symlink_1(struct apply_state
*state
, struct strbuf
*name
)
3830 unsigned int change
;
3832 while (--name
->len
&& name
->buf
[name
->len
] != '/')
3833 ; /* scan backwards */
3836 name
->buf
[name
->len
] = '\0';
3837 change
= check_symlink_changes(state
, name
->buf
);
3838 if (change
& APPLY_SYMLINK_IN_RESULT
)
3840 if (change
& APPLY_SYMLINK_GOES_AWAY
)
3842 * This cannot be "return 0", because we may
3843 * see a new one created at a higher level.
3847 /* otherwise, check the preimage */
3848 if (state
->check_index
) {
3849 struct cache_entry
*ce
;
3851 ce
= cache_file_exists(name
->buf
, name
->len
, ignore_case
);
3852 if (ce
&& S_ISLNK(ce
->ce_mode
))
3856 if (!lstat(name
->buf
, &st
) && S_ISLNK(st
.st_mode
))
3863 static int path_is_beyond_symlink(struct apply_state
*state
, const char *name_
)
3866 struct strbuf name
= STRBUF_INIT
;
3868 assert(*name_
!= '\0');
3869 strbuf_addstr(&name
, name_
);
3870 ret
= path_is_beyond_symlink_1(state
, &name
);
3871 strbuf_release(&name
);
3876 static int check_unsafe_path(struct patch
*patch
)
3878 const char *old_name
= NULL
;
3879 const char *new_name
= NULL
;
3880 if (patch
->is_delete
)
3881 old_name
= patch
->old_name
;
3882 else if (!patch
->is_new
&& !patch
->is_copy
)
3883 old_name
= patch
->old_name
;
3884 if (!patch
->is_delete
)
3885 new_name
= patch
->new_name
;
3887 if (old_name
&& !verify_path(old_name
))
3888 return error(_("invalid path '%s'"), old_name
);
3889 if (new_name
&& !verify_path(new_name
))
3890 return error(_("invalid path '%s'"), new_name
);
3895 * Check and apply the patch in-core; leave the result in patch->result
3896 * for the caller to write it out to the final destination.
3898 static int check_patch(struct apply_state
*state
, struct patch
*patch
)
3901 const char *old_name
= patch
->old_name
;
3902 const char *new_name
= patch
->new_name
;
3903 const char *name
= old_name
? old_name
: new_name
;
3904 struct cache_entry
*ce
= NULL
;
3905 struct patch
*tpatch
;
3909 patch
->rejected
= 1; /* we will drop this after we succeed */
3911 status
= check_preimage(state
, patch
, &ce
, &st
);
3914 old_name
= patch
->old_name
;
3917 * A type-change diff is always split into a patch to delete
3918 * old, immediately followed by a patch to create new (see
3919 * diff.c::run_diff()); in such a case it is Ok that the entry
3920 * to be deleted by the previous patch is still in the working
3921 * tree and in the index.
3923 * A patch to swap-rename between A and B would first rename A
3924 * to B and then rename B to A. While applying the first one,
3925 * the presence of B should not stop A from getting renamed to
3926 * B; ask to_be_deleted() about the later rename. Removal of
3927 * B and rename from A to B is handled the same way by asking
3930 if ((tpatch
= in_fn_table(state
, new_name
)) &&
3931 (was_deleted(tpatch
) || to_be_deleted(tpatch
)))
3937 ((0 < patch
->is_new
) || patch
->is_rename
|| patch
->is_copy
)) {
3938 int err
= check_to_create(state
, new_name
, ok_if_exists
);
3940 if (err
&& state
->threeway
) {
3941 patch
->direct_to_threeway
= 1;
3942 } else switch (err
) {
3945 case EXISTS_IN_INDEX
:
3946 return error(_("%s: already exists in index"), new_name
);
3948 case EXISTS_IN_WORKTREE
:
3949 return error(_("%s: already exists in working directory"),
3955 if (!patch
->new_mode
) {
3956 if (0 < patch
->is_new
)
3957 patch
->new_mode
= S_IFREG
| 0644;
3959 patch
->new_mode
= patch
->old_mode
;
3963 if (new_name
&& old_name
) {
3964 int same
= !strcmp(old_name
, new_name
);
3965 if (!patch
->new_mode
)
3966 patch
->new_mode
= patch
->old_mode
;
3967 if ((patch
->old_mode
^ patch
->new_mode
) & S_IFMT
) {
3969 return error(_("new mode (%o) of %s does not "
3970 "match old mode (%o)"),
3971 patch
->new_mode
, new_name
,
3974 return error(_("new mode (%o) of %s does not "
3975 "match old mode (%o) of %s"),
3976 patch
->new_mode
, new_name
,
3977 patch
->old_mode
, old_name
);
3981 if (!state
->unsafe_paths
&& check_unsafe_path(patch
))
3985 * An attempt to read from or delete a path that is beyond a
3986 * symbolic link will be prevented by load_patch_target() that
3987 * is called at the beginning of apply_data() so we do not
3988 * have to worry about a patch marked with "is_delete" bit
3989 * here. We however need to make sure that the patch result
3990 * is not deposited to a path that is beyond a symbolic link
3993 if (!patch
->is_delete
&& path_is_beyond_symlink(state
, patch
->new_name
))
3994 return error(_("affected file '%s' is beyond a symbolic link"),
3997 if (apply_data(state
, patch
, &st
, ce
) < 0)
3998 return error(_("%s: patch does not apply"), name
);
3999 patch
->rejected
= 0;
4003 static int check_patch_list(struct apply_state
*state
, struct patch
*patch
)
4007 prepare_symlink_changes(state
, patch
);
4008 prepare_fn_table(state
, patch
);
4011 if (state
->apply_verbosity
> verbosity_normal
)
4012 say_patch_name(stderr
,
4013 _("Checking patch %s..."), patch
);
4014 res
= check_patch(state
, patch
);
4018 patch
= patch
->next
;
4023 static int read_apply_cache(struct apply_state
*state
)
4025 if (state
->index_file
)
4026 return read_cache_from(state
->index_file
);
4028 return read_cache();
4031 /* This function tries to read the object name from the current index */
4032 static int get_current_oid(struct apply_state
*state
, const char *path
,
4033 struct object_id
*oid
)
4037 if (read_apply_cache(state
) < 0)
4039 pos
= cache_name_pos(path
, strlen(path
));
4042 oidcpy(oid
, &active_cache
[pos
]->oid
);
4046 static int preimage_oid_in_gitlink_patch(struct patch
*p
, struct object_id
*oid
)
4049 * A usable gitlink patch has only one fragment (hunk) that looks like:
4051 * -Subproject commit <old sha1>
4052 * +Subproject commit <new sha1>
4055 * -Subproject commit <old sha1>
4056 * for a removal patch.
4058 struct fragment
*hunk
= p
->fragments
;
4059 static const char heading
[] = "-Subproject commit ";
4062 if (/* does the patch have only one hunk? */
4063 hunk
&& !hunk
->next
&&
4064 /* is its preimage one line? */
4065 hunk
->oldpos
== 1 && hunk
->oldlines
== 1 &&
4066 /* does preimage begin with the heading? */
4067 (preimage
= memchr(hunk
->patch
, '\n', hunk
->size
)) != NULL
&&
4068 starts_with(++preimage
, heading
) &&
4069 /* does it record full SHA-1? */
4070 !get_oid_hex(preimage
+ sizeof(heading
) - 1, oid
) &&
4071 preimage
[sizeof(heading
) + GIT_SHA1_HEXSZ
- 1] == '\n' &&
4072 /* does the abbreviated name on the index line agree with it? */
4073 starts_with(preimage
+ sizeof(heading
) - 1, p
->old_sha1_prefix
))
4074 return 0; /* it all looks fine */
4076 /* we may have full object name on the index line */
4077 return get_oid_hex(p
->old_sha1_prefix
, oid
);
4080 /* Build an index that contains the just the files needed for a 3way merge */
4081 static int build_fake_ancestor(struct apply_state
*state
, struct patch
*list
)
4083 struct patch
*patch
;
4084 struct index_state result
= { NULL
};
4085 static struct lock_file lock
;
4088 /* Once we start supporting the reverse patch, it may be
4089 * worth showing the new sha1 prefix, but until then...
4091 for (patch
= list
; patch
; patch
= patch
->next
) {
4092 struct object_id oid
;
4093 struct cache_entry
*ce
;
4096 name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
4097 if (0 < patch
->is_new
)
4100 if (S_ISGITLINK(patch
->old_mode
)) {
4101 if (!preimage_oid_in_gitlink_patch(patch
, &oid
))
4102 ; /* ok, the textual part looks sane */
4104 return error(_("sha1 information is lacking or "
4105 "useless for submodule %s"), name
);
4106 } else if (!get_sha1_blob(patch
->old_sha1_prefix
, oid
.hash
)) {
4108 } else if (!patch
->lines_added
&& !patch
->lines_deleted
) {
4109 /* mode-only change: update the current */
4110 if (get_current_oid(state
, patch
->old_name
, &oid
))
4111 return error(_("mode change for %s, which is not "
4112 "in current HEAD"), name
);
4114 return error(_("sha1 information is lacking or useless "
4117 ce
= make_cache_entry(patch
->old_mode
, oid
.hash
, name
, 0, 0);
4119 return error(_("make_cache_entry failed for path '%s'"),
4121 if (add_index_entry(&result
, ce
, ADD_CACHE_OK_TO_ADD
)) {
4123 return error(_("could not add %s to temporary index"),
4128 hold_lock_file_for_update(&lock
, state
->fake_ancestor
, LOCK_DIE_ON_ERROR
);
4129 res
= write_locked_index(&result
, &lock
, COMMIT_LOCK
);
4130 discard_index(&result
);
4133 return error(_("could not write temporary index to %s"),
4134 state
->fake_ancestor
);
4139 static void stat_patch_list(struct apply_state
*state
, struct patch
*patch
)
4141 int files
, adds
, dels
;
4143 for (files
= adds
= dels
= 0 ; patch
; patch
= patch
->next
) {
4145 adds
+= patch
->lines_added
;
4146 dels
+= patch
->lines_deleted
;
4147 show_stats(state
, patch
);
4150 print_stat_summary(stdout
, files
, adds
, dels
);
4153 static void numstat_patch_list(struct apply_state
*state
,
4154 struct patch
*patch
)
4156 for ( ; patch
; patch
= patch
->next
) {
4158 name
= patch
->new_name
? patch
->new_name
: patch
->old_name
;
4159 if (patch
->is_binary
)
4162 printf("%d\t%d\t", patch
->lines_added
, patch
->lines_deleted
);
4163 write_name_quoted(name
, stdout
, state
->line_termination
);
4167 static void show_file_mode_name(const char *newdelete
, unsigned int mode
, const char *name
)
4170 printf(" %s mode %06o %s\n", newdelete
, mode
, name
);
4172 printf(" %s %s\n", newdelete
, name
);
4175 static void show_mode_change(struct patch
*p
, int show_name
)
4177 if (p
->old_mode
&& p
->new_mode
&& p
->old_mode
!= p
->new_mode
) {
4179 printf(" mode change %06o => %06o %s\n",
4180 p
->old_mode
, p
->new_mode
, p
->new_name
);
4182 printf(" mode change %06o => %06o\n",
4183 p
->old_mode
, p
->new_mode
);
4187 static void show_rename_copy(struct patch
*p
)
4189 const char *renamecopy
= p
->is_rename
? "rename" : "copy";
4190 const char *old
, *new;
4192 /* Find common prefix */
4196 const char *slash_old
, *slash_new
;
4197 slash_old
= strchr(old
, '/');
4198 slash_new
= strchr(new, '/');
4201 slash_old
- old
!= slash_new
- new ||
4202 memcmp(old
, new, slash_new
- new))
4204 old
= slash_old
+ 1;
4205 new = slash_new
+ 1;
4207 /* p->old_name thru old is the common prefix, and old and new
4208 * through the end of names are renames
4210 if (old
!= p
->old_name
)
4211 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy
,
4212 (int)(old
- p
->old_name
), p
->old_name
,
4213 old
, new, p
->score
);
4215 printf(" %s %s => %s (%d%%)\n", renamecopy
,
4216 p
->old_name
, p
->new_name
, p
->score
);
4217 show_mode_change(p
, 0);
4220 static void summary_patch_list(struct patch
*patch
)
4224 for (p
= patch
; p
; p
= p
->next
) {
4226 show_file_mode_name("create", p
->new_mode
, p
->new_name
);
4227 else if (p
->is_delete
)
4228 show_file_mode_name("delete", p
->old_mode
, p
->old_name
);
4230 if (p
->is_rename
|| p
->is_copy
)
4231 show_rename_copy(p
);
4234 printf(" rewrite %s (%d%%)\n",
4235 p
->new_name
, p
->score
);
4236 show_mode_change(p
, 0);
4239 show_mode_change(p
, 1);
4245 static void patch_stats(struct apply_state
*state
, struct patch
*patch
)
4247 int lines
= patch
->lines_added
+ patch
->lines_deleted
;
4249 if (lines
> state
->max_change
)
4250 state
->max_change
= lines
;
4251 if (patch
->old_name
) {
4252 int len
= quote_c_style(patch
->old_name
, NULL
, NULL
, 0);
4254 len
= strlen(patch
->old_name
);
4255 if (len
> state
->max_len
)
4256 state
->max_len
= len
;
4258 if (patch
->new_name
) {
4259 int len
= quote_c_style(patch
->new_name
, NULL
, NULL
, 0);
4261 len
= strlen(patch
->new_name
);
4262 if (len
> state
->max_len
)
4263 state
->max_len
= len
;
4267 static int remove_file(struct apply_state
*state
, struct patch
*patch
, int rmdir_empty
)
4269 if (state
->update_index
) {
4270 if (remove_file_from_cache(patch
->old_name
) < 0)
4271 return error(_("unable to remove %s from index"), patch
->old_name
);
4273 if (!state
->cached
) {
4274 if (!remove_or_warn(patch
->old_mode
, patch
->old_name
) && rmdir_empty
) {
4275 remove_path(patch
->old_name
);
4281 static int add_index_file(struct apply_state
*state
,
4288 struct cache_entry
*ce
;
4289 int namelen
= strlen(path
);
4290 unsigned ce_size
= cache_entry_size(namelen
);
4292 if (!state
->update_index
)
4295 ce
= xcalloc(1, ce_size
);
4296 memcpy(ce
->name
, path
, namelen
);
4297 ce
->ce_mode
= create_ce_mode(mode
);
4298 ce
->ce_flags
= create_ce_flags(0);
4299 ce
->ce_namelen
= namelen
;
4300 if (S_ISGITLINK(mode
)) {
4303 if (!skip_prefix(buf
, "Subproject commit ", &s
) ||
4304 get_oid_hex(s
, &ce
->oid
)) {
4306 return error(_("corrupt patch for submodule %s"), path
);
4309 if (!state
->cached
) {
4310 if (lstat(path
, &st
) < 0) {
4312 return error_errno(_("unable to stat newly "
4313 "created file '%s'"),
4316 fill_stat_cache_info(ce
, &st
);
4318 if (write_sha1_file(buf
, size
, blob_type
, ce
->oid
.hash
) < 0) {
4320 return error(_("unable to create backing store "
4321 "for newly created file %s"), path
);
4324 if (add_cache_entry(ce
, ADD_CACHE_OK_TO_ADD
) < 0) {
4326 return error(_("unable to add cache entry for %s"), path
);
4334 * -1 if an unrecoverable error happened
4335 * 0 if everything went well
4336 * 1 if a recoverable error happened
4338 static int try_create_file(const char *path
, unsigned int mode
, const char *buf
, unsigned long size
)
4341 struct strbuf nbuf
= STRBUF_INIT
;
4343 if (S_ISGITLINK(mode
)) {
4345 if (!lstat(path
, &st
) && S_ISDIR(st
.st_mode
))
4347 return !!mkdir(path
, 0777);
4350 if (has_symlinks
&& S_ISLNK(mode
))
4351 /* Although buf:size is counted string, it also is NUL
4354 return !!symlink(buf
, path
);
4356 fd
= open(path
, O_CREAT
| O_EXCL
| O_WRONLY
, (mode
& 0100) ? 0777 : 0666);
4360 if (convert_to_working_tree(path
, buf
, size
, &nbuf
)) {
4365 res
= write_in_full(fd
, buf
, size
) < 0;
4367 error_errno(_("failed to write to '%s'"), path
);
4368 strbuf_release(&nbuf
);
4370 if (close(fd
) < 0 && !res
)
4371 return error_errno(_("closing file '%s'"), path
);
4373 return res
? -1 : 0;
4377 * We optimistically assume that the directories exist,
4378 * which is true 99% of the time anyway. If they don't,
4379 * we create them and try again.
4385 static int create_one_file(struct apply_state
*state
,
4396 res
= try_create_file(path
, mode
, buf
, size
);
4402 if (errno
== ENOENT
) {
4403 if (safe_create_leading_directories(path
))
4405 res
= try_create_file(path
, mode
, buf
, size
);
4412 if (errno
== EEXIST
|| errno
== EACCES
) {
4413 /* We may be trying to create a file where a directory
4417 if (!lstat(path
, &st
) && (!S_ISDIR(st
.st_mode
) || !rmdir(path
)))
4421 if (errno
== EEXIST
) {
4422 unsigned int nr
= getpid();
4425 char newpath
[PATH_MAX
];
4426 mksnpath(newpath
, sizeof(newpath
), "%s~%u", path
, nr
);
4427 res
= try_create_file(newpath
, mode
, buf
, size
);
4431 if (!rename(newpath
, path
))
4433 unlink_or_warn(newpath
);
4436 if (errno
!= EEXIST
)
4441 return error_errno(_("unable to write file '%s' mode %o"),
4445 static int add_conflicted_stages_file(struct apply_state
*state
,
4446 struct patch
*patch
)
4449 unsigned ce_size
, mode
;
4450 struct cache_entry
*ce
;
4452 if (!state
->update_index
)
4454 namelen
= strlen(patch
->new_name
);
4455 ce_size
= cache_entry_size(namelen
);
4456 mode
= patch
->new_mode
? patch
->new_mode
: (S_IFREG
| 0644);
4458 remove_file_from_cache(patch
->new_name
);
4459 for (stage
= 1; stage
< 4; stage
++) {
4460 if (is_null_oid(&patch
->threeway_stage
[stage
- 1]))
4462 ce
= xcalloc(1, ce_size
);
4463 memcpy(ce
->name
, patch
->new_name
, namelen
);
4464 ce
->ce_mode
= create_ce_mode(mode
);
4465 ce
->ce_flags
= create_ce_flags(stage
);
4466 ce
->ce_namelen
= namelen
;
4467 oidcpy(&ce
->oid
, &patch
->threeway_stage
[stage
- 1]);
4468 if (add_cache_entry(ce
, ADD_CACHE_OK_TO_ADD
) < 0) {
4470 return error(_("unable to add cache entry for %s"),
4478 static int create_file(struct apply_state
*state
, struct patch
*patch
)
4480 char *path
= patch
->new_name
;
4481 unsigned mode
= patch
->new_mode
;
4482 unsigned long size
= patch
->resultsize
;
4483 char *buf
= patch
->result
;
4486 mode
= S_IFREG
| 0644;
4487 if (create_one_file(state
, path
, mode
, buf
, size
))
4490 if (patch
->conflicted_threeway
)
4491 return add_conflicted_stages_file(state
, patch
);
4493 return add_index_file(state
, path
, mode
, buf
, size
);
4496 /* phase zero is to remove, phase one is to create */
4497 static int write_out_one_result(struct apply_state
*state
,
4498 struct patch
*patch
,
4501 if (patch
->is_delete
> 0) {
4503 return remove_file(state
, patch
, 1);
4506 if (patch
->is_new
> 0 || patch
->is_copy
) {
4508 return create_file(state
, patch
);
4512 * Rename or modification boils down to the same
4513 * thing: remove the old, write the new
4516 return remove_file(state
, patch
, patch
->is_rename
);
4518 return create_file(state
, patch
);
4522 static int write_out_one_reject(struct apply_state
*state
, struct patch
*patch
)
4525 char namebuf
[PATH_MAX
];
4526 struct fragment
*frag
;
4528 struct strbuf sb
= STRBUF_INIT
;
4530 for (cnt
= 0, frag
= patch
->fragments
; frag
; frag
= frag
->next
) {
4531 if (!frag
->rejected
)
4537 if (state
->apply_verbosity
> verbosity_normal
)
4538 say_patch_name(stderr
,
4539 _("Applied patch %s cleanly."), patch
);
4543 /* This should not happen, because a removal patch that leaves
4544 * contents are marked "rejected" at the patch level.
4546 if (!patch
->new_name
)
4547 die(_("internal error"));
4549 /* Say this even without --verbose */
4550 strbuf_addf(&sb
, Q_("Applying patch %%s with %d reject...",
4551 "Applying patch %%s with %d rejects...",
4554 if (state
->apply_verbosity
> verbosity_silent
)
4555 say_patch_name(stderr
, sb
.buf
, patch
);
4556 strbuf_release(&sb
);
4558 cnt
= strlen(patch
->new_name
);
4559 if (ARRAY_SIZE(namebuf
) <= cnt
+ 5) {
4560 cnt
= ARRAY_SIZE(namebuf
) - 5;
4561 warning(_("truncating .rej filename to %.*s.rej"),
4562 cnt
- 1, patch
->new_name
);
4564 memcpy(namebuf
, patch
->new_name
, cnt
);
4565 memcpy(namebuf
+ cnt
, ".rej", 5);
4567 rej
= fopen(namebuf
, "w");
4569 return error_errno(_("cannot open %s"), namebuf
);
4571 /* Normal git tools never deal with .rej, so do not pretend
4572 * this is a git patch by saying --git or giving extended
4573 * headers. While at it, maybe please "kompare" that wants
4574 * the trailing TAB and some garbage at the end of line ;-).
4576 fprintf(rej
, "diff a/%s b/%s\t(rejected hunks)\n",
4577 patch
->new_name
, patch
->new_name
);
4578 for (cnt
= 1, frag
= patch
->fragments
;
4580 cnt
++, frag
= frag
->next
) {
4581 if (!frag
->rejected
) {
4582 if (state
->apply_verbosity
> verbosity_silent
)
4583 fprintf_ln(stderr
, _("Hunk #%d applied cleanly."), cnt
);
4586 if (state
->apply_verbosity
> verbosity_silent
)
4587 fprintf_ln(stderr
, _("Rejected hunk #%d."), cnt
);
4588 fprintf(rej
, "%.*s", frag
->size
, frag
->patch
);
4589 if (frag
->patch
[frag
->size
-1] != '\n')
4598 * -1 if an error happened
4599 * 0 if the patch applied cleanly
4600 * 1 if the patch did not apply cleanly
4602 static int write_out_results(struct apply_state
*state
, struct patch
*list
)
4607 struct string_list cpath
= STRING_LIST_INIT_DUP
;
4609 for (phase
= 0; phase
< 2; phase
++) {
4615 if (write_out_one_result(state
, l
, phase
)) {
4616 string_list_clear(&cpath
, 0);
4620 if (write_out_one_reject(state
, l
))
4622 if (l
->conflicted_threeway
) {
4623 string_list_append(&cpath
, l
->new_name
);
4633 struct string_list_item
*item
;
4635 string_list_sort(&cpath
);
4636 if (state
->apply_verbosity
> verbosity_silent
) {
4637 for_each_string_list_item(item
, &cpath
)
4638 fprintf(stderr
, "U %s\n", item
->string
);
4640 string_list_clear(&cpath
, 0);
4649 * Try to apply a patch.
4652 * -128 if a bad error happened (like patch unreadable)
4653 * -1 if patch did not apply and user cannot deal with it
4654 * 0 if the patch applied
4655 * 1 if the patch did not apply but user might fix it
4657 static int apply_patch(struct apply_state
*state
,
4659 const char *filename
,
4663 struct strbuf buf
= STRBUF_INIT
; /* owns the patch text */
4664 struct patch
*list
= NULL
, **listp
= &list
;
4665 int skipped_patch
= 0;
4668 state
->patch_input_file
= filename
;
4669 if (read_patch_file(&buf
, fd
) < 0)
4672 while (offset
< buf
.len
) {
4673 struct patch
*patch
;
4676 patch
= xcalloc(1, sizeof(*patch
));
4677 patch
->inaccurate_eof
= !!(options
& APPLY_OPT_INACCURATE_EOF
);
4678 patch
->recount
= !!(options
& APPLY_OPT_RECOUNT
);
4679 nr
= parse_chunk(state
, buf
.buf
+ offset
, buf
.len
- offset
, patch
);
4688 if (state
->apply_in_reverse
)
4689 reverse_patches(patch
);
4690 if (use_patch(state
, patch
)) {
4691 patch_stats(state
, patch
);
4693 listp
= &patch
->next
;
4696 if (state
->apply_verbosity
> verbosity_normal
)
4697 say_patch_name(stderr
, _("Skipped patch '%s'."), patch
);
4704 if (!list
&& !skipped_patch
) {
4705 error(_("unrecognized input"));
4710 if (state
->whitespace_error
&& (state
->ws_error_action
== die_on_ws_error
))
4713 state
->update_index
= state
->check_index
&& state
->apply
;
4714 if (state
->update_index
&& state
->newfd
< 0) {
4715 if (state
->index_file
)
4716 state
->newfd
= hold_lock_file_for_update(state
->lock_file
,
4720 state
->newfd
= hold_locked_index(state
->lock_file
, LOCK_DIE_ON_ERROR
);
4723 if (state
->check_index
&& read_apply_cache(state
) < 0) {
4724 error(_("unable to read index file"));
4729 if (state
->check
|| state
->apply
) {
4730 int r
= check_patch_list(state
, list
);
4735 if (r
< 0 && !state
->apply_with_reject
) {
4742 int write_res
= write_out_results(state
, list
);
4743 if (write_res
< 0) {
4747 if (write_res
> 0) {
4748 /* with --3way, we still need to write the index out */
4749 res
= state
->apply_with_reject
? -1 : 1;
4754 if (state
->fake_ancestor
&&
4755 build_fake_ancestor(state
, list
)) {
4760 if (state
->diffstat
&& state
->apply_verbosity
> verbosity_silent
)
4761 stat_patch_list(state
, list
);
4763 if (state
->numstat
&& state
->apply_verbosity
> verbosity_silent
)
4764 numstat_patch_list(state
, list
);
4766 if (state
->summary
&& state
->apply_verbosity
> verbosity_silent
)
4767 summary_patch_list(list
);
4770 free_patch_list(list
);
4771 strbuf_release(&buf
);
4772 string_list_clear(&state
->fn_table
, 0);
4776 static int apply_option_parse_exclude(const struct option
*opt
,
4777 const char *arg
, int unset
)
4779 struct apply_state
*state
= opt
->value
;
4780 add_name_limit(state
, arg
, 1);
4784 static int apply_option_parse_include(const struct option
*opt
,
4785 const char *arg
, int unset
)
4787 struct apply_state
*state
= opt
->value
;
4788 add_name_limit(state
, arg
, 0);
4789 state
->has_include
= 1;
4793 static int apply_option_parse_p(const struct option
*opt
,
4797 struct apply_state
*state
= opt
->value
;
4798 state
->p_value
= atoi(arg
);
4799 state
->p_value_known
= 1;
4803 static int apply_option_parse_space_change(const struct option
*opt
,
4804 const char *arg
, int unset
)
4806 struct apply_state
*state
= opt
->value
;
4808 state
->ws_ignore_action
= ignore_ws_none
;
4810 state
->ws_ignore_action
= ignore_ws_change
;
4814 static int apply_option_parse_whitespace(const struct option
*opt
,
4815 const char *arg
, int unset
)
4817 struct apply_state
*state
= opt
->value
;
4818 state
->whitespace_option
= arg
;
4819 if (parse_whitespace_option(state
, arg
))
4824 static int apply_option_parse_directory(const struct option
*opt
,
4825 const char *arg
, int unset
)
4827 struct apply_state
*state
= opt
->value
;
4828 strbuf_reset(&state
->root
);
4829 strbuf_addstr(&state
->root
, arg
);
4830 strbuf_complete(&state
->root
, '/');
4834 int apply_all_patches(struct apply_state
*state
,
4844 for (i
= 0; i
< argc
; i
++) {
4845 const char *arg
= argv
[i
];
4846 char *to_free
= NULL
;
4849 if (!strcmp(arg
, "-")) {
4850 res
= apply_patch(state
, 0, "<stdin>", options
);
4857 arg
= to_free
= prefix_filename(state
->prefix
, arg
);
4859 fd
= open(arg
, O_RDONLY
);
4861 error(_("can't open patch '%s': %s"), arg
, strerror(errno
));
4867 set_default_whitespace_mode(state
);
4868 res
= apply_patch(state
, fd
, arg
, options
);
4875 set_default_whitespace_mode(state
);
4877 res
= apply_patch(state
, 0, "<stdin>", options
);
4883 if (state
->whitespace_error
) {
4884 if (state
->squelch_whitespace_errors
&&
4885 state
->squelch_whitespace_errors
< state
->whitespace_error
) {
4887 state
->whitespace_error
- state
->squelch_whitespace_errors
;
4888 warning(Q_("squelched %d whitespace error",
4889 "squelched %d whitespace errors",
4893 if (state
->ws_error_action
== die_on_ws_error
) {
4894 error(Q_("%d line adds whitespace errors.",
4895 "%d lines add whitespace errors.",
4896 state
->whitespace_error
),
4897 state
->whitespace_error
);
4901 if (state
->applied_after_fixing_ws
&& state
->apply
)
4902 warning(Q_("%d line applied after"
4903 " fixing whitespace errors.",
4904 "%d lines applied after"
4905 " fixing whitespace errors.",
4906 state
->applied_after_fixing_ws
),
4907 state
->applied_after_fixing_ws
);
4908 else if (state
->whitespace_error
)
4909 warning(Q_("%d line adds whitespace errors.",
4910 "%d lines add whitespace errors.",
4911 state
->whitespace_error
),
4912 state
->whitespace_error
);
4915 if (state
->update_index
) {
4916 res
= write_locked_index(&the_index
, state
->lock_file
, COMMIT_LOCK
);
4918 error(_("Unable to write new index file"));
4928 if (state
->newfd
>= 0) {
4929 rollback_lock_file(state
->lock_file
);
4933 if (state
->apply_verbosity
<= verbosity_silent
) {
4934 set_error_routine(state
->saved_error_routine
);
4935 set_warn_routine(state
->saved_warn_routine
);
4940 return (res
== -1 ? 1 : 128);
4943 int apply_parse_options(int argc
, const char **argv
,
4944 struct apply_state
*state
,
4945 int *force_apply
, int *options
,
4946 const char * const *apply_usage
)
4948 struct option builtin_apply_options
[] = {
4949 { OPTION_CALLBACK
, 0, "exclude", state
, N_("path"),
4950 N_("don't apply changes matching the given path"),
4951 0, apply_option_parse_exclude
},
4952 { OPTION_CALLBACK
, 0, "include", state
, N_("path"),
4953 N_("apply changes matching the given path"),
4954 0, apply_option_parse_include
},
4955 { OPTION_CALLBACK
, 'p', NULL
, state
, N_("num"),
4956 N_("remove <num> leading slashes from traditional diff paths"),
4957 0, apply_option_parse_p
},
4958 OPT_BOOL(0, "no-add", &state
->no_add
,
4959 N_("ignore additions made by the patch")),
4960 OPT_BOOL(0, "stat", &state
->diffstat
,
4961 N_("instead of applying the patch, output diffstat for the input")),
4962 OPT_NOOP_NOARG(0, "allow-binary-replacement"),
4963 OPT_NOOP_NOARG(0, "binary"),
4964 OPT_BOOL(0, "numstat", &state
->numstat
,
4965 N_("show number of added and deleted lines in decimal notation")),
4966 OPT_BOOL(0, "summary", &state
->summary
,
4967 N_("instead of applying the patch, output a summary for the input")),
4968 OPT_BOOL(0, "check", &state
->check
,
4969 N_("instead of applying the patch, see if the patch is applicable")),
4970 OPT_BOOL(0, "index", &state
->check_index
,
4971 N_("make sure the patch is applicable to the current index")),
4972 OPT_BOOL(0, "cached", &state
->cached
,
4973 N_("apply a patch without touching the working tree")),
4974 OPT_BOOL(0, "unsafe-paths", &state
->unsafe_paths
,
4975 N_("accept a patch that touches outside the working area")),
4976 OPT_BOOL(0, "apply", force_apply
,
4977 N_("also apply the patch (use with --stat/--summary/--check)")),
4978 OPT_BOOL('3', "3way", &state
->threeway
,
4979 N_( "attempt three-way merge if a patch does not apply")),
4980 OPT_FILENAME(0, "build-fake-ancestor", &state
->fake_ancestor
,
4981 N_("build a temporary index based on embedded index information")),
4982 /* Think twice before adding "--nul" synonym to this */
4983 OPT_SET_INT('z', NULL
, &state
->line_termination
,
4984 N_("paths are separated with NUL character"), '\0'),
4985 OPT_INTEGER('C', NULL
, &state
->p_context
,
4986 N_("ensure at least <n> lines of context match")),
4987 { OPTION_CALLBACK
, 0, "whitespace", state
, N_("action"),
4988 N_("detect new or modified lines that have whitespace errors"),
4989 0, apply_option_parse_whitespace
},
4990 { OPTION_CALLBACK
, 0, "ignore-space-change", state
, NULL
,
4991 N_("ignore changes in whitespace when finding context"),
4992 PARSE_OPT_NOARG
, apply_option_parse_space_change
},
4993 { OPTION_CALLBACK
, 0, "ignore-whitespace", state
, NULL
,
4994 N_("ignore changes in whitespace when finding context"),
4995 PARSE_OPT_NOARG
, apply_option_parse_space_change
},
4996 OPT_BOOL('R', "reverse", &state
->apply_in_reverse
,
4997 N_("apply the patch in reverse")),
4998 OPT_BOOL(0, "unidiff-zero", &state
->unidiff_zero
,
4999 N_("don't expect at least one line of context")),
5000 OPT_BOOL(0, "reject", &state
->apply_with_reject
,
5001 N_("leave the rejected hunks in corresponding *.rej files")),
5002 OPT_BOOL(0, "allow-overlap", &state
->allow_overlap
,
5003 N_("allow overlapping hunks")),
5004 OPT__VERBOSE(&state
->apply_verbosity
, N_("be verbose")),
5005 OPT_BIT(0, "inaccurate-eof", options
,
5006 N_("tolerate incorrectly detected missing new-line at the end of file"),
5007 APPLY_OPT_INACCURATE_EOF
),
5008 OPT_BIT(0, "recount", options
,
5009 N_("do not trust the line counts in the hunk headers"),
5011 { OPTION_CALLBACK
, 0, "directory", state
, N_("root"),
5012 N_("prepend <root> to all filenames"),
5013 0, apply_option_parse_directory
},
5017 return parse_options(argc
, argv
, state
->prefix
, builtin_apply_options
, apply_usage
, 0);