4 * Copyright (C) Linus Torvalds, 2005
6 * This applies patches on top of some (arbitrary) version of the SCM.
13 // --check turns on checking that the working tree matches the
14 // files that are being modified, but doesn't apply the patch
15 // --stat does just a diffstat, and doesn't actually apply
16 // --numstat does numeric diffstat, and doesn't actually apply
17 // --index-info shows the old and new index info for paths if available.
19 static const char *prefix
;
20 static int prefix_length
= -1;
22 static int p_value
= 1;
23 static int allow_binary_replacement
= 0;
24 static int check_index
= 0;
25 static int write_index
= 0;
26 static int diffstat
= 0;
27 static int numstat
= 0;
28 static int summary
= 0;
31 static int no_add
= 0;
32 static int show_index_info
= 0;
33 static int line_termination
= '\n';
34 static const char apply_usage
[] =
35 "git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM] <patch>...";
37 static enum whitespace_eol
{
41 } new_whitespace
= nowarn
;
44 * For "diff-stat" like behaviour, we keep track of the biggest change
45 * we've seen, and the longest filename. That allows us to do simple
48 static int max_change
, max_len
;
51 * Various "current state", notably line numbers and what
52 * file (and how) we're patching right now.. The "is_xxxx"
53 * things are flags, where -1 means "don't know yet".
55 static int linenr
= 1;
58 unsigned long oldpos
, oldlines
;
59 unsigned long newpos
, newlines
;
62 struct fragment
*next
;
66 char *new_name
, *old_name
, *def_name
;
67 unsigned int old_mode
, new_mode
;
68 int is_rename
, is_copy
, is_new
, is_delete
, is_binary
;
69 int lines_added
, lines_deleted
;
71 struct fragment
*fragments
;
73 unsigned long resultsize
;
74 char old_sha1_prefix
[41];
75 char new_sha1_prefix
[41];
79 #define CHUNKSIZE (8192)
82 static void *read_patch_file(int fd
, unsigned long *sizep
)
84 unsigned long size
= 0, alloc
= CHUNKSIZE
;
85 void *buffer
= xmalloc(alloc
);
88 int nr
= alloc
- size
;
91 buffer
= xrealloc(buffer
, alloc
);
94 nr
= xread(fd
, buffer
+ size
, nr
);
98 die("git-apply: read returned %s", strerror(errno
));
104 * Make sure that we have some slop in the buffer
105 * so that we can do speculative "memcmp" etc, and
106 * see to it that it is NUL-filled.
108 if (alloc
< size
+ SLOP
)
109 buffer
= xrealloc(buffer
, size
+ SLOP
);
110 memset(buffer
+ size
, 0, SLOP
);
114 static unsigned long linelen(const char *buffer
, unsigned long size
)
116 unsigned long len
= 0;
119 if (*buffer
++ == '\n')
125 static int is_dev_null(const char *str
)
127 return !memcmp("/dev/null", str
, 9) && isspace(str
[9]);
133 static int name_terminate(const char *name
, int namelen
, int c
, int terminate
)
135 if (c
== ' ' && !(terminate
& TERM_SPACE
))
137 if (c
== '\t' && !(terminate
& TERM_TAB
))
143 static char * find_name(const char *line
, char *def
, int p_value
, int terminate
)
146 const char *start
= line
;
150 /* Proposed "new-style" GNU patch/diff format; see
151 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
153 name
= unquote_c_style(line
, NULL
);
157 cp
= strchr(name
, '/');
164 /* name can later be freed, so we need
165 * to memmove, not just return cp
167 memmove(name
, cp
, strlen(cp
) + 1);
184 if (name_terminate(start
, line
-start
, c
, terminate
))
188 if (c
== '/' && !--p_value
)
198 * Generally we prefer the shorter name, especially
199 * if the other one is just a variation of that with
200 * something else tacked on to the end (ie "file.orig"
204 int deflen
= strlen(def
);
205 if (deflen
< len
&& !strncmp(start
, def
, deflen
))
209 name
= xmalloc(len
+ 1);
210 memcpy(name
, start
, len
);
217 * Get the name etc info from the --/+++ lines of a traditional patch header
219 * NOTE! This hardcodes "-p1" behaviour in filename detection.
221 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
222 * files, we can happily check the index for a match, but for creating a
223 * new file we should try to match whatever "patch" does. I have no idea.
225 static void parse_traditional_patch(const char *first
, const char *second
, struct patch
*patch
)
229 first
+= 4; // skip "--- "
230 second
+= 4; // skip "+++ "
231 if (is_dev_null(first
)) {
233 patch
->is_delete
= 0;
234 name
= find_name(second
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
235 patch
->new_name
= name
;
236 } else if (is_dev_null(second
)) {
238 patch
->is_delete
= 1;
239 name
= find_name(first
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
240 patch
->old_name
= name
;
242 name
= find_name(first
, NULL
, p_value
, TERM_SPACE
| TERM_TAB
);
243 name
= find_name(second
, name
, p_value
, TERM_SPACE
| TERM_TAB
);
244 patch
->old_name
= patch
->new_name
= name
;
247 die("unable to find filename in patch at line %d", linenr
);
250 static int gitdiff_hdrend(const char *line
, struct patch
*patch
)
256 * We're anal about diff header consistency, to make
257 * sure that we don't end up having strange ambiguous
258 * patches floating around.
260 * As a result, gitdiff_{old|new}name() will check
261 * their names against any previous information, just
264 static char *gitdiff_verify_name(const char *line
, int isnull
, char *orig_name
, const char *oldnew
)
266 if (!orig_name
&& !isnull
)
267 return find_name(line
, NULL
, 1, 0);
276 die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name
, linenr
);
277 another
= find_name(line
, NULL
, 1, 0);
278 if (!another
|| memcmp(another
, name
, len
))
279 die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew
, linenr
);
284 /* expect "/dev/null" */
285 if (memcmp("/dev/null", line
, 9) || line
[9] != '\n')
286 die("git-apply: bad git-diff - expected /dev/null on line %d", linenr
);
291 static int gitdiff_oldname(const char *line
, struct patch
*patch
)
293 patch
->old_name
= gitdiff_verify_name(line
, patch
->is_new
, patch
->old_name
, "old");
297 static int gitdiff_newname(const char *line
, struct patch
*patch
)
299 patch
->new_name
= gitdiff_verify_name(line
, patch
->is_delete
, patch
->new_name
, "new");
303 static int gitdiff_oldmode(const char *line
, struct patch
*patch
)
305 patch
->old_mode
= strtoul(line
, NULL
, 8);
309 static int gitdiff_newmode(const char *line
, struct patch
*patch
)
311 patch
->new_mode
= strtoul(line
, NULL
, 8);
315 static int gitdiff_delete(const char *line
, struct patch
*patch
)
317 patch
->is_delete
= 1;
318 patch
->old_name
= patch
->def_name
;
319 return gitdiff_oldmode(line
, patch
);
322 static int gitdiff_newfile(const char *line
, struct patch
*patch
)
325 patch
->new_name
= patch
->def_name
;
326 return gitdiff_newmode(line
, patch
);
329 static int gitdiff_copysrc(const char *line
, struct patch
*patch
)
332 patch
->old_name
= find_name(line
, NULL
, 0, 0);
336 static int gitdiff_copydst(const char *line
, struct patch
*patch
)
339 patch
->new_name
= find_name(line
, NULL
, 0, 0);
343 static int gitdiff_renamesrc(const char *line
, struct patch
*patch
)
345 patch
->is_rename
= 1;
346 patch
->old_name
= find_name(line
, NULL
, 0, 0);
350 static int gitdiff_renamedst(const char *line
, struct patch
*patch
)
352 patch
->is_rename
= 1;
353 patch
->new_name
= find_name(line
, NULL
, 0, 0);
357 static int gitdiff_similarity(const char *line
, struct patch
*patch
)
359 if ((patch
->score
= strtoul(line
, NULL
, 10)) == ULONG_MAX
)
364 static int gitdiff_dissimilarity(const char *line
, struct patch
*patch
)
366 if ((patch
->score
= strtoul(line
, NULL
, 10)) == ULONG_MAX
)
371 static int gitdiff_index(const char *line
, struct patch
*patch
)
373 /* index line is N hexadecimal, "..", N hexadecimal,
374 * and optional space with octal mode.
376 const char *ptr
, *eol
;
379 ptr
= strchr(line
, '.');
380 if (!ptr
|| ptr
[1] != '.' || 40 < ptr
- line
)
383 memcpy(patch
->old_sha1_prefix
, line
, len
);
384 patch
->old_sha1_prefix
[len
] = 0;
387 ptr
= strchr(line
, ' ');
388 eol
= strchr(line
, '\n');
390 if (!ptr
|| eol
< ptr
)
396 memcpy(patch
->new_sha1_prefix
, line
, len
);
397 patch
->new_sha1_prefix
[len
] = 0;
399 patch
->new_mode
= patch
->old_mode
= strtoul(ptr
+1, NULL
, 8);
404 * This is normal for a diff that doesn't change anything: we'll fall through
405 * into the next diff. Tell the parser to break out.
407 static int gitdiff_unrecognized(const char *line
, struct patch
*patch
)
412 static const char *stop_at_slash(const char *line
, int llen
)
416 for (i
= 0; i
< llen
; i
++) {
424 /* This is to extract the same name that appears on "diff --git"
425 * line. We do not find and return anything if it is a rename
426 * patch, and it is OK because we will find the name elsewhere.
427 * We need to reliably find name only when it is mode-change only,
428 * creation or deletion of an empty file. In any of these cases,
429 * both sides are the same name under a/ and b/ respectively.
431 static char *git_header_name(char *line
, int llen
)
435 const char *second
= NULL
;
437 line
+= strlen("diff --git ");
438 llen
-= strlen("diff --git ");
442 char *first
= unquote_c_style(line
, &second
);
446 /* advance to the first slash */
447 cp
= stop_at_slash(first
, strlen(first
));
448 if (!cp
|| cp
== first
) {
449 /* we do not accept absolute paths */
455 memmove(first
, cp
+1, len
+1); /* including NUL */
457 /* second points at one past closing dq of name.
458 * find the second name.
460 while ((second
< line
+ llen
) && isspace(*second
))
463 if (line
+ llen
<= second
)
464 goto free_first_and_fail
;
465 if (*second
== '"') {
466 char *sp
= unquote_c_style(second
, NULL
);
468 goto free_first_and_fail
;
469 cp
= stop_at_slash(sp
, strlen(sp
));
470 if (!cp
|| cp
== sp
) {
473 goto free_first_and_fail
;
475 /* They must match, otherwise ignore */
476 if (strcmp(cp
+1, first
))
477 goto free_both_and_fail
;
482 /* unquoted second */
483 cp
= stop_at_slash(second
, line
+ llen
- second
);
484 if (!cp
|| cp
== second
)
485 goto free_first_and_fail
;
487 if (line
+ llen
- cp
!= len
+ 1 ||
488 memcmp(first
, cp
, len
))
489 goto free_first_and_fail
;
493 /* unquoted first name */
494 name
= stop_at_slash(line
, llen
);
495 if (!name
|| name
== line
)
500 /* since the first name is unquoted, a dq if exists must be
501 * the beginning of the second name.
503 for (second
= name
; second
< line
+ llen
; second
++) {
504 if (*second
== '"') {
505 const char *cp
= second
;
507 char *sp
= unquote_c_style(second
, NULL
);
511 np
= stop_at_slash(sp
, strlen(sp
));
512 if (!np
|| np
== sp
) {
513 free_second_and_fail
:
519 if (len
< cp
- name
&&
520 !strncmp(np
, name
, len
) &&
521 isspace(name
[len
])) {
523 memmove(sp
, np
, len
+ 1);
526 goto free_second_and_fail
;
531 * Accept a name only if it shows up twice, exactly the same
534 for (len
= 0 ; ; len
++) {
551 if (second
[len
] == '\n' && !memcmp(name
, second
, len
)) {
552 char *ret
= xmalloc(len
+ 1);
553 memcpy(ret
, name
, len
);
562 /* Verify that we recognize the lines following a git header */
563 static int parse_git_header(char *line
, int len
, unsigned int size
, struct patch
*patch
)
565 unsigned long offset
;
567 /* A git diff has explicit new/delete information, so we don't guess */
569 patch
->is_delete
= 0;
572 * Some things may not have the old name in the
573 * rest of the headers anywhere (pure mode changes,
574 * or removing or adding empty files), so we get
575 * the default name from the header.
577 patch
->def_name
= git_header_name(line
, len
);
582 for (offset
= len
; size
> 0 ; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
583 static const struct opentry
{
585 int (*fn
)(const char *, struct patch
*);
587 { "@@ -", gitdiff_hdrend
},
588 { "--- ", gitdiff_oldname
},
589 { "+++ ", gitdiff_newname
},
590 { "old mode ", gitdiff_oldmode
},
591 { "new mode ", gitdiff_newmode
},
592 { "deleted file mode ", gitdiff_delete
},
593 { "new file mode ", gitdiff_newfile
},
594 { "copy from ", gitdiff_copysrc
},
595 { "copy to ", gitdiff_copydst
},
596 { "rename old ", gitdiff_renamesrc
},
597 { "rename new ", gitdiff_renamedst
},
598 { "rename from ", gitdiff_renamesrc
},
599 { "rename to ", gitdiff_renamedst
},
600 { "similarity index ", gitdiff_similarity
},
601 { "dissimilarity index ", gitdiff_dissimilarity
},
602 { "index ", gitdiff_index
},
603 { "", gitdiff_unrecognized
},
607 len
= linelen(line
, size
);
608 if (!len
|| line
[len
-1] != '\n')
610 for (i
= 0; i
< sizeof(optable
) / sizeof(optable
[0]); i
++) {
611 const struct opentry
*p
= optable
+ i
;
612 int oplen
= strlen(p
->str
);
613 if (len
< oplen
|| memcmp(p
->str
, line
, oplen
))
615 if (p
->fn(line
+ oplen
, patch
) < 0)
624 static int parse_num(const char *line
, unsigned long *p
)
630 *p
= strtoul(line
, &ptr
, 10);
634 static int parse_range(const char *line
, int len
, int offset
, const char *expect
,
635 unsigned long *p1
, unsigned long *p2
)
639 if (offset
< 0 || offset
>= len
)
644 digits
= parse_num(line
, p1
);
654 digits
= parse_num(line
+1, p2
);
666 if (memcmp(line
, expect
, ex
))
673 * Parse a unified diff fragment header of the
674 * form "@@ -a,b +c,d @@"
676 static int parse_fragment_header(char *line
, int len
, struct fragment
*fragment
)
680 if (!len
|| line
[len
-1] != '\n')
683 /* Figure out the number of lines in a fragment */
684 offset
= parse_range(line
, len
, 4, " +", &fragment
->oldpos
, &fragment
->oldlines
);
685 offset
= parse_range(line
, len
, offset
, " @@", &fragment
->newpos
, &fragment
->newlines
);
690 static int find_header(char *line
, unsigned long size
, int *hdrsize
, struct patch
*patch
)
692 unsigned long offset
, len
;
694 patch
->is_rename
= patch
->is_copy
= 0;
695 patch
->is_new
= patch
->is_delete
= -1;
696 patch
->old_mode
= patch
->new_mode
= 0;
697 patch
->old_name
= patch
->new_name
= NULL
;
698 for (offset
= 0; size
> 0; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
699 unsigned long nextlen
;
701 len
= linelen(line
, size
);
705 /* Testing this early allows us to take a few shortcuts.. */
710 * Make sure we don't find any unconnected patch fragmants.
711 * That's a sign that we didn't find a header, and that a
712 * patch has become corrupted/broken up.
714 if (!memcmp("@@ -", line
, 4)) {
715 struct fragment dummy
;
716 if (parse_fragment_header(line
, len
, &dummy
) < 0)
718 error("patch fragment without header at line %d: %.*s", linenr
, (int)len
-1, line
);
725 * Git patch? It might not have a real patch, just a rename
726 * or mode change, so we handle that specially
728 if (!memcmp("diff --git ", line
, 11)) {
729 int git_hdr_len
= parse_git_header(line
, len
, size
, patch
);
730 if (git_hdr_len
<= len
)
732 if (!patch
->old_name
&& !patch
->new_name
) {
733 if (!patch
->def_name
)
734 die("git diff header lacks filename information (line %d)", linenr
);
735 patch
->old_name
= patch
->new_name
= patch
->def_name
;
737 *hdrsize
= git_hdr_len
;
741 /** --- followed by +++ ? */
742 if (memcmp("--- ", line
, 4) || memcmp("+++ ", line
+ len
, 4))
746 * We only accept unified patches, so we want it to
747 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
750 nextlen
= linelen(line
+ len
, size
- len
);
751 if (size
< nextlen
+ 14 || memcmp("@@ -", line
+ len
+ nextlen
, 4))
754 /* Ok, we'll consider it a patch */
755 parse_traditional_patch(line
, line
+len
, patch
);
756 *hdrsize
= len
+ nextlen
;
764 * Parse a unified diff. Note that this really needs
765 * to parse each fragment separately, since the only
766 * way to know the difference between a "---" that is
767 * part of a patch, and a "---" that starts the next
768 * patch is to look at the line counts..
770 static int parse_fragment(char *line
, unsigned long size
, struct patch
*patch
, struct fragment
*fragment
)
773 int len
= linelen(line
, size
), offset
;
774 unsigned long oldlines
, newlines
;
776 offset
= parse_fragment_header(line
, len
, fragment
);
779 oldlines
= fragment
->oldlines
;
780 newlines
= fragment
->newlines
;
782 if (patch
->is_new
< 0) {
783 patch
->is_new
= !oldlines
;
785 patch
->old_name
= NULL
;
787 if (patch
->is_delete
< 0) {
788 patch
->is_delete
= !newlines
;
790 patch
->new_name
= NULL
;
793 if (patch
->is_new
!= !oldlines
)
794 return error("new file depends on old contents");
795 if (patch
->is_delete
!= !newlines
) {
797 return error("deleted file still has contents");
798 fprintf(stderr
, "** warning: file %s becomes empty but is not deleted\n", patch
->new_name
);
801 /* Parse the thing.. */
806 for (offset
= len
; size
> 0; offset
+= len
, size
-= len
, line
+= len
, linenr
++) {
807 if (!oldlines
&& !newlines
)
809 len
= linelen(line
, size
);
810 if (!len
|| line
[len
-1] != '\n')
825 * We know len is at least two, since we have a '+' and
826 * we checked that the last character was a '\n' above
828 if (isspace(line
[len
-2])) {
829 switch (new_whitespace
) {
832 case warn_on_whitespace
:
833 new_whitespace
= nowarn
; /* Just once */
834 error("Added whitespace at end of line at line %d", linenr
);
836 case error_on_whitespace
:
837 die("Added whitespace at end of line at line %d", linenr
);
844 /* We allow "\ No newline at end of file". Depending
845 * on locale settings when the patch was produced we
846 * don't know what this line looks like. The only
847 * thing we do know is that it begins with "\ ".
848 * Checking for 12 is just for sanity check -- any
849 * l10n of "\ No newline..." is at least that long.
852 if (len
< 12 || memcmp(line
, "\\ ", 2))
857 /* If a fragment ends with an incomplete line, we failed to include
858 * it in the above loop because we hit oldlines == newlines == 0
861 if (12 < size
&& !memcmp(line
, "\\ ", 2))
862 offset
+= linelen(line
, size
);
864 patch
->lines_added
+= added
;
865 patch
->lines_deleted
+= deleted
;
869 static int parse_single_patch(char *line
, unsigned long size
, struct patch
*patch
)
871 unsigned long offset
= 0;
872 struct fragment
**fragp
= &patch
->fragments
;
874 while (size
> 4 && !memcmp(line
, "@@ -", 4)) {
875 struct fragment
*fragment
;
878 fragment
= xmalloc(sizeof(*fragment
));
879 memset(fragment
, 0, sizeof(*fragment
));
880 len
= parse_fragment(line
, size
, patch
, fragment
);
882 die("corrupt patch at line %d", linenr
);
884 fragment
->patch
= line
;
885 fragment
->size
= len
;
888 fragp
= &fragment
->next
;
897 static inline int metadata_changes(struct patch
*patch
)
899 return patch
->is_rename
> 0 ||
900 patch
->is_copy
> 0 ||
903 (patch
->old_mode
&& patch
->new_mode
&&
904 patch
->old_mode
!= patch
->new_mode
);
907 static int parse_chunk(char *buffer
, unsigned long size
, struct patch
*patch
)
909 int hdrsize
, patchsize
;
910 int offset
= find_header(buffer
, size
, &hdrsize
, patch
);
915 patchsize
= parse_single_patch(buffer
+ offset
+ hdrsize
, size
- offset
- hdrsize
, patch
);
918 static const char *binhdr
[] = {
924 int hd
= hdrsize
+ offset
;
925 unsigned long llen
= linelen(buffer
+ hd
, size
- hd
);
927 if (!memcmp(" differ\n", buffer
+ hd
+ llen
- 8, 8))
928 for (i
= 0; binhdr
[i
]; i
++) {
929 int len
= strlen(binhdr
[i
]);
930 if (len
< size
- hd
&&
931 !memcmp(binhdr
[i
], buffer
+ hd
, len
)) {
932 patch
->is_binary
= 1;
937 /* Empty patch cannot be applied if:
938 * - it is a binary patch and we do not do binary_replace, or
939 * - text patch without metadata change
941 if ((apply
|| check
) &&
943 ? !allow_binary_replacement
944 : !metadata_changes(patch
)))
945 die("patch with only garbage at line %d", linenr
);
948 return offset
+ hdrsize
+ patchsize
;
951 static const char pluses
[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
952 static const char minuses
[]= "----------------------------------------------------------------------";
954 static void show_stats(struct patch
*patch
)
956 const char *prefix
= "";
957 char *name
= patch
->new_name
;
959 int len
, max
, add
, del
, total
;
962 name
= patch
->old_name
;
964 if (0 < (len
= quote_c_style(name
, NULL
, NULL
, 0))) {
965 qname
= xmalloc(len
+ 1);
966 quote_c_style(name
, qname
, NULL
, 0);
971 * "scale" the filename
982 slash
= strchr(name
, '/');
989 * scale the add/delete
995 add
= patch
->lines_added
;
996 del
= patch
->lines_deleted
;
999 if (max_change
> 0) {
1000 total
= (total
* max
+ max_change
/ 2) / max_change
;
1001 add
= (add
* max
+ max_change
/ 2) / max_change
;
1004 if (patch
->is_binary
)
1005 printf(" %s%-*s | Bin\n", prefix
, len
, name
);
1007 printf(" %s%-*s |%5d %.*s%.*s\n", prefix
,
1008 len
, name
, patch
->lines_added
+ patch
->lines_deleted
,
1009 add
, pluses
, del
, minuses
);
1014 static int read_old_data(struct stat
*st
, const char *path
, void *buf
, unsigned long size
)
1019 switch (st
->st_mode
& S_IFMT
) {
1021 return readlink(path
, buf
, size
);
1023 fd
= open(path
, O_RDONLY
);
1025 return error("unable to open %s", path
);
1028 int ret
= xread(fd
, buf
+ got
, size
- got
);
1041 static int find_offset(const char *buf
, unsigned long size
, const char *fragment
, unsigned long fragsize
, int line
)
1044 unsigned long start
, backwards
, forwards
;
1046 if (fragsize
> size
)
1051 unsigned long offset
= 0;
1053 while (offset
+ fragsize
<= size
) {
1054 if (buf
[offset
++] == '\n') {
1062 /* Exact line number? */
1063 if (!memcmp(buf
+ start
, fragment
, fragsize
))
1067 * There's probably some smart way to do this, but I'll leave
1068 * that to the smart and beautiful people. I'm simple and stupid.
1072 for (i
= 0; ; i
++) {
1079 if (forwards
+ fragsize
> size
)
1085 } while (backwards
&& buf
[backwards
-1] != '\n');
1088 while (forwards
+ fragsize
<= size
) {
1089 if (buf
[forwards
++] == '\n')
1095 if (try + fragsize
> size
)
1097 if (memcmp(buf
+ try, fragment
, fragsize
))
1106 * We should start searching forward and backward.
1111 struct buffer_desc
{
1114 unsigned long alloc
;
1117 static int apply_one_fragment(struct buffer_desc
*desc
, struct fragment
*frag
)
1119 char *buf
= desc
->buffer
;
1120 const char *patch
= frag
->patch
;
1121 int offset
, size
= frag
->size
;
1122 char *old
= xmalloc(size
);
1123 char *new = xmalloc(size
);
1124 int oldsize
= 0, newsize
= 0;
1127 int len
= linelen(patch
, size
);
1134 * "plen" is how much of the line we should use for
1135 * the actual patch data. Normally we just remove the
1136 * first character on the line, but if the line is
1137 * followed by "\ No newline", then we also remove the
1138 * last one (which is the newline, of course).
1141 if (len
< size
&& patch
[len
] == '\\')
1146 memcpy(old
+ oldsize
, patch
+ 1, plen
);
1150 /* Fall-through for ' ' */
1152 if (*patch
!= '+' || !no_add
) {
1153 memcpy(new + newsize
, patch
+ 1, plen
);
1157 case '@': case '\\':
1158 /* Ignore it, we already handled it */
1167 #ifdef NO_ACCURATE_DIFF
1168 if (oldsize
> 0 && old
[oldsize
- 1] == '\n' &&
1169 newsize
> 0 && new[newsize
- 1] == '\n') {
1175 offset
= find_offset(buf
, desc
->size
, old
, oldsize
, frag
->newpos
);
1177 int diff
= newsize
- oldsize
;
1178 unsigned long size
= desc
->size
+ diff
;
1179 unsigned long alloc
= desc
->alloc
;
1182 alloc
= size
+ 8192;
1183 desc
->alloc
= alloc
;
1184 buf
= xrealloc(buf
, alloc
);
1188 memmove(buf
+ offset
+ newsize
, buf
+ offset
+ oldsize
, size
- offset
- newsize
);
1189 memcpy(buf
+ offset
, new, newsize
);
1198 static int apply_fragments(struct buffer_desc
*desc
, struct patch
*patch
)
1200 struct fragment
*frag
= patch
->fragments
;
1201 const char *name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
1203 if (patch
->is_binary
) {
1204 unsigned char sha1
[20];
1206 if (!allow_binary_replacement
)
1207 return error("cannot apply binary patch to '%s' "
1208 "without --allow-binary-replacement",
1211 /* For safety, we require patch index line to contain
1212 * full 40-byte textual SHA1 for old and new, at least for now.
1214 if (strlen(patch
->old_sha1_prefix
) != 40 ||
1215 strlen(patch
->new_sha1_prefix
) != 40 ||
1216 get_sha1_hex(patch
->old_sha1_prefix
, sha1
) ||
1217 get_sha1_hex(patch
->new_sha1_prefix
, sha1
))
1218 return error("cannot apply binary patch to '%s' "
1219 "without full index line", name
);
1221 if (patch
->old_name
) {
1222 unsigned char hdr
[50];
1225 /* See if the old one matches what the patch
1228 write_sha1_file_prepare(desc
->buffer
, desc
->size
,
1229 "blob", sha1
, hdr
, &hdrlen
);
1230 if (strcmp(sha1_to_hex(sha1
), patch
->old_sha1_prefix
))
1231 return error("the patch applies to '%s' (%s), "
1232 "which does not match the "
1233 "current contents.",
1234 name
, sha1_to_hex(sha1
));
1237 /* Otherwise, the old one must be empty. */
1239 return error("the patch applies to an empty "
1240 "'%s' but it is not empty", name
);
1243 /* For now, we do not record post-image data in the patch,
1244 * and require the object already present in the recipient's
1249 desc
->alloc
= desc
->size
= 0;
1251 get_sha1_hex(patch
->new_sha1_prefix
, sha1
);
1253 if (memcmp(sha1
, null_sha1
, 20)) {
1257 desc
->buffer
= read_sha1_file(sha1
, type
, &size
);
1259 return error("the necessary postimage %s for "
1260 "'%s' does not exist",
1261 patch
->new_sha1_prefix
, name
);
1262 desc
->alloc
= desc
->size
= size
;
1269 if (apply_one_fragment(desc
, frag
) < 0)
1270 return error("patch failed: %s:%ld",
1271 name
, frag
->oldpos
);
1277 static int apply_data(struct patch
*patch
, struct stat
*st
)
1280 unsigned long size
, alloc
;
1281 struct buffer_desc desc
;
1286 if (patch
->old_name
) {
1288 alloc
= size
+ 8192;
1289 buf
= xmalloc(alloc
);
1290 if (read_old_data(st
, patch
->old_name
, buf
, alloc
) != size
)
1291 return error("read of %s failed", patch
->old_name
);
1297 if (apply_fragments(&desc
, patch
) < 0)
1299 patch
->result
= desc
.buffer
;
1300 patch
->resultsize
= desc
.size
;
1302 if (patch
->is_delete
&& patch
->resultsize
)
1303 return error("removal patch leaves file contents");
1308 static int check_patch(struct patch
*patch
)
1311 const char *old_name
= patch
->old_name
;
1312 const char *new_name
= patch
->new_name
;
1313 const char *name
= old_name
? old_name
: new_name
;
1317 int stat_ret
= lstat(old_name
, &st
);
1320 int pos
= cache_name_pos(old_name
, strlen(old_name
));
1322 return error("%s: does not exist in index",
1325 struct checkout costate
;
1326 if (errno
!= ENOENT
)
1327 return error("%s: %s", old_name
,
1330 costate
.base_dir
= "";
1331 costate
.base_dir_len
= 0;
1334 costate
.not_new
= 0;
1335 costate
.refresh_cache
= 1;
1336 if (checkout_entry(active_cache
[pos
],
1338 lstat(old_name
, &st
))
1342 changed
= ce_match_stat(active_cache
[pos
], &st
, 1);
1344 return error("%s: does not match index",
1347 else if (stat_ret
< 0)
1348 return error("%s: %s", old_name
, strerror(errno
));
1350 if (patch
->is_new
< 0)
1352 st
.st_mode
= ntohl(create_ce_mode(st
.st_mode
));
1353 if (!patch
->old_mode
)
1354 patch
->old_mode
= st
.st_mode
;
1355 if ((st
.st_mode
^ patch
->old_mode
) & S_IFMT
)
1356 return error("%s: wrong type", old_name
);
1357 if (st
.st_mode
!= patch
->old_mode
)
1358 fprintf(stderr
, "warning: %s has type %o, expected %o\n",
1359 old_name
, st
.st_mode
, patch
->old_mode
);
1362 if (new_name
&& (patch
->is_new
| patch
->is_rename
| patch
->is_copy
)) {
1363 if (check_index
&& cache_name_pos(new_name
, strlen(new_name
)) >= 0)
1364 return error("%s: already exists in index", new_name
);
1365 if (!lstat(new_name
, &st
))
1366 return error("%s: already exists in working directory", new_name
);
1367 if (errno
!= ENOENT
)
1368 return error("%s: %s", new_name
, strerror(errno
));
1369 if (!patch
->new_mode
) {
1371 patch
->new_mode
= S_IFREG
| 0644;
1373 patch
->new_mode
= patch
->old_mode
;
1377 if (new_name
&& old_name
) {
1378 int same
= !strcmp(old_name
, new_name
);
1379 if (!patch
->new_mode
)
1380 patch
->new_mode
= patch
->old_mode
;
1381 if ((patch
->old_mode
^ patch
->new_mode
) & S_IFMT
)
1382 return error("new mode (%o) of %s does not match old mode (%o)%s%s",
1383 patch
->new_mode
, new_name
, patch
->old_mode
,
1384 same
? "" : " of ", same
? "" : old_name
);
1387 if (apply_data(patch
, &st
) < 0)
1388 return error("%s: patch does not apply", name
);
1392 static int check_patch_list(struct patch
*patch
)
1396 for (;patch
; patch
= patch
->next
)
1397 error
|= check_patch(patch
);
1401 static inline int is_null_sha1(const unsigned char *sha1
)
1403 return !memcmp(sha1
, null_sha1
, 20);
1406 static void show_index_list(struct patch
*list
)
1408 struct patch
*patch
;
1410 /* Once we start supporting the reverse patch, it may be
1411 * worth showing the new sha1 prefix, but until then...
1413 for (patch
= list
; patch
; patch
= patch
->next
) {
1414 const unsigned char *sha1_ptr
;
1415 unsigned char sha1
[20];
1418 name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
1420 sha1_ptr
= null_sha1
;
1421 else if (get_sha1(patch
->old_sha1_prefix
, sha1
))
1422 die("sha1 information is lacking or useless (%s).",
1427 printf("%06o %s ",patch
->old_mode
, sha1_to_hex(sha1_ptr
));
1428 if (line_termination
&& quote_c_style(name
, NULL
, NULL
, 0))
1429 quote_c_style(name
, NULL
, stdout
, 0);
1431 fputs(name
, stdout
);
1432 putchar(line_termination
);
1436 static void stat_patch_list(struct patch
*patch
)
1438 int files
, adds
, dels
;
1440 for (files
= adds
= dels
= 0 ; patch
; patch
= patch
->next
) {
1442 adds
+= patch
->lines_added
;
1443 dels
+= patch
->lines_deleted
;
1447 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files
, adds
, dels
);
1450 static void numstat_patch_list(struct patch
*patch
)
1452 for ( ; patch
; patch
= patch
->next
) {
1454 name
= patch
->old_name
? patch
->old_name
: patch
->new_name
;
1455 printf("%d\t%d\t", patch
->lines_added
, patch
->lines_deleted
);
1456 if (line_termination
&& quote_c_style(name
, NULL
, NULL
, 0))
1457 quote_c_style(name
, NULL
, stdout
, 0);
1459 fputs(name
, stdout
);
1464 static void show_file_mode_name(const char *newdelete
, unsigned int mode
, const char *name
)
1467 printf(" %s mode %06o %s\n", newdelete
, mode
, name
);
1469 printf(" %s %s\n", newdelete
, name
);
1472 static void show_mode_change(struct patch
*p
, int show_name
)
1474 if (p
->old_mode
&& p
->new_mode
&& p
->old_mode
!= p
->new_mode
) {
1476 printf(" mode change %06o => %06o %s\n",
1477 p
->old_mode
, p
->new_mode
, p
->new_name
);
1479 printf(" mode change %06o => %06o\n",
1480 p
->old_mode
, p
->new_mode
);
1484 static void show_rename_copy(struct patch
*p
)
1486 const char *renamecopy
= p
->is_rename
? "rename" : "copy";
1487 const char *old
, *new;
1489 /* Find common prefix */
1493 const char *slash_old
, *slash_new
;
1494 slash_old
= strchr(old
, '/');
1495 slash_new
= strchr(new, '/');
1498 slash_old
- old
!= slash_new
- new ||
1499 memcmp(old
, new, slash_new
- new))
1501 old
= slash_old
+ 1;
1502 new = slash_new
+ 1;
1504 /* p->old_name thru old is the common prefix, and old and new
1505 * through the end of names are renames
1507 if (old
!= p
->old_name
)
1508 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy
,
1509 (int)(old
- p
->old_name
), p
->old_name
,
1510 old
, new, p
->score
);
1512 printf(" %s %s => %s (%d%%)\n", renamecopy
,
1513 p
->old_name
, p
->new_name
, p
->score
);
1514 show_mode_change(p
, 0);
1517 static void summary_patch_list(struct patch
*patch
)
1521 for (p
= patch
; p
; p
= p
->next
) {
1523 show_file_mode_name("create", p
->new_mode
, p
->new_name
);
1524 else if (p
->is_delete
)
1525 show_file_mode_name("delete", p
->old_mode
, p
->old_name
);
1527 if (p
->is_rename
|| p
->is_copy
)
1528 show_rename_copy(p
);
1531 printf(" rewrite %s (%d%%)\n",
1532 p
->new_name
, p
->score
);
1533 show_mode_change(p
, 0);
1536 show_mode_change(p
, 1);
1542 static void patch_stats(struct patch
*patch
)
1544 int lines
= patch
->lines_added
+ patch
->lines_deleted
;
1546 if (lines
> max_change
)
1548 if (patch
->old_name
) {
1549 int len
= quote_c_style(patch
->old_name
, NULL
, NULL
, 0);
1551 len
= strlen(patch
->old_name
);
1555 if (patch
->new_name
) {
1556 int len
= quote_c_style(patch
->new_name
, NULL
, NULL
, 0);
1558 len
= strlen(patch
->new_name
);
1564 static void remove_file(struct patch
*patch
)
1567 if (remove_file_from_cache(patch
->old_name
) < 0)
1568 die("unable to remove %s from index", patch
->old_name
);
1570 unlink(patch
->old_name
);
1573 static void add_index_file(const char *path
, unsigned mode
, void *buf
, unsigned long size
)
1576 struct cache_entry
*ce
;
1577 int namelen
= strlen(path
);
1578 unsigned ce_size
= cache_entry_size(namelen
);
1583 ce
= xmalloc(ce_size
);
1584 memset(ce
, 0, ce_size
);
1585 memcpy(ce
->name
, path
, namelen
);
1586 ce
->ce_mode
= create_ce_mode(mode
);
1587 ce
->ce_flags
= htons(namelen
);
1588 if (lstat(path
, &st
) < 0)
1589 die("unable to stat newly created file %s", path
);
1590 fill_stat_cache_info(ce
, &st
);
1591 if (write_sha1_file(buf
, size
, "blob", ce
->sha1
) < 0)
1592 die("unable to create backing store for newly created file %s", path
);
1593 if (add_cache_entry(ce
, ADD_CACHE_OK_TO_ADD
) < 0)
1594 die("unable to add cache entry for %s", path
);
1597 static int try_create_file(const char *path
, unsigned int mode
, const char *buf
, unsigned long size
)
1602 return symlink(buf
, path
);
1603 fd
= open(path
, O_CREAT
| O_EXCL
| O_WRONLY
, (mode
& 0100) ? 0777 : 0666);
1607 int written
= xwrite(fd
, buf
, size
);
1609 die("writing file %s: %s", path
, strerror(errno
));
1611 die("out of space writing file %s", path
);
1616 die("closing file %s: %s", path
, strerror(errno
));
1621 * We optimistically assume that the directories exist,
1622 * which is true 99% of the time anyway. If they don't,
1623 * we create them and try again.
1625 static void create_one_file(char *path
, unsigned mode
, const char *buf
, unsigned long size
)
1627 if (!try_create_file(path
, mode
, buf
, size
))
1630 if (errno
== ENOENT
) {
1631 if (safe_create_leading_directories(path
))
1633 if (!try_create_file(path
, mode
, buf
, size
))
1637 if (errno
== EEXIST
) {
1638 unsigned int nr
= getpid();
1641 const char *newpath
;
1642 newpath
= mkpath("%s~%u", path
, nr
);
1643 if (!try_create_file(newpath
, mode
, buf
, size
)) {
1644 if (!rename(newpath
, path
))
1649 if (errno
!= EEXIST
)
1654 die("unable to write file %s mode %o", path
, mode
);
1657 static void create_file(struct patch
*patch
)
1659 char *path
= patch
->new_name
;
1660 unsigned mode
= patch
->new_mode
;
1661 unsigned long size
= patch
->resultsize
;
1662 char *buf
= patch
->result
;
1665 mode
= S_IFREG
| 0644;
1666 create_one_file(path
, mode
, buf
, size
);
1667 add_index_file(path
, mode
, buf
, size
);
1670 static void write_out_one_result(struct patch
*patch
)
1672 if (patch
->is_delete
> 0) {
1676 if (patch
->is_new
> 0 || patch
->is_copy
) {
1681 * Rename or modification boils down to the same
1682 * thing: remove the old, write the new
1688 static void write_out_results(struct patch
*list
, int skipped_patch
)
1690 if (!list
&& !skipped_patch
)
1694 write_out_one_result(list
);
1699 static struct cache_file cache_file
;
1701 static struct excludes
{
1702 struct excludes
*next
;
1706 static int use_patch(struct patch
*p
)
1708 const char *pathname
= p
->new_name
? p
->new_name
: p
->old_name
;
1709 struct excludes
*x
= excludes
;
1711 if (fnmatch(x
->path
, pathname
, 0) == 0)
1715 if (0 < prefix_length
) {
1716 int pathlen
= strlen(pathname
);
1717 if (pathlen
<= prefix_length
||
1718 memcmp(prefix
, pathname
, prefix_length
))
1724 static int apply_patch(int fd
)
1727 unsigned long offset
, size
;
1728 char *buffer
= read_patch_file(fd
, &size
);
1729 struct patch
*list
= NULL
, **listp
= &list
;
1730 int skipped_patch
= 0;
1736 struct patch
*patch
;
1739 patch
= xmalloc(sizeof(*patch
));
1740 memset(patch
, 0, sizeof(*patch
));
1741 nr
= parse_chunk(buffer
+ offset
, size
, patch
);
1744 if (use_patch(patch
)) {
1747 listp
= &patch
->next
;
1749 /* perhaps free it a bit better? */
1758 write_index
= check_index
&& apply
;
1760 newfd
= hold_index_file_for_update(&cache_file
, get_index_file());
1762 if (read_cache() < 0)
1763 die("unable to read index file");
1766 if ((check
|| apply
) && check_patch_list(list
) < 0)
1770 write_out_results(list
, skipped_patch
);
1773 if (write_cache(newfd
, active_cache
, active_nr
) ||
1774 commit_index_file(&cache_file
))
1775 die("Unable to write new cachefile");
1778 if (show_index_info
)
1779 show_index_list(list
);
1782 stat_patch_list(list
);
1785 numstat_patch_list(list
);
1788 summary_patch_list(list
);
1794 int main(int argc
, char **argv
)
1799 for (i
= 1; i
< argc
; i
++) {
1800 const char *arg
= argv
[i
];
1803 if (!strcmp(arg
, "-")) {
1808 if (!strncmp(arg
, "--exclude=", 10)) {
1809 struct excludes
*x
= xmalloc(sizeof(*x
));
1815 if (!strncmp(arg
, "-p", 2)) {
1816 p_value
= atoi(arg
+ 2);
1819 if (!strcmp(arg
, "--no-add")) {
1823 if (!strcmp(arg
, "--stat")) {
1828 if (!strcmp(arg
, "--allow-binary-replacement")) {
1829 allow_binary_replacement
= 1;
1832 if (!strcmp(arg
, "--numstat")) {
1837 if (!strcmp(arg
, "--summary")) {
1842 if (!strcmp(arg
, "--check")) {
1847 if (!strcmp(arg
, "--index")) {
1851 if (!strcmp(arg
, "--apply")) {
1855 if (!strcmp(arg
, "--index-info")) {
1857 show_index_info
= 1;
1860 if (!strcmp(arg
, "-z")) {
1861 line_termination
= 0;
1864 if (!strncmp(arg
, "--whitespace=", 13)) {
1865 if (strcmp(arg
+13, "warn")) {
1866 new_whitespace
= warn_on_whitespace
;
1869 if (strcmp(arg
+13, "error")) {
1870 new_whitespace
= error_on_whitespace
;
1873 die("unrecognixed whitespace option '%s'", arg
+13);
1876 if (check_index
&& prefix_length
< 0) {
1877 prefix
= setup_git_directory();
1878 prefix_length
= prefix
? strlen(prefix
) : 0;
1879 git_config(git_default_config
);
1881 if (0 < prefix_length
)
1882 arg
= prefix_filename(prefix
, prefix_length
, arg
);
1884 fd
= open(arg
, O_RDONLY
);