4 * Copyright (C) Linus Torvalds, 2005
6 * This applies patches on top of some (arbitrary) version of the SCM.
10 #include "cache-tree.h"
15 #include "string-list.h"
18 #include "parse-options.h"
19 #include "xdiff-interface.h"
24 * --check turns on checking that the working tree matches the
25 * files that are being modified, but doesn't apply the patch
26 * --stat does just a diffstat, and doesn't actually apply
27 * --numstat does numeric diffstat, and doesn't actually apply
28 * --index-info shows the old and new index info for paths if available.
29 * --index updates the cache as well.
30 * --cached updates only the cache without ever touching the working tree.
32 static const char *prefix
;
33 static int prefix_length
= -1;
34 static int newfd
= -1;
36 static int unidiff_zero
;
37 static int p_value
= 1;
38 static int p_value_known
;
39 static int check_index
;
40 static int update_index
;
47 static int apply_in_reverse
;
48 static int apply_with_reject
;
49 static int apply_verbosely
;
50 static int allow_overlap
;
53 static const char *fake_ancestor
;
54 static int line_termination
= '\n';
55 static unsigned int p_context
= UINT_MAX
;
56 static const char * const apply_usage
[] = {
57 N_("git apply [options] [<patch>...]"),
61 static enum ws_error_action
{
66 } ws_error_action
= warn_on_ws_error
;
67 static int whitespace_error
;
68 static int squelch_whitespace_errors
= 5;
69 static int applied_after_fixing_ws
;
71 static enum ws_ignore
{
74 } ws_ignore_action
= ignore_ws_none
;
77 static const char *patch_input_file
;
78 static const char *root
;
80 static int read_stdin
= 1;
83 static void parse_whitespace_option(const char *option
)
86 ws_error_action
= warn_on_ws_error
;
89 if (!strcmp(option
, "warn")) {
90 ws_error_action
= warn_on_ws_error
;
93 if (!strcmp(option
, "nowarn")) {
94 ws_error_action
= nowarn_ws_error
;
97 if (!strcmp(option
, "error")) {
98 ws_error_action
= die_on_ws_error
;
101 if (!strcmp(option
, "error-all")) {
102 ws_error_action
= die_on_ws_error
;
103 squelch_whitespace_errors
= 0;
106 if (!strcmp(option
, "strip") || !strcmp(option
, "fix")) {
107 ws_error_action
= correct_ws_error
;
110 die(_("unrecognized whitespace option '%s'"), option
);
113 static void parse_ignorewhitespace_option(const char *option
)
115 if (!option
|| !strcmp(option
, "no") ||
116 !strcmp(option
, "false") || !strcmp(option
, "never") ||
117 !strcmp(option
, "none")) {
118 ws_ignore_action
= ignore_ws_none
;
121 if (!strcmp(option
, "change")) {
122 ws_ignore_action
= ignore_ws_change
;
125 die(_("unrecognized whitespace ignore option '%s'"), option
);
128 static void set_default_whitespace_mode(const char *whitespace_option
)
130 if (!whitespace_option
&& !apply_default_whitespace
)
131 ws_error_action
= (apply
? warn_on_ws_error
: nowarn_ws_error
);
135 * For "diff-stat" like behaviour, we keep track of the biggest change
136 * we've seen, and the longest filename. That allows us to do simple
139 static int max_change
, max_len
;
142 * Various "current state", notably line numbers and what
143 * file (and how) we're patching right now.. The "is_xxxx"
144 * things are flags, where -1 means "don't know yet".
146 static int linenr
= 1;
149 * This represents one "hunk" from a patch, starting with
150 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The
151 * patch text is pointed at by patch, and its byte length
152 * is stored in size. leading and trailing are the number
156 unsigned long leading
, trailing
;
157 unsigned long oldpos
, oldlines
;
158 unsigned long newpos
, newlines
;
160 * 'patch' is usually borrowed from buf in apply_patch(),
161 * but some codepaths store an allocated buffer.
164 unsigned free_patch
:1,
168 struct fragment
*next
;
172 * When dealing with a binary patch, we reuse "leading" field
173 * to store the type of the binary hunk, either deflated "delta"
174 * or deflated "literal".
176 #define binary_patch_method leading
177 #define BINARY_DELTA_DEFLATED 1
178 #define BINARY_LITERAL_DEFLATED 2
181 * This represents a "patch" to a file, both metainfo changes
182 * such as creation/deletion, filemode and content changes represented
183 * as a series of fragments.
186 char *new_name
, *old_name
, *def_name
;
187 unsigned int old_mode
, new_mode
;
188 int is_new
, is_delete
; /* -1 = unknown, 0 = false, 1 = true */
191 int lines_added
, lines_deleted
;
193 unsigned int is_toplevel_relative
:1;
194 unsigned int inaccurate_eof
:1;
195 unsigned int is_binary
:1;
196 unsigned int is_copy
:1;
197 unsigned int is_rename
:1;
198 unsigned int recount
:1;
199 unsigned int conflicted_threeway
:1;
200 unsigned int direct_to_threeway
:1;
201 struct fragment
*fragments
;
204 char old_sha1_prefix
[41];
205 char new_sha1_prefix
[41];
208 /* three-way fallback result */
209 unsigned char threeway_stage
[3][20];
212 static void free_fragment_list(struct fragment
*list
)
215 struct fragment
*next
= list
->next
;
216 if (list
->free_patch
)
217 free((char *)list
->patch
);
223 static void free_patch(struct patch
*patch
)
225 free_fragment_list(patch
->fragments
);
226 free(patch
->def_name
);
227 free(patch
->old_name
);
228 free(patch
->new_name
);
233 static void free_patch_list(struct patch
*list
)
236 struct patch
*next
= list
->next
;
243 * A line in a file, len-bytes long (includes the terminating LF,
244 * except for an incomplete line at the end if the file ends with
245 * one), and its contents hashes to 'hash'.
251 #define LINE_COMMON 1
252 #define LINE_PATCHED 2
256 * This represents a "file", which is an array of "lines".
263 struct line
*line_allocated
;
268 * Records filenames that have been touched, in order to handle
269 * the case where more than one patches touch the same file.
272 static struct string_list fn_table
;
274 static uint32_t hash_line(const char *cp
, size_t len
)
278 for (i
= 0, h
= 0; i
< len
; i
++) {
279 if (!isspace(cp
[i
])) {
280 h
= h
* 3 + (cp
[i
] & 0xff);
287 * Compare lines s1 of length n1 and s2 of length n2, ignoring
288 * whitespace difference. Returns 1 if they match, 0 otherwise
290 static int fuzzy_matchlines(const char *s1
, size_t n1
,
291 const char *s2
, size_t n2
)
293 const char *last1
= s1
+ n1
- 1;
294 const char *last2
= s2
+ n2
- 1;
297 /* ignore line endings */
298 while ((*last1
== '\r') || (*last1
== '\n'))
300 while ((*last2
== '\r') || (*last2
== '\n'))
303 /* skip leading whitespaces, if both begin with whitespace */
304 if (s1
<= last1
&& s2
<= last2
&& isspace(*s1
) && isspace(*s2
)) {
305 while (isspace(*s1
) && (s1
<= last1
))
307 while (isspace(*s2
) && (s2
<= last2
))
310 /* early return if both lines are empty */
311 if ((s1
> last1
) && (s2
> last2
))
314 result
= *s1
++ - *s2
++;
316 * Skip whitespace inside. We check for whitespace on
317 * both buffers because we don't want "a b" to match
320 if (isspace(*s1
) && isspace(*s2
)) {
321 while (isspace(*s1
) && s1
<= last1
)
323 while (isspace(*s2
) && s2
<= last2
)
327 * If we reached the end on one side only,
331 ((s2
> last2
) && (s1
<= last1
)) ||
332 ((s1
> last1
) && (s2
<= last2
)))
334 if ((s1
> last1
) && (s2
> last2
))
341 static void add_line_info(struct image
*img
, const char *bol
, size_t len
, unsigned flag
)
343 ALLOC_GROW(img
->line_allocated
, img
->nr
+ 1, img
->alloc
);
344 img
->line_allocated
[img
->nr
].len
= len
;
345 img
->line_allocated
[img
->nr
].hash
= hash_line(bol
, len
);
346 img
->line_allocated
[img
->nr
].flag
= flag
;
351 * "buf" has the file contents to be patched (read from various sources).
352 * attach it to "image" and add line-based index to it.
353 * "image" now owns the "buf".
355 static void prepare_image(struct image
*image
, char *buf
, size_t len
,
356 int prepare_linetable
)
360 memset(image
, 0, sizeof(*image
));
364 if (!prepare_linetable
)
367 ep
= image
->buf
+ image
->len
;
371 for (next
= cp
; next
< ep
&& *next
!= '\n'; next
++)
375 add_line_info(image
, cp
, next
- cp
, 0);
378 image
->line
= image
->line_allocated
;
381 static void clear_image(struct image
*image
)
384 free(image
->line_allocated
);
385 memset(image
, 0, sizeof(*image
));
388 /* fmt must contain _one_ %s and no other substitution */
389 static void say_patch_name(FILE *output
, const char *fmt
, struct patch
*patch
)
391 struct strbuf sb
= STRBUF_INIT
;
393 if (patch
->old_name
&& patch
->new_name
&&
394 strcmp(patch
->old_name
, patch
->new_name
)) {
395 quote_c_style(patch
->old_name
, &sb
, NULL
, 0);
396 strbuf_addstr(&sb
, " => ");
397 quote_c_style(patch
->new_name
, &sb
, NULL
, 0);
399 const char *n
= patch
->new_name
;
402 quote_c_style(n
, &sb
, NULL
, 0);
404 fprintf(output
, fmt
, sb
.buf
);
411 static void read_patch_file(struct strbuf
*sb
, int fd
)
413 if (strbuf_read(sb
, fd
, 0) < 0)
414 die_errno("git apply: failed to read");
417 * Make sure that we have some slop in the buffer
418 * so that we can do speculative "memcmp" etc, and
419 * see to it that it is NUL-filled.
421 strbuf_grow(sb
, SLOP
);
422 memset(sb
->buf
+ sb
->len
, 0, SLOP
);
425 static unsigned long linelen(const char *buffer
, unsigned long size
)
427 unsigned long len
= 0;
430 if (*buffer
++ == '\n')
436 static int is_dev_null(const char *str
)
438 return !memcmp("/dev/null", str
, 9) && isspace(str
[9]);
444 static int name_terminate(const char *name
, int namelen
, int c
, int terminate
)
446 if (c
== ' ' && !(terminate
& TERM_SPACE
))
448 if (c
== '\t' && !(terminate
& TERM_TAB
))
454 /* remove double slashes to make --index work with such filenames */
455 static char *squash_slash(char *name
)
463 if ((name
[j
++] = name
[i
++]) == '/')
464 while (name
[i
] == '/')
471 static char *find_name_gnu(const char *line
, const char *def
, int p_value
)
473 struct strbuf name
= STRBUF_INIT
;
477 * Proposed "new-style" GNU patch/diff format; see
478 * http://marc.info/?l=git&m=112927316408690&w=2
480 if (unquote_c_style(&name
, line
, NULL
)) {
481 strbuf_release(&name
);
485 for (cp
= name
.buf
; p_value
; p_value
--) {
486 cp
= strchr(cp
, '/');
488 strbuf_release(&name
);
494 strbuf_remove(&name
, 0, cp
- name
.buf
);
496 strbuf_insert(&name
, 0, root
, root_len
);
497 return squash_slash(strbuf_detach(&name
, NULL
));
500 static size_t sane_tz_len(const char *line
, size_t len
)
504 if (len
< strlen(" +0500") || line
[len
-strlen(" +0500")] != ' ')
506 tz
= line
+ len
- strlen(" +0500");
508 if (tz
[1] != '+' && tz
[1] != '-')
511 for (p
= tz
+ 2; p
!= line
+ len
; p
++)
515 return line
+ len
- tz
;
518 static size_t tz_with_colon_len(const char *line
, size_t len
)
522 if (len
< strlen(" +08:00") || line
[len
- strlen(":00")] != ':')
524 tz
= line
+ len
- strlen(" +08:00");
526 if (tz
[0] != ' ' || (tz
[1] != '+' && tz
[1] != '-'))
529 if (!isdigit(*p
++) || !isdigit(*p
++) || *p
++ != ':' ||
530 !isdigit(*p
++) || !isdigit(*p
++))
533 return line
+ len
- tz
;
536 static size_t date_len(const char *line
, size_t len
)
538 const char *date
, *p
;
540 if (len
< strlen("72-02-05") || line
[len
-strlen("-05")] != '-')
542 p
= date
= line
+ len
- strlen("72-02-05");
544 if (!isdigit(*p
++) || !isdigit(*p
++) || *p
++ != '-' ||
545 !isdigit(*p
++) || !isdigit(*p
++) || *p
++ != '-' ||
546 !isdigit(*p
++) || !isdigit(*p
++)) /* Not a date. */
549 if (date
- line
>= strlen("19") &&
550 isdigit(date
[-1]) && isdigit(date
[-2])) /* 4-digit year */
551 date
-= strlen("19");
553 return line
+ len
- date
;
556 static size_t short_time_len(const char *line
, size_t len
)
558 const char *time
, *p
;
560 if (len
< strlen(" 07:01:32") || line
[len
-strlen(":32")] != ':')
562 p
= time
= line
+ len
- strlen(" 07:01:32");
564 /* Permit 1-digit hours? */
566 !isdigit(*p
++) || !isdigit(*p
++) || *p
++ != ':' ||
567 !isdigit(*p
++) || !isdigit(*p
++) || *p
++ != ':' ||
568 !isdigit(*p
++) || !isdigit(*p
++)) /* Not a time. */
571 return line
+ len
- time
;
574 static size_t fractional_time_len(const char *line
, size_t len
)
579 /* Expected format: 19:41:17.620000023 */
580 if (!len
|| !isdigit(line
[len
- 1]))
584 /* Fractional seconds. */
585 while (p
> line
&& isdigit(*p
))
590 /* Hours, minutes, and whole seconds. */
591 n
= short_time_len(line
, p
- line
);
595 return line
+ len
- p
+ n
;
598 static size_t trailing_spaces_len(const char *line
, size_t len
)
602 /* Expected format: ' ' x (1 or more) */
603 if (!len
|| line
[len
- 1] != ' ')
610 return line
+ len
- (p
+ 1);
617 static size_t diff_timestamp_len(const char *line
, size_t len
)
619 const char *end
= line
+ len
;
623 * Posix: 2010-07-05 19:41:17
624 * GNU: 2010-07-05 19:41:17.620000023 -0500
627 if (!isdigit(end
[-1]))
630 n
= sane_tz_len(line
, end
- line
);
632 n
= tz_with_colon_len(line
, end
- line
);
635 n
= short_time_len(line
, end
- line
);
637 n
= fractional_time_len(line
, end
- line
);
640 n
= date_len(line
, end
- line
);
641 if (!n
) /* No date. Too bad. */
645 if (end
== line
) /* No space before date. */
647 if (end
[-1] == '\t') { /* Success! */
649 return line
+ len
- end
;
651 if (end
[-1] != ' ') /* No space before date. */
654 /* Whitespace damage. */
655 end
-= trailing_spaces_len(line
, end
- line
);
656 return line
+ len
- end
;
659 static char *null_strdup(const char *s
)
661 return s
? xstrdup(s
) : NULL
;
664 static char *find_name_common(const char *line
, const char *def
,
665 int p_value
, const char *end
, int terminate
)
668 const char *start
= NULL
;
672 while (line
!= end
) {
675 if (!end
&& isspace(c
)) {
678 if (name_terminate(start
, line
-start
, c
, terminate
))
682 if (c
== '/' && !--p_value
)
686 return squash_slash(null_strdup(def
));
689 return squash_slash(null_strdup(def
));
692 * Generally we prefer the shorter name, especially
693 * if the other one is just a variation of that with
694 * something else tacked on to the end (ie "file.orig"
698 int deflen
= strlen(def
);
699 if (deflen
< len
&& !strncmp(start
, def
, deflen
))
700 return squash_slash(xstrdup(def
));
704 char *ret
= xmalloc(root_len
+ len
+ 1);
706 memcpy(ret
+ root_len
, start
, len
);
707 ret
[root_len
+ len
] = '\0';
708 return squash_slash(ret
);
711 return squash_slash(xmemdupz(start
, len
));
714 static char *find_name(const char *line
, char *def
, int p_value
, int terminate
)
717 char *name
= find_name_gnu(line
, def
, p_value
);
722 return find_name_common(line
, def
, p_value
, NULL
, terminate
);
725 static char *find_name_traditional(const char *line
, char *def
, int p_value
)
731 char *name
= find_name_gnu(line
, def
, p_value
);
736 len
= strchrnul(line
, '\n') - line
;
737 date_len
= diff_timestamp_len(line
, len
);
739 return find_name_common(line
, def
, p_value
, NULL
, TERM_TAB
);
742 return find_name_common(line
, def
, p_value
, line
+ len
, 0);
745 static int count_slashes(const char *cp
)
757 * Given the string after "--- " or "+++ ", guess the appropriate
758 * p_value for the given patch.
760 static int guess_p_value(const char *nameline
)
765 if (is_dev_null(nameline
))
767 name
= find_name_traditional(nameline
, NULL
, 0);
770 cp
= strchr(name
, '/');
775 * Does it begin with "a/$our-prefix" and such? Then this is
776 * very likely to apply to our directory.
778 if (!strncmp(name
, prefix
, prefix_length
))
779 val
= count_slashes(prefix
);
782 if (!strncmp(cp
, prefix
, prefix_length
))
783 val
= count_slashes(prefix
) + 1;
791 * Does the ---/+++ line has the POSIX timestamp after the last HT?
792 * GNU diff puts epoch there to signal a creation/deletion event. Is
793 * this such a timestamp?
795 static int has_epoch_timestamp(const char *nameline
)
798 * We are only interested in epoch timestamp; any non-zero
799 * fraction cannot be one, hence "(\.0+)?" in the regexp below.
800 * For the same reason, the date must be either 1969-12-31 or
801 * 1970-01-01, and the seconds part must be "00".
803 const char stamp_regexp
[] =
804 "^(1969-12-31|1970-01-01)"
806 "[0-2][0-9]:[0-5][0-9]:00(\\.0+)?"
808 "([-+][0-2][0-9]:?[0-5][0-9])\n";
809 const char *timestamp
= NULL
, *cp
, *colon
;
810 static regex_t
*stamp
;
816 for (cp
= nameline
; *cp
!= '\n'; cp
++) {
823 stamp
= xmalloc(sizeof(*stamp
));
824 if (regcomp(stamp
, stamp_regexp
, REG_EXTENDED
)) {
825 warning(_("Cannot prepare timestamp regexp %s"),
831 status
= regexec(stamp
, timestamp
, ARRAY_SIZE(m
), m
, 0);
833 if (status
!= REG_NOMATCH
)
834 warning(_("regexec returned %d for input: %s"),
839 zoneoffset
= strtol(timestamp
+ m
[3].rm_so
+ 1, (char **) &colon
, 10);
841 zoneoffset
= zoneoffset
* 60 + strtol(colon
+ 1, NULL
, 10);
843 zoneoffset
= (zoneoffset
/ 100) * 60 + (zoneoffset
% 100);
844 if (timestamp
[m
[3].rm_so
] == '-')
845 zoneoffset
= -zoneoffset
;
848 * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31
849 * (west of GMT) or 1970-01-01 (east of GMT)
851 if ((zoneoffset
< 0 && memcmp(timestamp
, "1969-12-31", 10)) ||
852 (0 <= zoneoffset
&& memcmp(timestamp
, "1970-01-01", 10)))
855 hourminute
= (strtol(timestamp
+ 11, NULL
, 10) * 60 +
856 strtol(timestamp
+ 14, NULL
, 10) -
859 return ((zoneoffset
< 0 && hourminute
== 1440) ||
860 (0 <= zoneoffset
&& !hourminute
));
864 * Get the name etc info from the ---/+++ lines of a traditional patch header
866 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
867 * files, we can happily check the index for a match, but for creating a
868 * new file we should try to match whatever "patch" does. I have no idea.
870 static void parse_traditional_patch(const char *first
, const char *second
, struct patch
*patch
)
874 first
+= 4; /* skip "--- " */
875 second
+= 4; /* skip "+++ " */
876 if (!p_value_known
) {
878 p
= guess_p_value(first
);
879 q
= guess_p_value(second
);
881 if (0 <= p
&& p
== q
) {
886 if (is_dev_null(first
)) {
888 patch
->is_delete
= 0;
889 name
= find_name_traditional(second
, NULL
, p_value
);
890 patch
->new_name
= name
;
891 } else if (is_dev_null(second
)) {
893 patch
->is_delete
= 1;
894 name
= find_name_traditional(first
, NULL
, p_value
);
895 patch
->old_name
= name
;
898 first_name
= find_name_traditional(first
, NULL
, p_value
);
899 name
= find_name_traditional(second
, first_name
, p_value
);
901 if (has_epoch_timestamp(first
)) {
903 patch
->is_delete
= 0;
904 patch
->new_name
= name
;
905 } else if (has_epoch_timestamp(second
)) {
907 patch
->is_delete
= 1;
908 patch
->old_name
= name
;
910 patch
->old_name
= name
;
911 patch
->new_name
= null_strdup(name
);
915 die(_("unable to find filename in patch at line %d"), linenr
);
918 static int gitdiff_hdrend(const char *line
, struct patch
*patch
)
924 * We're anal about diff header consistency, to make
925 * sure that we don't end up having strange ambiguous
926 * patches floating around.
928 * As a result, gitdiff_{old|new}name() will check
929 * their names against any previous information, just
932 #define DIFF_OLD_NAME 0
933 #define DIFF_NEW_NAME 1
935 static char *gitdiff_verify_name(const char *line
, int isnull
, char *orig_name
, int side
)
937 if (!orig_name
&& !isnull
)
938 return find_name(line
, NULL
, p_value
, TERM_TAB
);
947 die(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"), name
, linenr
);
948 another
= find_name(line
, NULL
, p_value
, TERM_TAB
);
949 if (!another
|| memcmp(another
, name
, len
+ 1))
950 die((side
== DIFF_NEW_NAME
) ?
951 _("git apply: bad git-diff - inconsistent new filename on line %d") :
952 _("git apply: bad git-diff - inconsistent old filename on line %d"), linenr
);
957 /* expect "/dev/null" */
958 if (memcmp("/dev/null", line
, 9) || line
[9] != '\n')
959 die(_("git apply: bad git-diff - expected /dev/null on line %d"), linenr
);
964 static int gitdiff_oldname(const char *line
, struct patch
*patch
)
966 char *orig
= patch
->old_name
;
967 patch
->old_name
= gitdiff_verify_name(line
, patch
->is_new
, patch
->old_name
,
969 if (orig
!= patch
->old_name
)
974 static int gitdiff_newname(const char *line
, struct patch
*patch
)
976 char *orig
= patch
->new_name
;
977 patch
->new_name
= gitdiff_verify_name(line
, patch
->is_delete
, patch
->new_name
,
979 if (orig
!= patch
->new_name
)
984 static int gitdiff_oldmode(const char *line
, struct patch
*patch
)
986 patch
->old_mode
= strtoul(line
, NULL
, 8);
990 static int gitdiff_newmode(const char *line
, struct patch
*patch
)
992 patch
->new_mode
= strtoul(line
, NULL
, 8);
996 static int gitdiff_delete(const char *line
, struct patch
*patch
)
998 patch
->is_delete
= 1;
999 free(patch
->old_name
);
1000 patch
->old_name
= null_strdup(patch
->def_name
);
1001 return gitdiff_oldmode(line
, patch
);
1004 static int gitdiff_newfile(const char *line
, struct patch
*patch
)
1007 free(patch
->new_name
);
1008 patch
->new_name
= null_strdup(patch
->def_name
);
1009 return gitdiff_newmode(line
, patch
);
1012 static int gitdiff_copysrc(const char *line
, struct patch
*patch
)
1015 free(patch
->old_name
);
1016 patch
->old_name
= find_name(line
, NULL
, p_value
? p_value
- 1 : 0, 0);
1020 static int gitdiff_copydst(const char *line
, struct patch
*patch
)
1023 free(patch
->new_name
);
1024 patch
->new_name
= find_name(line
, NULL
, p_value
? p_value
- 1 : 0, 0);
1028 static int gitdiff_renamesrc(const char *line
, struct patch
*patch
)
1030 patch
->is_rename
= 1;
1031 free(patch
->old_name
);
1032 patch
->old_name
= find_name(line
, NULL
, p_value
? p_value
- 1 : 0, 0);
1036 static int gitdiff_renamedst(const char *line
, struct patch
*patch
)
1038 patch
->is_rename
= 1;
1039 free(patch
->new_name
);
1040 patch
->new_name
= find_name(line
, NULL
, p_value
? p_value
- 1 : 0, 0);
1044 static int gitdiff_similarity(const char *line
, struct patch
*patch
)
1046 unsigned long val
= strtoul(line
, NULL
, 10);
1052 static int gitdiff_dissimilarity(const char *line
, struct patch
*patch
)
1054 unsigned long val
= strtoul(line
, NULL
, 10);
1060 static int gitdiff_index(const char *line
, struct patch
*patch
)
1063 * index line is N hexadecimal, "..", N hexadecimal,
1064 * and optional space with octal mode.
1066 const char *ptr
, *eol
;
1069 ptr
= strchr(line
, '.');
1070 if (!ptr
|| ptr
[1] != '.' || 40 < ptr
- line
)
1073 memcpy(patch
->old_sha1_prefix
, line
, len
);
1074 patch
->old_sha1_prefix
[len
] = 0;
1077 ptr
= strchr(line
, ' ');
1078 eol
= strchr(line
, '\n');
1080 if (!ptr
|| eol
< ptr
)
1086 memcpy(patch
->new_sha1_prefix
, line
, len
);
1087 patch
->new_sha1_prefix
[len
] = 0;
1089 patch
->old_mode
= strtoul(ptr
+1, NULL
, 8);
1094 * This is normal for a diff that doesn't change anything: we'll fall through
1095 * into the next diff. Tell the parser to break out.
1097 static int gitdiff_unrecognized(const char *line
, struct patch
*patch
)
1103 * Skip p_value leading components from "line"; as we do not accept
1104 * absolute paths, return NULL in that case.
1106 static const char *skip_tree_prefix(const char *line
, int llen
)
1112 return (llen
&& line
[0] == '/') ? NULL
: line
;
1115 for (i
= 0; i
< llen
; i
++) {
1117 if (ch
== '/' && --nslash
<= 0)
1118 return (i
== 0) ? NULL
: &line
[i
+ 1];
1124 * This is to extract the same name that appears on "diff --git"
1125 * line. We do not find and return anything if it is a rename
1126 * patch, and it is OK because we will find the name elsewhere.
1127 * We need to reliably find name only when it is mode-change only,
1128 * creation or deletion of an empty file. In any of these cases,
1129 * both sides are the same name under a/ and b/ respectively.
1131 static char *git_header_name(const char *line
, int llen
)
1134 const char *second
= NULL
;
1135 size_t len
, line_len
;
1137 line
+= strlen("diff --git ");
1138 llen
-= strlen("diff --git ");
1142 struct strbuf first
= STRBUF_INIT
;
1143 struct strbuf sp
= STRBUF_INIT
;
1145 if (unquote_c_style(&first
, line
, &second
))
1146 goto free_and_fail1
;
1148 /* strip the a/b prefix including trailing slash */
1149 cp
= skip_tree_prefix(first
.buf
, first
.len
);
1151 goto free_and_fail1
;
1152 strbuf_remove(&first
, 0, cp
- first
.buf
);
1155 * second points at one past closing dq of name.
1156 * find the second name.
1158 while ((second
< line
+ llen
) && isspace(*second
))
1161 if (line
+ llen
<= second
)
1162 goto free_and_fail1
;
1163 if (*second
== '"') {
1164 if (unquote_c_style(&sp
, second
, NULL
))
1165 goto free_and_fail1
;
1166 cp
= skip_tree_prefix(sp
.buf
, sp
.len
);
1168 goto free_and_fail1
;
1169 /* They must match, otherwise ignore */
1170 if (strcmp(cp
, first
.buf
))
1171 goto free_and_fail1
;
1172 strbuf_release(&sp
);
1173 return strbuf_detach(&first
, NULL
);
1176 /* unquoted second */
1177 cp
= skip_tree_prefix(second
, line
+ llen
- second
);
1179 goto free_and_fail1
;
1180 if (line
+ llen
- cp
!= first
.len
||
1181 memcmp(first
.buf
, cp
, first
.len
))
1182 goto free_and_fail1
;
1183 return strbuf_detach(&first
, NULL
);
1186 strbuf_release(&first
);
1187 strbuf_release(&sp
);
1191 /* unquoted first name */
1192 name
= skip_tree_prefix(line
, llen
);
1197 * since the first name is unquoted, a dq if exists must be
1198 * the beginning of the second name.
1200 for (second
= name
; second
< line
+ llen
; second
++) {
1201 if (*second
== '"') {
1202 struct strbuf sp
= STRBUF_INIT
;
1205 if (unquote_c_style(&sp
, second
, NULL
))
1206 goto free_and_fail2
;
1208 np
= skip_tree_prefix(sp
.buf
, sp
.len
);
1210 goto free_and_fail2
;
1212 len
= sp
.buf
+ sp
.len
- np
;
1213 if (len
< second
- name
&&
1214 !strncmp(np
, name
, len
) &&
1215 isspace(name
[len
])) {
1217 strbuf_remove(&sp
, 0, np
- sp
.buf
);
1218 return strbuf_detach(&sp
, NULL
);
1222 strbuf_release(&sp
);
1228 * Accept a name only if it shows up twice, exactly the same
1231 second
= strchr(name
, '\n');
1234 line_len
= second
- name
;
1235 for (len
= 0 ; ; len
++) {
1236 switch (name
[len
]) {
1241 case '\t': case ' ':
1243 * Is this the separator between the preimage
1244 * and the postimage pathname? Again, we are
1245 * only interested in the case where there is
1246 * no rename, as this is only to set def_name
1247 * and a rename patch has the names elsewhere
1248 * in an unambiguous form.
1251 return NULL
; /* no postimage name */
1252 second
= skip_tree_prefix(name
+ len
+ 1,
1253 line_len
- (len
+ 1));
1257 * Does len bytes starting at "name" and "second"
1258 * (that are separated by one HT or SP we just
1259 * found) exactly match?
1261 if (second
[len
] == '\n' && !strncmp(name
, second
, len
))
1262 return xmemdupz(name
, len
);
1267 /* Verify that we recognize the lines following a git header */
1268 static int parse_git_header(const char *line
, int len
, unsigned int size
, struct patch
*patch
)
1270 unsigned long offset
;
1272 /* A git diff has explicit new/delete information, so we don't guess */
1274 patch
->is_delete
= 0;
1277 * Some things may not have the old name in the
1278 * rest of the headers anywhere (pure mode changes,
1279 * or removing or adding empty files), so we get
1280 * the default name from the header.
1282 patch
->def_name
= git_header_name(line
, len
);
1283 if (patch
->def_name
&& root
) {
1284 char *s
= xstrfmt("%s%s", root
, patch
->def_name
);
1285 free(patch
->def_name
);
1286 patch
->def_name
= s
;
1292 for (offset
= len
; size
> 0 ; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
1293 static const struct opentry
{
1295 int (*fn
)(const char *, struct patch
*);
1297 { "@@ -", gitdiff_hdrend
},
1298 { "--- ", gitdiff_oldname
},
1299 { "+++ ", gitdiff_newname
},
1300 { "old mode ", gitdiff_oldmode
},
1301 { "new mode ", gitdiff_newmode
},
1302 { "deleted file mode ", gitdiff_delete
},
1303 { "new file mode ", gitdiff_newfile
},
1304 { "copy from ", gitdiff_copysrc
},
1305 { "copy to ", gitdiff_copydst
},
1306 { "rename old ", gitdiff_renamesrc
},
1307 { "rename new ", gitdiff_renamedst
},
1308 { "rename from ", gitdiff_renamesrc
},
1309 { "rename to ", gitdiff_renamedst
},
1310 { "similarity index ", gitdiff_similarity
},
1311 { "dissimilarity index ", gitdiff_dissimilarity
},
1312 { "index ", gitdiff_index
},
1313 { "", gitdiff_unrecognized
},
1317 len
= linelen(line
, size
);
1318 if (!len
|| line
[len
-1] != '\n')
1320 for (i
= 0; i
< ARRAY_SIZE(optable
); i
++) {
1321 const struct opentry
*p
= optable
+ i
;
1322 int oplen
= strlen(p
->str
);
1323 if (len
< oplen
|| memcmp(p
->str
, line
, oplen
))
1325 if (p
->fn(line
+ oplen
, patch
) < 0)
1334 static int parse_num(const char *line
, unsigned long *p
)
1338 if (!isdigit(*line
))
1340 *p
= strtoul(line
, &ptr
, 10);
1344 static int parse_range(const char *line
, int len
, int offset
, const char *expect
,
1345 unsigned long *p1
, unsigned long *p2
)
1349 if (offset
< 0 || offset
>= len
)
1354 digits
= parse_num(line
, p1
);
1364 digits
= parse_num(line
+1, p2
);
1373 ex
= strlen(expect
);
1376 if (memcmp(line
, expect
, ex
))
1382 static void recount_diff(const char *line
, int size
, struct fragment
*fragment
)
1384 int oldlines
= 0, newlines
= 0, ret
= 0;
1387 warning("recount: ignore empty hunk");
1392 int len
= linelen(line
, size
);
1400 case ' ': case '\n':
1412 ret
= size
< 3 || !starts_with(line
, "@@ ");
1415 ret
= size
< 5 || !starts_with(line
, "diff ");
1422 warning(_("recount: unexpected line: %.*s"),
1423 (int)linelen(line
, size
), line
);
1428 fragment
->oldlines
= oldlines
;
1429 fragment
->newlines
= newlines
;
1433 * Parse a unified diff fragment header of the
1434 * form "@@ -a,b +c,d @@"
1436 static int parse_fragment_header(const char *line
, int len
, struct fragment
*fragment
)
1440 if (!len
|| line
[len
-1] != '\n')
1443 /* Figure out the number of lines in a fragment */
1444 offset
= parse_range(line
, len
, 4, " +", &fragment
->oldpos
, &fragment
->oldlines
);
1445 offset
= parse_range(line
, len
, offset
, " @@", &fragment
->newpos
, &fragment
->newlines
);
1450 static int find_header(const char *line
, unsigned long size
, int *hdrsize
, struct patch
*patch
)
1452 unsigned long offset
, len
;
1454 patch
->is_toplevel_relative
= 0;
1455 patch
->is_rename
= patch
->is_copy
= 0;
1456 patch
->is_new
= patch
->is_delete
= -1;
1457 patch
->old_mode
= patch
->new_mode
= 0;
1458 patch
->old_name
= patch
->new_name
= NULL
;
1459 for (offset
= 0; size
> 0; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
1460 unsigned long nextlen
;
1462 len
= linelen(line
, size
);
1466 /* Testing this early allows us to take a few shortcuts.. */
1471 * Make sure we don't find any unconnected patch fragments.
1472 * That's a sign that we didn't find a header, and that a
1473 * patch has become corrupted/broken up.
1475 if (!memcmp("@@ -", line
, 4)) {
1476 struct fragment dummy
;
1477 if (parse_fragment_header(line
, len
, &dummy
) < 0)
1479 die(_("patch fragment without header at line %d: %.*s"),
1480 linenr
, (int)len
-1, line
);
1487 * Git patch? It might not have a real patch, just a rename
1488 * or mode change, so we handle that specially
1490 if (!memcmp("diff --git ", line
, 11)) {
1491 int git_hdr_len
= parse_git_header(line
, len
, size
, patch
);
1492 if (git_hdr_len
<= len
)
1494 if (!patch
->old_name
&& !patch
->new_name
) {
1495 if (!patch
->def_name
)
1496 die(Q_("git diff header lacks filename information when removing "
1497 "%d leading pathname component (line %d)",
1498 "git diff header lacks filename information when removing "
1499 "%d leading pathname components (line %d)",
1502 patch
->old_name
= xstrdup(patch
->def_name
);
1503 patch
->new_name
= xstrdup(patch
->def_name
);
1505 if (!patch
->is_delete
&& !patch
->new_name
)
1506 die("git diff header lacks filename information "
1507 "(line %d)", linenr
);
1508 patch
->is_toplevel_relative
= 1;
1509 *hdrsize
= git_hdr_len
;
1513 /* --- followed by +++ ? */
1514 if (memcmp("--- ", line
, 4) || memcmp("+++ ", line
+ len
, 4))
1518 * We only accept unified patches, so we want it to
1519 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
1520 * minimum ("@@ -0,0 +1 @@\n" is the shortest).
1522 nextlen
= linelen(line
+ len
, size
- len
);
1523 if (size
< nextlen
+ 14 || memcmp("@@ -", line
+ len
+ nextlen
, 4))
1526 /* Ok, we'll consider it a patch */
1527 parse_traditional_patch(line
, line
+len
, patch
);
1528 *hdrsize
= len
+ nextlen
;
1535 static void record_ws_error(unsigned result
, const char *line
, int len
, int linenr
)
1543 if (squelch_whitespace_errors
&&
1544 squelch_whitespace_errors
< whitespace_error
)
1547 err
= whitespace_error_string(result
);
1548 fprintf(stderr
, "%s:%d: %s.\n%.*s\n",
1549 patch_input_file
, linenr
, err
, len
, line
);
1553 static void check_whitespace(const char *line
, int len
, unsigned ws_rule
)
1555 unsigned result
= ws_check(line
+ 1, len
- 1, ws_rule
);
1557 record_ws_error(result
, line
+ 1, len
- 2, linenr
);
1561 * Parse a unified diff. Note that this really needs to parse each
1562 * fragment separately, since the only way to know the difference
1563 * between a "---" that is part of a patch, and a "---" that starts
1564 * the next patch is to look at the line counts..
1566 static int parse_fragment(const char *line
, unsigned long size
,
1567 struct patch
*patch
, struct fragment
*fragment
)
1570 int len
= linelen(line
, size
), offset
;
1571 unsigned long oldlines
, newlines
;
1572 unsigned long leading
, trailing
;
1574 offset
= parse_fragment_header(line
, len
, fragment
);
1577 if (offset
> 0 && patch
->recount
)
1578 recount_diff(line
+ offset
, size
- offset
, fragment
);
1579 oldlines
= fragment
->oldlines
;
1580 newlines
= fragment
->newlines
;
1584 /* Parse the thing.. */
1588 added
= deleted
= 0;
1591 offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
1592 if (!oldlines
&& !newlines
)
1594 len
= linelen(line
, size
);
1595 if (!len
|| line
[len
-1] != '\n')
1600 case '\n': /* newer GNU diff, an empty context line */
1604 if (!deleted
&& !added
)
1609 if (apply_in_reverse
&&
1610 ws_error_action
!= nowarn_ws_error
)
1611 check_whitespace(line
, len
, patch
->ws_rule
);
1617 if (!apply_in_reverse
&&
1618 ws_error_action
!= nowarn_ws_error
)
1619 check_whitespace(line
, len
, patch
->ws_rule
);
1626 * We allow "\ No newline at end of file". Depending
1627 * on locale settings when the patch was produced we
1628 * don't know what this line looks like. The only
1629 * thing we do know is that it begins with "\ ".
1630 * Checking for 12 is just for sanity check -- any
1631 * l10n of "\ No newline..." is at least that long.
1634 if (len
< 12 || memcmp(line
, "\\ ", 2))
1639 if (oldlines
|| newlines
)
1641 fragment
->leading
= leading
;
1642 fragment
->trailing
= trailing
;
1645 * If a fragment ends with an incomplete line, we failed to include
1646 * it in the above loop because we hit oldlines == newlines == 0
1649 if (12 < size
&& !memcmp(line
, "\\ ", 2))
1650 offset
+= linelen(line
, size
);
1652 patch
->lines_added
+= added
;
1653 patch
->lines_deleted
+= deleted
;
1655 if (0 < patch
->is_new
&& oldlines
)
1656 return error(_("new file depends on old contents"));
1657 if (0 < patch
->is_delete
&& newlines
)
1658 return error(_("deleted file still has contents"));
1663 * We have seen "diff --git a/... b/..." header (or a traditional patch
1664 * header). Read hunks that belong to this patch into fragments and hang
1665 * them to the given patch structure.
1667 * The (fragment->patch, fragment->size) pair points into the memory given
1668 * by the caller, not a copy, when we return.
1670 static int parse_single_patch(const char *line
, unsigned long size
, struct patch
*patch
)
1672 unsigned long offset
= 0;
1673 unsigned long oldlines
= 0, newlines
= 0, context
= 0;
1674 struct fragment
**fragp
= &patch
->fragments
;
1676 while (size
> 4 && !memcmp(line
, "@@ -", 4)) {
1677 struct fragment
*fragment
;
1680 fragment
= xcalloc(1, sizeof(*fragment
));
1681 fragment
->linenr
= linenr
;
1682 len
= parse_fragment(line
, size
, patch
, fragment
);
1684 die(_("corrupt patch at line %d"), linenr
);
1685 fragment
->patch
= line
;
1686 fragment
->size
= len
;
1687 oldlines
+= fragment
->oldlines
;
1688 newlines
+= fragment
->newlines
;
1689 context
+= fragment
->leading
+ fragment
->trailing
;
1692 fragp
= &fragment
->next
;
1700 * If something was removed (i.e. we have old-lines) it cannot
1701 * be creation, and if something was added it cannot be
1702 * deletion. However, the reverse is not true; --unified=0
1703 * patches that only add are not necessarily creation even
1704 * though they do not have any old lines, and ones that only
1705 * delete are not necessarily deletion.
1707 * Unfortunately, a real creation/deletion patch do _not_ have
1708 * any context line by definition, so we cannot safely tell it
1709 * apart with --unified=0 insanity. At least if the patch has
1710 * more than one hunk it is not creation or deletion.
1712 if (patch
->is_new
< 0 &&
1713 (oldlines
|| (patch
->fragments
&& patch
->fragments
->next
)))
1715 if (patch
->is_delete
< 0 &&
1716 (newlines
|| (patch
->fragments
&& patch
->fragments
->next
)))
1717 patch
->is_delete
= 0;
1719 if (0 < patch
->is_new
&& oldlines
)
1720 die(_("new file %s depends on old contents"), patch
->new_name
);
1721 if (0 < patch
->is_delete
&& newlines
)
1722 die(_("deleted file %s still has contents"), patch
->old_name
);
1723 if (!patch
->is_delete
&& !newlines
&& context
)
1726 "file %s becomes empty but is not deleted"),
1732 static inline int metadata_changes(struct patch
*patch
)
1734 return patch
->is_rename
> 0 ||
1735 patch
->is_copy
> 0 ||
1736 patch
->is_new
> 0 ||
1738 (patch
->old_mode
&& patch
->new_mode
&&
1739 patch
->old_mode
!= patch
->new_mode
);
1742 static char *inflate_it(const void *data
, unsigned long size
,
1743 unsigned long inflated_size
)
1749 memset(&stream
, 0, sizeof(stream
));
1751 stream
.next_in
= (unsigned char *)data
;
1752 stream
.avail_in
= size
;
1753 stream
.next_out
= out
= xmalloc(inflated_size
);
1754 stream
.avail_out
= inflated_size
;
1755 git_inflate_init(&stream
);
1756 st
= git_inflate(&stream
, Z_FINISH
);
1757 git_inflate_end(&stream
);
1758 if ((st
!= Z_STREAM_END
) || stream
.total_out
!= inflated_size
) {
1766 * Read a binary hunk and return a new fragment; fragment->patch
1767 * points at an allocated memory that the caller must free, so
1768 * it is marked as "->free_patch = 1".
1770 static struct fragment
*parse_binary_hunk(char **buf_p
,
1771 unsigned long *sz_p
,
1776 * Expect a line that begins with binary patch method ("literal"
1777 * or "delta"), followed by the length of data before deflating.
1778 * a sequence of 'length-byte' followed by base-85 encoded data
1779 * should follow, terminated by a newline.
1781 * Each 5-byte sequence of base-85 encodes up to 4 bytes,
1782 * and we would limit the patch line to 66 characters,
1783 * so one line can fit up to 13 groups that would decode
1784 * to 52 bytes max. The length byte 'A'-'Z' corresponds
1785 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
1788 unsigned long size
= *sz_p
;
1789 char *buffer
= *buf_p
;
1791 unsigned long origlen
;
1794 struct fragment
*frag
;
1796 llen
= linelen(buffer
, size
);
1801 if (starts_with(buffer
, "delta ")) {
1802 patch_method
= BINARY_DELTA_DEFLATED
;
1803 origlen
= strtoul(buffer
+ 6, NULL
, 10);
1805 else if (starts_with(buffer
, "literal ")) {
1806 patch_method
= BINARY_LITERAL_DEFLATED
;
1807 origlen
= strtoul(buffer
+ 8, NULL
, 10);
1815 int byte_length
, max_byte_length
, newsize
;
1816 llen
= linelen(buffer
, size
);
1820 /* consume the blank line */
1826 * Minimum line is "A00000\n" which is 7-byte long,
1827 * and the line length must be multiple of 5 plus 2.
1829 if ((llen
< 7) || (llen
-2) % 5)
1831 max_byte_length
= (llen
- 2) / 5 * 4;
1832 byte_length
= *buffer
;
1833 if ('A' <= byte_length
&& byte_length
<= 'Z')
1834 byte_length
= byte_length
- 'A' + 1;
1835 else if ('a' <= byte_length
&& byte_length
<= 'z')
1836 byte_length
= byte_length
- 'a' + 27;
1839 /* if the input length was not multiple of 4, we would
1840 * have filler at the end but the filler should never
1843 if (max_byte_length
< byte_length
||
1844 byte_length
<= max_byte_length
- 4)
1846 newsize
= hunk_size
+ byte_length
;
1847 data
= xrealloc(data
, newsize
);
1848 if (decode_85(data
+ hunk_size
, buffer
+ 1, byte_length
))
1850 hunk_size
= newsize
;
1855 frag
= xcalloc(1, sizeof(*frag
));
1856 frag
->patch
= inflate_it(data
, hunk_size
, origlen
);
1857 frag
->free_patch
= 1;
1861 frag
->size
= origlen
;
1865 frag
->binary_patch_method
= patch_method
;
1871 error(_("corrupt binary patch at line %d: %.*s"),
1872 linenr
-1, llen
-1, buffer
);
1876 static int parse_binary(char *buffer
, unsigned long size
, struct patch
*patch
)
1879 * We have read "GIT binary patch\n"; what follows is a line
1880 * that says the patch method (currently, either "literal" or
1881 * "delta") and the length of data before deflating; a
1882 * sequence of 'length-byte' followed by base-85 encoded data
1885 * When a binary patch is reversible, there is another binary
1886 * hunk in the same format, starting with patch method (either
1887 * "literal" or "delta") with the length of data, and a sequence
1888 * of length-byte + base-85 encoded data, terminated with another
1889 * empty line. This data, when applied to the postimage, produces
1892 struct fragment
*forward
;
1893 struct fragment
*reverse
;
1897 forward
= parse_binary_hunk(&buffer
, &size
, &status
, &used
);
1898 if (!forward
&& !status
)
1899 /* there has to be one hunk (forward hunk) */
1900 return error(_("unrecognized binary patch at line %d"), linenr
-1);
1902 /* otherwise we already gave an error message */
1905 reverse
= parse_binary_hunk(&buffer
, &size
, &status
, &used_1
);
1910 * Not having reverse hunk is not an error, but having
1911 * a corrupt reverse hunk is.
1913 free((void*) forward
->patch
);
1917 forward
->next
= reverse
;
1918 patch
->fragments
= forward
;
1919 patch
->is_binary
= 1;
1924 * Read the patch text in "buffer" that extends for "size" bytes; stop
1925 * reading after seeing a single patch (i.e. changes to a single file).
1926 * Create fragments (i.e. patch hunks) and hang them to the given patch.
1927 * Return the number of bytes consumed, so that the caller can call us
1928 * again for the next patch.
1930 static int parse_chunk(char *buffer
, unsigned long size
, struct patch
*patch
)
1932 int hdrsize
, patchsize
;
1933 int offset
= find_header(buffer
, size
, &hdrsize
, patch
);
1938 patch
->ws_rule
= whitespace_rule(patch
->new_name
1942 patchsize
= parse_single_patch(buffer
+ offset
+ hdrsize
,
1943 size
- offset
- hdrsize
, patch
);
1946 static const char git_binary
[] = "GIT binary patch\n";
1947 int hd
= hdrsize
+ offset
;
1948 unsigned long llen
= linelen(buffer
+ hd
, size
- hd
);
1950 if (llen
== sizeof(git_binary
) - 1 &&
1951 !memcmp(git_binary
, buffer
+ hd
, llen
)) {
1954 used
= parse_binary(buffer
+ hd
+ llen
,
1955 size
- hd
- llen
, patch
);
1957 patchsize
= used
+ llen
;
1961 else if (!memcmp(" differ\n", buffer
+ hd
+ llen
- 8, 8)) {
1962 static const char *binhdr
[] = {
1968 for (i
= 0; binhdr
[i
]; i
++) {
1969 int len
= strlen(binhdr
[i
]);
1970 if (len
< size
- hd
&&
1971 !memcmp(binhdr
[i
], buffer
+ hd
, len
)) {
1973 patch
->is_binary
= 1;
1980 /* Empty patch cannot be applied if it is a text patch
1981 * without metadata change. A binary patch appears
1984 if ((apply
|| check
) &&
1985 (!patch
->is_binary
&& !metadata_changes(patch
)))
1986 die(_("patch with only garbage at line %d"), linenr
);
1989 return offset
+ hdrsize
+ patchsize
;
1992 #define swap(a,b) myswap((a),(b),sizeof(a))
1994 #define myswap(a, b, size) do { \
1995 unsigned char mytmp[size]; \
1996 memcpy(mytmp, &a, size); \
1997 memcpy(&a, &b, size); \
1998 memcpy(&b, mytmp, size); \
2001 static void reverse_patches(struct patch
*p
)
2003 for (; p
; p
= p
->next
) {
2004 struct fragment
*frag
= p
->fragments
;
2006 swap(p
->new_name
, p
->old_name
);
2007 swap(p
->new_mode
, p
->old_mode
);
2008 swap(p
->is_new
, p
->is_delete
);
2009 swap(p
->lines_added
, p
->lines_deleted
);
2010 swap(p
->old_sha1_prefix
, p
->new_sha1_prefix
);
2012 for (; frag
; frag
= frag
->next
) {
2013 swap(frag
->newpos
, frag
->oldpos
);
2014 swap(frag
->newlines
, frag
->oldlines
);
2019 static const char pluses
[] =
2020 "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
2021 static const char minuses
[]=
2022 "----------------------------------------------------------------------";
2024 static void show_stats(struct patch
*patch
)
2026 struct strbuf qname
= STRBUF_INIT
;
2027 char *cp
= patch
->new_name
? patch
->new_name
: patch
->old_name
;
2030 quote_c_style(cp
, &qname
, NULL
, 0);
2033 * "scale" the filename
2039 if (qname
.len
> max
) {
2040 cp
= strchr(qname
.buf
+ qname
.len
+ 3 - max
, '/');
2042 cp
= qname
.buf
+ qname
.len
+ 3 - max
;
2043 strbuf_splice(&qname
, 0, cp
- qname
.buf
, "...", 3);
2046 if (patch
->is_binary
) {
2047 printf(" %-*s | Bin\n", max
, qname
.buf
);
2048 strbuf_release(&qname
);
2052 printf(" %-*s |", max
, qname
.buf
);
2053 strbuf_release(&qname
);
2056 * scale the add/delete
2058 max
= max
+ max_change
> 70 ? 70 - max
: max_change
;
2059 add
= patch
->lines_added
;
2060 del
= patch
->lines_deleted
;
2062 if (max_change
> 0) {
2063 int total
= ((add
+ del
) * max
+ max_change
/ 2) / max_change
;
2064 add
= (add
* max
+ max_change
/ 2) / max_change
;
2067 printf("%5d %.*s%.*s\n", patch
->lines_added
+ patch
->lines_deleted
,
2068 add
, pluses
, del
, minuses
);
2071 static int read_old_data(struct stat
*st
, const char *path
, struct strbuf
*buf
)
2073 switch (st
->st_mode
& S_IFMT
) {
2075 if (strbuf_readlink(buf
, path
, st
->st_size
) < 0)
2076 return error(_("unable to read symlink %s"), path
);
2079 if (strbuf_read_file(buf
, path
, st
->st_size
) != st
->st_size
)
2080 return error(_("unable to open or read %s"), path
);
2081 convert_to_git(path
, buf
->buf
, buf
->len
, buf
, 0);
2089 * Update the preimage, and the common lines in postimage,
2090 * from buffer buf of length len. If postlen is 0 the postimage
2091 * is updated in place, otherwise it's updated on a new buffer
2095 static void update_pre_post_images(struct image
*preimage
,
2096 struct image
*postimage
,
2098 size_t len
, size_t postlen
)
2100 int i
, ctx
, reduced
;
2101 char *new, *old
, *fixed
;
2102 struct image fixed_preimage
;
2105 * Update the preimage with whitespace fixes. Note that we
2106 * are not losing preimage->buf -- apply_one_fragment() will
2109 prepare_image(&fixed_preimage
, buf
, len
, 1);
2111 ? fixed_preimage
.nr
== preimage
->nr
2112 : fixed_preimage
.nr
<= preimage
->nr
);
2113 for (i
= 0; i
< fixed_preimage
.nr
; i
++)
2114 fixed_preimage
.line
[i
].flag
= preimage
->line
[i
].flag
;
2115 free(preimage
->line_allocated
);
2116 *preimage
= fixed_preimage
;
2119 * Adjust the common context lines in postimage. This can be
2120 * done in-place when we are shrinking it with whitespace
2121 * fixing, but needs a new buffer when ignoring whitespace or
2122 * expanding leading tabs to spaces.
2124 * We trust the caller to tell us if the update can be done
2125 * in place (postlen==0) or not.
2127 old
= postimage
->buf
;
2129 new = postimage
->buf
= xmalloc(postlen
);
2132 fixed
= preimage
->buf
;
2134 for (i
= reduced
= ctx
= 0; i
< postimage
->nr
; i
++) {
2135 size_t len
= postimage
->line
[i
].len
;
2136 if (!(postimage
->line
[i
].flag
& LINE_COMMON
)) {
2137 /* an added line -- no counterparts in preimage */
2138 memmove(new, old
, len
);
2144 /* a common context -- skip it in the original postimage */
2147 /* and find the corresponding one in the fixed preimage */
2148 while (ctx
< preimage
->nr
&&
2149 !(preimage
->line
[ctx
].flag
& LINE_COMMON
)) {
2150 fixed
+= preimage
->line
[ctx
].len
;
2155 * preimage is expected to run out, if the caller
2156 * fixed addition of trailing blank lines.
2158 if (preimage
->nr
<= ctx
) {
2163 /* and copy it in, while fixing the line length */
2164 len
= preimage
->line
[ctx
].len
;
2165 memcpy(new, fixed
, len
);
2168 postimage
->line
[i
].len
= len
;
2172 /* Fix the length of the whole thing */
2173 postimage
->len
= new - postimage
->buf
;
2174 postimage
->nr
-= reduced
;
2177 static int match_fragment(struct image
*img
,
2178 struct image
*preimage
,
2179 struct image
*postimage
,
2183 int match_beginning
, int match_end
)
2186 char *fixed_buf
, *buf
, *orig
, *target
;
2187 struct strbuf fixed
;
2188 size_t fixed_len
, postlen
;
2191 if (preimage
->nr
+ try_lno
<= img
->nr
) {
2193 * The hunk falls within the boundaries of img.
2195 preimage_limit
= preimage
->nr
;
2196 if (match_end
&& (preimage
->nr
+ try_lno
!= img
->nr
))
2198 } else if (ws_error_action
== correct_ws_error
&&
2199 (ws_rule
& WS_BLANK_AT_EOF
)) {
2201 * This hunk extends beyond the end of img, and we are
2202 * removing blank lines at the end of the file. This
2203 * many lines from the beginning of the preimage must
2204 * match with img, and the remainder of the preimage
2207 preimage_limit
= img
->nr
- try_lno
;
2210 * The hunk extends beyond the end of the img and
2211 * we are not removing blanks at the end, so we
2212 * should reject the hunk at this position.
2217 if (match_beginning
&& try_lno
)
2220 /* Quick hash check */
2221 for (i
= 0; i
< preimage_limit
; i
++)
2222 if ((img
->line
[try_lno
+ i
].flag
& LINE_PATCHED
) ||
2223 (preimage
->line
[i
].hash
!= img
->line
[try_lno
+ i
].hash
))
2226 if (preimage_limit
== preimage
->nr
) {
2228 * Do we have an exact match? If we were told to match
2229 * at the end, size must be exactly at try+fragsize,
2230 * otherwise try+fragsize must be still within the preimage,
2231 * and either case, the old piece should match the preimage
2235 ? (try + preimage
->len
== img
->len
)
2236 : (try + preimage
->len
<= img
->len
)) &&
2237 !memcmp(img
->buf
+ try, preimage
->buf
, preimage
->len
))
2241 * The preimage extends beyond the end of img, so
2242 * there cannot be an exact match.
2244 * There must be one non-blank context line that match
2245 * a line before the end of img.
2249 buf
= preimage
->buf
;
2251 for (i
= 0; i
< preimage_limit
; i
++)
2252 buf_end
+= preimage
->line
[i
].len
;
2254 for ( ; buf
< buf_end
; buf
++)
2262 * No exact match. If we are ignoring whitespace, run a line-by-line
2263 * fuzzy matching. We collect all the line length information because
2264 * we need it to adjust whitespace if we match.
2266 if (ws_ignore_action
== ignore_ws_change
) {
2269 size_t postlen
= postimage
->len
;
2273 for (i
= 0; i
< preimage_limit
; i
++) {
2274 size_t prelen
= preimage
->line
[i
].len
;
2275 size_t imglen
= img
->line
[try_lno
+i
].len
;
2277 if (!fuzzy_matchlines(img
->buf
+ try + imgoff
, imglen
,
2278 preimage
->buf
+ preoff
, prelen
))
2280 if (preimage
->line
[i
].flag
& LINE_COMMON
)
2281 postlen
+= imglen
- prelen
;
2287 * Ok, the preimage matches with whitespace fuzz.
2289 * imgoff now holds the true length of the target that
2290 * matches the preimage before the end of the file.
2292 * Count the number of characters in the preimage that fall
2293 * beyond the end of the file and make sure that all of them
2294 * are whitespace characters. (This can only happen if
2295 * we are removing blank lines at the end of the file.)
2297 buf
= preimage_eof
= preimage
->buf
+ preoff
;
2298 for ( ; i
< preimage
->nr
; i
++)
2299 preoff
+= preimage
->line
[i
].len
;
2300 preimage_end
= preimage
->buf
+ preoff
;
2301 for ( ; buf
< preimage_end
; buf
++)
2306 * Update the preimage and the common postimage context
2307 * lines to use the same whitespace as the target.
2308 * If whitespace is missing in the target (i.e.
2309 * if the preimage extends beyond the end of the file),
2310 * use the whitespace from the preimage.
2312 extra_chars
= preimage_end
- preimage_eof
;
2313 strbuf_init(&fixed
, imgoff
+ extra_chars
);
2314 strbuf_add(&fixed
, img
->buf
+ try, imgoff
);
2315 strbuf_add(&fixed
, preimage_eof
, extra_chars
);
2316 fixed_buf
= strbuf_detach(&fixed
, &fixed_len
);
2317 update_pre_post_images(preimage
, postimage
,
2318 fixed_buf
, fixed_len
, postlen
);
2322 if (ws_error_action
!= correct_ws_error
)
2326 * The hunk does not apply byte-by-byte, but the hash says
2327 * it might with whitespace fuzz. We haven't been asked to
2328 * ignore whitespace, we were asked to correct whitespace
2329 * errors, so let's try matching after whitespace correction.
2331 * The preimage may extend beyond the end of the file,
2332 * but in this loop we will only handle the part of the
2333 * preimage that falls within the file.
2335 strbuf_init(&fixed
, preimage
->len
+ 1);
2336 orig
= preimage
->buf
;
2337 target
= img
->buf
+ try;
2339 for (i
= 0; i
< preimage_limit
; i
++) {
2340 size_t oldlen
= preimage
->line
[i
].len
;
2341 size_t tgtlen
= img
->line
[try_lno
+ i
].len
;
2342 size_t fixstart
= fixed
.len
;
2343 struct strbuf tgtfix
;
2346 /* Try fixing the line in the preimage */
2347 ws_fix_copy(&fixed
, orig
, oldlen
, ws_rule
, NULL
);
2349 /* Try fixing the line in the target */
2350 strbuf_init(&tgtfix
, tgtlen
);
2351 ws_fix_copy(&tgtfix
, target
, tgtlen
, ws_rule
, NULL
);
2354 * If they match, either the preimage was based on
2355 * a version before our tree fixed whitespace breakage,
2356 * or we are lacking a whitespace-fix patch the tree
2357 * the preimage was based on already had (i.e. target
2358 * has whitespace breakage, the preimage doesn't).
2359 * In either case, we are fixing the whitespace breakages
2360 * so we might as well take the fix together with their
2363 match
= (tgtfix
.len
== fixed
.len
- fixstart
&&
2364 !memcmp(tgtfix
.buf
, fixed
.buf
+ fixstart
,
2365 fixed
.len
- fixstart
));
2366 postlen
+= tgtfix
.len
;
2368 strbuf_release(&tgtfix
);
2378 * Now handle the lines in the preimage that falls beyond the
2379 * end of the file (if any). They will only match if they are
2380 * empty or only contain whitespace (if WS_BLANK_AT_EOL is
2383 for ( ; i
< preimage
->nr
; i
++) {
2384 size_t fixstart
= fixed
.len
; /* start of the fixed preimage */
2385 size_t oldlen
= preimage
->line
[i
].len
;
2388 /* Try fixing the line in the preimage */
2389 ws_fix_copy(&fixed
, orig
, oldlen
, ws_rule
, NULL
);
2391 for (j
= fixstart
; j
< fixed
.len
; j
++)
2392 if (!isspace(fixed
.buf
[j
]))
2399 * Yes, the preimage is based on an older version that still
2400 * has whitespace breakages unfixed, and fixing them makes the
2401 * hunk match. Update the context lines in the postimage.
2403 fixed_buf
= strbuf_detach(&fixed
, &fixed_len
);
2404 if (postlen
< postimage
->len
)
2406 update_pre_post_images(preimage
, postimage
,
2407 fixed_buf
, fixed_len
, postlen
);
2411 strbuf_release(&fixed
);
2415 static int find_pos(struct image
*img
,
2416 struct image
*preimage
,
2417 struct image
*postimage
,
2420 int match_beginning
, int match_end
)
2423 unsigned long backwards
, forwards
, try;
2424 int backwards_lno
, forwards_lno
, try_lno
;
2427 * If match_beginning or match_end is specified, there is no
2428 * point starting from a wrong line that will never match and
2429 * wander around and wait for a match at the specified end.
2431 if (match_beginning
)
2434 line
= img
->nr
- preimage
->nr
;
2437 * Because the comparison is unsigned, the following test
2438 * will also take care of a negative line number that can
2439 * result when match_end and preimage is larger than the target.
2441 if ((size_t) line
> img
->nr
)
2445 for (i
= 0; i
< line
; i
++)
2446 try += img
->line
[i
].len
;
2449 * There's probably some smart way to do this, but I'll leave
2450 * that to the smart and beautiful people. I'm simple and stupid.
2453 backwards_lno
= line
;
2455 forwards_lno
= line
;
2458 for (i
= 0; ; i
++) {
2459 if (match_fragment(img
, preimage
, postimage
,
2460 try, try_lno
, ws_rule
,
2461 match_beginning
, match_end
))
2465 if (backwards_lno
== 0 && forwards_lno
== img
->nr
)
2469 if (backwards_lno
== 0) {
2474 backwards
-= img
->line
[backwards_lno
].len
;
2476 try_lno
= backwards_lno
;
2478 if (forwards_lno
== img
->nr
) {
2482 forwards
+= img
->line
[forwards_lno
].len
;
2485 try_lno
= forwards_lno
;
2492 static void remove_first_line(struct image
*img
)
2494 img
->buf
+= img
->line
[0].len
;
2495 img
->len
-= img
->line
[0].len
;
2500 static void remove_last_line(struct image
*img
)
2502 img
->len
-= img
->line
[--img
->nr
].len
;
2506 * The change from "preimage" and "postimage" has been found to
2507 * apply at applied_pos (counts in line numbers) in "img".
2508 * Update "img" to remove "preimage" and replace it with "postimage".
2510 static void update_image(struct image
*img
,
2512 struct image
*preimage
,
2513 struct image
*postimage
)
2516 * remove the copy of preimage at offset in img
2517 * and replace it with postimage
2520 size_t remove_count
, insert_count
, applied_at
= 0;
2525 * If we are removing blank lines at the end of img,
2526 * the preimage may extend beyond the end.
2527 * If that is the case, we must be careful only to
2528 * remove the part of the preimage that falls within
2529 * the boundaries of img. Initialize preimage_limit
2530 * to the number of lines in the preimage that falls
2531 * within the boundaries.
2533 preimage_limit
= preimage
->nr
;
2534 if (preimage_limit
> img
->nr
- applied_pos
)
2535 preimage_limit
= img
->nr
- applied_pos
;
2537 for (i
= 0; i
< applied_pos
; i
++)
2538 applied_at
+= img
->line
[i
].len
;
2541 for (i
= 0; i
< preimage_limit
; i
++)
2542 remove_count
+= img
->line
[applied_pos
+ i
].len
;
2543 insert_count
= postimage
->len
;
2545 /* Adjust the contents */
2546 result
= xmalloc(img
->len
+ insert_count
- remove_count
+ 1);
2547 memcpy(result
, img
->buf
, applied_at
);
2548 memcpy(result
+ applied_at
, postimage
->buf
, postimage
->len
);
2549 memcpy(result
+ applied_at
+ postimage
->len
,
2550 img
->buf
+ (applied_at
+ remove_count
),
2551 img
->len
- (applied_at
+ remove_count
));
2554 img
->len
+= insert_count
- remove_count
;
2555 result
[img
->len
] = '\0';
2557 /* Adjust the line table */
2558 nr
= img
->nr
+ postimage
->nr
- preimage_limit
;
2559 if (preimage_limit
< postimage
->nr
) {
2561 * NOTE: this knows that we never call remove_first_line()
2562 * on anything other than pre/post image.
2564 img
->line
= xrealloc(img
->line
, nr
* sizeof(*img
->line
));
2565 img
->line_allocated
= img
->line
;
2567 if (preimage_limit
!= postimage
->nr
)
2568 memmove(img
->line
+ applied_pos
+ postimage
->nr
,
2569 img
->line
+ applied_pos
+ preimage_limit
,
2570 (img
->nr
- (applied_pos
+ preimage_limit
)) *
2571 sizeof(*img
->line
));
2572 memcpy(img
->line
+ applied_pos
,
2574 postimage
->nr
* sizeof(*img
->line
));
2576 for (i
= 0; i
< postimage
->nr
; i
++)
2577 img
->line
[applied_pos
+ i
].flag
|= LINE_PATCHED
;
2582 * Use the patch-hunk text in "frag" to prepare two images (preimage and
2583 * postimage) for the hunk. Find lines that match "preimage" in "img" and
2584 * replace the part of "img" with "postimage" text.
2586 static int apply_one_fragment(struct image
*img
, struct fragment
*frag
,
2587 int inaccurate_eof
, unsigned ws_rule
,
2590 int match_beginning
, match_end
;
2591 const char *patch
= frag
->patch
;
2592 int size
= frag
->size
;
2593 char *old
, *oldlines
;
2594 struct strbuf newlines
;
2595 int new_blank_lines_at_end
= 0;
2596 int found_new_blank_lines_at_end
= 0;
2597 int hunk_linenr
= frag
->linenr
;
2598 unsigned long leading
, trailing
;
2599 int pos
, applied_pos
;
2600 struct image preimage
;
2601 struct image postimage
;
2603 memset(&preimage
, 0, sizeof(preimage
));
2604 memset(&postimage
, 0, sizeof(postimage
));
2605 oldlines
= xmalloc(size
);
2606 strbuf_init(&newlines
, size
);
2611 int len
= linelen(patch
, size
);
2613 int added_blank_line
= 0;
2614 int is_blank_context
= 0;
2621 * "plen" is how much of the line we should use for
2622 * the actual patch data. Normally we just remove the
2623 * first character on the line, but if the line is
2624 * followed by "\ No newline", then we also remove the
2625 * last one (which is the newline, of course).
2628 if (len
< size
&& patch
[len
] == '\\')
2631 if (apply_in_reverse
) {
2634 else if (first
== '+')
2640 /* Newer GNU diff, empty context line */
2642 /* ... followed by '\No newline'; nothing */
2645 strbuf_addch(&newlines
, '\n');
2646 add_line_info(&preimage
, "\n", 1, LINE_COMMON
);
2647 add_line_info(&postimage
, "\n", 1, LINE_COMMON
);
2648 is_blank_context
= 1;
2651 if (plen
&& (ws_rule
& WS_BLANK_AT_EOF
) &&
2652 ws_blank_line(patch
+ 1, plen
, ws_rule
))
2653 is_blank_context
= 1;
2655 memcpy(old
, patch
+ 1, plen
);
2656 add_line_info(&preimage
, old
, plen
,
2657 (first
== ' ' ? LINE_COMMON
: 0));
2661 /* Fall-through for ' ' */
2663 /* --no-add does not add new lines */
2664 if (first
== '+' && no_add
)
2667 start
= newlines
.len
;
2669 !whitespace_error
||
2670 ws_error_action
!= correct_ws_error
) {
2671 strbuf_add(&newlines
, patch
+ 1, plen
);
2674 ws_fix_copy(&newlines
, patch
+ 1, plen
, ws_rule
, &applied_after_fixing_ws
);
2676 add_line_info(&postimage
, newlines
.buf
+ start
, newlines
.len
- start
,
2677 (first
== '+' ? 0 : LINE_COMMON
));
2679 (ws_rule
& WS_BLANK_AT_EOF
) &&
2680 ws_blank_line(patch
+ 1, plen
, ws_rule
))
2681 added_blank_line
= 1;
2683 case '@': case '\\':
2684 /* Ignore it, we already handled it */
2687 if (apply_verbosely
)
2688 error(_("invalid start of line: '%c'"), first
);
2691 if (added_blank_line
) {
2692 if (!new_blank_lines_at_end
)
2693 found_new_blank_lines_at_end
= hunk_linenr
;
2694 new_blank_lines_at_end
++;
2696 else if (is_blank_context
)
2699 new_blank_lines_at_end
= 0;
2704 if (inaccurate_eof
&&
2705 old
> oldlines
&& old
[-1] == '\n' &&
2706 newlines
.len
> 0 && newlines
.buf
[newlines
.len
- 1] == '\n') {
2708 strbuf_setlen(&newlines
, newlines
.len
- 1);
2711 leading
= frag
->leading
;
2712 trailing
= frag
->trailing
;
2715 * A hunk to change lines at the beginning would begin with
2717 * but we need to be careful. -U0 that inserts before the second
2718 * line also has this pattern.
2720 * And a hunk to add to an empty file would begin with
2723 * In other words, a hunk that is (frag->oldpos <= 1) with or
2724 * without leading context must match at the beginning.
2726 match_beginning
= (!frag
->oldpos
||
2727 (frag
->oldpos
== 1 && !unidiff_zero
));
2730 * A hunk without trailing lines must match at the end.
2731 * However, we simply cannot tell if a hunk must match end
2732 * from the lack of trailing lines if the patch was generated
2733 * with unidiff without any context.
2735 match_end
= !unidiff_zero
&& !trailing
;
2737 pos
= frag
->newpos
? (frag
->newpos
- 1) : 0;
2738 preimage
.buf
= oldlines
;
2739 preimage
.len
= old
- oldlines
;
2740 postimage
.buf
= newlines
.buf
;
2741 postimage
.len
= newlines
.len
;
2742 preimage
.line
= preimage
.line_allocated
;
2743 postimage
.line
= postimage
.line_allocated
;
2747 applied_pos
= find_pos(img
, &preimage
, &postimage
, pos
,
2748 ws_rule
, match_beginning
, match_end
);
2750 if (applied_pos
>= 0)
2753 /* Am I at my context limits? */
2754 if ((leading
<= p_context
) && (trailing
<= p_context
))
2756 if (match_beginning
|| match_end
) {
2757 match_beginning
= match_end
= 0;
2762 * Reduce the number of context lines; reduce both
2763 * leading and trailing if they are equal otherwise
2764 * just reduce the larger context.
2766 if (leading
>= trailing
) {
2767 remove_first_line(&preimage
);
2768 remove_first_line(&postimage
);
2772 if (trailing
> leading
) {
2773 remove_last_line(&preimage
);
2774 remove_last_line(&postimage
);
2779 if (applied_pos
>= 0) {
2780 if (new_blank_lines_at_end
&&
2781 preimage
.nr
+ applied_pos
>= img
->nr
&&
2782 (ws_rule
& WS_BLANK_AT_EOF
) &&
2783 ws_error_action
!= nowarn_ws_error
) {
2784 record_ws_error(WS_BLANK_AT_EOF
, "+", 1,
2785 found_new_blank_lines_at_end
);
2786 if (ws_error_action
== correct_ws_error
) {
2787 while (new_blank_lines_at_end
--)
2788 remove_last_line(&postimage
);
2791 * We would want to prevent write_out_results()
2792 * from taking place in apply_patch() that follows
2793 * the callchain led us here, which is:
2794 * apply_patch->check_patch_list->check_patch->
2795 * apply_data->apply_fragments->apply_one_fragment
2797 if (ws_error_action
== die_on_ws_error
)
2801 if (apply_verbosely
&& applied_pos
!= pos
) {
2802 int offset
= applied_pos
- pos
;
2803 if (apply_in_reverse
)
2804 offset
= 0 - offset
;
2806 Q_("Hunk #%d succeeded at %d (offset %d line).",
2807 "Hunk #%d succeeded at %d (offset %d lines).",
2809 nth_fragment
, applied_pos
+ 1, offset
);
2813 * Warn if it was necessary to reduce the number
2816 if ((leading
!= frag
->leading
) ||
2817 (trailing
!= frag
->trailing
))
2818 fprintf_ln(stderr
, _("Context reduced to (%ld/%ld)"
2819 " to apply fragment at %d"),
2820 leading
, trailing
, applied_pos
+1);
2821 update_image(img
, applied_pos
, &preimage
, &postimage
);
2823 if (apply_verbosely
)
2824 error(_("while searching for:\n%.*s"),
2825 (int)(old
- oldlines
), oldlines
);
2829 strbuf_release(&newlines
);
2830 free(preimage
.line_allocated
);
2831 free(postimage
.line_allocated
);
2833 return (applied_pos
< 0);
2836 static int apply_binary_fragment(struct image
*img
, struct patch
*patch
)
2838 struct fragment
*fragment
= patch
->fragments
;
2843 return error(_("missing binary patch data for '%s'"),
2848 /* Binary patch is irreversible without the optional second hunk */
2849 if (apply_in_reverse
) {
2850 if (!fragment
->next
)
2851 return error("cannot reverse-apply a binary patch "
2852 "without the reverse hunk to '%s'",
2854 ? patch
->new_name
: patch
->old_name
);
2855 fragment
= fragment
->next
;
2857 switch (fragment
->binary_patch_method
) {
2858 case BINARY_DELTA_DEFLATED
:
2859 dst
= patch_delta(img
->buf
, img
->len
, fragment
->patch
,
2860 fragment
->size
, &len
);
2867 case BINARY_LITERAL_DEFLATED
:
2869 img
->len
= fragment
->size
;
2870 img
->buf
= xmalloc(img
->len
+1);
2871 memcpy(img
->buf
, fragment
->patch
, img
->len
);
2872 img
->buf
[img
->len
] = '\0';
2879 * Replace "img" with the result of applying the binary patch.
2880 * The binary patch data itself in patch->fragment is still kept
2881 * but the preimage prepared by the caller in "img" is freed here
2882 * or in the helper function apply_binary_fragment() this calls.
2884 static int apply_binary(struct image
*img
, struct patch
*patch
)
2886 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
2887 unsigned char sha1
[20];
2890 * For safety, we require patch index line to contain
2891 * full 40-byte textual SHA1 for old and new, at least for now.
2893 if (strlen(patch
->old_sha1_prefix
) != 40 ||
2894 strlen(patch
->new_sha1_prefix
) != 40 ||
2895 get_sha1_hex(patch
->old_sha1_prefix
, sha1
) ||
2896 get_sha1_hex(patch
->new_sha1_prefix
, sha1
))
2897 return error("cannot apply binary patch to '%s' "
2898 "without full index line", name
);
2900 if (patch
->old_name
) {
2902 * See if the old one matches what the patch
2905 hash_sha1_file(img
->buf
, img
->len
, blob_type
, sha1
);
2906 if (strcmp(sha1_to_hex(sha1
), patch
->old_sha1_prefix
))
2907 return error("the patch applies to '%s' (%s), "
2908 "which does not match the "
2909 "current contents.",
2910 name
, sha1_to_hex(sha1
));
2913 /* Otherwise, the old one must be empty. */
2915 return error("the patch applies to an empty "
2916 "'%s' but it is not empty", name
);
2919 get_sha1_hex(patch
->new_sha1_prefix
, sha1
);
2920 if (is_null_sha1(sha1
)) {
2922 return 0; /* deletion patch */
2925 if (has_sha1_file(sha1
)) {
2926 /* We already have the postimage */
2927 enum object_type type
;
2931 result
= read_sha1_file(sha1
, &type
, &size
);
2933 return error("the necessary postimage %s for "
2934 "'%s' cannot be read",
2935 patch
->new_sha1_prefix
, name
);
2941 * We have verified buf matches the preimage;
2942 * apply the patch data to it, which is stored
2943 * in the patch->fragments->{patch,size}.
2945 if (apply_binary_fragment(img
, patch
))
2946 return error(_("binary patch does not apply to '%s'"),
2949 /* verify that the result matches */
2950 hash_sha1_file(img
->buf
, img
->len
, blob_type
, sha1
);
2951 if (strcmp(sha1_to_hex(sha1
), patch
->new_sha1_prefix
))
2952 return error(_("binary patch to '%s' creates incorrect result (expecting %s, got %s)"),
2953 name
, patch
->new_sha1_prefix
, sha1_to_hex(sha1
));
2959 static int apply_fragments(struct image
*img
, struct patch
*patch
)
2961 struct fragment
*frag
= patch
->fragments
;
2962 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
2963 unsigned ws_rule
= patch
->ws_rule
;
2964 unsigned inaccurate_eof
= patch
->inaccurate_eof
;
2967 if (patch
->is_binary
)
2968 return apply_binary(img
, patch
);
2972 if (apply_one_fragment(img
, frag
, inaccurate_eof
, ws_rule
, nth
)) {
2973 error(_("patch failed: %s:%ld"), name
, frag
->oldpos
);
2974 if (!apply_with_reject
)
2983 static int read_blob_object(struct strbuf
*buf
, const unsigned char *sha1
, unsigned mode
)
2985 if (S_ISGITLINK(mode
)) {
2986 strbuf_grow(buf
, 100);
2987 strbuf_addf(buf
, "Subproject commit %s\n", sha1_to_hex(sha1
));
2989 enum object_type type
;
2993 result
= read_sha1_file(sha1
, &type
, &sz
);
2996 /* XXX read_sha1_file NUL-terminates */
2997 strbuf_attach(buf
, result
, sz
, sz
+ 1);
3002 static int read_file_or_gitlink(const struct cache_entry
*ce
, struct strbuf
*buf
)
3006 return read_blob_object(buf
, ce
->sha1
, ce
->ce_mode
);
3009 static struct patch
*in_fn_table(const char *name
)
3011 struct string_list_item
*item
;
3016 item
= string_list_lookup(&fn_table
, name
);
3018 return (struct patch
*)item
->util
;
3024 * item->util in the filename table records the status of the path.
3025 * Usually it points at a patch (whose result records the contents
3026 * of it after applying it), but it could be PATH_WAS_DELETED for a
3027 * path that a previously applied patch has already removed, or
3028 * PATH_TO_BE_DELETED for a path that a later patch would remove.
3030 * The latter is needed to deal with a case where two paths A and B
3031 * are swapped by first renaming A to B and then renaming B to A;
3032 * moving A to B should not be prevented due to presence of B as we
3033 * will remove it in a later patch.
3035 #define PATH_TO_BE_DELETED ((struct patch *) -2)
3036 #define PATH_WAS_DELETED ((struct patch *) -1)
3038 static int to_be_deleted(struct patch
*patch
)
3040 return patch
== PATH_TO_BE_DELETED
;
3043 static int was_deleted(struct patch
*patch
)
3045 return patch
== PATH_WAS_DELETED
;
3048 static void add_to_fn_table(struct patch
*patch
)
3050 struct string_list_item
*item
;
3053 * Always add new_name unless patch is a deletion
3054 * This should cover the cases for normal diffs,
3055 * file creations and copies
3057 if (patch
->new_name
!= NULL
) {
3058 item
= string_list_insert(&fn_table
, patch
->new_name
);
3063 * store a failure on rename/deletion cases because
3064 * later chunks shouldn't patch old names
3066 if ((patch
->new_name
== NULL
) || (patch
->is_rename
)) {
3067 item
= string_list_insert(&fn_table
, patch
->old_name
);
3068 item
->util
= PATH_WAS_DELETED
;
3072 static void prepare_fn_table(struct patch
*patch
)
3075 * store information about incoming file deletion
3078 if ((patch
->new_name
== NULL
) || (patch
->is_rename
)) {
3079 struct string_list_item
*item
;
3080 item
= string_list_insert(&fn_table
, patch
->old_name
);
3081 item
->util
= PATH_TO_BE_DELETED
;
3083 patch
= patch
->next
;
3087 static int checkout_target(struct cache_entry
*ce
, struct stat
*st
)
3089 struct checkout costate
;
3091 memset(&costate
, 0, sizeof(costate
));
3092 costate
.base_dir
= "";
3093 costate
.refresh_cache
= 1;
3094 if (checkout_entry(ce
, &costate
, NULL
) || lstat(ce
->name
, st
))
3095 return error(_("cannot checkout %s"), ce
->name
);
3099 static struct patch
*previous_patch(struct patch
*patch
, int *gone
)
3101 struct patch
*previous
;
3104 if (patch
->is_copy
|| patch
->is_rename
)
3105 return NULL
; /* "git" patches do not depend on the order */
3107 previous
= in_fn_table(patch
->old_name
);
3111 if (to_be_deleted(previous
))
3112 return NULL
; /* the deletion hasn't happened yet */
3114 if (was_deleted(previous
))
3120 static int verify_index_match(const struct cache_entry
*ce
, struct stat
*st
)
3122 if (S_ISGITLINK(ce
->ce_mode
)) {
3123 if (!S_ISDIR(st
->st_mode
))
3127 return ce_match_stat(ce
, st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
);
3130 #define SUBMODULE_PATCH_WITHOUT_INDEX 1
3132 static int load_patch_target(struct strbuf
*buf
,
3133 const struct cache_entry
*ce
,
3136 unsigned expected_mode
)
3139 if (read_file_or_gitlink(ce
, buf
))
3140 return error(_("read of %s failed"), name
);
3142 if (S_ISGITLINK(expected_mode
)) {
3144 return read_file_or_gitlink(ce
, buf
);
3146 return SUBMODULE_PATCH_WITHOUT_INDEX
;
3148 if (read_old_data(st
, name
, buf
))
3149 return error(_("read of %s failed"), name
);
3156 * We are about to apply "patch"; populate the "image" with the
3157 * current version we have, from the working tree or from the index,
3158 * depending on the situation e.g. --cached/--index. If we are
3159 * applying a non-git patch that incrementally updates the tree,
3160 * we read from the result of a previous diff.
3162 static int load_preimage(struct image
*image
,
3163 struct patch
*patch
, struct stat
*st
,
3164 const struct cache_entry
*ce
)
3166 struct strbuf buf
= STRBUF_INIT
;
3169 struct patch
*previous
;
3172 previous
= previous_patch(patch
, &status
);
3174 return error(_("path %s has been renamed/deleted"),
3177 /* We have a patched copy in memory; use that. */
3178 strbuf_add(&buf
, previous
->result
, previous
->resultsize
);
3180 status
= load_patch_target(&buf
, ce
, st
,
3181 patch
->old_name
, patch
->old_mode
);
3184 else if (status
== SUBMODULE_PATCH_WITHOUT_INDEX
) {
3186 * There is no way to apply subproject
3187 * patch without looking at the index.
3188 * NEEDSWORK: shouldn't this be flagged
3191 free_fragment_list(patch
->fragments
);
3192 patch
->fragments
= NULL
;
3193 } else if (status
) {
3194 return error(_("read of %s failed"), patch
->old_name
);
3198 img
= strbuf_detach(&buf
, &len
);
3199 prepare_image(image
, img
, len
, !patch
->is_binary
);
3203 static int three_way_merge(struct image
*image
,
3205 const unsigned char *base
,
3206 const unsigned char *ours
,
3207 const unsigned char *theirs
)
3209 mmfile_t base_file
, our_file
, their_file
;
3210 mmbuffer_t result
= { NULL
};
3213 read_mmblob(&base_file
, base
);
3214 read_mmblob(&our_file
, ours
);
3215 read_mmblob(&their_file
, theirs
);
3216 status
= ll_merge(&result
, path
,
3219 &their_file
, "theirs", NULL
);
3220 free(base_file
.ptr
);
3222 free(their_file
.ptr
);
3223 if (status
< 0 || !result
.ptr
) {
3228 image
->buf
= result
.ptr
;
3229 image
->len
= result
.size
;
3235 * When directly falling back to add/add three-way merge, we read from
3236 * the current contents of the new_name. In no cases other than that
3237 * this function will be called.
3239 static int load_current(struct image
*image
, struct patch
*patch
)
3241 struct strbuf buf
= STRBUF_INIT
;
3246 struct cache_entry
*ce
;
3247 char *name
= patch
->new_name
;
3248 unsigned mode
= patch
->new_mode
;
3251 die("BUG: patch to %s is not a creation", patch
->old_name
);
3253 pos
= cache_name_pos(name
, strlen(name
));
3255 return error(_("%s: does not exist in index"), name
);
3256 ce
= active_cache
[pos
];
3257 if (lstat(name
, &st
)) {
3258 if (errno
!= ENOENT
)
3259 return error(_("%s: %s"), name
, strerror(errno
));
3260 if (checkout_target(ce
, &st
))
3263 if (verify_index_match(ce
, &st
))
3264 return error(_("%s: does not match index"), name
);
3266 status
= load_patch_target(&buf
, ce
, &st
, name
, mode
);
3271 img
= strbuf_detach(&buf
, &len
);
3272 prepare_image(image
, img
, len
, !patch
->is_binary
);
3276 static int try_threeway(struct image
*image
, struct patch
*patch
,
3277 struct stat
*st
, const struct cache_entry
*ce
)
3279 unsigned char pre_sha1
[20], post_sha1
[20], our_sha1
[20];
3280 struct strbuf buf
= STRBUF_INIT
;
3284 struct image tmp_image
;
3286 /* No point falling back to 3-way merge in these cases */
3287 if (patch
->is_delete
||
3288 S_ISGITLINK(patch
->old_mode
) || S_ISGITLINK(patch
->new_mode
))
3291 /* Preimage the patch was prepared for */
3293 write_sha1_file("", 0, blob_type
, pre_sha1
);
3294 else if (get_sha1(patch
->old_sha1_prefix
, pre_sha1
) ||
3295 read_blob_object(&buf
, pre_sha1
, patch
->old_mode
))
3296 return error("repository lacks the necessary blob to fall back on 3-way merge.");
3298 fprintf(stderr
, "Falling back to three-way merge...\n");
3300 img
= strbuf_detach(&buf
, &len
);
3301 prepare_image(&tmp_image
, img
, len
, 1);
3302 /* Apply the patch to get the post image */
3303 if (apply_fragments(&tmp_image
, patch
) < 0) {
3304 clear_image(&tmp_image
);
3307 /* post_sha1[] is theirs */
3308 write_sha1_file(tmp_image
.buf
, tmp_image
.len
, blob_type
, post_sha1
);
3309 clear_image(&tmp_image
);
3311 /* our_sha1[] is ours */
3312 if (patch
->is_new
) {
3313 if (load_current(&tmp_image
, patch
))
3314 return error("cannot read the current contents of '%s'",
3317 if (load_preimage(&tmp_image
, patch
, st
, ce
))
3318 return error("cannot read the current contents of '%s'",
3321 write_sha1_file(tmp_image
.buf
, tmp_image
.len
, blob_type
, our_sha1
);
3322 clear_image(&tmp_image
);
3324 /* in-core three-way merge between post and our using pre as base */
3325 status
= three_way_merge(image
, patch
->new_name
,
3326 pre_sha1
, our_sha1
, post_sha1
);
3328 fprintf(stderr
, "Failed to fall back on three-way merge...\n");
3333 patch
->conflicted_threeway
= 1;
3335 hashclr(patch
->threeway_stage
[0]);
3337 hashcpy(patch
->threeway_stage
[0], pre_sha1
);
3338 hashcpy(patch
->threeway_stage
[1], our_sha1
);
3339 hashcpy(patch
->threeway_stage
[2], post_sha1
);
3340 fprintf(stderr
, "Applied patch to '%s' with conflicts.\n", patch
->new_name
);
3342 fprintf(stderr
, "Applied patch to '%s' cleanly.\n", patch
->new_name
);
3347 static int apply_data(struct patch
*patch
, struct stat
*st
, const struct cache_entry
*ce
)
3351 if (load_preimage(&image
, patch
, st
, ce
) < 0)
3354 if (patch
->direct_to_threeway
||
3355 apply_fragments(&image
, patch
) < 0) {
3356 /* Note: with --reject, apply_fragments() returns 0 */
3357 if (!threeway
|| try_threeway(&image
, patch
, st
, ce
) < 0)
3360 patch
->result
= image
.buf
;
3361 patch
->resultsize
= image
.len
;
3362 add_to_fn_table(patch
);
3363 free(image
.line_allocated
);
3365 if (0 < patch
->is_delete
&& patch
->resultsize
)
3366 return error(_("removal patch leaves file contents"));
3372 * If "patch" that we are looking at modifies or deletes what we have,
3373 * we would want it not to lose any local modification we have, either
3374 * in the working tree or in the index.
3376 * This also decides if a non-git patch is a creation patch or a
3377 * modification to an existing empty file. We do not check the state
3378 * of the current tree for a creation patch in this function; the caller
3379 * check_patch() separately makes sure (and errors out otherwise) that
3380 * the path the patch creates does not exist in the current tree.
3382 static int check_preimage(struct patch
*patch
, struct cache_entry
**ce
, struct stat
*st
)
3384 const char *old_name
= patch
->old_name
;
3385 struct patch
*previous
= NULL
;
3386 int stat_ret
= 0, status
;
3387 unsigned st_mode
= 0;
3392 assert(patch
->is_new
<= 0);
3393 previous
= previous_patch(patch
, &status
);
3396 return error(_("path %s has been renamed/deleted"), old_name
);
3398 st_mode
= previous
->new_mode
;
3399 } else if (!cached
) {
3400 stat_ret
= lstat(old_name
, st
);
3401 if (stat_ret
&& errno
!= ENOENT
)
3402 return error(_("%s: %s"), old_name
, strerror(errno
));
3405 if (check_index
&& !previous
) {
3406 int pos
= cache_name_pos(old_name
, strlen(old_name
));
3408 if (patch
->is_new
< 0)
3410 return error(_("%s: does not exist in index"), old_name
);
3412 *ce
= active_cache
[pos
];
3414 if (checkout_target(*ce
, st
))
3417 if (!cached
&& verify_index_match(*ce
, st
))
3418 return error(_("%s: does not match index"), old_name
);
3420 st_mode
= (*ce
)->ce_mode
;
3421 } else if (stat_ret
< 0) {
3422 if (patch
->is_new
< 0)
3424 return error(_("%s: %s"), old_name
, strerror(errno
));
3427 if (!cached
&& !previous
)
3428 st_mode
= ce_mode_from_stat(*ce
, st
->st_mode
);
3430 if (patch
->is_new
< 0)
3432 if (!patch
->old_mode
)
3433 patch
->old_mode
= st_mode
;
3434 if ((st_mode
^ patch
->old_mode
) & S_IFMT
)
3435 return error(_("%s: wrong type"), old_name
);
3436 if (st_mode
!= patch
->old_mode
)
3437 warning(_("%s has type %o, expected %o"),
3438 old_name
, st_mode
, patch
->old_mode
);
3439 if (!patch
->new_mode
&& !patch
->is_delete
)
3440 patch
->new_mode
= st_mode
;
3445 patch
->is_delete
= 0;
3446 free(patch
->old_name
);
3447 patch
->old_name
= NULL
;
3452 #define EXISTS_IN_INDEX 1
3453 #define EXISTS_IN_WORKTREE 2
3455 static int check_to_create(const char *new_name
, int ok_if_exists
)
3460 cache_name_pos(new_name
, strlen(new_name
)) >= 0 &&
3462 return EXISTS_IN_INDEX
;
3466 if (!lstat(new_name
, &nst
)) {
3467 if (S_ISDIR(nst
.st_mode
) || ok_if_exists
)
3470 * A leading component of new_name might be a symlink
3471 * that is going to be removed with this patch, but
3472 * still pointing at somewhere that has the path.
3473 * In such a case, path "new_name" does not exist as
3474 * far as git is concerned.
3476 if (has_symlink_leading_path(new_name
, strlen(new_name
)))
3479 return EXISTS_IN_WORKTREE
;
3480 } else if ((errno
!= ENOENT
) && (errno
!= ENOTDIR
)) {
3481 return error("%s: %s", new_name
, strerror(errno
));
3487 * Check and apply the patch in-core; leave the result in patch->result
3488 * for the caller to write it out to the final destination.
3490 static int check_patch(struct patch
*patch
)
3493 const char *old_name
= patch
->old_name
;
3494 const char *new_name
= patch
->new_name
;
3495 const char *name
= old_name
? old_name
: new_name
;
3496 struct cache_entry
*ce
= NULL
;
3497 struct patch
*tpatch
;
3501 patch
->rejected
= 1; /* we will drop this after we succeed */
3503 status
= check_preimage(patch
, &ce
, &st
);
3506 old_name
= patch
->old_name
;
3509 * A type-change diff is always split into a patch to delete
3510 * old, immediately followed by a patch to create new (see
3511 * diff.c::run_diff()); in such a case it is Ok that the entry
3512 * to be deleted by the previous patch is still in the working
3513 * tree and in the index.
3515 * A patch to swap-rename between A and B would first rename A
3516 * to B and then rename B to A. While applying the first one,
3517 * the presence of B should not stop A from getting renamed to
3518 * B; ask to_be_deleted() about the later rename. Removal of
3519 * B and rename from A to B is handled the same way by asking
3522 if ((tpatch
= in_fn_table(new_name
)) &&
3523 (was_deleted(tpatch
) || to_be_deleted(tpatch
)))
3529 ((0 < patch
->is_new
) || patch
->is_rename
|| patch
->is_copy
)) {
3530 int err
= check_to_create(new_name
, ok_if_exists
);
3532 if (err
&& threeway
) {
3533 patch
->direct_to_threeway
= 1;
3534 } else switch (err
) {
3537 case EXISTS_IN_INDEX
:
3538 return error(_("%s: already exists in index"), new_name
);
3540 case EXISTS_IN_WORKTREE
:
3541 return error(_("%s: already exists in working directory"),
3547 if (!patch
->new_mode
) {
3548 if (0 < patch
->is_new
)
3549 patch
->new_mode
= S_IFREG
| 0644;
3551 patch
->new_mode
= patch
->old_mode
;
3555 if (new_name
&& old_name
) {
3556 int same
= !strcmp(old_name
, new_name
);
3557 if (!patch
->new_mode
)
3558 patch
->new_mode
= patch
->old_mode
;
3559 if ((patch
->old_mode
^ patch
->new_mode
) & S_IFMT
) {
3561 return error(_("new mode (%o) of %s does not "
3562 "match old mode (%o)"),
3563 patch
->new_mode
, new_name
,
3566 return error(_("new mode (%o) of %s does not "
3567 "match old mode (%o) of %s"),
3568 patch
->new_mode
, new_name
,
3569 patch
->old_mode
, old_name
);
3573 if (apply_data(patch
, &st
, ce
) < 0)
3574 return error(_("%s: patch does not apply"), name
);
3575 patch
->rejected
= 0;
3579 static int check_patch_list(struct patch
*patch
)
3583 prepare_fn_table(patch
);
3585 if (apply_verbosely
)
3586 say_patch_name(stderr
,
3587 _("Checking patch %s..."), patch
);
3588 err
|= check_patch(patch
);
3589 patch
= patch
->next
;
3594 /* This function tries to read the sha1 from the current index */
3595 static int get_current_sha1(const char *path
, unsigned char *sha1
)
3599 if (read_cache() < 0)
3601 pos
= cache_name_pos(path
, strlen(path
));
3604 hashcpy(sha1
, active_cache
[pos
]->sha1
);
3608 static int preimage_sha1_in_gitlink_patch(struct patch
*p
, unsigned char sha1
[20])
3611 * A usable gitlink patch has only one fragment (hunk) that looks like:
3613 * -Subproject commit <old sha1>
3614 * +Subproject commit <new sha1>
3617 * -Subproject commit <old sha1>
3618 * for a removal patch.
3620 struct fragment
*hunk
= p
->fragments
;
3621 static const char heading
[] = "-Subproject commit ";
3624 if (/* does the patch have only one hunk? */
3625 hunk
&& !hunk
->next
&&
3626 /* is its preimage one line? */
3627 hunk
->oldpos
== 1 && hunk
->oldlines
== 1 &&
3628 /* does preimage begin with the heading? */
3629 (preimage
= memchr(hunk
->patch
, '\n', hunk
->size
)) != NULL
&&
3630 starts_with(++preimage
, heading
) &&
3631 /* does it record full SHA-1? */
3632 !get_sha1_hex(preimage
+ sizeof(heading
) - 1, sha1
) &&
3633 preimage
[sizeof(heading
) + 40 - 1] == '\n' &&
3634 /* does the abbreviated name on the index line agree with it? */
3635 starts_with(preimage
+ sizeof(heading
) - 1, p
->old_sha1_prefix
))
3636 return 0; /* it all looks fine */
3638 /* we may have full object name on the index line */
3639 return get_sha1_hex(p
->old_sha1_prefix
, sha1
);
3642 /* Build an index that contains the just the files needed for a 3way merge */
3643 static void build_fake_ancestor(struct patch
*list
, const char *filename
)
3645 struct patch
*patch
;
3646 struct index_state result
= { NULL
};
3649 /* Once we start supporting the reverse patch, it may be
3650 * worth showing the new sha1 prefix, but until then...
3652 for (patch
= list
; patch
; patch
= patch
->next
) {
3653 unsigned char sha1
[20];
3654 struct cache_entry
*ce
;
3657 name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
3658 if (0 < patch
->is_new
)
3661 if (S_ISGITLINK(patch
->old_mode
)) {
3662 if (!preimage_sha1_in_gitlink_patch(patch
, sha1
))
3663 ; /* ok, the textual part looks sane */
3665 die("sha1 information is lacking or useless for submoule %s",
3667 } else if (!get_sha1_blob(patch
->old_sha1_prefix
, sha1
)) {
3669 } else if (!patch
->lines_added
&& !patch
->lines_deleted
) {
3670 /* mode-only change: update the current */
3671 if (get_current_sha1(patch
->old_name
, sha1
))
3672 die("mode change for %s, which is not "
3673 "in current HEAD", name
);
3675 die("sha1 information is lacking or useless "
3678 ce
= make_cache_entry(patch
->old_mode
, sha1
, name
, 0, 0);
3680 die(_("make_cache_entry failed for path '%s'"), name
);
3681 if (add_index_entry(&result
, ce
, ADD_CACHE_OK_TO_ADD
))
3682 die ("Could not add %s to temporary index", name
);
3685 fd
= open(filename
, O_WRONLY
| O_CREAT
, 0666);
3686 if (fd
< 0 || write_index(&result
, fd
) || close(fd
))
3687 die ("Could not write temporary index to %s", filename
);
3689 discard_index(&result
);
3692 static void stat_patch_list(struct patch
*patch
)
3694 int files
, adds
, dels
;
3696 for (files
= adds
= dels
= 0 ; patch
; patch
= patch
->next
) {
3698 adds
+= patch
->lines_added
;
3699 dels
+= patch
->lines_deleted
;
3703 print_stat_summary(stdout
, files
, adds
, dels
);
3706 static void numstat_patch_list(struct patch
*patch
)
3708 for ( ; patch
; patch
= patch
->next
) {
3710 name
= patch
->new_name
? patch
->new_name
: patch
->old_name
;
3711 if (patch
->is_binary
)
3714 printf("%d\t%d\t", patch
->lines_added
, patch
->lines_deleted
);
3715 write_name_quoted(name
, stdout
, line_termination
);
3719 static void show_file_mode_name(const char *newdelete
, unsigned int mode
, const char *name
)
3722 printf(" %s mode %06o %s\n", newdelete
, mode
, name
);
3724 printf(" %s %s\n", newdelete
, name
);
3727 static void show_mode_change(struct patch
*p
, int show_name
)
3729 if (p
->old_mode
&& p
->new_mode
&& p
->old_mode
!= p
->new_mode
) {
3731 printf(" mode change %06o => %06o %s\n",
3732 p
->old_mode
, p
->new_mode
, p
->new_name
);
3734 printf(" mode change %06o => %06o\n",
3735 p
->old_mode
, p
->new_mode
);
3739 static void show_rename_copy(struct patch
*p
)
3741 const char *renamecopy
= p
->is_rename
? "rename" : "copy";
3742 const char *old
, *new;
3744 /* Find common prefix */
3748 const char *slash_old
, *slash_new
;
3749 slash_old
= strchr(old
, '/');
3750 slash_new
= strchr(new, '/');
3753 slash_old
- old
!= slash_new
- new ||
3754 memcmp(old
, new, slash_new
- new))
3756 old
= slash_old
+ 1;
3757 new = slash_new
+ 1;
3759 /* p->old_name thru old is the common prefix, and old and new
3760 * through the end of names are renames
3762 if (old
!= p
->old_name
)
3763 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy
,
3764 (int)(old
- p
->old_name
), p
->old_name
,
3765 old
, new, p
->score
);
3767 printf(" %s %s => %s (%d%%)\n", renamecopy
,
3768 p
->old_name
, p
->new_name
, p
->score
);
3769 show_mode_change(p
, 0);
3772 static void summary_patch_list(struct patch
*patch
)
3776 for (p
= patch
; p
; p
= p
->next
) {
3778 show_file_mode_name("create", p
->new_mode
, p
->new_name
);
3779 else if (p
->is_delete
)
3780 show_file_mode_name("delete", p
->old_mode
, p
->old_name
);
3782 if (p
->is_rename
|| p
->is_copy
)
3783 show_rename_copy(p
);
3786 printf(" rewrite %s (%d%%)\n",
3787 p
->new_name
, p
->score
);
3788 show_mode_change(p
, 0);
3791 show_mode_change(p
, 1);
3797 static void patch_stats(struct patch
*patch
)
3799 int lines
= patch
->lines_added
+ patch
->lines_deleted
;
3801 if (lines
> max_change
)
3803 if (patch
->old_name
) {
3804 int len
= quote_c_style(patch
->old_name
, NULL
, NULL
, 0);
3806 len
= strlen(patch
->old_name
);
3810 if (patch
->new_name
) {
3811 int len
= quote_c_style(patch
->new_name
, NULL
, NULL
, 0);
3813 len
= strlen(patch
->new_name
);
3819 static void remove_file(struct patch
*patch
, int rmdir_empty
)
3822 if (remove_file_from_cache(patch
->old_name
) < 0)
3823 die(_("unable to remove %s from index"), patch
->old_name
);
3826 if (!remove_or_warn(patch
->old_mode
, patch
->old_name
) && rmdir_empty
) {
3827 remove_path(patch
->old_name
);
3832 static void add_index_file(const char *path
, unsigned mode
, void *buf
, unsigned long size
)
3835 struct cache_entry
*ce
;
3836 int namelen
= strlen(path
);
3837 unsigned ce_size
= cache_entry_size(namelen
);
3842 ce
= xcalloc(1, ce_size
);
3843 memcpy(ce
->name
, path
, namelen
);
3844 ce
->ce_mode
= create_ce_mode(mode
);
3845 ce
->ce_flags
= create_ce_flags(0);
3846 ce
->ce_namelen
= namelen
;
3847 if (S_ISGITLINK(mode
)) {
3848 const char *s
= buf
;
3850 if (get_sha1_hex(s
+ strlen("Subproject commit "), ce
->sha1
))
3851 die(_("corrupt patch for submodule %s"), path
);
3854 if (lstat(path
, &st
) < 0)
3855 die_errno(_("unable to stat newly created file '%s'"),
3857 fill_stat_cache_info(ce
, &st
);
3859 if (write_sha1_file(buf
, size
, blob_type
, ce
->sha1
) < 0)
3860 die(_("unable to create backing store for newly created file %s"), path
);
3862 if (add_cache_entry(ce
, ADD_CACHE_OK_TO_ADD
) < 0)
3863 die(_("unable to add cache entry for %s"), path
);
3866 static int try_create_file(const char *path
, unsigned int mode
, const char *buf
, unsigned long size
)
3869 struct strbuf nbuf
= STRBUF_INIT
;
3871 if (S_ISGITLINK(mode
)) {
3873 if (!lstat(path
, &st
) && S_ISDIR(st
.st_mode
))
3875 return mkdir(path
, 0777);
3878 if (has_symlinks
&& S_ISLNK(mode
))
3879 /* Although buf:size is counted string, it also is NUL
3882 return symlink(buf
, path
);
3884 fd
= open(path
, O_CREAT
| O_EXCL
| O_WRONLY
, (mode
& 0100) ? 0777 : 0666);
3888 if (convert_to_working_tree(path
, buf
, size
, &nbuf
)) {
3892 write_or_die(fd
, buf
, size
);
3893 strbuf_release(&nbuf
);
3896 die_errno(_("closing file '%s'"), path
);
3901 * We optimistically assume that the directories exist,
3902 * which is true 99% of the time anyway. If they don't,
3903 * we create them and try again.
3905 static void create_one_file(char *path
, unsigned mode
, const char *buf
, unsigned long size
)
3909 if (!try_create_file(path
, mode
, buf
, size
))
3912 if (errno
== ENOENT
) {
3913 if (safe_create_leading_directories(path
))
3915 if (!try_create_file(path
, mode
, buf
, size
))
3919 if (errno
== EEXIST
|| errno
== EACCES
) {
3920 /* We may be trying to create a file where a directory
3924 if (!lstat(path
, &st
) && (!S_ISDIR(st
.st_mode
) || !rmdir(path
)))
3928 if (errno
== EEXIST
) {
3929 unsigned int nr
= getpid();
3932 char newpath
[PATH_MAX
];
3933 mksnpath(newpath
, sizeof(newpath
), "%s~%u", path
, nr
);
3934 if (!try_create_file(newpath
, mode
, buf
, size
)) {
3935 if (!rename(newpath
, path
))
3937 unlink_or_warn(newpath
);
3940 if (errno
!= EEXIST
)
3945 die_errno(_("unable to write file '%s' mode %o"), path
, mode
);
3948 static void add_conflicted_stages_file(struct patch
*patch
)
3951 unsigned ce_size
, mode
;
3952 struct cache_entry
*ce
;
3956 namelen
= strlen(patch
->new_name
);
3957 ce_size
= cache_entry_size(namelen
);
3958 mode
= patch
->new_mode
? patch
->new_mode
: (S_IFREG
| 0644);
3960 remove_file_from_cache(patch
->new_name
);
3961 for (stage
= 1; stage
< 4; stage
++) {
3962 if (is_null_sha1(patch
->threeway_stage
[stage
- 1]))
3964 ce
= xcalloc(1, ce_size
);
3965 memcpy(ce
->name
, patch
->new_name
, namelen
);
3966 ce
->ce_mode
= create_ce_mode(mode
);
3967 ce
->ce_flags
= create_ce_flags(stage
);
3968 ce
->ce_namelen
= namelen
;
3969 hashcpy(ce
->sha1
, patch
->threeway_stage
[stage
- 1]);
3970 if (add_cache_entry(ce
, ADD_CACHE_OK_TO_ADD
) < 0)
3971 die(_("unable to add cache entry for %s"), patch
->new_name
);
3975 static void create_file(struct patch
*patch
)
3977 char *path
= patch
->new_name
;
3978 unsigned mode
= patch
->new_mode
;
3979 unsigned long size
= patch
->resultsize
;
3980 char *buf
= patch
->result
;
3983 mode
= S_IFREG
| 0644;
3984 create_one_file(path
, mode
, buf
, size
);
3986 if (patch
->conflicted_threeway
)
3987 add_conflicted_stages_file(patch
);
3989 add_index_file(path
, mode
, buf
, size
);
3992 /* phase zero is to remove, phase one is to create */
3993 static void write_out_one_result(struct patch
*patch
, int phase
)
3995 if (patch
->is_delete
> 0) {
3997 remove_file(patch
, 1);
4000 if (patch
->is_new
> 0 || patch
->is_copy
) {
4006 * Rename or modification boils down to the same
4007 * thing: remove the old, write the new
4010 remove_file(patch
, patch
->is_rename
);
4015 static int write_out_one_reject(struct patch
*patch
)
4018 char namebuf
[PATH_MAX
];
4019 struct fragment
*frag
;
4021 struct strbuf sb
= STRBUF_INIT
;
4023 for (cnt
= 0, frag
= patch
->fragments
; frag
; frag
= frag
->next
) {
4024 if (!frag
->rejected
)
4030 if (apply_verbosely
)
4031 say_patch_name(stderr
,
4032 _("Applied patch %s cleanly."), patch
);
4036 /* This should not happen, because a removal patch that leaves
4037 * contents are marked "rejected" at the patch level.
4039 if (!patch
->new_name
)
4040 die(_("internal error"));
4042 /* Say this even without --verbose */
4043 strbuf_addf(&sb
, Q_("Applying patch %%s with %d reject...",
4044 "Applying patch %%s with %d rejects...",
4047 say_patch_name(stderr
, sb
.buf
, patch
);
4048 strbuf_release(&sb
);
4050 cnt
= strlen(patch
->new_name
);
4051 if (ARRAY_SIZE(namebuf
) <= cnt
+ 5) {
4052 cnt
= ARRAY_SIZE(namebuf
) - 5;
4053 warning(_("truncating .rej filename to %.*s.rej"),
4054 cnt
- 1, patch
->new_name
);
4056 memcpy(namebuf
, patch
->new_name
, cnt
);
4057 memcpy(namebuf
+ cnt
, ".rej", 5);
4059 rej
= fopen(namebuf
, "w");
4061 return error(_("cannot open %s: %s"), namebuf
, strerror(errno
));
4063 /* Normal git tools never deal with .rej, so do not pretend
4064 * this is a git patch by saying --git or giving extended
4065 * headers. While at it, maybe please "kompare" that wants
4066 * the trailing TAB and some garbage at the end of line ;-).
4068 fprintf(rej
, "diff a/%s b/%s\t(rejected hunks)\n",
4069 patch
->new_name
, patch
->new_name
);
4070 for (cnt
= 1, frag
= patch
->fragments
;
4072 cnt
++, frag
= frag
->next
) {
4073 if (!frag
->rejected
) {
4074 fprintf_ln(stderr
, _("Hunk #%d applied cleanly."), cnt
);
4077 fprintf_ln(stderr
, _("Rejected hunk #%d."), cnt
);
4078 fprintf(rej
, "%.*s", frag
->size
, frag
->patch
);
4079 if (frag
->patch
[frag
->size
-1] != '\n')
4086 static int write_out_results(struct patch
*list
)
4091 struct string_list cpath
= STRING_LIST_INIT_DUP
;
4093 for (phase
= 0; phase
< 2; phase
++) {
4099 write_out_one_result(l
, phase
);
4101 if (write_out_one_reject(l
))
4103 if (l
->conflicted_threeway
) {
4104 string_list_append(&cpath
, l
->new_name
);
4114 struct string_list_item
*item
;
4116 sort_string_list(&cpath
);
4117 for_each_string_list_item(item
, &cpath
)
4118 fprintf(stderr
, "U %s\n", item
->string
);
4119 string_list_clear(&cpath
, 0);
4127 static struct lock_file lock_file
;
4129 static struct string_list limit_by_name
;
4130 static int has_include
;
4131 static void add_name_limit(const char *name
, int exclude
)
4133 struct string_list_item
*it
;
4135 it
= string_list_append(&limit_by_name
, name
);
4136 it
->util
= exclude
? NULL
: (void *) 1;
4139 static int use_patch(struct patch
*p
)
4141 const char *pathname
= p
->new_name
? p
->new_name
: p
->old_name
;
4144 /* Paths outside are not touched regardless of "--include" */
4145 if (0 < prefix_length
) {
4146 int pathlen
= strlen(pathname
);
4147 if (pathlen
<= prefix_length
||
4148 memcmp(prefix
, pathname
, prefix_length
))
4152 /* See if it matches any of exclude/include rule */
4153 for (i
= 0; i
< limit_by_name
.nr
; i
++) {
4154 struct string_list_item
*it
= &limit_by_name
.items
[i
];
4155 if (!wildmatch(it
->string
, pathname
, 0, NULL
))
4156 return (it
->util
!= NULL
);
4160 * If we had any include, a path that does not match any rule is
4161 * not used. Otherwise, we saw bunch of exclude rules (or none)
4162 * and such a path is used.
4164 return !has_include
;
4168 static void prefix_one(char **name
)
4170 char *old_name
= *name
;
4173 *name
= xstrdup(prefix_filename(prefix
, prefix_length
, *name
));
4177 static void prefix_patches(struct patch
*p
)
4179 if (!prefix
|| p
->is_toplevel_relative
)
4181 for ( ; p
; p
= p
->next
) {
4182 prefix_one(&p
->new_name
);
4183 prefix_one(&p
->old_name
);
4187 #define INACCURATE_EOF (1<<0)
4188 #define RECOUNT (1<<1)
4190 static int apply_patch(int fd
, const char *filename
, int options
)
4193 struct strbuf buf
= STRBUF_INIT
; /* owns the patch text */
4194 struct patch
*list
= NULL
, **listp
= &list
;
4195 int skipped_patch
= 0;
4197 patch_input_file
= filename
;
4198 read_patch_file(&buf
, fd
);
4200 while (offset
< buf
.len
) {
4201 struct patch
*patch
;
4204 patch
= xcalloc(1, sizeof(*patch
));
4205 patch
->inaccurate_eof
= !!(options
& INACCURATE_EOF
);
4206 patch
->recount
= !!(options
& RECOUNT
);
4207 nr
= parse_chunk(buf
.buf
+ offset
, buf
.len
- offset
, patch
);
4210 if (apply_in_reverse
)
4211 reverse_patches(patch
);
4213 prefix_patches(patch
);
4214 if (use_patch(patch
)) {
4217 listp
= &patch
->next
;
4226 if (!list
&& !skipped_patch
)
4227 die(_("unrecognized input"));
4229 if (whitespace_error
&& (ws_error_action
== die_on_ws_error
))
4232 update_index
= check_index
&& apply
;
4233 if (update_index
&& newfd
< 0)
4234 newfd
= hold_locked_index(&lock_file
, 1);
4237 if (read_cache() < 0)
4238 die(_("unable to read index file"));
4241 if ((check
|| apply
) &&
4242 check_patch_list(list
) < 0 &&
4246 if (apply
&& write_out_results(list
)) {
4247 if (apply_with_reject
)
4249 /* with --3way, we still need to write the index out */
4254 build_fake_ancestor(list
, fake_ancestor
);
4257 stat_patch_list(list
);
4260 numstat_patch_list(list
);
4263 summary_patch_list(list
);
4265 free_patch_list(list
);
4266 strbuf_release(&buf
);
4267 string_list_clear(&fn_table
, 0);
4271 static int git_apply_config(const char *var
, const char *value
, void *cb
)
4273 if (!strcmp(var
, "apply.whitespace"))
4274 return git_config_string(&apply_default_whitespace
, var
, value
);
4275 else if (!strcmp(var
, "apply.ignorewhitespace"))
4276 return git_config_string(&apply_default_ignorewhitespace
, var
, value
);
4277 return git_default_config(var
, value
, cb
);
4280 static int option_parse_exclude(const struct option
*opt
,
4281 const char *arg
, int unset
)
4283 add_name_limit(arg
, 1);
4287 static int option_parse_include(const struct option
*opt
,
4288 const char *arg
, int unset
)
4290 add_name_limit(arg
, 0);
4295 static int option_parse_p(const struct option
*opt
,
4296 const char *arg
, int unset
)
4298 p_value
= atoi(arg
);
4303 static int option_parse_z(const struct option
*opt
,
4304 const char *arg
, int unset
)
4307 line_termination
= '\n';
4309 line_termination
= 0;
4313 static int option_parse_space_change(const struct option
*opt
,
4314 const char *arg
, int unset
)
4317 ws_ignore_action
= ignore_ws_none
;
4319 ws_ignore_action
= ignore_ws_change
;
4323 static int option_parse_whitespace(const struct option
*opt
,
4324 const char *arg
, int unset
)
4326 const char **whitespace_option
= opt
->value
;
4328 *whitespace_option
= arg
;
4329 parse_whitespace_option(arg
);
4333 static int option_parse_directory(const struct option
*opt
,
4334 const char *arg
, int unset
)
4336 root_len
= strlen(arg
);
4337 if (root_len
&& arg
[root_len
- 1] != '/') {
4339 root
= new_root
= xmalloc(root_len
+ 2);
4340 strcpy(new_root
, arg
);
4341 strcpy(new_root
+ root_len
++, "/");
4347 int cmd_apply(int argc
, const char **argv
, const char *prefix_
)
4351 int is_not_gitdir
= !startup_info
->have_repository
;
4352 int force_apply
= 0;
4354 const char *whitespace_option
= NULL
;
4356 struct option builtin_apply_options
[] = {
4357 { OPTION_CALLBACK
, 0, "exclude", NULL
, N_("path"),
4358 N_("don't apply changes matching the given path"),
4359 0, option_parse_exclude
},
4360 { OPTION_CALLBACK
, 0, "include", NULL
, N_("path"),
4361 N_("apply changes matching the given path"),
4362 0, option_parse_include
},
4363 { OPTION_CALLBACK
, 'p', NULL
, NULL
, N_("num"),
4364 N_("remove <num> leading slashes from traditional diff paths"),
4365 0, option_parse_p
},
4366 OPT_BOOL(0, "no-add", &no_add
,
4367 N_("ignore additions made by the patch")),
4368 OPT_BOOL(0, "stat", &diffstat
,
4369 N_("instead of applying the patch, output diffstat for the input")),
4370 OPT_NOOP_NOARG(0, "allow-binary-replacement"),
4371 OPT_NOOP_NOARG(0, "binary"),
4372 OPT_BOOL(0, "numstat", &numstat
,
4373 N_("show number of added and deleted lines in decimal notation")),
4374 OPT_BOOL(0, "summary", &summary
,
4375 N_("instead of applying the patch, output a summary for the input")),
4376 OPT_BOOL(0, "check", &check
,
4377 N_("instead of applying the patch, see if the patch is applicable")),
4378 OPT_BOOL(0, "index", &check_index
,
4379 N_("make sure the patch is applicable to the current index")),
4380 OPT_BOOL(0, "cached", &cached
,
4381 N_("apply a patch without touching the working tree")),
4382 OPT_BOOL(0, "apply", &force_apply
,
4383 N_("also apply the patch (use with --stat/--summary/--check)")),
4384 OPT_BOOL('3', "3way", &threeway
,
4385 N_( "attempt three-way merge if a patch does not apply")),
4386 OPT_FILENAME(0, "build-fake-ancestor", &fake_ancestor
,
4387 N_("build a temporary index based on embedded index information")),
4388 { OPTION_CALLBACK
, 'z', NULL
, NULL
, NULL
,
4389 N_("paths are separated with NUL character"),
4390 PARSE_OPT_NOARG
, option_parse_z
},
4391 OPT_INTEGER('C', NULL
, &p_context
,
4392 N_("ensure at least <n> lines of context match")),
4393 { OPTION_CALLBACK
, 0, "whitespace", &whitespace_option
, N_("action"),
4394 N_("detect new or modified lines that have whitespace errors"),
4395 0, option_parse_whitespace
},
4396 { OPTION_CALLBACK
, 0, "ignore-space-change", NULL
, NULL
,
4397 N_("ignore changes in whitespace when finding context"),
4398 PARSE_OPT_NOARG
, option_parse_space_change
},
4399 { OPTION_CALLBACK
, 0, "ignore-whitespace", NULL
, NULL
,
4400 N_("ignore changes in whitespace when finding context"),
4401 PARSE_OPT_NOARG
, option_parse_space_change
},
4402 OPT_BOOL('R', "reverse", &apply_in_reverse
,
4403 N_("apply the patch in reverse")),
4404 OPT_BOOL(0, "unidiff-zero", &unidiff_zero
,
4405 N_("don't expect at least one line of context")),
4406 OPT_BOOL(0, "reject", &apply_with_reject
,
4407 N_("leave the rejected hunks in corresponding *.rej files")),
4408 OPT_BOOL(0, "allow-overlap", &allow_overlap
,
4409 N_("allow overlapping hunks")),
4410 OPT__VERBOSE(&apply_verbosely
, N_("be verbose")),
4411 OPT_BIT(0, "inaccurate-eof", &options
,
4412 N_("tolerate incorrectly detected missing new-line at the end of file"),
4414 OPT_BIT(0, "recount", &options
,
4415 N_("do not trust the line counts in the hunk headers"),
4417 { OPTION_CALLBACK
, 0, "directory", NULL
, N_("root"),
4418 N_("prepend <root> to all filenames"),
4419 0, option_parse_directory
},
4424 prefix_length
= prefix
? strlen(prefix
) : 0;
4425 git_config(git_apply_config
, NULL
);
4426 if (apply_default_whitespace
)
4427 parse_whitespace_option(apply_default_whitespace
);
4428 if (apply_default_ignorewhitespace
)
4429 parse_ignorewhitespace_option(apply_default_ignorewhitespace
);
4431 argc
= parse_options(argc
, argv
, prefix
, builtin_apply_options
,
4434 if (apply_with_reject
&& threeway
)
4435 die("--reject and --3way cannot be used together.");
4436 if (cached
&& threeway
)
4437 die("--cached and --3way cannot be used together.");
4440 die(_("--3way outside a repository"));
4443 if (apply_with_reject
)
4444 apply
= apply_verbosely
= 1;
4445 if (!force_apply
&& (diffstat
|| numstat
|| summary
|| check
|| fake_ancestor
))
4447 if (check_index
&& is_not_gitdir
)
4448 die(_("--index outside a repository"));
4451 die(_("--cached outside a repository"));
4454 for (i
= 0; i
< argc
; i
++) {
4455 const char *arg
= argv
[i
];
4458 if (!strcmp(arg
, "-")) {
4459 errs
|= apply_patch(0, "<stdin>", options
);
4462 } else if (0 < prefix_length
)
4463 arg
= prefix_filename(prefix
, prefix_length
, arg
);
4465 fd
= open(arg
, O_RDONLY
);
4467 die_errno(_("can't open patch '%s'"), arg
);
4469 set_default_whitespace_mode(whitespace_option
);
4470 errs
|= apply_patch(fd
, arg
, options
);
4473 set_default_whitespace_mode(whitespace_option
);
4475 errs
|= apply_patch(0, "<stdin>", options
);
4476 if (whitespace_error
) {
4477 if (squelch_whitespace_errors
&&
4478 squelch_whitespace_errors
< whitespace_error
) {
4480 whitespace_error
- squelch_whitespace_errors
;
4481 warning(Q_("squelched %d whitespace error",
4482 "squelched %d whitespace errors",
4486 if (ws_error_action
== die_on_ws_error
)
4487 die(Q_("%d line adds whitespace errors.",
4488 "%d lines add whitespace errors.",
4491 if (applied_after_fixing_ws
&& apply
)
4492 warning("%d line%s applied after"
4493 " fixing whitespace errors.",
4494 applied_after_fixing_ws
,
4495 applied_after_fixing_ws
== 1 ? "" : "s");
4496 else if (whitespace_error
)
4497 warning(Q_("%d line adds whitespace errors.",
4498 "%d lines add whitespace errors.",
4504 if (write_cache(newfd
, active_cache
, active_nr
) ||
4505 commit_locked_index(&lock_file
))
4506 die(_("Unable to write new index file"));