git-send-email: Add --thread option
[git/aroben.git] / builtin-apply.c
blobc6f736c14e4840bde2efd204e7f88a3556e9eed9
1 /*
2 * apply.c
4 * Copyright (C) Linus Torvalds, 2005
6 * This applies patches on top of some (arbitrary) version of the SCM.
8 */
9 #include "cache.h"
10 #include "cache-tree.h"
11 #include "quote.h"
12 #include "blob.h"
13 #include "delta.h"
14 #include "builtin.h"
17 * --check turns on checking that the working tree matches the
18 * files that are being modified, but doesn't apply the patch
19 * --stat does just a diffstat, and doesn't actually apply
20 * --numstat does numeric diffstat, and doesn't actually apply
21 * --index-info shows the old and new index info for paths if available.
22 * --index updates the cache as well.
23 * --cached updates only the cache without ever touching the working tree.
25 static const char *prefix;
26 static int prefix_length = -1;
27 static int newfd = -1;
29 static int unidiff_zero;
30 static int p_value = 1;
31 static int p_value_known;
32 static int check_index;
33 static int update_index;
34 static int cached;
35 static int diffstat;
36 static int numstat;
37 static int summary;
38 static int check;
39 static int apply = 1;
40 static int apply_in_reverse;
41 static int apply_with_reject;
42 static int apply_verbosely;
43 static int no_add;
44 static int show_index_info;
45 static int line_termination = '\n';
46 static unsigned long p_context = ULONG_MAX;
47 static const char apply_usage[] =
48 "git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--cached] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [--reverse] [--reject] [--verbose] [-z] [-pNUM] [-CNUM] [--whitespace=<nowarn|warn|error|error-all|strip>] <patch>...";
50 static enum whitespace_eol {
51 nowarn_whitespace,
52 warn_on_whitespace,
53 error_on_whitespace,
54 strip_whitespace,
55 } new_whitespace = warn_on_whitespace;
56 static int whitespace_error;
57 static int squelch_whitespace_errors = 5;
58 static int applied_after_fixing_ws;
59 static const char *patch_input_file;
61 static void parse_whitespace_option(const char *option)
63 if (!option) {
64 new_whitespace = warn_on_whitespace;
65 return;
67 if (!strcmp(option, "warn")) {
68 new_whitespace = warn_on_whitespace;
69 return;
71 if (!strcmp(option, "nowarn")) {
72 new_whitespace = nowarn_whitespace;
73 return;
75 if (!strcmp(option, "error")) {
76 new_whitespace = error_on_whitespace;
77 return;
79 if (!strcmp(option, "error-all")) {
80 new_whitespace = error_on_whitespace;
81 squelch_whitespace_errors = 0;
82 return;
84 if (!strcmp(option, "strip")) {
85 new_whitespace = strip_whitespace;
86 return;
88 die("unrecognized whitespace option '%s'", option);
91 static void set_default_whitespace_mode(const char *whitespace_option)
93 if (!whitespace_option && !apply_default_whitespace) {
94 new_whitespace = (apply
95 ? warn_on_whitespace
96 : nowarn_whitespace);
101 * For "diff-stat" like behaviour, we keep track of the biggest change
102 * we've seen, and the longest filename. That allows us to do simple
103 * scaling.
105 static int max_change, max_len;
108 * Various "current state", notably line numbers and what
109 * file (and how) we're patching right now.. The "is_xxxx"
110 * things are flags, where -1 means "don't know yet".
112 static int linenr = 1;
115 * This represents one "hunk" from a patch, starting with
116 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The
117 * patch text is pointed at by patch, and its byte length
118 * is stored in size. leading and trailing are the number
119 * of context lines.
121 struct fragment {
122 unsigned long leading, trailing;
123 unsigned long oldpos, oldlines;
124 unsigned long newpos, newlines;
125 const char *patch;
126 int size;
127 int rejected;
128 struct fragment *next;
132 * When dealing with a binary patch, we reuse "leading" field
133 * to store the type of the binary hunk, either deflated "delta"
134 * or deflated "literal".
136 #define binary_patch_method leading
137 #define BINARY_DELTA_DEFLATED 1
138 #define BINARY_LITERAL_DEFLATED 2
140 struct patch {
141 char *new_name, *old_name, *def_name;
142 unsigned int old_mode, new_mode;
143 int is_new, is_delete; /* -1 = unknown, 0 = false, 1 = true */
144 int rejected;
145 unsigned long deflate_origlen;
146 int lines_added, lines_deleted;
147 int score;
148 unsigned int is_toplevel_relative:1;
149 unsigned int inaccurate_eof:1;
150 unsigned int is_binary:1;
151 unsigned int is_copy:1;
152 unsigned int is_rename:1;
153 struct fragment *fragments;
154 char *result;
155 unsigned long resultsize;
156 char old_sha1_prefix[41];
157 char new_sha1_prefix[41];
158 struct patch *next;
161 static void say_patch_name(FILE *output, const char *pre, struct patch *patch, const char *post)
163 fputs(pre, output);
164 if (patch->old_name && patch->new_name &&
165 strcmp(patch->old_name, patch->new_name)) {
166 write_name_quoted(NULL, 0, patch->old_name, 1, output);
167 fputs(" => ", output);
168 write_name_quoted(NULL, 0, patch->new_name, 1, output);
170 else {
171 const char *n = patch->new_name;
172 if (!n)
173 n = patch->old_name;
174 write_name_quoted(NULL, 0, n, 1, output);
176 fputs(post, output);
179 #define CHUNKSIZE (8192)
180 #define SLOP (16)
182 static void *read_patch_file(int fd, unsigned long *sizep)
184 unsigned long size = 0, alloc = CHUNKSIZE;
185 void *buffer = xmalloc(alloc);
187 for (;;) {
188 ssize_t nr = alloc - size;
189 if (nr < 1024) {
190 alloc += CHUNKSIZE;
191 buffer = xrealloc(buffer, alloc);
192 nr = alloc - size;
194 nr = xread(fd, (char *) buffer + size, nr);
195 if (!nr)
196 break;
197 if (nr < 0)
198 die("git-apply: read returned %s", strerror(errno));
199 size += nr;
201 *sizep = size;
204 * Make sure that we have some slop in the buffer
205 * so that we can do speculative "memcmp" etc, and
206 * see to it that it is NUL-filled.
208 if (alloc < size + SLOP)
209 buffer = xrealloc(buffer, size + SLOP);
210 memset((char *) buffer + size, 0, SLOP);
211 return buffer;
214 static unsigned long linelen(const char *buffer, unsigned long size)
216 unsigned long len = 0;
217 while (size--) {
218 len++;
219 if (*buffer++ == '\n')
220 break;
222 return len;
225 static int is_dev_null(const char *str)
227 return !memcmp("/dev/null", str, 9) && isspace(str[9]);
230 #define TERM_SPACE 1
231 #define TERM_TAB 2
233 static int name_terminate(const char *name, int namelen, int c, int terminate)
235 if (c == ' ' && !(terminate & TERM_SPACE))
236 return 0;
237 if (c == '\t' && !(terminate & TERM_TAB))
238 return 0;
240 return 1;
243 static char *find_name(const char *line, char *def, int p_value, int terminate)
245 int len;
246 const char *start = line;
247 char *name;
249 if (*line == '"') {
250 /* Proposed "new-style" GNU patch/diff format; see
251 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
253 name = unquote_c_style(line, NULL);
254 if (name) {
255 char *cp = name;
256 while (p_value) {
257 cp = strchr(name, '/');
258 if (!cp)
259 break;
260 cp++;
261 p_value--;
263 if (cp) {
264 /* name can later be freed, so we need
265 * to memmove, not just return cp
267 memmove(name, cp, strlen(cp) + 1);
268 free(def);
269 return name;
271 else {
272 free(name);
273 name = NULL;
278 for (;;) {
279 char c = *line;
281 if (isspace(c)) {
282 if (c == '\n')
283 break;
284 if (name_terminate(start, line-start, c, terminate))
285 break;
287 line++;
288 if (c == '/' && !--p_value)
289 start = line;
291 if (!start)
292 return def;
293 len = line - start;
294 if (!len)
295 return def;
298 * Generally we prefer the shorter name, especially
299 * if the other one is just a variation of that with
300 * something else tacked on to the end (ie "file.orig"
301 * or "file~").
303 if (def) {
304 int deflen = strlen(def);
305 if (deflen < len && !strncmp(start, def, deflen))
306 return def;
309 name = xmalloc(len + 1);
310 memcpy(name, start, len);
311 name[len] = 0;
312 free(def);
313 return name;
316 static int count_slashes(const char *cp)
318 int cnt = 0;
319 char ch;
321 while ((ch = *cp++))
322 if (ch == '/')
323 cnt++;
324 return cnt;
328 * Given the string after "--- " or "+++ ", guess the appropriate
329 * p_value for the given patch.
331 static int guess_p_value(const char *nameline)
333 char *name, *cp;
334 int val = -1;
336 if (is_dev_null(nameline))
337 return -1;
338 name = find_name(nameline, NULL, 0, TERM_SPACE | TERM_TAB);
339 if (!name)
340 return -1;
341 cp = strchr(name, '/');
342 if (!cp)
343 val = 0;
344 else if (prefix) {
346 * Does it begin with "a/$our-prefix" and such? Then this is
347 * very likely to apply to our directory.
349 if (!strncmp(name, prefix, prefix_length))
350 val = count_slashes(prefix);
351 else {
352 cp++;
353 if (!strncmp(cp, prefix, prefix_length))
354 val = count_slashes(prefix) + 1;
357 free(name);
358 return val;
362 * Get the name etc info from the --/+++ lines of a traditional patch header
364 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
365 * files, we can happily check the index for a match, but for creating a
366 * new file we should try to match whatever "patch" does. I have no idea.
368 static void parse_traditional_patch(const char *first, const char *second, struct patch *patch)
370 char *name;
372 first += 4; /* skip "--- " */
373 second += 4; /* skip "+++ " */
374 if (!p_value_known) {
375 int p, q;
376 p = guess_p_value(first);
377 q = guess_p_value(second);
378 if (p < 0) p = q;
379 if (0 <= p && p == q) {
380 p_value = p;
381 p_value_known = 1;
384 if (is_dev_null(first)) {
385 patch->is_new = 1;
386 patch->is_delete = 0;
387 name = find_name(second, NULL, p_value, TERM_SPACE | TERM_TAB);
388 patch->new_name = name;
389 } else if (is_dev_null(second)) {
390 patch->is_new = 0;
391 patch->is_delete = 1;
392 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
393 patch->old_name = name;
394 } else {
395 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
396 name = find_name(second, name, p_value, TERM_SPACE | TERM_TAB);
397 patch->old_name = patch->new_name = name;
399 if (!name)
400 die("unable to find filename in patch at line %d", linenr);
403 static int gitdiff_hdrend(const char *line, struct patch *patch)
405 return -1;
409 * We're anal about diff header consistency, to make
410 * sure that we don't end up having strange ambiguous
411 * patches floating around.
413 * As a result, gitdiff_{old|new}name() will check
414 * their names against any previous information, just
415 * to make sure..
417 static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, const char *oldnew)
419 if (!orig_name && !isnull)
420 return find_name(line, NULL, p_value, TERM_TAB);
422 if (orig_name) {
423 int len;
424 const char *name;
425 char *another;
426 name = orig_name;
427 len = strlen(name);
428 if (isnull)
429 die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr);
430 another = find_name(line, NULL, p_value, TERM_TAB);
431 if (!another || memcmp(another, name, len))
432 die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr);
433 free(another);
434 return orig_name;
436 else {
437 /* expect "/dev/null" */
438 if (memcmp("/dev/null", line, 9) || line[9] != '\n')
439 die("git-apply: bad git-diff - expected /dev/null on line %d", linenr);
440 return NULL;
444 static int gitdiff_oldname(const char *line, struct patch *patch)
446 patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name, "old");
447 return 0;
450 static int gitdiff_newname(const char *line, struct patch *patch)
452 patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name, "new");
453 return 0;
456 static int gitdiff_oldmode(const char *line, struct patch *patch)
458 patch->old_mode = strtoul(line, NULL, 8);
459 return 0;
462 static int gitdiff_newmode(const char *line, struct patch *patch)
464 patch->new_mode = strtoul(line, NULL, 8);
465 return 0;
468 static int gitdiff_delete(const char *line, struct patch *patch)
470 patch->is_delete = 1;
471 patch->old_name = patch->def_name;
472 return gitdiff_oldmode(line, patch);
475 static int gitdiff_newfile(const char *line, struct patch *patch)
477 patch->is_new = 1;
478 patch->new_name = patch->def_name;
479 return gitdiff_newmode(line, patch);
482 static int gitdiff_copysrc(const char *line, struct patch *patch)
484 patch->is_copy = 1;
485 patch->old_name = find_name(line, NULL, 0, 0);
486 return 0;
489 static int gitdiff_copydst(const char *line, struct patch *patch)
491 patch->is_copy = 1;
492 patch->new_name = find_name(line, NULL, 0, 0);
493 return 0;
496 static int gitdiff_renamesrc(const char *line, struct patch *patch)
498 patch->is_rename = 1;
499 patch->old_name = find_name(line, NULL, 0, 0);
500 return 0;
503 static int gitdiff_renamedst(const char *line, struct patch *patch)
505 patch->is_rename = 1;
506 patch->new_name = find_name(line, NULL, 0, 0);
507 return 0;
510 static int gitdiff_similarity(const char *line, struct patch *patch)
512 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
513 patch->score = 0;
514 return 0;
517 static int gitdiff_dissimilarity(const char *line, struct patch *patch)
519 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
520 patch->score = 0;
521 return 0;
524 static int gitdiff_index(const char *line, struct patch *patch)
526 /* index line is N hexadecimal, "..", N hexadecimal,
527 * and optional space with octal mode.
529 const char *ptr, *eol;
530 int len;
532 ptr = strchr(line, '.');
533 if (!ptr || ptr[1] != '.' || 40 < ptr - line)
534 return 0;
535 len = ptr - line;
536 memcpy(patch->old_sha1_prefix, line, len);
537 patch->old_sha1_prefix[len] = 0;
539 line = ptr + 2;
540 ptr = strchr(line, ' ');
541 eol = strchr(line, '\n');
543 if (!ptr || eol < ptr)
544 ptr = eol;
545 len = ptr - line;
547 if (40 < len)
548 return 0;
549 memcpy(patch->new_sha1_prefix, line, len);
550 patch->new_sha1_prefix[len] = 0;
551 if (*ptr == ' ')
552 patch->new_mode = patch->old_mode = strtoul(ptr+1, NULL, 8);
553 return 0;
557 * This is normal for a diff that doesn't change anything: we'll fall through
558 * into the next diff. Tell the parser to break out.
560 static int gitdiff_unrecognized(const char *line, struct patch *patch)
562 return -1;
565 static const char *stop_at_slash(const char *line, int llen)
567 int i;
569 for (i = 0; i < llen; i++) {
570 int ch = line[i];
571 if (ch == '/')
572 return line + i;
574 return NULL;
577 /* This is to extract the same name that appears on "diff --git"
578 * line. We do not find and return anything if it is a rename
579 * patch, and it is OK because we will find the name elsewhere.
580 * We need to reliably find name only when it is mode-change only,
581 * creation or deletion of an empty file. In any of these cases,
582 * both sides are the same name under a/ and b/ respectively.
584 static char *git_header_name(char *line, int llen)
586 int len;
587 const char *name;
588 const char *second = NULL;
590 line += strlen("diff --git ");
591 llen -= strlen("diff --git ");
593 if (*line == '"') {
594 const char *cp;
595 char *first = unquote_c_style(line, &second);
596 if (!first)
597 return NULL;
599 /* advance to the first slash */
600 cp = stop_at_slash(first, strlen(first));
601 if (!cp || cp == first) {
602 /* we do not accept absolute paths */
603 free_first_and_fail:
604 free(first);
605 return NULL;
607 len = strlen(cp+1);
608 memmove(first, cp+1, len+1); /* including NUL */
610 /* second points at one past closing dq of name.
611 * find the second name.
613 while ((second < line + llen) && isspace(*second))
614 second++;
616 if (line + llen <= second)
617 goto free_first_and_fail;
618 if (*second == '"') {
619 char *sp = unquote_c_style(second, NULL);
620 if (!sp)
621 goto free_first_and_fail;
622 cp = stop_at_slash(sp, strlen(sp));
623 if (!cp || cp == sp) {
624 free_both_and_fail:
625 free(sp);
626 goto free_first_and_fail;
628 /* They must match, otherwise ignore */
629 if (strcmp(cp+1, first))
630 goto free_both_and_fail;
631 free(sp);
632 return first;
635 /* unquoted second */
636 cp = stop_at_slash(second, line + llen - second);
637 if (!cp || cp == second)
638 goto free_first_and_fail;
639 cp++;
640 if (line + llen - cp != len + 1 ||
641 memcmp(first, cp, len))
642 goto free_first_and_fail;
643 return first;
646 /* unquoted first name */
647 name = stop_at_slash(line, llen);
648 if (!name || name == line)
649 return NULL;
651 name++;
653 /* since the first name is unquoted, a dq if exists must be
654 * the beginning of the second name.
656 for (second = name; second < line + llen; second++) {
657 if (*second == '"') {
658 const char *cp = second;
659 const char *np;
660 char *sp = unquote_c_style(second, NULL);
662 if (!sp)
663 return NULL;
664 np = stop_at_slash(sp, strlen(sp));
665 if (!np || np == sp) {
666 free_second_and_fail:
667 free(sp);
668 return NULL;
670 np++;
671 len = strlen(np);
672 if (len < cp - name &&
673 !strncmp(np, name, len) &&
674 isspace(name[len])) {
675 /* Good */
676 memmove(sp, np, len + 1);
677 return sp;
679 goto free_second_and_fail;
684 * Accept a name only if it shows up twice, exactly the same
685 * form.
687 for (len = 0 ; ; len++) {
688 switch (name[len]) {
689 default:
690 continue;
691 case '\n':
692 return NULL;
693 case '\t': case ' ':
694 second = name+len;
695 for (;;) {
696 char c = *second++;
697 if (c == '\n')
698 return NULL;
699 if (c == '/')
700 break;
702 if (second[len] == '\n' && !memcmp(name, second, len)) {
703 char *ret = xmalloc(len + 1);
704 memcpy(ret, name, len);
705 ret[len] = 0;
706 return ret;
710 return NULL;
713 /* Verify that we recognize the lines following a git header */
714 static int parse_git_header(char *line, int len, unsigned int size, struct patch *patch)
716 unsigned long offset;
718 /* A git diff has explicit new/delete information, so we don't guess */
719 patch->is_new = 0;
720 patch->is_delete = 0;
723 * Some things may not have the old name in the
724 * rest of the headers anywhere (pure mode changes,
725 * or removing or adding empty files), so we get
726 * the default name from the header.
728 patch->def_name = git_header_name(line, len);
730 line += len;
731 size -= len;
732 linenr++;
733 for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {
734 static const struct opentry {
735 const char *str;
736 int (*fn)(const char *, struct patch *);
737 } optable[] = {
738 { "@@ -", gitdiff_hdrend },
739 { "--- ", gitdiff_oldname },
740 { "+++ ", gitdiff_newname },
741 { "old mode ", gitdiff_oldmode },
742 { "new mode ", gitdiff_newmode },
743 { "deleted file mode ", gitdiff_delete },
744 { "new file mode ", gitdiff_newfile },
745 { "copy from ", gitdiff_copysrc },
746 { "copy to ", gitdiff_copydst },
747 { "rename old ", gitdiff_renamesrc },
748 { "rename new ", gitdiff_renamedst },
749 { "rename from ", gitdiff_renamesrc },
750 { "rename to ", gitdiff_renamedst },
751 { "similarity index ", gitdiff_similarity },
752 { "dissimilarity index ", gitdiff_dissimilarity },
753 { "index ", gitdiff_index },
754 { "", gitdiff_unrecognized },
756 int i;
758 len = linelen(line, size);
759 if (!len || line[len-1] != '\n')
760 break;
761 for (i = 0; i < ARRAY_SIZE(optable); i++) {
762 const struct opentry *p = optable + i;
763 int oplen = strlen(p->str);
764 if (len < oplen || memcmp(p->str, line, oplen))
765 continue;
766 if (p->fn(line + oplen, patch) < 0)
767 return offset;
768 break;
772 return offset;
775 static int parse_num(const char *line, unsigned long *p)
777 char *ptr;
779 if (!isdigit(*line))
780 return 0;
781 *p = strtoul(line, &ptr, 10);
782 return ptr - line;
785 static int parse_range(const char *line, int len, int offset, const char *expect,
786 unsigned long *p1, unsigned long *p2)
788 int digits, ex;
790 if (offset < 0 || offset >= len)
791 return -1;
792 line += offset;
793 len -= offset;
795 digits = parse_num(line, p1);
796 if (!digits)
797 return -1;
799 offset += digits;
800 line += digits;
801 len -= digits;
803 *p2 = 1;
804 if (*line == ',') {
805 digits = parse_num(line+1, p2);
806 if (!digits)
807 return -1;
809 offset += digits+1;
810 line += digits+1;
811 len -= digits+1;
814 ex = strlen(expect);
815 if (ex > len)
816 return -1;
817 if (memcmp(line, expect, ex))
818 return -1;
820 return offset + ex;
824 * Parse a unified diff fragment header of the
825 * form "@@ -a,b +c,d @@"
827 static int parse_fragment_header(char *line, int len, struct fragment *fragment)
829 int offset;
831 if (!len || line[len-1] != '\n')
832 return -1;
834 /* Figure out the number of lines in a fragment */
835 offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);
836 offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);
838 return offset;
841 static int find_header(char *line, unsigned long size, int *hdrsize, struct patch *patch)
843 unsigned long offset, len;
845 patch->is_toplevel_relative = 0;
846 patch->is_rename = patch->is_copy = 0;
847 patch->is_new = patch->is_delete = -1;
848 patch->old_mode = patch->new_mode = 0;
849 patch->old_name = patch->new_name = NULL;
850 for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {
851 unsigned long nextlen;
853 len = linelen(line, size);
854 if (!len)
855 break;
857 /* Testing this early allows us to take a few shortcuts.. */
858 if (len < 6)
859 continue;
862 * Make sure we don't find any unconnected patch fragments.
863 * That's a sign that we didn't find a header, and that a
864 * patch has become corrupted/broken up.
866 if (!memcmp("@@ -", line, 4)) {
867 struct fragment dummy;
868 if (parse_fragment_header(line, len, &dummy) < 0)
869 continue;
870 die("patch fragment without header at line %d: %.*s",
871 linenr, (int)len-1, line);
874 if (size < len + 6)
875 break;
878 * Git patch? It might not have a real patch, just a rename
879 * or mode change, so we handle that specially
881 if (!memcmp("diff --git ", line, 11)) {
882 int git_hdr_len = parse_git_header(line, len, size, patch);
883 if (git_hdr_len <= len)
884 continue;
885 if (!patch->old_name && !patch->new_name) {
886 if (!patch->def_name)
887 die("git diff header lacks filename information (line %d)", linenr);
888 patch->old_name = patch->new_name = patch->def_name;
890 patch->is_toplevel_relative = 1;
891 *hdrsize = git_hdr_len;
892 return offset;
895 /** --- followed by +++ ? */
896 if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4))
897 continue;
900 * We only accept unified patches, so we want it to
901 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
902 * minimum
904 nextlen = linelen(line + len, size - len);
905 if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))
906 continue;
908 /* Ok, we'll consider it a patch */
909 parse_traditional_patch(line, line+len, patch);
910 *hdrsize = len + nextlen;
911 linenr += 2;
912 return offset;
914 return -1;
917 static void check_whitespace(const char *line, int len)
919 const char *err = "Adds trailing whitespace";
920 int seen_space = 0;
921 int i;
924 * We know len is at least two, since we have a '+' and we
925 * checked that the last character was a '\n' before calling
926 * this function. That is, an addition of an empty line would
927 * check the '+' here. Sneaky...
929 if (isspace(line[len-2]))
930 goto error;
933 * Make sure that there is no space followed by a tab in
934 * indentation.
936 err = "Space in indent is followed by a tab";
937 for (i = 1; i < len; i++) {
938 if (line[i] == '\t') {
939 if (seen_space)
940 goto error;
942 else if (line[i] == ' ')
943 seen_space = 1;
944 else
945 break;
947 return;
949 error:
950 whitespace_error++;
951 if (squelch_whitespace_errors &&
952 squelch_whitespace_errors < whitespace_error)
954 else
955 fprintf(stderr, "%s.\n%s:%d:%.*s\n",
956 err, patch_input_file, linenr, len-2, line+1);
961 * Parse a unified diff. Note that this really needs to parse each
962 * fragment separately, since the only way to know the difference
963 * between a "---" that is part of a patch, and a "---" that starts
964 * the next patch is to look at the line counts..
966 static int parse_fragment(char *line, unsigned long size, struct patch *patch, struct fragment *fragment)
968 int added, deleted;
969 int len = linelen(line, size), offset;
970 unsigned long oldlines, newlines;
971 unsigned long leading, trailing;
973 offset = parse_fragment_header(line, len, fragment);
974 if (offset < 0)
975 return -1;
976 oldlines = fragment->oldlines;
977 newlines = fragment->newlines;
978 leading = 0;
979 trailing = 0;
981 /* Parse the thing.. */
982 line += len;
983 size -= len;
984 linenr++;
985 added = deleted = 0;
986 for (offset = len;
987 0 < size;
988 offset += len, size -= len, line += len, linenr++) {
989 if (!oldlines && !newlines)
990 break;
991 len = linelen(line, size);
992 if (!len || line[len-1] != '\n')
993 return -1;
994 switch (*line) {
995 default:
996 return -1;
997 case '\n': /* newer GNU diff, an empty context line */
998 case ' ':
999 oldlines--;
1000 newlines--;
1001 if (!deleted && !added)
1002 leading++;
1003 trailing++;
1004 break;
1005 case '-':
1006 deleted++;
1007 oldlines--;
1008 trailing = 0;
1009 break;
1010 case '+':
1011 if (new_whitespace != nowarn_whitespace)
1012 check_whitespace(line, len);
1013 added++;
1014 newlines--;
1015 trailing = 0;
1016 break;
1018 /* We allow "\ No newline at end of file". Depending
1019 * on locale settings when the patch was produced we
1020 * don't know what this line looks like. The only
1021 * thing we do know is that it begins with "\ ".
1022 * Checking for 12 is just for sanity check -- any
1023 * l10n of "\ No newline..." is at least that long.
1025 case '\\':
1026 if (len < 12 || memcmp(line, "\\ ", 2))
1027 return -1;
1028 break;
1031 if (oldlines || newlines)
1032 return -1;
1033 fragment->leading = leading;
1034 fragment->trailing = trailing;
1036 /* If a fragment ends with an incomplete line, we failed to include
1037 * it in the above loop because we hit oldlines == newlines == 0
1038 * before seeing it.
1040 if (12 < size && !memcmp(line, "\\ ", 2))
1041 offset += linelen(line, size);
1043 patch->lines_added += added;
1044 patch->lines_deleted += deleted;
1046 if (0 < patch->is_new && oldlines)
1047 return error("new file depends on old contents");
1048 if (0 < patch->is_delete && newlines)
1049 return error("deleted file still has contents");
1050 return offset;
1053 static int parse_single_patch(char *line, unsigned long size, struct patch *patch)
1055 unsigned long offset = 0;
1056 unsigned long oldlines = 0, newlines = 0, context = 0;
1057 struct fragment **fragp = &patch->fragments;
1059 while (size > 4 && !memcmp(line, "@@ -", 4)) {
1060 struct fragment *fragment;
1061 int len;
1063 fragment = xcalloc(1, sizeof(*fragment));
1064 len = parse_fragment(line, size, patch, fragment);
1065 if (len <= 0)
1066 die("corrupt patch at line %d", linenr);
1067 fragment->patch = line;
1068 fragment->size = len;
1069 oldlines += fragment->oldlines;
1070 newlines += fragment->newlines;
1071 context += fragment->leading + fragment->trailing;
1073 *fragp = fragment;
1074 fragp = &fragment->next;
1076 offset += len;
1077 line += len;
1078 size -= len;
1082 * If something was removed (i.e. we have old-lines) it cannot
1083 * be creation, and if something was added it cannot be
1084 * deletion. However, the reverse is not true; --unified=0
1085 * patches that only add are not necessarily creation even
1086 * though they do not have any old lines, and ones that only
1087 * delete are not necessarily deletion.
1089 * Unfortunately, a real creation/deletion patch do _not_ have
1090 * any context line by definition, so we cannot safely tell it
1091 * apart with --unified=0 insanity. At least if the patch has
1092 * more than one hunk it is not creation or deletion.
1094 if (patch->is_new < 0 &&
1095 (oldlines || (patch->fragments && patch->fragments->next)))
1096 patch->is_new = 0;
1097 if (patch->is_delete < 0 &&
1098 (newlines || (patch->fragments && patch->fragments->next)))
1099 patch->is_delete = 0;
1100 if (!unidiff_zero || context) {
1101 /* If the user says the patch is not generated with
1102 * --unified=0, or if we have seen context lines,
1103 * then not having oldlines means the patch is creation,
1104 * and not having newlines means the patch is deletion.
1106 if (patch->is_new < 0 && !oldlines) {
1107 patch->is_new = 1;
1108 patch->old_name = NULL;
1110 if (patch->is_delete < 0 && !newlines) {
1111 patch->is_delete = 1;
1112 patch->new_name = NULL;
1116 if (0 < patch->is_new && oldlines)
1117 die("new file %s depends on old contents", patch->new_name);
1118 if (0 < patch->is_delete && newlines)
1119 die("deleted file %s still has contents", patch->old_name);
1120 if (!patch->is_delete && !newlines && context)
1121 fprintf(stderr, "** warning: file %s becomes empty but "
1122 "is not deleted\n", patch->new_name);
1124 return offset;
1127 static inline int metadata_changes(struct patch *patch)
1129 return patch->is_rename > 0 ||
1130 patch->is_copy > 0 ||
1131 patch->is_new > 0 ||
1132 patch->is_delete ||
1133 (patch->old_mode && patch->new_mode &&
1134 patch->old_mode != patch->new_mode);
1137 static char *inflate_it(const void *data, unsigned long size,
1138 unsigned long inflated_size)
1140 z_stream stream;
1141 void *out;
1142 int st;
1144 memset(&stream, 0, sizeof(stream));
1146 stream.next_in = (unsigned char *)data;
1147 stream.avail_in = size;
1148 stream.next_out = out = xmalloc(inflated_size);
1149 stream.avail_out = inflated_size;
1150 inflateInit(&stream);
1151 st = inflate(&stream, Z_FINISH);
1152 if ((st != Z_STREAM_END) || stream.total_out != inflated_size) {
1153 free(out);
1154 return NULL;
1156 return out;
1159 static struct fragment *parse_binary_hunk(char **buf_p,
1160 unsigned long *sz_p,
1161 int *status_p,
1162 int *used_p)
1164 /* Expect a line that begins with binary patch method ("literal"
1165 * or "delta"), followed by the length of data before deflating.
1166 * a sequence of 'length-byte' followed by base-85 encoded data
1167 * should follow, terminated by a newline.
1169 * Each 5-byte sequence of base-85 encodes up to 4 bytes,
1170 * and we would limit the patch line to 66 characters,
1171 * so one line can fit up to 13 groups that would decode
1172 * to 52 bytes max. The length byte 'A'-'Z' corresponds
1173 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
1175 int llen, used;
1176 unsigned long size = *sz_p;
1177 char *buffer = *buf_p;
1178 int patch_method;
1179 unsigned long origlen;
1180 char *data = NULL;
1181 int hunk_size = 0;
1182 struct fragment *frag;
1184 llen = linelen(buffer, size);
1185 used = llen;
1187 *status_p = 0;
1189 if (!prefixcmp(buffer, "delta ")) {
1190 patch_method = BINARY_DELTA_DEFLATED;
1191 origlen = strtoul(buffer + 6, NULL, 10);
1193 else if (!prefixcmp(buffer, "literal ")) {
1194 patch_method = BINARY_LITERAL_DEFLATED;
1195 origlen = strtoul(buffer + 8, NULL, 10);
1197 else
1198 return NULL;
1200 linenr++;
1201 buffer += llen;
1202 while (1) {
1203 int byte_length, max_byte_length, newsize;
1204 llen = linelen(buffer, size);
1205 used += llen;
1206 linenr++;
1207 if (llen == 1) {
1208 /* consume the blank line */
1209 buffer++;
1210 size--;
1211 break;
1213 /* Minimum line is "A00000\n" which is 7-byte long,
1214 * and the line length must be multiple of 5 plus 2.
1216 if ((llen < 7) || (llen-2) % 5)
1217 goto corrupt;
1218 max_byte_length = (llen - 2) / 5 * 4;
1219 byte_length = *buffer;
1220 if ('A' <= byte_length && byte_length <= 'Z')
1221 byte_length = byte_length - 'A' + 1;
1222 else if ('a' <= byte_length && byte_length <= 'z')
1223 byte_length = byte_length - 'a' + 27;
1224 else
1225 goto corrupt;
1226 /* if the input length was not multiple of 4, we would
1227 * have filler at the end but the filler should never
1228 * exceed 3 bytes
1230 if (max_byte_length < byte_length ||
1231 byte_length <= max_byte_length - 4)
1232 goto corrupt;
1233 newsize = hunk_size + byte_length;
1234 data = xrealloc(data, newsize);
1235 if (decode_85(data + hunk_size, buffer + 1, byte_length))
1236 goto corrupt;
1237 hunk_size = newsize;
1238 buffer += llen;
1239 size -= llen;
1242 frag = xcalloc(1, sizeof(*frag));
1243 frag->patch = inflate_it(data, hunk_size, origlen);
1244 if (!frag->patch)
1245 goto corrupt;
1246 free(data);
1247 frag->size = origlen;
1248 *buf_p = buffer;
1249 *sz_p = size;
1250 *used_p = used;
1251 frag->binary_patch_method = patch_method;
1252 return frag;
1254 corrupt:
1255 free(data);
1256 *status_p = -1;
1257 error("corrupt binary patch at line %d: %.*s",
1258 linenr-1, llen-1, buffer);
1259 return NULL;
1262 static int parse_binary(char *buffer, unsigned long size, struct patch *patch)
1264 /* We have read "GIT binary patch\n"; what follows is a line
1265 * that says the patch method (currently, either "literal" or
1266 * "delta") and the length of data before deflating; a
1267 * sequence of 'length-byte' followed by base-85 encoded data
1268 * follows.
1270 * When a binary patch is reversible, there is another binary
1271 * hunk in the same format, starting with patch method (either
1272 * "literal" or "delta") with the length of data, and a sequence
1273 * of length-byte + base-85 encoded data, terminated with another
1274 * empty line. This data, when applied to the postimage, produces
1275 * the preimage.
1277 struct fragment *forward;
1278 struct fragment *reverse;
1279 int status;
1280 int used, used_1;
1282 forward = parse_binary_hunk(&buffer, &size, &status, &used);
1283 if (!forward && !status)
1284 /* there has to be one hunk (forward hunk) */
1285 return error("unrecognized binary patch at line %d", linenr-1);
1286 if (status)
1287 /* otherwise we already gave an error message */
1288 return status;
1290 reverse = parse_binary_hunk(&buffer, &size, &status, &used_1);
1291 if (reverse)
1292 used += used_1;
1293 else if (status) {
1294 /* not having reverse hunk is not an error, but having
1295 * a corrupt reverse hunk is.
1297 free((void*) forward->patch);
1298 free(forward);
1299 return status;
1301 forward->next = reverse;
1302 patch->fragments = forward;
1303 patch->is_binary = 1;
1304 return used;
1307 static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
1309 int hdrsize, patchsize;
1310 int offset = find_header(buffer, size, &hdrsize, patch);
1312 if (offset < 0)
1313 return offset;
1315 patchsize = parse_single_patch(buffer + offset + hdrsize, size - offset - hdrsize, patch);
1317 if (!patchsize) {
1318 static const char *binhdr[] = {
1319 "Binary files ",
1320 "Files ",
1321 NULL,
1323 static const char git_binary[] = "GIT binary patch\n";
1324 int i;
1325 int hd = hdrsize + offset;
1326 unsigned long llen = linelen(buffer + hd, size - hd);
1328 if (llen == sizeof(git_binary) - 1 &&
1329 !memcmp(git_binary, buffer + hd, llen)) {
1330 int used;
1331 linenr++;
1332 used = parse_binary(buffer + hd + llen,
1333 size - hd - llen, patch);
1334 if (used)
1335 patchsize = used + llen;
1336 else
1337 patchsize = 0;
1339 else if (!memcmp(" differ\n", buffer + hd + llen - 8, 8)) {
1340 for (i = 0; binhdr[i]; i++) {
1341 int len = strlen(binhdr[i]);
1342 if (len < size - hd &&
1343 !memcmp(binhdr[i], buffer + hd, len)) {
1344 linenr++;
1345 patch->is_binary = 1;
1346 patchsize = llen;
1347 break;
1352 /* Empty patch cannot be applied if it is a text patch
1353 * without metadata change. A binary patch appears
1354 * empty to us here.
1356 if ((apply || check) &&
1357 (!patch->is_binary && !metadata_changes(patch)))
1358 die("patch with only garbage at line %d", linenr);
1361 return offset + hdrsize + patchsize;
1364 #define swap(a,b) myswap((a),(b),sizeof(a))
1366 #define myswap(a, b, size) do { \
1367 unsigned char mytmp[size]; \
1368 memcpy(mytmp, &a, size); \
1369 memcpy(&a, &b, size); \
1370 memcpy(&b, mytmp, size); \
1371 } while (0)
1373 static void reverse_patches(struct patch *p)
1375 for (; p; p = p->next) {
1376 struct fragment *frag = p->fragments;
1378 swap(p->new_name, p->old_name);
1379 swap(p->new_mode, p->old_mode);
1380 swap(p->is_new, p->is_delete);
1381 swap(p->lines_added, p->lines_deleted);
1382 swap(p->old_sha1_prefix, p->new_sha1_prefix);
1384 for (; frag; frag = frag->next) {
1385 swap(frag->newpos, frag->oldpos);
1386 swap(frag->newlines, frag->oldlines);
1391 static const char pluses[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
1392 static const char minuses[]= "----------------------------------------------------------------------";
1394 static void show_stats(struct patch *patch)
1396 const char *prefix = "";
1397 char *name = patch->new_name;
1398 char *qname = NULL;
1399 int len, max, add, del, total;
1401 if (!name)
1402 name = patch->old_name;
1404 if (0 < (len = quote_c_style(name, NULL, NULL, 0))) {
1405 qname = xmalloc(len + 1);
1406 quote_c_style(name, qname, NULL, 0);
1407 name = qname;
1411 * "scale" the filename
1413 len = strlen(name);
1414 max = max_len;
1415 if (max > 50)
1416 max = 50;
1417 if (len > max) {
1418 char *slash;
1419 prefix = "...";
1420 max -= 3;
1421 name += len - max;
1422 slash = strchr(name, '/');
1423 if (slash)
1424 name = slash;
1426 len = max;
1429 * scale the add/delete
1431 max = max_change;
1432 if (max + len > 70)
1433 max = 70 - len;
1435 add = patch->lines_added;
1436 del = patch->lines_deleted;
1437 total = add + del;
1439 if (max_change > 0) {
1440 total = (total * max + max_change / 2) / max_change;
1441 add = (add * max + max_change / 2) / max_change;
1442 del = total - add;
1444 if (patch->is_binary)
1445 printf(" %s%-*s | Bin\n", prefix, len, name);
1446 else
1447 printf(" %s%-*s |%5d %.*s%.*s\n", prefix,
1448 len, name, patch->lines_added + patch->lines_deleted,
1449 add, pluses, del, minuses);
1450 free(qname);
1453 static int read_old_data(struct stat *st, const char *path, char **buf_p, unsigned long *alloc_p, unsigned long *size_p)
1455 int fd;
1456 unsigned long got;
1457 unsigned long nsize;
1458 char *nbuf;
1459 unsigned long size = *size_p;
1460 char *buf = *buf_p;
1462 switch (st->st_mode & S_IFMT) {
1463 case S_IFLNK:
1464 return readlink(path, buf, size) != size;
1465 case S_IFREG:
1466 fd = open(path, O_RDONLY);
1467 if (fd < 0)
1468 return error("unable to open %s", path);
1469 got = 0;
1470 for (;;) {
1471 ssize_t ret = xread(fd, buf + got, size - got);
1472 if (ret <= 0)
1473 break;
1474 got += ret;
1476 close(fd);
1477 nsize = got;
1478 nbuf = convert_to_git(path, buf, &nsize);
1479 if (nbuf) {
1480 free(buf);
1481 *buf_p = nbuf;
1482 *alloc_p = nsize;
1483 *size_p = nsize;
1485 return got != size;
1486 default:
1487 return -1;
1491 static int find_offset(const char *buf, unsigned long size, const char *fragment, unsigned long fragsize, int line, int *lines)
1493 int i;
1494 unsigned long start, backwards, forwards;
1496 if (fragsize > size)
1497 return -1;
1499 start = 0;
1500 if (line > 1) {
1501 unsigned long offset = 0;
1502 i = line-1;
1503 while (offset + fragsize <= size) {
1504 if (buf[offset++] == '\n') {
1505 start = offset;
1506 if (!--i)
1507 break;
1512 /* Exact line number? */
1513 if (!memcmp(buf + start, fragment, fragsize))
1514 return start;
1517 * There's probably some smart way to do this, but I'll leave
1518 * that to the smart and beautiful people. I'm simple and stupid.
1520 backwards = start;
1521 forwards = start;
1522 for (i = 0; ; i++) {
1523 unsigned long try;
1524 int n;
1526 /* "backward" */
1527 if (i & 1) {
1528 if (!backwards) {
1529 if (forwards + fragsize > size)
1530 break;
1531 continue;
1533 do {
1534 --backwards;
1535 } while (backwards && buf[backwards-1] != '\n');
1536 try = backwards;
1537 } else {
1538 while (forwards + fragsize <= size) {
1539 if (buf[forwards++] == '\n')
1540 break;
1542 try = forwards;
1545 if (try + fragsize > size)
1546 continue;
1547 if (memcmp(buf + try, fragment, fragsize))
1548 continue;
1549 n = (i >> 1)+1;
1550 if (i & 1)
1551 n = -n;
1552 *lines = n;
1553 return try;
1557 * We should start searching forward and backward.
1559 return -1;
1562 static void remove_first_line(const char **rbuf, int *rsize)
1564 const char *buf = *rbuf;
1565 int size = *rsize;
1566 unsigned long offset;
1567 offset = 0;
1568 while (offset <= size) {
1569 if (buf[offset++] == '\n')
1570 break;
1572 *rsize = size - offset;
1573 *rbuf = buf + offset;
1576 static void remove_last_line(const char **rbuf, int *rsize)
1578 const char *buf = *rbuf;
1579 int size = *rsize;
1580 unsigned long offset;
1581 offset = size - 1;
1582 while (offset > 0) {
1583 if (buf[--offset] == '\n')
1584 break;
1586 *rsize = offset + 1;
1589 struct buffer_desc {
1590 char *buffer;
1591 unsigned long size;
1592 unsigned long alloc;
1595 static int apply_line(char *output, const char *patch, int plen)
1597 /* plen is number of bytes to be copied from patch,
1598 * starting at patch+1 (patch[0] is '+'). Typically
1599 * patch[plen] is '\n', unless this is the incomplete
1600 * last line.
1602 int i;
1603 int add_nl_to_tail = 0;
1604 int fixed = 0;
1605 int last_tab_in_indent = -1;
1606 int last_space_in_indent = -1;
1607 int need_fix_leading_space = 0;
1608 char *buf;
1610 if ((new_whitespace != strip_whitespace) || !whitespace_error ||
1611 *patch != '+') {
1612 memcpy(output, patch + 1, plen);
1613 return plen;
1616 if (1 < plen && isspace(patch[plen-1])) {
1617 if (patch[plen] == '\n')
1618 add_nl_to_tail = 1;
1619 plen--;
1620 while (0 < plen && isspace(patch[plen]))
1621 plen--;
1622 fixed = 1;
1625 for (i = 1; i < plen; i++) {
1626 char ch = patch[i];
1627 if (ch == '\t') {
1628 last_tab_in_indent = i;
1629 if (0 <= last_space_in_indent)
1630 need_fix_leading_space = 1;
1632 else if (ch == ' ')
1633 last_space_in_indent = i;
1634 else
1635 break;
1638 buf = output;
1639 if (need_fix_leading_space) {
1640 /* between patch[1..last_tab_in_indent] strip the
1641 * funny spaces, updating them to tab as needed.
1643 for (i = 1; i < last_tab_in_indent; i++, plen--) {
1644 char ch = patch[i];
1645 if (ch != ' ')
1646 *output++ = ch;
1647 else if ((i % 8) == 0)
1648 *output++ = '\t';
1650 fixed = 1;
1651 i = last_tab_in_indent;
1653 else
1654 i = 1;
1656 memcpy(output, patch + i, plen);
1657 if (add_nl_to_tail)
1658 output[plen++] = '\n';
1659 if (fixed)
1660 applied_after_fixing_ws++;
1661 return output + plen - buf;
1664 static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag, int inaccurate_eof)
1666 int match_beginning, match_end;
1667 char *buf = desc->buffer;
1668 const char *patch = frag->patch;
1669 int offset, size = frag->size;
1670 char *old = xmalloc(size);
1671 char *new = xmalloc(size);
1672 const char *oldlines, *newlines;
1673 int oldsize = 0, newsize = 0;
1674 int new_blank_lines_at_end = 0;
1675 unsigned long leading, trailing;
1676 int pos, lines;
1678 while (size > 0) {
1679 char first;
1680 int len = linelen(patch, size);
1681 int plen;
1682 int added_blank_line = 0;
1684 if (!len)
1685 break;
1688 * "plen" is how much of the line we should use for
1689 * the actual patch data. Normally we just remove the
1690 * first character on the line, but if the line is
1691 * followed by "\ No newline", then we also remove the
1692 * last one (which is the newline, of course).
1694 plen = len-1;
1695 if (len < size && patch[len] == '\\')
1696 plen--;
1697 first = *patch;
1698 if (apply_in_reverse) {
1699 if (first == '-')
1700 first = '+';
1701 else if (first == '+')
1702 first = '-';
1705 switch (first) {
1706 case '\n':
1707 /* Newer GNU diff, empty context line */
1708 if (plen < 0)
1709 /* ... followed by '\No newline'; nothing */
1710 break;
1711 old[oldsize++] = '\n';
1712 new[newsize++] = '\n';
1713 break;
1714 case ' ':
1715 case '-':
1716 memcpy(old + oldsize, patch + 1, plen);
1717 oldsize += plen;
1718 if (first == '-')
1719 break;
1720 /* Fall-through for ' ' */
1721 case '+':
1722 if (first != '+' || !no_add) {
1723 int added = apply_line(new + newsize, patch,
1724 plen);
1725 newsize += added;
1726 if (first == '+' &&
1727 added == 1 && new[newsize-1] == '\n')
1728 added_blank_line = 1;
1730 break;
1731 case '@': case '\\':
1732 /* Ignore it, we already handled it */
1733 break;
1734 default:
1735 if (apply_verbosely)
1736 error("invalid start of line: '%c'", first);
1737 return -1;
1739 if (added_blank_line)
1740 new_blank_lines_at_end++;
1741 else
1742 new_blank_lines_at_end = 0;
1743 patch += len;
1744 size -= len;
1747 if (inaccurate_eof && oldsize > 0 && old[oldsize - 1] == '\n' &&
1748 newsize > 0 && new[newsize - 1] == '\n') {
1749 oldsize--;
1750 newsize--;
1753 oldlines = old;
1754 newlines = new;
1755 leading = frag->leading;
1756 trailing = frag->trailing;
1759 * If we don't have any leading/trailing data in the patch,
1760 * we want it to match at the beginning/end of the file.
1762 * But that would break if the patch is generated with
1763 * --unified=0; sane people wouldn't do that to cause us
1764 * trouble, but we try to please not so sane ones as well.
1766 if (unidiff_zero) {
1767 match_beginning = (!leading && !frag->oldpos);
1768 match_end = 0;
1770 else {
1771 match_beginning = !leading && (frag->oldpos == 1);
1772 match_end = !trailing;
1775 lines = 0;
1776 pos = frag->newpos;
1777 for (;;) {
1778 offset = find_offset(buf, desc->size,
1779 oldlines, oldsize, pos, &lines);
1780 if (match_end && offset + oldsize != desc->size)
1781 offset = -1;
1782 if (match_beginning && offset)
1783 offset = -1;
1784 if (offset >= 0) {
1785 int diff;
1786 unsigned long size, alloc;
1788 if (new_whitespace == strip_whitespace &&
1789 (desc->size - oldsize - offset == 0)) /* end of file? */
1790 newsize -= new_blank_lines_at_end;
1792 diff = newsize - oldsize;
1793 size = desc->size + diff;
1794 alloc = desc->alloc;
1796 /* Warn if it was necessary to reduce the number
1797 * of context lines.
1799 if ((leading != frag->leading) ||
1800 (trailing != frag->trailing))
1801 fprintf(stderr, "Context reduced to (%ld/%ld)"
1802 " to apply fragment at %d\n",
1803 leading, trailing, pos + lines);
1805 if (size > alloc) {
1806 alloc = size + 8192;
1807 desc->alloc = alloc;
1808 buf = xrealloc(buf, alloc);
1809 desc->buffer = buf;
1811 desc->size = size;
1812 memmove(buf + offset + newsize,
1813 buf + offset + oldsize,
1814 size - offset - newsize);
1815 memcpy(buf + offset, newlines, newsize);
1816 offset = 0;
1818 break;
1821 /* Am I at my context limits? */
1822 if ((leading <= p_context) && (trailing <= p_context))
1823 break;
1824 if (match_beginning || match_end) {
1825 match_beginning = match_end = 0;
1826 continue;
1828 /* Reduce the number of context lines
1829 * Reduce both leading and trailing if they are equal
1830 * otherwise just reduce the larger context.
1832 if (leading >= trailing) {
1833 remove_first_line(&oldlines, &oldsize);
1834 remove_first_line(&newlines, &newsize);
1835 pos--;
1836 leading--;
1838 if (trailing > leading) {
1839 remove_last_line(&oldlines, &oldsize);
1840 remove_last_line(&newlines, &newsize);
1841 trailing--;
1845 if (offset && apply_verbosely)
1846 error("while searching for:\n%.*s", oldsize, oldlines);
1848 free(old);
1849 free(new);
1850 return offset;
1853 static int apply_binary_fragment(struct buffer_desc *desc, struct patch *patch)
1855 unsigned long dst_size;
1856 struct fragment *fragment = patch->fragments;
1857 void *data;
1858 void *result;
1860 /* Binary patch is irreversible without the optional second hunk */
1861 if (apply_in_reverse) {
1862 if (!fragment->next)
1863 return error("cannot reverse-apply a binary patch "
1864 "without the reverse hunk to '%s'",
1865 patch->new_name
1866 ? patch->new_name : patch->old_name);
1867 fragment = fragment->next;
1869 data = (void*) fragment->patch;
1870 switch (fragment->binary_patch_method) {
1871 case BINARY_DELTA_DEFLATED:
1872 result = patch_delta(desc->buffer, desc->size,
1873 data,
1874 fragment->size,
1875 &dst_size);
1876 free(desc->buffer);
1877 desc->buffer = result;
1878 break;
1879 case BINARY_LITERAL_DEFLATED:
1880 free(desc->buffer);
1881 desc->buffer = data;
1882 dst_size = fragment->size;
1883 break;
1885 if (!desc->buffer)
1886 return -1;
1887 desc->size = desc->alloc = dst_size;
1888 return 0;
1891 static int apply_binary(struct buffer_desc *desc, struct patch *patch)
1893 const char *name = patch->old_name ? patch->old_name : patch->new_name;
1894 unsigned char sha1[20];
1896 /* For safety, we require patch index line to contain
1897 * full 40-byte textual SHA1 for old and new, at least for now.
1899 if (strlen(patch->old_sha1_prefix) != 40 ||
1900 strlen(patch->new_sha1_prefix) != 40 ||
1901 get_sha1_hex(patch->old_sha1_prefix, sha1) ||
1902 get_sha1_hex(patch->new_sha1_prefix, sha1))
1903 return error("cannot apply binary patch to '%s' "
1904 "without full index line", name);
1906 if (patch->old_name) {
1907 /* See if the old one matches what the patch
1908 * applies to.
1910 hash_sha1_file(desc->buffer, desc->size, blob_type, sha1);
1911 if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))
1912 return error("the patch applies to '%s' (%s), "
1913 "which does not match the "
1914 "current contents.",
1915 name, sha1_to_hex(sha1));
1917 else {
1918 /* Otherwise, the old one must be empty. */
1919 if (desc->size)
1920 return error("the patch applies to an empty "
1921 "'%s' but it is not empty", name);
1924 get_sha1_hex(patch->new_sha1_prefix, sha1);
1925 if (is_null_sha1(sha1)) {
1926 free(desc->buffer);
1927 desc->alloc = desc->size = 0;
1928 desc->buffer = NULL;
1929 return 0; /* deletion patch */
1932 if (has_sha1_file(sha1)) {
1933 /* We already have the postimage */
1934 enum object_type type;
1935 unsigned long size;
1937 free(desc->buffer);
1938 desc->buffer = read_sha1_file(sha1, &type, &size);
1939 if (!desc->buffer)
1940 return error("the necessary postimage %s for "
1941 "'%s' cannot be read",
1942 patch->new_sha1_prefix, name);
1943 desc->alloc = desc->size = size;
1945 else {
1946 /* We have verified desc matches the preimage;
1947 * apply the patch data to it, which is stored
1948 * in the patch->fragments->{patch,size}.
1950 if (apply_binary_fragment(desc, patch))
1951 return error("binary patch does not apply to '%s'",
1952 name);
1954 /* verify that the result matches */
1955 hash_sha1_file(desc->buffer, desc->size, blob_type, sha1);
1956 if (strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))
1957 return error("binary patch to '%s' creates incorrect result (expecting %s, got %s)", name, patch->new_sha1_prefix, sha1_to_hex(sha1));
1960 return 0;
1963 static int apply_fragments(struct buffer_desc *desc, struct patch *patch)
1965 struct fragment *frag = patch->fragments;
1966 const char *name = patch->old_name ? patch->old_name : patch->new_name;
1968 if (patch->is_binary)
1969 return apply_binary(desc, patch);
1971 while (frag) {
1972 if (apply_one_fragment(desc, frag, patch->inaccurate_eof)) {
1973 error("patch failed: %s:%ld", name, frag->oldpos);
1974 if (!apply_with_reject)
1975 return -1;
1976 frag->rejected = 1;
1978 frag = frag->next;
1980 return 0;
1983 static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *ce)
1985 char *buf;
1986 unsigned long size, alloc;
1987 struct buffer_desc desc;
1989 size = 0;
1990 alloc = 0;
1991 buf = NULL;
1992 if (cached) {
1993 if (ce) {
1994 enum object_type type;
1995 buf = read_sha1_file(ce->sha1, &type, &size);
1996 if (!buf)
1997 return error("read of %s failed",
1998 patch->old_name);
1999 alloc = size;
2002 else if (patch->old_name) {
2003 size = xsize_t(st->st_size);
2004 alloc = size + 8192;
2005 buf = xmalloc(alloc);
2006 if (read_old_data(st, patch->old_name, &buf, &alloc, &size))
2007 return error("read of %s failed", patch->old_name);
2010 desc.size = size;
2011 desc.alloc = alloc;
2012 desc.buffer = buf;
2014 if (apply_fragments(&desc, patch) < 0)
2015 return -1; /* note with --reject this succeeds. */
2017 /* NUL terminate the result */
2018 if (desc.alloc <= desc.size)
2019 desc.buffer = xrealloc(desc.buffer, desc.size + 1);
2020 desc.buffer[desc.size] = 0;
2022 patch->result = desc.buffer;
2023 patch->resultsize = desc.size;
2025 if (0 < patch->is_delete && patch->resultsize)
2026 return error("removal patch leaves file contents");
2028 return 0;
2031 static int check_to_create_blob(const char *new_name, int ok_if_exists)
2033 struct stat nst;
2034 if (!lstat(new_name, &nst)) {
2035 if (S_ISDIR(nst.st_mode) || ok_if_exists)
2036 return 0;
2038 * A leading component of new_name might be a symlink
2039 * that is going to be removed with this patch, but
2040 * still pointing at somewhere that has the path.
2041 * In such a case, path "new_name" does not exist as
2042 * far as git is concerned.
2044 if (has_symlink_leading_path(new_name, NULL))
2045 return 0;
2047 return error("%s: already exists in working directory", new_name);
2049 else if ((errno != ENOENT) && (errno != ENOTDIR))
2050 return error("%s: %s", new_name, strerror(errno));
2051 return 0;
2054 static int check_patch(struct patch *patch, struct patch *prev_patch)
2056 struct stat st;
2057 const char *old_name = patch->old_name;
2058 const char *new_name = patch->new_name;
2059 const char *name = old_name ? old_name : new_name;
2060 struct cache_entry *ce = NULL;
2061 int ok_if_exists;
2063 patch->rejected = 1; /* we will drop this after we succeed */
2064 if (old_name) {
2065 int changed = 0;
2066 int stat_ret = 0;
2067 unsigned st_mode = 0;
2069 if (!cached)
2070 stat_ret = lstat(old_name, &st);
2071 if (check_index) {
2072 int pos = cache_name_pos(old_name, strlen(old_name));
2073 if (pos < 0)
2074 return error("%s: does not exist in index",
2075 old_name);
2076 ce = active_cache[pos];
2077 if (stat_ret < 0) {
2078 struct checkout costate;
2079 if (errno != ENOENT)
2080 return error("%s: %s", old_name,
2081 strerror(errno));
2082 /* checkout */
2083 costate.base_dir = "";
2084 costate.base_dir_len = 0;
2085 costate.force = 0;
2086 costate.quiet = 0;
2087 costate.not_new = 0;
2088 costate.refresh_cache = 1;
2089 if (checkout_entry(ce,
2090 &costate,
2091 NULL) ||
2092 lstat(old_name, &st))
2093 return -1;
2095 if (!cached)
2096 changed = ce_match_stat(ce, &st, 1);
2097 if (changed)
2098 return error("%s: does not match index",
2099 old_name);
2100 if (cached)
2101 st_mode = ntohl(ce->ce_mode);
2103 else if (stat_ret < 0)
2104 return error("%s: %s", old_name, strerror(errno));
2106 if (!cached)
2107 st_mode = ntohl(ce_mode_from_stat(ce, st.st_mode));
2109 if (patch->is_new < 0)
2110 patch->is_new = 0;
2111 if (!patch->old_mode)
2112 patch->old_mode = st_mode;
2113 if ((st_mode ^ patch->old_mode) & S_IFMT)
2114 return error("%s: wrong type", old_name);
2115 if (st_mode != patch->old_mode)
2116 fprintf(stderr, "warning: %s has type %o, expected %o\n",
2117 old_name, st_mode, patch->old_mode);
2120 if (new_name && prev_patch && 0 < prev_patch->is_delete &&
2121 !strcmp(prev_patch->old_name, new_name))
2122 /* A type-change diff is always split into a patch to
2123 * delete old, immediately followed by a patch to
2124 * create new (see diff.c::run_diff()); in such a case
2125 * it is Ok that the entry to be deleted by the
2126 * previous patch is still in the working tree and in
2127 * the index.
2129 ok_if_exists = 1;
2130 else
2131 ok_if_exists = 0;
2133 if (new_name &&
2134 ((0 < patch->is_new) | (0 < patch->is_rename) | patch->is_copy)) {
2135 if (check_index &&
2136 cache_name_pos(new_name, strlen(new_name)) >= 0 &&
2137 !ok_if_exists)
2138 return error("%s: already exists in index", new_name);
2139 if (!cached) {
2140 int err = check_to_create_blob(new_name, ok_if_exists);
2141 if (err)
2142 return err;
2144 if (!patch->new_mode) {
2145 if (0 < patch->is_new)
2146 patch->new_mode = S_IFREG | 0644;
2147 else
2148 patch->new_mode = patch->old_mode;
2152 if (new_name && old_name) {
2153 int same = !strcmp(old_name, new_name);
2154 if (!patch->new_mode)
2155 patch->new_mode = patch->old_mode;
2156 if ((patch->old_mode ^ patch->new_mode) & S_IFMT)
2157 return error("new mode (%o) of %s does not match old mode (%o)%s%s",
2158 patch->new_mode, new_name, patch->old_mode,
2159 same ? "" : " of ", same ? "" : old_name);
2162 if (apply_data(patch, &st, ce) < 0)
2163 return error("%s: patch does not apply", name);
2164 patch->rejected = 0;
2165 return 0;
2168 static int check_patch_list(struct patch *patch)
2170 struct patch *prev_patch = NULL;
2171 int err = 0;
2173 for (prev_patch = NULL; patch ; patch = patch->next) {
2174 if (apply_verbosely)
2175 say_patch_name(stderr,
2176 "Checking patch ", patch, "...\n");
2177 err |= check_patch(patch, prev_patch);
2178 prev_patch = patch;
2180 return err;
2183 static void show_index_list(struct patch *list)
2185 struct patch *patch;
2187 /* Once we start supporting the reverse patch, it may be
2188 * worth showing the new sha1 prefix, but until then...
2190 for (patch = list; patch; patch = patch->next) {
2191 const unsigned char *sha1_ptr;
2192 unsigned char sha1[20];
2193 const char *name;
2195 name = patch->old_name ? patch->old_name : patch->new_name;
2196 if (0 < patch->is_new)
2197 sha1_ptr = null_sha1;
2198 else if (get_sha1(patch->old_sha1_prefix, sha1))
2199 die("sha1 information is lacking or useless (%s).",
2200 name);
2201 else
2202 sha1_ptr = sha1;
2204 printf("%06o %s ",patch->old_mode, sha1_to_hex(sha1_ptr));
2205 if (line_termination && quote_c_style(name, NULL, NULL, 0))
2206 quote_c_style(name, NULL, stdout, 0);
2207 else
2208 fputs(name, stdout);
2209 putchar(line_termination);
2213 static void stat_patch_list(struct patch *patch)
2215 int files, adds, dels;
2217 for (files = adds = dels = 0 ; patch ; patch = patch->next) {
2218 files++;
2219 adds += patch->lines_added;
2220 dels += patch->lines_deleted;
2221 show_stats(patch);
2224 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files, adds, dels);
2227 static void numstat_patch_list(struct patch *patch)
2229 for ( ; patch; patch = patch->next) {
2230 const char *name;
2231 name = patch->new_name ? patch->new_name : patch->old_name;
2232 if (patch->is_binary)
2233 printf("-\t-\t");
2234 else
2235 printf("%d\t%d\t",
2236 patch->lines_added, patch->lines_deleted);
2237 if (line_termination && quote_c_style(name, NULL, NULL, 0))
2238 quote_c_style(name, NULL, stdout, 0);
2239 else
2240 fputs(name, stdout);
2241 putchar(line_termination);
2245 static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)
2247 if (mode)
2248 printf(" %s mode %06o %s\n", newdelete, mode, name);
2249 else
2250 printf(" %s %s\n", newdelete, name);
2253 static void show_mode_change(struct patch *p, int show_name)
2255 if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {
2256 if (show_name)
2257 printf(" mode change %06o => %06o %s\n",
2258 p->old_mode, p->new_mode, p->new_name);
2259 else
2260 printf(" mode change %06o => %06o\n",
2261 p->old_mode, p->new_mode);
2265 static void show_rename_copy(struct patch *p)
2267 const char *renamecopy = p->is_rename ? "rename" : "copy";
2268 const char *old, *new;
2270 /* Find common prefix */
2271 old = p->old_name;
2272 new = p->new_name;
2273 while (1) {
2274 const char *slash_old, *slash_new;
2275 slash_old = strchr(old, '/');
2276 slash_new = strchr(new, '/');
2277 if (!slash_old ||
2278 !slash_new ||
2279 slash_old - old != slash_new - new ||
2280 memcmp(old, new, slash_new - new))
2281 break;
2282 old = slash_old + 1;
2283 new = slash_new + 1;
2285 /* p->old_name thru old is the common prefix, and old and new
2286 * through the end of names are renames
2288 if (old != p->old_name)
2289 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
2290 (int)(old - p->old_name), p->old_name,
2291 old, new, p->score);
2292 else
2293 printf(" %s %s => %s (%d%%)\n", renamecopy,
2294 p->old_name, p->new_name, p->score);
2295 show_mode_change(p, 0);
2298 static void summary_patch_list(struct patch *patch)
2300 struct patch *p;
2302 for (p = patch; p; p = p->next) {
2303 if (p->is_new)
2304 show_file_mode_name("create", p->new_mode, p->new_name);
2305 else if (p->is_delete)
2306 show_file_mode_name("delete", p->old_mode, p->old_name);
2307 else {
2308 if (p->is_rename || p->is_copy)
2309 show_rename_copy(p);
2310 else {
2311 if (p->score) {
2312 printf(" rewrite %s (%d%%)\n",
2313 p->new_name, p->score);
2314 show_mode_change(p, 0);
2316 else
2317 show_mode_change(p, 1);
2323 static void patch_stats(struct patch *patch)
2325 int lines = patch->lines_added + patch->lines_deleted;
2327 if (lines > max_change)
2328 max_change = lines;
2329 if (patch->old_name) {
2330 int len = quote_c_style(patch->old_name, NULL, NULL, 0);
2331 if (!len)
2332 len = strlen(patch->old_name);
2333 if (len > max_len)
2334 max_len = len;
2336 if (patch->new_name) {
2337 int len = quote_c_style(patch->new_name, NULL, NULL, 0);
2338 if (!len)
2339 len = strlen(patch->new_name);
2340 if (len > max_len)
2341 max_len = len;
2345 static void remove_file(struct patch *patch, int rmdir_empty)
2347 if (update_index) {
2348 if (remove_file_from_cache(patch->old_name) < 0)
2349 die("unable to remove %s from index", patch->old_name);
2350 cache_tree_invalidate_path(active_cache_tree, patch->old_name);
2352 if (!cached) {
2353 if (!unlink(patch->old_name) && rmdir_empty) {
2354 char *name = xstrdup(patch->old_name);
2355 char *end = strrchr(name, '/');
2356 while (end) {
2357 *end = 0;
2358 if (rmdir(name))
2359 break;
2360 end = strrchr(name, '/');
2362 free(name);
2367 static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size)
2369 struct stat st;
2370 struct cache_entry *ce;
2371 int namelen = strlen(path);
2372 unsigned ce_size = cache_entry_size(namelen);
2374 if (!update_index)
2375 return;
2377 ce = xcalloc(1, ce_size);
2378 memcpy(ce->name, path, namelen);
2379 ce->ce_mode = create_ce_mode(mode);
2380 ce->ce_flags = htons(namelen);
2381 if (!cached) {
2382 if (lstat(path, &st) < 0)
2383 die("unable to stat newly created file %s", path);
2384 fill_stat_cache_info(ce, &st);
2386 if (write_sha1_file(buf, size, blob_type, ce->sha1) < 0)
2387 die("unable to create backing store for newly created file %s", path);
2388 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)
2389 die("unable to add cache entry for %s", path);
2392 static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)
2394 int fd;
2395 char *nbuf;
2397 if (has_symlinks && S_ISLNK(mode))
2398 /* Although buf:size is counted string, it also is NUL
2399 * terminated.
2401 return symlink(buf, path);
2403 fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);
2404 if (fd < 0)
2405 return -1;
2407 nbuf = convert_to_working_tree(path, buf, &size);
2408 if (nbuf)
2409 buf = nbuf;
2411 while (size) {
2412 int written = xwrite(fd, buf, size);
2413 if (written < 0)
2414 die("writing file %s: %s", path, strerror(errno));
2415 if (!written)
2416 die("out of space writing file %s", path);
2417 buf += written;
2418 size -= written;
2420 if (close(fd) < 0)
2421 die("closing file %s: %s", path, strerror(errno));
2422 if (nbuf)
2423 free(nbuf);
2424 return 0;
2428 * We optimistically assume that the directories exist,
2429 * which is true 99% of the time anyway. If they don't,
2430 * we create them and try again.
2432 static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size)
2434 if (cached)
2435 return;
2436 if (!try_create_file(path, mode, buf, size))
2437 return;
2439 if (errno == ENOENT) {
2440 if (safe_create_leading_directories(path))
2441 return;
2442 if (!try_create_file(path, mode, buf, size))
2443 return;
2446 if (errno == EEXIST || errno == EACCES) {
2447 /* We may be trying to create a file where a directory
2448 * used to be.
2450 struct stat st;
2451 if (!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))
2452 errno = EEXIST;
2455 if (errno == EEXIST) {
2456 unsigned int nr = getpid();
2458 for (;;) {
2459 const char *newpath;
2460 newpath = mkpath("%s~%u", path, nr);
2461 if (!try_create_file(newpath, mode, buf, size)) {
2462 if (!rename(newpath, path))
2463 return;
2464 unlink(newpath);
2465 break;
2467 if (errno != EEXIST)
2468 break;
2469 ++nr;
2472 die("unable to write file %s mode %o", path, mode);
2475 static void create_file(struct patch *patch)
2477 char *path = patch->new_name;
2478 unsigned mode = patch->new_mode;
2479 unsigned long size = patch->resultsize;
2480 char *buf = patch->result;
2482 if (!mode)
2483 mode = S_IFREG | 0644;
2484 create_one_file(path, mode, buf, size);
2485 add_index_file(path, mode, buf, size);
2486 cache_tree_invalidate_path(active_cache_tree, path);
2489 /* phase zero is to remove, phase one is to create */
2490 static void write_out_one_result(struct patch *patch, int phase)
2492 if (patch->is_delete > 0) {
2493 if (phase == 0)
2494 remove_file(patch, 1);
2495 return;
2497 if (patch->is_new > 0 || patch->is_copy) {
2498 if (phase == 1)
2499 create_file(patch);
2500 return;
2503 * Rename or modification boils down to the same
2504 * thing: remove the old, write the new
2506 if (phase == 0)
2507 remove_file(patch, 0);
2508 if (phase == 1)
2509 create_file(patch);
2512 static int write_out_one_reject(struct patch *patch)
2514 FILE *rej;
2515 char namebuf[PATH_MAX];
2516 struct fragment *frag;
2517 int cnt = 0;
2519 for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) {
2520 if (!frag->rejected)
2521 continue;
2522 cnt++;
2525 if (!cnt) {
2526 if (apply_verbosely)
2527 say_patch_name(stderr,
2528 "Applied patch ", patch, " cleanly.\n");
2529 return 0;
2532 /* This should not happen, because a removal patch that leaves
2533 * contents are marked "rejected" at the patch level.
2535 if (!patch->new_name)
2536 die("internal error");
2538 /* Say this even without --verbose */
2539 say_patch_name(stderr, "Applying patch ", patch, " with");
2540 fprintf(stderr, " %d rejects...\n", cnt);
2542 cnt = strlen(patch->new_name);
2543 if (ARRAY_SIZE(namebuf) <= cnt + 5) {
2544 cnt = ARRAY_SIZE(namebuf) - 5;
2545 fprintf(stderr,
2546 "warning: truncating .rej filename to %.*s.rej",
2547 cnt - 1, patch->new_name);
2549 memcpy(namebuf, patch->new_name, cnt);
2550 memcpy(namebuf + cnt, ".rej", 5);
2552 rej = fopen(namebuf, "w");
2553 if (!rej)
2554 return error("cannot open %s: %s", namebuf, strerror(errno));
2556 /* Normal git tools never deal with .rej, so do not pretend
2557 * this is a git patch by saying --git nor give extended
2558 * headers. While at it, maybe please "kompare" that wants
2559 * the trailing TAB and some garbage at the end of line ;-).
2561 fprintf(rej, "diff a/%s b/%s\t(rejected hunks)\n",
2562 patch->new_name, patch->new_name);
2563 for (cnt = 1, frag = patch->fragments;
2564 frag;
2565 cnt++, frag = frag->next) {
2566 if (!frag->rejected) {
2567 fprintf(stderr, "Hunk #%d applied cleanly.\n", cnt);
2568 continue;
2570 fprintf(stderr, "Rejected hunk #%d.\n", cnt);
2571 fprintf(rej, "%.*s", frag->size, frag->patch);
2572 if (frag->patch[frag->size-1] != '\n')
2573 fputc('\n', rej);
2575 fclose(rej);
2576 return -1;
2579 static int write_out_results(struct patch *list, int skipped_patch)
2581 int phase;
2582 int errs = 0;
2583 struct patch *l;
2585 if (!list && !skipped_patch)
2586 return error("No changes");
2588 for (phase = 0; phase < 2; phase++) {
2589 l = list;
2590 while (l) {
2591 if (l->rejected)
2592 errs = 1;
2593 else {
2594 write_out_one_result(l, phase);
2595 if (phase == 1 && write_out_one_reject(l))
2596 errs = 1;
2598 l = l->next;
2601 return errs;
2604 static struct lock_file lock_file;
2606 static struct excludes {
2607 struct excludes *next;
2608 const char *path;
2609 } *excludes;
2611 static int use_patch(struct patch *p)
2613 const char *pathname = p->new_name ? p->new_name : p->old_name;
2614 struct excludes *x = excludes;
2615 while (x) {
2616 if (fnmatch(x->path, pathname, 0) == 0)
2617 return 0;
2618 x = x->next;
2620 if (0 < prefix_length) {
2621 int pathlen = strlen(pathname);
2622 if (pathlen <= prefix_length ||
2623 memcmp(prefix, pathname, prefix_length))
2624 return 0;
2626 return 1;
2629 static void prefix_one(char **name)
2631 char *old_name = *name;
2632 if (!old_name)
2633 return;
2634 *name = xstrdup(prefix_filename(prefix, prefix_length, *name));
2635 free(old_name);
2638 static void prefix_patches(struct patch *p)
2640 if (!prefix || p->is_toplevel_relative)
2641 return;
2642 for ( ; p; p = p->next) {
2643 if (p->new_name == p->old_name) {
2644 char *prefixed = p->new_name;
2645 prefix_one(&prefixed);
2646 p->new_name = p->old_name = prefixed;
2648 else {
2649 prefix_one(&p->new_name);
2650 prefix_one(&p->old_name);
2655 static int apply_patch(int fd, const char *filename, int inaccurate_eof)
2657 unsigned long offset, size;
2658 char *buffer = read_patch_file(fd, &size);
2659 struct patch *list = NULL, **listp = &list;
2660 int skipped_patch = 0;
2662 patch_input_file = filename;
2663 if (!buffer)
2664 return -1;
2665 offset = 0;
2666 while (size > 0) {
2667 struct patch *patch;
2668 int nr;
2670 patch = xcalloc(1, sizeof(*patch));
2671 patch->inaccurate_eof = inaccurate_eof;
2672 nr = parse_chunk(buffer + offset, size, patch);
2673 if (nr < 0)
2674 break;
2675 if (apply_in_reverse)
2676 reverse_patches(patch);
2677 if (prefix)
2678 prefix_patches(patch);
2679 if (use_patch(patch)) {
2680 patch_stats(patch);
2681 *listp = patch;
2682 listp = &patch->next;
2684 else {
2685 /* perhaps free it a bit better? */
2686 free(patch);
2687 skipped_patch++;
2689 offset += nr;
2690 size -= nr;
2693 if (whitespace_error && (new_whitespace == error_on_whitespace))
2694 apply = 0;
2696 update_index = check_index && apply;
2697 if (update_index && newfd < 0)
2698 newfd = hold_locked_index(&lock_file, 1);
2700 if (check_index) {
2701 if (read_cache() < 0)
2702 die("unable to read index file");
2705 if ((check || apply) &&
2706 check_patch_list(list) < 0 &&
2707 !apply_with_reject)
2708 exit(1);
2710 if (apply && write_out_results(list, skipped_patch))
2711 exit(1);
2713 if (show_index_info)
2714 show_index_list(list);
2716 if (diffstat)
2717 stat_patch_list(list);
2719 if (numstat)
2720 numstat_patch_list(list);
2722 if (summary)
2723 summary_patch_list(list);
2725 free(buffer);
2726 return 0;
2729 static int git_apply_config(const char *var, const char *value)
2731 if (!strcmp(var, "apply.whitespace")) {
2732 apply_default_whitespace = xstrdup(value);
2733 return 0;
2735 return git_default_config(var, value);
2739 int cmd_apply(int argc, const char **argv, const char *unused_prefix)
2741 int i;
2742 int read_stdin = 1;
2743 int inaccurate_eof = 0;
2744 int errs = 0;
2745 int is_not_gitdir = 0;
2747 const char *whitespace_option = NULL;
2749 prefix = setup_git_directory_gently(&is_not_gitdir);
2750 prefix_length = prefix ? strlen(prefix) : 0;
2751 git_config(git_apply_config);
2752 if (apply_default_whitespace)
2753 parse_whitespace_option(apply_default_whitespace);
2755 for (i = 1; i < argc; i++) {
2756 const char *arg = argv[i];
2757 char *end;
2758 int fd;
2760 if (!strcmp(arg, "-")) {
2761 errs |= apply_patch(0, "<stdin>", inaccurate_eof);
2762 read_stdin = 0;
2763 continue;
2765 if (!prefixcmp(arg, "--exclude=")) {
2766 struct excludes *x = xmalloc(sizeof(*x));
2767 x->path = arg + 10;
2768 x->next = excludes;
2769 excludes = x;
2770 continue;
2772 if (!prefixcmp(arg, "-p")) {
2773 p_value = atoi(arg + 2);
2774 p_value_known = 1;
2775 continue;
2777 if (!strcmp(arg, "--no-add")) {
2778 no_add = 1;
2779 continue;
2781 if (!strcmp(arg, "--stat")) {
2782 apply = 0;
2783 diffstat = 1;
2784 continue;
2786 if (!strcmp(arg, "--allow-binary-replacement") ||
2787 !strcmp(arg, "--binary")) {
2788 continue; /* now no-op */
2790 if (!strcmp(arg, "--numstat")) {
2791 apply = 0;
2792 numstat = 1;
2793 continue;
2795 if (!strcmp(arg, "--summary")) {
2796 apply = 0;
2797 summary = 1;
2798 continue;
2800 if (!strcmp(arg, "--check")) {
2801 apply = 0;
2802 check = 1;
2803 continue;
2805 if (!strcmp(arg, "--index")) {
2806 if (is_not_gitdir)
2807 die("--index outside a repository");
2808 check_index = 1;
2809 continue;
2811 if (!strcmp(arg, "--cached")) {
2812 if (is_not_gitdir)
2813 die("--cached outside a repository");
2814 check_index = 1;
2815 cached = 1;
2816 continue;
2818 if (!strcmp(arg, "--apply")) {
2819 apply = 1;
2820 continue;
2822 if (!strcmp(arg, "--index-info")) {
2823 apply = 0;
2824 show_index_info = 1;
2825 continue;
2827 if (!strcmp(arg, "-z")) {
2828 line_termination = 0;
2829 continue;
2831 if (!prefixcmp(arg, "-C")) {
2832 p_context = strtoul(arg + 2, &end, 0);
2833 if (*end != '\0')
2834 die("unrecognized context count '%s'", arg + 2);
2835 continue;
2837 if (!prefixcmp(arg, "--whitespace=")) {
2838 whitespace_option = arg + 13;
2839 parse_whitespace_option(arg + 13);
2840 continue;
2842 if (!strcmp(arg, "-R") || !strcmp(arg, "--reverse")) {
2843 apply_in_reverse = 1;
2844 continue;
2846 if (!strcmp(arg, "--unidiff-zero")) {
2847 unidiff_zero = 1;
2848 continue;
2850 if (!strcmp(arg, "--reject")) {
2851 apply = apply_with_reject = apply_verbosely = 1;
2852 continue;
2854 if (!strcmp(arg, "-v") || !strcmp(arg, "--verbose")) {
2855 apply_verbosely = 1;
2856 continue;
2858 if (!strcmp(arg, "--inaccurate-eof")) {
2859 inaccurate_eof = 1;
2860 continue;
2862 if (0 < prefix_length)
2863 arg = prefix_filename(prefix, prefix_length, arg);
2865 fd = open(arg, O_RDONLY);
2866 if (fd < 0)
2867 usage(apply_usage);
2868 read_stdin = 0;
2869 set_default_whitespace_mode(whitespace_option);
2870 errs |= apply_patch(fd, arg, inaccurate_eof);
2871 close(fd);
2873 set_default_whitespace_mode(whitespace_option);
2874 if (read_stdin)
2875 errs |= apply_patch(0, "<stdin>", inaccurate_eof);
2876 if (whitespace_error) {
2877 if (squelch_whitespace_errors &&
2878 squelch_whitespace_errors < whitespace_error) {
2879 int squelched =
2880 whitespace_error - squelch_whitespace_errors;
2881 fprintf(stderr, "warning: squelched %d "
2882 "whitespace error%s\n",
2883 squelched,
2884 squelched == 1 ? "" : "s");
2886 if (new_whitespace == error_on_whitespace)
2887 die("%d line%s add%s whitespace errors.",
2888 whitespace_error,
2889 whitespace_error == 1 ? "" : "s",
2890 whitespace_error == 1 ? "s" : "");
2891 if (applied_after_fixing_ws)
2892 fprintf(stderr, "warning: %d line%s applied after"
2893 " fixing whitespace errors.\n",
2894 applied_after_fixing_ws,
2895 applied_after_fixing_ws == 1 ? "" : "s");
2896 else if (whitespace_error)
2897 fprintf(stderr, "warning: %d line%s add%s whitespace errors.\n",
2898 whitespace_error,
2899 whitespace_error == 1 ? "" : "s",
2900 whitespace_error == 1 ? "s" : "");
2903 if (update_index) {
2904 if (write_cache(newfd, active_cache, active_nr) ||
2905 close(newfd) || commit_locked_index(&lock_file))
2906 die("Unable to write new index file");
2909 return !!errs;