4 * Copyright (C) Linus Torvalds, 2005
6 * This applies patches on top of some (arbitrary) version of the SCM.
10 #include "git-compat-util.h"
14 #include "object-store-ll.h"
18 #include "environment.h"
21 #include "xdiff-interface.h"
24 #include "name-hash.h"
25 #include "object-name.h"
26 #include "object-file.h"
27 #include "parse-options.h"
30 #include "read-cache.h"
36 #include "wildmatch.h"
45 static void git_apply_config(void)
47 git_config_get_string("apply.whitespace", &apply_default_whitespace
);
48 git_config_get_string("apply.ignorewhitespace", &apply_default_ignorewhitespace
);
49 git_config(git_xmerge_config
, NULL
);
52 static int parse_whitespace_option(struct apply_state
*state
, const char *option
)
55 state
->ws_error_action
= warn_on_ws_error
;
58 if (!strcmp(option
, "warn")) {
59 state
->ws_error_action
= warn_on_ws_error
;
62 if (!strcmp(option
, "nowarn")) {
63 state
->ws_error_action
= nowarn_ws_error
;
66 if (!strcmp(option
, "error")) {
67 state
->ws_error_action
= die_on_ws_error
;
70 if (!strcmp(option
, "error-all")) {
71 state
->ws_error_action
= die_on_ws_error
;
72 state
->squelch_whitespace_errors
= 0;
75 if (!strcmp(option
, "strip") || !strcmp(option
, "fix")) {
76 state
->ws_error_action
= correct_ws_error
;
80 * Please update $__git_whitespacelist in git-completion.bash
81 * when you add new options.
83 return error(_("unrecognized whitespace option '%s'"), option
);
86 static int parse_ignorewhitespace_option(struct apply_state
*state
,
89 if (!option
|| !strcmp(option
, "no") ||
90 !strcmp(option
, "false") || !strcmp(option
, "never") ||
91 !strcmp(option
, "none")) {
92 state
->ws_ignore_action
= ignore_ws_none
;
95 if (!strcmp(option
, "change")) {
96 state
->ws_ignore_action
= ignore_ws_change
;
99 return error(_("unrecognized whitespace ignore option '%s'"), option
);
102 int init_apply_state(struct apply_state
*state
,
103 struct repository
*repo
,
106 memset(state
, 0, sizeof(*state
));
107 state
->prefix
= prefix
;
110 state
->line_termination
= '\n';
112 state
->p_context
= UINT_MAX
;
113 state
->squelch_whitespace_errors
= 5;
114 state
->ws_error_action
= warn_on_ws_error
;
115 state
->ws_ignore_action
= ignore_ws_none
;
117 string_list_init_nodup(&state
->fn_table
);
118 string_list_init_nodup(&state
->limit_by_name
);
119 strset_init(&state
->removed_symlinks
);
120 strset_init(&state
->kept_symlinks
);
121 strbuf_init(&state
->root
, 0);
124 if (apply_default_whitespace
&& parse_whitespace_option(state
, apply_default_whitespace
))
126 if (apply_default_ignorewhitespace
&& parse_ignorewhitespace_option(state
, apply_default_ignorewhitespace
))
131 void clear_apply_state(struct apply_state
*state
)
133 string_list_clear(&state
->limit_by_name
, 0);
134 strset_clear(&state
->removed_symlinks
);
135 strset_clear(&state
->kept_symlinks
);
136 strbuf_release(&state
->root
);
138 /* &state->fn_table is cleared at the end of apply_patch() */
141 static void mute_routine(const char *msg UNUSED
, va_list params UNUSED
)
146 int check_apply_state(struct apply_state
*state
, int force_apply
)
148 int is_not_gitdir
= !startup_info
->have_repository
;
150 if (state
->apply_with_reject
&& state
->threeway
)
151 return error(_("options '%s' and '%s' cannot be used together"), "--reject", "--3way");
152 if (state
->threeway
) {
154 return error(_("'%s' outside a repository"), "--3way");
155 state
->check_index
= 1;
157 if (state
->apply_with_reject
) {
159 if (state
->apply_verbosity
== verbosity_normal
)
160 state
->apply_verbosity
= verbosity_verbose
;
162 if (!force_apply
&& (state
->diffstat
|| state
->numstat
|| state
->summary
|| state
->check
|| state
->fake_ancestor
))
164 if (state
->check_index
&& is_not_gitdir
)
165 return error(_("'%s' outside a repository"), "--index");
168 return error(_("'%s' outside a repository"), "--cached");
169 state
->check_index
= 1;
171 if (state
->ita_only
&& (state
->check_index
|| is_not_gitdir
))
173 if (state
->check_index
)
174 state
->unsafe_paths
= 0;
176 if (state
->apply_verbosity
<= verbosity_silent
) {
177 state
->saved_error_routine
= get_error_routine();
178 state
->saved_warn_routine
= get_warn_routine();
179 set_error_routine(mute_routine
);
180 set_warn_routine(mute_routine
);
186 static void set_default_whitespace_mode(struct apply_state
*state
)
188 if (!state
->whitespace_option
&& !apply_default_whitespace
)
189 state
->ws_error_action
= (state
->apply
? warn_on_ws_error
: nowarn_ws_error
);
193 * This represents one "hunk" from a patch, starting with
194 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The
195 * patch text is pointed at by patch, and its byte length
196 * is stored in size. leading and trailing are the number
200 unsigned long leading
, trailing
;
201 unsigned long oldpos
, oldlines
;
202 unsigned long newpos
, newlines
;
204 * 'patch' is usually borrowed from buf in apply_patch(),
205 * but some codepaths store an allocated buffer.
208 unsigned free_patch
:1,
212 struct fragment
*next
;
216 * When dealing with a binary patch, we reuse "leading" field
217 * to store the type of the binary hunk, either deflated "delta"
218 * or deflated "literal".
220 #define binary_patch_method leading
221 #define BINARY_DELTA_DEFLATED 1
222 #define BINARY_LITERAL_DEFLATED 2
224 static void free_fragment_list(struct fragment
*list
)
227 struct fragment
*next
= list
->next
;
228 if (list
->free_patch
)
229 free((char *)list
->patch
);
235 void release_patch(struct patch
*patch
)
237 free_fragment_list(patch
->fragments
);
238 free(patch
->def_name
);
239 free(patch
->old_name
);
240 free(patch
->new_name
);
244 static void free_patch(struct patch
*patch
)
246 release_patch(patch
);
250 static void free_patch_list(struct patch
*list
)
253 struct patch
*next
= list
->next
;
260 * A line in a file, len-bytes long (includes the terminating LF,
261 * except for an incomplete line at the end if the file ends with
262 * one), and its contents hashes to 'hash'.
268 #define LINE_COMMON 1
269 #define LINE_PATCHED 2
273 * This represents a "file", which is an array of "lines".
280 struct line
*line_allocated
;
284 static uint32_t hash_line(const char *cp
, size_t len
)
288 for (i
= 0, h
= 0; i
< len
; i
++) {
289 if (!isspace(cp
[i
])) {
290 h
= h
* 3 + (cp
[i
] & 0xff);
297 * Compare lines s1 of length n1 and s2 of length n2, ignoring
298 * whitespace difference. Returns 1 if they match, 0 otherwise
300 static int fuzzy_matchlines(const char *s1
, size_t n1
,
301 const char *s2
, size_t n2
)
303 const char *end1
= s1
+ n1
;
304 const char *end2
= s2
+ n2
;
306 /* ignore line endings */
307 while (s1
< end1
&& (end1
[-1] == '\r' || end1
[-1] == '\n'))
309 while (s2
< end2
&& (end2
[-1] == '\r' || end2
[-1] == '\n'))
312 while (s1
< end1
&& s2
< end2
) {
315 * Skip whitespace. We check on both buffers
316 * because we don't want "a b" to match "ab".
320 while (s1
< end1
&& isspace(*s1
))
322 while (s2
< end2
&& isspace(*s2
))
324 } else if (*s1
++ != *s2
++)
328 /* If we reached the end on one side only, lines don't match. */
329 return s1
== end1
&& s2
== end2
;
332 static void add_line_info(struct image
*img
, const char *bol
, size_t len
, unsigned flag
)
334 ALLOC_GROW(img
->line_allocated
, img
->nr
+ 1, img
->alloc
);
335 img
->line_allocated
[img
->nr
].len
= len
;
336 img
->line_allocated
[img
->nr
].hash
= hash_line(bol
, len
);
337 img
->line_allocated
[img
->nr
].flag
= flag
;
342 * "buf" has the file contents to be patched (read from various sources).
343 * attach it to "image" and add line-based index to it.
344 * "image" now owns the "buf".
346 static void prepare_image(struct image
*image
, char *buf
, size_t len
,
347 int prepare_linetable
)
351 memset(image
, 0, sizeof(*image
));
355 if (!prepare_linetable
)
358 ep
= image
->buf
+ image
->len
;
362 for (next
= cp
; next
< ep
&& *next
!= '\n'; next
++)
366 add_line_info(image
, cp
, next
- cp
, 0);
369 image
->line
= image
->line_allocated
;
372 static void clear_image(struct image
*image
)
375 free(image
->line_allocated
);
376 memset(image
, 0, sizeof(*image
));
379 /* fmt must contain _one_ %s and no other substitution */
380 static void say_patch_name(FILE *output
, const char *fmt
, struct patch
*patch
)
382 struct strbuf sb
= STRBUF_INIT
;
384 if (patch
->old_name
&& patch
->new_name
&&
385 strcmp(patch
->old_name
, patch
->new_name
)) {
386 quote_c_style(patch
->old_name
, &sb
, NULL
, 0);
387 strbuf_addstr(&sb
, " => ");
388 quote_c_style(patch
->new_name
, &sb
, NULL
, 0);
390 const char *n
= patch
->new_name
;
393 quote_c_style(n
, &sb
, NULL
, 0);
395 fprintf(output
, fmt
, sb
.buf
);
403 * apply.c isn't equipped to handle arbitrarily large patches, because
404 * it intermingles `unsigned long` with `int` for the type used to store
407 * Only process patches that are just shy of 1 GiB large in order to
408 * avoid any truncation or overflow issues.
410 #define MAX_APPLY_SIZE (1024UL * 1024 * 1023)
412 static int read_patch_file(struct strbuf
*sb
, int fd
)
414 if (strbuf_read(sb
, fd
, 0) < 0)
415 return error_errno(_("failed to read patch"));
416 else if (sb
->len
>= MAX_APPLY_SIZE
)
417 return error(_("patch too large"));
419 * Make sure that we have some slop in the buffer
420 * so that we can do speculative "memcmp" etc, and
421 * see to it that it is NUL-filled.
423 strbuf_grow(sb
, SLOP
);
424 memset(sb
->buf
+ sb
->len
, 0, SLOP
);
428 static unsigned long linelen(const char *buffer
, unsigned long size
)
430 unsigned long len
= 0;
433 if (*buffer
++ == '\n')
439 static int is_dev_null(const char *str
)
441 return skip_prefix(str
, "/dev/null", &str
) && isspace(*str
);
447 static int name_terminate(int c
, int terminate
)
449 if (c
== ' ' && !(terminate
& TERM_SPACE
))
451 if (c
== '\t' && !(terminate
& TERM_TAB
))
457 /* remove double slashes to make --index work with such filenames */
458 static char *squash_slash(char *name
)
466 if ((name
[j
++] = name
[i
++]) == '/')
467 while (name
[i
] == '/')
474 static char *find_name_gnu(struct strbuf
*root
,
478 struct strbuf name
= STRBUF_INIT
;
482 * Proposed "new-style" GNU patch/diff format; see
483 * https://lore.kernel.org/git/7vll0wvb2a.fsf@assigned-by-dhcp.cox.net/
485 if (unquote_c_style(&name
, line
, NULL
)) {
486 strbuf_release(&name
);
490 for (cp
= name
.buf
; p_value
; p_value
--) {
491 cp
= strchr(cp
, '/');
493 strbuf_release(&name
);
499 strbuf_remove(&name
, 0, cp
- name
.buf
);
501 strbuf_insert(&name
, 0, root
->buf
, root
->len
);
502 return squash_slash(strbuf_detach(&name
, NULL
));
505 static size_t sane_tz_len(const char *line
, size_t len
)
509 if (len
< strlen(" +0500") || line
[len
-strlen(" +0500")] != ' ')
511 tz
= line
+ len
- strlen(" +0500");
513 if (tz
[1] != '+' && tz
[1] != '-')
516 for (p
= tz
+ 2; p
!= line
+ len
; p
++)
520 return line
+ len
- tz
;
523 static size_t tz_with_colon_len(const char *line
, size_t len
)
527 if (len
< strlen(" +08:00") || line
[len
- strlen(":00")] != ':')
529 tz
= line
+ len
- strlen(" +08:00");
531 if (tz
[0] != ' ' || (tz
[1] != '+' && tz
[1] != '-'))
534 if (!isdigit(*p
++) || !isdigit(*p
++) || *p
++ != ':' ||
535 !isdigit(*p
++) || !isdigit(*p
++))
538 return line
+ len
- tz
;
541 static size_t date_len(const char *line
, size_t len
)
543 const char *date
, *p
;
545 if (len
< strlen("72-02-05") || line
[len
-strlen("-05")] != '-')
547 p
= date
= line
+ len
- strlen("72-02-05");
549 if (!isdigit(*p
++) || !isdigit(*p
++) || *p
++ != '-' ||
550 !isdigit(*p
++) || !isdigit(*p
++) || *p
++ != '-' ||
551 !isdigit(*p
++) || !isdigit(*p
++)) /* Not a date. */
554 if (date
- line
>= strlen("19") &&
555 isdigit(date
[-1]) && isdigit(date
[-2])) /* 4-digit year */
556 date
-= strlen("19");
558 return line
+ len
- date
;
561 static size_t short_time_len(const char *line
, size_t len
)
563 const char *time
, *p
;
565 if (len
< strlen(" 07:01:32") || line
[len
-strlen(":32")] != ':')
567 p
= time
= line
+ len
- strlen(" 07:01:32");
569 /* Permit 1-digit hours? */
571 !isdigit(*p
++) || !isdigit(*p
++) || *p
++ != ':' ||
572 !isdigit(*p
++) || !isdigit(*p
++) || *p
++ != ':' ||
573 !isdigit(*p
++) || !isdigit(*p
++)) /* Not a time. */
576 return line
+ len
- time
;
579 static size_t fractional_time_len(const char *line
, size_t len
)
584 /* Expected format: 19:41:17.620000023 */
585 if (!len
|| !isdigit(line
[len
- 1]))
589 /* Fractional seconds. */
590 while (p
> line
&& isdigit(*p
))
595 /* Hours, minutes, and whole seconds. */
596 n
= short_time_len(line
, p
- line
);
600 return line
+ len
- p
+ n
;
603 static size_t trailing_spaces_len(const char *line
, size_t len
)
607 /* Expected format: ' ' x (1 or more) */
608 if (!len
|| line
[len
- 1] != ' ')
615 return line
+ len
- (p
+ 1);
622 static size_t diff_timestamp_len(const char *line
, size_t len
)
624 const char *end
= line
+ len
;
628 * Posix: 2010-07-05 19:41:17
629 * GNU: 2010-07-05 19:41:17.620000023 -0500
632 if (!isdigit(end
[-1]))
635 n
= sane_tz_len(line
, end
- line
);
637 n
= tz_with_colon_len(line
, end
- line
);
640 n
= short_time_len(line
, end
- line
);
642 n
= fractional_time_len(line
, end
- line
);
645 n
= date_len(line
, end
- line
);
646 if (!n
) /* No date. Too bad. */
650 if (end
== line
) /* No space before date. */
652 if (end
[-1] == '\t') { /* Success! */
654 return line
+ len
- end
;
656 if (end
[-1] != ' ') /* No space before date. */
659 /* Whitespace damage. */
660 end
-= trailing_spaces_len(line
, end
- line
);
661 return line
+ len
- end
;
664 static char *find_name_common(struct strbuf
*root
,
672 const char *start
= NULL
;
676 while (line
!= end
) {
679 if (!end
&& isspace(c
)) {
682 if (name_terminate(c
, terminate
))
686 if (c
== '/' && !--p_value
)
690 return squash_slash(xstrdup_or_null(def
));
693 return squash_slash(xstrdup_or_null(def
));
696 * Generally we prefer the shorter name, especially
697 * if the other one is just a variation of that with
698 * something else tacked on to the end (ie "file.orig"
702 int deflen
= strlen(def
);
703 if (deflen
< len
&& !strncmp(start
, def
, deflen
))
704 return squash_slash(xstrdup(def
));
708 char *ret
= xstrfmt("%s%.*s", root
->buf
, len
, start
);
709 return squash_slash(ret
);
712 return squash_slash(xmemdupz(start
, len
));
715 static char *find_name(struct strbuf
*root
,
722 char *name
= find_name_gnu(root
, line
, p_value
);
727 return find_name_common(root
, line
, def
, p_value
, NULL
, terminate
);
730 static char *find_name_traditional(struct strbuf
*root
,
739 char *name
= find_name_gnu(root
, line
, p_value
);
744 len
= strchrnul(line
, '\n') - line
;
745 date_len
= diff_timestamp_len(line
, len
);
747 return find_name_common(root
, line
, def
, p_value
, NULL
, TERM_TAB
);
750 return find_name_common(root
, line
, def
, p_value
, line
+ len
, 0);
754 * Given the string after "--- " or "+++ ", guess the appropriate
755 * p_value for the given patch.
757 static int guess_p_value(struct apply_state
*state
, const char *nameline
)
762 if (is_dev_null(nameline
))
764 name
= find_name_traditional(&state
->root
, nameline
, NULL
, 0);
767 cp
= strchr(name
, '/');
770 else if (state
->prefix
) {
772 * Does it begin with "a/$our-prefix" and such? Then this is
773 * very likely to apply to our directory.
775 if (starts_with(name
, state
->prefix
))
776 val
= count_slashes(state
->prefix
);
779 if (starts_with(cp
, state
->prefix
))
780 val
= count_slashes(state
->prefix
) + 1;
788 * Does the ---/+++ line have the POSIX timestamp after the last HT?
789 * GNU diff puts epoch there to signal a creation/deletion event. Is
790 * this such a timestamp?
792 static int has_epoch_timestamp(const char *nameline
)
795 * We are only interested in epoch timestamp; any non-zero
796 * fraction cannot be one, hence "(\.0+)?" in the regexp below.
797 * For the same reason, the date must be either 1969-12-31 or
798 * 1970-01-01, and the seconds part must be "00".
800 const char stamp_regexp
[] =
801 "^[0-2][0-9]:([0-5][0-9]):00(\\.0+)?"
803 "([-+][0-2][0-9]:?[0-5][0-9])\n";
804 const char *timestamp
= NULL
, *cp
, *colon
;
805 static regex_t
*stamp
;
807 int zoneoffset
, epoch_hour
, hour
, minute
;
810 for (cp
= nameline
; *cp
!= '\n'; cp
++) {
818 * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31
819 * (west of GMT) or 1970-01-01 (east of GMT)
821 if (skip_prefix(timestamp
, "1969-12-31 ", ×tamp
))
823 else if (skip_prefix(timestamp
, "1970-01-01 ", ×tamp
))
829 stamp
= xmalloc(sizeof(*stamp
));
830 if (regcomp(stamp
, stamp_regexp
, REG_EXTENDED
)) {
831 warning(_("Cannot prepare timestamp regexp %s"),
837 status
= regexec(stamp
, timestamp
, ARRAY_SIZE(m
), m
, 0);
839 if (status
!= REG_NOMATCH
)
840 warning(_("regexec returned %d for input: %s"),
845 hour
= strtol(timestamp
, NULL
, 10);
846 minute
= strtol(timestamp
+ m
[1].rm_so
, NULL
, 10);
848 zoneoffset
= strtol(timestamp
+ m
[3].rm_so
+ 1, (char **) &colon
, 10);
850 zoneoffset
= zoneoffset
* 60 + strtol(colon
+ 1, NULL
, 10);
852 zoneoffset
= (zoneoffset
/ 100) * 60 + (zoneoffset
% 100);
853 if (timestamp
[m
[3].rm_so
] == '-')
854 zoneoffset
= -zoneoffset
;
856 return hour
* 60 + minute
- zoneoffset
== epoch_hour
* 60;
860 * Get the name etc info from the ---/+++ lines of a traditional patch header
862 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
863 * files, we can happily check the index for a match, but for creating a
864 * new file we should try to match whatever "patch" does. I have no idea.
866 static int parse_traditional_patch(struct apply_state
*state
,
873 first
+= 4; /* skip "--- " */
874 second
+= 4; /* skip "+++ " */
875 if (!state
->p_value_known
) {
877 p
= guess_p_value(state
, first
);
878 q
= guess_p_value(state
, second
);
880 if (0 <= p
&& p
== q
) {
882 state
->p_value_known
= 1;
885 if (is_dev_null(first
)) {
887 patch
->is_delete
= 0;
888 name
= find_name_traditional(&state
->root
, second
, NULL
, state
->p_value
);
889 patch
->new_name
= name
;
890 } else if (is_dev_null(second
)) {
892 patch
->is_delete
= 1;
893 name
= find_name_traditional(&state
->root
, first
, NULL
, state
->p_value
);
894 patch
->old_name
= name
;
897 first_name
= find_name_traditional(&state
->root
, first
, NULL
, state
->p_value
);
898 name
= find_name_traditional(&state
->root
, second
, first_name
, state
->p_value
);
900 if (has_epoch_timestamp(first
)) {
902 patch
->is_delete
= 0;
903 patch
->new_name
= name
;
904 } else if (has_epoch_timestamp(second
)) {
906 patch
->is_delete
= 1;
907 patch
->old_name
= name
;
909 patch
->old_name
= name
;
910 patch
->new_name
= xstrdup_or_null(name
);
914 return error(_("unable to find filename in patch at line %d"), state
->linenr
);
919 static int gitdiff_hdrend(struct gitdiff_data
*state UNUSED
,
920 const char *line UNUSED
,
921 struct patch
*patch UNUSED
)
927 * We're anal about diff header consistency, to make
928 * sure that we don't end up having strange ambiguous
929 * patches floating around.
931 * As a result, gitdiff_{old|new}name() will check
932 * their names against any previous information, just
935 #define DIFF_OLD_NAME 0
936 #define DIFF_NEW_NAME 1
938 static int gitdiff_verify_name(struct gitdiff_data
*state
,
944 if (!*name
&& !isnull
) {
945 *name
= find_name(state
->root
, line
, NULL
, state
->p_value
, TERM_TAB
);
952 return error(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"),
953 *name
, state
->linenr
);
954 another
= find_name(state
->root
, line
, NULL
, state
->p_value
, TERM_TAB
);
955 if (!another
|| strcmp(another
, *name
)) {
957 return error((side
== DIFF_NEW_NAME
) ?
958 _("git apply: bad git-diff - inconsistent new filename on line %d") :
959 _("git apply: bad git-diff - inconsistent old filename on line %d"), state
->linenr
);
963 if (!is_dev_null(line
))
964 return error(_("git apply: bad git-diff - expected /dev/null on line %d"), state
->linenr
);
970 static int gitdiff_oldname(struct gitdiff_data
*state
,
974 return gitdiff_verify_name(state
, line
,
975 patch
->is_new
, &patch
->old_name
,
979 static int gitdiff_newname(struct gitdiff_data
*state
,
983 return gitdiff_verify_name(state
, line
,
984 patch
->is_delete
, &patch
->new_name
,
988 static int parse_mode_line(const char *line
, int linenr
, unsigned int *mode
)
991 *mode
= strtoul(line
, &end
, 8);
992 if (end
== line
|| !isspace(*end
))
993 return error(_("invalid mode on line %d: %s"), linenr
, line
);
997 static int gitdiff_oldmode(struct gitdiff_data
*state
,
1001 return parse_mode_line(line
, state
->linenr
, &patch
->old_mode
);
1004 static int gitdiff_newmode(struct gitdiff_data
*state
,
1006 struct patch
*patch
)
1008 return parse_mode_line(line
, state
->linenr
, &patch
->new_mode
);
1011 static int gitdiff_delete(struct gitdiff_data
*state
,
1013 struct patch
*patch
)
1015 patch
->is_delete
= 1;
1016 free(patch
->old_name
);
1017 patch
->old_name
= xstrdup_or_null(patch
->def_name
);
1018 return gitdiff_oldmode(state
, line
, patch
);
1021 static int gitdiff_newfile(struct gitdiff_data
*state
,
1023 struct patch
*patch
)
1026 free(patch
->new_name
);
1027 patch
->new_name
= xstrdup_or_null(patch
->def_name
);
1028 return gitdiff_newmode(state
, line
, patch
);
1031 static int gitdiff_copysrc(struct gitdiff_data
*state
,
1033 struct patch
*patch
)
1036 free(patch
->old_name
);
1037 patch
->old_name
= find_name(state
->root
, line
, NULL
, state
->p_value
? state
->p_value
- 1 : 0, 0);
1041 static int gitdiff_copydst(struct gitdiff_data
*state
,
1043 struct patch
*patch
)
1046 free(patch
->new_name
);
1047 patch
->new_name
= find_name(state
->root
, line
, NULL
, state
->p_value
? state
->p_value
- 1 : 0, 0);
1051 static int gitdiff_renamesrc(struct gitdiff_data
*state
,
1053 struct patch
*patch
)
1055 patch
->is_rename
= 1;
1056 free(patch
->old_name
);
1057 patch
->old_name
= find_name(state
->root
, line
, NULL
, state
->p_value
? state
->p_value
- 1 : 0, 0);
1061 static int gitdiff_renamedst(struct gitdiff_data
*state
,
1063 struct patch
*patch
)
1065 patch
->is_rename
= 1;
1066 free(patch
->new_name
);
1067 patch
->new_name
= find_name(state
->root
, line
, NULL
, state
->p_value
? state
->p_value
- 1 : 0, 0);
1071 static int gitdiff_similarity(struct gitdiff_data
*state UNUSED
,
1073 struct patch
*patch
)
1075 unsigned long val
= strtoul(line
, NULL
, 10);
1081 static int gitdiff_dissimilarity(struct gitdiff_data
*state UNUSED
,
1083 struct patch
*patch
)
1085 unsigned long val
= strtoul(line
, NULL
, 10);
1091 static int gitdiff_index(struct gitdiff_data
*state
,
1093 struct patch
*patch
)
1096 * index line is N hexadecimal, "..", N hexadecimal,
1097 * and optional space with octal mode.
1099 const char *ptr
, *eol
;
1101 const unsigned hexsz
= the_hash_algo
->hexsz
;
1103 ptr
= strchr(line
, '.');
1104 if (!ptr
|| ptr
[1] != '.' || hexsz
< ptr
- line
)
1107 memcpy(patch
->old_oid_prefix
, line
, len
);
1108 patch
->old_oid_prefix
[len
] = 0;
1111 ptr
= strchr(line
, ' ');
1112 eol
= strchrnul(line
, '\n');
1114 if (!ptr
|| eol
< ptr
)
1120 memcpy(patch
->new_oid_prefix
, line
, len
);
1121 patch
->new_oid_prefix
[len
] = 0;
1123 return gitdiff_oldmode(state
, ptr
+ 1, patch
);
1128 * This is normal for a diff that doesn't change anything: we'll fall through
1129 * into the next diff. Tell the parser to break out.
1131 static int gitdiff_unrecognized(struct gitdiff_data
*state UNUSED
,
1132 const char *line UNUSED
,
1133 struct patch
*patch UNUSED
)
1139 * Skip p_value leading components from "line"; as we do not accept
1140 * absolute paths, return NULL in that case.
1142 static const char *skip_tree_prefix(int p_value
,
1150 return (llen
&& line
[0] == '/') ? NULL
: line
;
1153 for (i
= 0; i
< llen
; i
++) {
1155 if (ch
== '/' && --nslash
<= 0)
1156 return (i
== 0) ? NULL
: &line
[i
+ 1];
1162 * This is to extract the same name that appears on "diff --git"
1163 * line. We do not find and return anything if it is a rename
1164 * patch, and it is OK because we will find the name elsewhere.
1165 * We need to reliably find name only when it is mode-change only,
1166 * creation or deletion of an empty file. In any of these cases,
1167 * both sides are the same name under a/ and b/ respectively.
1169 static char *git_header_name(int p_value
,
1174 const char *second
= NULL
;
1175 size_t len
, line_len
;
1177 line
+= strlen("diff --git ");
1178 llen
-= strlen("diff --git ");
1182 struct strbuf first
= STRBUF_INIT
;
1183 struct strbuf sp
= STRBUF_INIT
;
1185 if (unquote_c_style(&first
, line
, &second
))
1186 goto free_and_fail1
;
1188 /* strip the a/b prefix including trailing slash */
1189 cp
= skip_tree_prefix(p_value
, first
.buf
, first
.len
);
1191 goto free_and_fail1
;
1192 strbuf_remove(&first
, 0, cp
- first
.buf
);
1195 * second points at one past closing dq of name.
1196 * find the second name.
1198 while ((second
< line
+ llen
) && isspace(*second
))
1201 if (line
+ llen
<= second
)
1202 goto free_and_fail1
;
1203 if (*second
== '"') {
1204 if (unquote_c_style(&sp
, second
, NULL
))
1205 goto free_and_fail1
;
1206 cp
= skip_tree_prefix(p_value
, sp
.buf
, sp
.len
);
1208 goto free_and_fail1
;
1209 /* They must match, otherwise ignore */
1210 if (strcmp(cp
, first
.buf
))
1211 goto free_and_fail1
;
1212 strbuf_release(&sp
);
1213 return strbuf_detach(&first
, NULL
);
1216 /* unquoted second */
1217 cp
= skip_tree_prefix(p_value
, second
, line
+ llen
- second
);
1219 goto free_and_fail1
;
1220 if (line
+ llen
- cp
!= first
.len
||
1221 memcmp(first
.buf
, cp
, first
.len
))
1222 goto free_and_fail1
;
1223 return strbuf_detach(&first
, NULL
);
1226 strbuf_release(&first
);
1227 strbuf_release(&sp
);
1231 /* unquoted first name */
1232 name
= skip_tree_prefix(p_value
, line
, llen
);
1237 * since the first name is unquoted, a dq if exists must be
1238 * the beginning of the second name.
1240 for (second
= name
; second
< line
+ llen
; second
++) {
1241 if (*second
== '"') {
1242 struct strbuf sp
= STRBUF_INIT
;
1245 if (unquote_c_style(&sp
, second
, NULL
))
1246 goto free_and_fail2
;
1248 np
= skip_tree_prefix(p_value
, sp
.buf
, sp
.len
);
1250 goto free_and_fail2
;
1252 len
= sp
.buf
+ sp
.len
- np
;
1253 if (len
< second
- name
&&
1254 !strncmp(np
, name
, len
) &&
1255 isspace(name
[len
])) {
1257 strbuf_remove(&sp
, 0, np
- sp
.buf
);
1258 return strbuf_detach(&sp
, NULL
);
1262 strbuf_release(&sp
);
1268 * Accept a name only if it shows up twice, exactly the same
1271 second
= strchr(name
, '\n');
1274 line_len
= second
- name
;
1275 for (len
= 0 ; ; len
++) {
1276 switch (name
[len
]) {
1281 case '\t': case ' ':
1283 * Is this the separator between the preimage
1284 * and the postimage pathname? Again, we are
1285 * only interested in the case where there is
1286 * no rename, as this is only to set def_name
1287 * and a rename patch has the names elsewhere
1288 * in an unambiguous form.
1291 return NULL
; /* no postimage name */
1292 second
= skip_tree_prefix(p_value
, name
+ len
+ 1,
1293 line_len
- (len
+ 1));
1297 * Does len bytes starting at "name" and "second"
1298 * (that are separated by one HT or SP we just
1299 * found) exactly match?
1301 if (second
[len
] == '\n' && !strncmp(name
, second
, len
))
1302 return xmemdupz(name
, len
);
1307 static int check_header_line(int linenr
, struct patch
*patch
)
1309 int extensions
= (patch
->is_delete
== 1) + (patch
->is_new
== 1) +
1310 (patch
->is_rename
== 1) + (patch
->is_copy
== 1);
1312 return error(_("inconsistent header lines %d and %d"),
1313 patch
->extension_linenr
, linenr
);
1314 if (extensions
&& !patch
->extension_linenr
)
1315 patch
->extension_linenr
= linenr
;
1319 int parse_git_diff_header(struct strbuf
*root
,
1325 struct patch
*patch
)
1327 unsigned long offset
;
1328 struct gitdiff_data parse_hdr_state
;
1330 /* A git diff has explicit new/delete information, so we don't guess */
1332 patch
->is_delete
= 0;
1335 * Some things may not have the old name in the
1336 * rest of the headers anywhere (pure mode changes,
1337 * or removing or adding empty files), so we get
1338 * the default name from the header.
1340 patch
->def_name
= git_header_name(p_value
, line
, len
);
1341 if (patch
->def_name
&& root
->len
) {
1342 char *s
= xstrfmt("%s%s", root
->buf
, patch
->def_name
);
1343 free(patch
->def_name
);
1344 patch
->def_name
= s
;
1350 parse_hdr_state
.root
= root
;
1351 parse_hdr_state
.linenr
= *linenr
;
1352 parse_hdr_state
.p_value
= p_value
;
1354 for (offset
= len
; size
> 0 ; offset
+= len
, size
-= len
, line
+= len
, (*linenr
)++) {
1355 static const struct opentry
{
1357 int (*fn
)(struct gitdiff_data
*, const char *, struct patch
*);
1359 { "@@ -", gitdiff_hdrend
},
1360 { "--- ", gitdiff_oldname
},
1361 { "+++ ", gitdiff_newname
},
1362 { "old mode ", gitdiff_oldmode
},
1363 { "new mode ", gitdiff_newmode
},
1364 { "deleted file mode ", gitdiff_delete
},
1365 { "new file mode ", gitdiff_newfile
},
1366 { "copy from ", gitdiff_copysrc
},
1367 { "copy to ", gitdiff_copydst
},
1368 { "rename old ", gitdiff_renamesrc
},
1369 { "rename new ", gitdiff_renamedst
},
1370 { "rename from ", gitdiff_renamesrc
},
1371 { "rename to ", gitdiff_renamedst
},
1372 { "similarity index ", gitdiff_similarity
},
1373 { "dissimilarity index ", gitdiff_dissimilarity
},
1374 { "index ", gitdiff_index
},
1375 { "", gitdiff_unrecognized
},
1379 len
= linelen(line
, size
);
1380 if (!len
|| line
[len
-1] != '\n')
1382 for (i
= 0; i
< ARRAY_SIZE(optable
); i
++) {
1383 const struct opentry
*p
= optable
+ i
;
1384 int oplen
= strlen(p
->str
);
1386 if (len
< oplen
|| memcmp(p
->str
, line
, oplen
))
1388 res
= p
->fn(&parse_hdr_state
, line
+ oplen
, patch
);
1391 if (check_header_line(*linenr
, patch
))
1400 if (!patch
->old_name
&& !patch
->new_name
) {
1401 if (!patch
->def_name
) {
1402 error(Q_("git diff header lacks filename information when removing "
1403 "%d leading pathname component (line %d)",
1404 "git diff header lacks filename information when removing "
1405 "%d leading pathname components (line %d)",
1406 parse_hdr_state
.p_value
),
1407 parse_hdr_state
.p_value
, *linenr
);
1410 patch
->old_name
= xstrdup(patch
->def_name
);
1411 patch
->new_name
= xstrdup(patch
->def_name
);
1413 if ((!patch
->new_name
&& !patch
->is_delete
) ||
1414 (!patch
->old_name
&& !patch
->is_new
)) {
1415 error(_("git diff header lacks filename information "
1416 "(line %d)"), *linenr
);
1419 patch
->is_toplevel_relative
= 1;
1423 static int parse_num(const char *line
, unsigned long *p
)
1427 if (!isdigit(*line
))
1429 *p
= strtoul(line
, &ptr
, 10);
1433 static int parse_range(const char *line
, int len
, int offset
, const char *expect
,
1434 unsigned long *p1
, unsigned long *p2
)
1438 if (offset
< 0 || offset
>= len
)
1443 digits
= parse_num(line
, p1
);
1453 digits
= parse_num(line
+1, p2
);
1462 ex
= strlen(expect
);
1465 if (memcmp(line
, expect
, ex
))
1471 static void recount_diff(const char *line
, int size
, struct fragment
*fragment
)
1473 int oldlines
= 0, newlines
= 0, ret
= 0;
1476 warning("recount: ignore empty hunk");
1481 int len
= linelen(line
, size
);
1489 case ' ': case '\n':
1501 ret
= size
< 3 || !starts_with(line
, "@@ ");
1504 ret
= size
< 5 || !starts_with(line
, "diff ");
1511 warning(_("recount: unexpected line: %.*s"),
1512 (int)linelen(line
, size
), line
);
1517 fragment
->oldlines
= oldlines
;
1518 fragment
->newlines
= newlines
;
1522 * Parse a unified diff fragment header of the
1523 * form "@@ -a,b +c,d @@"
1525 static int parse_fragment_header(const char *line
, int len
, struct fragment
*fragment
)
1529 if (!len
|| line
[len
-1] != '\n')
1532 /* Figure out the number of lines in a fragment */
1533 offset
= parse_range(line
, len
, 4, " +", &fragment
->oldpos
, &fragment
->oldlines
);
1534 offset
= parse_range(line
, len
, offset
, " @@", &fragment
->newpos
, &fragment
->newlines
);
1540 * Find file diff header
1543 * -1 if no header was found
1544 * -128 in case of error
1545 * the size of the header in bytes (called "offset") otherwise
1547 static int find_header(struct apply_state
*state
,
1551 struct patch
*patch
)
1553 unsigned long offset
, len
;
1555 patch
->is_toplevel_relative
= 0;
1556 patch
->is_rename
= patch
->is_copy
= 0;
1557 patch
->is_new
= patch
->is_delete
= -1;
1558 patch
->old_mode
= patch
->new_mode
= 0;
1559 patch
->old_name
= patch
->new_name
= NULL
;
1560 for (offset
= 0; size
> 0; offset
+= len
, size
-= len
, line
+= len
, state
->linenr
++) {
1561 unsigned long nextlen
;
1563 len
= linelen(line
, size
);
1567 /* Testing this early allows us to take a few shortcuts.. */
1572 * Make sure we don't find any unconnected patch fragments.
1573 * That's a sign that we didn't find a header, and that a
1574 * patch has become corrupted/broken up.
1576 if (!memcmp("@@ -", line
, 4)) {
1577 struct fragment dummy
;
1578 if (parse_fragment_header(line
, len
, &dummy
) < 0)
1580 error(_("patch fragment without header at line %d: %.*s"),
1581 state
->linenr
, (int)len
-1, line
);
1589 * Git patch? It might not have a real patch, just a rename
1590 * or mode change, so we handle that specially
1592 if (!memcmp("diff --git ", line
, 11)) {
1593 int git_hdr_len
= parse_git_diff_header(&state
->root
, &state
->linenr
,
1594 state
->p_value
, line
, len
,
1596 if (git_hdr_len
< 0)
1598 if (git_hdr_len
<= len
)
1600 *hdrsize
= git_hdr_len
;
1604 /* --- followed by +++ ? */
1605 if (memcmp("--- ", line
, 4) || memcmp("+++ ", line
+ len
, 4))
1609 * We only accept unified patches, so we want it to
1610 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
1611 * minimum ("@@ -0,0 +1 @@\n" is the shortest).
1613 nextlen
= linelen(line
+ len
, size
- len
);
1614 if (size
< nextlen
+ 14 || memcmp("@@ -", line
+ len
+ nextlen
, 4))
1617 /* Ok, we'll consider it a patch */
1618 if (parse_traditional_patch(state
, line
, line
+len
, patch
))
1620 *hdrsize
= len
+ nextlen
;
1627 static void record_ws_error(struct apply_state
*state
,
1638 state
->whitespace_error
++;
1639 if (state
->squelch_whitespace_errors
&&
1640 state
->squelch_whitespace_errors
< state
->whitespace_error
)
1643 err
= whitespace_error_string(result
);
1644 if (state
->apply_verbosity
> verbosity_silent
)
1645 fprintf(stderr
, "%s:%d: %s.\n%.*s\n",
1646 state
->patch_input_file
, linenr
, err
, len
, line
);
1650 static void check_whitespace(struct apply_state
*state
,
1655 unsigned result
= ws_check(line
+ 1, len
- 1, ws_rule
);
1657 record_ws_error(state
, result
, line
+ 1, len
- 2, state
->linenr
);
1661 * Check if the patch has context lines with CRLF or
1662 * the patch wants to remove lines with CRLF.
1664 static void check_old_for_crlf(struct patch
*patch
, const char *line
, int len
)
1666 if (len
>= 2 && line
[len
-1] == '\n' && line
[len
-2] == '\r') {
1667 patch
->ws_rule
|= WS_CR_AT_EOL
;
1668 patch
->crlf_in_old
= 1;
1674 * Parse a unified diff. Note that this really needs to parse each
1675 * fragment separately, since the only way to know the difference
1676 * between a "---" that is part of a patch, and a "---" that starts
1677 * the next patch is to look at the line counts..
1679 static int parse_fragment(struct apply_state
*state
,
1682 struct patch
*patch
,
1683 struct fragment
*fragment
)
1686 int len
= linelen(line
, size
), offset
;
1687 unsigned long oldlines
, newlines
;
1688 unsigned long leading
, trailing
;
1690 offset
= parse_fragment_header(line
, len
, fragment
);
1693 if (offset
> 0 && patch
->recount
)
1694 recount_diff(line
+ offset
, size
- offset
, fragment
);
1695 oldlines
= fragment
->oldlines
;
1696 newlines
= fragment
->newlines
;
1700 /* Parse the thing.. */
1704 added
= deleted
= 0;
1707 offset
+= len
, size
-= len
, line
+= len
, state
->linenr
++) {
1708 if (!oldlines
&& !newlines
)
1710 len
= linelen(line
, size
);
1711 if (!len
|| line
[len
-1] != '\n')
1716 case '\n': /* newer GNU diff, an empty context line */
1720 if (!deleted
&& !added
)
1723 check_old_for_crlf(patch
, line
, len
);
1724 if (!state
->apply_in_reverse
&&
1725 state
->ws_error_action
== correct_ws_error
)
1726 check_whitespace(state
, line
, len
, patch
->ws_rule
);
1729 if (!state
->apply_in_reverse
)
1730 check_old_for_crlf(patch
, line
, len
);
1731 if (state
->apply_in_reverse
&&
1732 state
->ws_error_action
!= nowarn_ws_error
)
1733 check_whitespace(state
, line
, len
, patch
->ws_rule
);
1739 if (state
->apply_in_reverse
)
1740 check_old_for_crlf(patch
, line
, len
);
1741 if (!state
->apply_in_reverse
&&
1742 state
->ws_error_action
!= nowarn_ws_error
)
1743 check_whitespace(state
, line
, len
, patch
->ws_rule
);
1750 * We allow "\ No newline at end of file". Depending
1751 * on locale settings when the patch was produced we
1752 * don't know what this line looks like. The only
1753 * thing we do know is that it begins with "\ ".
1754 * Checking for 12 is just for sanity check -- any
1755 * l10n of "\ No newline..." is at least that long.
1758 if (len
< 12 || memcmp(line
, "\\ ", 2))
1763 if (oldlines
|| newlines
)
1765 if (!patch
->recount
&& !deleted
&& !added
)
1768 fragment
->leading
= leading
;
1769 fragment
->trailing
= trailing
;
1772 * If a fragment ends with an incomplete line, we failed to include
1773 * it in the above loop because we hit oldlines == newlines == 0
1776 if (12 < size
&& !memcmp(line
, "\\ ", 2))
1777 offset
+= linelen(line
, size
);
1779 patch
->lines_added
+= added
;
1780 patch
->lines_deleted
+= deleted
;
1782 if (0 < patch
->is_new
&& oldlines
)
1783 return error(_("new file depends on old contents"));
1784 if (0 < patch
->is_delete
&& newlines
)
1785 return error(_("deleted file still has contents"));
1790 * We have seen "diff --git a/... b/..." header (or a traditional patch
1791 * header). Read hunks that belong to this patch into fragments and hang
1792 * them to the given patch structure.
1794 * The (fragment->patch, fragment->size) pair points into the memory given
1795 * by the caller, not a copy, when we return.
1798 * -1 in case of error,
1799 * the number of bytes in the patch otherwise.
1801 static int parse_single_patch(struct apply_state
*state
,
1804 struct patch
*patch
)
1806 unsigned long offset
= 0;
1807 unsigned long oldlines
= 0, newlines
= 0, context
= 0;
1808 struct fragment
**fragp
= &patch
->fragments
;
1810 while (size
> 4 && !memcmp(line
, "@@ -", 4)) {
1811 struct fragment
*fragment
;
1814 CALLOC_ARRAY(fragment
, 1);
1815 fragment
->linenr
= state
->linenr
;
1816 len
= parse_fragment(state
, line
, size
, patch
, fragment
);
1819 return error(_("corrupt patch at line %d"), state
->linenr
);
1821 fragment
->patch
= line
;
1822 fragment
->size
= len
;
1823 oldlines
+= fragment
->oldlines
;
1824 newlines
+= fragment
->newlines
;
1825 context
+= fragment
->leading
+ fragment
->trailing
;
1828 fragp
= &fragment
->next
;
1836 * If something was removed (i.e. we have old-lines) it cannot
1837 * be creation, and if something was added it cannot be
1838 * deletion. However, the reverse is not true; --unified=0
1839 * patches that only add are not necessarily creation even
1840 * though they do not have any old lines, and ones that only
1841 * delete are not necessarily deletion.
1843 * Unfortunately, a real creation/deletion patch do _not_ have
1844 * any context line by definition, so we cannot safely tell it
1845 * apart with --unified=0 insanity. At least if the patch has
1846 * more than one hunk it is not creation or deletion.
1848 if (patch
->is_new
< 0 &&
1849 (oldlines
|| (patch
->fragments
&& patch
->fragments
->next
)))
1851 if (patch
->is_delete
< 0 &&
1852 (newlines
|| (patch
->fragments
&& patch
->fragments
->next
)))
1853 patch
->is_delete
= 0;
1855 if (0 < patch
->is_new
&& oldlines
)
1856 return error(_("new file %s depends on old contents"), patch
->new_name
);
1857 if (0 < patch
->is_delete
&& newlines
)
1858 return error(_("deleted file %s still has contents"), patch
->old_name
);
1859 if (!patch
->is_delete
&& !newlines
&& context
&& state
->apply_verbosity
> verbosity_silent
)
1862 "file %s becomes empty but is not deleted"),
1868 static inline int metadata_changes(struct patch
*patch
)
1870 return patch
->is_rename
> 0 ||
1871 patch
->is_copy
> 0 ||
1872 patch
->is_new
> 0 ||
1874 (patch
->old_mode
&& patch
->new_mode
&&
1875 patch
->old_mode
!= patch
->new_mode
);
1878 static char *inflate_it(const void *data
, unsigned long size
,
1879 unsigned long inflated_size
)
1885 memset(&stream
, 0, sizeof(stream
));
1887 stream
.next_in
= (unsigned char *)data
;
1888 stream
.avail_in
= size
;
1889 stream
.next_out
= out
= xmalloc(inflated_size
);
1890 stream
.avail_out
= inflated_size
;
1891 git_inflate_init(&stream
);
1892 st
= git_inflate(&stream
, Z_FINISH
);
1893 git_inflate_end(&stream
);
1894 if ((st
!= Z_STREAM_END
) || stream
.total_out
!= inflated_size
) {
1902 * Read a binary hunk and return a new fragment; fragment->patch
1903 * points at an allocated memory that the caller must free, so
1904 * it is marked as "->free_patch = 1".
1906 static struct fragment
*parse_binary_hunk(struct apply_state
*state
,
1908 unsigned long *sz_p
,
1913 * Expect a line that begins with binary patch method ("literal"
1914 * or "delta"), followed by the length of data before deflating.
1915 * a sequence of 'length-byte' followed by base-85 encoded data
1916 * should follow, terminated by a newline.
1918 * Each 5-byte sequence of base-85 encodes up to 4 bytes,
1919 * and we would limit the patch line to 66 characters,
1920 * so one line can fit up to 13 groups that would decode
1921 * to 52 bytes max. The length byte 'A'-'Z' corresponds
1922 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
1925 unsigned long size
= *sz_p
;
1926 char *buffer
= *buf_p
;
1928 unsigned long origlen
;
1931 struct fragment
*frag
;
1933 llen
= linelen(buffer
, size
);
1938 if (starts_with(buffer
, "delta ")) {
1939 patch_method
= BINARY_DELTA_DEFLATED
;
1940 origlen
= strtoul(buffer
+ 6, NULL
, 10);
1942 else if (starts_with(buffer
, "literal ")) {
1943 patch_method
= BINARY_LITERAL_DEFLATED
;
1944 origlen
= strtoul(buffer
+ 8, NULL
, 10);
1953 int byte_length
, max_byte_length
, newsize
;
1954 llen
= linelen(buffer
, size
);
1958 /* consume the blank line */
1964 * Minimum line is "A00000\n" which is 7-byte long,
1965 * and the line length must be multiple of 5 plus 2.
1967 if ((llen
< 7) || (llen
-2) % 5)
1969 max_byte_length
= (llen
- 2) / 5 * 4;
1970 byte_length
= *buffer
;
1971 if ('A' <= byte_length
&& byte_length
<= 'Z')
1972 byte_length
= byte_length
- 'A' + 1;
1973 else if ('a' <= byte_length
&& byte_length
<= 'z')
1974 byte_length
= byte_length
- 'a' + 27;
1977 /* if the input length was not multiple of 4, we would
1978 * have filler at the end but the filler should never
1981 if (max_byte_length
< byte_length
||
1982 byte_length
<= max_byte_length
- 4)
1984 newsize
= hunk_size
+ byte_length
;
1985 data
= xrealloc(data
, newsize
);
1986 if (decode_85(data
+ hunk_size
, buffer
+ 1, byte_length
))
1988 hunk_size
= newsize
;
1993 CALLOC_ARRAY(frag
, 1);
1994 frag
->patch
= inflate_it(data
, hunk_size
, origlen
);
1995 frag
->free_patch
= 1;
1999 frag
->size
= origlen
;
2003 frag
->binary_patch_method
= patch_method
;
2009 error(_("corrupt binary patch at line %d: %.*s"),
2010 state
->linenr
-1, llen
-1, buffer
);
2016 * -1 in case of error,
2017 * the length of the parsed binary patch otherwise
2019 static int parse_binary(struct apply_state
*state
,
2022 struct patch
*patch
)
2025 * We have read "GIT binary patch\n"; what follows is a line
2026 * that says the patch method (currently, either "literal" or
2027 * "delta") and the length of data before deflating; a
2028 * sequence of 'length-byte' followed by base-85 encoded data
2031 * When a binary patch is reversible, there is another binary
2032 * hunk in the same format, starting with patch method (either
2033 * "literal" or "delta") with the length of data, and a sequence
2034 * of length-byte + base-85 encoded data, terminated with another
2035 * empty line. This data, when applied to the postimage, produces
2038 struct fragment
*forward
;
2039 struct fragment
*reverse
;
2043 forward
= parse_binary_hunk(state
, &buffer
, &size
, &status
, &used
);
2044 if (!forward
&& !status
)
2045 /* there has to be one hunk (forward hunk) */
2046 return error(_("unrecognized binary patch at line %d"), state
->linenr
-1);
2048 /* otherwise we already gave an error message */
2051 reverse
= parse_binary_hunk(state
, &buffer
, &size
, &status
, &used_1
);
2056 * Not having reverse hunk is not an error, but having
2057 * a corrupt reverse hunk is.
2059 free((void*) forward
->patch
);
2063 forward
->next
= reverse
;
2064 patch
->fragments
= forward
;
2065 patch
->is_binary
= 1;
2069 static void prefix_one(struct apply_state
*state
, char **name
)
2071 char *old_name
= *name
;
2074 *name
= prefix_filename(state
->prefix
, *name
);
2078 static void prefix_patch(struct apply_state
*state
, struct patch
*p
)
2080 if (!state
->prefix
|| p
->is_toplevel_relative
)
2082 prefix_one(state
, &p
->new_name
);
2083 prefix_one(state
, &p
->old_name
);
2090 static void add_name_limit(struct apply_state
*state
,
2094 struct string_list_item
*it
;
2096 it
= string_list_append(&state
->limit_by_name
, name
);
2097 it
->util
= exclude
? NULL
: (void *) 1;
2100 static int use_patch(struct apply_state
*state
, struct patch
*p
)
2102 const char *pathname
= p
->new_name
? p
->new_name
: p
->old_name
;
2105 /* Paths outside are not touched regardless of "--include" */
2106 if (state
->prefix
&& *state
->prefix
) {
2108 if (!skip_prefix(pathname
, state
->prefix
, &rest
) || !*rest
)
2112 /* See if it matches any of exclude/include rule */
2113 for (i
= 0; i
< state
->limit_by_name
.nr
; i
++) {
2114 struct string_list_item
*it
= &state
->limit_by_name
.items
[i
];
2115 if (!wildmatch(it
->string
, pathname
, 0))
2116 return (it
->util
!= NULL
);
2120 * If we had any include, a path that does not match any rule is
2121 * not used. Otherwise, we saw bunch of exclude rules (or none)
2122 * and such a path is used.
2124 return !state
->has_include
;
2128 * Read the patch text in "buffer" that extends for "size" bytes; stop
2129 * reading after seeing a single patch (i.e. changes to a single file).
2130 * Create fragments (i.e. patch hunks) and hang them to the given patch.
2133 * -1 if no header was found or parse_binary() failed,
2134 * -128 on another error,
2135 * the number of bytes consumed otherwise,
2136 * so that the caller can call us again for the next patch.
2138 static int parse_chunk(struct apply_state
*state
, char *buffer
, unsigned long size
, struct patch
*patch
)
2140 int hdrsize
, patchsize
;
2141 int offset
= find_header(state
, buffer
, size
, &hdrsize
, patch
);
2146 prefix_patch(state
, patch
);
2148 if (!use_patch(state
, patch
))
2150 else if (patch
->new_name
)
2151 patch
->ws_rule
= whitespace_rule(state
->repo
->index
,
2154 patch
->ws_rule
= whitespace_rule(state
->repo
->index
,
2157 patchsize
= parse_single_patch(state
,
2158 buffer
+ offset
+ hdrsize
,
2159 size
- offset
- hdrsize
,
2166 static const char git_binary
[] = "GIT binary patch\n";
2167 int hd
= hdrsize
+ offset
;
2168 unsigned long llen
= linelen(buffer
+ hd
, size
- hd
);
2170 if (llen
== sizeof(git_binary
) - 1 &&
2171 !memcmp(git_binary
, buffer
+ hd
, llen
)) {
2174 used
= parse_binary(state
, buffer
+ hd
+ llen
,
2175 size
- hd
- llen
, patch
);
2179 patchsize
= used
+ llen
;
2183 else if (!memcmp(" differ\n", buffer
+ hd
+ llen
- 8, 8)) {
2184 static const char *binhdr
[] = {
2190 for (i
= 0; binhdr
[i
]; i
++) {
2191 int len
= strlen(binhdr
[i
]);
2192 if (len
< size
- hd
&&
2193 !memcmp(binhdr
[i
], buffer
+ hd
, len
)) {
2195 patch
->is_binary
= 1;
2202 /* Empty patch cannot be applied if it is a text patch
2203 * without metadata change. A binary patch appears
2206 if ((state
->apply
|| state
->check
) &&
2207 (!patch
->is_binary
&& !metadata_changes(patch
))) {
2208 error(_("patch with only garbage at line %d"), state
->linenr
);
2213 return offset
+ hdrsize
+ patchsize
;
2216 static void reverse_patches(struct patch
*p
)
2218 for (; p
; p
= p
->next
) {
2219 struct fragment
*frag
= p
->fragments
;
2221 SWAP(p
->new_name
, p
->old_name
);
2223 SWAP(p
->new_mode
, p
->old_mode
);
2224 SWAP(p
->is_new
, p
->is_delete
);
2225 SWAP(p
->lines_added
, p
->lines_deleted
);
2226 SWAP(p
->old_oid_prefix
, p
->new_oid_prefix
);
2228 for (; frag
; frag
= frag
->next
) {
2229 SWAP(frag
->newpos
, frag
->oldpos
);
2230 SWAP(frag
->newlines
, frag
->oldlines
);
2235 static const char pluses
[] =
2236 "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
2237 static const char minuses
[]=
2238 "----------------------------------------------------------------------";
2240 static void show_stats(struct apply_state
*state
, struct patch
*patch
)
2242 struct strbuf qname
= STRBUF_INIT
;
2243 char *cp
= patch
->new_name
? patch
->new_name
: patch
->old_name
;
2246 quote_c_style(cp
, &qname
, NULL
, 0);
2249 * "scale" the filename
2251 max
= state
->max_len
;
2255 if (qname
.len
> max
) {
2256 cp
= strchr(qname
.buf
+ qname
.len
+ 3 - max
, '/');
2258 cp
= qname
.buf
+ qname
.len
+ 3 - max
;
2259 strbuf_splice(&qname
, 0, cp
- qname
.buf
, "...", 3);
2262 if (patch
->is_binary
) {
2263 printf(" %-*s | Bin\n", max
, qname
.buf
);
2264 strbuf_release(&qname
);
2268 printf(" %-*s |", max
, qname
.buf
);
2269 strbuf_release(&qname
);
2272 * scale the add/delete
2274 max
= max
+ state
->max_change
> 70 ? 70 - max
: state
->max_change
;
2275 add
= patch
->lines_added
;
2276 del
= patch
->lines_deleted
;
2278 if (state
->max_change
> 0) {
2279 int total
= ((add
+ del
) * max
+ state
->max_change
/ 2) / state
->max_change
;
2280 add
= (add
* max
+ state
->max_change
/ 2) / state
->max_change
;
2283 printf("%5d %.*s%.*s\n", patch
->lines_added
+ patch
->lines_deleted
,
2284 add
, pluses
, del
, minuses
);
2287 static int read_old_data(struct stat
*st
, struct patch
*patch
,
2288 const char *path
, struct strbuf
*buf
)
2290 int conv_flags
= patch
->crlf_in_old
?
2291 CONV_EOL_KEEP_CRLF
: CONV_EOL_RENORMALIZE
;
2292 switch (st
->st_mode
& S_IFMT
) {
2294 if (strbuf_readlink(buf
, path
, st
->st_size
) < 0)
2295 return error(_("unable to read symlink %s"), path
);
2298 if (strbuf_read_file(buf
, path
, st
->st_size
) != st
->st_size
)
2299 return error(_("unable to open or read %s"), path
);
2301 * "git apply" without "--index/--cached" should never look
2302 * at the index; the target file may not have been added to
2303 * the index yet, and we may not even be in any Git repository.
2304 * Pass NULL to convert_to_git() to stress this; the function
2305 * should never look at the index when explicit crlf option
2308 convert_to_git(NULL
, path
, buf
->buf
, buf
->len
, buf
, conv_flags
);
2316 * Update the preimage, and the common lines in postimage,
2317 * from buffer buf of length len. If postlen is 0 the postimage
2318 * is updated in place, otherwise it's updated on a new buffer
2322 static void update_pre_post_images(struct image
*preimage
,
2323 struct image
*postimage
,
2325 size_t len
, size_t postlen
)
2327 int i
, ctx
, reduced
;
2328 char *new_buf
, *old_buf
, *fixed
;
2329 struct image fixed_preimage
;
2332 * Update the preimage with whitespace fixes. Note that we
2333 * are not losing preimage->buf -- apply_one_fragment() will
2336 prepare_image(&fixed_preimage
, buf
, len
, 1);
2338 ? fixed_preimage
.nr
== preimage
->nr
2339 : fixed_preimage
.nr
<= preimage
->nr
);
2340 for (i
= 0; i
< fixed_preimage
.nr
; i
++)
2341 fixed_preimage
.line
[i
].flag
= preimage
->line
[i
].flag
;
2342 free(preimage
->line_allocated
);
2343 *preimage
= fixed_preimage
;
2346 * Adjust the common context lines in postimage. This can be
2347 * done in-place when we are shrinking it with whitespace
2348 * fixing, but needs a new buffer when ignoring whitespace or
2349 * expanding leading tabs to spaces.
2351 * We trust the caller to tell us if the update can be done
2352 * in place (postlen==0) or not.
2354 old_buf
= postimage
->buf
;
2356 new_buf
= postimage
->buf
= xmalloc(postlen
);
2359 fixed
= preimage
->buf
;
2361 for (i
= reduced
= ctx
= 0; i
< postimage
->nr
; i
++) {
2362 size_t l_len
= postimage
->line
[i
].len
;
2363 if (!(postimage
->line
[i
].flag
& LINE_COMMON
)) {
2364 /* an added line -- no counterparts in preimage */
2365 memmove(new_buf
, old_buf
, l_len
);
2371 /* a common context -- skip it in the original postimage */
2374 /* and find the corresponding one in the fixed preimage */
2375 while (ctx
< preimage
->nr
&&
2376 !(preimage
->line
[ctx
].flag
& LINE_COMMON
)) {
2377 fixed
+= preimage
->line
[ctx
].len
;
2382 * preimage is expected to run out, if the caller
2383 * fixed addition of trailing blank lines.
2385 if (preimage
->nr
<= ctx
) {
2390 /* and copy it in, while fixing the line length */
2391 l_len
= preimage
->line
[ctx
].len
;
2392 memcpy(new_buf
, fixed
, l_len
);
2395 postimage
->line
[i
].len
= l_len
;
2400 ? postlen
< new_buf
- postimage
->buf
2401 : postimage
->len
< new_buf
- postimage
->buf
)
2402 BUG("caller miscounted postlen: asked %d, orig = %d, used = %d",
2403 (int)postlen
, (int) postimage
->len
, (int)(new_buf
- postimage
->buf
));
2405 /* Fix the length of the whole thing */
2406 postimage
->len
= new_buf
- postimage
->buf
;
2407 postimage
->nr
-= reduced
;
2410 static int line_by_line_fuzzy_match(struct image
*img
,
2411 struct image
*preimage
,
2412 struct image
*postimage
,
2413 unsigned long current
,
2420 size_t postlen
= postimage
->len
;
2425 struct strbuf fixed
;
2429 for (i
= 0; i
< preimage_limit
; i
++) {
2430 size_t prelen
= preimage
->line
[i
].len
;
2431 size_t imglen
= img
->line
[current_lno
+i
].len
;
2433 if (!fuzzy_matchlines(img
->buf
+ current
+ imgoff
, imglen
,
2434 preimage
->buf
+ preoff
, prelen
))
2436 if (preimage
->line
[i
].flag
& LINE_COMMON
)
2437 postlen
+= imglen
- prelen
;
2443 * Ok, the preimage matches with whitespace fuzz.
2445 * imgoff now holds the true length of the target that
2446 * matches the preimage before the end of the file.
2448 * Count the number of characters in the preimage that fall
2449 * beyond the end of the file and make sure that all of them
2450 * are whitespace characters. (This can only happen if
2451 * we are removing blank lines at the end of the file.)
2453 buf
= preimage_eof
= preimage
->buf
+ preoff
;
2454 for ( ; i
< preimage
->nr
; i
++)
2455 preoff
+= preimage
->line
[i
].len
;
2456 preimage_end
= preimage
->buf
+ preoff
;
2457 for ( ; buf
< preimage_end
; buf
++)
2462 * Update the preimage and the common postimage context
2463 * lines to use the same whitespace as the target.
2464 * If whitespace is missing in the target (i.e.
2465 * if the preimage extends beyond the end of the file),
2466 * use the whitespace from the preimage.
2468 extra_chars
= preimage_end
- preimage_eof
;
2469 strbuf_init(&fixed
, imgoff
+ extra_chars
);
2470 strbuf_add(&fixed
, img
->buf
+ current
, imgoff
);
2471 strbuf_add(&fixed
, preimage_eof
, extra_chars
);
2472 fixed_buf
= strbuf_detach(&fixed
, &fixed_len
);
2473 update_pre_post_images(preimage
, postimage
,
2474 fixed_buf
, fixed_len
, postlen
);
2478 static int match_fragment(struct apply_state
*state
,
2480 struct image
*preimage
,
2481 struct image
*postimage
,
2482 unsigned long current
,
2485 int match_beginning
, int match_end
)
2488 char *fixed_buf
, *buf
, *orig
, *target
;
2489 struct strbuf fixed
;
2490 size_t fixed_len
, postlen
;
2493 if (preimage
->nr
+ current_lno
<= img
->nr
) {
2495 * The hunk falls within the boundaries of img.
2497 preimage_limit
= preimage
->nr
;
2498 if (match_end
&& (preimage
->nr
+ current_lno
!= img
->nr
))
2500 } else if (state
->ws_error_action
== correct_ws_error
&&
2501 (ws_rule
& WS_BLANK_AT_EOF
)) {
2503 * This hunk extends beyond the end of img, and we are
2504 * removing blank lines at the end of the file. This
2505 * many lines from the beginning of the preimage must
2506 * match with img, and the remainder of the preimage
2509 preimage_limit
= img
->nr
- current_lno
;
2512 * The hunk extends beyond the end of the img and
2513 * we are not removing blanks at the end, so we
2514 * should reject the hunk at this position.
2519 if (match_beginning
&& current_lno
)
2522 /* Quick hash check */
2523 for (i
= 0; i
< preimage_limit
; i
++)
2524 if ((img
->line
[current_lno
+ i
].flag
& LINE_PATCHED
) ||
2525 (preimage
->line
[i
].hash
!= img
->line
[current_lno
+ i
].hash
))
2528 if (preimage_limit
== preimage
->nr
) {
2530 * Do we have an exact match? If we were told to match
2531 * at the end, size must be exactly at current+fragsize,
2532 * otherwise current+fragsize must be still within the preimage,
2533 * and either case, the old piece should match the preimage
2537 ? (current
+ preimage
->len
== img
->len
)
2538 : (current
+ preimage
->len
<= img
->len
)) &&
2539 !memcmp(img
->buf
+ current
, preimage
->buf
, preimage
->len
))
2543 * The preimage extends beyond the end of img, so
2544 * there cannot be an exact match.
2546 * There must be one non-blank context line that match
2547 * a line before the end of img.
2551 buf
= preimage
->buf
;
2553 for (i
= 0; i
< preimage_limit
; i
++)
2554 buf_end
+= preimage
->line
[i
].len
;
2556 for ( ; buf
< buf_end
; buf
++)
2564 * No exact match. If we are ignoring whitespace, run a line-by-line
2565 * fuzzy matching. We collect all the line length information because
2566 * we need it to adjust whitespace if we match.
2568 if (state
->ws_ignore_action
== ignore_ws_change
)
2569 return line_by_line_fuzzy_match(img
, preimage
, postimage
,
2570 current
, current_lno
, preimage_limit
);
2572 if (state
->ws_error_action
!= correct_ws_error
)
2576 * The hunk does not apply byte-by-byte, but the hash says
2577 * it might with whitespace fuzz. We weren't asked to
2578 * ignore whitespace, we were asked to correct whitespace
2579 * errors, so let's try matching after whitespace correction.
2581 * While checking the preimage against the target, whitespace
2582 * errors in both fixed, we count how large the corresponding
2583 * postimage needs to be. The postimage prepared by
2584 * apply_one_fragment() has whitespace errors fixed on added
2585 * lines already, but the common lines were propagated as-is,
2586 * which may become longer when their whitespace errors are
2590 /* First count added lines in postimage */
2592 for (i
= 0; i
< postimage
->nr
; i
++) {
2593 if (!(postimage
->line
[i
].flag
& LINE_COMMON
))
2594 postlen
+= postimage
->line
[i
].len
;
2598 * The preimage may extend beyond the end of the file,
2599 * but in this loop we will only handle the part of the
2600 * preimage that falls within the file.
2602 strbuf_init(&fixed
, preimage
->len
+ 1);
2603 orig
= preimage
->buf
;
2604 target
= img
->buf
+ current
;
2605 for (i
= 0; i
< preimage_limit
; i
++) {
2606 size_t oldlen
= preimage
->line
[i
].len
;
2607 size_t tgtlen
= img
->line
[current_lno
+ i
].len
;
2608 size_t fixstart
= fixed
.len
;
2609 struct strbuf tgtfix
;
2612 /* Try fixing the line in the preimage */
2613 ws_fix_copy(&fixed
, orig
, oldlen
, ws_rule
, NULL
);
2615 /* Try fixing the line in the target */
2616 strbuf_init(&tgtfix
, tgtlen
);
2617 ws_fix_copy(&tgtfix
, target
, tgtlen
, ws_rule
, NULL
);
2620 * If they match, either the preimage was based on
2621 * a version before our tree fixed whitespace breakage,
2622 * or we are lacking a whitespace-fix patch the tree
2623 * the preimage was based on already had (i.e. target
2624 * has whitespace breakage, the preimage doesn't).
2625 * In either case, we are fixing the whitespace breakages
2626 * so we might as well take the fix together with their
2629 match
= (tgtfix
.len
== fixed
.len
- fixstart
&&
2630 !memcmp(tgtfix
.buf
, fixed
.buf
+ fixstart
,
2631 fixed
.len
- fixstart
));
2633 /* Add the length if this is common with the postimage */
2634 if (preimage
->line
[i
].flag
& LINE_COMMON
)
2635 postlen
+= tgtfix
.len
;
2637 strbuf_release(&tgtfix
);
2647 * Now handle the lines in the preimage that falls beyond the
2648 * end of the file (if any). They will only match if they are
2649 * empty or only contain whitespace (if WS_BLANK_AT_EOL is
2652 for ( ; i
< preimage
->nr
; i
++) {
2653 size_t fixstart
= fixed
.len
; /* start of the fixed preimage */
2654 size_t oldlen
= preimage
->line
[i
].len
;
2657 /* Try fixing the line in the preimage */
2658 ws_fix_copy(&fixed
, orig
, oldlen
, ws_rule
, NULL
);
2660 for (j
= fixstart
; j
< fixed
.len
; j
++)
2661 if (!isspace(fixed
.buf
[j
]))
2668 * Yes, the preimage is based on an older version that still
2669 * has whitespace breakages unfixed, and fixing them makes the
2670 * hunk match. Update the context lines in the postimage.
2672 fixed_buf
= strbuf_detach(&fixed
, &fixed_len
);
2673 if (postlen
< postimage
->len
)
2675 update_pre_post_images(preimage
, postimage
,
2676 fixed_buf
, fixed_len
, postlen
);
2680 strbuf_release(&fixed
);
2684 static int find_pos(struct apply_state
*state
,
2686 struct image
*preimage
,
2687 struct image
*postimage
,
2690 int match_beginning
, int match_end
)
2693 unsigned long backwards
, forwards
, current
;
2694 int backwards_lno
, forwards_lno
, current_lno
;
2697 * When running with --allow-overlap, it is possible that a hunk is
2698 * seen that pretends to start at the beginning (but no longer does),
2699 * and that *still* needs to match the end. So trust `match_end` more
2700 * than `match_beginning`.
2702 if (state
->allow_overlap
&& match_beginning
&& match_end
&&
2703 img
->nr
- preimage
->nr
!= 0)
2704 match_beginning
= 0;
2707 * If match_beginning or match_end is specified, there is no
2708 * point starting from a wrong line that will never match and
2709 * wander around and wait for a match at the specified end.
2711 if (match_beginning
)
2714 line
= img
->nr
- preimage
->nr
;
2717 * Because the comparison is unsigned, the following test
2718 * will also take care of a negative line number that can
2719 * result when match_end and preimage is larger than the target.
2721 if ((size_t) line
> img
->nr
)
2725 for (i
= 0; i
< line
; i
++)
2726 current
+= img
->line
[i
].len
;
2729 * There's probably some smart way to do this, but I'll leave
2730 * that to the smart and beautiful people. I'm simple and stupid.
2732 backwards
= current
;
2733 backwards_lno
= line
;
2735 forwards_lno
= line
;
2738 for (i
= 0; ; i
++) {
2739 if (match_fragment(state
, img
, preimage
, postimage
,
2740 current
, current_lno
, ws_rule
,
2741 match_beginning
, match_end
))
2745 if (backwards_lno
== 0 && forwards_lno
== img
->nr
)
2749 if (backwards_lno
== 0) {
2754 backwards
-= img
->line
[backwards_lno
].len
;
2755 current
= backwards
;
2756 current_lno
= backwards_lno
;
2758 if (forwards_lno
== img
->nr
) {
2762 forwards
+= img
->line
[forwards_lno
].len
;
2765 current_lno
= forwards_lno
;
2772 static void remove_first_line(struct image
*img
)
2774 img
->buf
+= img
->line
[0].len
;
2775 img
->len
-= img
->line
[0].len
;
2780 static void remove_last_line(struct image
*img
)
2782 img
->len
-= img
->line
[--img
->nr
].len
;
2786 * The change from "preimage" and "postimage" has been found to
2787 * apply at applied_pos (counts in line numbers) in "img".
2788 * Update "img" to remove "preimage" and replace it with "postimage".
2790 static void update_image(struct apply_state
*state
,
2793 struct image
*preimage
,
2794 struct image
*postimage
)
2797 * remove the copy of preimage at offset in img
2798 * and replace it with postimage
2801 size_t remove_count
, insert_count
, applied_at
= 0;
2806 * If we are removing blank lines at the end of img,
2807 * the preimage may extend beyond the end.
2808 * If that is the case, we must be careful only to
2809 * remove the part of the preimage that falls within
2810 * the boundaries of img. Initialize preimage_limit
2811 * to the number of lines in the preimage that falls
2812 * within the boundaries.
2814 preimage_limit
= preimage
->nr
;
2815 if (preimage_limit
> img
->nr
- applied_pos
)
2816 preimage_limit
= img
->nr
- applied_pos
;
2818 for (i
= 0; i
< applied_pos
; i
++)
2819 applied_at
+= img
->line
[i
].len
;
2822 for (i
= 0; i
< preimage_limit
; i
++)
2823 remove_count
+= img
->line
[applied_pos
+ i
].len
;
2824 insert_count
= postimage
->len
;
2826 /* Adjust the contents */
2827 result
= xmalloc(st_add3(st_sub(img
->len
, remove_count
), insert_count
, 1));
2828 memcpy(result
, img
->buf
, applied_at
);
2829 memcpy(result
+ applied_at
, postimage
->buf
, postimage
->len
);
2830 memcpy(result
+ applied_at
+ postimage
->len
,
2831 img
->buf
+ (applied_at
+ remove_count
),
2832 img
->len
- (applied_at
+ remove_count
));
2835 img
->len
+= insert_count
- remove_count
;
2836 result
[img
->len
] = '\0';
2838 /* Adjust the line table */
2839 nr
= img
->nr
+ postimage
->nr
- preimage_limit
;
2840 if (preimage_limit
< postimage
->nr
) {
2842 * NOTE: this knows that we never call remove_first_line()
2843 * on anything other than pre/post image.
2845 REALLOC_ARRAY(img
->line
, nr
);
2846 img
->line_allocated
= img
->line
;
2848 if (preimage_limit
!= postimage
->nr
)
2849 MOVE_ARRAY(img
->line
+ applied_pos
+ postimage
->nr
,
2850 img
->line
+ applied_pos
+ preimage_limit
,
2851 img
->nr
- (applied_pos
+ preimage_limit
));
2852 COPY_ARRAY(img
->line
+ applied_pos
, postimage
->line
, postimage
->nr
);
2853 if (!state
->allow_overlap
)
2854 for (i
= 0; i
< postimage
->nr
; i
++)
2855 img
->line
[applied_pos
+ i
].flag
|= LINE_PATCHED
;
2860 * Use the patch-hunk text in "frag" to prepare two images (preimage and
2861 * postimage) for the hunk. Find lines that match "preimage" in "img" and
2862 * replace the part of "img" with "postimage" text.
2864 static int apply_one_fragment(struct apply_state
*state
,
2865 struct image
*img
, struct fragment
*frag
,
2866 int inaccurate_eof
, unsigned ws_rule
,
2869 int match_beginning
, match_end
;
2870 const char *patch
= frag
->patch
;
2871 int size
= frag
->size
;
2872 char *old
, *oldlines
;
2873 struct strbuf newlines
;
2874 int new_blank_lines_at_end
= 0;
2875 int found_new_blank_lines_at_end
= 0;
2876 int hunk_linenr
= frag
->linenr
;
2877 unsigned long leading
, trailing
;
2878 int pos
, applied_pos
;
2879 struct image preimage
;
2880 struct image postimage
;
2882 memset(&preimage
, 0, sizeof(preimage
));
2883 memset(&postimage
, 0, sizeof(postimage
));
2884 oldlines
= xmalloc(size
);
2885 strbuf_init(&newlines
, size
);
2890 int len
= linelen(patch
, size
);
2892 int added_blank_line
= 0;
2893 int is_blank_context
= 0;
2900 * "plen" is how much of the line we should use for
2901 * the actual patch data. Normally we just remove the
2902 * first character on the line, but if the line is
2903 * followed by "\ No newline", then we also remove the
2904 * last one (which is the newline, of course).
2907 if (len
< size
&& patch
[len
] == '\\')
2910 if (state
->apply_in_reverse
) {
2913 else if (first
== '+')
2919 /* Newer GNU diff, empty context line */
2921 /* ... followed by '\No newline'; nothing */
2924 strbuf_addch(&newlines
, '\n');
2925 add_line_info(&preimage
, "\n", 1, LINE_COMMON
);
2926 add_line_info(&postimage
, "\n", 1, LINE_COMMON
);
2927 is_blank_context
= 1;
2930 if (plen
&& (ws_rule
& WS_BLANK_AT_EOF
) &&
2931 ws_blank_line(patch
+ 1, plen
))
2932 is_blank_context
= 1;
2935 memcpy(old
, patch
+ 1, plen
);
2936 add_line_info(&preimage
, old
, plen
,
2937 (first
== ' ' ? LINE_COMMON
: 0));
2943 /* --no-add does not add new lines */
2944 if (first
== '+' && state
->no_add
)
2947 start
= newlines
.len
;
2949 !state
->whitespace_error
||
2950 state
->ws_error_action
!= correct_ws_error
) {
2951 strbuf_add(&newlines
, patch
+ 1, plen
);
2954 ws_fix_copy(&newlines
, patch
+ 1, plen
, ws_rule
, &state
->applied_after_fixing_ws
);
2956 add_line_info(&postimage
, newlines
.buf
+ start
, newlines
.len
- start
,
2957 (first
== '+' ? 0 : LINE_COMMON
));
2959 (ws_rule
& WS_BLANK_AT_EOF
) &&
2960 ws_blank_line(patch
+ 1, plen
))
2961 added_blank_line
= 1;
2963 case '@': case '\\':
2964 /* Ignore it, we already handled it */
2967 if (state
->apply_verbosity
> verbosity_normal
)
2968 error(_("invalid start of line: '%c'"), first
);
2972 if (added_blank_line
) {
2973 if (!new_blank_lines_at_end
)
2974 found_new_blank_lines_at_end
= hunk_linenr
;
2975 new_blank_lines_at_end
++;
2977 else if (is_blank_context
)
2980 new_blank_lines_at_end
= 0;
2985 if (inaccurate_eof
&&
2986 old
> oldlines
&& old
[-1] == '\n' &&
2987 newlines
.len
> 0 && newlines
.buf
[newlines
.len
- 1] == '\n') {
2989 strbuf_setlen(&newlines
, newlines
.len
- 1);
2990 preimage
.line_allocated
[preimage
.nr
- 1].len
--;
2991 postimage
.line_allocated
[postimage
.nr
- 1].len
--;
2994 leading
= frag
->leading
;
2995 trailing
= frag
->trailing
;
2998 * A hunk to change lines at the beginning would begin with
3000 * but we need to be careful. -U0 that inserts before the second
3001 * line also has this pattern.
3003 * And a hunk to add to an empty file would begin with
3006 * In other words, a hunk that is (frag->oldpos <= 1) with or
3007 * without leading context must match at the beginning.
3009 match_beginning
= (!frag
->oldpos
||
3010 (frag
->oldpos
== 1 && !state
->unidiff_zero
));
3013 * A hunk without trailing lines must match at the end.
3014 * However, we simply cannot tell if a hunk must match end
3015 * from the lack of trailing lines if the patch was generated
3016 * with unidiff without any context.
3018 match_end
= !state
->unidiff_zero
&& !trailing
;
3020 pos
= frag
->newpos
? (frag
->newpos
- 1) : 0;
3021 preimage
.buf
= oldlines
;
3022 preimage
.len
= old
- oldlines
;
3023 postimage
.buf
= newlines
.buf
;
3024 postimage
.len
= newlines
.len
;
3025 preimage
.line
= preimage
.line_allocated
;
3026 postimage
.line
= postimage
.line_allocated
;
3030 applied_pos
= find_pos(state
, img
, &preimage
, &postimage
, pos
,
3031 ws_rule
, match_beginning
, match_end
);
3033 if (applied_pos
>= 0)
3036 /* Am I at my context limits? */
3037 if ((leading
<= state
->p_context
) && (trailing
<= state
->p_context
))
3039 if (match_beginning
|| match_end
) {
3040 match_beginning
= match_end
= 0;
3045 * Reduce the number of context lines; reduce both
3046 * leading and trailing if they are equal otherwise
3047 * just reduce the larger context.
3049 if (leading
>= trailing
) {
3050 remove_first_line(&preimage
);
3051 remove_first_line(&postimage
);
3055 if (trailing
> leading
) {
3056 remove_last_line(&preimage
);
3057 remove_last_line(&postimage
);
3062 if (applied_pos
>= 0) {
3063 if (new_blank_lines_at_end
&&
3064 preimage
.nr
+ applied_pos
>= img
->nr
&&
3065 (ws_rule
& WS_BLANK_AT_EOF
) &&
3066 state
->ws_error_action
!= nowarn_ws_error
) {
3067 record_ws_error(state
, WS_BLANK_AT_EOF
, "+", 1,
3068 found_new_blank_lines_at_end
);
3069 if (state
->ws_error_action
== correct_ws_error
) {
3070 while (new_blank_lines_at_end
--)
3071 remove_last_line(&postimage
);
3074 * We would want to prevent write_out_results()
3075 * from taking place in apply_patch() that follows
3076 * the callchain led us here, which is:
3077 * apply_patch->check_patch_list->check_patch->
3078 * apply_data->apply_fragments->apply_one_fragment
3080 if (state
->ws_error_action
== die_on_ws_error
)
3084 if (state
->apply_verbosity
> verbosity_normal
&& applied_pos
!= pos
) {
3085 int offset
= applied_pos
- pos
;
3086 if (state
->apply_in_reverse
)
3087 offset
= 0 - offset
;
3089 Q_("Hunk #%d succeeded at %d (offset %d line).",
3090 "Hunk #%d succeeded at %d (offset %d lines).",
3092 nth_fragment
, applied_pos
+ 1, offset
);
3096 * Warn if it was necessary to reduce the number
3099 if ((leading
!= frag
->leading
||
3100 trailing
!= frag
->trailing
) && state
->apply_verbosity
> verbosity_silent
)
3101 fprintf_ln(stderr
, _("Context reduced to (%ld/%ld)"
3102 " to apply fragment at %d"),
3103 leading
, trailing
, applied_pos
+1);
3104 update_image(state
, img
, applied_pos
, &preimage
, &postimage
);
3106 if (state
->apply_verbosity
> verbosity_normal
)
3107 error(_("while searching for:\n%.*s"),
3108 (int)(old
- oldlines
), oldlines
);
3113 strbuf_release(&newlines
);
3114 free(preimage
.line_allocated
);
3115 free(postimage
.line_allocated
);
3117 return (applied_pos
< 0);
3120 static int apply_binary_fragment(struct apply_state
*state
,
3122 struct patch
*patch
)
3124 struct fragment
*fragment
= patch
->fragments
;
3129 return error(_("missing binary patch data for '%s'"),
3134 /* Binary patch is irreversible without the optional second hunk */
3135 if (state
->apply_in_reverse
) {
3136 if (!fragment
->next
)
3137 return error(_("cannot reverse-apply a binary patch "
3138 "without the reverse hunk to '%s'"),
3140 ? patch
->new_name
: patch
->old_name
);
3141 fragment
= fragment
->next
;
3143 switch (fragment
->binary_patch_method
) {
3144 case BINARY_DELTA_DEFLATED
:
3145 dst
= patch_delta(img
->buf
, img
->len
, fragment
->patch
,
3146 fragment
->size
, &len
);
3153 case BINARY_LITERAL_DEFLATED
:
3155 img
->len
= fragment
->size
;
3156 img
->buf
= xmemdupz(fragment
->patch
, img
->len
);
3163 * Replace "img" with the result of applying the binary patch.
3164 * The binary patch data itself in patch->fragment is still kept
3165 * but the preimage prepared by the caller in "img" is freed here
3166 * or in the helper function apply_binary_fragment() this calls.
3168 static int apply_binary(struct apply_state
*state
,
3170 struct patch
*patch
)
3172 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
3173 struct object_id oid
;
3174 const unsigned hexsz
= the_hash_algo
->hexsz
;
3177 * For safety, we require patch index line to contain
3178 * full hex textual object ID for old and new, at least for now.
3180 if (strlen(patch
->old_oid_prefix
) != hexsz
||
3181 strlen(patch
->new_oid_prefix
) != hexsz
||
3182 get_oid_hex(patch
->old_oid_prefix
, &oid
) ||
3183 get_oid_hex(patch
->new_oid_prefix
, &oid
))
3184 return error(_("cannot apply binary patch to '%s' "
3185 "without full index line"), name
);
3187 if (patch
->old_name
) {
3189 * See if the old one matches what the patch
3192 hash_object_file(the_hash_algo
, img
->buf
, img
->len
, OBJ_BLOB
,
3194 if (strcmp(oid_to_hex(&oid
), patch
->old_oid_prefix
))
3195 return error(_("the patch applies to '%s' (%s), "
3196 "which does not match the "
3197 "current contents."),
3198 name
, oid_to_hex(&oid
));
3201 /* Otherwise, the old one must be empty. */
3203 return error(_("the patch applies to an empty "
3204 "'%s' but it is not empty"), name
);
3207 get_oid_hex(patch
->new_oid_prefix
, &oid
);
3208 if (is_null_oid(&oid
)) {
3210 return 0; /* deletion patch */
3213 if (has_object(the_repository
, &oid
, 0)) {
3214 /* We already have the postimage */
3215 enum object_type type
;
3219 result
= repo_read_object_file(the_repository
, &oid
, &type
,
3222 return error(_("the necessary postimage %s for "
3223 "'%s' cannot be read"),
3224 patch
->new_oid_prefix
, name
);
3230 * We have verified buf matches the preimage;
3231 * apply the patch data to it, which is stored
3232 * in the patch->fragments->{patch,size}.
3234 if (apply_binary_fragment(state
, img
, patch
))
3235 return error(_("binary patch does not apply to '%s'"),
3238 /* verify that the result matches */
3239 hash_object_file(the_hash_algo
, img
->buf
, img
->len
, OBJ_BLOB
,
3241 if (strcmp(oid_to_hex(&oid
), patch
->new_oid_prefix
))
3242 return error(_("binary patch to '%s' creates incorrect result (expecting %s, got %s)"),
3243 name
, patch
->new_oid_prefix
, oid_to_hex(&oid
));
3249 static int apply_fragments(struct apply_state
*state
, struct image
*img
, struct patch
*patch
)
3251 struct fragment
*frag
= patch
->fragments
;
3252 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
3253 unsigned ws_rule
= patch
->ws_rule
;
3254 unsigned inaccurate_eof
= patch
->inaccurate_eof
;
3257 if (patch
->is_binary
)
3258 return apply_binary(state
, img
, patch
);
3262 if (apply_one_fragment(state
, img
, frag
, inaccurate_eof
, ws_rule
, nth
)) {
3263 error(_("patch failed: %s:%ld"), name
, frag
->oldpos
);
3264 if (!state
->apply_with_reject
)
3273 static int read_blob_object(struct strbuf
*buf
, const struct object_id
*oid
, unsigned mode
)
3275 if (S_ISGITLINK(mode
)) {
3276 strbuf_grow(buf
, 100);
3277 strbuf_addf(buf
, "Subproject commit %s\n", oid_to_hex(oid
));
3279 enum object_type type
;
3283 result
= repo_read_object_file(the_repository
, oid
, &type
,
3287 /* XXX read_sha1_file NUL-terminates */
3288 strbuf_attach(buf
, result
, sz
, sz
+ 1);
3293 static int read_file_or_gitlink(const struct cache_entry
*ce
, struct strbuf
*buf
)
3297 return read_blob_object(buf
, &ce
->oid
, ce
->ce_mode
);
3300 static struct patch
*in_fn_table(struct apply_state
*state
, const char *name
)
3302 struct string_list_item
*item
;
3307 item
= string_list_lookup(&state
->fn_table
, name
);
3309 return (struct patch
*)item
->util
;
3315 * item->util in the filename table records the status of the path.
3316 * Usually it points at a patch (whose result records the contents
3317 * of it after applying it), but it could be PATH_WAS_DELETED for a
3318 * path that a previously applied patch has already removed, or
3319 * PATH_TO_BE_DELETED for a path that a later patch would remove.
3321 * The latter is needed to deal with a case where two paths A and B
3322 * are swapped by first renaming A to B and then renaming B to A;
3323 * moving A to B should not be prevented due to presence of B as we
3324 * will remove it in a later patch.
3326 #define PATH_TO_BE_DELETED ((struct patch *) -2)
3327 #define PATH_WAS_DELETED ((struct patch *) -1)
3329 static int to_be_deleted(struct patch
*patch
)
3331 return patch
== PATH_TO_BE_DELETED
;
3334 static int was_deleted(struct patch
*patch
)
3336 return patch
== PATH_WAS_DELETED
;
3339 static void add_to_fn_table(struct apply_state
*state
, struct patch
*patch
)
3341 struct string_list_item
*item
;
3344 * Always add new_name unless patch is a deletion
3345 * This should cover the cases for normal diffs,
3346 * file creations and copies
3348 if (patch
->new_name
) {
3349 item
= string_list_insert(&state
->fn_table
, patch
->new_name
);
3354 * store a failure on rename/deletion cases because
3355 * later chunks shouldn't patch old names
3357 if ((patch
->new_name
== NULL
) || (patch
->is_rename
)) {
3358 item
= string_list_insert(&state
->fn_table
, patch
->old_name
);
3359 item
->util
= PATH_WAS_DELETED
;
3363 static void prepare_fn_table(struct apply_state
*state
, struct patch
*patch
)
3366 * store information about incoming file deletion
3369 if ((patch
->new_name
== NULL
) || (patch
->is_rename
)) {
3370 struct string_list_item
*item
;
3371 item
= string_list_insert(&state
->fn_table
, patch
->old_name
);
3372 item
->util
= PATH_TO_BE_DELETED
;
3374 patch
= patch
->next
;
3378 static int checkout_target(struct index_state
*istate
,
3379 struct cache_entry
*ce
, struct stat
*st
)
3381 struct checkout costate
= CHECKOUT_INIT
;
3383 costate
.refresh_cache
= 1;
3384 costate
.istate
= istate
;
3385 if (checkout_entry(ce
, &costate
, NULL
, NULL
) ||
3386 lstat(ce
->name
, st
))
3387 return error(_("cannot checkout %s"), ce
->name
);
3391 static struct patch
*previous_patch(struct apply_state
*state
,
3392 struct patch
*patch
,
3395 struct patch
*previous
;
3398 if (patch
->is_copy
|| patch
->is_rename
)
3399 return NULL
; /* "git" patches do not depend on the order */
3401 previous
= in_fn_table(state
, patch
->old_name
);
3405 if (to_be_deleted(previous
))
3406 return NULL
; /* the deletion hasn't happened yet */
3408 if (was_deleted(previous
))
3414 static int verify_index_match(struct apply_state
*state
,
3415 const struct cache_entry
*ce
,
3418 if (S_ISGITLINK(ce
->ce_mode
)) {
3419 if (!S_ISDIR(st
->st_mode
))
3423 return ie_match_stat(state
->repo
->index
, ce
, st
,
3424 CE_MATCH_IGNORE_VALID
| CE_MATCH_IGNORE_SKIP_WORKTREE
);
3427 #define SUBMODULE_PATCH_WITHOUT_INDEX 1
3429 static int load_patch_target(struct apply_state
*state
,
3431 const struct cache_entry
*ce
,
3433 struct patch
*patch
,
3435 unsigned expected_mode
)
3437 if (state
->cached
|| state
->check_index
) {
3438 if (read_file_or_gitlink(ce
, buf
))
3439 return error(_("failed to read %s"), name
);
3441 if (S_ISGITLINK(expected_mode
)) {
3443 return read_file_or_gitlink(ce
, buf
);
3445 return SUBMODULE_PATCH_WITHOUT_INDEX
;
3446 } else if (has_symlink_leading_path(name
, strlen(name
))) {
3447 return error(_("reading from '%s' beyond a symbolic link"), name
);
3449 if (read_old_data(st
, patch
, name
, buf
))
3450 return error(_("failed to read %s"), name
);
3457 * We are about to apply "patch"; populate the "image" with the
3458 * current version we have, from the working tree or from the index,
3459 * depending on the situation e.g. --cached/--index. If we are
3460 * applying a non-git patch that incrementally updates the tree,
3461 * we read from the result of a previous diff.
3463 static int load_preimage(struct apply_state
*state
,
3464 struct image
*image
,
3465 struct patch
*patch
, struct stat
*st
,
3466 const struct cache_entry
*ce
)
3468 struct strbuf buf
= STRBUF_INIT
;
3471 struct patch
*previous
;
3474 previous
= previous_patch(state
, patch
, &status
);
3476 return error(_("path %s has been renamed/deleted"),
3479 /* We have a patched copy in memory; use that. */
3480 strbuf_add(&buf
, previous
->result
, previous
->resultsize
);
3482 status
= load_patch_target(state
, &buf
, ce
, st
, patch
,
3483 patch
->old_name
, patch
->old_mode
);
3486 else if (status
== SUBMODULE_PATCH_WITHOUT_INDEX
) {
3488 * There is no way to apply subproject
3489 * patch without looking at the index.
3490 * NEEDSWORK: shouldn't this be flagged
3493 free_fragment_list(patch
->fragments
);
3494 patch
->fragments
= NULL
;
3495 } else if (status
) {
3496 return error(_("failed to read %s"), patch
->old_name
);
3500 img
= strbuf_detach(&buf
, &len
);
3501 prepare_image(image
, img
, len
, !patch
->is_binary
);
3505 static int resolve_to(struct image
*image
, const struct object_id
*result_id
)
3508 enum object_type type
;
3512 image
->buf
= repo_read_object_file(the_repository
, result_id
, &type
,
3514 if (!image
->buf
|| type
!= OBJ_BLOB
)
3515 die("unable to read blob object %s", oid_to_hex(result_id
));
3521 static int three_way_merge(struct apply_state
*state
,
3522 struct image
*image
,
3524 const struct object_id
*base
,
3525 const struct object_id
*ours
,
3526 const struct object_id
*theirs
)
3528 mmfile_t base_file
, our_file
, their_file
;
3529 mmbuffer_t result
= { NULL
};
3530 enum ll_merge_result status
;
3532 /* resolve trivial cases first */
3533 if (oideq(base
, ours
))
3534 return resolve_to(image
, theirs
);
3535 else if (oideq(base
, theirs
) || oideq(ours
, theirs
))
3536 return resolve_to(image
, ours
);
3538 read_mmblob(&base_file
, base
);
3539 read_mmblob(&our_file
, ours
);
3540 read_mmblob(&their_file
, theirs
);
3541 status
= ll_merge(&result
, path
,
3544 &their_file
, "theirs",
3547 if (status
== LL_MERGE_BINARY_CONFLICT
)
3548 warning("Cannot merge binary files: %s (%s vs. %s)",
3549 path
, "ours", "theirs");
3550 free(base_file
.ptr
);
3552 free(their_file
.ptr
);
3553 if (status
< 0 || !result
.ptr
) {
3558 image
->buf
= result
.ptr
;
3559 image
->len
= result
.size
;
3565 * When directly falling back to add/add three-way merge, we read from
3566 * the current contents of the new_name. In no cases other than that
3567 * this function will be called.
3569 static int load_current(struct apply_state
*state
,
3570 struct image
*image
,
3571 struct patch
*patch
)
3573 struct strbuf buf
= STRBUF_INIT
;
3578 struct cache_entry
*ce
;
3579 char *name
= patch
->new_name
;
3580 unsigned mode
= patch
->new_mode
;
3583 BUG("patch to %s is not a creation", patch
->old_name
);
3585 pos
= index_name_pos(state
->repo
->index
, name
, strlen(name
));
3587 return error(_("%s: does not exist in index"), name
);
3588 ce
= state
->repo
->index
->cache
[pos
];
3589 if (lstat(name
, &st
)) {
3590 if (errno
!= ENOENT
)
3591 return error_errno("%s", name
);
3592 if (checkout_target(state
->repo
->index
, ce
, &st
))
3595 if (verify_index_match(state
, ce
, &st
))
3596 return error(_("%s: does not match index"), name
);
3598 status
= load_patch_target(state
, &buf
, ce
, &st
, patch
, name
, mode
);
3603 img
= strbuf_detach(&buf
, &len
);
3604 prepare_image(image
, img
, len
, !patch
->is_binary
);
3608 static int try_threeway(struct apply_state
*state
,
3609 struct image
*image
,
3610 struct patch
*patch
,
3612 const struct cache_entry
*ce
)
3614 struct object_id pre_oid
, post_oid
, our_oid
;
3615 struct strbuf buf
= STRBUF_INIT
;
3619 struct image tmp_image
;
3621 /* No point falling back to 3-way merge in these cases */
3622 if (patch
->is_delete
||
3623 S_ISGITLINK(patch
->old_mode
) || S_ISGITLINK(patch
->new_mode
) ||
3624 (patch
->is_new
&& !patch
->direct_to_threeway
) ||
3625 (patch
->is_rename
&& !patch
->lines_added
&& !patch
->lines_deleted
))
3628 /* Preimage the patch was prepared for */
3630 write_object_file("", 0, OBJ_BLOB
, &pre_oid
);
3631 else if (repo_get_oid(the_repository
, patch
->old_oid_prefix
, &pre_oid
) ||
3632 read_blob_object(&buf
, &pre_oid
, patch
->old_mode
))
3633 return error(_("repository lacks the necessary blob to perform 3-way merge."));
3635 if (state
->apply_verbosity
> verbosity_silent
&& patch
->direct_to_threeway
)
3636 fprintf(stderr
, _("Performing three-way merge...\n"));
3638 img
= strbuf_detach(&buf
, &len
);
3639 prepare_image(&tmp_image
, img
, len
, 1);
3640 /* Apply the patch to get the post image */
3641 if (apply_fragments(state
, &tmp_image
, patch
) < 0) {
3642 clear_image(&tmp_image
);
3645 /* post_oid is theirs */
3646 write_object_file(tmp_image
.buf
, tmp_image
.len
, OBJ_BLOB
, &post_oid
);
3647 clear_image(&tmp_image
);
3649 /* our_oid is ours */
3650 if (patch
->is_new
) {
3651 if (load_current(state
, &tmp_image
, patch
))
3652 return error(_("cannot read the current contents of '%s'"),
3655 if (load_preimage(state
, &tmp_image
, patch
, st
, ce
))
3656 return error(_("cannot read the current contents of '%s'"),
3659 write_object_file(tmp_image
.buf
, tmp_image
.len
, OBJ_BLOB
, &our_oid
);
3660 clear_image(&tmp_image
);
3662 /* in-core three-way merge between post and our using pre as base */
3663 status
= three_way_merge(state
, image
, patch
->new_name
,
3664 &pre_oid
, &our_oid
, &post_oid
);
3666 if (state
->apply_verbosity
> verbosity_silent
)
3668 _("Failed to perform three-way merge...\n"));
3673 patch
->conflicted_threeway
= 1;
3675 oidclr(&patch
->threeway_stage
[0]);
3677 oidcpy(&patch
->threeway_stage
[0], &pre_oid
);
3678 oidcpy(&patch
->threeway_stage
[1], &our_oid
);
3679 oidcpy(&patch
->threeway_stage
[2], &post_oid
);
3680 if (state
->apply_verbosity
> verbosity_silent
)
3682 _("Applied patch to '%s' with conflicts.\n"),
3685 if (state
->apply_verbosity
> verbosity_silent
)
3687 _("Applied patch to '%s' cleanly.\n"),
3693 static int apply_data(struct apply_state
*state
, struct patch
*patch
,
3694 struct stat
*st
, const struct cache_entry
*ce
)
3698 if (load_preimage(state
, &image
, patch
, st
, ce
) < 0)
3701 if (!state
->threeway
|| try_threeway(state
, &image
, patch
, st
, ce
) < 0) {
3702 if (state
->apply_verbosity
> verbosity_silent
&&
3703 state
->threeway
&& !patch
->direct_to_threeway
)
3704 fprintf(stderr
, _("Falling back to direct application...\n"));
3706 /* Note: with --reject, apply_fragments() returns 0 */
3707 if (patch
->direct_to_threeway
|| apply_fragments(state
, &image
, patch
) < 0)
3710 patch
->result
= image
.buf
;
3711 patch
->resultsize
= image
.len
;
3712 add_to_fn_table(state
, patch
);
3713 free(image
.line_allocated
);
3715 if (0 < patch
->is_delete
&& patch
->resultsize
)
3716 return error(_("removal patch leaves file contents"));
3722 * If "patch" that we are looking at modifies or deletes what we have,
3723 * we would want it not to lose any local modification we have, either
3724 * in the working tree or in the index.
3726 * This also decides if a non-git patch is a creation patch or a
3727 * modification to an existing empty file. We do not check the state
3728 * of the current tree for a creation patch in this function; the caller
3729 * check_patch() separately makes sure (and errors out otherwise) that
3730 * the path the patch creates does not exist in the current tree.
3732 static int check_preimage(struct apply_state
*state
,
3733 struct patch
*patch
,
3734 struct cache_entry
**ce
,
3737 const char *old_name
= patch
->old_name
;
3738 struct patch
*previous
= NULL
;
3739 int stat_ret
= 0, status
;
3740 unsigned st_mode
= 0;
3745 assert(patch
->is_new
<= 0);
3746 previous
= previous_patch(state
, patch
, &status
);
3749 return error(_("path %s has been renamed/deleted"), old_name
);
3751 st_mode
= previous
->new_mode
;
3752 } else if (!state
->cached
) {
3753 stat_ret
= lstat(old_name
, st
);
3754 if (stat_ret
&& errno
!= ENOENT
)
3755 return error_errno("%s", old_name
);
3758 if (state
->check_index
&& !previous
) {
3759 int pos
= index_name_pos(state
->repo
->index
, old_name
,
3762 if (patch
->is_new
< 0)
3764 return error(_("%s: does not exist in index"), old_name
);
3766 *ce
= state
->repo
->index
->cache
[pos
];
3768 if (checkout_target(state
->repo
->index
, *ce
, st
))
3771 if (!state
->cached
&& verify_index_match(state
, *ce
, st
))
3772 return error(_("%s: does not match index"), old_name
);
3774 st_mode
= (*ce
)->ce_mode
;
3775 } else if (stat_ret
< 0) {
3776 if (patch
->is_new
< 0)
3778 return error_errno("%s", old_name
);
3781 if (!state
->cached
&& !previous
) {
3782 if (*ce
&& !(*ce
)->ce_mode
)
3783 BUG("ce_mode == 0 for path '%s'", old_name
);
3785 if (trust_executable_bit
)
3786 st_mode
= ce_mode_from_stat(*ce
, st
->st_mode
);
3788 st_mode
= (*ce
)->ce_mode
;
3790 st_mode
= patch
->old_mode
;
3793 if (patch
->is_new
< 0)
3795 if (!patch
->old_mode
)
3796 patch
->old_mode
= st_mode
;
3797 if ((st_mode
^ patch
->old_mode
) & S_IFMT
)
3798 return error(_("%s: wrong type"), old_name
);
3799 if (st_mode
!= patch
->old_mode
)
3800 warning(_("%s has type %o, expected %o"),
3801 old_name
, st_mode
, patch
->old_mode
);
3802 if (!patch
->new_mode
&& !patch
->is_delete
)
3803 patch
->new_mode
= st_mode
;
3808 patch
->is_delete
= 0;
3809 FREE_AND_NULL(patch
->old_name
);
3814 #define EXISTS_IN_INDEX 1
3815 #define EXISTS_IN_WORKTREE 2
3816 #define EXISTS_IN_INDEX_AS_ITA 3
3818 static int check_to_create(struct apply_state
*state
,
3819 const char *new_name
,
3824 if (state
->check_index
&& (!ok_if_exists
|| !state
->cached
)) {
3827 pos
= index_name_pos(state
->repo
->index
, new_name
, strlen(new_name
));
3829 struct cache_entry
*ce
= state
->repo
->index
->cache
[pos
];
3831 /* allow ITA, as they do not yet exist in the index */
3832 if (!ok_if_exists
&& !(ce
->ce_flags
& CE_INTENT_TO_ADD
))
3833 return EXISTS_IN_INDEX
;
3835 /* ITA entries can never match working tree files */
3836 if (!state
->cached
&& (ce
->ce_flags
& CE_INTENT_TO_ADD
))
3837 return EXISTS_IN_INDEX_AS_ITA
;
3844 if (!lstat(new_name
, &nst
)) {
3845 if (S_ISDIR(nst
.st_mode
) || ok_if_exists
)
3848 * A leading component of new_name might be a symlink
3849 * that is going to be removed with this patch, but
3850 * still pointing at somewhere that has the path.
3851 * In such a case, path "new_name" does not exist as
3852 * far as git is concerned.
3854 if (has_symlink_leading_path(new_name
, strlen(new_name
)))
3857 return EXISTS_IN_WORKTREE
;
3858 } else if (!is_missing_file_error(errno
)) {
3859 return error_errno("%s", new_name
);
3864 static void prepare_symlink_changes(struct apply_state
*state
, struct patch
*patch
)
3866 for ( ; patch
; patch
= patch
->next
) {
3867 if ((patch
->old_name
&& S_ISLNK(patch
->old_mode
)) &&
3868 (patch
->is_rename
|| patch
->is_delete
))
3869 /* the symlink at patch->old_name is removed */
3870 strset_add(&state
->removed_symlinks
, patch
->old_name
);
3872 if (patch
->new_name
&& S_ISLNK(patch
->new_mode
))
3873 /* the symlink at patch->new_name is created or remains */
3874 strset_add(&state
->kept_symlinks
, patch
->new_name
);
3878 static int path_is_beyond_symlink_1(struct apply_state
*state
, struct strbuf
*name
)
3881 while (--name
->len
&& name
->buf
[name
->len
] != '/')
3882 ; /* scan backwards */
3885 name
->buf
[name
->len
] = '\0';
3886 if (strset_contains(&state
->kept_symlinks
, name
->buf
))
3888 if (strset_contains(&state
->removed_symlinks
, name
->buf
))
3890 * This cannot be "return 0", because we may
3891 * see a new one created at a higher level.
3895 /* otherwise, check the preimage */
3896 if (state
->check_index
) {
3897 struct cache_entry
*ce
;
3899 ce
= index_file_exists(state
->repo
->index
, name
->buf
,
3900 name
->len
, ignore_case
);
3901 if (ce
&& S_ISLNK(ce
->ce_mode
))
3905 if (!lstat(name
->buf
, &st
) && S_ISLNK(st
.st_mode
))
3912 static int path_is_beyond_symlink(struct apply_state
*state
, const char *name_
)
3915 struct strbuf name
= STRBUF_INIT
;
3917 assert(*name_
!= '\0');
3918 strbuf_addstr(&name
, name_
);
3919 ret
= path_is_beyond_symlink_1(state
, &name
);
3920 strbuf_release(&name
);
3925 static int check_unsafe_path(struct patch
*patch
)
3927 const char *old_name
= NULL
;
3928 const char *new_name
= NULL
;
3929 if (patch
->is_delete
)
3930 old_name
= patch
->old_name
;
3931 else if (!patch
->is_new
&& !patch
->is_copy
)
3932 old_name
= patch
->old_name
;
3933 if (!patch
->is_delete
)
3934 new_name
= patch
->new_name
;
3936 if (old_name
&& !verify_path(old_name
, patch
->old_mode
))
3937 return error(_("invalid path '%s'"), old_name
);
3938 if (new_name
&& !verify_path(new_name
, patch
->new_mode
))
3939 return error(_("invalid path '%s'"), new_name
);
3944 * Check and apply the patch in-core; leave the result in patch->result
3945 * for the caller to write it out to the final destination.
3947 static int check_patch(struct apply_state
*state
, struct patch
*patch
)
3950 const char *old_name
= patch
->old_name
;
3951 const char *new_name
= patch
->new_name
;
3952 const char *name
= old_name
? old_name
: new_name
;
3953 struct cache_entry
*ce
= NULL
;
3954 struct patch
*tpatch
;
3958 patch
->rejected
= 1; /* we will drop this after we succeed */
3960 status
= check_preimage(state
, patch
, &ce
, &st
);
3963 old_name
= patch
->old_name
;
3966 * A type-change diff is always split into a patch to delete
3967 * old, immediately followed by a patch to create new (see
3968 * diff.c::run_diff()); in such a case it is Ok that the entry
3969 * to be deleted by the previous patch is still in the working
3970 * tree and in the index.
3972 * A patch to swap-rename between A and B would first rename A
3973 * to B and then rename B to A. While applying the first one,
3974 * the presence of B should not stop A from getting renamed to
3975 * B; ask to_be_deleted() about the later rename. Removal of
3976 * B and rename from A to B is handled the same way by asking
3979 if ((tpatch
= in_fn_table(state
, new_name
)) &&
3980 (was_deleted(tpatch
) || to_be_deleted(tpatch
)))
3986 ((0 < patch
->is_new
) || patch
->is_rename
|| patch
->is_copy
)) {
3987 int err
= check_to_create(state
, new_name
, ok_if_exists
);
3989 if (err
&& state
->threeway
) {
3990 patch
->direct_to_threeway
= 1;
3991 } else switch (err
) {
3994 case EXISTS_IN_INDEX
:
3995 return error(_("%s: already exists in index"), new_name
);
3996 case EXISTS_IN_INDEX_AS_ITA
:
3997 return error(_("%s: does not match index"), new_name
);
3998 case EXISTS_IN_WORKTREE
:
3999 return error(_("%s: already exists in working directory"),
4005 if (!patch
->new_mode
) {
4006 if (0 < patch
->is_new
)
4007 patch
->new_mode
= S_IFREG
| 0644;
4009 patch
->new_mode
= patch
->old_mode
;
4013 if (new_name
&& old_name
) {
4014 int same
= !strcmp(old_name
, new_name
);
4015 if (!patch
->new_mode
)
4016 patch
->new_mode
= patch
->old_mode
;
4017 if ((patch
->old_mode
^ patch
->new_mode
) & S_IFMT
) {
4019 return error(_("new mode (%o) of %s does not "
4020 "match old mode (%o)"),
4021 patch
->new_mode
, new_name
,
4024 return error(_("new mode (%o) of %s does not "
4025 "match old mode (%o) of %s"),
4026 patch
->new_mode
, new_name
,
4027 patch
->old_mode
, old_name
);
4031 if (!state
->unsafe_paths
&& check_unsafe_path(patch
))
4035 * An attempt to read from or delete a path that is beyond a
4036 * symbolic link will be prevented by load_patch_target() that
4037 * is called at the beginning of apply_data() so we do not
4038 * have to worry about a patch marked with "is_delete" bit
4039 * here. We however need to make sure that the patch result
4040 * is not deposited to a path that is beyond a symbolic link
4043 if (!patch
->is_delete
&& path_is_beyond_symlink(state
, patch
->new_name
))
4044 return error(_("affected file '%s' is beyond a symbolic link"),
4047 if (apply_data(state
, patch
, &st
, ce
) < 0)
4048 return error(_("%s: patch does not apply"), name
);
4049 patch
->rejected
= 0;
4053 static int check_patch_list(struct apply_state
*state
, struct patch
*patch
)
4057 prepare_symlink_changes(state
, patch
);
4058 prepare_fn_table(state
, patch
);
4061 if (state
->apply_verbosity
> verbosity_normal
)
4062 say_patch_name(stderr
,
4063 _("Checking patch %s..."), patch
);
4064 res
= check_patch(state
, patch
);
4068 patch
= patch
->next
;
4073 static int read_apply_cache(struct apply_state
*state
)
4075 if (state
->index_file
)
4076 return read_index_from(state
->repo
->index
, state
->index_file
,
4079 return repo_read_index(state
->repo
);
4082 /* This function tries to read the object name from the current index */
4083 static int get_current_oid(struct apply_state
*state
, const char *path
,
4084 struct object_id
*oid
)
4088 if (read_apply_cache(state
) < 0)
4090 pos
= index_name_pos(state
->repo
->index
, path
, strlen(path
));
4093 oidcpy(oid
, &state
->repo
->index
->cache
[pos
]->oid
);
4097 static int preimage_oid_in_gitlink_patch(struct patch
*p
, struct object_id
*oid
)
4100 * A usable gitlink patch has only one fragment (hunk) that looks like:
4102 * -Subproject commit <old sha1>
4103 * +Subproject commit <new sha1>
4106 * -Subproject commit <old sha1>
4107 * for a removal patch.
4109 struct fragment
*hunk
= p
->fragments
;
4110 static const char heading
[] = "-Subproject commit ";
4113 if (/* does the patch have only one hunk? */
4114 hunk
&& !hunk
->next
&&
4115 /* is its preimage one line? */
4116 hunk
->oldpos
== 1 && hunk
->oldlines
== 1 &&
4117 /* does preimage begin with the heading? */
4118 (preimage
= memchr(hunk
->patch
, '\n', hunk
->size
)) != NULL
&&
4119 starts_with(++preimage
, heading
) &&
4120 /* does it record full SHA-1? */
4121 !get_oid_hex(preimage
+ sizeof(heading
) - 1, oid
) &&
4122 preimage
[sizeof(heading
) + the_hash_algo
->hexsz
- 1] == '\n' &&
4123 /* does the abbreviated name on the index line agree with it? */
4124 starts_with(preimage
+ sizeof(heading
) - 1, p
->old_oid_prefix
))
4125 return 0; /* it all looks fine */
4127 /* we may have full object name on the index line */
4128 return get_oid_hex(p
->old_oid_prefix
, oid
);
4131 /* Build an index that contains just the files needed for a 3way merge */
4132 static int build_fake_ancestor(struct apply_state
*state
, struct patch
*list
)
4134 struct patch
*patch
;
4135 struct index_state result
= INDEX_STATE_INIT(state
->repo
);
4136 struct lock_file lock
= LOCK_INIT
;
4139 /* Once we start supporting the reverse patch, it may be
4140 * worth showing the new sha1 prefix, but until then...
4142 for (patch
= list
; patch
; patch
= patch
->next
) {
4143 struct object_id oid
;
4144 struct cache_entry
*ce
;
4147 name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
4148 if (0 < patch
->is_new
)
4151 if (S_ISGITLINK(patch
->old_mode
)) {
4152 if (!preimage_oid_in_gitlink_patch(patch
, &oid
))
4153 ; /* ok, the textual part looks sane */
4155 return error(_("sha1 information is lacking or "
4156 "useless for submodule %s"), name
);
4157 } else if (!repo_get_oid_blob(the_repository
, patch
->old_oid_prefix
, &oid
)) {
4159 } else if (!patch
->lines_added
&& !patch
->lines_deleted
) {
4160 /* mode-only change: update the current */
4161 if (get_current_oid(state
, patch
->old_name
, &oid
))
4162 return error(_("mode change for %s, which is not "
4163 "in current HEAD"), name
);
4165 return error(_("sha1 information is lacking or useless "
4168 ce
= make_cache_entry(&result
, patch
->old_mode
, &oid
, name
, 0, 0);
4170 return error(_("make_cache_entry failed for path '%s'"),
4172 if (add_index_entry(&result
, ce
, ADD_CACHE_OK_TO_ADD
)) {
4173 discard_cache_entry(ce
);
4174 return error(_("could not add %s to temporary index"),
4179 hold_lock_file_for_update(&lock
, state
->fake_ancestor
, LOCK_DIE_ON_ERROR
);
4180 res
= write_locked_index(&result
, &lock
, COMMIT_LOCK
);
4181 discard_index(&result
);
4184 return error(_("could not write temporary index to %s"),
4185 state
->fake_ancestor
);
4190 static void stat_patch_list(struct apply_state
*state
, struct patch
*patch
)
4192 int files
, adds
, dels
;
4194 for (files
= adds
= dels
= 0 ; patch
; patch
= patch
->next
) {
4196 adds
+= patch
->lines_added
;
4197 dels
+= patch
->lines_deleted
;
4198 show_stats(state
, patch
);
4201 print_stat_summary(stdout
, files
, adds
, dels
);
4204 static void numstat_patch_list(struct apply_state
*state
,
4205 struct patch
*patch
)
4207 for ( ; patch
; patch
= patch
->next
) {
4209 name
= patch
->new_name
? patch
->new_name
: patch
->old_name
;
4210 if (patch
->is_binary
)
4213 printf("%d\t%d\t", patch
->lines_added
, patch
->lines_deleted
);
4214 write_name_quoted(name
, stdout
, state
->line_termination
);
4218 static void show_file_mode_name(const char *newdelete
, unsigned int mode
, const char *name
)
4221 printf(" %s mode %06o %s\n", newdelete
, mode
, name
);
4223 printf(" %s %s\n", newdelete
, name
);
4226 static void show_mode_change(struct patch
*p
, int show_name
)
4228 if (p
->old_mode
&& p
->new_mode
&& p
->old_mode
!= p
->new_mode
) {
4230 printf(" mode change %06o => %06o %s\n",
4231 p
->old_mode
, p
->new_mode
, p
->new_name
);
4233 printf(" mode change %06o => %06o\n",
4234 p
->old_mode
, p
->new_mode
);
4238 static void show_rename_copy(struct patch
*p
)
4240 const char *renamecopy
= p
->is_rename
? "rename" : "copy";
4241 const char *old_name
, *new_name
;
4243 /* Find common prefix */
4244 old_name
= p
->old_name
;
4245 new_name
= p
->new_name
;
4247 const char *slash_old
, *slash_new
;
4248 slash_old
= strchr(old_name
, '/');
4249 slash_new
= strchr(new_name
, '/');
4252 slash_old
- old_name
!= slash_new
- new_name
||
4253 memcmp(old_name
, new_name
, slash_new
- new_name
))
4255 old_name
= slash_old
+ 1;
4256 new_name
= slash_new
+ 1;
4258 /* p->old_name through old_name is the common prefix, and old_name and
4259 * new_name through the end of names are renames
4261 if (old_name
!= p
->old_name
)
4262 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy
,
4263 (int)(old_name
- p
->old_name
), p
->old_name
,
4264 old_name
, new_name
, p
->score
);
4266 printf(" %s %s => %s (%d%%)\n", renamecopy
,
4267 p
->old_name
, p
->new_name
, p
->score
);
4268 show_mode_change(p
, 0);
4271 static void summary_patch_list(struct patch
*patch
)
4275 for (p
= patch
; p
; p
= p
->next
) {
4277 show_file_mode_name("create", p
->new_mode
, p
->new_name
);
4278 else if (p
->is_delete
)
4279 show_file_mode_name("delete", p
->old_mode
, p
->old_name
);
4281 if (p
->is_rename
|| p
->is_copy
)
4282 show_rename_copy(p
);
4285 printf(" rewrite %s (%d%%)\n",
4286 p
->new_name
, p
->score
);
4287 show_mode_change(p
, 0);
4290 show_mode_change(p
, 1);
4296 static void patch_stats(struct apply_state
*state
, struct patch
*patch
)
4298 int lines
= patch
->lines_added
+ patch
->lines_deleted
;
4300 if (lines
> state
->max_change
)
4301 state
->max_change
= lines
;
4302 if (patch
->old_name
) {
4303 int len
= quote_c_style(patch
->old_name
, NULL
, NULL
, 0);
4305 len
= strlen(patch
->old_name
);
4306 if (len
> state
->max_len
)
4307 state
->max_len
= len
;
4309 if (patch
->new_name
) {
4310 int len
= quote_c_style(patch
->new_name
, NULL
, NULL
, 0);
4312 len
= strlen(patch
->new_name
);
4313 if (len
> state
->max_len
)
4314 state
->max_len
= len
;
4318 static int remove_file(struct apply_state
*state
, struct patch
*patch
, int rmdir_empty
)
4320 if (state
->update_index
&& !state
->ita_only
) {
4321 if (remove_file_from_index(state
->repo
->index
, patch
->old_name
) < 0)
4322 return error(_("unable to remove %s from index"), patch
->old_name
);
4324 if (!state
->cached
) {
4325 if (!remove_or_warn(patch
->old_mode
, patch
->old_name
) && rmdir_empty
) {
4326 remove_path(patch
->old_name
);
4332 static int add_index_file(struct apply_state
*state
,
4339 struct cache_entry
*ce
;
4340 int namelen
= strlen(path
);
4342 ce
= make_empty_cache_entry(state
->repo
->index
, namelen
);
4343 memcpy(ce
->name
, path
, namelen
);
4344 ce
->ce_mode
= create_ce_mode(mode
);
4345 ce
->ce_flags
= create_ce_flags(0);
4346 ce
->ce_namelen
= namelen
;
4347 if (state
->ita_only
) {
4348 ce
->ce_flags
|= CE_INTENT_TO_ADD
;
4349 set_object_name_for_intent_to_add_entry(ce
);
4350 } else if (S_ISGITLINK(mode
)) {
4353 if (!skip_prefix(buf
, "Subproject commit ", &s
) ||
4354 get_oid_hex(s
, &ce
->oid
)) {
4355 discard_cache_entry(ce
);
4356 return error(_("corrupt patch for submodule %s"), path
);
4359 if (!state
->cached
) {
4360 if (lstat(path
, &st
) < 0) {
4361 discard_cache_entry(ce
);
4362 return error_errno(_("unable to stat newly "
4363 "created file '%s'"),
4366 fill_stat_cache_info(state
->repo
->index
, ce
, &st
);
4368 if (write_object_file(buf
, size
, OBJ_BLOB
, &ce
->oid
) < 0) {
4369 discard_cache_entry(ce
);
4370 return error(_("unable to create backing store "
4371 "for newly created file %s"), path
);
4374 if (add_index_entry(state
->repo
->index
, ce
, ADD_CACHE_OK_TO_ADD
) < 0) {
4375 discard_cache_entry(ce
);
4376 return error(_("unable to add cache entry for %s"), path
);
4384 * -1 if an unrecoverable error happened
4385 * 0 if everything went well
4386 * 1 if a recoverable error happened
4388 static int try_create_file(struct apply_state
*state
, const char *path
,
4389 unsigned int mode
, const char *buf
,
4393 struct strbuf nbuf
= STRBUF_INIT
;
4395 if (S_ISGITLINK(mode
)) {
4397 if (!lstat(path
, &st
) && S_ISDIR(st
.st_mode
))
4399 return !!mkdir(path
, 0777);
4402 if (has_symlinks
&& S_ISLNK(mode
))
4403 /* Although buf:size is counted string, it also is NUL
4406 return !!symlink(buf
, path
);
4408 fd
= open(path
, O_CREAT
| O_EXCL
| O_WRONLY
, (mode
& 0100) ? 0777 : 0666);
4412 if (convert_to_working_tree(state
->repo
->index
, path
, buf
, size
, &nbuf
, NULL
)) {
4417 res
= write_in_full(fd
, buf
, size
) < 0;
4419 error_errno(_("failed to write to '%s'"), path
);
4420 strbuf_release(&nbuf
);
4422 if (close(fd
) < 0 && !res
)
4423 return error_errno(_("closing file '%s'"), path
);
4425 return res
? -1 : 0;
4429 * We optimistically assume that the directories exist,
4430 * which is true 99% of the time anyway. If they don't,
4431 * we create them and try again.
4437 static int create_one_file(struct apply_state
*state
,
4449 * We already try to detect whether files are beyond a symlink in our
4450 * up-front checks. But in the case where symlinks are created by any
4451 * of the intermediate hunks it can happen that our up-front checks
4452 * didn't yet see the symlink, but at the point of arriving here there
4453 * in fact is one. We thus repeat the check for symlinks here.
4455 * Note that this does not make the up-front check obsolete as the
4456 * failure mode is different:
4458 * - The up-front checks cause us to abort before we have written
4459 * anything into the working directory. So when we exit this way the
4460 * working directory remains clean.
4462 * - The checks here happen in the middle of the action where we have
4463 * already started to apply the patch. The end result will be a dirty
4464 * working directory.
4466 * Ideally, we should update the up-front checks to catch what would
4467 * happen when we apply the patch before we damage the working tree.
4468 * We have all the information necessary to do so. But for now, as a
4469 * part of embargoed security work, having this check would serve as a
4470 * reasonable first step.
4472 if (path_is_beyond_symlink(state
, path
))
4473 return error(_("affected file '%s' is beyond a symbolic link"), path
);
4475 res
= try_create_file(state
, path
, mode
, buf
, size
);
4481 if (errno
== ENOENT
) {
4482 if (safe_create_leading_directories_no_share(path
))
4484 res
= try_create_file(state
, path
, mode
, buf
, size
);
4491 if (errno
== EEXIST
|| errno
== EACCES
) {
4492 /* We may be trying to create a file where a directory
4496 if (!lstat(path
, &st
) && (!S_ISDIR(st
.st_mode
) || !rmdir(path
)))
4500 if (errno
== EEXIST
) {
4501 unsigned int nr
= getpid();
4504 char newpath
[PATH_MAX
];
4505 mksnpath(newpath
, sizeof(newpath
), "%s~%u", path
, nr
);
4506 res
= try_create_file(state
, newpath
, mode
, buf
, size
);
4510 if (!rename(newpath
, path
))
4512 unlink_or_warn(newpath
);
4515 if (errno
!= EEXIST
)
4520 return error_errno(_("unable to write file '%s' mode %o"),
4524 static int add_conflicted_stages_file(struct apply_state
*state
,
4525 struct patch
*patch
)
4529 struct cache_entry
*ce
;
4531 if (!state
->update_index
)
4533 namelen
= strlen(patch
->new_name
);
4534 mode
= patch
->new_mode
? patch
->new_mode
: (S_IFREG
| 0644);
4536 remove_file_from_index(state
->repo
->index
, patch
->new_name
);
4537 for (stage
= 1; stage
< 4; stage
++) {
4538 if (is_null_oid(&patch
->threeway_stage
[stage
- 1]))
4540 ce
= make_empty_cache_entry(state
->repo
->index
, namelen
);
4541 memcpy(ce
->name
, patch
->new_name
, namelen
);
4542 ce
->ce_mode
= create_ce_mode(mode
);
4543 ce
->ce_flags
= create_ce_flags(stage
);
4544 ce
->ce_namelen
= namelen
;
4545 oidcpy(&ce
->oid
, &patch
->threeway_stage
[stage
- 1]);
4546 if (add_index_entry(state
->repo
->index
, ce
, ADD_CACHE_OK_TO_ADD
) < 0) {
4547 discard_cache_entry(ce
);
4548 return error(_("unable to add cache entry for %s"),
4556 static int create_file(struct apply_state
*state
, struct patch
*patch
)
4558 char *path
= patch
->new_name
;
4559 unsigned mode
= patch
->new_mode
;
4560 unsigned long size
= patch
->resultsize
;
4561 char *buf
= patch
->result
;
4564 mode
= S_IFREG
| 0644;
4565 if (create_one_file(state
, path
, mode
, buf
, size
))
4568 if (patch
->conflicted_threeway
)
4569 return add_conflicted_stages_file(state
, patch
);
4570 else if (state
->update_index
)
4571 return add_index_file(state
, path
, mode
, buf
, size
);
4575 /* phase zero is to remove, phase one is to create */
4576 static int write_out_one_result(struct apply_state
*state
,
4577 struct patch
*patch
,
4580 if (patch
->is_delete
> 0) {
4582 return remove_file(state
, patch
, 1);
4585 if (patch
->is_new
> 0 || patch
->is_copy
) {
4587 return create_file(state
, patch
);
4591 * Rename or modification boils down to the same
4592 * thing: remove the old, write the new
4595 return remove_file(state
, patch
, patch
->is_rename
);
4597 return create_file(state
, patch
);
4601 static int write_out_one_reject(struct apply_state
*state
, struct patch
*patch
)
4604 char namebuf
[PATH_MAX
];
4605 struct fragment
*frag
;
4607 struct strbuf sb
= STRBUF_INIT
;
4609 for (cnt
= 0, frag
= patch
->fragments
; frag
; frag
= frag
->next
) {
4610 if (!frag
->rejected
)
4616 if (state
->apply_verbosity
> verbosity_normal
)
4617 say_patch_name(stderr
,
4618 _("Applied patch %s cleanly."), patch
);
4622 /* This should not happen, because a removal patch that leaves
4623 * contents are marked "rejected" at the patch level.
4625 if (!patch
->new_name
)
4626 die(_("internal error"));
4628 /* Say this even without --verbose */
4629 strbuf_addf(&sb
, Q_("Applying patch %%s with %d reject...",
4630 "Applying patch %%s with %d rejects...",
4633 if (state
->apply_verbosity
> verbosity_silent
)
4634 say_patch_name(stderr
, sb
.buf
, patch
);
4635 strbuf_release(&sb
);
4637 cnt
= strlen(patch
->new_name
);
4638 if (ARRAY_SIZE(namebuf
) <= cnt
+ 5) {
4639 cnt
= ARRAY_SIZE(namebuf
) - 5;
4640 warning(_("truncating .rej filename to %.*s.rej"),
4641 cnt
- 1, patch
->new_name
);
4643 memcpy(namebuf
, patch
->new_name
, cnt
);
4644 memcpy(namebuf
+ cnt
, ".rej", 5);
4646 fd
= open(namebuf
, O_CREAT
| O_EXCL
| O_WRONLY
, 0666);
4648 if (errno
!= EEXIST
)
4649 return error_errno(_("cannot open %s"), namebuf
);
4650 if (unlink(namebuf
))
4651 return error_errno(_("cannot unlink '%s'"), namebuf
);
4652 fd
= open(namebuf
, O_CREAT
| O_EXCL
| O_WRONLY
, 0666);
4654 return error_errno(_("cannot open %s"), namebuf
);
4656 rej
= fdopen(fd
, "w");
4658 return error_errno(_("cannot open %s"), namebuf
);
4660 /* Normal git tools never deal with .rej, so do not pretend
4661 * this is a git patch by saying --git or giving extended
4662 * headers. While at it, maybe please "kompare" that wants
4663 * the trailing TAB and some garbage at the end of line ;-).
4665 fprintf(rej
, "diff a/%s b/%s\t(rejected hunks)\n",
4666 patch
->new_name
, patch
->new_name
);
4667 for (cnt
= 1, frag
= patch
->fragments
;
4669 cnt
++, frag
= frag
->next
) {
4670 if (!frag
->rejected
) {
4671 if (state
->apply_verbosity
> verbosity_silent
)
4672 fprintf_ln(stderr
, _("Hunk #%d applied cleanly."), cnt
);
4675 if (state
->apply_verbosity
> verbosity_silent
)
4676 fprintf_ln(stderr
, _("Rejected hunk #%d."), cnt
);
4677 fprintf(rej
, "%.*s", frag
->size
, frag
->patch
);
4678 if (frag
->patch
[frag
->size
-1] != '\n')
4687 * -1 if an error happened
4688 * 0 if the patch applied cleanly
4689 * 1 if the patch did not apply cleanly
4691 static int write_out_results(struct apply_state
*state
, struct patch
*list
)
4696 struct string_list cpath
= STRING_LIST_INIT_DUP
;
4698 for (phase
= 0; phase
< 2; phase
++) {
4704 if (write_out_one_result(state
, l
, phase
)) {
4705 string_list_clear(&cpath
, 0);
4709 if (write_out_one_reject(state
, l
))
4711 if (l
->conflicted_threeway
) {
4712 string_list_append(&cpath
, l
->new_name
);
4722 struct string_list_item
*item
;
4724 string_list_sort(&cpath
);
4725 if (state
->apply_verbosity
> verbosity_silent
) {
4726 for_each_string_list_item(item
, &cpath
)
4727 fprintf(stderr
, "U %s\n", item
->string
);
4729 string_list_clear(&cpath
, 0);
4732 * rerere relies on the partially merged result being in the working
4733 * tree with conflict markers, but that isn't written with --cached.
4736 repo_rerere(state
->repo
, 0);
4743 * Try to apply a patch.
4746 * -128 if a bad error happened (like patch unreadable)
4747 * -1 if patch did not apply and user cannot deal with it
4748 * 0 if the patch applied
4749 * 1 if the patch did not apply but user might fix it
4751 static int apply_patch(struct apply_state
*state
,
4753 const char *filename
,
4757 struct strbuf buf
= STRBUF_INIT
; /* owns the patch text */
4758 struct patch
*list
= NULL
, **listp
= &list
;
4759 int skipped_patch
= 0;
4761 int flush_attributes
= 0;
4763 state
->patch_input_file
= filename
;
4764 if (read_patch_file(&buf
, fd
) < 0)
4767 while (offset
< buf
.len
) {
4768 struct patch
*patch
;
4771 CALLOC_ARRAY(patch
, 1);
4772 patch
->inaccurate_eof
= !!(options
& APPLY_OPT_INACCURATE_EOF
);
4773 patch
->recount
= !!(options
& APPLY_OPT_RECOUNT
);
4774 nr
= parse_chunk(state
, buf
.buf
+ offset
, buf
.len
- offset
, patch
);
4783 if (state
->apply_in_reverse
)
4784 reverse_patches(patch
);
4785 if (use_patch(state
, patch
)) {
4786 patch_stats(state
, patch
);
4787 if (!list
|| !state
->apply_in_reverse
) {
4789 listp
= &patch
->next
;
4795 if ((patch
->new_name
&&
4796 ends_with_path_components(patch
->new_name
,
4797 GITATTRIBUTES_FILE
)) ||
4799 ends_with_path_components(patch
->old_name
,
4800 GITATTRIBUTES_FILE
)))
4801 flush_attributes
= 1;
4804 if (state
->apply_verbosity
> verbosity_normal
)
4805 say_patch_name(stderr
, _("Skipped patch '%s'."), patch
);
4812 if (!list
&& !skipped_patch
) {
4813 if (!state
->allow_empty
) {
4814 error(_("No valid patches in input (allow with \"--allow-empty\")"));
4820 if (state
->whitespace_error
&& (state
->ws_error_action
== die_on_ws_error
))
4823 state
->update_index
= (state
->check_index
|| state
->ita_only
) && state
->apply
;
4824 if (state
->update_index
&& !is_lock_file_locked(&state
->lock_file
)) {
4825 if (state
->index_file
)
4826 hold_lock_file_for_update(&state
->lock_file
,
4830 repo_hold_locked_index(state
->repo
, &state
->lock_file
,
4834 if (state
->check_index
&& read_apply_cache(state
) < 0) {
4835 error(_("unable to read index file"));
4840 if (state
->check
|| state
->apply
) {
4841 int r
= check_patch_list(state
, list
);
4846 if (r
< 0 && !state
->apply_with_reject
) {
4853 int write_res
= write_out_results(state
, list
);
4854 if (write_res
< 0) {
4858 if (write_res
> 0) {
4859 /* with --3way, we still need to write the index out */
4860 res
= state
->apply_with_reject
? -1 : 1;
4865 if (state
->fake_ancestor
&&
4866 build_fake_ancestor(state
, list
)) {
4871 if (state
->diffstat
&& state
->apply_verbosity
> verbosity_silent
)
4872 stat_patch_list(state
, list
);
4874 if (state
->numstat
&& state
->apply_verbosity
> verbosity_silent
)
4875 numstat_patch_list(state
, list
);
4877 if (state
->summary
&& state
->apply_verbosity
> verbosity_silent
)
4878 summary_patch_list(list
);
4880 if (flush_attributes
)
4881 reset_parsed_attributes();
4883 free_patch_list(list
);
4884 strbuf_release(&buf
);
4885 string_list_clear(&state
->fn_table
, 0);
4889 static int apply_option_parse_exclude(const struct option
*opt
,
4890 const char *arg
, int unset
)
4892 struct apply_state
*state
= opt
->value
;
4894 BUG_ON_OPT_NEG(unset
);
4896 add_name_limit(state
, arg
, 1);
4900 static int apply_option_parse_include(const struct option
*opt
,
4901 const char *arg
, int unset
)
4903 struct apply_state
*state
= opt
->value
;
4905 BUG_ON_OPT_NEG(unset
);
4907 add_name_limit(state
, arg
, 0);
4908 state
->has_include
= 1;
4912 static int apply_option_parse_p(const struct option
*opt
,
4916 struct apply_state
*state
= opt
->value
;
4918 BUG_ON_OPT_NEG(unset
);
4920 state
->p_value
= atoi(arg
);
4921 state
->p_value_known
= 1;
4925 static int apply_option_parse_space_change(const struct option
*opt
,
4926 const char *arg
, int unset
)
4928 struct apply_state
*state
= opt
->value
;
4930 BUG_ON_OPT_ARG(arg
);
4933 state
->ws_ignore_action
= ignore_ws_none
;
4935 state
->ws_ignore_action
= ignore_ws_change
;
4939 static int apply_option_parse_whitespace(const struct option
*opt
,
4940 const char *arg
, int unset
)
4942 struct apply_state
*state
= opt
->value
;
4944 BUG_ON_OPT_NEG(unset
);
4946 state
->whitespace_option
= arg
;
4947 if (parse_whitespace_option(state
, arg
))
4952 static int apply_option_parse_directory(const struct option
*opt
,
4953 const char *arg
, int unset
)
4955 struct apply_state
*state
= opt
->value
;
4957 BUG_ON_OPT_NEG(unset
);
4959 strbuf_reset(&state
->root
);
4960 strbuf_addstr(&state
->root
, arg
);
4961 strbuf_complete(&state
->root
, '/');
4965 int apply_all_patches(struct apply_state
*state
,
4975 for (i
= 0; i
< argc
; i
++) {
4976 const char *arg
= argv
[i
];
4977 char *to_free
= NULL
;
4980 if (!strcmp(arg
, "-")) {
4981 res
= apply_patch(state
, 0, "<stdin>", options
);
4988 arg
= to_free
= prefix_filename(state
->prefix
, arg
);
4990 fd
= open(arg
, O_RDONLY
);
4992 error(_("can't open patch '%s': %s"), arg
, strerror(errno
));
4998 set_default_whitespace_mode(state
);
4999 res
= apply_patch(state
, fd
, arg
, options
);
5006 set_default_whitespace_mode(state
);
5008 res
= apply_patch(state
, 0, "<stdin>", options
);
5014 if (state
->whitespace_error
) {
5015 if (state
->squelch_whitespace_errors
&&
5016 state
->squelch_whitespace_errors
< state
->whitespace_error
) {
5018 state
->whitespace_error
- state
->squelch_whitespace_errors
;
5019 warning(Q_("squelched %d whitespace error",
5020 "squelched %d whitespace errors",
5024 if (state
->ws_error_action
== die_on_ws_error
) {
5025 error(Q_("%d line adds whitespace errors.",
5026 "%d lines add whitespace errors.",
5027 state
->whitespace_error
),
5028 state
->whitespace_error
);
5032 if (state
->applied_after_fixing_ws
&& state
->apply
)
5033 warning(Q_("%d line applied after"
5034 " fixing whitespace errors.",
5035 "%d lines applied after"
5036 " fixing whitespace errors.",
5037 state
->applied_after_fixing_ws
),
5038 state
->applied_after_fixing_ws
);
5039 else if (state
->whitespace_error
)
5040 warning(Q_("%d line adds whitespace errors.",
5041 "%d lines add whitespace errors.",
5042 state
->whitespace_error
),
5043 state
->whitespace_error
);
5046 if (state
->update_index
) {
5047 res
= write_locked_index(state
->repo
->index
, &state
->lock_file
, COMMIT_LOCK
);
5049 error(_("Unable to write new index file"));
5058 rollback_lock_file(&state
->lock_file
);
5060 if (state
->apply_verbosity
<= verbosity_silent
) {
5061 set_error_routine(state
->saved_error_routine
);
5062 set_warn_routine(state
->saved_warn_routine
);
5067 return (res
== -1 ? 1 : 128);
5070 int apply_parse_options(int argc
, const char **argv
,
5071 struct apply_state
*state
,
5072 int *force_apply
, int *options
,
5073 const char * const *apply_usage
)
5075 struct option builtin_apply_options
[] = {
5076 OPT_CALLBACK_F(0, "exclude", state
, N_("path"),
5077 N_("don't apply changes matching the given path"),
5078 PARSE_OPT_NONEG
, apply_option_parse_exclude
),
5079 OPT_CALLBACK_F(0, "include", state
, N_("path"),
5080 N_("apply changes matching the given path"),
5081 PARSE_OPT_NONEG
, apply_option_parse_include
),
5082 OPT_CALLBACK('p', NULL
, state
, N_("num"),
5083 N_("remove <num> leading slashes from traditional diff paths"),
5084 apply_option_parse_p
),
5085 OPT_BOOL(0, "no-add", &state
->no_add
,
5086 N_("ignore additions made by the patch")),
5087 OPT_BOOL(0, "stat", &state
->diffstat
,
5088 N_("instead of applying the patch, output diffstat for the input")),
5089 OPT_NOOP_NOARG(0, "allow-binary-replacement"),
5090 OPT_NOOP_NOARG(0, "binary"),
5091 OPT_BOOL(0, "numstat", &state
->numstat
,
5092 N_("show number of added and deleted lines in decimal notation")),
5093 OPT_BOOL(0, "summary", &state
->summary
,
5094 N_("instead of applying the patch, output a summary for the input")),
5095 OPT_BOOL(0, "check", &state
->check
,
5096 N_("instead of applying the patch, see if the patch is applicable")),
5097 OPT_BOOL(0, "index", &state
->check_index
,
5098 N_("make sure the patch is applicable to the current index")),
5099 OPT_BOOL('N', "intent-to-add", &state
->ita_only
,
5100 N_("mark new files with `git add --intent-to-add`")),
5101 OPT_BOOL(0, "cached", &state
->cached
,
5102 N_("apply a patch without touching the working tree")),
5103 OPT_BOOL_F(0, "unsafe-paths", &state
->unsafe_paths
,
5104 N_("accept a patch that touches outside the working area"),
5105 PARSE_OPT_NOCOMPLETE
),
5106 OPT_BOOL(0, "apply", force_apply
,
5107 N_("also apply the patch (use with --stat/--summary/--check)")),
5108 OPT_BOOL('3', "3way", &state
->threeway
,
5109 N_( "attempt three-way merge, fall back on normal patch if that fails")),
5110 OPT_FILENAME(0, "build-fake-ancestor", &state
->fake_ancestor
,
5111 N_("build a temporary index based on embedded index information")),
5112 /* Think twice before adding "--nul" synonym to this */
5113 OPT_SET_INT('z', NULL
, &state
->line_termination
,
5114 N_("paths are separated with NUL character"), '\0'),
5115 OPT_INTEGER('C', NULL
, &state
->p_context
,
5116 N_("ensure at least <n> lines of context match")),
5117 OPT_CALLBACK(0, "whitespace", state
, N_("action"),
5118 N_("detect new or modified lines that have whitespace errors"),
5119 apply_option_parse_whitespace
),
5120 OPT_CALLBACK_F(0, "ignore-space-change", state
, NULL
,
5121 N_("ignore changes in whitespace when finding context"),
5122 PARSE_OPT_NOARG
, apply_option_parse_space_change
),
5123 OPT_CALLBACK_F(0, "ignore-whitespace", state
, NULL
,
5124 N_("ignore changes in whitespace when finding context"),
5125 PARSE_OPT_NOARG
, apply_option_parse_space_change
),
5126 OPT_BOOL('R', "reverse", &state
->apply_in_reverse
,
5127 N_("apply the patch in reverse")),
5128 OPT_BOOL(0, "unidiff-zero", &state
->unidiff_zero
,
5129 N_("don't expect at least one line of context")),
5130 OPT_BOOL(0, "reject", &state
->apply_with_reject
,
5131 N_("leave the rejected hunks in corresponding *.rej files")),
5132 OPT_BOOL(0, "allow-overlap", &state
->allow_overlap
,
5133 N_("allow overlapping hunks")),
5134 OPT__VERBOSITY(&state
->apply_verbosity
),
5135 OPT_BIT(0, "inaccurate-eof", options
,
5136 N_("tolerate incorrectly detected missing new-line at the end of file"),
5137 APPLY_OPT_INACCURATE_EOF
),
5138 OPT_BIT(0, "recount", options
,
5139 N_("do not trust the line counts in the hunk headers"),
5141 OPT_CALLBACK(0, "directory", state
, N_("root"),
5142 N_("prepend <root> to all filenames"),
5143 apply_option_parse_directory
),
5144 OPT_BOOL(0, "allow-empty", &state
->allow_empty
,
5145 N_("don't return error for empty patches")),
5149 return parse_options(argc
, argv
, state
->prefix
, builtin_apply_options
, apply_usage
, 0);