4 * Copyright (C) Linus Torvalds, 2005
6 * This applies patches on top of some (arbitrary) version of the SCM.
12 #include "object-store.h"
17 #include "xdiff-interface.h"
20 #include "parse-options.h"
32 static void git_apply_config(void)
34 git_config_get_string("apply.whitespace", &apply_default_whitespace
);
35 git_config_get_string("apply.ignorewhitespace", &apply_default_ignorewhitespace
);
36 git_config(git_xmerge_config
, NULL
);
39 static int parse_whitespace_option(struct apply_state
*state
, const char *option
)
42 state
->ws_error_action
= warn_on_ws_error
;
45 if (!strcmp(option
, "warn")) {
46 state
->ws_error_action
= warn_on_ws_error
;
49 if (!strcmp(option
, "nowarn")) {
50 state
->ws_error_action
= nowarn_ws_error
;
53 if (!strcmp(option
, "error")) {
54 state
->ws_error_action
= die_on_ws_error
;
57 if (!strcmp(option
, "error-all")) {
58 state
->ws_error_action
= die_on_ws_error
;
59 state
->squelch_whitespace_errors
= 0;
62 if (!strcmp(option
, "strip") || !strcmp(option
, "fix")) {
63 state
->ws_error_action
= correct_ws_error
;
67 * Please update $__git_whitespacelist in git-completion.bash
68 * when you add new options.
70 return error(_("unrecognized whitespace option '%s'"), option
);
73 static int parse_ignorewhitespace_option(struct apply_state
*state
,
76 if (!option
|| !strcmp(option
, "no") ||
77 !strcmp(option
, "false") || !strcmp(option
, "never") ||
78 !strcmp(option
, "none")) {
79 state
->ws_ignore_action
= ignore_ws_none
;
82 if (!strcmp(option
, "change")) {
83 state
->ws_ignore_action
= ignore_ws_change
;
86 return error(_("unrecognized whitespace ignore option '%s'"), option
);
89 int init_apply_state(struct apply_state
*state
,
90 struct repository
*repo
,
93 memset(state
, 0, sizeof(*state
));
94 state
->prefix
= prefix
;
97 state
->line_termination
= '\n';
99 state
->p_context
= UINT_MAX
;
100 state
->squelch_whitespace_errors
= 5;
101 state
->ws_error_action
= warn_on_ws_error
;
102 state
->ws_ignore_action
= ignore_ws_none
;
104 string_list_init_nodup(&state
->fn_table
);
105 string_list_init_nodup(&state
->limit_by_name
);
106 strset_init(&state
->removed_symlinks
);
107 strset_init(&state
->kept_symlinks
);
108 strbuf_init(&state
->root
, 0);
111 if (apply_default_whitespace
&& parse_whitespace_option(state
, apply_default_whitespace
))
113 if (apply_default_ignorewhitespace
&& parse_ignorewhitespace_option(state
, apply_default_ignorewhitespace
))
118 void clear_apply_state(struct apply_state
*state
)
120 string_list_clear(&state
->limit_by_name
, 0);
121 strset_clear(&state
->removed_symlinks
);
122 strset_clear(&state
->kept_symlinks
);
123 strbuf_release(&state
->root
);
125 /* &state->fn_table is cleared at the end of apply_patch() */
128 static void mute_routine(const char *msg
, va_list params
)
133 int check_apply_state(struct apply_state
*state
, int force_apply
)
135 int is_not_gitdir
= !startup_info
->have_repository
;
137 if (state
->apply_with_reject
&& state
->threeway
)
138 return error(_("--reject and --3way cannot be used together."));
139 if (state
->threeway
) {
141 return error(_("--3way outside a repository"));
142 state
->check_index
= 1;
144 if (state
->apply_with_reject
) {
146 if (state
->apply_verbosity
== verbosity_normal
)
147 state
->apply_verbosity
= verbosity_verbose
;
149 if (!force_apply
&& (state
->diffstat
|| state
->numstat
|| state
->summary
|| state
->check
|| state
->fake_ancestor
))
151 if (state
->check_index
&& is_not_gitdir
)
152 return error(_("--index outside a repository"));
155 return error(_("--cached outside a repository"));
156 state
->check_index
= 1;
158 if (state
->ita_only
&& (state
->check_index
|| is_not_gitdir
))
160 if (state
->check_index
)
161 state
->unsafe_paths
= 0;
163 if (state
->apply_verbosity
<= verbosity_silent
) {
164 state
->saved_error_routine
= get_error_routine();
165 state
->saved_warn_routine
= get_warn_routine();
166 set_error_routine(mute_routine
);
167 set_warn_routine(mute_routine
);
173 static void set_default_whitespace_mode(struct apply_state
*state
)
175 if (!state
->whitespace_option
&& !apply_default_whitespace
)
176 state
->ws_error_action
= (state
->apply
? warn_on_ws_error
: nowarn_ws_error
);
180 * This represents one "hunk" from a patch, starting with
181 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The
182 * patch text is pointed at by patch, and its byte length
183 * is stored in size. leading and trailing are the number
187 unsigned long leading
, trailing
;
188 unsigned long oldpos
, oldlines
;
189 unsigned long newpos
, newlines
;
191 * 'patch' is usually borrowed from buf in apply_patch(),
192 * but some codepaths store an allocated buffer.
195 unsigned free_patch
:1,
199 struct fragment
*next
;
203 * When dealing with a binary patch, we reuse "leading" field
204 * to store the type of the binary hunk, either deflated "delta"
205 * or deflated "literal".
207 #define binary_patch_method leading
208 #define BINARY_DELTA_DEFLATED 1
209 #define BINARY_LITERAL_DEFLATED 2
211 static void free_fragment_list(struct fragment
*list
)
214 struct fragment
*next
= list
->next
;
215 if (list
->free_patch
)
216 free((char *)list
->patch
);
222 static void free_patch(struct patch
*patch
)
224 free_fragment_list(patch
->fragments
);
225 free(patch
->def_name
);
226 free(patch
->old_name
);
227 free(patch
->new_name
);
232 static void free_patch_list(struct patch
*list
)
235 struct patch
*next
= list
->next
;
242 * A line in a file, len-bytes long (includes the terminating LF,
243 * except for an incomplete line at the end if the file ends with
244 * one), and its contents hashes to 'hash'.
250 #define LINE_COMMON 1
251 #define LINE_PATCHED 2
255 * This represents a "file", which is an array of "lines".
262 struct line
*line_allocated
;
266 static uint32_t hash_line(const char *cp
, size_t len
)
270 for (i
= 0, h
= 0; i
< len
; i
++) {
271 if (!isspace(cp
[i
])) {
272 h
= h
* 3 + (cp
[i
] & 0xff);
279 * Compare lines s1 of length n1 and s2 of length n2, ignoring
280 * whitespace difference. Returns 1 if they match, 0 otherwise
282 static int fuzzy_matchlines(const char *s1
, size_t n1
,
283 const char *s2
, size_t n2
)
285 const char *end1
= s1
+ n1
;
286 const char *end2
= s2
+ n2
;
288 /* ignore line endings */
289 while (s1
< end1
&& (end1
[-1] == '\r' || end1
[-1] == '\n'))
291 while (s2
< end2
&& (end2
[-1] == '\r' || end2
[-1] == '\n'))
294 while (s1
< end1
&& s2
< end2
) {
297 * Skip whitespace. We check on both buffers
298 * because we don't want "a b" to match "ab".
302 while (s1
< end1
&& isspace(*s1
))
304 while (s2
< end2
&& isspace(*s2
))
306 } else if (*s1
++ != *s2
++)
310 /* If we reached the end on one side only, lines don't match. */
311 return s1
== end1
&& s2
== end2
;
314 static void add_line_info(struct image
*img
, const char *bol
, size_t len
, unsigned flag
)
316 ALLOC_GROW(img
->line_allocated
, img
->nr
+ 1, img
->alloc
);
317 img
->line_allocated
[img
->nr
].len
= len
;
318 img
->line_allocated
[img
->nr
].hash
= hash_line(bol
, len
);
319 img
->line_allocated
[img
->nr
].flag
= flag
;
324 * "buf" has the file contents to be patched (read from various sources).
325 * attach it to "image" and add line-based index to it.
326 * "image" now owns the "buf".
328 static void prepare_image(struct image
*image
, char *buf
, size_t len
,
329 int prepare_linetable
)
333 memset(image
, 0, sizeof(*image
));
337 if (!prepare_linetable
)
340 ep
= image
->buf
+ image
->len
;
344 for (next
= cp
; next
< ep
&& *next
!= '\n'; next
++)
348 add_line_info(image
, cp
, next
- cp
, 0);
351 image
->line
= image
->line_allocated
;
354 static void clear_image(struct image
*image
)
357 free(image
->line_allocated
);
358 memset(image
, 0, sizeof(*image
));
361 /* fmt must contain _one_ %s and no other substitution */
362 static void say_patch_name(FILE *output
, const char *fmt
, struct patch
*patch
)
364 struct strbuf sb
= STRBUF_INIT
;
366 if (patch
->old_name
&& patch
->new_name
&&
367 strcmp(patch
->old_name
, patch
->new_name
)) {
368 quote_c_style(patch
->old_name
, &sb
, NULL
, 0);
369 strbuf_addstr(&sb
, " => ");
370 quote_c_style(patch
->new_name
, &sb
, NULL
, 0);
372 const char *n
= patch
->new_name
;
375 quote_c_style(n
, &sb
, NULL
, 0);
377 fprintf(output
, fmt
, sb
.buf
);
384 static int read_patch_file(struct strbuf
*sb
, int fd
)
386 if (strbuf_read(sb
, fd
, 0) < 0)
387 return error_errno("git apply: failed to read");
390 * Make sure that we have some slop in the buffer
391 * so that we can do speculative "memcmp" etc, and
392 * see to it that it is NUL-filled.
394 strbuf_grow(sb
, SLOP
);
395 memset(sb
->buf
+ sb
->len
, 0, SLOP
);
399 static unsigned long linelen(const char *buffer
, unsigned long size
)
401 unsigned long len
= 0;
404 if (*buffer
++ == '\n')
410 static int is_dev_null(const char *str
)
412 return skip_prefix(str
, "/dev/null", &str
) && isspace(*str
);
418 static int name_terminate(int c
, int terminate
)
420 if (c
== ' ' && !(terminate
& TERM_SPACE
))
422 if (c
== '\t' && !(terminate
& TERM_TAB
))
428 /* remove double slashes to make --index work with such filenames */
429 static char *squash_slash(char *name
)
437 if ((name
[j
++] = name
[i
++]) == '/')
438 while (name
[i
] == '/')
445 static char *find_name_gnu(struct strbuf
*root
,
449 struct strbuf name
= STRBUF_INIT
;
453 * Proposed "new-style" GNU patch/diff format; see
454 * https://lore.kernel.org/git/7vll0wvb2a.fsf@assigned-by-dhcp.cox.net/
456 if (unquote_c_style(&name
, line
, NULL
)) {
457 strbuf_release(&name
);
461 for (cp
= name
.buf
; p_value
; p_value
--) {
462 cp
= strchr(cp
, '/');
464 strbuf_release(&name
);
470 strbuf_remove(&name
, 0, cp
- name
.buf
);
472 strbuf_insert(&name
, 0, root
->buf
, root
->len
);
473 return squash_slash(strbuf_detach(&name
, NULL
));
476 static size_t sane_tz_len(const char *line
, size_t len
)
480 if (len
< strlen(" +0500") || line
[len
-strlen(" +0500")] != ' ')
482 tz
= line
+ len
- strlen(" +0500");
484 if (tz
[1] != '+' && tz
[1] != '-')
487 for (p
= tz
+ 2; p
!= line
+ len
; p
++)
491 return line
+ len
- tz
;
494 static size_t tz_with_colon_len(const char *line
, size_t len
)
498 if (len
< strlen(" +08:00") || line
[len
- strlen(":00")] != ':')
500 tz
= line
+ len
- strlen(" +08:00");
502 if (tz
[0] != ' ' || (tz
[1] != '+' && tz
[1] != '-'))
505 if (!isdigit(*p
++) || !isdigit(*p
++) || *p
++ != ':' ||
506 !isdigit(*p
++) || !isdigit(*p
++))
509 return line
+ len
- tz
;
512 static size_t date_len(const char *line
, size_t len
)
514 const char *date
, *p
;
516 if (len
< strlen("72-02-05") || line
[len
-strlen("-05")] != '-')
518 p
= date
= line
+ len
- strlen("72-02-05");
520 if (!isdigit(*p
++) || !isdigit(*p
++) || *p
++ != '-' ||
521 !isdigit(*p
++) || !isdigit(*p
++) || *p
++ != '-' ||
522 !isdigit(*p
++) || !isdigit(*p
++)) /* Not a date. */
525 if (date
- line
>= strlen("19") &&
526 isdigit(date
[-1]) && isdigit(date
[-2])) /* 4-digit year */
527 date
-= strlen("19");
529 return line
+ len
- date
;
532 static size_t short_time_len(const char *line
, size_t len
)
534 const char *time
, *p
;
536 if (len
< strlen(" 07:01:32") || line
[len
-strlen(":32")] != ':')
538 p
= time
= line
+ len
- strlen(" 07:01:32");
540 /* Permit 1-digit hours? */
542 !isdigit(*p
++) || !isdigit(*p
++) || *p
++ != ':' ||
543 !isdigit(*p
++) || !isdigit(*p
++) || *p
++ != ':' ||
544 !isdigit(*p
++) || !isdigit(*p
++)) /* Not a time. */
547 return line
+ len
- time
;
550 static size_t fractional_time_len(const char *line
, size_t len
)
555 /* Expected format: 19:41:17.620000023 */
556 if (!len
|| !isdigit(line
[len
- 1]))
560 /* Fractional seconds. */
561 while (p
> line
&& isdigit(*p
))
566 /* Hours, minutes, and whole seconds. */
567 n
= short_time_len(line
, p
- line
);
571 return line
+ len
- p
+ n
;
574 static size_t trailing_spaces_len(const char *line
, size_t len
)
578 /* Expected format: ' ' x (1 or more) */
579 if (!len
|| line
[len
- 1] != ' ')
586 return line
+ len
- (p
+ 1);
593 static size_t diff_timestamp_len(const char *line
, size_t len
)
595 const char *end
= line
+ len
;
599 * Posix: 2010-07-05 19:41:17
600 * GNU: 2010-07-05 19:41:17.620000023 -0500
603 if (!isdigit(end
[-1]))
606 n
= sane_tz_len(line
, end
- line
);
608 n
= tz_with_colon_len(line
, end
- line
);
611 n
= short_time_len(line
, end
- line
);
613 n
= fractional_time_len(line
, end
- line
);
616 n
= date_len(line
, end
- line
);
617 if (!n
) /* No date. Too bad. */
621 if (end
== line
) /* No space before date. */
623 if (end
[-1] == '\t') { /* Success! */
625 return line
+ len
- end
;
627 if (end
[-1] != ' ') /* No space before date. */
630 /* Whitespace damage. */
631 end
-= trailing_spaces_len(line
, end
- line
);
632 return line
+ len
- end
;
635 static char *find_name_common(struct strbuf
*root
,
643 const char *start
= NULL
;
647 while (line
!= end
) {
650 if (!end
&& isspace(c
)) {
653 if (name_terminate(c
, terminate
))
657 if (c
== '/' && !--p_value
)
661 return squash_slash(xstrdup_or_null(def
));
664 return squash_slash(xstrdup_or_null(def
));
667 * Generally we prefer the shorter name, especially
668 * if the other one is just a variation of that with
669 * something else tacked on to the end (ie "file.orig"
673 int deflen
= strlen(def
);
674 if (deflen
< len
&& !strncmp(start
, def
, deflen
))
675 return squash_slash(xstrdup(def
));
679 char *ret
= xstrfmt("%s%.*s", root
->buf
, len
, start
);
680 return squash_slash(ret
);
683 return squash_slash(xmemdupz(start
, len
));
686 static char *find_name(struct strbuf
*root
,
693 char *name
= find_name_gnu(root
, line
, p_value
);
698 return find_name_common(root
, line
, def
, p_value
, NULL
, terminate
);
701 static char *find_name_traditional(struct strbuf
*root
,
710 char *name
= find_name_gnu(root
, line
, p_value
);
715 len
= strchrnul(line
, '\n') - line
;
716 date_len
= diff_timestamp_len(line
, len
);
718 return find_name_common(root
, line
, def
, p_value
, NULL
, TERM_TAB
);
721 return find_name_common(root
, line
, def
, p_value
, line
+ len
, 0);
725 * Given the string after "--- " or "+++ ", guess the appropriate
726 * p_value for the given patch.
728 static int guess_p_value(struct apply_state
*state
, const char *nameline
)
733 if (is_dev_null(nameline
))
735 name
= find_name_traditional(&state
->root
, nameline
, NULL
, 0);
738 cp
= strchr(name
, '/');
741 else if (state
->prefix
) {
743 * Does it begin with "a/$our-prefix" and such? Then this is
744 * very likely to apply to our directory.
746 if (starts_with(name
, state
->prefix
))
747 val
= count_slashes(state
->prefix
);
750 if (starts_with(cp
, state
->prefix
))
751 val
= count_slashes(state
->prefix
) + 1;
759 * Does the ---/+++ line have the POSIX timestamp after the last HT?
760 * GNU diff puts epoch there to signal a creation/deletion event. Is
761 * this such a timestamp?
763 static int has_epoch_timestamp(const char *nameline
)
766 * We are only interested in epoch timestamp; any non-zero
767 * fraction cannot be one, hence "(\.0+)?" in the regexp below.
768 * For the same reason, the date must be either 1969-12-31 or
769 * 1970-01-01, and the seconds part must be "00".
771 const char stamp_regexp
[] =
772 "^[0-2][0-9]:([0-5][0-9]):00(\\.0+)?"
774 "([-+][0-2][0-9]:?[0-5][0-9])\n";
775 const char *timestamp
= NULL
, *cp
, *colon
;
776 static regex_t
*stamp
;
778 int zoneoffset
, epoch_hour
, hour
, minute
;
781 for (cp
= nameline
; *cp
!= '\n'; cp
++) {
789 * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31
790 * (west of GMT) or 1970-01-01 (east of GMT)
792 if (skip_prefix(timestamp
, "1969-12-31 ", ×tamp
))
794 else if (skip_prefix(timestamp
, "1970-01-01 ", ×tamp
))
800 stamp
= xmalloc(sizeof(*stamp
));
801 if (regcomp(stamp
, stamp_regexp
, REG_EXTENDED
)) {
802 warning(_("Cannot prepare timestamp regexp %s"),
808 status
= regexec(stamp
, timestamp
, ARRAY_SIZE(m
), m
, 0);
810 if (status
!= REG_NOMATCH
)
811 warning(_("regexec returned %d for input: %s"),
816 hour
= strtol(timestamp
, NULL
, 10);
817 minute
= strtol(timestamp
+ m
[1].rm_so
, NULL
, 10);
819 zoneoffset
= strtol(timestamp
+ m
[3].rm_so
+ 1, (char **) &colon
, 10);
821 zoneoffset
= zoneoffset
* 60 + strtol(colon
+ 1, NULL
, 10);
823 zoneoffset
= (zoneoffset
/ 100) * 60 + (zoneoffset
% 100);
824 if (timestamp
[m
[3].rm_so
] == '-')
825 zoneoffset
= -zoneoffset
;
827 return hour
* 60 + minute
- zoneoffset
== epoch_hour
* 60;
831 * Get the name etc info from the ---/+++ lines of a traditional patch header
833 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
834 * files, we can happily check the index for a match, but for creating a
835 * new file we should try to match whatever "patch" does. I have no idea.
837 static int parse_traditional_patch(struct apply_state
*state
,
844 first
+= 4; /* skip "--- " */
845 second
+= 4; /* skip "+++ " */
846 if (!state
->p_value_known
) {
848 p
= guess_p_value(state
, first
);
849 q
= guess_p_value(state
, second
);
851 if (0 <= p
&& p
== q
) {
853 state
->p_value_known
= 1;
856 if (is_dev_null(first
)) {
858 patch
->is_delete
= 0;
859 name
= find_name_traditional(&state
->root
, second
, NULL
, state
->p_value
);
860 patch
->new_name
= name
;
861 } else if (is_dev_null(second
)) {
863 patch
->is_delete
= 1;
864 name
= find_name_traditional(&state
->root
, first
, NULL
, state
->p_value
);
865 patch
->old_name
= name
;
868 first_name
= find_name_traditional(&state
->root
, first
, NULL
, state
->p_value
);
869 name
= find_name_traditional(&state
->root
, second
, first_name
, state
->p_value
);
871 if (has_epoch_timestamp(first
)) {
873 patch
->is_delete
= 0;
874 patch
->new_name
= name
;
875 } else if (has_epoch_timestamp(second
)) {
877 patch
->is_delete
= 1;
878 patch
->old_name
= name
;
880 patch
->old_name
= name
;
881 patch
->new_name
= xstrdup_or_null(name
);
885 return error(_("unable to find filename in patch at line %d"), state
->linenr
);
890 static int gitdiff_hdrend(struct gitdiff_data
*state
,
898 * We're anal about diff header consistency, to make
899 * sure that we don't end up having strange ambiguous
900 * patches floating around.
902 * As a result, gitdiff_{old|new}name() will check
903 * their names against any previous information, just
906 #define DIFF_OLD_NAME 0
907 #define DIFF_NEW_NAME 1
909 static int gitdiff_verify_name(struct gitdiff_data
*state
,
915 if (!*name
&& !isnull
) {
916 *name
= find_name(state
->root
, line
, NULL
, state
->p_value
, TERM_TAB
);
923 return error(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"),
924 *name
, state
->linenr
);
925 another
= find_name(state
->root
, line
, NULL
, state
->p_value
, TERM_TAB
);
926 if (!another
|| strcmp(another
, *name
)) {
928 return error((side
== DIFF_NEW_NAME
) ?
929 _("git apply: bad git-diff - inconsistent new filename on line %d") :
930 _("git apply: bad git-diff - inconsistent old filename on line %d"), state
->linenr
);
934 if (!is_dev_null(line
))
935 return error(_("git apply: bad git-diff - expected /dev/null on line %d"), state
->linenr
);
941 static int gitdiff_oldname(struct gitdiff_data
*state
,
945 return gitdiff_verify_name(state
, line
,
946 patch
->is_new
, &patch
->old_name
,
950 static int gitdiff_newname(struct gitdiff_data
*state
,
954 return gitdiff_verify_name(state
, line
,
955 patch
->is_delete
, &patch
->new_name
,
959 static int parse_mode_line(const char *line
, int linenr
, unsigned int *mode
)
962 *mode
= strtoul(line
, &end
, 8);
963 if (end
== line
|| !isspace(*end
))
964 return error(_("invalid mode on line %d: %s"), linenr
, line
);
968 static int gitdiff_oldmode(struct gitdiff_data
*state
,
972 return parse_mode_line(line
, state
->linenr
, &patch
->old_mode
);
975 static int gitdiff_newmode(struct gitdiff_data
*state
,
979 return parse_mode_line(line
, state
->linenr
, &patch
->new_mode
);
982 static int gitdiff_delete(struct gitdiff_data
*state
,
986 patch
->is_delete
= 1;
987 free(patch
->old_name
);
988 patch
->old_name
= xstrdup_or_null(patch
->def_name
);
989 return gitdiff_oldmode(state
, line
, patch
);
992 static int gitdiff_newfile(struct gitdiff_data
*state
,
997 free(patch
->new_name
);
998 patch
->new_name
= xstrdup_or_null(patch
->def_name
);
999 return gitdiff_newmode(state
, line
, patch
);
1002 static int gitdiff_copysrc(struct gitdiff_data
*state
,
1004 struct patch
*patch
)
1007 free(patch
->old_name
);
1008 patch
->old_name
= find_name(state
->root
, line
, NULL
, state
->p_value
? state
->p_value
- 1 : 0, 0);
1012 static int gitdiff_copydst(struct gitdiff_data
*state
,
1014 struct patch
*patch
)
1017 free(patch
->new_name
);
1018 patch
->new_name
= find_name(state
->root
, line
, NULL
, state
->p_value
? state
->p_value
- 1 : 0, 0);
1022 static int gitdiff_renamesrc(struct gitdiff_data
*state
,
1024 struct patch
*patch
)
1026 patch
->is_rename
= 1;
1027 free(patch
->old_name
);
1028 patch
->old_name
= find_name(state
->root
, line
, NULL
, state
->p_value
? state
->p_value
- 1 : 0, 0);
1032 static int gitdiff_renamedst(struct gitdiff_data
*state
,
1034 struct patch
*patch
)
1036 patch
->is_rename
= 1;
1037 free(patch
->new_name
);
1038 patch
->new_name
= find_name(state
->root
, line
, NULL
, state
->p_value
? state
->p_value
- 1 : 0, 0);
1042 static int gitdiff_similarity(struct gitdiff_data
*state
,
1044 struct patch
*patch
)
1046 unsigned long val
= strtoul(line
, NULL
, 10);
1052 static int gitdiff_dissimilarity(struct gitdiff_data
*state
,
1054 struct patch
*patch
)
1056 unsigned long val
= strtoul(line
, NULL
, 10);
1062 static int gitdiff_index(struct gitdiff_data
*state
,
1064 struct patch
*patch
)
1067 * index line is N hexadecimal, "..", N hexadecimal,
1068 * and optional space with octal mode.
1070 const char *ptr
, *eol
;
1072 const unsigned hexsz
= the_hash_algo
->hexsz
;
1074 ptr
= strchr(line
, '.');
1075 if (!ptr
|| ptr
[1] != '.' || hexsz
< ptr
- line
)
1078 memcpy(patch
->old_oid_prefix
, line
, len
);
1079 patch
->old_oid_prefix
[len
] = 0;
1082 ptr
= strchr(line
, ' ');
1083 eol
= strchrnul(line
, '\n');
1085 if (!ptr
|| eol
< ptr
)
1091 memcpy(patch
->new_oid_prefix
, line
, len
);
1092 patch
->new_oid_prefix
[len
] = 0;
1094 return gitdiff_oldmode(state
, ptr
+ 1, patch
);
1099 * This is normal for a diff that doesn't change anything: we'll fall through
1100 * into the next diff. Tell the parser to break out.
1102 static int gitdiff_unrecognized(struct gitdiff_data
*state
,
1104 struct patch
*patch
)
1110 * Skip p_value leading components from "line"; as we do not accept
1111 * absolute paths, return NULL in that case.
1113 static const char *skip_tree_prefix(int p_value
,
1121 return (llen
&& line
[0] == '/') ? NULL
: line
;
1124 for (i
= 0; i
< llen
; i
++) {
1126 if (ch
== '/' && --nslash
<= 0)
1127 return (i
== 0) ? NULL
: &line
[i
+ 1];
1133 * This is to extract the same name that appears on "diff --git"
1134 * line. We do not find and return anything if it is a rename
1135 * patch, and it is OK because we will find the name elsewhere.
1136 * We need to reliably find name only when it is mode-change only,
1137 * creation or deletion of an empty file. In any of these cases,
1138 * both sides are the same name under a/ and b/ respectively.
1140 static char *git_header_name(int p_value
,
1145 const char *second
= NULL
;
1146 size_t len
, line_len
;
1148 line
+= strlen("diff --git ");
1149 llen
-= strlen("diff --git ");
1153 struct strbuf first
= STRBUF_INIT
;
1154 struct strbuf sp
= STRBUF_INIT
;
1156 if (unquote_c_style(&first
, line
, &second
))
1157 goto free_and_fail1
;
1159 /* strip the a/b prefix including trailing slash */
1160 cp
= skip_tree_prefix(p_value
, first
.buf
, first
.len
);
1162 goto free_and_fail1
;
1163 strbuf_remove(&first
, 0, cp
- first
.buf
);
1166 * second points at one past closing dq of name.
1167 * find the second name.
1169 while ((second
< line
+ llen
) && isspace(*second
))
1172 if (line
+ llen
<= second
)
1173 goto free_and_fail1
;
1174 if (*second
== '"') {
1175 if (unquote_c_style(&sp
, second
, NULL
))
1176 goto free_and_fail1
;
1177 cp
= skip_tree_prefix(p_value
, sp
.buf
, sp
.len
);
1179 goto free_and_fail1
;
1180 /* They must match, otherwise ignore */
1181 if (strcmp(cp
, first
.buf
))
1182 goto free_and_fail1
;
1183 strbuf_release(&sp
);
1184 return strbuf_detach(&first
, NULL
);
1187 /* unquoted second */
1188 cp
= skip_tree_prefix(p_value
, second
, line
+ llen
- second
);
1190 goto free_and_fail1
;
1191 if (line
+ llen
- cp
!= first
.len
||
1192 memcmp(first
.buf
, cp
, first
.len
))
1193 goto free_and_fail1
;
1194 return strbuf_detach(&first
, NULL
);
1197 strbuf_release(&first
);
1198 strbuf_release(&sp
);
1202 /* unquoted first name */
1203 name
= skip_tree_prefix(p_value
, line
, llen
);
1208 * since the first name is unquoted, a dq if exists must be
1209 * the beginning of the second name.
1211 for (second
= name
; second
< line
+ llen
; second
++) {
1212 if (*second
== '"') {
1213 struct strbuf sp
= STRBUF_INIT
;
1216 if (unquote_c_style(&sp
, second
, NULL
))
1217 goto free_and_fail2
;
1219 np
= skip_tree_prefix(p_value
, sp
.buf
, sp
.len
);
1221 goto free_and_fail2
;
1223 len
= sp
.buf
+ sp
.len
- np
;
1224 if (len
< second
- name
&&
1225 !strncmp(np
, name
, len
) &&
1226 isspace(name
[len
])) {
1228 strbuf_remove(&sp
, 0, np
- sp
.buf
);
1229 return strbuf_detach(&sp
, NULL
);
1233 strbuf_release(&sp
);
1239 * Accept a name only if it shows up twice, exactly the same
1242 second
= strchr(name
, '\n');
1245 line_len
= second
- name
;
1246 for (len
= 0 ; ; len
++) {
1247 switch (name
[len
]) {
1252 case '\t': case ' ':
1254 * Is this the separator between the preimage
1255 * and the postimage pathname? Again, we are
1256 * only interested in the case where there is
1257 * no rename, as this is only to set def_name
1258 * and a rename patch has the names elsewhere
1259 * in an unambiguous form.
1262 return NULL
; /* no postimage name */
1263 second
= skip_tree_prefix(p_value
, name
+ len
+ 1,
1264 line_len
- (len
+ 1));
1268 * Does len bytes starting at "name" and "second"
1269 * (that are separated by one HT or SP we just
1270 * found) exactly match?
1272 if (second
[len
] == '\n' && !strncmp(name
, second
, len
))
1273 return xmemdupz(name
, len
);
1278 static int check_header_line(int linenr
, struct patch
*patch
)
1280 int extensions
= (patch
->is_delete
== 1) + (patch
->is_new
== 1) +
1281 (patch
->is_rename
== 1) + (patch
->is_copy
== 1);
1283 return error(_("inconsistent header lines %d and %d"),
1284 patch
->extension_linenr
, linenr
);
1285 if (extensions
&& !patch
->extension_linenr
)
1286 patch
->extension_linenr
= linenr
;
1290 int parse_git_diff_header(struct strbuf
*root
,
1296 struct patch
*patch
)
1298 unsigned long offset
;
1299 struct gitdiff_data parse_hdr_state
;
1301 /* A git diff has explicit new/delete information, so we don't guess */
1303 patch
->is_delete
= 0;
1306 * Some things may not have the old name in the
1307 * rest of the headers anywhere (pure mode changes,
1308 * or removing or adding empty files), so we get
1309 * the default name from the header.
1311 patch
->def_name
= git_header_name(p_value
, line
, len
);
1312 if (patch
->def_name
&& root
->len
) {
1313 char *s
= xstrfmt("%s%s", root
->buf
, patch
->def_name
);
1314 free(patch
->def_name
);
1315 patch
->def_name
= s
;
1321 parse_hdr_state
.root
= root
;
1322 parse_hdr_state
.linenr
= *linenr
;
1323 parse_hdr_state
.p_value
= p_value
;
1325 for (offset
= len
; size
> 0 ; offset
+= len
, size
-= len
, line
+= len
, (*linenr
)++) {
1326 static const struct opentry
{
1328 int (*fn
)(struct gitdiff_data
*, const char *, struct patch
*);
1330 { "@@ -", gitdiff_hdrend
},
1331 { "--- ", gitdiff_oldname
},
1332 { "+++ ", gitdiff_newname
},
1333 { "old mode ", gitdiff_oldmode
},
1334 { "new mode ", gitdiff_newmode
},
1335 { "deleted file mode ", gitdiff_delete
},
1336 { "new file mode ", gitdiff_newfile
},
1337 { "copy from ", gitdiff_copysrc
},
1338 { "copy to ", gitdiff_copydst
},
1339 { "rename old ", gitdiff_renamesrc
},
1340 { "rename new ", gitdiff_renamedst
},
1341 { "rename from ", gitdiff_renamesrc
},
1342 { "rename to ", gitdiff_renamedst
},
1343 { "similarity index ", gitdiff_similarity
},
1344 { "dissimilarity index ", gitdiff_dissimilarity
},
1345 { "index ", gitdiff_index
},
1346 { "", gitdiff_unrecognized
},
1350 len
= linelen(line
, size
);
1351 if (!len
|| line
[len
-1] != '\n')
1353 for (i
= 0; i
< ARRAY_SIZE(optable
); i
++) {
1354 const struct opentry
*p
= optable
+ i
;
1355 int oplen
= strlen(p
->str
);
1357 if (len
< oplen
|| memcmp(p
->str
, line
, oplen
))
1359 res
= p
->fn(&parse_hdr_state
, line
+ oplen
, patch
);
1362 if (check_header_line(*linenr
, patch
))
1371 if (!patch
->old_name
&& !patch
->new_name
) {
1372 if (!patch
->def_name
) {
1373 error(Q_("git diff header lacks filename information when removing "
1374 "%d leading pathname component (line %d)",
1375 "git diff header lacks filename information when removing "
1376 "%d leading pathname components (line %d)",
1377 parse_hdr_state
.p_value
),
1378 parse_hdr_state
.p_value
, *linenr
);
1381 patch
->old_name
= xstrdup(patch
->def_name
);
1382 patch
->new_name
= xstrdup(patch
->def_name
);
1384 if ((!patch
->new_name
&& !patch
->is_delete
) ||
1385 (!patch
->old_name
&& !patch
->is_new
)) {
1386 error(_("git diff header lacks filename information "
1387 "(line %d)"), *linenr
);
1390 patch
->is_toplevel_relative
= 1;
1394 static int parse_num(const char *line
, unsigned long *p
)
1398 if (!isdigit(*line
))
1400 *p
= strtoul(line
, &ptr
, 10);
1404 static int parse_range(const char *line
, int len
, int offset
, const char *expect
,
1405 unsigned long *p1
, unsigned long *p2
)
1409 if (offset
< 0 || offset
>= len
)
1414 digits
= parse_num(line
, p1
);
1424 digits
= parse_num(line
+1, p2
);
1433 ex
= strlen(expect
);
1436 if (memcmp(line
, expect
, ex
))
1442 static void recount_diff(const char *line
, int size
, struct fragment
*fragment
)
1444 int oldlines
= 0, newlines
= 0, ret
= 0;
1447 warning("recount: ignore empty hunk");
1452 int len
= linelen(line
, size
);
1460 case ' ': case '\n':
1472 ret
= size
< 3 || !starts_with(line
, "@@ ");
1475 ret
= size
< 5 || !starts_with(line
, "diff ");
1482 warning(_("recount: unexpected line: %.*s"),
1483 (int)linelen(line
, size
), line
);
1488 fragment
->oldlines
= oldlines
;
1489 fragment
->newlines
= newlines
;
1493 * Parse a unified diff fragment header of the
1494 * form "@@ -a,b +c,d @@"
1496 static int parse_fragment_header(const char *line
, int len
, struct fragment
*fragment
)
1500 if (!len
|| line
[len
-1] != '\n')
1503 /* Figure out the number of lines in a fragment */
1504 offset
= parse_range(line
, len
, 4, " +", &fragment
->oldpos
, &fragment
->oldlines
);
1505 offset
= parse_range(line
, len
, offset
, " @@", &fragment
->newpos
, &fragment
->newlines
);
1511 * Find file diff header
1514 * -1 if no header was found
1515 * -128 in case of error
1516 * the size of the header in bytes (called "offset") otherwise
1518 static int find_header(struct apply_state
*state
,
1522 struct patch
*patch
)
1524 unsigned long offset
, len
;
1526 patch
->is_toplevel_relative
= 0;
1527 patch
->is_rename
= patch
->is_copy
= 0;
1528 patch
->is_new
= patch
->is_delete
= -1;
1529 patch
->old_mode
= patch
->new_mode
= 0;
1530 patch
->old_name
= patch
->new_name
= NULL
;
1531 for (offset
= 0; size
> 0; offset
+= len
, size
-= len
, line
+= len
, state
->linenr
++) {
1532 unsigned long nextlen
;
1534 len
= linelen(line
, size
);
1538 /* Testing this early allows us to take a few shortcuts.. */
1543 * Make sure we don't find any unconnected patch fragments.
1544 * That's a sign that we didn't find a header, and that a
1545 * patch has become corrupted/broken up.
1547 if (!memcmp("@@ -", line
, 4)) {
1548 struct fragment dummy
;
1549 if (parse_fragment_header(line
, len
, &dummy
) < 0)
1551 error(_("patch fragment without header at line %d: %.*s"),
1552 state
->linenr
, (int)len
-1, line
);
1560 * Git patch? It might not have a real patch, just a rename
1561 * or mode change, so we handle that specially
1563 if (!memcmp("diff --git ", line
, 11)) {
1564 int git_hdr_len
= parse_git_diff_header(&state
->root
, &state
->linenr
,
1565 state
->p_value
, line
, len
,
1567 if (git_hdr_len
< 0)
1569 if (git_hdr_len
<= len
)
1571 *hdrsize
= git_hdr_len
;
1575 /* --- followed by +++ ? */
1576 if (memcmp("--- ", line
, 4) || memcmp("+++ ", line
+ len
, 4))
1580 * We only accept unified patches, so we want it to
1581 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
1582 * minimum ("@@ -0,0 +1 @@\n" is the shortest).
1584 nextlen
= linelen(line
+ len
, size
- len
);
1585 if (size
< nextlen
+ 14 || memcmp("@@ -", line
+ len
+ nextlen
, 4))
1588 /* Ok, we'll consider it a patch */
1589 if (parse_traditional_patch(state
, line
, line
+len
, patch
))
1591 *hdrsize
= len
+ nextlen
;
1598 static void record_ws_error(struct apply_state
*state
,
1609 state
->whitespace_error
++;
1610 if (state
->squelch_whitespace_errors
&&
1611 state
->squelch_whitespace_errors
< state
->whitespace_error
)
1614 err
= whitespace_error_string(result
);
1615 if (state
->apply_verbosity
> verbosity_silent
)
1616 fprintf(stderr
, "%s:%d: %s.\n%.*s\n",
1617 state
->patch_input_file
, linenr
, err
, len
, line
);
1621 static void check_whitespace(struct apply_state
*state
,
1626 unsigned result
= ws_check(line
+ 1, len
- 1, ws_rule
);
1628 record_ws_error(state
, result
, line
+ 1, len
- 2, state
->linenr
);
1632 * Check if the patch has context lines with CRLF or
1633 * the patch wants to remove lines with CRLF.
1635 static void check_old_for_crlf(struct patch
*patch
, const char *line
, int len
)
1637 if (len
>= 2 && line
[len
-1] == '\n' && line
[len
-2] == '\r') {
1638 patch
->ws_rule
|= WS_CR_AT_EOL
;
1639 patch
->crlf_in_old
= 1;
1645 * Parse a unified diff. Note that this really needs to parse each
1646 * fragment separately, since the only way to know the difference
1647 * between a "---" that is part of a patch, and a "---" that starts
1648 * the next patch is to look at the line counts..
1650 static int parse_fragment(struct apply_state
*state
,
1653 struct patch
*patch
,
1654 struct fragment
*fragment
)
1657 int len
= linelen(line
, size
), offset
;
1658 unsigned long oldlines
, newlines
;
1659 unsigned long leading
, trailing
;
1661 offset
= parse_fragment_header(line
, len
, fragment
);
1664 if (offset
> 0 && patch
->recount
)
1665 recount_diff(line
+ offset
, size
- offset
, fragment
);
1666 oldlines
= fragment
->oldlines
;
1667 newlines
= fragment
->newlines
;
1671 /* Parse the thing.. */
1675 added
= deleted
= 0;
1678 offset
+= len
, size
-= len
, line
+= len
, state
->linenr
++) {
1679 if (!oldlines
&& !newlines
)
1681 len
= linelen(line
, size
);
1682 if (!len
|| line
[len
-1] != '\n')
1687 case '\n': /* newer GNU diff, an empty context line */
1691 if (!deleted
&& !added
)
1694 check_old_for_crlf(patch
, line
, len
);
1695 if (!state
->apply_in_reverse
&&
1696 state
->ws_error_action
== correct_ws_error
)
1697 check_whitespace(state
, line
, len
, patch
->ws_rule
);
1700 if (!state
->apply_in_reverse
)
1701 check_old_for_crlf(patch
, line
, len
);
1702 if (state
->apply_in_reverse
&&
1703 state
->ws_error_action
!= nowarn_ws_error
)
1704 check_whitespace(state
, line
, len
, patch
->ws_rule
);
1710 if (state
->apply_in_reverse
)
1711 check_old_for_crlf(patch
, line
, len
);
1712 if (!state
->apply_in_reverse
&&
1713 state
->ws_error_action
!= nowarn_ws_error
)
1714 check_whitespace(state
, line
, len
, patch
->ws_rule
);
1721 * We allow "\ No newline at end of file". Depending
1722 * on locale settings when the patch was produced we
1723 * don't know what this line looks like. The only
1724 * thing we do know is that it begins with "\ ".
1725 * Checking for 12 is just for sanity check -- any
1726 * l10n of "\ No newline..." is at least that long.
1729 if (len
< 12 || memcmp(line
, "\\ ", 2))
1734 if (oldlines
|| newlines
)
1736 if (!patch
->recount
&& !deleted
&& !added
)
1739 fragment
->leading
= leading
;
1740 fragment
->trailing
= trailing
;
1743 * If a fragment ends with an incomplete line, we failed to include
1744 * it in the above loop because we hit oldlines == newlines == 0
1747 if (12 < size
&& !memcmp(line
, "\\ ", 2))
1748 offset
+= linelen(line
, size
);
1750 patch
->lines_added
+= added
;
1751 patch
->lines_deleted
+= deleted
;
1753 if (0 < patch
->is_new
&& oldlines
)
1754 return error(_("new file depends on old contents"));
1755 if (0 < patch
->is_delete
&& newlines
)
1756 return error(_("deleted file still has contents"));
1761 * We have seen "diff --git a/... b/..." header (or a traditional patch
1762 * header). Read hunks that belong to this patch into fragments and hang
1763 * them to the given patch structure.
1765 * The (fragment->patch, fragment->size) pair points into the memory given
1766 * by the caller, not a copy, when we return.
1769 * -1 in case of error,
1770 * the number of bytes in the patch otherwise.
1772 static int parse_single_patch(struct apply_state
*state
,
1775 struct patch
*patch
)
1777 unsigned long offset
= 0;
1778 unsigned long oldlines
= 0, newlines
= 0, context
= 0;
1779 struct fragment
**fragp
= &patch
->fragments
;
1781 while (size
> 4 && !memcmp(line
, "@@ -", 4)) {
1782 struct fragment
*fragment
;
1785 CALLOC_ARRAY(fragment
, 1);
1786 fragment
->linenr
= state
->linenr
;
1787 len
= parse_fragment(state
, line
, size
, patch
, fragment
);
1790 return error(_("corrupt patch at line %d"), state
->linenr
);
1792 fragment
->patch
= line
;
1793 fragment
->size
= len
;
1794 oldlines
+= fragment
->oldlines
;
1795 newlines
+= fragment
->newlines
;
1796 context
+= fragment
->leading
+ fragment
->trailing
;
1799 fragp
= &fragment
->next
;
1807 * If something was removed (i.e. we have old-lines) it cannot
1808 * be creation, and if something was added it cannot be
1809 * deletion. However, the reverse is not true; --unified=0
1810 * patches that only add are not necessarily creation even
1811 * though they do not have any old lines, and ones that only
1812 * delete are not necessarily deletion.
1814 * Unfortunately, a real creation/deletion patch do _not_ have
1815 * any context line by definition, so we cannot safely tell it
1816 * apart with --unified=0 insanity. At least if the patch has
1817 * more than one hunk it is not creation or deletion.
1819 if (patch
->is_new
< 0 &&
1820 (oldlines
|| (patch
->fragments
&& patch
->fragments
->next
)))
1822 if (patch
->is_delete
< 0 &&
1823 (newlines
|| (patch
->fragments
&& patch
->fragments
->next
)))
1824 patch
->is_delete
= 0;
1826 if (0 < patch
->is_new
&& oldlines
)
1827 return error(_("new file %s depends on old contents"), patch
->new_name
);
1828 if (0 < patch
->is_delete
&& newlines
)
1829 return error(_("deleted file %s still has contents"), patch
->old_name
);
1830 if (!patch
->is_delete
&& !newlines
&& context
&& state
->apply_verbosity
> verbosity_silent
)
1833 "file %s becomes empty but is not deleted"),
1839 static inline int metadata_changes(struct patch
*patch
)
1841 return patch
->is_rename
> 0 ||
1842 patch
->is_copy
> 0 ||
1843 patch
->is_new
> 0 ||
1845 (patch
->old_mode
&& patch
->new_mode
&&
1846 patch
->old_mode
!= patch
->new_mode
);
1849 static char *inflate_it(const void *data
, unsigned long size
,
1850 unsigned long inflated_size
)
1856 memset(&stream
, 0, sizeof(stream
));
1858 stream
.next_in
= (unsigned char *)data
;
1859 stream
.avail_in
= size
;
1860 stream
.next_out
= out
= xmalloc(inflated_size
);
1861 stream
.avail_out
= inflated_size
;
1862 git_inflate_init(&stream
);
1863 st
= git_inflate(&stream
, Z_FINISH
);
1864 git_inflate_end(&stream
);
1865 if ((st
!= Z_STREAM_END
) || stream
.total_out
!= inflated_size
) {
1873 * Read a binary hunk and return a new fragment; fragment->patch
1874 * points at an allocated memory that the caller must free, so
1875 * it is marked as "->free_patch = 1".
1877 static struct fragment
*parse_binary_hunk(struct apply_state
*state
,
1879 unsigned long *sz_p
,
1884 * Expect a line that begins with binary patch method ("literal"
1885 * or "delta"), followed by the length of data before deflating.
1886 * a sequence of 'length-byte' followed by base-85 encoded data
1887 * should follow, terminated by a newline.
1889 * Each 5-byte sequence of base-85 encodes up to 4 bytes,
1890 * and we would limit the patch line to 66 characters,
1891 * so one line can fit up to 13 groups that would decode
1892 * to 52 bytes max. The length byte 'A'-'Z' corresponds
1893 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
1896 unsigned long size
= *sz_p
;
1897 char *buffer
= *buf_p
;
1899 unsigned long origlen
;
1902 struct fragment
*frag
;
1904 llen
= linelen(buffer
, size
);
1909 if (starts_with(buffer
, "delta ")) {
1910 patch_method
= BINARY_DELTA_DEFLATED
;
1911 origlen
= strtoul(buffer
+ 6, NULL
, 10);
1913 else if (starts_with(buffer
, "literal ")) {
1914 patch_method
= BINARY_LITERAL_DEFLATED
;
1915 origlen
= strtoul(buffer
+ 8, NULL
, 10);
1924 int byte_length
, max_byte_length
, newsize
;
1925 llen
= linelen(buffer
, size
);
1929 /* consume the blank line */
1935 * Minimum line is "A00000\n" which is 7-byte long,
1936 * and the line length must be multiple of 5 plus 2.
1938 if ((llen
< 7) || (llen
-2) % 5)
1940 max_byte_length
= (llen
- 2) / 5 * 4;
1941 byte_length
= *buffer
;
1942 if ('A' <= byte_length
&& byte_length
<= 'Z')
1943 byte_length
= byte_length
- 'A' + 1;
1944 else if ('a' <= byte_length
&& byte_length
<= 'z')
1945 byte_length
= byte_length
- 'a' + 27;
1948 /* if the input length was not multiple of 4, we would
1949 * have filler at the end but the filler should never
1952 if (max_byte_length
< byte_length
||
1953 byte_length
<= max_byte_length
- 4)
1955 newsize
= hunk_size
+ byte_length
;
1956 data
= xrealloc(data
, newsize
);
1957 if (decode_85(data
+ hunk_size
, buffer
+ 1, byte_length
))
1959 hunk_size
= newsize
;
1964 CALLOC_ARRAY(frag
, 1);
1965 frag
->patch
= inflate_it(data
, hunk_size
, origlen
);
1966 frag
->free_patch
= 1;
1970 frag
->size
= origlen
;
1974 frag
->binary_patch_method
= patch_method
;
1980 error(_("corrupt binary patch at line %d: %.*s"),
1981 state
->linenr
-1, llen
-1, buffer
);
1987 * -1 in case of error,
1988 * the length of the parsed binary patch otherwise
1990 static int parse_binary(struct apply_state
*state
,
1993 struct patch
*patch
)
1996 * We have read "GIT binary patch\n"; what follows is a line
1997 * that says the patch method (currently, either "literal" or
1998 * "delta") and the length of data before deflating; a
1999 * sequence of 'length-byte' followed by base-85 encoded data
2002 * When a binary patch is reversible, there is another binary
2003 * hunk in the same format, starting with patch method (either
2004 * "literal" or "delta") with the length of data, and a sequence
2005 * of length-byte + base-85 encoded data, terminated with another
2006 * empty line. This data, when applied to the postimage, produces
2009 struct fragment
*forward
;
2010 struct fragment
*reverse
;
2014 forward
= parse_binary_hunk(state
, &buffer
, &size
, &status
, &used
);
2015 if (!forward
&& !status
)
2016 /* there has to be one hunk (forward hunk) */
2017 return error(_("unrecognized binary patch at line %d"), state
->linenr
-1);
2019 /* otherwise we already gave an error message */
2022 reverse
= parse_binary_hunk(state
, &buffer
, &size
, &status
, &used_1
);
2027 * Not having reverse hunk is not an error, but having
2028 * a corrupt reverse hunk is.
2030 free((void*) forward
->patch
);
2034 forward
->next
= reverse
;
2035 patch
->fragments
= forward
;
2036 patch
->is_binary
= 1;
2040 static void prefix_one(struct apply_state
*state
, char **name
)
2042 char *old_name
= *name
;
2045 *name
= prefix_filename(state
->prefix
, *name
);
2049 static void prefix_patch(struct apply_state
*state
, struct patch
*p
)
2051 if (!state
->prefix
|| p
->is_toplevel_relative
)
2053 prefix_one(state
, &p
->new_name
);
2054 prefix_one(state
, &p
->old_name
);
2061 static void add_name_limit(struct apply_state
*state
,
2065 struct string_list_item
*it
;
2067 it
= string_list_append(&state
->limit_by_name
, name
);
2068 it
->util
= exclude
? NULL
: (void *) 1;
2071 static int use_patch(struct apply_state
*state
, struct patch
*p
)
2073 const char *pathname
= p
->new_name
? p
->new_name
: p
->old_name
;
2076 /* Paths outside are not touched regardless of "--include" */
2077 if (state
->prefix
&& *state
->prefix
) {
2079 if (!skip_prefix(pathname
, state
->prefix
, &rest
) || !*rest
)
2083 /* See if it matches any of exclude/include rule */
2084 for (i
= 0; i
< state
->limit_by_name
.nr
; i
++) {
2085 struct string_list_item
*it
= &state
->limit_by_name
.items
[i
];
2086 if (!wildmatch(it
->string
, pathname
, 0))
2087 return (it
->util
!= NULL
);
2091 * If we had any include, a path that does not match any rule is
2092 * not used. Otherwise, we saw bunch of exclude rules (or none)
2093 * and such a path is used.
2095 return !state
->has_include
;
2099 * Read the patch text in "buffer" that extends for "size" bytes; stop
2100 * reading after seeing a single patch (i.e. changes to a single file).
2101 * Create fragments (i.e. patch hunks) and hang them to the given patch.
2104 * -1 if no header was found or parse_binary() failed,
2105 * -128 on another error,
2106 * the number of bytes consumed otherwise,
2107 * so that the caller can call us again for the next patch.
2109 static int parse_chunk(struct apply_state
*state
, char *buffer
, unsigned long size
, struct patch
*patch
)
2111 int hdrsize
, patchsize
;
2112 int offset
= find_header(state
, buffer
, size
, &hdrsize
, patch
);
2117 prefix_patch(state
, patch
);
2119 if (!use_patch(state
, patch
))
2121 else if (patch
->new_name
)
2122 patch
->ws_rule
= whitespace_rule(state
->repo
->index
,
2125 patch
->ws_rule
= whitespace_rule(state
->repo
->index
,
2128 patchsize
= parse_single_patch(state
,
2129 buffer
+ offset
+ hdrsize
,
2130 size
- offset
- hdrsize
,
2137 static const char git_binary
[] = "GIT binary patch\n";
2138 int hd
= hdrsize
+ offset
;
2139 unsigned long llen
= linelen(buffer
+ hd
, size
- hd
);
2141 if (llen
== sizeof(git_binary
) - 1 &&
2142 !memcmp(git_binary
, buffer
+ hd
, llen
)) {
2145 used
= parse_binary(state
, buffer
+ hd
+ llen
,
2146 size
- hd
- llen
, patch
);
2150 patchsize
= used
+ llen
;
2154 else if (!memcmp(" differ\n", buffer
+ hd
+ llen
- 8, 8)) {
2155 static const char *binhdr
[] = {
2161 for (i
= 0; binhdr
[i
]; i
++) {
2162 int len
= strlen(binhdr
[i
]);
2163 if (len
< size
- hd
&&
2164 !memcmp(binhdr
[i
], buffer
+ hd
, len
)) {
2166 patch
->is_binary
= 1;
2173 /* Empty patch cannot be applied if it is a text patch
2174 * without metadata change. A binary patch appears
2177 if ((state
->apply
|| state
->check
) &&
2178 (!patch
->is_binary
&& !metadata_changes(patch
))) {
2179 error(_("patch with only garbage at line %d"), state
->linenr
);
2184 return offset
+ hdrsize
+ patchsize
;
2187 static void reverse_patches(struct patch
*p
)
2189 for (; p
; p
= p
->next
) {
2190 struct fragment
*frag
= p
->fragments
;
2192 SWAP(p
->new_name
, p
->old_name
);
2193 SWAP(p
->new_mode
, p
->old_mode
);
2194 SWAP(p
->is_new
, p
->is_delete
);
2195 SWAP(p
->lines_added
, p
->lines_deleted
);
2196 SWAP(p
->old_oid_prefix
, p
->new_oid_prefix
);
2198 for (; frag
; frag
= frag
->next
) {
2199 SWAP(frag
->newpos
, frag
->oldpos
);
2200 SWAP(frag
->newlines
, frag
->oldlines
);
2205 static const char pluses
[] =
2206 "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
2207 static const char minuses
[]=
2208 "----------------------------------------------------------------------";
2210 static void show_stats(struct apply_state
*state
, struct patch
*patch
)
2212 struct strbuf qname
= STRBUF_INIT
;
2213 char *cp
= patch
->new_name
? patch
->new_name
: patch
->old_name
;
2216 quote_c_style(cp
, &qname
, NULL
, 0);
2219 * "scale" the filename
2221 max
= state
->max_len
;
2225 if (qname
.len
> max
) {
2226 cp
= strchr(qname
.buf
+ qname
.len
+ 3 - max
, '/');
2228 cp
= qname
.buf
+ qname
.len
+ 3 - max
;
2229 strbuf_splice(&qname
, 0, cp
- qname
.buf
, "...", 3);
2232 if (patch
->is_binary
) {
2233 printf(" %-*s | Bin\n", max
, qname
.buf
);
2234 strbuf_release(&qname
);
2238 printf(" %-*s |", max
, qname
.buf
);
2239 strbuf_release(&qname
);
2242 * scale the add/delete
2244 max
= max
+ state
->max_change
> 70 ? 70 - max
: state
->max_change
;
2245 add
= patch
->lines_added
;
2246 del
= patch
->lines_deleted
;
2248 if (state
->max_change
> 0) {
2249 int total
= ((add
+ del
) * max
+ state
->max_change
/ 2) / state
->max_change
;
2250 add
= (add
* max
+ state
->max_change
/ 2) / state
->max_change
;
2253 printf("%5d %.*s%.*s\n", patch
->lines_added
+ patch
->lines_deleted
,
2254 add
, pluses
, del
, minuses
);
2257 static int read_old_data(struct stat
*st
, struct patch
*patch
,
2258 const char *path
, struct strbuf
*buf
)
2260 int conv_flags
= patch
->crlf_in_old
?
2261 CONV_EOL_KEEP_CRLF
: CONV_EOL_RENORMALIZE
;
2262 switch (st
->st_mode
& S_IFMT
) {
2264 if (strbuf_readlink(buf
, path
, st
->st_size
) < 0)
2265 return error(_("unable to read symlink %s"), path
);
2268 if (strbuf_read_file(buf
, path
, st
->st_size
) != st
->st_size
)
2269 return error(_("unable to open or read %s"), path
);
2271 * "git apply" without "--index/--cached" should never look
2272 * at the index; the target file may not have been added to
2273 * the index yet, and we may not even be in any Git repository.
2274 * Pass NULL to convert_to_git() to stress this; the function
2275 * should never look at the index when explicit crlf option
2278 convert_to_git(NULL
, path
, buf
->buf
, buf
->len
, buf
, conv_flags
);
2286 * Update the preimage, and the common lines in postimage,
2287 * from buffer buf of length len. If postlen is 0 the postimage
2288 * is updated in place, otherwise it's updated on a new buffer
2292 static void update_pre_post_images(struct image
*preimage
,
2293 struct image
*postimage
,
2295 size_t len
, size_t postlen
)
2297 int i
, ctx
, reduced
;
2298 char *new_buf
, *old_buf
, *fixed
;
2299 struct image fixed_preimage
;
2302 * Update the preimage with whitespace fixes. Note that we
2303 * are not losing preimage->buf -- apply_one_fragment() will
2306 prepare_image(&fixed_preimage
, buf
, len
, 1);
2308 ? fixed_preimage
.nr
== preimage
->nr
2309 : fixed_preimage
.nr
<= preimage
->nr
);
2310 for (i
= 0; i
< fixed_preimage
.nr
; i
++)
2311 fixed_preimage
.line
[i
].flag
= preimage
->line
[i
].flag
;
2312 free(preimage
->line_allocated
);
2313 *preimage
= fixed_preimage
;
2316 * Adjust the common context lines in postimage. This can be
2317 * done in-place when we are shrinking it with whitespace
2318 * fixing, but needs a new buffer when ignoring whitespace or
2319 * expanding leading tabs to spaces.
2321 * We trust the caller to tell us if the update can be done
2322 * in place (postlen==0) or not.
2324 old_buf
= postimage
->buf
;
2326 new_buf
= postimage
->buf
= xmalloc(postlen
);
2329 fixed
= preimage
->buf
;
2331 for (i
= reduced
= ctx
= 0; i
< postimage
->nr
; i
++) {
2332 size_t l_len
= postimage
->line
[i
].len
;
2333 if (!(postimage
->line
[i
].flag
& LINE_COMMON
)) {
2334 /* an added line -- no counterparts in preimage */
2335 memmove(new_buf
, old_buf
, l_len
);
2341 /* a common context -- skip it in the original postimage */
2344 /* and find the corresponding one in the fixed preimage */
2345 while (ctx
< preimage
->nr
&&
2346 !(preimage
->line
[ctx
].flag
& LINE_COMMON
)) {
2347 fixed
+= preimage
->line
[ctx
].len
;
2352 * preimage is expected to run out, if the caller
2353 * fixed addition of trailing blank lines.
2355 if (preimage
->nr
<= ctx
) {
2360 /* and copy it in, while fixing the line length */
2361 l_len
= preimage
->line
[ctx
].len
;
2362 memcpy(new_buf
, fixed
, l_len
);
2365 postimage
->line
[i
].len
= l_len
;
2370 ? postlen
< new_buf
- postimage
->buf
2371 : postimage
->len
< new_buf
- postimage
->buf
)
2372 BUG("caller miscounted postlen: asked %d, orig = %d, used = %d",
2373 (int)postlen
, (int) postimage
->len
, (int)(new_buf
- postimage
->buf
));
2375 /* Fix the length of the whole thing */
2376 postimage
->len
= new_buf
- postimage
->buf
;
2377 postimage
->nr
-= reduced
;
2380 static int line_by_line_fuzzy_match(struct image
*img
,
2381 struct image
*preimage
,
2382 struct image
*postimage
,
2383 unsigned long current
,
2390 size_t postlen
= postimage
->len
;
2395 struct strbuf fixed
;
2399 for (i
= 0; i
< preimage_limit
; i
++) {
2400 size_t prelen
= preimage
->line
[i
].len
;
2401 size_t imglen
= img
->line
[current_lno
+i
].len
;
2403 if (!fuzzy_matchlines(img
->buf
+ current
+ imgoff
, imglen
,
2404 preimage
->buf
+ preoff
, prelen
))
2406 if (preimage
->line
[i
].flag
& LINE_COMMON
)
2407 postlen
+= imglen
- prelen
;
2413 * Ok, the preimage matches with whitespace fuzz.
2415 * imgoff now holds the true length of the target that
2416 * matches the preimage before the end of the file.
2418 * Count the number of characters in the preimage that fall
2419 * beyond the end of the file and make sure that all of them
2420 * are whitespace characters. (This can only happen if
2421 * we are removing blank lines at the end of the file.)
2423 buf
= preimage_eof
= preimage
->buf
+ preoff
;
2424 for ( ; i
< preimage
->nr
; i
++)
2425 preoff
+= preimage
->line
[i
].len
;
2426 preimage_end
= preimage
->buf
+ preoff
;
2427 for ( ; buf
< preimage_end
; buf
++)
2432 * Update the preimage and the common postimage context
2433 * lines to use the same whitespace as the target.
2434 * If whitespace is missing in the target (i.e.
2435 * if the preimage extends beyond the end of the file),
2436 * use the whitespace from the preimage.
2438 extra_chars
= preimage_end
- preimage_eof
;
2439 strbuf_init(&fixed
, imgoff
+ extra_chars
);
2440 strbuf_add(&fixed
, img
->buf
+ current
, imgoff
);
2441 strbuf_add(&fixed
, preimage_eof
, extra_chars
);
2442 fixed_buf
= strbuf_detach(&fixed
, &fixed_len
);
2443 update_pre_post_images(preimage
, postimage
,
2444 fixed_buf
, fixed_len
, postlen
);
2448 static int match_fragment(struct apply_state
*state
,
2450 struct image
*preimage
,
2451 struct image
*postimage
,
2452 unsigned long current
,
2455 int match_beginning
, int match_end
)
2458 char *fixed_buf
, *buf
, *orig
, *target
;
2459 struct strbuf fixed
;
2460 size_t fixed_len
, postlen
;
2463 if (preimage
->nr
+ current_lno
<= img
->nr
) {
2465 * The hunk falls within the boundaries of img.
2467 preimage_limit
= preimage
->nr
;
2468 if (match_end
&& (preimage
->nr
+ current_lno
!= img
->nr
))
2470 } else if (state
->ws_error_action
== correct_ws_error
&&
2471 (ws_rule
& WS_BLANK_AT_EOF
)) {
2473 * This hunk extends beyond the end of img, and we are
2474 * removing blank lines at the end of the file. This
2475 * many lines from the beginning of the preimage must
2476 * match with img, and the remainder of the preimage
2479 preimage_limit
= img
->nr
- current_lno
;
2482 * The hunk extends beyond the end of the img and
2483 * we are not removing blanks at the end, so we
2484 * should reject the hunk at this position.
2489 if (match_beginning
&& current_lno
)
2492 /* Quick hash check */
2493 for (i
= 0; i
< preimage_limit
; i
++)
2494 if ((img
->line
[current_lno
+ i
].flag
& LINE_PATCHED
) ||
2495 (preimage
->line
[i
].hash
!= img
->line
[current_lno
+ i
].hash
))
2498 if (preimage_limit
== preimage
->nr
) {
2500 * Do we have an exact match? If we were told to match
2501 * at the end, size must be exactly at current+fragsize,
2502 * otherwise current+fragsize must be still within the preimage,
2503 * and either case, the old piece should match the preimage
2507 ? (current
+ preimage
->len
== img
->len
)
2508 : (current
+ preimage
->len
<= img
->len
)) &&
2509 !memcmp(img
->buf
+ current
, preimage
->buf
, preimage
->len
))
2513 * The preimage extends beyond the end of img, so
2514 * there cannot be an exact match.
2516 * There must be one non-blank context line that match
2517 * a line before the end of img.
2521 buf
= preimage
->buf
;
2523 for (i
= 0; i
< preimage_limit
; i
++)
2524 buf_end
+= preimage
->line
[i
].len
;
2526 for ( ; buf
< buf_end
; buf
++)
2534 * No exact match. If we are ignoring whitespace, run a line-by-line
2535 * fuzzy matching. We collect all the line length information because
2536 * we need it to adjust whitespace if we match.
2538 if (state
->ws_ignore_action
== ignore_ws_change
)
2539 return line_by_line_fuzzy_match(img
, preimage
, postimage
,
2540 current
, current_lno
, preimage_limit
);
2542 if (state
->ws_error_action
!= correct_ws_error
)
2546 * The hunk does not apply byte-by-byte, but the hash says
2547 * it might with whitespace fuzz. We weren't asked to
2548 * ignore whitespace, we were asked to correct whitespace
2549 * errors, so let's try matching after whitespace correction.
2551 * While checking the preimage against the target, whitespace
2552 * errors in both fixed, we count how large the corresponding
2553 * postimage needs to be. The postimage prepared by
2554 * apply_one_fragment() has whitespace errors fixed on added
2555 * lines already, but the common lines were propagated as-is,
2556 * which may become longer when their whitespace errors are
2560 /* First count added lines in postimage */
2562 for (i
= 0; i
< postimage
->nr
; i
++) {
2563 if (!(postimage
->line
[i
].flag
& LINE_COMMON
))
2564 postlen
+= postimage
->line
[i
].len
;
2568 * The preimage may extend beyond the end of the file,
2569 * but in this loop we will only handle the part of the
2570 * preimage that falls within the file.
2572 strbuf_init(&fixed
, preimage
->len
+ 1);
2573 orig
= preimage
->buf
;
2574 target
= img
->buf
+ current
;
2575 for (i
= 0; i
< preimage_limit
; i
++) {
2576 size_t oldlen
= preimage
->line
[i
].len
;
2577 size_t tgtlen
= img
->line
[current_lno
+ i
].len
;
2578 size_t fixstart
= fixed
.len
;
2579 struct strbuf tgtfix
;
2582 /* Try fixing the line in the preimage */
2583 ws_fix_copy(&fixed
, orig
, oldlen
, ws_rule
, NULL
);
2585 /* Try fixing the line in the target */
2586 strbuf_init(&tgtfix
, tgtlen
);
2587 ws_fix_copy(&tgtfix
, target
, tgtlen
, ws_rule
, NULL
);
2590 * If they match, either the preimage was based on
2591 * a version before our tree fixed whitespace breakage,
2592 * or we are lacking a whitespace-fix patch the tree
2593 * the preimage was based on already had (i.e. target
2594 * has whitespace breakage, the preimage doesn't).
2595 * In either case, we are fixing the whitespace breakages
2596 * so we might as well take the fix together with their
2599 match
= (tgtfix
.len
== fixed
.len
- fixstart
&&
2600 !memcmp(tgtfix
.buf
, fixed
.buf
+ fixstart
,
2601 fixed
.len
- fixstart
));
2603 /* Add the length if this is common with the postimage */
2604 if (preimage
->line
[i
].flag
& LINE_COMMON
)
2605 postlen
+= tgtfix
.len
;
2607 strbuf_release(&tgtfix
);
2617 * Now handle the lines in the preimage that falls beyond the
2618 * end of the file (if any). They will only match if they are
2619 * empty or only contain whitespace (if WS_BLANK_AT_EOL is
2622 for ( ; i
< preimage
->nr
; i
++) {
2623 size_t fixstart
= fixed
.len
; /* start of the fixed preimage */
2624 size_t oldlen
= preimage
->line
[i
].len
;
2627 /* Try fixing the line in the preimage */
2628 ws_fix_copy(&fixed
, orig
, oldlen
, ws_rule
, NULL
);
2630 for (j
= fixstart
; j
< fixed
.len
; j
++)
2631 if (!isspace(fixed
.buf
[j
]))
2638 * Yes, the preimage is based on an older version that still
2639 * has whitespace breakages unfixed, and fixing them makes the
2640 * hunk match. Update the context lines in the postimage.
2642 fixed_buf
= strbuf_detach(&fixed
, &fixed_len
);
2643 if (postlen
< postimage
->len
)
2645 update_pre_post_images(preimage
, postimage
,
2646 fixed_buf
, fixed_len
, postlen
);
2650 strbuf_release(&fixed
);
2654 static int find_pos(struct apply_state
*state
,
2656 struct image
*preimage
,
2657 struct image
*postimage
,
2660 int match_beginning
, int match_end
)
2663 unsigned long backwards
, forwards
, current
;
2664 int backwards_lno
, forwards_lno
, current_lno
;
2667 * When running with --allow-overlap, it is possible that a hunk is
2668 * seen that pretends to start at the beginning (but no longer does),
2669 * and that *still* needs to match the end. So trust `match_end` more
2670 * than `match_beginning`.
2672 if (state
->allow_overlap
&& match_beginning
&& match_end
&&
2673 img
->nr
- preimage
->nr
!= 0)
2674 match_beginning
= 0;
2677 * If match_beginning or match_end is specified, there is no
2678 * point starting from a wrong line that will never match and
2679 * wander around and wait for a match at the specified end.
2681 if (match_beginning
)
2684 line
= img
->nr
- preimage
->nr
;
2687 * Because the comparison is unsigned, the following test
2688 * will also take care of a negative line number that can
2689 * result when match_end and preimage is larger than the target.
2691 if ((size_t) line
> img
->nr
)
2695 for (i
= 0; i
< line
; i
++)
2696 current
+= img
->line
[i
].len
;
2699 * There's probably some smart way to do this, but I'll leave
2700 * that to the smart and beautiful people. I'm simple and stupid.
2702 backwards
= current
;
2703 backwards_lno
= line
;
2705 forwards_lno
= line
;
2708 for (i
= 0; ; i
++) {
2709 if (match_fragment(state
, img
, preimage
, postimage
,
2710 current
, current_lno
, ws_rule
,
2711 match_beginning
, match_end
))
2715 if (backwards_lno
== 0 && forwards_lno
== img
->nr
)
2719 if (backwards_lno
== 0) {
2724 backwards
-= img
->line
[backwards_lno
].len
;
2725 current
= backwards
;
2726 current_lno
= backwards_lno
;
2728 if (forwards_lno
== img
->nr
) {
2732 forwards
+= img
->line
[forwards_lno
].len
;
2735 current_lno
= forwards_lno
;
2742 static void remove_first_line(struct image
*img
)
2744 img
->buf
+= img
->line
[0].len
;
2745 img
->len
-= img
->line
[0].len
;
2750 static void remove_last_line(struct image
*img
)
2752 img
->len
-= img
->line
[--img
->nr
].len
;
2756 * The change from "preimage" and "postimage" has been found to
2757 * apply at applied_pos (counts in line numbers) in "img".
2758 * Update "img" to remove "preimage" and replace it with "postimage".
2760 static void update_image(struct apply_state
*state
,
2763 struct image
*preimage
,
2764 struct image
*postimage
)
2767 * remove the copy of preimage at offset in img
2768 * and replace it with postimage
2771 size_t remove_count
, insert_count
, applied_at
= 0;
2776 * If we are removing blank lines at the end of img,
2777 * the preimage may extend beyond the end.
2778 * If that is the case, we must be careful only to
2779 * remove the part of the preimage that falls within
2780 * the boundaries of img. Initialize preimage_limit
2781 * to the number of lines in the preimage that falls
2782 * within the boundaries.
2784 preimage_limit
= preimage
->nr
;
2785 if (preimage_limit
> img
->nr
- applied_pos
)
2786 preimage_limit
= img
->nr
- applied_pos
;
2788 for (i
= 0; i
< applied_pos
; i
++)
2789 applied_at
+= img
->line
[i
].len
;
2792 for (i
= 0; i
< preimage_limit
; i
++)
2793 remove_count
+= img
->line
[applied_pos
+ i
].len
;
2794 insert_count
= postimage
->len
;
2796 /* Adjust the contents */
2797 result
= xmalloc(st_add3(st_sub(img
->len
, remove_count
), insert_count
, 1));
2798 memcpy(result
, img
->buf
, applied_at
);
2799 memcpy(result
+ applied_at
, postimage
->buf
, postimage
->len
);
2800 memcpy(result
+ applied_at
+ postimage
->len
,
2801 img
->buf
+ (applied_at
+ remove_count
),
2802 img
->len
- (applied_at
+ remove_count
));
2805 img
->len
+= insert_count
- remove_count
;
2806 result
[img
->len
] = '\0';
2808 /* Adjust the line table */
2809 nr
= img
->nr
+ postimage
->nr
- preimage_limit
;
2810 if (preimage_limit
< postimage
->nr
) {
2812 * NOTE: this knows that we never call remove_first_line()
2813 * on anything other than pre/post image.
2815 REALLOC_ARRAY(img
->line
, nr
);
2816 img
->line_allocated
= img
->line
;
2818 if (preimage_limit
!= postimage
->nr
)
2819 MOVE_ARRAY(img
->line
+ applied_pos
+ postimage
->nr
,
2820 img
->line
+ applied_pos
+ preimage_limit
,
2821 img
->nr
- (applied_pos
+ preimage_limit
));
2822 COPY_ARRAY(img
->line
+ applied_pos
, postimage
->line
, postimage
->nr
);
2823 if (!state
->allow_overlap
)
2824 for (i
= 0; i
< postimage
->nr
; i
++)
2825 img
->line
[applied_pos
+ i
].flag
|= LINE_PATCHED
;
2830 * Use the patch-hunk text in "frag" to prepare two images (preimage and
2831 * postimage) for the hunk. Find lines that match "preimage" in "img" and
2832 * replace the part of "img" with "postimage" text.
2834 static int apply_one_fragment(struct apply_state
*state
,
2835 struct image
*img
, struct fragment
*frag
,
2836 int inaccurate_eof
, unsigned ws_rule
,
2839 int match_beginning
, match_end
;
2840 const char *patch
= frag
->patch
;
2841 int size
= frag
->size
;
2842 char *old
, *oldlines
;
2843 struct strbuf newlines
;
2844 int new_blank_lines_at_end
= 0;
2845 int found_new_blank_lines_at_end
= 0;
2846 int hunk_linenr
= frag
->linenr
;
2847 unsigned long leading
, trailing
;
2848 int pos
, applied_pos
;
2849 struct image preimage
;
2850 struct image postimage
;
2852 memset(&preimage
, 0, sizeof(preimage
));
2853 memset(&postimage
, 0, sizeof(postimage
));
2854 oldlines
= xmalloc(size
);
2855 strbuf_init(&newlines
, size
);
2860 int len
= linelen(patch
, size
);
2862 int added_blank_line
= 0;
2863 int is_blank_context
= 0;
2870 * "plen" is how much of the line we should use for
2871 * the actual patch data. Normally we just remove the
2872 * first character on the line, but if the line is
2873 * followed by "\ No newline", then we also remove the
2874 * last one (which is the newline, of course).
2877 if (len
< size
&& patch
[len
] == '\\')
2880 if (state
->apply_in_reverse
) {
2883 else if (first
== '+')
2889 /* Newer GNU diff, empty context line */
2891 /* ... followed by '\No newline'; nothing */
2894 strbuf_addch(&newlines
, '\n');
2895 add_line_info(&preimage
, "\n", 1, LINE_COMMON
);
2896 add_line_info(&postimage
, "\n", 1, LINE_COMMON
);
2897 is_blank_context
= 1;
2900 if (plen
&& (ws_rule
& WS_BLANK_AT_EOF
) &&
2901 ws_blank_line(patch
+ 1, plen
, ws_rule
))
2902 is_blank_context
= 1;
2905 memcpy(old
, patch
+ 1, plen
);
2906 add_line_info(&preimage
, old
, plen
,
2907 (first
== ' ' ? LINE_COMMON
: 0));
2913 /* --no-add does not add new lines */
2914 if (first
== '+' && state
->no_add
)
2917 start
= newlines
.len
;
2919 !state
->whitespace_error
||
2920 state
->ws_error_action
!= correct_ws_error
) {
2921 strbuf_add(&newlines
, patch
+ 1, plen
);
2924 ws_fix_copy(&newlines
, patch
+ 1, plen
, ws_rule
, &state
->applied_after_fixing_ws
);
2926 add_line_info(&postimage
, newlines
.buf
+ start
, newlines
.len
- start
,
2927 (first
== '+' ? 0 : LINE_COMMON
));
2929 (ws_rule
& WS_BLANK_AT_EOF
) &&
2930 ws_blank_line(patch
+ 1, plen
, ws_rule
))
2931 added_blank_line
= 1;
2933 case '@': case '\\':
2934 /* Ignore it, we already handled it */
2937 if (state
->apply_verbosity
> verbosity_normal
)
2938 error(_("invalid start of line: '%c'"), first
);
2942 if (added_blank_line
) {
2943 if (!new_blank_lines_at_end
)
2944 found_new_blank_lines_at_end
= hunk_linenr
;
2945 new_blank_lines_at_end
++;
2947 else if (is_blank_context
)
2950 new_blank_lines_at_end
= 0;
2955 if (inaccurate_eof
&&
2956 old
> oldlines
&& old
[-1] == '\n' &&
2957 newlines
.len
> 0 && newlines
.buf
[newlines
.len
- 1] == '\n') {
2959 strbuf_setlen(&newlines
, newlines
.len
- 1);
2960 preimage
.line_allocated
[preimage
.nr
- 1].len
--;
2961 postimage
.line_allocated
[postimage
.nr
- 1].len
--;
2964 leading
= frag
->leading
;
2965 trailing
= frag
->trailing
;
2968 * A hunk to change lines at the beginning would begin with
2970 * but we need to be careful. -U0 that inserts before the second
2971 * line also has this pattern.
2973 * And a hunk to add to an empty file would begin with
2976 * In other words, a hunk that is (frag->oldpos <= 1) with or
2977 * without leading context must match at the beginning.
2979 match_beginning
= (!frag
->oldpos
||
2980 (frag
->oldpos
== 1 && !state
->unidiff_zero
));
2983 * A hunk without trailing lines must match at the end.
2984 * However, we simply cannot tell if a hunk must match end
2985 * from the lack of trailing lines if the patch was generated
2986 * with unidiff without any context.
2988 match_end
= !state
->unidiff_zero
&& !trailing
;
2990 pos
= frag
->newpos
? (frag
->newpos
- 1) : 0;
2991 preimage
.buf
= oldlines
;
2992 preimage
.len
= old
- oldlines
;
2993 postimage
.buf
= newlines
.buf
;
2994 postimage
.len
= newlines
.len
;
2995 preimage
.line
= preimage
.line_allocated
;
2996 postimage
.line
= postimage
.line_allocated
;
3000 applied_pos
= find_pos(state
, img
, &preimage
, &postimage
, pos
,
3001 ws_rule
, match_beginning
, match_end
);
3003 if (applied_pos
>= 0)
3006 /* Am I at my context limits? */
3007 if ((leading
<= state
->p_context
) && (trailing
<= state
->p_context
))
3009 if (match_beginning
|| match_end
) {
3010 match_beginning
= match_end
= 0;
3015 * Reduce the number of context lines; reduce both
3016 * leading and trailing if they are equal otherwise
3017 * just reduce the larger context.
3019 if (leading
>= trailing
) {
3020 remove_first_line(&preimage
);
3021 remove_first_line(&postimage
);
3025 if (trailing
> leading
) {
3026 remove_last_line(&preimage
);
3027 remove_last_line(&postimage
);
3032 if (applied_pos
>= 0) {
3033 if (new_blank_lines_at_end
&&
3034 preimage
.nr
+ applied_pos
>= img
->nr
&&
3035 (ws_rule
& WS_BLANK_AT_EOF
) &&
3036 state
->ws_error_action
!= nowarn_ws_error
) {
3037 record_ws_error(state
, WS_BLANK_AT_EOF
, "+", 1,
3038 found_new_blank_lines_at_end
);
3039 if (state
->ws_error_action
== correct_ws_error
) {
3040 while (new_blank_lines_at_end
--)
3041 remove_last_line(&postimage
);
3044 * We would want to prevent write_out_results()
3045 * from taking place in apply_patch() that follows
3046 * the callchain led us here, which is:
3047 * apply_patch->check_patch_list->check_patch->
3048 * apply_data->apply_fragments->apply_one_fragment
3050 if (state
->ws_error_action
== die_on_ws_error
)
3054 if (state
->apply_verbosity
> verbosity_normal
&& applied_pos
!= pos
) {
3055 int offset
= applied_pos
- pos
;
3056 if (state
->apply_in_reverse
)
3057 offset
= 0 - offset
;
3059 Q_("Hunk #%d succeeded at %d (offset %d line).",
3060 "Hunk #%d succeeded at %d (offset %d lines).",
3062 nth_fragment
, applied_pos
+ 1, offset
);
3066 * Warn if it was necessary to reduce the number
3069 if ((leading
!= frag
->leading
||
3070 trailing
!= frag
->trailing
) && state
->apply_verbosity
> verbosity_silent
)
3071 fprintf_ln(stderr
, _("Context reduced to (%ld/%ld)"
3072 " to apply fragment at %d"),
3073 leading
, trailing
, applied_pos
+1);
3074 update_image(state
, img
, applied_pos
, &preimage
, &postimage
);
3076 if (state
->apply_verbosity
> verbosity_normal
)
3077 error(_("while searching for:\n%.*s"),
3078 (int)(old
- oldlines
), oldlines
);
3083 strbuf_release(&newlines
);
3084 free(preimage
.line_allocated
);
3085 free(postimage
.line_allocated
);
3087 return (applied_pos
< 0);
3090 static int apply_binary_fragment(struct apply_state
*state
,
3092 struct patch
*patch
)
3094 struct fragment
*fragment
= patch
->fragments
;
3099 return error(_("missing binary patch data for '%s'"),
3104 /* Binary patch is irreversible without the optional second hunk */
3105 if (state
->apply_in_reverse
) {
3106 if (!fragment
->next
)
3107 return error(_("cannot reverse-apply a binary patch "
3108 "without the reverse hunk to '%s'"),
3110 ? patch
->new_name
: patch
->old_name
);
3111 fragment
= fragment
->next
;
3113 switch (fragment
->binary_patch_method
) {
3114 case BINARY_DELTA_DEFLATED
:
3115 dst
= patch_delta(img
->buf
, img
->len
, fragment
->patch
,
3116 fragment
->size
, &len
);
3123 case BINARY_LITERAL_DEFLATED
:
3125 img
->len
= fragment
->size
;
3126 img
->buf
= xmemdupz(fragment
->patch
, img
->len
);
3133 * Replace "img" with the result of applying the binary patch.
3134 * The binary patch data itself in patch->fragment is still kept
3135 * but the preimage prepared by the caller in "img" is freed here
3136 * or in the helper function apply_binary_fragment() this calls.
3138 static int apply_binary(struct apply_state
*state
,
3140 struct patch
*patch
)
3142 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
3143 struct object_id oid
;
3144 const unsigned hexsz
= the_hash_algo
->hexsz
;
3147 * For safety, we require patch index line to contain
3148 * full hex textual object ID for old and new, at least for now.
3150 if (strlen(patch
->old_oid_prefix
) != hexsz
||
3151 strlen(patch
->new_oid_prefix
) != hexsz
||
3152 get_oid_hex(patch
->old_oid_prefix
, &oid
) ||
3153 get_oid_hex(patch
->new_oid_prefix
, &oid
))
3154 return error(_("cannot apply binary patch to '%s' "
3155 "without full index line"), name
);
3157 if (patch
->old_name
) {
3159 * See if the old one matches what the patch
3162 hash_object_file(the_hash_algo
, img
->buf
, img
->len
, blob_type
,
3164 if (strcmp(oid_to_hex(&oid
), patch
->old_oid_prefix
))
3165 return error(_("the patch applies to '%s' (%s), "
3166 "which does not match the "
3167 "current contents."),
3168 name
, oid_to_hex(&oid
));
3171 /* Otherwise, the old one must be empty. */
3173 return error(_("the patch applies to an empty "
3174 "'%s' but it is not empty"), name
);
3177 get_oid_hex(patch
->new_oid_prefix
, &oid
);
3178 if (is_null_oid(&oid
)) {
3180 return 0; /* deletion patch */
3183 if (has_object(the_repository
, &oid
, 0)) {
3184 /* We already have the postimage */
3185 enum object_type type
;
3189 result
= read_object_file(&oid
, &type
, &size
);
3191 return error(_("the necessary postimage %s for "
3192 "'%s' cannot be read"),
3193 patch
->new_oid_prefix
, name
);
3199 * We have verified buf matches the preimage;
3200 * apply the patch data to it, which is stored
3201 * in the patch->fragments->{patch,size}.
3203 if (apply_binary_fragment(state
, img
, patch
))
3204 return error(_("binary patch does not apply to '%s'"),
3207 /* verify that the result matches */
3208 hash_object_file(the_hash_algo
, img
->buf
, img
->len
, blob_type
,
3210 if (strcmp(oid_to_hex(&oid
), patch
->new_oid_prefix
))
3211 return error(_("binary patch to '%s' creates incorrect result (expecting %s, got %s)"),
3212 name
, patch
->new_oid_prefix
, oid_to_hex(&oid
));
3218 static int apply_fragments(struct apply_state
*state
, struct image
*img
, struct patch
*patch
)
3220 struct fragment
*frag
= patch
->fragments
;
3221 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
3222 unsigned ws_rule
= patch
->ws_rule
;
3223 unsigned inaccurate_eof
= patch
->inaccurate_eof
;
3226 if (patch
->is_binary
)
3227 return apply_binary(state
, img
, patch
);
3231 if (apply_one_fragment(state
, img
, frag
, inaccurate_eof
, ws_rule
, nth
)) {
3232 error(_("patch failed: %s:%ld"), name
, frag
->oldpos
);
3233 if (!state
->apply_with_reject
)
3242 static int read_blob_object(struct strbuf
*buf
, const struct object_id
*oid
, unsigned mode
)
3244 if (S_ISGITLINK(mode
)) {
3245 strbuf_grow(buf
, 100);
3246 strbuf_addf(buf
, "Subproject commit %s\n", oid_to_hex(oid
));
3248 enum object_type type
;
3252 result
= read_object_file(oid
, &type
, &sz
);
3255 /* XXX read_sha1_file NUL-terminates */
3256 strbuf_attach(buf
, result
, sz
, sz
+ 1);
3261 static int read_file_or_gitlink(const struct cache_entry
*ce
, struct strbuf
*buf
)
3265 return read_blob_object(buf
, &ce
->oid
, ce
->ce_mode
);
3268 static struct patch
*in_fn_table(struct apply_state
*state
, const char *name
)
3270 struct string_list_item
*item
;
3275 item
= string_list_lookup(&state
->fn_table
, name
);
3277 return (struct patch
*)item
->util
;
3283 * item->util in the filename table records the status of the path.
3284 * Usually it points at a patch (whose result records the contents
3285 * of it after applying it), but it could be PATH_WAS_DELETED for a
3286 * path that a previously applied patch has already removed, or
3287 * PATH_TO_BE_DELETED for a path that a later patch would remove.
3289 * The latter is needed to deal with a case where two paths A and B
3290 * are swapped by first renaming A to B and then renaming B to A;
3291 * moving A to B should not be prevented due to presence of B as we
3292 * will remove it in a later patch.
3294 #define PATH_TO_BE_DELETED ((struct patch *) -2)
3295 #define PATH_WAS_DELETED ((struct patch *) -1)
3297 static int to_be_deleted(struct patch
*patch
)
3299 return patch
== PATH_TO_BE_DELETED
;
3302 static int was_deleted(struct patch
*patch
)
3304 return patch
== PATH_WAS_DELETED
;
3307 static void add_to_fn_table(struct apply_state
*state
, struct patch
*patch
)
3309 struct string_list_item
*item
;
3312 * Always add new_name unless patch is a deletion
3313 * This should cover the cases for normal diffs,
3314 * file creations and copies
3316 if (patch
->new_name
!= NULL
) {
3317 item
= string_list_insert(&state
->fn_table
, patch
->new_name
);
3322 * store a failure on rename/deletion cases because
3323 * later chunks shouldn't patch old names
3325 if ((patch
->new_name
== NULL
) || (patch
->is_rename
)) {
3326 item
= string_list_insert(&state
->fn_table
, patch
->old_name
);
3327 item
->util
= PATH_WAS_DELETED
;
3331 static void prepare_fn_table(struct apply_state
*state
, struct patch
*patch
)
3334 * store information about incoming file deletion
3337 if ((patch
->new_name
== NULL
) || (patch
->is_rename
)) {
3338 struct string_list_item
*item
;
3339 item
= string_list_insert(&state
->fn_table
, patch
->old_name
);
3340 item
->util
= PATH_TO_BE_DELETED
;
3342 patch
= patch
->next
;
3346 static int checkout_target(struct index_state
*istate
,
3347 struct cache_entry
*ce
, struct stat
*st
)
3349 struct checkout costate
= CHECKOUT_INIT
;
3351 costate
.refresh_cache
= 1;
3352 costate
.istate
= istate
;
3353 if (checkout_entry(ce
, &costate
, NULL
, NULL
) ||
3354 lstat(ce
->name
, st
))
3355 return error(_("cannot checkout %s"), ce
->name
);
3359 static struct patch
*previous_patch(struct apply_state
*state
,
3360 struct patch
*patch
,
3363 struct patch
*previous
;
3366 if (patch
->is_copy
|| patch
->is_rename
)
3367 return NULL
; /* "git" patches do not depend on the order */
3369 previous
= in_fn_table(state
, patch
->old_name
);
3373 if (to_be_deleted(previous
))
3374 return NULL
; /* the deletion hasn't happened yet */
3376 if (was_deleted(previous
))
3382 static int verify_index_match(struct apply_state
*state
,
3383 const struct cache_entry
*ce
,
3386 if (S_ISGITLINK(ce
->ce_mode
)) {
3387 if (!S_ISDIR(st
->st_mode
))
3391 return ie_match_stat(state
->repo
->index
, ce
, st
,
3392 CE_MATCH_IGNORE_VALID
| CE_MATCH_IGNORE_SKIP_WORKTREE
);
3395 #define SUBMODULE_PATCH_WITHOUT_INDEX 1
3397 static int load_patch_target(struct apply_state
*state
,
3399 const struct cache_entry
*ce
,
3401 struct patch
*patch
,
3403 unsigned expected_mode
)
3405 if (state
->cached
|| state
->check_index
) {
3406 if (read_file_or_gitlink(ce
, buf
))
3407 return error(_("failed to read %s"), name
);
3409 if (S_ISGITLINK(expected_mode
)) {
3411 return read_file_or_gitlink(ce
, buf
);
3413 return SUBMODULE_PATCH_WITHOUT_INDEX
;
3414 } else if (has_symlink_leading_path(name
, strlen(name
))) {
3415 return error(_("reading from '%s' beyond a symbolic link"), name
);
3417 if (read_old_data(st
, patch
, name
, buf
))
3418 return error(_("failed to read %s"), name
);
3425 * We are about to apply "patch"; populate the "image" with the
3426 * current version we have, from the working tree or from the index,
3427 * depending on the situation e.g. --cached/--index. If we are
3428 * applying a non-git patch that incrementally updates the tree,
3429 * we read from the result of a previous diff.
3431 static int load_preimage(struct apply_state
*state
,
3432 struct image
*image
,
3433 struct patch
*patch
, struct stat
*st
,
3434 const struct cache_entry
*ce
)
3436 struct strbuf buf
= STRBUF_INIT
;
3439 struct patch
*previous
;
3442 previous
= previous_patch(state
, patch
, &status
);
3444 return error(_("path %s has been renamed/deleted"),
3447 /* We have a patched copy in memory; use that. */
3448 strbuf_add(&buf
, previous
->result
, previous
->resultsize
);
3450 status
= load_patch_target(state
, &buf
, ce
, st
, patch
,
3451 patch
->old_name
, patch
->old_mode
);
3454 else if (status
== SUBMODULE_PATCH_WITHOUT_INDEX
) {
3456 * There is no way to apply subproject
3457 * patch without looking at the index.
3458 * NEEDSWORK: shouldn't this be flagged
3461 free_fragment_list(patch
->fragments
);
3462 patch
->fragments
= NULL
;
3463 } else if (status
) {
3464 return error(_("failed to read %s"), patch
->old_name
);
3468 img
= strbuf_detach(&buf
, &len
);
3469 prepare_image(image
, img
, len
, !patch
->is_binary
);
3473 static int resolve_to(struct image
*image
, const struct object_id
*result_id
)
3476 enum object_type type
;
3480 image
->buf
= read_object_file(result_id
, &type
, &size
);
3481 if (!image
->buf
|| type
!= OBJ_BLOB
)
3482 die("unable to read blob object %s", oid_to_hex(result_id
));
3488 static int three_way_merge(struct apply_state
*state
,
3489 struct image
*image
,
3491 const struct object_id
*base
,
3492 const struct object_id
*ours
,
3493 const struct object_id
*theirs
)
3495 mmfile_t base_file
, our_file
, their_file
;
3496 mmbuffer_t result
= { NULL
};
3499 /* resolve trivial cases first */
3500 if (oideq(base
, ours
))
3501 return resolve_to(image
, theirs
);
3502 else if (oideq(base
, theirs
) || oideq(ours
, theirs
))
3503 return resolve_to(image
, ours
);
3505 read_mmblob(&base_file
, base
);
3506 read_mmblob(&our_file
, ours
);
3507 read_mmblob(&their_file
, theirs
);
3508 status
= ll_merge(&result
, path
,
3511 &their_file
, "theirs",
3514 free(base_file
.ptr
);
3516 free(their_file
.ptr
);
3517 if (status
< 0 || !result
.ptr
) {
3522 image
->buf
= result
.ptr
;
3523 image
->len
= result
.size
;
3529 * When directly falling back to add/add three-way merge, we read from
3530 * the current contents of the new_name. In no cases other than that
3531 * this function will be called.
3533 static int load_current(struct apply_state
*state
,
3534 struct image
*image
,
3535 struct patch
*patch
)
3537 struct strbuf buf
= STRBUF_INIT
;
3542 struct cache_entry
*ce
;
3543 char *name
= patch
->new_name
;
3544 unsigned mode
= patch
->new_mode
;
3547 BUG("patch to %s is not a creation", patch
->old_name
);
3549 pos
= index_name_pos(state
->repo
->index
, name
, strlen(name
));
3551 return error(_("%s: does not exist in index"), name
);
3552 ce
= state
->repo
->index
->cache
[pos
];
3553 if (lstat(name
, &st
)) {
3554 if (errno
!= ENOENT
)
3555 return error_errno("%s", name
);
3556 if (checkout_target(state
->repo
->index
, ce
, &st
))
3559 if (verify_index_match(state
, ce
, &st
))
3560 return error(_("%s: does not match index"), name
);
3562 status
= load_patch_target(state
, &buf
, ce
, &st
, patch
, name
, mode
);
3567 img
= strbuf_detach(&buf
, &len
);
3568 prepare_image(image
, img
, len
, !patch
->is_binary
);
3572 static int try_threeway(struct apply_state
*state
,
3573 struct image
*image
,
3574 struct patch
*patch
,
3576 const struct cache_entry
*ce
)
3578 struct object_id pre_oid
, post_oid
, our_oid
;
3579 struct strbuf buf
= STRBUF_INIT
;
3583 struct image tmp_image
;
3585 /* No point falling back to 3-way merge in these cases */
3586 if (patch
->is_delete
||
3587 S_ISGITLINK(patch
->old_mode
) || S_ISGITLINK(patch
->new_mode
))
3590 /* Preimage the patch was prepared for */
3592 write_object_file("", 0, blob_type
, &pre_oid
);
3593 else if (get_oid(patch
->old_oid_prefix
, &pre_oid
) ||
3594 read_blob_object(&buf
, &pre_oid
, patch
->old_mode
))
3595 return error(_("repository lacks the necessary blob to perform 3-way merge."));
3597 if (state
->apply_verbosity
> verbosity_silent
&& patch
->direct_to_threeway
)
3598 fprintf(stderr
, _("Performing three-way merge...\n"));
3600 img
= strbuf_detach(&buf
, &len
);
3601 prepare_image(&tmp_image
, img
, len
, 1);
3602 /* Apply the patch to get the post image */
3603 if (apply_fragments(state
, &tmp_image
, patch
) < 0) {
3604 clear_image(&tmp_image
);
3607 /* post_oid is theirs */
3608 write_object_file(tmp_image
.buf
, tmp_image
.len
, blob_type
, &post_oid
);
3609 clear_image(&tmp_image
);
3611 /* our_oid is ours */
3612 if (patch
->is_new
) {
3613 if (load_current(state
, &tmp_image
, patch
))
3614 return error(_("cannot read the current contents of '%s'"),
3617 if (load_preimage(state
, &tmp_image
, patch
, st
, ce
))
3618 return error(_("cannot read the current contents of '%s'"),
3621 write_object_file(tmp_image
.buf
, tmp_image
.len
, blob_type
, &our_oid
);
3622 clear_image(&tmp_image
);
3624 /* in-core three-way merge between post and our using pre as base */
3625 status
= three_way_merge(state
, image
, patch
->new_name
,
3626 &pre_oid
, &our_oid
, &post_oid
);
3628 if (state
->apply_verbosity
> verbosity_silent
)
3630 _("Failed to perform three-way merge...\n"));
3635 patch
->conflicted_threeway
= 1;
3637 oidclr(&patch
->threeway_stage
[0]);
3639 oidcpy(&patch
->threeway_stage
[0], &pre_oid
);
3640 oidcpy(&patch
->threeway_stage
[1], &our_oid
);
3641 oidcpy(&patch
->threeway_stage
[2], &post_oid
);
3642 if (state
->apply_verbosity
> verbosity_silent
)
3644 _("Applied patch to '%s' with conflicts.\n"),
3647 if (state
->apply_verbosity
> verbosity_silent
)
3649 _("Applied patch to '%s' cleanly.\n"),
3655 static int apply_data(struct apply_state
*state
, struct patch
*patch
,
3656 struct stat
*st
, const struct cache_entry
*ce
)
3660 if (load_preimage(state
, &image
, patch
, st
, ce
) < 0)
3663 if (!state
->threeway
|| try_threeway(state
, &image
, patch
, st
, ce
) < 0) {
3664 if (state
->apply_verbosity
> verbosity_silent
&&
3665 state
->threeway
&& !patch
->direct_to_threeway
)
3666 fprintf(stderr
, _("Falling back to direct application...\n"));
3668 /* Note: with --reject, apply_fragments() returns 0 */
3669 if (patch
->direct_to_threeway
|| apply_fragments(state
, &image
, patch
) < 0)
3672 patch
->result
= image
.buf
;
3673 patch
->resultsize
= image
.len
;
3674 add_to_fn_table(state
, patch
);
3675 free(image
.line_allocated
);
3677 if (0 < patch
->is_delete
&& patch
->resultsize
)
3678 return error(_("removal patch leaves file contents"));
3684 * If "patch" that we are looking at modifies or deletes what we have,
3685 * we would want it not to lose any local modification we have, either
3686 * in the working tree or in the index.
3688 * This also decides if a non-git patch is a creation patch or a
3689 * modification to an existing empty file. We do not check the state
3690 * of the current tree for a creation patch in this function; the caller
3691 * check_patch() separately makes sure (and errors out otherwise) that
3692 * the path the patch creates does not exist in the current tree.
3694 static int check_preimage(struct apply_state
*state
,
3695 struct patch
*patch
,
3696 struct cache_entry
**ce
,
3699 const char *old_name
= patch
->old_name
;
3700 struct patch
*previous
= NULL
;
3701 int stat_ret
= 0, status
;
3702 unsigned st_mode
= 0;
3707 assert(patch
->is_new
<= 0);
3708 previous
= previous_patch(state
, patch
, &status
);
3711 return error(_("path %s has been renamed/deleted"), old_name
);
3713 st_mode
= previous
->new_mode
;
3714 } else if (!state
->cached
) {
3715 stat_ret
= lstat(old_name
, st
);
3716 if (stat_ret
&& errno
!= ENOENT
)
3717 return error_errno("%s", old_name
);
3720 if (state
->check_index
&& !previous
) {
3721 int pos
= index_name_pos(state
->repo
->index
, old_name
,
3724 if (patch
->is_new
< 0)
3726 return error(_("%s: does not exist in index"), old_name
);
3728 *ce
= state
->repo
->index
->cache
[pos
];
3730 if (checkout_target(state
->repo
->index
, *ce
, st
))
3733 if (!state
->cached
&& verify_index_match(state
, *ce
, st
))
3734 return error(_("%s: does not match index"), old_name
);
3736 st_mode
= (*ce
)->ce_mode
;
3737 } else if (stat_ret
< 0) {
3738 if (patch
->is_new
< 0)
3740 return error_errno("%s", old_name
);
3743 if (!state
->cached
&& !previous
)
3744 st_mode
= ce_mode_from_stat(*ce
, st
->st_mode
);
3746 if (patch
->is_new
< 0)
3748 if (!patch
->old_mode
)
3749 patch
->old_mode
= st_mode
;
3750 if ((st_mode
^ patch
->old_mode
) & S_IFMT
)
3751 return error(_("%s: wrong type"), old_name
);
3752 if (st_mode
!= patch
->old_mode
)
3753 warning(_("%s has type %o, expected %o"),
3754 old_name
, st_mode
, patch
->old_mode
);
3755 if (!patch
->new_mode
&& !patch
->is_delete
)
3756 patch
->new_mode
= st_mode
;
3761 patch
->is_delete
= 0;
3762 FREE_AND_NULL(patch
->old_name
);
3767 #define EXISTS_IN_INDEX 1
3768 #define EXISTS_IN_WORKTREE 2
3769 #define EXISTS_IN_INDEX_AS_ITA 3
3771 static int check_to_create(struct apply_state
*state
,
3772 const char *new_name
,
3777 if (state
->check_index
&& (!ok_if_exists
|| !state
->cached
)) {
3780 pos
= index_name_pos(state
->repo
->index
, new_name
, strlen(new_name
));
3782 struct cache_entry
*ce
= state
->repo
->index
->cache
[pos
];
3784 /* allow ITA, as they do not yet exist in the index */
3785 if (!ok_if_exists
&& !(ce
->ce_flags
& CE_INTENT_TO_ADD
))
3786 return EXISTS_IN_INDEX
;
3788 /* ITA entries can never match working tree files */
3789 if (!state
->cached
&& (ce
->ce_flags
& CE_INTENT_TO_ADD
))
3790 return EXISTS_IN_INDEX_AS_ITA
;
3797 if (!lstat(new_name
, &nst
)) {
3798 if (S_ISDIR(nst
.st_mode
) || ok_if_exists
)
3801 * A leading component of new_name might be a symlink
3802 * that is going to be removed with this patch, but
3803 * still pointing at somewhere that has the path.
3804 * In such a case, path "new_name" does not exist as
3805 * far as git is concerned.
3807 if (has_symlink_leading_path(new_name
, strlen(new_name
)))
3810 return EXISTS_IN_WORKTREE
;
3811 } else if (!is_missing_file_error(errno
)) {
3812 return error_errno("%s", new_name
);
3817 static void prepare_symlink_changes(struct apply_state
*state
, struct patch
*patch
)
3819 for ( ; patch
; patch
= patch
->next
) {
3820 if ((patch
->old_name
&& S_ISLNK(patch
->old_mode
)) &&
3821 (patch
->is_rename
|| patch
->is_delete
))
3822 /* the symlink at patch->old_name is removed */
3823 strset_add(&state
->removed_symlinks
, patch
->old_name
);
3825 if (patch
->new_name
&& S_ISLNK(patch
->new_mode
))
3826 /* the symlink at patch->new_name is created or remains */
3827 strset_add(&state
->kept_symlinks
, patch
->new_name
);
3831 static int path_is_beyond_symlink_1(struct apply_state
*state
, struct strbuf
*name
)
3834 while (--name
->len
&& name
->buf
[name
->len
] != '/')
3835 ; /* scan backwards */
3838 name
->buf
[name
->len
] = '\0';
3839 if (strset_contains(&state
->kept_symlinks
, name
->buf
))
3841 if (strset_contains(&state
->removed_symlinks
, name
->buf
))
3843 * This cannot be "return 0", because we may
3844 * see a new one created at a higher level.
3848 /* otherwise, check the preimage */
3849 if (state
->check_index
) {
3850 struct cache_entry
*ce
;
3852 ce
= index_file_exists(state
->repo
->index
, name
->buf
,
3853 name
->len
, ignore_case
);
3854 if (ce
&& S_ISLNK(ce
->ce_mode
))
3858 if (!lstat(name
->buf
, &st
) && S_ISLNK(st
.st_mode
))
3865 static int path_is_beyond_symlink(struct apply_state
*state
, const char *name_
)
3868 struct strbuf name
= STRBUF_INIT
;
3870 assert(*name_
!= '\0');
3871 strbuf_addstr(&name
, name_
);
3872 ret
= path_is_beyond_symlink_1(state
, &name
);
3873 strbuf_release(&name
);
3878 static int check_unsafe_path(struct patch
*patch
)
3880 const char *old_name
= NULL
;
3881 const char *new_name
= NULL
;
3882 if (patch
->is_delete
)
3883 old_name
= patch
->old_name
;
3884 else if (!patch
->is_new
&& !patch
->is_copy
)
3885 old_name
= patch
->old_name
;
3886 if (!patch
->is_delete
)
3887 new_name
= patch
->new_name
;
3889 if (old_name
&& !verify_path(old_name
, patch
->old_mode
))
3890 return error(_("invalid path '%s'"), old_name
);
3891 if (new_name
&& !verify_path(new_name
, patch
->new_mode
))
3892 return error(_("invalid path '%s'"), new_name
);
3897 * Check and apply the patch in-core; leave the result in patch->result
3898 * for the caller to write it out to the final destination.
3900 static int check_patch(struct apply_state
*state
, struct patch
*patch
)
3903 const char *old_name
= patch
->old_name
;
3904 const char *new_name
= patch
->new_name
;
3905 const char *name
= old_name
? old_name
: new_name
;
3906 struct cache_entry
*ce
= NULL
;
3907 struct patch
*tpatch
;
3911 patch
->rejected
= 1; /* we will drop this after we succeed */
3913 status
= check_preimage(state
, patch
, &ce
, &st
);
3916 old_name
= patch
->old_name
;
3919 * A type-change diff is always split into a patch to delete
3920 * old, immediately followed by a patch to create new (see
3921 * diff.c::run_diff()); in such a case it is Ok that the entry
3922 * to be deleted by the previous patch is still in the working
3923 * tree and in the index.
3925 * A patch to swap-rename between A and B would first rename A
3926 * to B and then rename B to A. While applying the first one,
3927 * the presence of B should not stop A from getting renamed to
3928 * B; ask to_be_deleted() about the later rename. Removal of
3929 * B and rename from A to B is handled the same way by asking
3932 if ((tpatch
= in_fn_table(state
, new_name
)) &&
3933 (was_deleted(tpatch
) || to_be_deleted(tpatch
)))
3939 ((0 < patch
->is_new
) || patch
->is_rename
|| patch
->is_copy
)) {
3940 int err
= check_to_create(state
, new_name
, ok_if_exists
);
3942 if (err
&& state
->threeway
) {
3943 patch
->direct_to_threeway
= 1;
3944 } else switch (err
) {
3947 case EXISTS_IN_INDEX
:
3948 return error(_("%s: already exists in index"), new_name
);
3949 case EXISTS_IN_INDEX_AS_ITA
:
3950 return error(_("%s: does not match index"), new_name
);
3951 case EXISTS_IN_WORKTREE
:
3952 return error(_("%s: already exists in working directory"),
3958 if (!patch
->new_mode
) {
3959 if (0 < patch
->is_new
)
3960 patch
->new_mode
= S_IFREG
| 0644;
3962 patch
->new_mode
= patch
->old_mode
;
3966 if (new_name
&& old_name
) {
3967 int same
= !strcmp(old_name
, new_name
);
3968 if (!patch
->new_mode
)
3969 patch
->new_mode
= patch
->old_mode
;
3970 if ((patch
->old_mode
^ patch
->new_mode
) & S_IFMT
) {
3972 return error(_("new mode (%o) of %s does not "
3973 "match old mode (%o)"),
3974 patch
->new_mode
, new_name
,
3977 return error(_("new mode (%o) of %s does not "
3978 "match old mode (%o) of %s"),
3979 patch
->new_mode
, new_name
,
3980 patch
->old_mode
, old_name
);
3984 if (!state
->unsafe_paths
&& check_unsafe_path(patch
))
3988 * An attempt to read from or delete a path that is beyond a
3989 * symbolic link will be prevented by load_patch_target() that
3990 * is called at the beginning of apply_data() so we do not
3991 * have to worry about a patch marked with "is_delete" bit
3992 * here. We however need to make sure that the patch result
3993 * is not deposited to a path that is beyond a symbolic link
3996 if (!patch
->is_delete
&& path_is_beyond_symlink(state
, patch
->new_name
))
3997 return error(_("affected file '%s' is beyond a symbolic link"),
4000 if (apply_data(state
, patch
, &st
, ce
) < 0)
4001 return error(_("%s: patch does not apply"), name
);
4002 patch
->rejected
= 0;
4006 static int check_patch_list(struct apply_state
*state
, struct patch
*patch
)
4010 prepare_symlink_changes(state
, patch
);
4011 prepare_fn_table(state
, patch
);
4014 if (state
->apply_verbosity
> verbosity_normal
)
4015 say_patch_name(stderr
,
4016 _("Checking patch %s..."), patch
);
4017 res
= check_patch(state
, patch
);
4021 patch
= patch
->next
;
4026 static int read_apply_cache(struct apply_state
*state
)
4028 if (state
->index_file
)
4029 return read_index_from(state
->repo
->index
, state
->index_file
,
4032 return repo_read_index(state
->repo
);
4035 /* This function tries to read the object name from the current index */
4036 static int get_current_oid(struct apply_state
*state
, const char *path
,
4037 struct object_id
*oid
)
4041 if (read_apply_cache(state
) < 0)
4043 pos
= index_name_pos(state
->repo
->index
, path
, strlen(path
));
4046 oidcpy(oid
, &state
->repo
->index
->cache
[pos
]->oid
);
4050 static int preimage_oid_in_gitlink_patch(struct patch
*p
, struct object_id
*oid
)
4053 * A usable gitlink patch has only one fragment (hunk) that looks like:
4055 * -Subproject commit <old sha1>
4056 * +Subproject commit <new sha1>
4059 * -Subproject commit <old sha1>
4060 * for a removal patch.
4062 struct fragment
*hunk
= p
->fragments
;
4063 static const char heading
[] = "-Subproject commit ";
4066 if (/* does the patch have only one hunk? */
4067 hunk
&& !hunk
->next
&&
4068 /* is its preimage one line? */
4069 hunk
->oldpos
== 1 && hunk
->oldlines
== 1 &&
4070 /* does preimage begin with the heading? */
4071 (preimage
= memchr(hunk
->patch
, '\n', hunk
->size
)) != NULL
&&
4072 starts_with(++preimage
, heading
) &&
4073 /* does it record full SHA-1? */
4074 !get_oid_hex(preimage
+ sizeof(heading
) - 1, oid
) &&
4075 preimage
[sizeof(heading
) + the_hash_algo
->hexsz
- 1] == '\n' &&
4076 /* does the abbreviated name on the index line agree with it? */
4077 starts_with(preimage
+ sizeof(heading
) - 1, p
->old_oid_prefix
))
4078 return 0; /* it all looks fine */
4080 /* we may have full object name on the index line */
4081 return get_oid_hex(p
->old_oid_prefix
, oid
);
4084 /* Build an index that contains just the files needed for a 3way merge */
4085 static int build_fake_ancestor(struct apply_state
*state
, struct patch
*list
)
4087 struct patch
*patch
;
4088 struct index_state result
= { NULL
};
4089 struct lock_file lock
= LOCK_INIT
;
4092 /* Once we start supporting the reverse patch, it may be
4093 * worth showing the new sha1 prefix, but until then...
4095 for (patch
= list
; patch
; patch
= patch
->next
) {
4096 struct object_id oid
;
4097 struct cache_entry
*ce
;
4100 name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
4101 if (0 < patch
->is_new
)
4104 if (S_ISGITLINK(patch
->old_mode
)) {
4105 if (!preimage_oid_in_gitlink_patch(patch
, &oid
))
4106 ; /* ok, the textual part looks sane */
4108 return error(_("sha1 information is lacking or "
4109 "useless for submodule %s"), name
);
4110 } else if (!get_oid_blob(patch
->old_oid_prefix
, &oid
)) {
4112 } else if (!patch
->lines_added
&& !patch
->lines_deleted
) {
4113 /* mode-only change: update the current */
4114 if (get_current_oid(state
, patch
->old_name
, &oid
))
4115 return error(_("mode change for %s, which is not "
4116 "in current HEAD"), name
);
4118 return error(_("sha1 information is lacking or useless "
4121 ce
= make_cache_entry(&result
, patch
->old_mode
, &oid
, name
, 0, 0);
4123 return error(_("make_cache_entry failed for path '%s'"),
4125 if (add_index_entry(&result
, ce
, ADD_CACHE_OK_TO_ADD
)) {
4126 discard_cache_entry(ce
);
4127 return error(_("could not add %s to temporary index"),
4132 hold_lock_file_for_update(&lock
, state
->fake_ancestor
, LOCK_DIE_ON_ERROR
);
4133 res
= write_locked_index(&result
, &lock
, COMMIT_LOCK
);
4134 discard_index(&result
);
4137 return error(_("could not write temporary index to %s"),
4138 state
->fake_ancestor
);
4143 static void stat_patch_list(struct apply_state
*state
, struct patch
*patch
)
4145 int files
, adds
, dels
;
4147 for (files
= adds
= dels
= 0 ; patch
; patch
= patch
->next
) {
4149 adds
+= patch
->lines_added
;
4150 dels
+= patch
->lines_deleted
;
4151 show_stats(state
, patch
);
4154 print_stat_summary(stdout
, files
, adds
, dels
);
4157 static void numstat_patch_list(struct apply_state
*state
,
4158 struct patch
*patch
)
4160 for ( ; patch
; patch
= patch
->next
) {
4162 name
= patch
->new_name
? patch
->new_name
: patch
->old_name
;
4163 if (patch
->is_binary
)
4166 printf("%d\t%d\t", patch
->lines_added
, patch
->lines_deleted
);
4167 write_name_quoted(name
, stdout
, state
->line_termination
);
4171 static void show_file_mode_name(const char *newdelete
, unsigned int mode
, const char *name
)
4174 printf(" %s mode %06o %s\n", newdelete
, mode
, name
);
4176 printf(" %s %s\n", newdelete
, name
);
4179 static void show_mode_change(struct patch
*p
, int show_name
)
4181 if (p
->old_mode
&& p
->new_mode
&& p
->old_mode
!= p
->new_mode
) {
4183 printf(" mode change %06o => %06o %s\n",
4184 p
->old_mode
, p
->new_mode
, p
->new_name
);
4186 printf(" mode change %06o => %06o\n",
4187 p
->old_mode
, p
->new_mode
);
4191 static void show_rename_copy(struct patch
*p
)
4193 const char *renamecopy
= p
->is_rename
? "rename" : "copy";
4194 const char *old_name
, *new_name
;
4196 /* Find common prefix */
4197 old_name
= p
->old_name
;
4198 new_name
= p
->new_name
;
4200 const char *slash_old
, *slash_new
;
4201 slash_old
= strchr(old_name
, '/');
4202 slash_new
= strchr(new_name
, '/');
4205 slash_old
- old_name
!= slash_new
- new_name
||
4206 memcmp(old_name
, new_name
, slash_new
- new_name
))
4208 old_name
= slash_old
+ 1;
4209 new_name
= slash_new
+ 1;
4211 /* p->old_name through old_name is the common prefix, and old_name and
4212 * new_name through the end of names are renames
4214 if (old_name
!= p
->old_name
)
4215 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy
,
4216 (int)(old_name
- p
->old_name
), p
->old_name
,
4217 old_name
, new_name
, p
->score
);
4219 printf(" %s %s => %s (%d%%)\n", renamecopy
,
4220 p
->old_name
, p
->new_name
, p
->score
);
4221 show_mode_change(p
, 0);
4224 static void summary_patch_list(struct patch
*patch
)
4228 for (p
= patch
; p
; p
= p
->next
) {
4230 show_file_mode_name("create", p
->new_mode
, p
->new_name
);
4231 else if (p
->is_delete
)
4232 show_file_mode_name("delete", p
->old_mode
, p
->old_name
);
4234 if (p
->is_rename
|| p
->is_copy
)
4235 show_rename_copy(p
);
4238 printf(" rewrite %s (%d%%)\n",
4239 p
->new_name
, p
->score
);
4240 show_mode_change(p
, 0);
4243 show_mode_change(p
, 1);
4249 static void patch_stats(struct apply_state
*state
, struct patch
*patch
)
4251 int lines
= patch
->lines_added
+ patch
->lines_deleted
;
4253 if (lines
> state
->max_change
)
4254 state
->max_change
= lines
;
4255 if (patch
->old_name
) {
4256 int len
= quote_c_style(patch
->old_name
, NULL
, NULL
, 0);
4258 len
= strlen(patch
->old_name
);
4259 if (len
> state
->max_len
)
4260 state
->max_len
= len
;
4262 if (patch
->new_name
) {
4263 int len
= quote_c_style(patch
->new_name
, NULL
, NULL
, 0);
4265 len
= strlen(patch
->new_name
);
4266 if (len
> state
->max_len
)
4267 state
->max_len
= len
;
4271 static int remove_file(struct apply_state
*state
, struct patch
*patch
, int rmdir_empty
)
4273 if (state
->update_index
&& !state
->ita_only
) {
4274 if (remove_file_from_index(state
->repo
->index
, patch
->old_name
) < 0)
4275 return error(_("unable to remove %s from index"), patch
->old_name
);
4277 if (!state
->cached
) {
4278 if (!remove_or_warn(patch
->old_mode
, patch
->old_name
) && rmdir_empty
) {
4279 remove_path(patch
->old_name
);
4285 static int add_index_file(struct apply_state
*state
,
4292 struct cache_entry
*ce
;
4293 int namelen
= strlen(path
);
4295 ce
= make_empty_cache_entry(state
->repo
->index
, namelen
);
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 (state
->ita_only
) {
4301 ce
->ce_flags
|= CE_INTENT_TO_ADD
;
4302 set_object_name_for_intent_to_add_entry(ce
);
4303 } else if (S_ISGITLINK(mode
)) {
4306 if (!skip_prefix(buf
, "Subproject commit ", &s
) ||
4307 get_oid_hex(s
, &ce
->oid
)) {
4308 discard_cache_entry(ce
);
4309 return error(_("corrupt patch for submodule %s"), path
);
4312 if (!state
->cached
) {
4313 if (lstat(path
, &st
) < 0) {
4314 discard_cache_entry(ce
);
4315 return error_errno(_("unable to stat newly "
4316 "created file '%s'"),
4319 fill_stat_cache_info(state
->repo
->index
, ce
, &st
);
4321 if (write_object_file(buf
, size
, blob_type
, &ce
->oid
) < 0) {
4322 discard_cache_entry(ce
);
4323 return error(_("unable to create backing store "
4324 "for newly created file %s"), path
);
4327 if (add_index_entry(state
->repo
->index
, ce
, ADD_CACHE_OK_TO_ADD
) < 0) {
4328 discard_cache_entry(ce
);
4329 return error(_("unable to add cache entry for %s"), path
);
4337 * -1 if an unrecoverable error happened
4338 * 0 if everything went well
4339 * 1 if a recoverable error happened
4341 static int try_create_file(struct apply_state
*state
, const char *path
,
4342 unsigned int mode
, const char *buf
,
4346 struct strbuf nbuf
= STRBUF_INIT
;
4348 if (S_ISGITLINK(mode
)) {
4350 if (!lstat(path
, &st
) && S_ISDIR(st
.st_mode
))
4352 return !!mkdir(path
, 0777);
4355 if (has_symlinks
&& S_ISLNK(mode
))
4356 /* Although buf:size is counted string, it also is NUL
4359 return !!symlink(buf
, path
);
4361 fd
= open(path
, O_CREAT
| O_EXCL
| O_WRONLY
, (mode
& 0100) ? 0777 : 0666);
4365 if (convert_to_working_tree(state
->repo
->index
, path
, buf
, size
, &nbuf
, NULL
)) {
4370 res
= write_in_full(fd
, buf
, size
) < 0;
4372 error_errno(_("failed to write to '%s'"), path
);
4373 strbuf_release(&nbuf
);
4375 if (close(fd
) < 0 && !res
)
4376 return error_errno(_("closing file '%s'"), path
);
4378 return res
? -1 : 0;
4382 * We optimistically assume that the directories exist,
4383 * which is true 99% of the time anyway. If they don't,
4384 * we create them and try again.
4390 static int create_one_file(struct apply_state
*state
,
4401 res
= try_create_file(state
, path
, mode
, buf
, size
);
4407 if (errno
== ENOENT
) {
4408 if (safe_create_leading_directories_no_share(path
))
4410 res
= try_create_file(state
, path
, mode
, buf
, size
);
4417 if (errno
== EEXIST
|| errno
== EACCES
) {
4418 /* We may be trying to create a file where a directory
4422 if (!lstat(path
, &st
) && (!S_ISDIR(st
.st_mode
) || !rmdir(path
)))
4426 if (errno
== EEXIST
) {
4427 unsigned int nr
= getpid();
4430 char newpath
[PATH_MAX
];
4431 mksnpath(newpath
, sizeof(newpath
), "%s~%u", path
, nr
);
4432 res
= try_create_file(state
, newpath
, mode
, buf
, size
);
4436 if (!rename(newpath
, path
))
4438 unlink_or_warn(newpath
);
4441 if (errno
!= EEXIST
)
4446 return error_errno(_("unable to write file '%s' mode %o"),
4450 static int add_conflicted_stages_file(struct apply_state
*state
,
4451 struct patch
*patch
)
4455 struct cache_entry
*ce
;
4457 if (!state
->update_index
)
4459 namelen
= strlen(patch
->new_name
);
4460 mode
= patch
->new_mode
? patch
->new_mode
: (S_IFREG
| 0644);
4462 remove_file_from_index(state
->repo
->index
, patch
->new_name
);
4463 for (stage
= 1; stage
< 4; stage
++) {
4464 if (is_null_oid(&patch
->threeway_stage
[stage
- 1]))
4466 ce
= make_empty_cache_entry(state
->repo
->index
, namelen
);
4467 memcpy(ce
->name
, patch
->new_name
, namelen
);
4468 ce
->ce_mode
= create_ce_mode(mode
);
4469 ce
->ce_flags
= create_ce_flags(stage
);
4470 ce
->ce_namelen
= namelen
;
4471 oidcpy(&ce
->oid
, &patch
->threeway_stage
[stage
- 1]);
4472 if (add_index_entry(state
->repo
->index
, ce
, ADD_CACHE_OK_TO_ADD
) < 0) {
4473 discard_cache_entry(ce
);
4474 return error(_("unable to add cache entry for %s"),
4482 static int create_file(struct apply_state
*state
, struct patch
*patch
)
4484 char *path
= patch
->new_name
;
4485 unsigned mode
= patch
->new_mode
;
4486 unsigned long size
= patch
->resultsize
;
4487 char *buf
= patch
->result
;
4490 mode
= S_IFREG
| 0644;
4491 if (create_one_file(state
, path
, mode
, buf
, size
))
4494 if (patch
->conflicted_threeway
)
4495 return add_conflicted_stages_file(state
, patch
);
4496 else if (state
->update_index
)
4497 return add_index_file(state
, path
, mode
, buf
, size
);
4501 /* phase zero is to remove, phase one is to create */
4502 static int write_out_one_result(struct apply_state
*state
,
4503 struct patch
*patch
,
4506 if (patch
->is_delete
> 0) {
4508 return remove_file(state
, patch
, 1);
4511 if (patch
->is_new
> 0 || patch
->is_copy
) {
4513 return create_file(state
, patch
);
4517 * Rename or modification boils down to the same
4518 * thing: remove the old, write the new
4521 return remove_file(state
, patch
, patch
->is_rename
);
4523 return create_file(state
, patch
);
4527 static int write_out_one_reject(struct apply_state
*state
, struct patch
*patch
)
4530 char namebuf
[PATH_MAX
];
4531 struct fragment
*frag
;
4533 struct strbuf sb
= STRBUF_INIT
;
4535 for (cnt
= 0, frag
= patch
->fragments
; frag
; frag
= frag
->next
) {
4536 if (!frag
->rejected
)
4542 if (state
->apply_verbosity
> verbosity_normal
)
4543 say_patch_name(stderr
,
4544 _("Applied patch %s cleanly."), patch
);
4548 /* This should not happen, because a removal patch that leaves
4549 * contents are marked "rejected" at the patch level.
4551 if (!patch
->new_name
)
4552 die(_("internal error"));
4554 /* Say this even without --verbose */
4555 strbuf_addf(&sb
, Q_("Applying patch %%s with %d reject...",
4556 "Applying patch %%s with %d rejects...",
4559 if (state
->apply_verbosity
> verbosity_silent
)
4560 say_patch_name(stderr
, sb
.buf
, patch
);
4561 strbuf_release(&sb
);
4563 cnt
= strlen(patch
->new_name
);
4564 if (ARRAY_SIZE(namebuf
) <= cnt
+ 5) {
4565 cnt
= ARRAY_SIZE(namebuf
) - 5;
4566 warning(_("truncating .rej filename to %.*s.rej"),
4567 cnt
- 1, patch
->new_name
);
4569 memcpy(namebuf
, patch
->new_name
, cnt
);
4570 memcpy(namebuf
+ cnt
, ".rej", 5);
4572 rej
= fopen(namebuf
, "w");
4574 return error_errno(_("cannot open %s"), namebuf
);
4576 /* Normal git tools never deal with .rej, so do not pretend
4577 * this is a git patch by saying --git or giving extended
4578 * headers. While at it, maybe please "kompare" that wants
4579 * the trailing TAB and some garbage at the end of line ;-).
4581 fprintf(rej
, "diff a/%s b/%s\t(rejected hunks)\n",
4582 patch
->new_name
, patch
->new_name
);
4583 for (cnt
= 1, frag
= patch
->fragments
;
4585 cnt
++, frag
= frag
->next
) {
4586 if (!frag
->rejected
) {
4587 if (state
->apply_verbosity
> verbosity_silent
)
4588 fprintf_ln(stderr
, _("Hunk #%d applied cleanly."), cnt
);
4591 if (state
->apply_verbosity
> verbosity_silent
)
4592 fprintf_ln(stderr
, _("Rejected hunk #%d."), cnt
);
4593 fprintf(rej
, "%.*s", frag
->size
, frag
->patch
);
4594 if (frag
->patch
[frag
->size
-1] != '\n')
4603 * -1 if an error happened
4604 * 0 if the patch applied cleanly
4605 * 1 if the patch did not apply cleanly
4607 static int write_out_results(struct apply_state
*state
, struct patch
*list
)
4612 struct string_list cpath
= STRING_LIST_INIT_DUP
;
4614 for (phase
= 0; phase
< 2; phase
++) {
4620 if (write_out_one_result(state
, l
, phase
)) {
4621 string_list_clear(&cpath
, 0);
4625 if (write_out_one_reject(state
, l
))
4627 if (l
->conflicted_threeway
) {
4628 string_list_append(&cpath
, l
->new_name
);
4638 struct string_list_item
*item
;
4640 string_list_sort(&cpath
);
4641 if (state
->apply_verbosity
> verbosity_silent
) {
4642 for_each_string_list_item(item
, &cpath
)
4643 fprintf(stderr
, "U %s\n", item
->string
);
4645 string_list_clear(&cpath
, 0);
4648 * rerere relies on the partially merged result being in the working
4649 * tree with conflict markers, but that isn't written with --cached.
4652 repo_rerere(state
->repo
, 0);
4659 * Try to apply a patch.
4662 * -128 if a bad error happened (like patch unreadable)
4663 * -1 if patch did not apply and user cannot deal with it
4664 * 0 if the patch applied
4665 * 1 if the patch did not apply but user might fix it
4667 static int apply_patch(struct apply_state
*state
,
4669 const char *filename
,
4673 struct strbuf buf
= STRBUF_INIT
; /* owns the patch text */
4674 struct patch
*list
= NULL
, **listp
= &list
;
4675 int skipped_patch
= 0;
4677 int flush_attributes
= 0;
4679 state
->patch_input_file
= filename
;
4680 if (read_patch_file(&buf
, fd
) < 0)
4683 while (offset
< buf
.len
) {
4684 struct patch
*patch
;
4687 CALLOC_ARRAY(patch
, 1);
4688 patch
->inaccurate_eof
= !!(options
& APPLY_OPT_INACCURATE_EOF
);
4689 patch
->recount
= !!(options
& APPLY_OPT_RECOUNT
);
4690 nr
= parse_chunk(state
, buf
.buf
+ offset
, buf
.len
- offset
, patch
);
4699 if (state
->apply_in_reverse
)
4700 reverse_patches(patch
);
4701 if (use_patch(state
, patch
)) {
4702 patch_stats(state
, patch
);
4703 if (!list
|| !state
->apply_in_reverse
) {
4705 listp
= &patch
->next
;
4711 if ((patch
->new_name
&&
4712 ends_with_path_components(patch
->new_name
,
4713 GITATTRIBUTES_FILE
)) ||
4715 ends_with_path_components(patch
->old_name
,
4716 GITATTRIBUTES_FILE
)))
4717 flush_attributes
= 1;
4720 if (state
->apply_verbosity
> verbosity_normal
)
4721 say_patch_name(stderr
, _("Skipped patch '%s'."), patch
);
4728 if (!list
&& !skipped_patch
) {
4729 error(_("unrecognized input"));
4734 if (state
->whitespace_error
&& (state
->ws_error_action
== die_on_ws_error
))
4737 state
->update_index
= (state
->check_index
|| state
->ita_only
) && state
->apply
;
4738 if (state
->update_index
&& !is_lock_file_locked(&state
->lock_file
)) {
4739 if (state
->index_file
)
4740 hold_lock_file_for_update(&state
->lock_file
,
4744 repo_hold_locked_index(state
->repo
, &state
->lock_file
,
4748 if (state
->check_index
&& read_apply_cache(state
) < 0) {
4749 error(_("unable to read index file"));
4754 if (state
->check
|| state
->apply
) {
4755 int r
= check_patch_list(state
, list
);
4760 if (r
< 0 && !state
->apply_with_reject
) {
4767 int write_res
= write_out_results(state
, list
);
4768 if (write_res
< 0) {
4772 if (write_res
> 0) {
4773 /* with --3way, we still need to write the index out */
4774 res
= state
->apply_with_reject
? -1 : 1;
4779 if (state
->fake_ancestor
&&
4780 build_fake_ancestor(state
, list
)) {
4785 if (state
->diffstat
&& state
->apply_verbosity
> verbosity_silent
)
4786 stat_patch_list(state
, list
);
4788 if (state
->numstat
&& state
->apply_verbosity
> verbosity_silent
)
4789 numstat_patch_list(state
, list
);
4791 if (state
->summary
&& state
->apply_verbosity
> verbosity_silent
)
4792 summary_patch_list(list
);
4794 if (flush_attributes
)
4795 reset_parsed_attributes();
4797 free_patch_list(list
);
4798 strbuf_release(&buf
);
4799 string_list_clear(&state
->fn_table
, 0);
4803 static int apply_option_parse_exclude(const struct option
*opt
,
4804 const char *arg
, int unset
)
4806 struct apply_state
*state
= opt
->value
;
4808 BUG_ON_OPT_NEG(unset
);
4810 add_name_limit(state
, arg
, 1);
4814 static int apply_option_parse_include(const struct option
*opt
,
4815 const char *arg
, int unset
)
4817 struct apply_state
*state
= opt
->value
;
4819 BUG_ON_OPT_NEG(unset
);
4821 add_name_limit(state
, arg
, 0);
4822 state
->has_include
= 1;
4826 static int apply_option_parse_p(const struct option
*opt
,
4830 struct apply_state
*state
= opt
->value
;
4832 BUG_ON_OPT_NEG(unset
);
4834 state
->p_value
= atoi(arg
);
4835 state
->p_value_known
= 1;
4839 static int apply_option_parse_space_change(const struct option
*opt
,
4840 const char *arg
, int unset
)
4842 struct apply_state
*state
= opt
->value
;
4844 BUG_ON_OPT_ARG(arg
);
4847 state
->ws_ignore_action
= ignore_ws_none
;
4849 state
->ws_ignore_action
= ignore_ws_change
;
4853 static int apply_option_parse_whitespace(const struct option
*opt
,
4854 const char *arg
, int unset
)
4856 struct apply_state
*state
= opt
->value
;
4858 BUG_ON_OPT_NEG(unset
);
4860 state
->whitespace_option
= arg
;
4861 if (parse_whitespace_option(state
, arg
))
4866 static int apply_option_parse_directory(const struct option
*opt
,
4867 const char *arg
, int unset
)
4869 struct apply_state
*state
= opt
->value
;
4871 BUG_ON_OPT_NEG(unset
);
4873 strbuf_reset(&state
->root
);
4874 strbuf_addstr(&state
->root
, arg
);
4875 strbuf_complete(&state
->root
, '/');
4879 int apply_all_patches(struct apply_state
*state
,
4889 for (i
= 0; i
< argc
; i
++) {
4890 const char *arg
= argv
[i
];
4891 char *to_free
= NULL
;
4894 if (!strcmp(arg
, "-")) {
4895 res
= apply_patch(state
, 0, "<stdin>", options
);
4902 arg
= to_free
= prefix_filename(state
->prefix
, arg
);
4904 fd
= open(arg
, O_RDONLY
);
4906 error(_("can't open patch '%s': %s"), arg
, strerror(errno
));
4912 set_default_whitespace_mode(state
);
4913 res
= apply_patch(state
, fd
, arg
, options
);
4920 set_default_whitespace_mode(state
);
4922 res
= apply_patch(state
, 0, "<stdin>", options
);
4928 if (state
->whitespace_error
) {
4929 if (state
->squelch_whitespace_errors
&&
4930 state
->squelch_whitespace_errors
< state
->whitespace_error
) {
4932 state
->whitespace_error
- state
->squelch_whitespace_errors
;
4933 warning(Q_("squelched %d whitespace error",
4934 "squelched %d whitespace errors",
4938 if (state
->ws_error_action
== die_on_ws_error
) {
4939 error(Q_("%d line adds whitespace errors.",
4940 "%d lines add whitespace errors.",
4941 state
->whitespace_error
),
4942 state
->whitespace_error
);
4946 if (state
->applied_after_fixing_ws
&& state
->apply
)
4947 warning(Q_("%d line applied after"
4948 " fixing whitespace errors.",
4949 "%d lines applied after"
4950 " fixing whitespace errors.",
4951 state
->applied_after_fixing_ws
),
4952 state
->applied_after_fixing_ws
);
4953 else if (state
->whitespace_error
)
4954 warning(Q_("%d line adds whitespace errors.",
4955 "%d lines add whitespace errors.",
4956 state
->whitespace_error
),
4957 state
->whitespace_error
);
4960 if (state
->update_index
) {
4961 res
= write_locked_index(state
->repo
->index
, &state
->lock_file
, COMMIT_LOCK
);
4963 error(_("Unable to write new index file"));
4972 rollback_lock_file(&state
->lock_file
);
4974 if (state
->apply_verbosity
<= verbosity_silent
) {
4975 set_error_routine(state
->saved_error_routine
);
4976 set_warn_routine(state
->saved_warn_routine
);
4981 return (res
== -1 ? 1 : 128);
4984 int apply_parse_options(int argc
, const char **argv
,
4985 struct apply_state
*state
,
4986 int *force_apply
, int *options
,
4987 const char * const *apply_usage
)
4989 struct option builtin_apply_options
[] = {
4990 OPT_CALLBACK_F(0, "exclude", state
, N_("path"),
4991 N_("don't apply changes matching the given path"),
4992 PARSE_OPT_NONEG
, apply_option_parse_exclude
),
4993 OPT_CALLBACK_F(0, "include", state
, N_("path"),
4994 N_("apply changes matching the given path"),
4995 PARSE_OPT_NONEG
, apply_option_parse_include
),
4996 OPT_CALLBACK('p', NULL
, state
, N_("num"),
4997 N_("remove <num> leading slashes from traditional diff paths"),
4998 apply_option_parse_p
),
4999 OPT_BOOL(0, "no-add", &state
->no_add
,
5000 N_("ignore additions made by the patch")),
5001 OPT_BOOL(0, "stat", &state
->diffstat
,
5002 N_("instead of applying the patch, output diffstat for the input")),
5003 OPT_NOOP_NOARG(0, "allow-binary-replacement"),
5004 OPT_NOOP_NOARG(0, "binary"),
5005 OPT_BOOL(0, "numstat", &state
->numstat
,
5006 N_("show number of added and deleted lines in decimal notation")),
5007 OPT_BOOL(0, "summary", &state
->summary
,
5008 N_("instead of applying the patch, output a summary for the input")),
5009 OPT_BOOL(0, "check", &state
->check
,
5010 N_("instead of applying the patch, see if the patch is applicable")),
5011 OPT_BOOL(0, "index", &state
->check_index
,
5012 N_("make sure the patch is applicable to the current index")),
5013 OPT_BOOL('N', "intent-to-add", &state
->ita_only
,
5014 N_("mark new files with `git add --intent-to-add`")),
5015 OPT_BOOL(0, "cached", &state
->cached
,
5016 N_("apply a patch without touching the working tree")),
5017 OPT_BOOL_F(0, "unsafe-paths", &state
->unsafe_paths
,
5018 N_("accept a patch that touches outside the working area"),
5019 PARSE_OPT_NOCOMPLETE
),
5020 OPT_BOOL(0, "apply", force_apply
,
5021 N_("also apply the patch (use with --stat/--summary/--check)")),
5022 OPT_BOOL('3', "3way", &state
->threeway
,
5023 N_( "attempt three-way merge, fall back on normal patch if that fails")),
5024 OPT_FILENAME(0, "build-fake-ancestor", &state
->fake_ancestor
,
5025 N_("build a temporary index based on embedded index information")),
5026 /* Think twice before adding "--nul" synonym to this */
5027 OPT_SET_INT('z', NULL
, &state
->line_termination
,
5028 N_("paths are separated with NUL character"), '\0'),
5029 OPT_INTEGER('C', NULL
, &state
->p_context
,
5030 N_("ensure at least <n> lines of context match")),
5031 OPT_CALLBACK(0, "whitespace", state
, N_("action"),
5032 N_("detect new or modified lines that have whitespace errors"),
5033 apply_option_parse_whitespace
),
5034 OPT_CALLBACK_F(0, "ignore-space-change", state
, NULL
,
5035 N_("ignore changes in whitespace when finding context"),
5036 PARSE_OPT_NOARG
, apply_option_parse_space_change
),
5037 OPT_CALLBACK_F(0, "ignore-whitespace", state
, NULL
,
5038 N_("ignore changes in whitespace when finding context"),
5039 PARSE_OPT_NOARG
, apply_option_parse_space_change
),
5040 OPT_BOOL('R', "reverse", &state
->apply_in_reverse
,
5041 N_("apply the patch in reverse")),
5042 OPT_BOOL(0, "unidiff-zero", &state
->unidiff_zero
,
5043 N_("don't expect at least one line of context")),
5044 OPT_BOOL(0, "reject", &state
->apply_with_reject
,
5045 N_("leave the rejected hunks in corresponding *.rej files")),
5046 OPT_BOOL(0, "allow-overlap", &state
->allow_overlap
,
5047 N_("allow overlapping hunks")),
5048 OPT__VERBOSE(&state
->apply_verbosity
, N_("be verbose")),
5049 OPT_BIT(0, "inaccurate-eof", options
,
5050 N_("tolerate incorrectly detected missing new-line at the end of file"),
5051 APPLY_OPT_INACCURATE_EOF
),
5052 OPT_BIT(0, "recount", options
,
5053 N_("do not trust the line counts in the hunk headers"),
5055 OPT_CALLBACK(0, "directory", state
, N_("root"),
5056 N_("prepend <root> to all filenames"),
5057 apply_option_parse_directory
),
5061 return parse_options(argc
, argv
, state
->prefix
, builtin_apply_options
, apply_usage
, 0);