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"
17 #include "parse-options.h"
20 * --check turns on checking that the working tree matches the
21 * files that are being modified, but doesn't apply the patch
22 * --stat does just a diffstat, and doesn't actually apply
23 * --numstat does numeric diffstat, and doesn't actually apply
24 * --index-info shows the old and new index info for paths if available.
25 * --index updates the cache as well.
26 * --cached updates only the cache without ever touching the working tree.
28 static const char *prefix
;
29 static int prefix_length
= -1;
30 static int newfd
= -1;
32 static int unidiff_zero
;
33 static int p_value
= 1;
34 static int p_value_known
;
35 static int check_index
;
36 static int update_index
;
43 static int apply_in_reverse
;
44 static int apply_with_reject
;
45 static int apply_verbosely
;
46 static int allow_overlap
;
48 static const char *fake_ancestor
;
49 static int line_termination
= '\n';
50 static unsigned int p_context
= UINT_MAX
;
51 static const char * const apply_usage
[] = {
52 "git apply [options] [<patch>...]",
56 static enum ws_error_action
{
61 } ws_error_action
= warn_on_ws_error
;
62 static int whitespace_error
;
63 static int squelch_whitespace_errors
= 5;
64 static int applied_after_fixing_ws
;
66 static enum ws_ignore
{
69 } ws_ignore_action
= ignore_ws_none
;
72 static const char *patch_input_file
;
73 static const char *root
;
75 static int read_stdin
= 1;
78 static void parse_whitespace_option(const char *option
)
81 ws_error_action
= warn_on_ws_error
;
84 if (!strcmp(option
, "warn")) {
85 ws_error_action
= warn_on_ws_error
;
88 if (!strcmp(option
, "nowarn")) {
89 ws_error_action
= nowarn_ws_error
;
92 if (!strcmp(option
, "error")) {
93 ws_error_action
= die_on_ws_error
;
96 if (!strcmp(option
, "error-all")) {
97 ws_error_action
= die_on_ws_error
;
98 squelch_whitespace_errors
= 0;
101 if (!strcmp(option
, "strip") || !strcmp(option
, "fix")) {
102 ws_error_action
= correct_ws_error
;
105 die("unrecognized whitespace option '%s'", option
);
108 static void parse_ignorewhitespace_option(const char *option
)
110 if (!option
|| !strcmp(option
, "no") ||
111 !strcmp(option
, "false") || !strcmp(option
, "never") ||
112 !strcmp(option
, "none")) {
113 ws_ignore_action
= ignore_ws_none
;
116 if (!strcmp(option
, "change")) {
117 ws_ignore_action
= ignore_ws_change
;
120 die("unrecognized whitespace ignore option '%s'", option
);
123 static void set_default_whitespace_mode(const char *whitespace_option
)
125 if (!whitespace_option
&& !apply_default_whitespace
)
126 ws_error_action
= (apply
? warn_on_ws_error
: nowarn_ws_error
);
130 * For "diff-stat" like behaviour, we keep track of the biggest change
131 * we've seen, and the longest filename. That allows us to do simple
134 static int max_change
, max_len
;
137 * Various "current state", notably line numbers and what
138 * file (and how) we're patching right now.. The "is_xxxx"
139 * things are flags, where -1 means "don't know yet".
141 static int linenr
= 1;
144 * This represents one "hunk" from a patch, starting with
145 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The
146 * patch text is pointed at by patch, and its byte length
147 * is stored in size. leading and trailing are the number
151 unsigned long leading
, trailing
;
152 unsigned long oldpos
, oldlines
;
153 unsigned long newpos
, newlines
;
155 unsigned free_patch
:1,
159 struct fragment
*next
;
163 * When dealing with a binary patch, we reuse "leading" field
164 * to store the type of the binary hunk, either deflated "delta"
165 * or deflated "literal".
167 #define binary_patch_method leading
168 #define BINARY_DELTA_DEFLATED 1
169 #define BINARY_LITERAL_DEFLATED 2
172 * This represents a "patch" to a file, both metainfo changes
173 * such as creation/deletion, filemode and content changes represented
174 * as a series of fragments.
177 char *new_name
, *old_name
, *def_name
;
178 unsigned int old_mode
, new_mode
;
179 int is_new
, is_delete
; /* -1 = unknown, 0 = false, 1 = true */
182 unsigned long deflate_origlen
;
183 int lines_added
, lines_deleted
;
185 unsigned int is_toplevel_relative
:1;
186 unsigned int inaccurate_eof
:1;
187 unsigned int is_binary
:1;
188 unsigned int is_copy
:1;
189 unsigned int is_rename
:1;
190 unsigned int recount
:1;
191 struct fragment
*fragments
;
194 char old_sha1_prefix
[41];
195 char new_sha1_prefix
[41];
199 static void free_fragment_list(struct fragment
*list
)
202 struct fragment
*next
= list
->next
;
203 if (list
->free_patch
)
204 free((char *)list
->patch
);
210 static void free_patch(struct patch
*patch
)
212 free_fragment_list(patch
->fragments
);
213 free(patch
->def_name
);
214 free(patch
->old_name
);
215 free(patch
->new_name
);
220 static void free_patch_list(struct patch
*list
)
223 struct patch
*next
= list
->next
;
230 * A line in a file, len-bytes long (includes the terminating LF,
231 * except for an incomplete line at the end if the file ends with
232 * one), and its contents hashes to 'hash'.
238 #define LINE_COMMON 1
239 #define LINE_PATCHED 2
243 * This represents a "file", which is an array of "lines".
250 struct line
*line_allocated
;
255 * Records filenames that have been touched, in order to handle
256 * the case where more than one patches touch the same file.
259 static struct string_list fn_table
;
261 static uint32_t hash_line(const char *cp
, size_t len
)
265 for (i
= 0, h
= 0; i
< len
; i
++) {
266 if (!isspace(cp
[i
])) {
267 h
= h
* 3 + (cp
[i
] & 0xff);
274 * Compare lines s1 of length n1 and s2 of length n2, ignoring
275 * whitespace difference. Returns 1 if they match, 0 otherwise
277 static int fuzzy_matchlines(const char *s1
, size_t n1
,
278 const char *s2
, size_t n2
)
280 const char *last1
= s1
+ n1
- 1;
281 const char *last2
= s2
+ n2
- 1;
284 /* ignore line endings */
285 while ((*last1
== '\r') || (*last1
== '\n'))
287 while ((*last2
== '\r') || (*last2
== '\n'))
290 /* skip leading whitespace */
291 while (isspace(*s1
) && (s1
<= last1
))
293 while (isspace(*s2
) && (s2
<= last2
))
295 /* early return if both lines are empty */
296 if ((s1
> last1
) && (s2
> last2
))
299 result
= *s1
++ - *s2
++;
301 * Skip whitespace inside. We check for whitespace on
302 * both buffers because we don't want "a b" to match
305 if (isspace(*s1
) && isspace(*s2
)) {
306 while (isspace(*s1
) && s1
<= last1
)
308 while (isspace(*s2
) && s2
<= last2
)
312 * If we reached the end on one side only,
316 ((s2
> last2
) && (s1
<= last1
)) ||
317 ((s1
> last1
) && (s2
<= last2
)))
319 if ((s1
> last1
) && (s2
> last2
))
326 static void add_line_info(struct image
*img
, const char *bol
, size_t len
, unsigned flag
)
328 ALLOC_GROW(img
->line_allocated
, img
->nr
+ 1, img
->alloc
);
329 img
->line_allocated
[img
->nr
].len
= len
;
330 img
->line_allocated
[img
->nr
].hash
= hash_line(bol
, len
);
331 img
->line_allocated
[img
->nr
].flag
= flag
;
335 static void prepare_image(struct image
*image
, char *buf
, size_t len
,
336 int prepare_linetable
)
340 memset(image
, 0, sizeof(*image
));
344 if (!prepare_linetable
)
347 ep
= image
->buf
+ image
->len
;
351 for (next
= cp
; next
< ep
&& *next
!= '\n'; next
++)
355 add_line_info(image
, cp
, next
- cp
, 0);
358 image
->line
= image
->line_allocated
;
361 static void clear_image(struct image
*image
)
368 static void say_patch_name(FILE *output
, const char *pre
,
369 struct patch
*patch
, const char *post
)
372 if (patch
->old_name
&& patch
->new_name
&&
373 strcmp(patch
->old_name
, patch
->new_name
)) {
374 quote_c_style(patch
->old_name
, NULL
, output
, 0);
375 fputs(" => ", output
);
376 quote_c_style(patch
->new_name
, NULL
, output
, 0);
378 const char *n
= patch
->new_name
;
381 quote_c_style(n
, NULL
, output
, 0);
388 static void read_patch_file(struct strbuf
*sb
, int fd
)
390 if (strbuf_read(sb
, fd
, 0) < 0)
391 die_errno("git apply: failed to read");
394 * Make sure that we have some slop in the buffer
395 * so that we can do speculative "memcmp" etc, and
396 * see to it that it is NUL-filled.
398 strbuf_grow(sb
, SLOP
);
399 memset(sb
->buf
+ sb
->len
, 0, SLOP
);
402 static unsigned long linelen(const char *buffer
, unsigned long size
)
404 unsigned long len
= 0;
407 if (*buffer
++ == '\n')
413 static int is_dev_null(const char *str
)
415 return !memcmp("/dev/null", str
, 9) && isspace(str
[9]);
421 static int name_terminate(const char *name
, int namelen
, int c
, int terminate
)
423 if (c
== ' ' && !(terminate
& TERM_SPACE
))
425 if (c
== '\t' && !(terminate
& TERM_TAB
))
431 /* remove double slashes to make --index work with such filenames */
432 static char *squash_slash(char *name
)
440 if ((name
[j
++] = name
[i
++]) == '/')
441 while (name
[i
] == '/')
448 static char *find_name_gnu(const char *line
, const char *def
, int p_value
)
450 struct strbuf name
= STRBUF_INIT
;
454 * Proposed "new-style" GNU patch/diff format; see
455 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
457 if (unquote_c_style(&name
, line
, NULL
)) {
458 strbuf_release(&name
);
462 for (cp
= name
.buf
; p_value
; p_value
--) {
463 cp
= strchr(cp
, '/');
465 strbuf_release(&name
);
471 strbuf_remove(&name
, 0, cp
- name
.buf
);
473 strbuf_insert(&name
, 0, root
, root_len
);
474 return squash_slash(strbuf_detach(&name
, NULL
));
477 static size_t sane_tz_len(const char *line
, size_t len
)
481 if (len
< strlen(" +0500") || line
[len
-strlen(" +0500")] != ' ')
483 tz
= line
+ len
- strlen(" +0500");
485 if (tz
[1] != '+' && tz
[1] != '-')
488 for (p
= tz
+ 2; p
!= line
+ len
; p
++)
492 return line
+ len
- tz
;
495 static size_t tz_with_colon_len(const char *line
, size_t len
)
499 if (len
< strlen(" +08:00") || line
[len
- strlen(":00")] != ':')
501 tz
= line
+ len
- strlen(" +08:00");
503 if (tz
[0] != ' ' || (tz
[1] != '+' && tz
[1] != '-'))
506 if (!isdigit(*p
++) || !isdigit(*p
++) || *p
++ != ':' ||
507 !isdigit(*p
++) || !isdigit(*p
++))
510 return line
+ len
- tz
;
513 static size_t date_len(const char *line
, size_t len
)
515 const char *date
, *p
;
517 if (len
< strlen("72-02-05") || line
[len
-strlen("-05")] != '-')
519 p
= date
= line
+ len
- strlen("72-02-05");
521 if (!isdigit(*p
++) || !isdigit(*p
++) || *p
++ != '-' ||
522 !isdigit(*p
++) || !isdigit(*p
++) || *p
++ != '-' ||
523 !isdigit(*p
++) || !isdigit(*p
++)) /* Not a date. */
526 if (date
- line
>= strlen("19") &&
527 isdigit(date
[-1]) && isdigit(date
[-2])) /* 4-digit year */
528 date
-= strlen("19");
530 return line
+ len
- date
;
533 static size_t short_time_len(const char *line
, size_t len
)
535 const char *time
, *p
;
537 if (len
< strlen(" 07:01:32") || line
[len
-strlen(":32")] != ':')
539 p
= time
= line
+ len
- strlen(" 07:01:32");
541 /* Permit 1-digit hours? */
543 !isdigit(*p
++) || !isdigit(*p
++) || *p
++ != ':' ||
544 !isdigit(*p
++) || !isdigit(*p
++) || *p
++ != ':' ||
545 !isdigit(*p
++) || !isdigit(*p
++)) /* Not a time. */
548 return line
+ len
- time
;
551 static size_t fractional_time_len(const char *line
, size_t len
)
556 /* Expected format: 19:41:17.620000023 */
557 if (!len
|| !isdigit(line
[len
- 1]))
561 /* Fractional seconds. */
562 while (p
> line
&& isdigit(*p
))
567 /* Hours, minutes, and whole seconds. */
568 n
= short_time_len(line
, p
- line
);
572 return line
+ len
- p
+ n
;
575 static size_t trailing_spaces_len(const char *line
, size_t len
)
579 /* Expected format: ' ' x (1 or more) */
580 if (!len
|| line
[len
- 1] != ' ')
587 return line
+ len
- (p
+ 1);
594 static size_t diff_timestamp_len(const char *line
, size_t len
)
596 const char *end
= line
+ len
;
600 * Posix: 2010-07-05 19:41:17
601 * GNU: 2010-07-05 19:41:17.620000023 -0500
604 if (!isdigit(end
[-1]))
607 n
= sane_tz_len(line
, end
- line
);
609 n
= tz_with_colon_len(line
, end
- line
);
612 n
= short_time_len(line
, end
- line
);
614 n
= fractional_time_len(line
, end
- line
);
617 n
= date_len(line
, end
- line
);
618 if (!n
) /* No date. Too bad. */
622 if (end
== line
) /* No space before date. */
624 if (end
[-1] == '\t') { /* Success! */
626 return line
+ len
- end
;
628 if (end
[-1] != ' ') /* No space before date. */
631 /* Whitespace damage. */
632 end
-= trailing_spaces_len(line
, end
- line
);
633 return line
+ len
- end
;
636 static char *null_strdup(const char *s
)
638 return s
? xstrdup(s
) : NULL
;
641 static char *find_name_common(const char *line
, const char *def
,
642 int p_value
, const char *end
, int terminate
)
645 const char *start
= NULL
;
649 while (line
!= end
) {
652 if (!end
&& isspace(c
)) {
655 if (name_terminate(start
, line
-start
, c
, terminate
))
659 if (c
== '/' && !--p_value
)
663 return squash_slash(null_strdup(def
));
666 return squash_slash(null_strdup(def
));
669 * Generally we prefer the shorter name, especially
670 * if the other one is just a variation of that with
671 * something else tacked on to the end (ie "file.orig"
675 int deflen
= strlen(def
);
676 if (deflen
< len
&& !strncmp(start
, def
, deflen
))
677 return squash_slash(xstrdup(def
));
681 char *ret
= xmalloc(root_len
+ len
+ 1);
683 memcpy(ret
+ root_len
, start
, len
);
684 ret
[root_len
+ len
] = '\0';
685 return squash_slash(ret
);
688 return squash_slash(xmemdupz(start
, len
));
691 static char *find_name(const char *line
, char *def
, int p_value
, int terminate
)
694 char *name
= find_name_gnu(line
, def
, p_value
);
699 return find_name_common(line
, def
, p_value
, NULL
, terminate
);
702 static char *find_name_traditional(const char *line
, char *def
, int p_value
)
704 size_t len
= strlen(line
);
708 char *name
= find_name_gnu(line
, def
, p_value
);
713 len
= strchrnul(line
, '\n') - line
;
714 date_len
= diff_timestamp_len(line
, len
);
716 return find_name_common(line
, def
, p_value
, NULL
, TERM_TAB
);
719 return find_name_common(line
, def
, p_value
, line
+ len
, 0);
722 static int count_slashes(const char *cp
)
734 * Given the string after "--- " or "+++ ", guess the appropriate
735 * p_value for the given patch.
737 static int guess_p_value(const char *nameline
)
742 if (is_dev_null(nameline
))
744 name
= find_name_traditional(nameline
, NULL
, 0);
747 cp
= strchr(name
, '/');
752 * Does it begin with "a/$our-prefix" and such? Then this is
753 * very likely to apply to our directory.
755 if (!strncmp(name
, prefix
, prefix_length
))
756 val
= count_slashes(prefix
);
759 if (!strncmp(cp
, prefix
, prefix_length
))
760 val
= count_slashes(prefix
) + 1;
768 * Does the ---/+++ line has the POSIX timestamp after the last HT?
769 * GNU diff puts epoch there to signal a creation/deletion event. Is
770 * this such a timestamp?
772 static int has_epoch_timestamp(const char *nameline
)
775 * We are only interested in epoch timestamp; any non-zero
776 * fraction cannot be one, hence "(\.0+)?" in the regexp below.
777 * For the same reason, the date must be either 1969-12-31 or
778 * 1970-01-01, and the seconds part must be "00".
780 const char stamp_regexp
[] =
781 "^(1969-12-31|1970-01-01)"
783 "[0-2][0-9]:[0-5][0-9]:00(\\.0+)?"
785 "([-+][0-2][0-9]:?[0-5][0-9])\n";
786 const char *timestamp
= NULL
, *cp
, *colon
;
787 static regex_t
*stamp
;
793 for (cp
= nameline
; *cp
!= '\n'; cp
++) {
800 stamp
= xmalloc(sizeof(*stamp
));
801 if (regcomp(stamp
, stamp_regexp
, REG_EXTENDED
)) {
802 warning("Cannot prepare timestamp regexp %s",
808 status
= regexec(stamp
, timestamp
, ARRAY_SIZE(m
), m
, 0);
810 if (status
!= REG_NOMATCH
)
811 warning("regexec returned %d for input: %s",
816 zoneoffset
= strtol(timestamp
+ m
[3].rm_so
+ 1, (char **) &colon
, 10);
818 zoneoffset
= zoneoffset
* 60 + strtol(colon
+ 1, NULL
, 10);
820 zoneoffset
= (zoneoffset
/ 100) * 60 + (zoneoffset
% 100);
821 if (timestamp
[m
[3].rm_so
] == '-')
822 zoneoffset
= -zoneoffset
;
825 * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31
826 * (west of GMT) or 1970-01-01 (east of GMT)
828 if ((zoneoffset
< 0 && memcmp(timestamp
, "1969-12-31", 10)) ||
829 (0 <= zoneoffset
&& memcmp(timestamp
, "1970-01-01", 10)))
832 hourminute
= (strtol(timestamp
+ 11, NULL
, 10) * 60 +
833 strtol(timestamp
+ 14, NULL
, 10) -
836 return ((zoneoffset
< 0 && hourminute
== 1440) ||
837 (0 <= zoneoffset
&& !hourminute
));
841 * Get the name etc info from the ---/+++ lines of a traditional patch header
843 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
844 * files, we can happily check the index for a match, but for creating a
845 * new file we should try to match whatever "patch" does. I have no idea.
847 static void parse_traditional_patch(const char *first
, const char *second
, struct patch
*patch
)
851 first
+= 4; /* skip "--- " */
852 second
+= 4; /* skip "+++ " */
853 if (!p_value_known
) {
855 p
= guess_p_value(first
);
856 q
= guess_p_value(second
);
858 if (0 <= p
&& p
== q
) {
863 if (is_dev_null(first
)) {
865 patch
->is_delete
= 0;
866 name
= find_name_traditional(second
, NULL
, p_value
);
867 patch
->new_name
= name
;
868 } else if (is_dev_null(second
)) {
870 patch
->is_delete
= 1;
871 name
= find_name_traditional(first
, NULL
, p_value
);
872 patch
->old_name
= name
;
875 first_name
= find_name_traditional(first
, NULL
, p_value
);
876 name
= find_name_traditional(second
, first_name
, p_value
);
878 if (has_epoch_timestamp(first
)) {
880 patch
->is_delete
= 0;
881 patch
->new_name
= name
;
882 } else if (has_epoch_timestamp(second
)) {
884 patch
->is_delete
= 1;
885 patch
->old_name
= name
;
887 patch
->old_name
= name
;
888 patch
->new_name
= xstrdup(name
);
892 die("unable to find filename in patch at line %d", linenr
);
895 static int gitdiff_hdrend(const char *line
, struct patch
*patch
)
901 * We're anal about diff header consistency, to make
902 * sure that we don't end up having strange ambiguous
903 * patches floating around.
905 * As a result, gitdiff_{old|new}name() will check
906 * their names against any previous information, just
909 static char *gitdiff_verify_name(const char *line
, int isnull
, char *orig_name
, const char *oldnew
)
911 if (!orig_name
&& !isnull
)
912 return find_name(line
, NULL
, p_value
, TERM_TAB
);
921 die("git apply: bad git-diff - expected /dev/null, got %s on line %d", name
, linenr
);
922 another
= find_name(line
, NULL
, p_value
, TERM_TAB
);
923 if (!another
|| memcmp(another
, name
, len
+ 1))
924 die("git apply: bad git-diff - inconsistent %s filename on line %d", oldnew
, linenr
);
929 /* expect "/dev/null" */
930 if (memcmp("/dev/null", line
, 9) || line
[9] != '\n')
931 die("git apply: bad git-diff - expected /dev/null on line %d", linenr
);
936 static int gitdiff_oldname(const char *line
, struct patch
*patch
)
938 char *orig
= patch
->old_name
;
939 patch
->old_name
= gitdiff_verify_name(line
, patch
->is_new
, patch
->old_name
, "old");
940 if (orig
!= patch
->old_name
)
945 static int gitdiff_newname(const char *line
, struct patch
*patch
)
947 char *orig
= patch
->new_name
;
948 patch
->new_name
= gitdiff_verify_name(line
, patch
->is_delete
, patch
->new_name
, "new");
949 if (orig
!= patch
->new_name
)
954 static int gitdiff_oldmode(const char *line
, struct patch
*patch
)
956 patch
->old_mode
= strtoul(line
, NULL
, 8);
960 static int gitdiff_newmode(const char *line
, struct patch
*patch
)
962 patch
->new_mode
= strtoul(line
, NULL
, 8);
966 static int gitdiff_delete(const char *line
, struct patch
*patch
)
968 patch
->is_delete
= 1;
969 free(patch
->old_name
);
970 patch
->old_name
= null_strdup(patch
->def_name
);
971 return gitdiff_oldmode(line
, patch
);
974 static int gitdiff_newfile(const char *line
, struct patch
*patch
)
977 free(patch
->new_name
);
978 patch
->new_name
= null_strdup(patch
->def_name
);
979 return gitdiff_newmode(line
, patch
);
982 static int gitdiff_copysrc(const char *line
, struct patch
*patch
)
985 free(patch
->old_name
);
986 patch
->old_name
= find_name(line
, NULL
, p_value
? p_value
- 1 : 0, 0);
990 static int gitdiff_copydst(const char *line
, struct patch
*patch
)
993 free(patch
->new_name
);
994 patch
->new_name
= find_name(line
, NULL
, p_value
? p_value
- 1 : 0, 0);
998 static int gitdiff_renamesrc(const char *line
, struct patch
*patch
)
1000 patch
->is_rename
= 1;
1001 free(patch
->old_name
);
1002 patch
->old_name
= find_name(line
, NULL
, p_value
? p_value
- 1 : 0, 0);
1006 static int gitdiff_renamedst(const char *line
, struct patch
*patch
)
1008 patch
->is_rename
= 1;
1009 free(patch
->new_name
);
1010 patch
->new_name
= find_name(line
, NULL
, p_value
? p_value
- 1 : 0, 0);
1014 static int gitdiff_similarity(const char *line
, struct patch
*patch
)
1016 if ((patch
->score
= strtoul(line
, NULL
, 10)) == ULONG_MAX
)
1021 static int gitdiff_dissimilarity(const char *line
, struct patch
*patch
)
1023 if ((patch
->score
= strtoul(line
, NULL
, 10)) == ULONG_MAX
)
1028 static int gitdiff_index(const char *line
, struct patch
*patch
)
1031 * index line is N hexadecimal, "..", N hexadecimal,
1032 * and optional space with octal mode.
1034 const char *ptr
, *eol
;
1037 ptr
= strchr(line
, '.');
1038 if (!ptr
|| ptr
[1] != '.' || 40 < ptr
- line
)
1041 memcpy(patch
->old_sha1_prefix
, line
, len
);
1042 patch
->old_sha1_prefix
[len
] = 0;
1045 ptr
= strchr(line
, ' ');
1046 eol
= strchr(line
, '\n');
1048 if (!ptr
|| eol
< ptr
)
1054 memcpy(patch
->new_sha1_prefix
, line
, len
);
1055 patch
->new_sha1_prefix
[len
] = 0;
1057 patch
->old_mode
= strtoul(ptr
+1, NULL
, 8);
1062 * This is normal for a diff that doesn't change anything: we'll fall through
1063 * into the next diff. Tell the parser to break out.
1065 static int gitdiff_unrecognized(const char *line
, struct patch
*patch
)
1070 static const char *stop_at_slash(const char *line
, int llen
)
1072 int nslash
= p_value
;
1075 for (i
= 0; i
< llen
; i
++) {
1077 if (ch
== '/' && --nslash
<= 0)
1084 * This is to extract the same name that appears on "diff --git"
1085 * line. We do not find and return anything if it is a rename
1086 * patch, and it is OK because we will find the name elsewhere.
1087 * We need to reliably find name only when it is mode-change only,
1088 * creation or deletion of an empty file. In any of these cases,
1089 * both sides are the same name under a/ and b/ respectively.
1091 static char *git_header_name(const char *line
, int llen
)
1094 const char *second
= NULL
;
1095 size_t len
, line_len
;
1097 line
+= strlen("diff --git ");
1098 llen
-= strlen("diff --git ");
1102 struct strbuf first
= STRBUF_INIT
;
1103 struct strbuf sp
= STRBUF_INIT
;
1105 if (unquote_c_style(&first
, line
, &second
))
1106 goto free_and_fail1
;
1108 /* advance to the first slash */
1109 cp
= stop_at_slash(first
.buf
, first
.len
);
1110 /* we do not accept absolute paths */
1111 if (!cp
|| cp
== first
.buf
)
1112 goto free_and_fail1
;
1113 strbuf_remove(&first
, 0, cp
+ 1 - first
.buf
);
1116 * second points at one past closing dq of name.
1117 * find the second name.
1119 while ((second
< line
+ llen
) && isspace(*second
))
1122 if (line
+ llen
<= second
)
1123 goto free_and_fail1
;
1124 if (*second
== '"') {
1125 if (unquote_c_style(&sp
, second
, NULL
))
1126 goto free_and_fail1
;
1127 cp
= stop_at_slash(sp
.buf
, sp
.len
);
1128 if (!cp
|| cp
== sp
.buf
)
1129 goto free_and_fail1
;
1130 /* They must match, otherwise ignore */
1131 if (strcmp(cp
+ 1, first
.buf
))
1132 goto free_and_fail1
;
1133 strbuf_release(&sp
);
1134 return strbuf_detach(&first
, NULL
);
1137 /* unquoted second */
1138 cp
= stop_at_slash(second
, line
+ llen
- second
);
1139 if (!cp
|| cp
== second
)
1140 goto free_and_fail1
;
1142 if (line
+ llen
- cp
!= first
.len
+ 1 ||
1143 memcmp(first
.buf
, cp
, first
.len
))
1144 goto free_and_fail1
;
1145 return strbuf_detach(&first
, NULL
);
1148 strbuf_release(&first
);
1149 strbuf_release(&sp
);
1153 /* unquoted first name */
1154 name
= stop_at_slash(line
, llen
);
1155 if (!name
|| name
== line
)
1160 * since the first name is unquoted, a dq if exists must be
1161 * the beginning of the second name.
1163 for (second
= name
; second
< line
+ llen
; second
++) {
1164 if (*second
== '"') {
1165 struct strbuf sp
= STRBUF_INIT
;
1168 if (unquote_c_style(&sp
, second
, NULL
))
1169 goto free_and_fail2
;
1171 np
= stop_at_slash(sp
.buf
, sp
.len
);
1172 if (!np
|| np
== sp
.buf
)
1173 goto free_and_fail2
;
1176 len
= sp
.buf
+ sp
.len
- np
;
1177 if (len
< second
- name
&&
1178 !strncmp(np
, name
, len
) &&
1179 isspace(name
[len
])) {
1181 strbuf_remove(&sp
, 0, np
- sp
.buf
);
1182 return strbuf_detach(&sp
, NULL
);
1186 strbuf_release(&sp
);
1192 * Accept a name only if it shows up twice, exactly the same
1195 second
= strchr(name
, '\n');
1198 line_len
= second
- name
;
1199 for (len
= 0 ; ; len
++) {
1200 switch (name
[len
]) {
1205 case '\t': case ' ':
1206 second
= stop_at_slash(name
+ len
, line_len
- len
);
1210 if (second
[len
] == '\n' && !strncmp(name
, second
, len
)) {
1211 return xmemdupz(name
, len
);
1217 /* Verify that we recognize the lines following a git header */
1218 static int parse_git_header(const char *line
, int len
, unsigned int size
, struct patch
*patch
)
1220 unsigned long offset
;
1222 /* A git diff has explicit new/delete information, so we don't guess */
1224 patch
->is_delete
= 0;
1227 * Some things may not have the old name in the
1228 * rest of the headers anywhere (pure mode changes,
1229 * or removing or adding empty files), so we get
1230 * the default name from the header.
1232 patch
->def_name
= git_header_name(line
, len
);
1233 if (patch
->def_name
&& root
) {
1234 char *s
= xmalloc(root_len
+ strlen(patch
->def_name
) + 1);
1236 strcpy(s
+ root_len
, patch
->def_name
);
1237 free(patch
->def_name
);
1238 patch
->def_name
= s
;
1244 for (offset
= len
; size
> 0 ; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
1245 static const struct opentry
{
1247 int (*fn
)(const char *, struct patch
*);
1249 { "@@ -", gitdiff_hdrend
},
1250 { "--- ", gitdiff_oldname
},
1251 { "+++ ", gitdiff_newname
},
1252 { "old mode ", gitdiff_oldmode
},
1253 { "new mode ", gitdiff_newmode
},
1254 { "deleted file mode ", gitdiff_delete
},
1255 { "new file mode ", gitdiff_newfile
},
1256 { "copy from ", gitdiff_copysrc
},
1257 { "copy to ", gitdiff_copydst
},
1258 { "rename old ", gitdiff_renamesrc
},
1259 { "rename new ", gitdiff_renamedst
},
1260 { "rename from ", gitdiff_renamesrc
},
1261 { "rename to ", gitdiff_renamedst
},
1262 { "similarity index ", gitdiff_similarity
},
1263 { "dissimilarity index ", gitdiff_dissimilarity
},
1264 { "index ", gitdiff_index
},
1265 { "", gitdiff_unrecognized
},
1269 len
= linelen(line
, size
);
1270 if (!len
|| line
[len
-1] != '\n')
1272 for (i
= 0; i
< ARRAY_SIZE(optable
); i
++) {
1273 const struct opentry
*p
= optable
+ i
;
1274 int oplen
= strlen(p
->str
);
1275 if (len
< oplen
|| memcmp(p
->str
, line
, oplen
))
1277 if (p
->fn(line
+ oplen
, patch
) < 0)
1286 static int parse_num(const char *line
, unsigned long *p
)
1290 if (!isdigit(*line
))
1292 *p
= strtoul(line
, &ptr
, 10);
1296 static int parse_range(const char *line
, int len
, int offset
, const char *expect
,
1297 unsigned long *p1
, unsigned long *p2
)
1301 if (offset
< 0 || offset
>= len
)
1306 digits
= parse_num(line
, p1
);
1316 digits
= parse_num(line
+1, p2
);
1325 ex
= strlen(expect
);
1328 if (memcmp(line
, expect
, ex
))
1334 static void recount_diff(const char *line
, int size
, struct fragment
*fragment
)
1336 int oldlines
= 0, newlines
= 0, ret
= 0;
1339 warning("recount: ignore empty hunk");
1344 int len
= linelen(line
, size
);
1352 case ' ': case '\n':
1364 ret
= size
< 3 || prefixcmp(line
, "@@ ");
1367 ret
= size
< 5 || prefixcmp(line
, "diff ");
1374 warning("recount: unexpected line: %.*s",
1375 (int)linelen(line
, size
), line
);
1380 fragment
->oldlines
= oldlines
;
1381 fragment
->newlines
= newlines
;
1385 * Parse a unified diff fragment header of the
1386 * form "@@ -a,b +c,d @@"
1388 static int parse_fragment_header(const char *line
, int len
, struct fragment
*fragment
)
1392 if (!len
|| line
[len
-1] != '\n')
1395 /* Figure out the number of lines in a fragment */
1396 offset
= parse_range(line
, len
, 4, " +", &fragment
->oldpos
, &fragment
->oldlines
);
1397 offset
= parse_range(line
, len
, offset
, " @@", &fragment
->newpos
, &fragment
->newlines
);
1402 static int find_header(const char *line
, unsigned long size
, int *hdrsize
, struct patch
*patch
)
1404 unsigned long offset
, len
;
1406 patch
->is_toplevel_relative
= 0;
1407 patch
->is_rename
= patch
->is_copy
= 0;
1408 patch
->is_new
= patch
->is_delete
= -1;
1409 patch
->old_mode
= patch
->new_mode
= 0;
1410 patch
->old_name
= patch
->new_name
= NULL
;
1411 for (offset
= 0; size
> 0; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
1412 unsigned long nextlen
;
1414 len
= linelen(line
, size
);
1418 /* Testing this early allows us to take a few shortcuts.. */
1423 * Make sure we don't find any unconnected patch fragments.
1424 * That's a sign that we didn't find a header, and that a
1425 * patch has become corrupted/broken up.
1427 if (!memcmp("@@ -", line
, 4)) {
1428 struct fragment dummy
;
1429 if (parse_fragment_header(line
, len
, &dummy
) < 0)
1431 die("patch fragment without header at line %d: %.*s",
1432 linenr
, (int)len
-1, line
);
1439 * Git patch? It might not have a real patch, just a rename
1440 * or mode change, so we handle that specially
1442 if (!memcmp("diff --git ", line
, 11)) {
1443 int git_hdr_len
= parse_git_header(line
, len
, size
, patch
);
1444 if (git_hdr_len
<= len
)
1446 if (!patch
->old_name
&& !patch
->new_name
) {
1447 if (!patch
->def_name
)
1448 die("git diff header lacks filename information when removing "
1449 "%d leading pathname components (line %d)" , p_value
, linenr
);
1450 patch
->old_name
= xstrdup(patch
->def_name
);
1451 patch
->new_name
= xstrdup(patch
->def_name
);
1453 if (!patch
->is_delete
&& !patch
->new_name
)
1454 die("git diff header lacks filename information "
1455 "(line %d)", linenr
);
1456 patch
->is_toplevel_relative
= 1;
1457 *hdrsize
= git_hdr_len
;
1461 /* --- followed by +++ ? */
1462 if (memcmp("--- ", line
, 4) || memcmp("+++ ", line
+ len
, 4))
1466 * We only accept unified patches, so we want it to
1467 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
1468 * minimum ("@@ -0,0 +1 @@\n" is the shortest).
1470 nextlen
= linelen(line
+ len
, size
- len
);
1471 if (size
< nextlen
+ 14 || memcmp("@@ -", line
+ len
+ nextlen
, 4))
1474 /* Ok, we'll consider it a patch */
1475 parse_traditional_patch(line
, line
+len
, patch
);
1476 *hdrsize
= len
+ nextlen
;
1483 static void record_ws_error(unsigned result
, const char *line
, int len
, int linenr
)
1491 if (squelch_whitespace_errors
&&
1492 squelch_whitespace_errors
< whitespace_error
)
1495 err
= whitespace_error_string(result
);
1496 fprintf(stderr
, "%s:%d: %s.\n%.*s\n",
1497 patch_input_file
, linenr
, err
, len
, line
);
1501 static void check_whitespace(const char *line
, int len
, unsigned ws_rule
)
1503 unsigned result
= ws_check(line
+ 1, len
- 1, ws_rule
);
1505 record_ws_error(result
, line
+ 1, len
- 2, linenr
);
1509 * Parse a unified diff. Note that this really needs to parse each
1510 * fragment separately, since the only way to know the difference
1511 * between a "---" that is part of a patch, and a "---" that starts
1512 * the next patch is to look at the line counts..
1514 static int parse_fragment(const char *line
, unsigned long size
,
1515 struct patch
*patch
, struct fragment
*fragment
)
1518 int len
= linelen(line
, size
), offset
;
1519 unsigned long oldlines
, newlines
;
1520 unsigned long leading
, trailing
;
1522 offset
= parse_fragment_header(line
, len
, fragment
);
1525 if (offset
> 0 && patch
->recount
)
1526 recount_diff(line
+ offset
, size
- offset
, fragment
);
1527 oldlines
= fragment
->oldlines
;
1528 newlines
= fragment
->newlines
;
1532 /* Parse the thing.. */
1536 added
= deleted
= 0;
1539 offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
1540 if (!oldlines
&& !newlines
)
1542 len
= linelen(line
, size
);
1543 if (!len
|| line
[len
-1] != '\n')
1548 case '\n': /* newer GNU diff, an empty context line */
1552 if (!deleted
&& !added
)
1557 if (apply_in_reverse
&&
1558 ws_error_action
!= nowarn_ws_error
)
1559 check_whitespace(line
, len
, patch
->ws_rule
);
1565 if (!apply_in_reverse
&&
1566 ws_error_action
!= nowarn_ws_error
)
1567 check_whitespace(line
, len
, patch
->ws_rule
);
1574 * We allow "\ No newline at end of file". Depending
1575 * on locale settings when the patch was produced we
1576 * don't know what this line looks like. The only
1577 * thing we do know is that it begins with "\ ".
1578 * Checking for 12 is just for sanity check -- any
1579 * l10n of "\ No newline..." is at least that long.
1582 if (len
< 12 || memcmp(line
, "\\ ", 2))
1587 if (oldlines
|| newlines
)
1589 fragment
->leading
= leading
;
1590 fragment
->trailing
= trailing
;
1593 * If a fragment ends with an incomplete line, we failed to include
1594 * it in the above loop because we hit oldlines == newlines == 0
1597 if (12 < size
&& !memcmp(line
, "\\ ", 2))
1598 offset
+= linelen(line
, size
);
1600 patch
->lines_added
+= added
;
1601 patch
->lines_deleted
+= deleted
;
1603 if (0 < patch
->is_new
&& oldlines
)
1604 return error("new file depends on old contents");
1605 if (0 < patch
->is_delete
&& newlines
)
1606 return error("deleted file still has contents");
1610 static int parse_single_patch(const char *line
, unsigned long size
, struct patch
*patch
)
1612 unsigned long offset
= 0;
1613 unsigned long oldlines
= 0, newlines
= 0, context
= 0;
1614 struct fragment
**fragp
= &patch
->fragments
;
1616 while (size
> 4 && !memcmp(line
, "@@ -", 4)) {
1617 struct fragment
*fragment
;
1620 fragment
= xcalloc(1, sizeof(*fragment
));
1621 fragment
->linenr
= linenr
;
1622 len
= parse_fragment(line
, size
, patch
, fragment
);
1624 die("corrupt patch at line %d", linenr
);
1625 fragment
->patch
= line
;
1626 fragment
->size
= len
;
1627 oldlines
+= fragment
->oldlines
;
1628 newlines
+= fragment
->newlines
;
1629 context
+= fragment
->leading
+ fragment
->trailing
;
1632 fragp
= &fragment
->next
;
1640 * If something was removed (i.e. we have old-lines) it cannot
1641 * be creation, and if something was added it cannot be
1642 * deletion. However, the reverse is not true; --unified=0
1643 * patches that only add are not necessarily creation even
1644 * though they do not have any old lines, and ones that only
1645 * delete are not necessarily deletion.
1647 * Unfortunately, a real creation/deletion patch do _not_ have
1648 * any context line by definition, so we cannot safely tell it
1649 * apart with --unified=0 insanity. At least if the patch has
1650 * more than one hunk it is not creation or deletion.
1652 if (patch
->is_new
< 0 &&
1653 (oldlines
|| (patch
->fragments
&& patch
->fragments
->next
)))
1655 if (patch
->is_delete
< 0 &&
1656 (newlines
|| (patch
->fragments
&& patch
->fragments
->next
)))
1657 patch
->is_delete
= 0;
1659 if (0 < patch
->is_new
&& oldlines
)
1660 die("new file %s depends on old contents", patch
->new_name
);
1661 if (0 < patch
->is_delete
&& newlines
)
1662 die("deleted file %s still has contents", patch
->old_name
);
1663 if (!patch
->is_delete
&& !newlines
&& context
)
1664 fprintf(stderr
, "** warning: file %s becomes empty but "
1665 "is not deleted\n", patch
->new_name
);
1670 static inline int metadata_changes(struct patch
*patch
)
1672 return patch
->is_rename
> 0 ||
1673 patch
->is_copy
> 0 ||
1674 patch
->is_new
> 0 ||
1676 (patch
->old_mode
&& patch
->new_mode
&&
1677 patch
->old_mode
!= patch
->new_mode
);
1680 static char *inflate_it(const void *data
, unsigned long size
,
1681 unsigned long inflated_size
)
1687 memset(&stream
, 0, sizeof(stream
));
1689 stream
.next_in
= (unsigned char *)data
;
1690 stream
.avail_in
= size
;
1691 stream
.next_out
= out
= xmalloc(inflated_size
);
1692 stream
.avail_out
= inflated_size
;
1693 git_inflate_init(&stream
);
1694 st
= git_inflate(&stream
, Z_FINISH
);
1695 git_inflate_end(&stream
);
1696 if ((st
!= Z_STREAM_END
) || stream
.total_out
!= inflated_size
) {
1703 static struct fragment
*parse_binary_hunk(char **buf_p
,
1704 unsigned long *sz_p
,
1709 * Expect a line that begins with binary patch method ("literal"
1710 * or "delta"), followed by the length of data before deflating.
1711 * a sequence of 'length-byte' followed by base-85 encoded data
1712 * should follow, terminated by a newline.
1714 * Each 5-byte sequence of base-85 encodes up to 4 bytes,
1715 * and we would limit the patch line to 66 characters,
1716 * so one line can fit up to 13 groups that would decode
1717 * to 52 bytes max. The length byte 'A'-'Z' corresponds
1718 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
1721 unsigned long size
= *sz_p
;
1722 char *buffer
= *buf_p
;
1724 unsigned long origlen
;
1727 struct fragment
*frag
;
1729 llen
= linelen(buffer
, size
);
1734 if (!prefixcmp(buffer
, "delta ")) {
1735 patch_method
= BINARY_DELTA_DEFLATED
;
1736 origlen
= strtoul(buffer
+ 6, NULL
, 10);
1738 else if (!prefixcmp(buffer
, "literal ")) {
1739 patch_method
= BINARY_LITERAL_DEFLATED
;
1740 origlen
= strtoul(buffer
+ 8, NULL
, 10);
1748 int byte_length
, max_byte_length
, newsize
;
1749 llen
= linelen(buffer
, size
);
1753 /* consume the blank line */
1759 * Minimum line is "A00000\n" which is 7-byte long,
1760 * and the line length must be multiple of 5 plus 2.
1762 if ((llen
< 7) || (llen
-2) % 5)
1764 max_byte_length
= (llen
- 2) / 5 * 4;
1765 byte_length
= *buffer
;
1766 if ('A' <= byte_length
&& byte_length
<= 'Z')
1767 byte_length
= byte_length
- 'A' + 1;
1768 else if ('a' <= byte_length
&& byte_length
<= 'z')
1769 byte_length
= byte_length
- 'a' + 27;
1772 /* if the input length was not multiple of 4, we would
1773 * have filler at the end but the filler should never
1776 if (max_byte_length
< byte_length
||
1777 byte_length
<= max_byte_length
- 4)
1779 newsize
= hunk_size
+ byte_length
;
1780 data
= xrealloc(data
, newsize
);
1781 if (decode_85(data
+ hunk_size
, buffer
+ 1, byte_length
))
1783 hunk_size
= newsize
;
1788 frag
= xcalloc(1, sizeof(*frag
));
1789 frag
->patch
= inflate_it(data
, hunk_size
, origlen
);
1790 frag
->free_patch
= 1;
1794 frag
->size
= origlen
;
1798 frag
->binary_patch_method
= patch_method
;
1804 error("corrupt binary patch at line %d: %.*s",
1805 linenr
-1, llen
-1, buffer
);
1809 static int parse_binary(char *buffer
, unsigned long size
, struct patch
*patch
)
1812 * We have read "GIT binary patch\n"; what follows is a line
1813 * that says the patch method (currently, either "literal" or
1814 * "delta") and the length of data before deflating; a
1815 * sequence of 'length-byte' followed by base-85 encoded data
1818 * When a binary patch is reversible, there is another binary
1819 * hunk in the same format, starting with patch method (either
1820 * "literal" or "delta") with the length of data, and a sequence
1821 * of length-byte + base-85 encoded data, terminated with another
1822 * empty line. This data, when applied to the postimage, produces
1825 struct fragment
*forward
;
1826 struct fragment
*reverse
;
1830 forward
= parse_binary_hunk(&buffer
, &size
, &status
, &used
);
1831 if (!forward
&& !status
)
1832 /* there has to be one hunk (forward hunk) */
1833 return error("unrecognized binary patch at line %d", linenr
-1);
1835 /* otherwise we already gave an error message */
1838 reverse
= parse_binary_hunk(&buffer
, &size
, &status
, &used_1
);
1843 * Not having reverse hunk is not an error, but having
1844 * a corrupt reverse hunk is.
1846 free((void*) forward
->patch
);
1850 forward
->next
= reverse
;
1851 patch
->fragments
= forward
;
1852 patch
->is_binary
= 1;
1856 static int parse_chunk(char *buffer
, unsigned long size
, struct patch
*patch
)
1858 int hdrsize
, patchsize
;
1859 int offset
= find_header(buffer
, size
, &hdrsize
, patch
);
1864 patch
->ws_rule
= whitespace_rule(patch
->new_name
1868 patchsize
= parse_single_patch(buffer
+ offset
+ hdrsize
,
1869 size
- offset
- hdrsize
, patch
);
1872 static const char *binhdr
[] = {
1877 static const char git_binary
[] = "GIT binary patch\n";
1879 int hd
= hdrsize
+ offset
;
1880 unsigned long llen
= linelen(buffer
+ hd
, size
- hd
);
1882 if (llen
== sizeof(git_binary
) - 1 &&
1883 !memcmp(git_binary
, buffer
+ hd
, llen
)) {
1886 used
= parse_binary(buffer
+ hd
+ llen
,
1887 size
- hd
- llen
, patch
);
1889 patchsize
= used
+ llen
;
1893 else if (!memcmp(" differ\n", buffer
+ hd
+ llen
- 8, 8)) {
1894 for (i
= 0; binhdr
[i
]; i
++) {
1895 int len
= strlen(binhdr
[i
]);
1896 if (len
< size
- hd
&&
1897 !memcmp(binhdr
[i
], buffer
+ hd
, len
)) {
1899 patch
->is_binary
= 1;
1906 /* Empty patch cannot be applied if it is a text patch
1907 * without metadata change. A binary patch appears
1910 if ((apply
|| check
) &&
1911 (!patch
->is_binary
&& !metadata_changes(patch
)))
1912 die("patch with only garbage at line %d", linenr
);
1915 return offset
+ hdrsize
+ patchsize
;
1918 #define swap(a,b) myswap((a),(b),sizeof(a))
1920 #define myswap(a, b, size) do { \
1921 unsigned char mytmp[size]; \
1922 memcpy(mytmp, &a, size); \
1923 memcpy(&a, &b, size); \
1924 memcpy(&b, mytmp, size); \
1927 static void reverse_patches(struct patch
*p
)
1929 for (; p
; p
= p
->next
) {
1930 struct fragment
*frag
= p
->fragments
;
1932 swap(p
->new_name
, p
->old_name
);
1933 swap(p
->new_mode
, p
->old_mode
);
1934 swap(p
->is_new
, p
->is_delete
);
1935 swap(p
->lines_added
, p
->lines_deleted
);
1936 swap(p
->old_sha1_prefix
, p
->new_sha1_prefix
);
1938 for (; frag
; frag
= frag
->next
) {
1939 swap(frag
->newpos
, frag
->oldpos
);
1940 swap(frag
->newlines
, frag
->oldlines
);
1945 static const char pluses
[] =
1946 "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
1947 static const char minuses
[]=
1948 "----------------------------------------------------------------------";
1950 static void show_stats(struct patch
*patch
)
1952 struct strbuf qname
= STRBUF_INIT
;
1953 char *cp
= patch
->new_name
? patch
->new_name
: patch
->old_name
;
1956 quote_c_style(cp
, &qname
, NULL
, 0);
1959 * "scale" the filename
1965 if (qname
.len
> max
) {
1966 cp
= strchr(qname
.buf
+ qname
.len
+ 3 - max
, '/');
1968 cp
= qname
.buf
+ qname
.len
+ 3 - max
;
1969 strbuf_splice(&qname
, 0, cp
- qname
.buf
, "...", 3);
1972 if (patch
->is_binary
) {
1973 printf(" %-*s | Bin\n", max
, qname
.buf
);
1974 strbuf_release(&qname
);
1978 printf(" %-*s |", max
, qname
.buf
);
1979 strbuf_release(&qname
);
1982 * scale the add/delete
1984 max
= max
+ max_change
> 70 ? 70 - max
: max_change
;
1985 add
= patch
->lines_added
;
1986 del
= patch
->lines_deleted
;
1988 if (max_change
> 0) {
1989 int total
= ((add
+ del
) * max
+ max_change
/ 2) / max_change
;
1990 add
= (add
* max
+ max_change
/ 2) / max_change
;
1993 printf("%5d %.*s%.*s\n", patch
->lines_added
+ patch
->lines_deleted
,
1994 add
, pluses
, del
, minuses
);
1997 static int read_old_data(struct stat
*st
, const char *path
, struct strbuf
*buf
)
1999 switch (st
->st_mode
& S_IFMT
) {
2001 if (strbuf_readlink(buf
, path
, st
->st_size
) < 0)
2002 return error("unable to read symlink %s", path
);
2005 if (strbuf_read_file(buf
, path
, st
->st_size
) != st
->st_size
)
2006 return error("unable to open or read %s", path
);
2007 convert_to_git(path
, buf
->buf
, buf
->len
, buf
, 0);
2015 * Update the preimage, and the common lines in postimage,
2016 * from buffer buf of length len. If postlen is 0 the postimage
2017 * is updated in place, otherwise it's updated on a new buffer
2021 static void update_pre_post_images(struct image
*preimage
,
2022 struct image
*postimage
,
2024 size_t len
, size_t postlen
)
2027 char *new, *old
, *fixed
;
2028 struct image fixed_preimage
;
2031 * Update the preimage with whitespace fixes. Note that we
2032 * are not losing preimage->buf -- apply_one_fragment() will
2035 prepare_image(&fixed_preimage
, buf
, len
, 1);
2036 assert(fixed_preimage
.nr
== preimage
->nr
);
2037 for (i
= 0; i
< preimage
->nr
; i
++)
2038 fixed_preimage
.line
[i
].flag
= preimage
->line
[i
].flag
;
2039 free(preimage
->line_allocated
);
2040 *preimage
= fixed_preimage
;
2043 * Adjust the common context lines in postimage. This can be
2044 * done in-place when we are just doing whitespace fixing,
2045 * which does not make the string grow, but needs a new buffer
2046 * when ignoring whitespace causes the update, since in this case
2047 * we could have e.g. tabs converted to multiple spaces.
2048 * We trust the caller to tell us if the update can be done
2049 * in place (postlen==0) or not.
2051 old
= postimage
->buf
;
2053 new = postimage
->buf
= xmalloc(postlen
);
2056 fixed
= preimage
->buf
;
2057 for (i
= ctx
= 0; i
< postimage
->nr
; i
++) {
2058 size_t len
= postimage
->line
[i
].len
;
2059 if (!(postimage
->line
[i
].flag
& LINE_COMMON
)) {
2060 /* an added line -- no counterparts in preimage */
2061 memmove(new, old
, len
);
2067 /* a common context -- skip it in the original postimage */
2070 /* and find the corresponding one in the fixed preimage */
2071 while (ctx
< preimage
->nr
&&
2072 !(preimage
->line
[ctx
].flag
& LINE_COMMON
)) {
2073 fixed
+= preimage
->line
[ctx
].len
;
2076 if (preimage
->nr
<= ctx
)
2079 /* and copy it in, while fixing the line length */
2080 len
= preimage
->line
[ctx
].len
;
2081 memcpy(new, fixed
, len
);
2084 postimage
->line
[i
].len
= len
;
2088 /* Fix the length of the whole thing */
2089 postimage
->len
= new - postimage
->buf
;
2092 static int match_fragment(struct image
*img
,
2093 struct image
*preimage
,
2094 struct image
*postimage
,
2098 int match_beginning
, int match_end
)
2101 char *fixed_buf
, *buf
, *orig
, *target
;
2102 struct strbuf fixed
;
2106 if (preimage
->nr
+ try_lno
<= img
->nr
) {
2108 * The hunk falls within the boundaries of img.
2110 preimage_limit
= preimage
->nr
;
2111 if (match_end
&& (preimage
->nr
+ try_lno
!= img
->nr
))
2113 } else if (ws_error_action
== correct_ws_error
&&
2114 (ws_rule
& WS_BLANK_AT_EOF
)) {
2116 * This hunk extends beyond the end of img, and we are
2117 * removing blank lines at the end of the file. This
2118 * many lines from the beginning of the preimage must
2119 * match with img, and the remainder of the preimage
2122 preimage_limit
= img
->nr
- try_lno
;
2125 * The hunk extends beyond the end of the img and
2126 * we are not removing blanks at the end, so we
2127 * should reject the hunk at this position.
2132 if (match_beginning
&& try_lno
)
2135 /* Quick hash check */
2136 for (i
= 0; i
< preimage_limit
; i
++)
2137 if ((img
->line
[try_lno
+ i
].flag
& LINE_PATCHED
) ||
2138 (preimage
->line
[i
].hash
!= img
->line
[try_lno
+ i
].hash
))
2141 if (preimage_limit
== preimage
->nr
) {
2143 * Do we have an exact match? If we were told to match
2144 * at the end, size must be exactly at try+fragsize,
2145 * otherwise try+fragsize must be still within the preimage,
2146 * and either case, the old piece should match the preimage
2150 ? (try + preimage
->len
== img
->len
)
2151 : (try + preimage
->len
<= img
->len
)) &&
2152 !memcmp(img
->buf
+ try, preimage
->buf
, preimage
->len
))
2156 * The preimage extends beyond the end of img, so
2157 * there cannot be an exact match.
2159 * There must be one non-blank context line that match
2160 * a line before the end of img.
2164 buf
= preimage
->buf
;
2166 for (i
= 0; i
< preimage_limit
; i
++)
2167 buf_end
+= preimage
->line
[i
].len
;
2169 for ( ; buf
< buf_end
; buf
++)
2177 * No exact match. If we are ignoring whitespace, run a line-by-line
2178 * fuzzy matching. We collect all the line length information because
2179 * we need it to adjust whitespace if we match.
2181 if (ws_ignore_action
== ignore_ws_change
) {
2184 size_t postlen
= postimage
->len
;
2188 for (i
= 0; i
< preimage_limit
; i
++) {
2189 size_t prelen
= preimage
->line
[i
].len
;
2190 size_t imglen
= img
->line
[try_lno
+i
].len
;
2192 if (!fuzzy_matchlines(img
->buf
+ try + imgoff
, imglen
,
2193 preimage
->buf
+ preoff
, prelen
))
2195 if (preimage
->line
[i
].flag
& LINE_COMMON
)
2196 postlen
+= imglen
- prelen
;
2202 * Ok, the preimage matches with whitespace fuzz.
2204 * imgoff now holds the true length of the target that
2205 * matches the preimage before the end of the file.
2207 * Count the number of characters in the preimage that fall
2208 * beyond the end of the file and make sure that all of them
2209 * are whitespace characters. (This can only happen if
2210 * we are removing blank lines at the end of the file.)
2212 buf
= preimage_eof
= preimage
->buf
+ preoff
;
2213 for ( ; i
< preimage
->nr
; i
++)
2214 preoff
+= preimage
->line
[i
].len
;
2215 preimage_end
= preimage
->buf
+ preoff
;
2216 for ( ; buf
< preimage_end
; buf
++)
2221 * Update the preimage and the common postimage context
2222 * lines to use the same whitespace as the target.
2223 * If whitespace is missing in the target (i.e.
2224 * if the preimage extends beyond the end of the file),
2225 * use the whitespace from the preimage.
2227 extra_chars
= preimage_end
- preimage_eof
;
2228 strbuf_init(&fixed
, imgoff
+ extra_chars
);
2229 strbuf_add(&fixed
, img
->buf
+ try, imgoff
);
2230 strbuf_add(&fixed
, preimage_eof
, extra_chars
);
2231 fixed_buf
= strbuf_detach(&fixed
, &fixed_len
);
2232 update_pre_post_images(preimage
, postimage
,
2233 fixed_buf
, fixed_len
, postlen
);
2237 if (ws_error_action
!= correct_ws_error
)
2241 * The hunk does not apply byte-by-byte, but the hash says
2242 * it might with whitespace fuzz. We haven't been asked to
2243 * ignore whitespace, we were asked to correct whitespace
2244 * errors, so let's try matching after whitespace correction.
2246 * The preimage may extend beyond the end of the file,
2247 * but in this loop we will only handle the part of the
2248 * preimage that falls within the file.
2250 strbuf_init(&fixed
, preimage
->len
+ 1);
2251 orig
= preimage
->buf
;
2252 target
= img
->buf
+ try;
2253 for (i
= 0; i
< preimage_limit
; i
++) {
2254 size_t oldlen
= preimage
->line
[i
].len
;
2255 size_t tgtlen
= img
->line
[try_lno
+ i
].len
;
2256 size_t fixstart
= fixed
.len
;
2257 struct strbuf tgtfix
;
2260 /* Try fixing the line in the preimage */
2261 ws_fix_copy(&fixed
, orig
, oldlen
, ws_rule
, NULL
);
2263 /* Try fixing the line in the target */
2264 strbuf_init(&tgtfix
, tgtlen
);
2265 ws_fix_copy(&tgtfix
, target
, tgtlen
, ws_rule
, NULL
);
2268 * If they match, either the preimage was based on
2269 * a version before our tree fixed whitespace breakage,
2270 * or we are lacking a whitespace-fix patch the tree
2271 * the preimage was based on already had (i.e. target
2272 * has whitespace breakage, the preimage doesn't).
2273 * In either case, we are fixing the whitespace breakages
2274 * so we might as well take the fix together with their
2277 match
= (tgtfix
.len
== fixed
.len
- fixstart
&&
2278 !memcmp(tgtfix
.buf
, fixed
.buf
+ fixstart
,
2279 fixed
.len
- fixstart
));
2281 strbuf_release(&tgtfix
);
2291 * Now handle the lines in the preimage that falls beyond the
2292 * end of the file (if any). They will only match if they are
2293 * empty or only contain whitespace (if WS_BLANK_AT_EOL is
2296 for ( ; i
< preimage
->nr
; i
++) {
2297 size_t fixstart
= fixed
.len
; /* start of the fixed preimage */
2298 size_t oldlen
= preimage
->line
[i
].len
;
2301 /* Try fixing the line in the preimage */
2302 ws_fix_copy(&fixed
, orig
, oldlen
, ws_rule
, NULL
);
2304 for (j
= fixstart
; j
< fixed
.len
; j
++)
2305 if (!isspace(fixed
.buf
[j
]))
2312 * Yes, the preimage is based on an older version that still
2313 * has whitespace breakages unfixed, and fixing them makes the
2314 * hunk match. Update the context lines in the postimage.
2316 fixed_buf
= strbuf_detach(&fixed
, &fixed_len
);
2317 update_pre_post_images(preimage
, postimage
,
2318 fixed_buf
, fixed_len
, 0);
2322 strbuf_release(&fixed
);
2326 static int find_pos(struct image
*img
,
2327 struct image
*preimage
,
2328 struct image
*postimage
,
2331 int match_beginning
, int match_end
)
2334 unsigned long backwards
, forwards
, try;
2335 int backwards_lno
, forwards_lno
, try_lno
;
2338 * If match_beginning or match_end is specified, there is no
2339 * point starting from a wrong line that will never match and
2340 * wander around and wait for a match at the specified end.
2342 if (match_beginning
)
2345 line
= img
->nr
- preimage
->nr
;
2348 * Because the comparison is unsigned, the following test
2349 * will also take care of a negative line number that can
2350 * result when match_end and preimage is larger than the target.
2352 if ((size_t) line
> img
->nr
)
2356 for (i
= 0; i
< line
; i
++)
2357 try += img
->line
[i
].len
;
2360 * There's probably some smart way to do this, but I'll leave
2361 * that to the smart and beautiful people. I'm simple and stupid.
2364 backwards_lno
= line
;
2366 forwards_lno
= line
;
2369 for (i
= 0; ; i
++) {
2370 if (match_fragment(img
, preimage
, postimage
,
2371 try, try_lno
, ws_rule
,
2372 match_beginning
, match_end
))
2376 if (backwards_lno
== 0 && forwards_lno
== img
->nr
)
2380 if (backwards_lno
== 0) {
2385 backwards
-= img
->line
[backwards_lno
].len
;
2387 try_lno
= backwards_lno
;
2389 if (forwards_lno
== img
->nr
) {
2393 forwards
+= img
->line
[forwards_lno
].len
;
2396 try_lno
= forwards_lno
;
2403 static void remove_first_line(struct image
*img
)
2405 img
->buf
+= img
->line
[0].len
;
2406 img
->len
-= img
->line
[0].len
;
2411 static void remove_last_line(struct image
*img
)
2413 img
->len
-= img
->line
[--img
->nr
].len
;
2416 static void update_image(struct image
*img
,
2418 struct image
*preimage
,
2419 struct image
*postimage
)
2422 * remove the copy of preimage at offset in img
2423 * and replace it with postimage
2426 size_t remove_count
, insert_count
, applied_at
= 0;
2431 * If we are removing blank lines at the end of img,
2432 * the preimage may extend beyond the end.
2433 * If that is the case, we must be careful only to
2434 * remove the part of the preimage that falls within
2435 * the boundaries of img. Initialize preimage_limit
2436 * to the number of lines in the preimage that falls
2437 * within the boundaries.
2439 preimage_limit
= preimage
->nr
;
2440 if (preimage_limit
> img
->nr
- applied_pos
)
2441 preimage_limit
= img
->nr
- applied_pos
;
2443 for (i
= 0; i
< applied_pos
; i
++)
2444 applied_at
+= img
->line
[i
].len
;
2447 for (i
= 0; i
< preimage_limit
; i
++)
2448 remove_count
+= img
->line
[applied_pos
+ i
].len
;
2449 insert_count
= postimage
->len
;
2451 /* Adjust the contents */
2452 result
= xmalloc(img
->len
+ insert_count
- remove_count
+ 1);
2453 memcpy(result
, img
->buf
, applied_at
);
2454 memcpy(result
+ applied_at
, postimage
->buf
, postimage
->len
);
2455 memcpy(result
+ applied_at
+ postimage
->len
,
2456 img
->buf
+ (applied_at
+ remove_count
),
2457 img
->len
- (applied_at
+ remove_count
));
2460 img
->len
+= insert_count
- remove_count
;
2461 result
[img
->len
] = '\0';
2463 /* Adjust the line table */
2464 nr
= img
->nr
+ postimage
->nr
- preimage_limit
;
2465 if (preimage_limit
< postimage
->nr
) {
2467 * NOTE: this knows that we never call remove_first_line()
2468 * on anything other than pre/post image.
2470 img
->line
= xrealloc(img
->line
, nr
* sizeof(*img
->line
));
2471 img
->line_allocated
= img
->line
;
2473 if (preimage_limit
!= postimage
->nr
)
2474 memmove(img
->line
+ applied_pos
+ postimage
->nr
,
2475 img
->line
+ applied_pos
+ preimage_limit
,
2476 (img
->nr
- (applied_pos
+ preimage_limit
)) *
2477 sizeof(*img
->line
));
2478 memcpy(img
->line
+ applied_pos
,
2480 postimage
->nr
* sizeof(*img
->line
));
2482 for (i
= 0; i
< postimage
->nr
; i
++)
2483 img
->line
[applied_pos
+ i
].flag
|= LINE_PATCHED
;
2487 static int apply_one_fragment(struct image
*img
, struct fragment
*frag
,
2488 int inaccurate_eof
, unsigned ws_rule
,
2491 int match_beginning
, match_end
;
2492 const char *patch
= frag
->patch
;
2493 int size
= frag
->size
;
2494 char *old
, *oldlines
;
2495 struct strbuf newlines
;
2496 int new_blank_lines_at_end
= 0;
2497 int found_new_blank_lines_at_end
= 0;
2498 int hunk_linenr
= frag
->linenr
;
2499 unsigned long leading
, trailing
;
2500 int pos
, applied_pos
;
2501 struct image preimage
;
2502 struct image postimage
;
2504 memset(&preimage
, 0, sizeof(preimage
));
2505 memset(&postimage
, 0, sizeof(postimage
));
2506 oldlines
= xmalloc(size
);
2507 strbuf_init(&newlines
, size
);
2512 int len
= linelen(patch
, size
);
2514 int added_blank_line
= 0;
2515 int is_blank_context
= 0;
2522 * "plen" is how much of the line we should use for
2523 * the actual patch data. Normally we just remove the
2524 * first character on the line, but if the line is
2525 * followed by "\ No newline", then we also remove the
2526 * last one (which is the newline, of course).
2529 if (len
< size
&& patch
[len
] == '\\')
2532 if (apply_in_reverse
) {
2535 else if (first
== '+')
2541 /* Newer GNU diff, empty context line */
2543 /* ... followed by '\No newline'; nothing */
2546 strbuf_addch(&newlines
, '\n');
2547 add_line_info(&preimage
, "\n", 1, LINE_COMMON
);
2548 add_line_info(&postimage
, "\n", 1, LINE_COMMON
);
2549 is_blank_context
= 1;
2552 if (plen
&& (ws_rule
& WS_BLANK_AT_EOF
) &&
2553 ws_blank_line(patch
+ 1, plen
, ws_rule
))
2554 is_blank_context
= 1;
2556 memcpy(old
, patch
+ 1, plen
);
2557 add_line_info(&preimage
, old
, plen
,
2558 (first
== ' ' ? LINE_COMMON
: 0));
2562 /* Fall-through for ' ' */
2564 /* --no-add does not add new lines */
2565 if (first
== '+' && no_add
)
2568 start
= newlines
.len
;
2570 !whitespace_error
||
2571 ws_error_action
!= correct_ws_error
) {
2572 strbuf_add(&newlines
, patch
+ 1, plen
);
2575 ws_fix_copy(&newlines
, patch
+ 1, plen
, ws_rule
, &applied_after_fixing_ws
);
2577 add_line_info(&postimage
, newlines
.buf
+ start
, newlines
.len
- start
,
2578 (first
== '+' ? 0 : LINE_COMMON
));
2580 (ws_rule
& WS_BLANK_AT_EOF
) &&
2581 ws_blank_line(patch
+ 1, plen
, ws_rule
))
2582 added_blank_line
= 1;
2584 case '@': case '\\':
2585 /* Ignore it, we already handled it */
2588 if (apply_verbosely
)
2589 error("invalid start of line: '%c'", first
);
2592 if (added_blank_line
) {
2593 if (!new_blank_lines_at_end
)
2594 found_new_blank_lines_at_end
= hunk_linenr
;
2595 new_blank_lines_at_end
++;
2597 else if (is_blank_context
)
2600 new_blank_lines_at_end
= 0;
2605 if (inaccurate_eof
&&
2606 old
> oldlines
&& old
[-1] == '\n' &&
2607 newlines
.len
> 0 && newlines
.buf
[newlines
.len
- 1] == '\n') {
2609 strbuf_setlen(&newlines
, newlines
.len
- 1);
2612 leading
= frag
->leading
;
2613 trailing
= frag
->trailing
;
2616 * A hunk to change lines at the beginning would begin with
2618 * but we need to be careful. -U0 that inserts before the second
2619 * line also has this pattern.
2621 * And a hunk to add to an empty file would begin with
2624 * In other words, a hunk that is (frag->oldpos <= 1) with or
2625 * without leading context must match at the beginning.
2627 match_beginning
= (!frag
->oldpos
||
2628 (frag
->oldpos
== 1 && !unidiff_zero
));
2631 * A hunk without trailing lines must match at the end.
2632 * However, we simply cannot tell if a hunk must match end
2633 * from the lack of trailing lines if the patch was generated
2634 * with unidiff without any context.
2636 match_end
= !unidiff_zero
&& !trailing
;
2638 pos
= frag
->newpos
? (frag
->newpos
- 1) : 0;
2639 preimage
.buf
= oldlines
;
2640 preimage
.len
= old
- oldlines
;
2641 postimage
.buf
= newlines
.buf
;
2642 postimage
.len
= newlines
.len
;
2643 preimage
.line
= preimage
.line_allocated
;
2644 postimage
.line
= postimage
.line_allocated
;
2648 applied_pos
= find_pos(img
, &preimage
, &postimage
, pos
,
2649 ws_rule
, match_beginning
, match_end
);
2651 if (applied_pos
>= 0)
2654 /* Am I at my context limits? */
2655 if ((leading
<= p_context
) && (trailing
<= p_context
))
2657 if (match_beginning
|| match_end
) {
2658 match_beginning
= match_end
= 0;
2663 * Reduce the number of context lines; reduce both
2664 * leading and trailing if they are equal otherwise
2665 * just reduce the larger context.
2667 if (leading
>= trailing
) {
2668 remove_first_line(&preimage
);
2669 remove_first_line(&postimage
);
2673 if (trailing
> leading
) {
2674 remove_last_line(&preimage
);
2675 remove_last_line(&postimage
);
2680 if (applied_pos
>= 0) {
2681 if (new_blank_lines_at_end
&&
2682 preimage
.nr
+ applied_pos
>= img
->nr
&&
2683 (ws_rule
& WS_BLANK_AT_EOF
) &&
2684 ws_error_action
!= nowarn_ws_error
) {
2685 record_ws_error(WS_BLANK_AT_EOF
, "+", 1,
2686 found_new_blank_lines_at_end
);
2687 if (ws_error_action
== correct_ws_error
) {
2688 while (new_blank_lines_at_end
--)
2689 remove_last_line(&postimage
);
2692 * We would want to prevent write_out_results()
2693 * from taking place in apply_patch() that follows
2694 * the callchain led us here, which is:
2695 * apply_patch->check_patch_list->check_patch->
2696 * apply_data->apply_fragments->apply_one_fragment
2698 if (ws_error_action
== die_on_ws_error
)
2702 if (apply_verbosely
&& applied_pos
!= pos
) {
2703 int offset
= applied_pos
- pos
;
2704 if (apply_in_reverse
)
2705 offset
= 0 - offset
;
2707 "Hunk #%d succeeded at %d (offset %d lines).\n",
2708 nth_fragment
, applied_pos
+ 1, offset
);
2712 * Warn if it was necessary to reduce the number
2715 if ((leading
!= frag
->leading
) ||
2716 (trailing
!= frag
->trailing
))
2717 fprintf(stderr
, "Context reduced to (%ld/%ld)"
2718 " to apply fragment at %d\n",
2719 leading
, trailing
, applied_pos
+1);
2720 update_image(img
, applied_pos
, &preimage
, &postimage
);
2722 if (apply_verbosely
)
2723 error("while searching for:\n%.*s",
2724 (int)(old
- oldlines
), oldlines
);
2728 strbuf_release(&newlines
);
2729 free(preimage
.line_allocated
);
2730 free(postimage
.line_allocated
);
2732 return (applied_pos
< 0);
2735 static int apply_binary_fragment(struct image
*img
, struct patch
*patch
)
2737 struct fragment
*fragment
= patch
->fragments
;
2742 return error("missing binary patch data for '%s'",
2747 /* Binary patch is irreversible without the optional second hunk */
2748 if (apply_in_reverse
) {
2749 if (!fragment
->next
)
2750 return error("cannot reverse-apply a binary patch "
2751 "without the reverse hunk to '%s'",
2753 ? patch
->new_name
: patch
->old_name
);
2754 fragment
= fragment
->next
;
2756 switch (fragment
->binary_patch_method
) {
2757 case BINARY_DELTA_DEFLATED
:
2758 dst
= patch_delta(img
->buf
, img
->len
, fragment
->patch
,
2759 fragment
->size
, &len
);
2766 case BINARY_LITERAL_DEFLATED
:
2768 img
->len
= fragment
->size
;
2769 img
->buf
= xmalloc(img
->len
+1);
2770 memcpy(img
->buf
, fragment
->patch
, img
->len
);
2771 img
->buf
[img
->len
] = '\0';
2777 static int apply_binary(struct image
*img
, struct patch
*patch
)
2779 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
2780 unsigned char sha1
[20];
2783 * For safety, we require patch index line to contain
2784 * full 40-byte textual SHA1 for old and new, at least for now.
2786 if (strlen(patch
->old_sha1_prefix
) != 40 ||
2787 strlen(patch
->new_sha1_prefix
) != 40 ||
2788 get_sha1_hex(patch
->old_sha1_prefix
, sha1
) ||
2789 get_sha1_hex(patch
->new_sha1_prefix
, sha1
))
2790 return error("cannot apply binary patch to '%s' "
2791 "without full index line", name
);
2793 if (patch
->old_name
) {
2795 * See if the old one matches what the patch
2798 hash_sha1_file(img
->buf
, img
->len
, blob_type
, sha1
);
2799 if (strcmp(sha1_to_hex(sha1
), patch
->old_sha1_prefix
))
2800 return error("the patch applies to '%s' (%s), "
2801 "which does not match the "
2802 "current contents.",
2803 name
, sha1_to_hex(sha1
));
2806 /* Otherwise, the old one must be empty. */
2808 return error("the patch applies to an empty "
2809 "'%s' but it is not empty", name
);
2812 get_sha1_hex(patch
->new_sha1_prefix
, sha1
);
2813 if (is_null_sha1(sha1
)) {
2815 return 0; /* deletion patch */
2818 if (has_sha1_file(sha1
)) {
2819 /* We already have the postimage */
2820 enum object_type type
;
2824 result
= read_sha1_file(sha1
, &type
, &size
);
2826 return error("the necessary postimage %s for "
2827 "'%s' cannot be read",
2828 patch
->new_sha1_prefix
, name
);
2834 * We have verified buf matches the preimage;
2835 * apply the patch data to it, which is stored
2836 * in the patch->fragments->{patch,size}.
2838 if (apply_binary_fragment(img
, patch
))
2839 return error("binary patch does not apply to '%s'",
2842 /* verify that the result matches */
2843 hash_sha1_file(img
->buf
, img
->len
, blob_type
, sha1
);
2844 if (strcmp(sha1_to_hex(sha1
), patch
->new_sha1_prefix
))
2845 return error("binary patch to '%s' creates incorrect result (expecting %s, got %s)",
2846 name
, patch
->new_sha1_prefix
, sha1_to_hex(sha1
));
2852 static int apply_fragments(struct image
*img
, struct patch
*patch
)
2854 struct fragment
*frag
= patch
->fragments
;
2855 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
2856 unsigned ws_rule
= patch
->ws_rule
;
2857 unsigned inaccurate_eof
= patch
->inaccurate_eof
;
2860 if (patch
->is_binary
)
2861 return apply_binary(img
, patch
);
2865 if (apply_one_fragment(img
, frag
, inaccurate_eof
, ws_rule
, nth
)) {
2866 error("patch failed: %s:%ld", name
, frag
->oldpos
);
2867 if (!apply_with_reject
)
2876 static int read_file_or_gitlink(struct cache_entry
*ce
, struct strbuf
*buf
)
2881 if (S_ISGITLINK(ce
->ce_mode
)) {
2882 strbuf_grow(buf
, 100);
2883 strbuf_addf(buf
, "Subproject commit %s\n", sha1_to_hex(ce
->sha1
));
2885 enum object_type type
;
2889 result
= read_sha1_file(ce
->sha1
, &type
, &sz
);
2892 /* XXX read_sha1_file NUL-terminates */
2893 strbuf_attach(buf
, result
, sz
, sz
+ 1);
2898 static struct patch
*in_fn_table(const char *name
)
2900 struct string_list_item
*item
;
2905 item
= string_list_lookup(&fn_table
, name
);
2907 return (struct patch
*)item
->util
;
2913 * item->util in the filename table records the status of the path.
2914 * Usually it points at a patch (whose result records the contents
2915 * of it after applying it), but it could be PATH_WAS_DELETED for a
2916 * path that a previously applied patch has already removed.
2918 #define PATH_TO_BE_DELETED ((struct patch *) -2)
2919 #define PATH_WAS_DELETED ((struct patch *) -1)
2921 static int to_be_deleted(struct patch
*patch
)
2923 return patch
== PATH_TO_BE_DELETED
;
2926 static int was_deleted(struct patch
*patch
)
2928 return patch
== PATH_WAS_DELETED
;
2931 static void add_to_fn_table(struct patch
*patch
)
2933 struct string_list_item
*item
;
2936 * Always add new_name unless patch is a deletion
2937 * This should cover the cases for normal diffs,
2938 * file creations and copies
2940 if (patch
->new_name
!= NULL
) {
2941 item
= string_list_insert(&fn_table
, patch
->new_name
);
2946 * store a failure on rename/deletion cases because
2947 * later chunks shouldn't patch old names
2949 if ((patch
->new_name
== NULL
) || (patch
->is_rename
)) {
2950 item
= string_list_insert(&fn_table
, patch
->old_name
);
2951 item
->util
= PATH_WAS_DELETED
;
2955 static void prepare_fn_table(struct patch
*patch
)
2958 * store information about incoming file deletion
2961 if ((patch
->new_name
== NULL
) || (patch
->is_rename
)) {
2962 struct string_list_item
*item
;
2963 item
= string_list_insert(&fn_table
, patch
->old_name
);
2964 item
->util
= PATH_TO_BE_DELETED
;
2966 patch
= patch
->next
;
2970 static int apply_data(struct patch
*patch
, struct stat
*st
, struct cache_entry
*ce
)
2972 struct strbuf buf
= STRBUF_INIT
;
2976 struct patch
*tpatch
;
2978 if (!(patch
->is_copy
|| patch
->is_rename
) &&
2979 (tpatch
= in_fn_table(patch
->old_name
)) != NULL
&& !to_be_deleted(tpatch
)) {
2980 if (was_deleted(tpatch
)) {
2981 return error("patch %s has been renamed/deleted",
2984 /* We have a patched copy in memory use that */
2985 strbuf_add(&buf
, tpatch
->result
, tpatch
->resultsize
);
2986 } else if (cached
) {
2987 if (read_file_or_gitlink(ce
, &buf
))
2988 return error("read of %s failed", patch
->old_name
);
2989 } else if (patch
->old_name
) {
2990 if (S_ISGITLINK(patch
->old_mode
)) {
2992 read_file_or_gitlink(ce
, &buf
);
2995 * There is no way to apply subproject
2996 * patch without looking at the index.
2997 * NEEDSWORK: shouldn't this be flagged
3000 free_fragment_list(patch
->fragments
);
3001 patch
->fragments
= NULL
;
3004 if (read_old_data(st
, patch
->old_name
, &buf
))
3005 return error("read of %s failed", patch
->old_name
);
3009 img
= strbuf_detach(&buf
, &len
);
3010 prepare_image(&image
, img
, len
, !patch
->is_binary
);
3012 if (apply_fragments(&image
, patch
) < 0)
3013 return -1; /* note with --reject this succeeds. */
3014 patch
->result
= image
.buf
;
3015 patch
->resultsize
= image
.len
;
3016 add_to_fn_table(patch
);
3017 free(image
.line_allocated
);
3019 if (0 < patch
->is_delete
&& patch
->resultsize
)
3020 return error("removal patch leaves file contents");
3025 static int check_to_create_blob(const char *new_name
, int ok_if_exists
)
3028 if (!lstat(new_name
, &nst
)) {
3029 if (S_ISDIR(nst
.st_mode
) || ok_if_exists
)
3032 * A leading component of new_name might be a symlink
3033 * that is going to be removed with this patch, but
3034 * still pointing at somewhere that has the path.
3035 * In such a case, path "new_name" does not exist as
3036 * far as git is concerned.
3038 if (has_symlink_leading_path(new_name
, strlen(new_name
)))
3041 return error("%s: already exists in working directory", new_name
);
3043 else if ((errno
!= ENOENT
) && (errno
!= ENOTDIR
))
3044 return error("%s: %s", new_name
, strerror(errno
));
3048 static int verify_index_match(struct cache_entry
*ce
, struct stat
*st
)
3050 if (S_ISGITLINK(ce
->ce_mode
)) {
3051 if (!S_ISDIR(st
->st_mode
))
3055 return ce_match_stat(ce
, st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
);
3058 static int check_preimage(struct patch
*patch
, struct cache_entry
**ce
, struct stat
*st
)
3060 const char *old_name
= patch
->old_name
;
3061 struct patch
*tpatch
= NULL
;
3063 unsigned st_mode
= 0;
3066 * Make sure that we do not have local modifications from the
3067 * index when we are looking at the index. Also make sure
3068 * we have the preimage file to be patched in the work tree,
3069 * unless --cached, which tells git to apply only in the index.
3074 assert(patch
->is_new
<= 0);
3076 if (!(patch
->is_copy
|| patch
->is_rename
) &&
3077 (tpatch
= in_fn_table(old_name
)) != NULL
&& !to_be_deleted(tpatch
)) {
3078 if (was_deleted(tpatch
))
3079 return error("%s: has been deleted/renamed", old_name
);
3080 st_mode
= tpatch
->new_mode
;
3081 } else if (!cached
) {
3082 stat_ret
= lstat(old_name
, st
);
3083 if (stat_ret
&& errno
!= ENOENT
)
3084 return error("%s: %s", old_name
, strerror(errno
));
3087 if (to_be_deleted(tpatch
))
3090 if (check_index
&& !tpatch
) {
3091 int pos
= cache_name_pos(old_name
, strlen(old_name
));
3093 if (patch
->is_new
< 0)
3095 return error("%s: does not exist in index", old_name
);
3097 *ce
= active_cache
[pos
];
3099 struct checkout costate
;
3101 memset(&costate
, 0, sizeof(costate
));
3102 costate
.base_dir
= "";
3103 costate
.refresh_cache
= 1;
3104 if (checkout_entry(*ce
, &costate
, NULL
) ||
3105 lstat(old_name
, st
))
3108 if (!cached
&& verify_index_match(*ce
, st
))
3109 return error("%s: does not match index", old_name
);
3111 st_mode
= (*ce
)->ce_mode
;
3112 } else if (stat_ret
< 0) {
3113 if (patch
->is_new
< 0)
3115 return error("%s: %s", old_name
, strerror(errno
));
3118 if (!cached
&& !tpatch
)
3119 st_mode
= ce_mode_from_stat(*ce
, st
->st_mode
);
3121 if (patch
->is_new
< 0)
3123 if (!patch
->old_mode
)
3124 patch
->old_mode
= st_mode
;
3125 if ((st_mode
^ patch
->old_mode
) & S_IFMT
)
3126 return error("%s: wrong type", old_name
);
3127 if (st_mode
!= patch
->old_mode
)
3128 warning("%s has type %o, expected %o",
3129 old_name
, st_mode
, patch
->old_mode
);
3130 if (!patch
->new_mode
&& !patch
->is_delete
)
3131 patch
->new_mode
= st_mode
;
3136 patch
->is_delete
= 0;
3137 free(patch
->old_name
);
3138 patch
->old_name
= NULL
;
3142 static int check_patch(struct patch
*patch
)
3145 const char *old_name
= patch
->old_name
;
3146 const char *new_name
= patch
->new_name
;
3147 const char *name
= old_name
? old_name
: new_name
;
3148 struct cache_entry
*ce
= NULL
;
3149 struct patch
*tpatch
;
3153 patch
->rejected
= 1; /* we will drop this after we succeed */
3155 status
= check_preimage(patch
, &ce
, &st
);
3158 old_name
= patch
->old_name
;
3160 if ((tpatch
= in_fn_table(new_name
)) &&
3161 (was_deleted(tpatch
) || to_be_deleted(tpatch
)))
3163 * A type-change diff is always split into a patch to
3164 * delete old, immediately followed by a patch to
3165 * create new (see diff.c::run_diff()); in such a case
3166 * it is Ok that the entry to be deleted by the
3167 * previous patch is still in the working tree and in
3175 ((0 < patch
->is_new
) | (0 < patch
->is_rename
) | patch
->is_copy
)) {
3177 cache_name_pos(new_name
, strlen(new_name
)) >= 0 &&
3179 return error("%s: already exists in index", new_name
);
3181 int err
= check_to_create_blob(new_name
, ok_if_exists
);
3185 if (!patch
->new_mode
) {
3186 if (0 < patch
->is_new
)
3187 patch
->new_mode
= S_IFREG
| 0644;
3189 patch
->new_mode
= patch
->old_mode
;
3193 if (new_name
&& old_name
) {
3194 int same
= !strcmp(old_name
, new_name
);
3195 if (!patch
->new_mode
)
3196 patch
->new_mode
= patch
->old_mode
;
3197 if ((patch
->old_mode
^ patch
->new_mode
) & S_IFMT
)
3198 return error("new mode (%o) of %s does not match old mode (%o)%s%s",
3199 patch
->new_mode
, new_name
, patch
->old_mode
,
3200 same
? "" : " of ", same
? "" : old_name
);
3203 if (apply_data(patch
, &st
, ce
) < 0)
3204 return error("%s: patch does not apply", name
);
3205 patch
->rejected
= 0;
3209 static int check_patch_list(struct patch
*patch
)
3213 prepare_fn_table(patch
);
3215 if (apply_verbosely
)
3216 say_patch_name(stderr
,
3217 "Checking patch ", patch
, "...\n");
3218 err
|= check_patch(patch
);
3219 patch
= patch
->next
;
3224 /* This function tries to read the sha1 from the current index */
3225 static int get_current_sha1(const char *path
, unsigned char *sha1
)
3229 if (read_cache() < 0)
3231 pos
= cache_name_pos(path
, strlen(path
));
3234 hashcpy(sha1
, active_cache
[pos
]->sha1
);
3238 /* Build an index that contains the just the files needed for a 3way merge */
3239 static void build_fake_ancestor(struct patch
*list
, const char *filename
)
3241 struct patch
*patch
;
3242 struct index_state result
= { NULL
};
3245 /* Once we start supporting the reverse patch, it may be
3246 * worth showing the new sha1 prefix, but until then...
3248 for (patch
= list
; patch
; patch
= patch
->next
) {
3249 const unsigned char *sha1_ptr
;
3250 unsigned char sha1
[20];
3251 struct cache_entry
*ce
;
3254 name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
3255 if (0 < patch
->is_new
)
3257 else if (get_sha1(patch
->old_sha1_prefix
, sha1
))
3258 /* git diff has no index line for mode/type changes */
3259 if (!patch
->lines_added
&& !patch
->lines_deleted
) {
3260 if (get_current_sha1(patch
->old_name
, sha1
))
3261 die("mode change for %s, which is not "
3262 "in current HEAD", name
);
3265 die("sha1 information is lacking or useless "
3270 ce
= make_cache_entry(patch
->old_mode
, sha1_ptr
, name
, 0, 0);
3272 die("make_cache_entry failed for path '%s'", name
);
3273 if (add_index_entry(&result
, ce
, ADD_CACHE_OK_TO_ADD
))
3274 die ("Could not add %s to temporary index", name
);
3277 fd
= open(filename
, O_WRONLY
| O_CREAT
, 0666);
3278 if (fd
< 0 || write_index(&result
, fd
) || close(fd
))
3279 die ("Could not write temporary index to %s", filename
);
3281 discard_index(&result
);
3284 static void stat_patch_list(struct patch
*patch
)
3286 int files
, adds
, dels
;
3288 for (files
= adds
= dels
= 0 ; patch
; patch
= patch
->next
) {
3290 adds
+= patch
->lines_added
;
3291 dels
+= patch
->lines_deleted
;
3295 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files
, adds
, dels
);
3298 static void numstat_patch_list(struct patch
*patch
)
3300 for ( ; patch
; patch
= patch
->next
) {
3302 name
= patch
->new_name
? patch
->new_name
: patch
->old_name
;
3303 if (patch
->is_binary
)
3306 printf("%d\t%d\t", patch
->lines_added
, patch
->lines_deleted
);
3307 write_name_quoted(name
, stdout
, line_termination
);
3311 static void show_file_mode_name(const char *newdelete
, unsigned int mode
, const char *name
)
3314 printf(" %s mode %06o %s\n", newdelete
, mode
, name
);
3316 printf(" %s %s\n", newdelete
, name
);
3319 static void show_mode_change(struct patch
*p
, int show_name
)
3321 if (p
->old_mode
&& p
->new_mode
&& p
->old_mode
!= p
->new_mode
) {
3323 printf(" mode change %06o => %06o %s\n",
3324 p
->old_mode
, p
->new_mode
, p
->new_name
);
3326 printf(" mode change %06o => %06o\n",
3327 p
->old_mode
, p
->new_mode
);
3331 static void show_rename_copy(struct patch
*p
)
3333 const char *renamecopy
= p
->is_rename
? "rename" : "copy";
3334 const char *old
, *new;
3336 /* Find common prefix */
3340 const char *slash_old
, *slash_new
;
3341 slash_old
= strchr(old
, '/');
3342 slash_new
= strchr(new, '/');
3345 slash_old
- old
!= slash_new
- new ||
3346 memcmp(old
, new, slash_new
- new))
3348 old
= slash_old
+ 1;
3349 new = slash_new
+ 1;
3351 /* p->old_name thru old is the common prefix, and old and new
3352 * through the end of names are renames
3354 if (old
!= p
->old_name
)
3355 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy
,
3356 (int)(old
- p
->old_name
), p
->old_name
,
3357 old
, new, p
->score
);
3359 printf(" %s %s => %s (%d%%)\n", renamecopy
,
3360 p
->old_name
, p
->new_name
, p
->score
);
3361 show_mode_change(p
, 0);
3364 static void summary_patch_list(struct patch
*patch
)
3368 for (p
= patch
; p
; p
= p
->next
) {
3370 show_file_mode_name("create", p
->new_mode
, p
->new_name
);
3371 else if (p
->is_delete
)
3372 show_file_mode_name("delete", p
->old_mode
, p
->old_name
);
3374 if (p
->is_rename
|| p
->is_copy
)
3375 show_rename_copy(p
);
3378 printf(" rewrite %s (%d%%)\n",
3379 p
->new_name
, p
->score
);
3380 show_mode_change(p
, 0);
3383 show_mode_change(p
, 1);
3389 static void patch_stats(struct patch
*patch
)
3391 int lines
= patch
->lines_added
+ patch
->lines_deleted
;
3393 if (lines
> max_change
)
3395 if (patch
->old_name
) {
3396 int len
= quote_c_style(patch
->old_name
, NULL
, NULL
, 0);
3398 len
= strlen(patch
->old_name
);
3402 if (patch
->new_name
) {
3403 int len
= quote_c_style(patch
->new_name
, NULL
, NULL
, 0);
3405 len
= strlen(patch
->new_name
);
3411 static void remove_file(struct patch
*patch
, int rmdir_empty
)
3414 if (remove_file_from_cache(patch
->old_name
) < 0)
3415 die("unable to remove %s from index", patch
->old_name
);
3418 if (!remove_or_warn(patch
->old_mode
, patch
->old_name
) && rmdir_empty
) {
3419 remove_path(patch
->old_name
);
3424 static void add_index_file(const char *path
, unsigned mode
, void *buf
, unsigned long size
)
3427 struct cache_entry
*ce
;
3428 int namelen
= strlen(path
);
3429 unsigned ce_size
= cache_entry_size(namelen
);
3434 ce
= xcalloc(1, ce_size
);
3435 memcpy(ce
->name
, path
, namelen
);
3436 ce
->ce_mode
= create_ce_mode(mode
);
3437 ce
->ce_flags
= namelen
;
3438 if (S_ISGITLINK(mode
)) {
3439 const char *s
= buf
;
3441 if (get_sha1_hex(s
+ strlen("Subproject commit "), ce
->sha1
))
3442 die("corrupt patch for subproject %s", path
);
3445 if (lstat(path
, &st
) < 0)
3446 die_errno("unable to stat newly created file '%s'",
3448 fill_stat_cache_info(ce
, &st
);
3450 if (write_sha1_file(buf
, size
, blob_type
, ce
->sha1
) < 0)
3451 die("unable to create backing store for newly created file %s", path
);
3453 if (add_cache_entry(ce
, ADD_CACHE_OK_TO_ADD
) < 0)
3454 die("unable to add cache entry for %s", path
);
3457 static int try_create_file(const char *path
, unsigned int mode
, const char *buf
, unsigned long size
)
3460 struct strbuf nbuf
= STRBUF_INIT
;
3462 if (S_ISGITLINK(mode
)) {
3464 if (!lstat(path
, &st
) && S_ISDIR(st
.st_mode
))
3466 return mkdir(path
, 0777);
3469 if (has_symlinks
&& S_ISLNK(mode
))
3470 /* Although buf:size is counted string, it also is NUL
3473 return symlink(buf
, path
);
3475 fd
= open(path
, O_CREAT
| O_EXCL
| O_WRONLY
, (mode
& 0100) ? 0777 : 0666);
3479 if (convert_to_working_tree(path
, buf
, size
, &nbuf
)) {
3483 write_or_die(fd
, buf
, size
);
3484 strbuf_release(&nbuf
);
3487 die_errno("closing file '%s'", path
);
3492 * We optimistically assume that the directories exist,
3493 * which is true 99% of the time anyway. If they don't,
3494 * we create them and try again.
3496 static void create_one_file(char *path
, unsigned mode
, const char *buf
, unsigned long size
)
3500 if (!try_create_file(path
, mode
, buf
, size
))
3503 if (errno
== ENOENT
) {
3504 if (safe_create_leading_directories(path
))
3506 if (!try_create_file(path
, mode
, buf
, size
))
3510 if (errno
== EEXIST
|| errno
== EACCES
) {
3511 /* We may be trying to create a file where a directory
3515 if (!lstat(path
, &st
) && (!S_ISDIR(st
.st_mode
) || !rmdir(path
)))
3519 if (errno
== EEXIST
) {
3520 unsigned int nr
= getpid();
3523 char newpath
[PATH_MAX
];
3524 mksnpath(newpath
, sizeof(newpath
), "%s~%u", path
, nr
);
3525 if (!try_create_file(newpath
, mode
, buf
, size
)) {
3526 if (!rename(newpath
, path
))
3528 unlink_or_warn(newpath
);
3531 if (errno
!= EEXIST
)
3536 die_errno("unable to write file '%s' mode %o", path
, mode
);
3539 static void create_file(struct patch
*patch
)
3541 char *path
= patch
->new_name
;
3542 unsigned mode
= patch
->new_mode
;
3543 unsigned long size
= patch
->resultsize
;
3544 char *buf
= patch
->result
;
3547 mode
= S_IFREG
| 0644;
3548 create_one_file(path
, mode
, buf
, size
);
3549 add_index_file(path
, mode
, buf
, size
);
3552 /* phase zero is to remove, phase one is to create */
3553 static void write_out_one_result(struct patch
*patch
, int phase
)
3555 if (patch
->is_delete
> 0) {
3557 remove_file(patch
, 1);
3560 if (patch
->is_new
> 0 || patch
->is_copy
) {
3566 * Rename or modification boils down to the same
3567 * thing: remove the old, write the new
3570 remove_file(patch
, patch
->is_rename
);
3575 static int write_out_one_reject(struct patch
*patch
)
3578 char namebuf
[PATH_MAX
];
3579 struct fragment
*frag
;
3582 for (cnt
= 0, frag
= patch
->fragments
; frag
; frag
= frag
->next
) {
3583 if (!frag
->rejected
)
3589 if (apply_verbosely
)
3590 say_patch_name(stderr
,
3591 "Applied patch ", patch
, " cleanly.\n");
3595 /* This should not happen, because a removal patch that leaves
3596 * contents are marked "rejected" at the patch level.
3598 if (!patch
->new_name
)
3599 die("internal error");
3601 /* Say this even without --verbose */
3602 say_patch_name(stderr
, "Applying patch ", patch
, " with");
3603 fprintf(stderr
, " %d rejects...\n", cnt
);
3605 cnt
= strlen(patch
->new_name
);
3606 if (ARRAY_SIZE(namebuf
) <= cnt
+ 5) {
3607 cnt
= ARRAY_SIZE(namebuf
) - 5;
3608 warning("truncating .rej filename to %.*s.rej",
3609 cnt
- 1, patch
->new_name
);
3611 memcpy(namebuf
, patch
->new_name
, cnt
);
3612 memcpy(namebuf
+ cnt
, ".rej", 5);
3614 rej
= fopen(namebuf
, "w");
3616 return error("cannot open %s: %s", namebuf
, strerror(errno
));
3618 /* Normal git tools never deal with .rej, so do not pretend
3619 * this is a git patch by saying --git nor give extended
3620 * headers. While at it, maybe please "kompare" that wants
3621 * the trailing TAB and some garbage at the end of line ;-).
3623 fprintf(rej
, "diff a/%s b/%s\t(rejected hunks)\n",
3624 patch
->new_name
, patch
->new_name
);
3625 for (cnt
= 1, frag
= patch
->fragments
;
3627 cnt
++, frag
= frag
->next
) {
3628 if (!frag
->rejected
) {
3629 fprintf(stderr
, "Hunk #%d applied cleanly.\n", cnt
);
3632 fprintf(stderr
, "Rejected hunk #%d.\n", cnt
);
3633 fprintf(rej
, "%.*s", frag
->size
, frag
->patch
);
3634 if (frag
->patch
[frag
->size
-1] != '\n')
3641 static int write_out_results(struct patch
*list
)
3647 for (phase
= 0; phase
< 2; phase
++) {
3653 write_out_one_result(l
, phase
);
3654 if (phase
== 1 && write_out_one_reject(l
))
3663 static struct lock_file lock_file
;
3665 static struct string_list limit_by_name
;
3666 static int has_include
;
3667 static void add_name_limit(const char *name
, int exclude
)
3669 struct string_list_item
*it
;
3671 it
= string_list_append(&limit_by_name
, name
);
3672 it
->util
= exclude
? NULL
: (void *) 1;
3675 static int use_patch(struct patch
*p
)
3677 const char *pathname
= p
->new_name
? p
->new_name
: p
->old_name
;
3680 /* Paths outside are not touched regardless of "--include" */
3681 if (0 < prefix_length
) {
3682 int pathlen
= strlen(pathname
);
3683 if (pathlen
<= prefix_length
||
3684 memcmp(prefix
, pathname
, prefix_length
))
3688 /* See if it matches any of exclude/include rule */
3689 for (i
= 0; i
< limit_by_name
.nr
; i
++) {
3690 struct string_list_item
*it
= &limit_by_name
.items
[i
];
3691 if (!fnmatch(it
->string
, pathname
, 0))
3692 return (it
->util
!= NULL
);
3696 * If we had any include, a path that does not match any rule is
3697 * not used. Otherwise, we saw bunch of exclude rules (or none)
3698 * and such a path is used.
3700 return !has_include
;
3704 static void prefix_one(char **name
)
3706 char *old_name
= *name
;
3709 *name
= xstrdup(prefix_filename(prefix
, prefix_length
, *name
));
3713 static void prefix_patches(struct patch
*p
)
3715 if (!prefix
|| p
->is_toplevel_relative
)
3717 for ( ; p
; p
= p
->next
) {
3718 prefix_one(&p
->new_name
);
3719 prefix_one(&p
->old_name
);
3723 #define INACCURATE_EOF (1<<0)
3724 #define RECOUNT (1<<1)
3726 static int apply_patch(int fd
, const char *filename
, int options
)
3729 struct strbuf buf
= STRBUF_INIT
;
3730 struct patch
*list
= NULL
, **listp
= &list
;
3731 int skipped_patch
= 0;
3733 patch_input_file
= filename
;
3734 read_patch_file(&buf
, fd
);
3736 while (offset
< buf
.len
) {
3737 struct patch
*patch
;
3740 patch
= xcalloc(1, sizeof(*patch
));
3741 patch
->inaccurate_eof
= !!(options
& INACCURATE_EOF
);
3742 patch
->recount
= !!(options
& RECOUNT
);
3743 nr
= parse_chunk(buf
.buf
+ offset
, buf
.len
- offset
, patch
);
3746 if (apply_in_reverse
)
3747 reverse_patches(patch
);
3749 prefix_patches(patch
);
3750 if (use_patch(patch
)) {
3753 listp
= &patch
->next
;
3762 if (!list
&& !skipped_patch
)
3763 die("unrecognized input");
3765 if (whitespace_error
&& (ws_error_action
== die_on_ws_error
))
3768 update_index
= check_index
&& apply
;
3769 if (update_index
&& newfd
< 0)
3770 newfd
= hold_locked_index(&lock_file
, 1);
3773 if (read_cache() < 0)
3774 die("unable to read index file");
3777 if ((check
|| apply
) &&
3778 check_patch_list(list
) < 0 &&
3782 if (apply
&& write_out_results(list
))
3786 build_fake_ancestor(list
, fake_ancestor
);
3789 stat_patch_list(list
);
3792 numstat_patch_list(list
);
3795 summary_patch_list(list
);
3797 free_patch_list(list
);
3798 strbuf_release(&buf
);
3799 string_list_clear(&fn_table
, 0);
3803 static int git_apply_config(const char *var
, const char *value
, void *cb
)
3805 if (!strcmp(var
, "apply.whitespace"))
3806 return git_config_string(&apply_default_whitespace
, var
, value
);
3807 else if (!strcmp(var
, "apply.ignorewhitespace"))
3808 return git_config_string(&apply_default_ignorewhitespace
, var
, value
);
3809 return git_default_config(var
, value
, cb
);
3812 static int option_parse_exclude(const struct option
*opt
,
3813 const char *arg
, int unset
)
3815 add_name_limit(arg
, 1);
3819 static int option_parse_include(const struct option
*opt
,
3820 const char *arg
, int unset
)
3822 add_name_limit(arg
, 0);
3827 static int option_parse_p(const struct option
*opt
,
3828 const char *arg
, int unset
)
3830 p_value
= atoi(arg
);
3835 static int option_parse_z(const struct option
*opt
,
3836 const char *arg
, int unset
)
3839 line_termination
= '\n';
3841 line_termination
= 0;
3845 static int option_parse_space_change(const struct option
*opt
,
3846 const char *arg
, int unset
)
3849 ws_ignore_action
= ignore_ws_none
;
3851 ws_ignore_action
= ignore_ws_change
;
3855 static int option_parse_whitespace(const struct option
*opt
,
3856 const char *arg
, int unset
)
3858 const char **whitespace_option
= opt
->value
;
3860 *whitespace_option
= arg
;
3861 parse_whitespace_option(arg
);
3865 static int option_parse_directory(const struct option
*opt
,
3866 const char *arg
, int unset
)
3868 root_len
= strlen(arg
);
3869 if (root_len
&& arg
[root_len
- 1] != '/') {
3871 root
= new_root
= xmalloc(root_len
+ 2);
3872 strcpy(new_root
, arg
);
3873 strcpy(new_root
+ root_len
++, "/");
3879 int cmd_apply(int argc
, const char **argv
, const char *prefix_
)
3883 int is_not_gitdir
= !startup_info
->have_repository
;
3884 int force_apply
= 0;
3886 const char *whitespace_option
= NULL
;
3888 struct option builtin_apply_options
[] = {
3889 { OPTION_CALLBACK
, 0, "exclude", NULL
, "path",
3890 "don't apply changes matching the given path",
3891 0, option_parse_exclude
},
3892 { OPTION_CALLBACK
, 0, "include", NULL
, "path",
3893 "apply changes matching the given path",
3894 0, option_parse_include
},
3895 { OPTION_CALLBACK
, 'p', NULL
, NULL
, "num",
3896 "remove <num> leading slashes from traditional diff paths",
3897 0, option_parse_p
},
3898 OPT_BOOLEAN(0, "no-add", &no_add
,
3899 "ignore additions made by the patch"),
3900 OPT_BOOLEAN(0, "stat", &diffstat
,
3901 "instead of applying the patch, output diffstat for the input"),
3902 OPT_NOOP_NOARG(0, "allow-binary-replacement"),
3903 OPT_NOOP_NOARG(0, "binary"),
3904 OPT_BOOLEAN(0, "numstat", &numstat
,
3905 "shows number of added and deleted lines in decimal notation"),
3906 OPT_BOOLEAN(0, "summary", &summary
,
3907 "instead of applying the patch, output a summary for the input"),
3908 OPT_BOOLEAN(0, "check", &check
,
3909 "instead of applying the patch, see if the patch is applicable"),
3910 OPT_BOOLEAN(0, "index", &check_index
,
3911 "make sure the patch is applicable to the current index"),
3912 OPT_BOOLEAN(0, "cached", &cached
,
3913 "apply a patch without touching the working tree"),
3914 OPT_BOOLEAN(0, "apply", &force_apply
,
3915 "also apply the patch (use with --stat/--summary/--check)"),
3916 OPT_FILENAME(0, "build-fake-ancestor", &fake_ancestor
,
3917 "build a temporary index based on embedded index information"),
3918 { OPTION_CALLBACK
, 'z', NULL
, NULL
, NULL
,
3919 "paths are separated with NUL character",
3920 PARSE_OPT_NOARG
, option_parse_z
},
3921 OPT_INTEGER('C', NULL
, &p_context
,
3922 "ensure at least <n> lines of context match"),
3923 { OPTION_CALLBACK
, 0, "whitespace", &whitespace_option
, "action",
3924 "detect new or modified lines that have whitespace errors",
3925 0, option_parse_whitespace
},
3926 { OPTION_CALLBACK
, 0, "ignore-space-change", NULL
, NULL
,
3927 "ignore changes in whitespace when finding context",
3928 PARSE_OPT_NOARG
, option_parse_space_change
},
3929 { OPTION_CALLBACK
, 0, "ignore-whitespace", NULL
, NULL
,
3930 "ignore changes in whitespace when finding context",
3931 PARSE_OPT_NOARG
, option_parse_space_change
},
3932 OPT_BOOLEAN('R', "reverse", &apply_in_reverse
,
3933 "apply the patch in reverse"),
3934 OPT_BOOLEAN(0, "unidiff-zero", &unidiff_zero
,
3935 "don't expect at least one line of context"),
3936 OPT_BOOLEAN(0, "reject", &apply_with_reject
,
3937 "leave the rejected hunks in corresponding *.rej files"),
3938 OPT_BOOLEAN(0, "allow-overlap", &allow_overlap
,
3939 "allow overlapping hunks"),
3940 OPT__VERBOSE(&apply_verbosely
, "be verbose"),
3941 OPT_BIT(0, "inaccurate-eof", &options
,
3942 "tolerate incorrectly detected missing new-line at the end of file",
3944 OPT_BIT(0, "recount", &options
,
3945 "do not trust the line counts in the hunk headers",
3947 { OPTION_CALLBACK
, 0, "directory", NULL
, "root",
3948 "prepend <root> to all filenames",
3949 0, option_parse_directory
},
3954 prefix_length
= prefix
? strlen(prefix
) : 0;
3955 git_config(git_apply_config
, NULL
);
3956 if (apply_default_whitespace
)
3957 parse_whitespace_option(apply_default_whitespace
);
3958 if (apply_default_ignorewhitespace
)
3959 parse_ignorewhitespace_option(apply_default_ignorewhitespace
);
3961 argc
= parse_options(argc
, argv
, prefix
, builtin_apply_options
,
3964 if (apply_with_reject
)
3965 apply
= apply_verbosely
= 1;
3966 if (!force_apply
&& (diffstat
|| numstat
|| summary
|| check
|| fake_ancestor
))
3968 if (check_index
&& is_not_gitdir
)
3969 die("--index outside a repository");
3972 die("--cached outside a repository");
3975 for (i
= 0; i
< argc
; i
++) {
3976 const char *arg
= argv
[i
];
3979 if (!strcmp(arg
, "-")) {
3980 errs
|= apply_patch(0, "<stdin>", options
);
3983 } else if (0 < prefix_length
)
3984 arg
= prefix_filename(prefix
, prefix_length
, arg
);
3986 fd
= open(arg
, O_RDONLY
);
3988 die_errno("can't open patch '%s'", arg
);
3990 set_default_whitespace_mode(whitespace_option
);
3991 errs
|= apply_patch(fd
, arg
, options
);
3994 set_default_whitespace_mode(whitespace_option
);
3996 errs
|= apply_patch(0, "<stdin>", options
);
3997 if (whitespace_error
) {
3998 if (squelch_whitespace_errors
&&
3999 squelch_whitespace_errors
< whitespace_error
) {
4001 whitespace_error
- squelch_whitespace_errors
;
4002 warning("squelched %d "
4003 "whitespace error%s",
4005 squelched
== 1 ? "" : "s");
4007 if (ws_error_action
== die_on_ws_error
)
4008 die("%d line%s add%s whitespace errors.",
4010 whitespace_error
== 1 ? "" : "s",
4011 whitespace_error
== 1 ? "s" : "");
4012 if (applied_after_fixing_ws
&& apply
)
4013 warning("%d line%s applied after"
4014 " fixing whitespace errors.",
4015 applied_after_fixing_ws
,
4016 applied_after_fixing_ws
== 1 ? "" : "s");
4017 else if (whitespace_error
)
4018 warning("%d line%s add%s whitespace errors.",
4020 whitespace_error
== 1 ? "" : "s",
4021 whitespace_error
== 1 ? "s" : "");
4025 if (write_cache(newfd
, active_cache
, active_nr
) ||
4026 commit_locked_index(&lock_file
))
4027 die("Unable to write new index file");