1/* 2 * apply.c 3 * 4 * Copyright (C) Linus Torvalds, 2005 5 * 6 * This applies patches on top of some (arbitrary) version of the SCM. 7 * 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" 15#include "string-list.h" 16#include "dir.h" 17#include "parse-options.h" 18 19/* 20 * --check turns on checking that the working tree matches the 21 * files that are being modified, but doesn't apply the patch 22 * --stat does just a diffstat, and doesn't actually apply 23 * --numstat does numeric diffstat, and doesn't actually apply 24 * --index-info shows the old and new index info for paths if available. 25 * --index updates the cache as well. 26 * --cached updates only the cache without ever touching the working tree. 27 */ 28static const char *prefix; 29static int prefix_length = -1; 30static int newfd = -1; 31 32static int unidiff_zero; 33static int p_value = 1; 34static int p_value_known; 35static int check_index; 36static int update_index; 37static int cached; 38static int diffstat; 39static int numstat; 40static int summary; 41static int check; 42static int apply = 1; 43static int apply_in_reverse; 44static int apply_with_reject; 45static int apply_verbosely; 46static int no_add; 47static const char *fake_ancestor; 48static int line_termination = '\n'; 49static unsigned int p_context = UINT_MAX; 50static const char * const apply_usage[] = { 51 "git apply [options] [<patch>...]", 52 NULL 53}; 54 55static enum ws_error_action { 56 nowarn_ws_error, 57 warn_on_ws_error, 58 die_on_ws_error, 59 correct_ws_error, 60} ws_error_action = warn_on_ws_error; 61static int whitespace_error; 62static int squelch_whitespace_errors = 5; 63static int applied_after_fixing_ws; 64static const char *patch_input_file; 65static const char *root; 66static int root_len; 67static int read_stdin = 1; 68static int options; 69 70static void parse_whitespace_option(const char *option) 71{ 72 if (!option) { 73 ws_error_action = warn_on_ws_error; 74 return; 75 } 76 if (!strcmp(option, "warn")) { 77 ws_error_action = warn_on_ws_error; 78 return; 79 } 80 if (!strcmp(option, "nowarn")) { 81 ws_error_action = nowarn_ws_error; 82 return; 83 } 84 if (!strcmp(option, "error")) { 85 ws_error_action = die_on_ws_error; 86 return; 87 } 88 if (!strcmp(option, "error-all")) { 89 ws_error_action = die_on_ws_error; 90 squelch_whitespace_errors = 0; 91 return; 92 } 93 if (!strcmp(option, "strip") || !strcmp(option, "fix")) { 94 ws_error_action = correct_ws_error; 95 return; 96 } 97 die("unrecognized whitespace option '%s'", option); 98} 99 100static void set_default_whitespace_mode(const char *whitespace_option) 101{ 102 if (!whitespace_option && !apply_default_whitespace) 103 ws_error_action = (apply ? warn_on_ws_error : nowarn_ws_error); 104} 105 106/* 107 * For "diff-stat" like behaviour, we keep track of the biggest change 108 * we've seen, and the longest filename. That allows us to do simple 109 * scaling. 110 */ 111static int max_change, max_len; 112 113/* 114 * Various "current state", notably line numbers and what 115 * file (and how) we're patching right now.. The "is_xxxx" 116 * things are flags, where -1 means "don't know yet". 117 */ 118static int linenr = 1; 119 120/* 121 * This represents one "hunk" from a patch, starting with 122 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The 123 * patch text is pointed at by patch, and its byte length 124 * is stored in size. leading and trailing are the number 125 * of context lines. 126 */ 127struct fragment { 128 unsigned long leading, trailing; 129 unsigned long oldpos, oldlines; 130 unsigned long newpos, newlines; 131 const char *patch; 132 int size; 133 int rejected; 134 struct fragment *next; 135}; 136 137/* 138 * When dealing with a binary patch, we reuse "leading" field 139 * to store the type of the binary hunk, either deflated "delta" 140 * or deflated "literal". 141 */ 142#define binary_patch_method leading 143#define BINARY_DELTA_DEFLATED 1 144#define BINARY_LITERAL_DEFLATED 2 145 146/* 147 * This represents a "patch" to a file, both metainfo changes 148 * such as creation/deletion, filemode and content changes represented 149 * as a series of fragments. 150 */ 151struct patch { 152 char *new_name, *old_name, *def_name; 153 unsigned int old_mode, new_mode; 154 int is_new, is_delete; /* -1 = unknown, 0 = false, 1 = true */ 155 int rejected; 156 unsigned ws_rule; 157 unsigned long deflate_origlen; 158 int lines_added, lines_deleted; 159 int score; 160 unsigned int is_toplevel_relative:1; 161 unsigned int inaccurate_eof:1; 162 unsigned int is_binary:1; 163 unsigned int is_copy:1; 164 unsigned int is_rename:1; 165 unsigned int recount:1; 166 struct fragment *fragments; 167 char *result; 168 size_t resultsize; 169 char old_sha1_prefix[41]; 170 char new_sha1_prefix[41]; 171 struct patch *next; 172}; 173 174/* 175 * A line in a file, len-bytes long (includes the terminating LF, 176 * except for an incomplete line at the end if the file ends with 177 * one), and its contents hashes to 'hash'. 178 */ 179struct line { 180 size_t len; 181 unsigned hash : 24; 182 unsigned flag : 8; 183#define LINE_COMMON 1 184}; 185 186/* 187 * This represents a "file", which is an array of "lines". 188 */ 189struct image { 190 char *buf; 191 size_t len; 192 size_t nr; 193 size_t alloc; 194 struct line *line_allocated; 195 struct line *line; 196}; 197 198/* 199 * Records filenames that have been touched, in order to handle 200 * the case where more than one patches touch the same file. 201 */ 202 203static struct string_list fn_table; 204 205static uint32_t hash_line(const char *cp, size_t len) 206{ 207 size_t i; 208 uint32_t h; 209 for (i = 0, h = 0; i < len; i++) { 210 if (!isspace(cp[i])) { 211 h = h * 3 + (cp[i] & 0xff); 212 } 213 } 214 return h; 215} 216 217static void add_line_info(struct image *img, const char *bol, size_t len, unsigned flag) 218{ 219 ALLOC_GROW(img->line_allocated, img->nr + 1, img->alloc); 220 img->line_allocated[img->nr].len = len; 221 img->line_allocated[img->nr].hash = hash_line(bol, len); 222 img->line_allocated[img->nr].flag = flag; 223 img->nr++; 224} 225 226static void prepare_image(struct image *image, char *buf, size_t len, 227 int prepare_linetable) 228{ 229 const char *cp, *ep; 230 231 memset(image, 0, sizeof(*image)); 232 image->buf = buf; 233 image->len = len; 234 235 if (!prepare_linetable) 236 return; 237 238 ep = image->buf + image->len; 239 cp = image->buf; 240 while (cp < ep) { 241 const char *next; 242 for (next = cp; next < ep && *next != '\n'; next++) 243 ; 244 if (next < ep) 245 next++; 246 add_line_info(image, cp, next - cp, 0); 247 cp = next; 248 } 249 image->line = image->line_allocated; 250} 251 252static void clear_image(struct image *image) 253{ 254 free(image->buf); 255 image->buf = NULL; 256 image->len = 0; 257} 258 259static void say_patch_name(FILE *output, const char *pre, 260 struct patch *patch, const char *post) 261{ 262 fputs(pre, output); 263 if (patch->old_name && patch->new_name && 264 strcmp(patch->old_name, patch->new_name)) { 265 quote_c_style(patch->old_name, NULL, output, 0); 266 fputs(" => ", output); 267 quote_c_style(patch->new_name, NULL, output, 0); 268 } else { 269 const char *n = patch->new_name; 270 if (!n) 271 n = patch->old_name; 272 quote_c_style(n, NULL, output, 0); 273 } 274 fputs(post, output); 275} 276 277#define CHUNKSIZE (8192) 278#define SLOP (16) 279 280static void read_patch_file(struct strbuf *sb, int fd) 281{ 282 if (strbuf_read(sb, fd, 0) < 0) 283 die("git apply: read returned %s", strerror(errno)); 284 285 /* 286 * Make sure that we have some slop in the buffer 287 * so that we can do speculative "memcmp" etc, and 288 * see to it that it is NUL-filled. 289 */ 290 strbuf_grow(sb, SLOP); 291 memset(sb->buf + sb->len, 0, SLOP); 292} 293 294static unsigned long linelen(const char *buffer, unsigned long size) 295{ 296 unsigned long len = 0; 297 while (size--) { 298 len++; 299 if (*buffer++ == '\n') 300 break; 301 } 302 return len; 303} 304 305static int is_dev_null(const char *str) 306{ 307 return !memcmp("/dev/null", str, 9) && isspace(str[9]); 308} 309 310#define TERM_SPACE 1 311#define TERM_TAB 2 312 313static int name_terminate(const char *name, int namelen, int c, int terminate) 314{ 315 if (c == ' ' && !(terminate & TERM_SPACE)) 316 return 0; 317 if (c == '\t' && !(terminate & TERM_TAB)) 318 return 0; 319 320 return 1; 321} 322 323static char *find_name(const char *line, char *def, int p_value, int terminate) 324{ 325 int len; 326 const char *start = line; 327 328 if (*line == '"') { 329 struct strbuf name = STRBUF_INIT; 330 331 /* 332 * Proposed "new-style" GNU patch/diff format; see 333 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2 334 */ 335 if (!unquote_c_style(&name, line, NULL)) { 336 char *cp; 337 338 for (cp = name.buf; p_value; p_value--) { 339 cp = strchr(cp, '/'); 340 if (!cp) 341 break; 342 cp++; 343 } 344 if (cp) { 345 /* name can later be freed, so we need 346 * to memmove, not just return cp 347 */ 348 strbuf_remove(&name, 0, cp - name.buf); 349 free(def); 350 if (root) 351 strbuf_insert(&name, 0, root, root_len); 352 return strbuf_detach(&name, NULL); 353 } 354 } 355 strbuf_release(&name); 356 } 357 358 for (;;) { 359 char c = *line; 360 361 if (isspace(c)) { 362 if (c == '\n') 363 break; 364 if (name_terminate(start, line-start, c, terminate)) 365 break; 366 } 367 line++; 368 if (c == '/' && !--p_value) 369 start = line; 370 } 371 if (!start) 372 return def; 373 len = line - start; 374 if (!len) 375 return def; 376 377 /* 378 * Generally we prefer the shorter name, especially 379 * if the other one is just a variation of that with 380 * something else tacked on to the end (ie "file.orig" 381 * or "file~"). 382 */ 383 if (def) { 384 int deflen = strlen(def); 385 if (deflen < len && !strncmp(start, def, deflen)) 386 return def; 387 free(def); 388 } 389 390 if (root) { 391 char *ret = xmalloc(root_len + len + 1); 392 strcpy(ret, root); 393 memcpy(ret + root_len, start, len); 394 ret[root_len + len] = '\0'; 395 return ret; 396 } 397 398 return xmemdupz(start, len); 399} 400 401static int count_slashes(const char *cp) 402{ 403 int cnt = 0; 404 char ch; 405 406 while ((ch = *cp++)) 407 if (ch == '/') 408 cnt++; 409 return cnt; 410} 411 412/* 413 * Given the string after "--- " or "+++ ", guess the appropriate 414 * p_value for the given patch. 415 */ 416static int guess_p_value(const char *nameline) 417{ 418 char *name, *cp; 419 int val = -1; 420 421 if (is_dev_null(nameline)) 422 return -1; 423 name = find_name(nameline, NULL, 0, TERM_SPACE | TERM_TAB); 424 if (!name) 425 return -1; 426 cp = strchr(name, '/'); 427 if (!cp) 428 val = 0; 429 else if (prefix) { 430 /* 431 * Does it begin with "a/$our-prefix" and such? Then this is 432 * very likely to apply to our directory. 433 */ 434 if (!strncmp(name, prefix, prefix_length)) 435 val = count_slashes(prefix); 436 else { 437 cp++; 438 if (!strncmp(cp, prefix, prefix_length)) 439 val = count_slashes(prefix) + 1; 440 } 441 } 442 free(name); 443 return val; 444} 445 446/* 447 * Get the name etc info from the ---/+++ lines of a traditional patch header 448 * 449 * FIXME! The end-of-filename heuristics are kind of screwy. For existing 450 * files, we can happily check the index for a match, but for creating a 451 * new file we should try to match whatever "patch" does. I have no idea. 452 */ 453static void parse_traditional_patch(const char *first, const char *second, struct patch *patch) 454{ 455 char *name; 456 457 first += 4; /* skip "--- " */ 458 second += 4; /* skip "+++ " */ 459 if (!p_value_known) { 460 int p, q; 461 p = guess_p_value(first); 462 q = guess_p_value(second); 463 if (p < 0) p = q; 464 if (0 <= p && p == q) { 465 p_value = p; 466 p_value_known = 1; 467 } 468 } 469 if (is_dev_null(first)) { 470 patch->is_new = 1; 471 patch->is_delete = 0; 472 name = find_name(second, NULL, p_value, TERM_SPACE | TERM_TAB); 473 patch->new_name = name; 474 } else if (is_dev_null(second)) { 475 patch->is_new = 0; 476 patch->is_delete = 1; 477 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB); 478 patch->old_name = name; 479 } else { 480 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB); 481 name = find_name(second, name, p_value, TERM_SPACE | TERM_TAB); 482 patch->old_name = patch->new_name = name; 483 } 484 if (!name) 485 die("unable to find filename in patch at line %d", linenr); 486} 487 488static int gitdiff_hdrend(const char *line, struct patch *patch) 489{ 490 return -1; 491} 492 493/* 494 * We're anal about diff header consistency, to make 495 * sure that we don't end up having strange ambiguous 496 * patches floating around. 497 * 498 * As a result, gitdiff_{old|new}name() will check 499 * their names against any previous information, just 500 * to make sure.. 501 */ 502static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, const char *oldnew) 503{ 504 if (!orig_name && !isnull) 505 return find_name(line, NULL, p_value, TERM_TAB); 506 507 if (orig_name) { 508 int len; 509 const char *name; 510 char *another; 511 name = orig_name; 512 len = strlen(name); 513 if (isnull) 514 die("git apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr); 515 another = find_name(line, NULL, p_value, TERM_TAB); 516 if (!another || memcmp(another, name, len)) 517 die("git apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr); 518 free(another); 519 return orig_name; 520 } 521 else { 522 /* expect "/dev/null" */ 523 if (memcmp("/dev/null", line, 9) || line[9] != '\n') 524 die("git apply: bad git-diff - expected /dev/null on line %d", linenr); 525 return NULL; 526 } 527} 528 529static int gitdiff_oldname(const char *line, struct patch *patch) 530{ 531 patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name, "old"); 532 return 0; 533} 534 535static int gitdiff_newname(const char *line, struct patch *patch) 536{ 537 patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name, "new"); 538 return 0; 539} 540 541static int gitdiff_oldmode(const char *line, struct patch *patch) 542{ 543 patch->old_mode = strtoul(line, NULL, 8); 544 return 0; 545} 546 547static int gitdiff_newmode(const char *line, struct patch *patch) 548{ 549 patch->new_mode = strtoul(line, NULL, 8); 550 return 0; 551} 552 553static int gitdiff_delete(const char *line, struct patch *patch) 554{ 555 patch->is_delete = 1; 556 patch->old_name = patch->def_name; 557 return gitdiff_oldmode(line, patch); 558} 559 560static int gitdiff_newfile(const char *line, struct patch *patch) 561{ 562 patch->is_new = 1; 563 patch->new_name = patch->def_name; 564 return gitdiff_newmode(line, patch); 565} 566 567static int gitdiff_copysrc(const char *line, struct patch *patch) 568{ 569 patch->is_copy = 1; 570 patch->old_name = find_name(line, NULL, 0, 0); 571 return 0; 572} 573 574static int gitdiff_copydst(const char *line, struct patch *patch) 575{ 576 patch->is_copy = 1; 577 patch->new_name = find_name(line, NULL, 0, 0); 578 return 0; 579} 580 581static int gitdiff_renamesrc(const char *line, struct patch *patch) 582{ 583 patch->is_rename = 1; 584 patch->old_name = find_name(line, NULL, 0, 0); 585 return 0; 586} 587 588static int gitdiff_renamedst(const char *line, struct patch *patch) 589{ 590 patch->is_rename = 1; 591 patch->new_name = find_name(line, NULL, 0, 0); 592 return 0; 593} 594 595static int gitdiff_similarity(const char *line, struct patch *patch) 596{ 597 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX) 598 patch->score = 0; 599 return 0; 600} 601 602static int gitdiff_dissimilarity(const char *line, struct patch *patch) 603{ 604 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX) 605 patch->score = 0; 606 return 0; 607} 608 609static int gitdiff_index(const char *line, struct patch *patch) 610{ 611 /* 612 * index line is N hexadecimal, "..", N hexadecimal, 613 * and optional space with octal mode. 614 */ 615 const char *ptr, *eol; 616 int len; 617 618 ptr = strchr(line, '.'); 619 if (!ptr || ptr[1] != '.' || 40 < ptr - line) 620 return 0; 621 len = ptr - line; 622 memcpy(patch->old_sha1_prefix, line, len); 623 patch->old_sha1_prefix[len] = 0; 624 625 line = ptr + 2; 626 ptr = strchr(line, ' '); 627 eol = strchr(line, '\n'); 628 629 if (!ptr || eol < ptr) 630 ptr = eol; 631 len = ptr - line; 632 633 if (40 < len) 634 return 0; 635 memcpy(patch->new_sha1_prefix, line, len); 636 patch->new_sha1_prefix[len] = 0; 637 if (*ptr == ' ') 638 patch->old_mode = strtoul(ptr+1, NULL, 8); 639 return 0; 640} 641 642/* 643 * This is normal for a diff that doesn't change anything: we'll fall through 644 * into the next diff. Tell the parser to break out. 645 */ 646static int gitdiff_unrecognized(const char *line, struct patch *patch) 647{ 648 return -1; 649} 650 651static const char *stop_at_slash(const char *line, int llen) 652{ 653 int i; 654 655 for (i = 0; i < llen; i++) { 656 int ch = line[i]; 657 if (ch == '/') 658 return line + i; 659 } 660 return NULL; 661} 662 663/* 664 * This is to extract the same name that appears on "diff --git" 665 * line. We do not find and return anything if it is a rename 666 * patch, and it is OK because we will find the name elsewhere. 667 * We need to reliably find name only when it is mode-change only, 668 * creation or deletion of an empty file. In any of these cases, 669 * both sides are the same name under a/ and b/ respectively. 670 */ 671static char *git_header_name(char *line, int llen) 672{ 673 const char *name; 674 const char *second = NULL; 675 size_t len; 676 677 line += strlen("diff --git "); 678 llen -= strlen("diff --git "); 679 680 if (*line == '"') { 681 const char *cp; 682 struct strbuf first = STRBUF_INIT; 683 struct strbuf sp = STRBUF_INIT; 684 685 if (unquote_c_style(&first, line, &second)) 686 goto free_and_fail1; 687 688 /* advance to the first slash */ 689 cp = stop_at_slash(first.buf, first.len); 690 /* we do not accept absolute paths */ 691 if (!cp || cp == first.buf) 692 goto free_and_fail1; 693 strbuf_remove(&first, 0, cp + 1 - first.buf); 694 695 /* 696 * second points at one past closing dq of name. 697 * find the second name. 698 */ 699 while ((second < line + llen) && isspace(*second)) 700 second++; 701 702 if (line + llen <= second) 703 goto free_and_fail1; 704 if (*second == '"') { 705 if (unquote_c_style(&sp, second, NULL)) 706 goto free_and_fail1; 707 cp = stop_at_slash(sp.buf, sp.len); 708 if (!cp || cp == sp.buf) 709 goto free_and_fail1; 710 /* They must match, otherwise ignore */ 711 if (strcmp(cp + 1, first.buf)) 712 goto free_and_fail1; 713 strbuf_release(&sp); 714 return strbuf_detach(&first, NULL); 715 } 716 717 /* unquoted second */ 718 cp = stop_at_slash(second, line + llen - second); 719 if (!cp || cp == second) 720 goto free_and_fail1; 721 cp++; 722 if (line + llen - cp != first.len + 1 || 723 memcmp(first.buf, cp, first.len)) 724 goto free_and_fail1; 725 return strbuf_detach(&first, NULL); 726 727 free_and_fail1: 728 strbuf_release(&first); 729 strbuf_release(&sp); 730 return NULL; 731 } 732 733 /* unquoted first name */ 734 name = stop_at_slash(line, llen); 735 if (!name || name == line) 736 return NULL; 737 name++; 738 739 /* 740 * since the first name is unquoted, a dq if exists must be 741 * the beginning of the second name. 742 */ 743 for (second = name; second < line + llen; second++) { 744 if (*second == '"') { 745 struct strbuf sp = STRBUF_INIT; 746 const char *np; 747 748 if (unquote_c_style(&sp, second, NULL)) 749 goto free_and_fail2; 750 751 np = stop_at_slash(sp.buf, sp.len); 752 if (!np || np == sp.buf) 753 goto free_and_fail2; 754 np++; 755 756 len = sp.buf + sp.len - np; 757 if (len < second - name && 758 !strncmp(np, name, len) && 759 isspace(name[len])) { 760 /* Good */ 761 strbuf_remove(&sp, 0, np - sp.buf); 762 return strbuf_detach(&sp, NULL); 763 } 764 765 free_and_fail2: 766 strbuf_release(&sp); 767 return NULL; 768 } 769 } 770 771 /* 772 * Accept a name only if it shows up twice, exactly the same 773 * form. 774 */ 775 for (len = 0 ; ; len++) { 776 switch (name[len]) { 777 default: 778 continue; 779 case '\n': 780 return NULL; 781 case '\t': case ' ': 782 second = name+len; 783 for (;;) { 784 char c = *second++; 785 if (c == '\n') 786 return NULL; 787 if (c == '/') 788 break; 789 } 790 if (second[len] == '\n' && !memcmp(name, second, len)) { 791 return xmemdupz(name, len); 792 } 793 } 794 } 795} 796 797/* Verify that we recognize the lines following a git header */ 798static int parse_git_header(char *line, int len, unsigned int size, struct patch *patch) 799{ 800 unsigned long offset; 801 802 /* A git diff has explicit new/delete information, so we don't guess */ 803 patch->is_new = 0; 804 patch->is_delete = 0; 805 806 /* 807 * Some things may not have the old name in the 808 * rest of the headers anywhere (pure mode changes, 809 * or removing or adding empty files), so we get 810 * the default name from the header. 811 */ 812 patch->def_name = git_header_name(line, len); 813 if (patch->def_name && root) { 814 char *s = xmalloc(root_len + strlen(patch->def_name) + 1); 815 strcpy(s, root); 816 strcpy(s + root_len, patch->def_name); 817 free(patch->def_name); 818 patch->def_name = s; 819 } 820 821 line += len; 822 size -= len; 823 linenr++; 824 for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) { 825 static const struct opentry { 826 const char *str; 827 int (*fn)(const char *, struct patch *); 828 } optable[] = { 829 { "@@ -", gitdiff_hdrend }, 830 { "--- ", gitdiff_oldname }, 831 { "+++ ", gitdiff_newname }, 832 { "old mode ", gitdiff_oldmode }, 833 { "new mode ", gitdiff_newmode }, 834 { "deleted file mode ", gitdiff_delete }, 835 { "new file mode ", gitdiff_newfile }, 836 { "copy from ", gitdiff_copysrc }, 837 { "copy to ", gitdiff_copydst }, 838 { "rename old ", gitdiff_renamesrc }, 839 { "rename new ", gitdiff_renamedst }, 840 { "rename from ", gitdiff_renamesrc }, 841 { "rename to ", gitdiff_renamedst }, 842 { "similarity index ", gitdiff_similarity }, 843 { "dissimilarity index ", gitdiff_dissimilarity }, 844 { "index ", gitdiff_index }, 845 { "", gitdiff_unrecognized }, 846 }; 847 int i; 848 849 len = linelen(line, size); 850 if (!len || line[len-1] != '\n') 851 break; 852 for (i = 0; i < ARRAY_SIZE(optable); i++) { 853 const struct opentry *p = optable + i; 854 int oplen = strlen(p->str); 855 if (len < oplen || memcmp(p->str, line, oplen)) 856 continue; 857 if (p->fn(line + oplen, patch) < 0) 858 return offset; 859 break; 860 } 861 } 862 863 return offset; 864} 865 866static int parse_num(const char *line, unsigned long *p) 867{ 868 char *ptr; 869 870 if (!isdigit(*line)) 871 return 0; 872 *p = strtoul(line, &ptr, 10); 873 return ptr - line; 874} 875 876static int parse_range(const char *line, int len, int offset, const char *expect, 877 unsigned long *p1, unsigned long *p2) 878{ 879 int digits, ex; 880 881 if (offset < 0 || offset >= len) 882 return -1; 883 line += offset; 884 len -= offset; 885 886 digits = parse_num(line, p1); 887 if (!digits) 888 return -1; 889 890 offset += digits; 891 line += digits; 892 len -= digits; 893 894 *p2 = 1; 895 if (*line == ',') { 896 digits = parse_num(line+1, p2); 897 if (!digits) 898 return -1; 899 900 offset += digits+1; 901 line += digits+1; 902 len -= digits+1; 903 } 904 905 ex = strlen(expect); 906 if (ex > len) 907 return -1; 908 if (memcmp(line, expect, ex)) 909 return -1; 910 911 return offset + ex; 912} 913 914static void recount_diff(char *line, int size, struct fragment *fragment) 915{ 916 int oldlines = 0, newlines = 0, ret = 0; 917 918 if (size < 1) { 919 warning("recount: ignore empty hunk"); 920 return; 921 } 922 923 for (;;) { 924 int len = linelen(line, size); 925 size -= len; 926 line += len; 927 928 if (size < 1) 929 break; 930 931 switch (*line) { 932 case ' ': case '\n': 933 newlines++; 934 /* fall through */ 935 case '-': 936 oldlines++; 937 continue; 938 case '+': 939 newlines++; 940 continue; 941 case '\\': 942 continue; 943 case '@': 944 ret = size < 3 || prefixcmp(line, "@@ "); 945 break; 946 case 'd': 947 ret = size < 5 || prefixcmp(line, "diff "); 948 break; 949 default: 950 ret = -1; 951 break; 952 } 953 if (ret) { 954 warning("recount: unexpected line: %.*s", 955 (int)linelen(line, size), line); 956 return; 957 } 958 break; 959 } 960 fragment->oldlines = oldlines; 961 fragment->newlines = newlines; 962} 963 964/* 965 * Parse a unified diff fragment header of the 966 * form "@@ -a,b +c,d @@" 967 */ 968static int parse_fragment_header(char *line, int len, struct fragment *fragment) 969{ 970 int offset; 971 972 if (!len || line[len-1] != '\n') 973 return -1; 974 975 /* Figure out the number of lines in a fragment */ 976 offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines); 977 offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines); 978 979 return offset; 980} 981 982static int find_header(char *line, unsigned long size, int *hdrsize, struct patch *patch) 983{ 984 unsigned long offset, len; 985 986 patch->is_toplevel_relative = 0; 987 patch->is_rename = patch->is_copy = 0; 988 patch->is_new = patch->is_delete = -1; 989 patch->old_mode = patch->new_mode = 0; 990 patch->old_name = patch->new_name = NULL; 991 for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) { 992 unsigned long nextlen; 993 994 len = linelen(line, size); 995 if (!len) 996 break; 997 998 /* Testing this early allows us to take a few shortcuts.. */ 999 if (len < 6)1000 continue;10011002 /*1003 * Make sure we don't find any unconnected patch fragments.1004 * That's a sign that we didn't find a header, and that a1005 * patch has become corrupted/broken up.1006 */1007 if (!memcmp("@@ -", line, 4)) {1008 struct fragment dummy;1009 if (parse_fragment_header(line, len, &dummy) < 0)1010 continue;1011 die("patch fragment without header at line %d: %.*s",1012 linenr, (int)len-1, line);1013 }10141015 if (size < len + 6)1016 break;10171018 /*1019 * Git patch? It might not have a real patch, just a rename1020 * or mode change, so we handle that specially1021 */1022 if (!memcmp("diff --git ", line, 11)) {1023 int git_hdr_len = parse_git_header(line, len, size, patch);1024 if (git_hdr_len <= len)1025 continue;1026 if (!patch->old_name && !patch->new_name) {1027 if (!patch->def_name)1028 die("git diff header lacks filename information (line %d)", linenr);1029 patch->old_name = patch->new_name = patch->def_name;1030 }1031 patch->is_toplevel_relative = 1;1032 *hdrsize = git_hdr_len;1033 return offset;1034 }10351036 /* --- followed by +++ ? */1037 if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4))1038 continue;10391040 /*1041 * We only accept unified patches, so we want it to1042 * at least have "@@ -a,b +c,d @@\n", which is 14 chars1043 * minimum ("@@ -0,0 +1 @@\n" is the shortest).1044 */1045 nextlen = linelen(line + len, size - len);1046 if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))1047 continue;10481049 /* Ok, we'll consider it a patch */1050 parse_traditional_patch(line, line+len, patch);1051 *hdrsize = len + nextlen;1052 linenr += 2;1053 return offset;1054 }1055 return -1;1056}10571058static void check_whitespace(const char *line, int len, unsigned ws_rule)1059{1060 char *err;1061 unsigned result = ws_check(line + 1, len - 1, ws_rule);1062 if (!result)1063 return;10641065 whitespace_error++;1066 if (squelch_whitespace_errors &&1067 squelch_whitespace_errors < whitespace_error)1068 ;1069 else {1070 err = whitespace_error_string(result);1071 fprintf(stderr, "%s:%d: %s.\n%.*s\n",1072 patch_input_file, linenr, err, len - 2, line + 1);1073 free(err);1074 }1075}10761077/*1078 * Parse a unified diff. Note that this really needs to parse each1079 * fragment separately, since the only way to know the difference1080 * between a "---" that is part of a patch, and a "---" that starts1081 * the next patch is to look at the line counts..1082 */1083static int parse_fragment(char *line, unsigned long size,1084 struct patch *patch, struct fragment *fragment)1085{1086 int added, deleted;1087 int len = linelen(line, size), offset;1088 unsigned long oldlines, newlines;1089 unsigned long leading, trailing;10901091 offset = parse_fragment_header(line, len, fragment);1092 if (offset < 0)1093 return -1;1094 if (offset > 0 && patch->recount)1095 recount_diff(line + offset, size - offset, fragment);1096 oldlines = fragment->oldlines;1097 newlines = fragment->newlines;1098 leading = 0;1099 trailing = 0;11001101 /* Parse the thing.. */1102 line += len;1103 size -= len;1104 linenr++;1105 added = deleted = 0;1106 for (offset = len;1107 0 < size;1108 offset += len, size -= len, line += len, linenr++) {1109 if (!oldlines && !newlines)1110 break;1111 len = linelen(line, size);1112 if (!len || line[len-1] != '\n')1113 return -1;1114 switch (*line) {1115 default:1116 return -1;1117 case '\n': /* newer GNU diff, an empty context line */1118 case ' ':1119 oldlines--;1120 newlines--;1121 if (!deleted && !added)1122 leading++;1123 trailing++;1124 break;1125 case '-':1126 if (apply_in_reverse &&1127 ws_error_action != nowarn_ws_error)1128 check_whitespace(line, len, patch->ws_rule);1129 deleted++;1130 oldlines--;1131 trailing = 0;1132 break;1133 case '+':1134 if (!apply_in_reverse &&1135 ws_error_action != nowarn_ws_error)1136 check_whitespace(line, len, patch->ws_rule);1137 added++;1138 newlines--;1139 trailing = 0;1140 break;11411142 /*1143 * We allow "\ No newline at end of file". Depending1144 * on locale settings when the patch was produced we1145 * don't know what this line looks like. The only1146 * thing we do know is that it begins with "\ ".1147 * Checking for 12 is just for sanity check -- any1148 * l10n of "\ No newline..." is at least that long.1149 */1150 case '\\':1151 if (len < 12 || memcmp(line, "\\ ", 2))1152 return -1;1153 break;1154 }1155 }1156 if (oldlines || newlines)1157 return -1;1158 fragment->leading = leading;1159 fragment->trailing = trailing;11601161 /*1162 * If a fragment ends with an incomplete line, we failed to include1163 * it in the above loop because we hit oldlines == newlines == 01164 * before seeing it.1165 */1166 if (12 < size && !memcmp(line, "\\ ", 2))1167 offset += linelen(line, size);11681169 patch->lines_added += added;1170 patch->lines_deleted += deleted;11711172 if (0 < patch->is_new && oldlines)1173 return error("new file depends on old contents");1174 if (0 < patch->is_delete && newlines)1175 return error("deleted file still has contents");1176 return offset;1177}11781179static int parse_single_patch(char *line, unsigned long size, struct patch *patch)1180{1181 unsigned long offset = 0;1182 unsigned long oldlines = 0, newlines = 0, context = 0;1183 struct fragment **fragp = &patch->fragments;11841185 while (size > 4 && !memcmp(line, "@@ -", 4)) {1186 struct fragment *fragment;1187 int len;11881189 fragment = xcalloc(1, sizeof(*fragment));1190 len = parse_fragment(line, size, patch, fragment);1191 if (len <= 0)1192 die("corrupt patch at line %d", linenr);1193 fragment->patch = line;1194 fragment->size = len;1195 oldlines += fragment->oldlines;1196 newlines += fragment->newlines;1197 context += fragment->leading + fragment->trailing;11981199 *fragp = fragment;1200 fragp = &fragment->next;12011202 offset += len;1203 line += len;1204 size -= len;1205 }12061207 /*1208 * If something was removed (i.e. we have old-lines) it cannot1209 * be creation, and if something was added it cannot be1210 * deletion. However, the reverse is not true; --unified=01211 * patches that only add are not necessarily creation even1212 * though they do not have any old lines, and ones that only1213 * delete are not necessarily deletion.1214 *1215 * Unfortunately, a real creation/deletion patch do _not_ have1216 * any context line by definition, so we cannot safely tell it1217 * apart with --unified=0 insanity. At least if the patch has1218 * more than one hunk it is not creation or deletion.1219 */1220 if (patch->is_new < 0 &&1221 (oldlines || (patch->fragments && patch->fragments->next)))1222 patch->is_new = 0;1223 if (patch->is_delete < 0 &&1224 (newlines || (patch->fragments && patch->fragments->next)))1225 patch->is_delete = 0;12261227 if (0 < patch->is_new && oldlines)1228 die("new file %s depends on old contents", patch->new_name);1229 if (0 < patch->is_delete && newlines)1230 die("deleted file %s still has contents", patch->old_name);1231 if (!patch->is_delete && !newlines && context)1232 fprintf(stderr, "** warning: file %s becomes empty but "1233 "is not deleted\n", patch->new_name);12341235 return offset;1236}12371238static inline int metadata_changes(struct patch *patch)1239{1240 return patch->is_rename > 0 ||1241 patch->is_copy > 0 ||1242 patch->is_new > 0 ||1243 patch->is_delete ||1244 (patch->old_mode && patch->new_mode &&1245 patch->old_mode != patch->new_mode);1246}12471248static char *inflate_it(const void *data, unsigned long size,1249 unsigned long inflated_size)1250{1251 z_stream stream;1252 void *out;1253 int st;12541255 memset(&stream, 0, sizeof(stream));12561257 stream.next_in = (unsigned char *)data;1258 stream.avail_in = size;1259 stream.next_out = out = xmalloc(inflated_size);1260 stream.avail_out = inflated_size;1261 git_inflate_init(&stream);1262 st = git_inflate(&stream, Z_FINISH);1263 git_inflate_end(&stream);1264 if ((st != Z_STREAM_END) || stream.total_out != inflated_size) {1265 free(out);1266 return NULL;1267 }1268 return out;1269}12701271static struct fragment *parse_binary_hunk(char **buf_p,1272 unsigned long *sz_p,1273 int *status_p,1274 int *used_p)1275{1276 /*1277 * Expect a line that begins with binary patch method ("literal"1278 * or "delta"), followed by the length of data before deflating.1279 * a sequence of 'length-byte' followed by base-85 encoded data1280 * should follow, terminated by a newline.1281 *1282 * Each 5-byte sequence of base-85 encodes up to 4 bytes,1283 * and we would limit the patch line to 66 characters,1284 * so one line can fit up to 13 groups that would decode1285 * to 52 bytes max. The length byte 'A'-'Z' corresponds1286 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.1287 */1288 int llen, used;1289 unsigned long size = *sz_p;1290 char *buffer = *buf_p;1291 int patch_method;1292 unsigned long origlen;1293 char *data = NULL;1294 int hunk_size = 0;1295 struct fragment *frag;12961297 llen = linelen(buffer, size);1298 used = llen;12991300 *status_p = 0;13011302 if (!prefixcmp(buffer, "delta ")) {1303 patch_method = BINARY_DELTA_DEFLATED;1304 origlen = strtoul(buffer + 6, NULL, 10);1305 }1306 else if (!prefixcmp(buffer, "literal ")) {1307 patch_method = BINARY_LITERAL_DEFLATED;1308 origlen = strtoul(buffer + 8, NULL, 10);1309 }1310 else1311 return NULL;13121313 linenr++;1314 buffer += llen;1315 while (1) {1316 int byte_length, max_byte_length, newsize;1317 llen = linelen(buffer, size);1318 used += llen;1319 linenr++;1320 if (llen == 1) {1321 /* consume the blank line */1322 buffer++;1323 size--;1324 break;1325 }1326 /*1327 * Minimum line is "A00000\n" which is 7-byte long,1328 * and the line length must be multiple of 5 plus 2.1329 */1330 if ((llen < 7) || (llen-2) % 5)1331 goto corrupt;1332 max_byte_length = (llen - 2) / 5 * 4;1333 byte_length = *buffer;1334 if ('A' <= byte_length && byte_length <= 'Z')1335 byte_length = byte_length - 'A' + 1;1336 else if ('a' <= byte_length && byte_length <= 'z')1337 byte_length = byte_length - 'a' + 27;1338 else1339 goto corrupt;1340 /* if the input length was not multiple of 4, we would1341 * have filler at the end but the filler should never1342 * exceed 3 bytes1343 */1344 if (max_byte_length < byte_length ||1345 byte_length <= max_byte_length - 4)1346 goto corrupt;1347 newsize = hunk_size + byte_length;1348 data = xrealloc(data, newsize);1349 if (decode_85(data + hunk_size, buffer + 1, byte_length))1350 goto corrupt;1351 hunk_size = newsize;1352 buffer += llen;1353 size -= llen;1354 }13551356 frag = xcalloc(1, sizeof(*frag));1357 frag->patch = inflate_it(data, hunk_size, origlen);1358 if (!frag->patch)1359 goto corrupt;1360 free(data);1361 frag->size = origlen;1362 *buf_p = buffer;1363 *sz_p = size;1364 *used_p = used;1365 frag->binary_patch_method = patch_method;1366 return frag;13671368 corrupt:1369 free(data);1370 *status_p = -1;1371 error("corrupt binary patch at line %d: %.*s",1372 linenr-1, llen-1, buffer);1373 return NULL;1374}13751376static int parse_binary(char *buffer, unsigned long size, struct patch *patch)1377{1378 /*1379 * We have read "GIT binary patch\n"; what follows is a line1380 * that says the patch method (currently, either "literal" or1381 * "delta") and the length of data before deflating; a1382 * sequence of 'length-byte' followed by base-85 encoded data1383 * follows.1384 *1385 * When a binary patch is reversible, there is another binary1386 * hunk in the same format, starting with patch method (either1387 * "literal" or "delta") with the length of data, and a sequence1388 * of length-byte + base-85 encoded data, terminated with another1389 * empty line. This data, when applied to the postimage, produces1390 * the preimage.1391 */1392 struct fragment *forward;1393 struct fragment *reverse;1394 int status;1395 int used, used_1;13961397 forward = parse_binary_hunk(&buffer, &size, &status, &used);1398 if (!forward && !status)1399 /* there has to be one hunk (forward hunk) */1400 return error("unrecognized binary patch at line %d", linenr-1);1401 if (status)1402 /* otherwise we already gave an error message */1403 return status;14041405 reverse = parse_binary_hunk(&buffer, &size, &status, &used_1);1406 if (reverse)1407 used += used_1;1408 else if (status) {1409 /*1410 * Not having reverse hunk is not an error, but having1411 * a corrupt reverse hunk is.1412 */1413 free((void*) forward->patch);1414 free(forward);1415 return status;1416 }1417 forward->next = reverse;1418 patch->fragments = forward;1419 patch->is_binary = 1;1420 return used;1421}14221423static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)1424{1425 int hdrsize, patchsize;1426 int offset = find_header(buffer, size, &hdrsize, patch);14271428 if (offset < 0)1429 return offset;14301431 patch->ws_rule = whitespace_rule(patch->new_name1432 ? patch->new_name1433 : patch->old_name);14341435 patchsize = parse_single_patch(buffer + offset + hdrsize,1436 size - offset - hdrsize, patch);14371438 if (!patchsize) {1439 static const char *binhdr[] = {1440 "Binary files ",1441 "Files ",1442 NULL,1443 };1444 static const char git_binary[] = "GIT binary patch\n";1445 int i;1446 int hd = hdrsize + offset;1447 unsigned long llen = linelen(buffer + hd, size - hd);14481449 if (llen == sizeof(git_binary) - 1 &&1450 !memcmp(git_binary, buffer + hd, llen)) {1451 int used;1452 linenr++;1453 used = parse_binary(buffer + hd + llen,1454 size - hd - llen, patch);1455 if (used)1456 patchsize = used + llen;1457 else1458 patchsize = 0;1459 }1460 else if (!memcmp(" differ\n", buffer + hd + llen - 8, 8)) {1461 for (i = 0; binhdr[i]; i++) {1462 int len = strlen(binhdr[i]);1463 if (len < size - hd &&1464 !memcmp(binhdr[i], buffer + hd, len)) {1465 linenr++;1466 patch->is_binary = 1;1467 patchsize = llen;1468 break;1469 }1470 }1471 }14721473 /* Empty patch cannot be applied if it is a text patch1474 * without metadata change. A binary patch appears1475 * empty to us here.1476 */1477 if ((apply || check) &&1478 (!patch->is_binary && !metadata_changes(patch)))1479 die("patch with only garbage at line %d", linenr);1480 }14811482 return offset + hdrsize + patchsize;1483}14841485#define swap(a,b) myswap((a),(b),sizeof(a))14861487#define myswap(a, b, size) do { \1488 unsigned char mytmp[size]; \1489 memcpy(mytmp, &a, size); \1490 memcpy(&a, &b, size); \1491 memcpy(&b, mytmp, size); \1492} while (0)14931494static void reverse_patches(struct patch *p)1495{1496 for (; p; p = p->next) {1497 struct fragment *frag = p->fragments;14981499 swap(p->new_name, p->old_name);1500 swap(p->new_mode, p->old_mode);1501 swap(p->is_new, p->is_delete);1502 swap(p->lines_added, p->lines_deleted);1503 swap(p->old_sha1_prefix, p->new_sha1_prefix);15041505 for (; frag; frag = frag->next) {1506 swap(frag->newpos, frag->oldpos);1507 swap(frag->newlines, frag->oldlines);1508 }1509 }1510}15111512static const char pluses[] =1513"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";1514static const char minuses[]=1515"----------------------------------------------------------------------";15161517static void show_stats(struct patch *patch)1518{1519 struct strbuf qname = STRBUF_INIT;1520 char *cp = patch->new_name ? patch->new_name : patch->old_name;1521 int max, add, del;15221523 quote_c_style(cp, &qname, NULL, 0);15241525 /*1526 * "scale" the filename1527 */1528 max = max_len;1529 if (max > 50)1530 max = 50;15311532 if (qname.len > max) {1533 cp = strchr(qname.buf + qname.len + 3 - max, '/');1534 if (!cp)1535 cp = qname.buf + qname.len + 3 - max;1536 strbuf_splice(&qname, 0, cp - qname.buf, "...", 3);1537 }15381539 if (patch->is_binary) {1540 printf(" %-*s | Bin\n", max, qname.buf);1541 strbuf_release(&qname);1542 return;1543 }15441545 printf(" %-*s |", max, qname.buf);1546 strbuf_release(&qname);15471548 /*1549 * scale the add/delete1550 */1551 max = max + max_change > 70 ? 70 - max : max_change;1552 add = patch->lines_added;1553 del = patch->lines_deleted;15541555 if (max_change > 0) {1556 int total = ((add + del) * max + max_change / 2) / max_change;1557 add = (add * max + max_change / 2) / max_change;1558 del = total - add;1559 }1560 printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,1561 add, pluses, del, minuses);1562}15631564static int read_old_data(struct stat *st, const char *path, struct strbuf *buf)1565{1566 switch (st->st_mode & S_IFMT) {1567 case S_IFLNK:1568 if (strbuf_readlink(buf, path, st->st_size) < 0)1569 return error("unable to read symlink %s", path);1570 return 0;1571 case S_IFREG:1572 if (strbuf_read_file(buf, path, st->st_size) != st->st_size)1573 return error("unable to open or read %s", path);1574 convert_to_git(path, buf->buf, buf->len, buf, 0);1575 return 0;1576 default:1577 return -1;1578 }1579}15801581static void update_pre_post_images(struct image *preimage,1582 struct image *postimage,1583 char *buf,1584 size_t len)1585{1586 int i, ctx;1587 char *new, *old, *fixed;1588 struct image fixed_preimage;15891590 /*1591 * Update the preimage with whitespace fixes. Note that we1592 * are not losing preimage->buf -- apply_one_fragment() will1593 * free "oldlines".1594 */1595 prepare_image(&fixed_preimage, buf, len, 1);1596 assert(fixed_preimage.nr == preimage->nr);1597 for (i = 0; i < preimage->nr; i++)1598 fixed_preimage.line[i].flag = preimage->line[i].flag;1599 free(preimage->line_allocated);1600 *preimage = fixed_preimage;16011602 /*1603 * Adjust the common context lines in postimage, in place.1604 * This is possible because whitespace fixing does not make1605 * the string grow.1606 */1607 new = old = postimage->buf;1608 fixed = preimage->buf;1609 for (i = ctx = 0; i < postimage->nr; i++) {1610 size_t len = postimage->line[i].len;1611 if (!(postimage->line[i].flag & LINE_COMMON)) {1612 /* an added line -- no counterparts in preimage */1613 memmove(new, old, len);1614 old += len;1615 new += len;1616 continue;1617 }16181619 /* a common context -- skip it in the original postimage */1620 old += len;16211622 /* and find the corresponding one in the fixed preimage */1623 while (ctx < preimage->nr &&1624 !(preimage->line[ctx].flag & LINE_COMMON)) {1625 fixed += preimage->line[ctx].len;1626 ctx++;1627 }1628 if (preimage->nr <= ctx)1629 die("oops");16301631 /* and copy it in, while fixing the line length */1632 len = preimage->line[ctx].len;1633 memcpy(new, fixed, len);1634 new += len;1635 fixed += len;1636 postimage->line[i].len = len;1637 ctx++;1638 }16391640 /* Fix the length of the whole thing */1641 postimage->len = new - postimage->buf;1642}16431644static int match_fragment(struct image *img,1645 struct image *preimage,1646 struct image *postimage,1647 unsigned long try,1648 int try_lno,1649 unsigned ws_rule,1650 int match_beginning, int match_end)1651{1652 int i;1653 char *fixed_buf, *buf, *orig, *target;16541655 if (preimage->nr + try_lno > img->nr)1656 return 0;16571658 if (match_beginning && try_lno)1659 return 0;16601661 if (match_end && preimage->nr + try_lno != img->nr)1662 return 0;16631664 /* Quick hash check */1665 for (i = 0; i < preimage->nr; i++)1666 if (preimage->line[i].hash != img->line[try_lno + i].hash)1667 return 0;16681669 /*1670 * Do we have an exact match? If we were told to match1671 * at the end, size must be exactly at try+fragsize,1672 * otherwise try+fragsize must be still within the preimage,1673 * and either case, the old piece should match the preimage1674 * exactly.1675 */1676 if ((match_end1677 ? (try + preimage->len == img->len)1678 : (try + preimage->len <= img->len)) &&1679 !memcmp(img->buf + try, preimage->buf, preimage->len))1680 return 1;16811682 if (ws_error_action != correct_ws_error)1683 return 0;16841685 /*1686 * The hunk does not apply byte-by-byte, but the hash says1687 * it might with whitespace fuzz.1688 */1689 fixed_buf = xmalloc(preimage->len + 1);1690 buf = fixed_buf;1691 orig = preimage->buf;1692 target = img->buf + try;1693 for (i = 0; i < preimage->nr; i++) {1694 size_t fixlen; /* length after fixing the preimage */1695 size_t oldlen = preimage->line[i].len;1696 size_t tgtlen = img->line[try_lno + i].len;1697 size_t tgtfixlen; /* length after fixing the target line */1698 char tgtfixbuf[1024], *tgtfix;1699 int match;17001701 /* Try fixing the line in the preimage */1702 fixlen = ws_fix_copy(buf, orig, oldlen, ws_rule, NULL);17031704 /* Try fixing the line in the target */1705 if (sizeof(tgtfixbuf) > tgtlen)1706 tgtfix = tgtfixbuf;1707 else1708 tgtfix = xmalloc(tgtlen);1709 tgtfixlen = ws_fix_copy(tgtfix, target, tgtlen, ws_rule, NULL);17101711 /*1712 * If they match, either the preimage was based on1713 * a version before our tree fixed whitespace breakage,1714 * or we are lacking a whitespace-fix patch the tree1715 * the preimage was based on already had (i.e. target1716 * has whitespace breakage, the preimage doesn't).1717 * In either case, we are fixing the whitespace breakages1718 * so we might as well take the fix together with their1719 * real change.1720 */1721 match = (tgtfixlen == fixlen && !memcmp(tgtfix, buf, fixlen));17221723 if (tgtfix != tgtfixbuf)1724 free(tgtfix);1725 if (!match)1726 goto unmatch_exit;17271728 orig += oldlen;1729 buf += fixlen;1730 target += tgtlen;1731 }17321733 /*1734 * Yes, the preimage is based on an older version that still1735 * has whitespace breakages unfixed, and fixing them makes the1736 * hunk match. Update the context lines in the postimage.1737 */1738 update_pre_post_images(preimage, postimage,1739 fixed_buf, buf - fixed_buf);1740 return 1;17411742 unmatch_exit:1743 free(fixed_buf);1744 return 0;1745}17461747static int find_pos(struct image *img,1748 struct image *preimage,1749 struct image *postimage,1750 int line,1751 unsigned ws_rule,1752 int match_beginning, int match_end)1753{1754 int i;1755 unsigned long backwards, forwards, try;1756 int backwards_lno, forwards_lno, try_lno;17571758 if (preimage->nr > img->nr)1759 return -1;17601761 /*1762 * If match_begining or match_end is specified, there is no1763 * point starting from a wrong line that will never match and1764 * wander around and wait for a match at the specified end.1765 */1766 if (match_beginning)1767 line = 0;1768 else if (match_end)1769 line = img->nr - preimage->nr;17701771 if (line > img->nr)1772 line = img->nr;17731774 try = 0;1775 for (i = 0; i < line; i++)1776 try += img->line[i].len;17771778 /*1779 * There's probably some smart way to do this, but I'll leave1780 * that to the smart and beautiful people. I'm simple and stupid.1781 */1782 backwards = try;1783 backwards_lno = line;1784 forwards = try;1785 forwards_lno = line;1786 try_lno = line;17871788 for (i = 0; ; i++) {1789 if (match_fragment(img, preimage, postimage,1790 try, try_lno, ws_rule,1791 match_beginning, match_end))1792 return try_lno;17931794 again:1795 if (backwards_lno == 0 && forwards_lno == img->nr)1796 break;17971798 if (i & 1) {1799 if (backwards_lno == 0) {1800 i++;1801 goto again;1802 }1803 backwards_lno--;1804 backwards -= img->line[backwards_lno].len;1805 try = backwards;1806 try_lno = backwards_lno;1807 } else {1808 if (forwards_lno == img->nr) {1809 i++;1810 goto again;1811 }1812 forwards += img->line[forwards_lno].len;1813 forwards_lno++;1814 try = forwards;1815 try_lno = forwards_lno;1816 }18171818 }1819 return -1;1820}18211822static void remove_first_line(struct image *img)1823{1824 img->buf += img->line[0].len;1825 img->len -= img->line[0].len;1826 img->line++;1827 img->nr--;1828}18291830static void remove_last_line(struct image *img)1831{1832 img->len -= img->line[--img->nr].len;1833}18341835static void update_image(struct image *img,1836 int applied_pos,1837 struct image *preimage,1838 struct image *postimage)1839{1840 /*1841 * remove the copy of preimage at offset in img1842 * and replace it with postimage1843 */1844 int i, nr;1845 size_t remove_count, insert_count, applied_at = 0;1846 char *result;18471848 for (i = 0; i < applied_pos; i++)1849 applied_at += img->line[i].len;18501851 remove_count = 0;1852 for (i = 0; i < preimage->nr; i++)1853 remove_count += img->line[applied_pos + i].len;1854 insert_count = postimage->len;18551856 /* Adjust the contents */1857 result = xmalloc(img->len + insert_count - remove_count + 1);1858 memcpy(result, img->buf, applied_at);1859 memcpy(result + applied_at, postimage->buf, postimage->len);1860 memcpy(result + applied_at + postimage->len,1861 img->buf + (applied_at + remove_count),1862 img->len - (applied_at + remove_count));1863 free(img->buf);1864 img->buf = result;1865 img->len += insert_count - remove_count;1866 result[img->len] = '\0';18671868 /* Adjust the line table */1869 nr = img->nr + postimage->nr - preimage->nr;1870 if (preimage->nr < postimage->nr) {1871 /*1872 * NOTE: this knows that we never call remove_first_line()1873 * on anything other than pre/post image.1874 */1875 img->line = xrealloc(img->line, nr * sizeof(*img->line));1876 img->line_allocated = img->line;1877 }1878 if (preimage->nr != postimage->nr)1879 memmove(img->line + applied_pos + postimage->nr,1880 img->line + applied_pos + preimage->nr,1881 (img->nr - (applied_pos + preimage->nr)) *1882 sizeof(*img->line));1883 memcpy(img->line + applied_pos,1884 postimage->line,1885 postimage->nr * sizeof(*img->line));1886 img->nr = nr;1887}18881889static int apply_one_fragment(struct image *img, struct fragment *frag,1890 int inaccurate_eof, unsigned ws_rule)1891{1892 int match_beginning, match_end;1893 const char *patch = frag->patch;1894 int size = frag->size;1895 char *old, *new, *oldlines, *newlines;1896 int new_blank_lines_at_end = 0;1897 unsigned long leading, trailing;1898 int pos, applied_pos;1899 struct image preimage;1900 struct image postimage;19011902 memset(&preimage, 0, sizeof(preimage));1903 memset(&postimage, 0, sizeof(postimage));1904 oldlines = xmalloc(size);1905 newlines = xmalloc(size);19061907 old = oldlines;1908 new = newlines;1909 while (size > 0) {1910 char first;1911 int len = linelen(patch, size);1912 int plen, added;1913 int added_blank_line = 0;19141915 if (!len)1916 break;19171918 /*1919 * "plen" is how much of the line we should use for1920 * the actual patch data. Normally we just remove the1921 * first character on the line, but if the line is1922 * followed by "\ No newline", then we also remove the1923 * last one (which is the newline, of course).1924 */1925 plen = len - 1;1926 if (len < size && patch[len] == '\\')1927 plen--;1928 first = *patch;1929 if (apply_in_reverse) {1930 if (first == '-')1931 first = '+';1932 else if (first == '+')1933 first = '-';1934 }19351936 switch (first) {1937 case '\n':1938 /* Newer GNU diff, empty context line */1939 if (plen < 0)1940 /* ... followed by '\No newline'; nothing */1941 break;1942 *old++ = '\n';1943 *new++ = '\n';1944 add_line_info(&preimage, "\n", 1, LINE_COMMON);1945 add_line_info(&postimage, "\n", 1, LINE_COMMON);1946 break;1947 case ' ':1948 case '-':1949 memcpy(old, patch + 1, plen);1950 add_line_info(&preimage, old, plen,1951 (first == ' ' ? LINE_COMMON : 0));1952 old += plen;1953 if (first == '-')1954 break;1955 /* Fall-through for ' ' */1956 case '+':1957 /* --no-add does not add new lines */1958 if (first == '+' && no_add)1959 break;19601961 if (first != '+' ||1962 !whitespace_error ||1963 ws_error_action != correct_ws_error) {1964 memcpy(new, patch + 1, plen);1965 added = plen;1966 }1967 else {1968 added = ws_fix_copy(new, patch + 1, plen, ws_rule, &applied_after_fixing_ws);1969 }1970 add_line_info(&postimage, new, added,1971 (first == '+' ? 0 : LINE_COMMON));1972 new += added;1973 if (first == '+' &&1974 added == 1 && new[-1] == '\n')1975 added_blank_line = 1;1976 break;1977 case '@': case '\\':1978 /* Ignore it, we already handled it */1979 break;1980 default:1981 if (apply_verbosely)1982 error("invalid start of line: '%c'", first);1983 return -1;1984 }1985 if (added_blank_line)1986 new_blank_lines_at_end++;1987 else1988 new_blank_lines_at_end = 0;1989 patch += len;1990 size -= len;1991 }1992 if (inaccurate_eof &&1993 old > oldlines && old[-1] == '\n' &&1994 new > newlines && new[-1] == '\n') {1995 old--;1996 new--;1997 }19981999 leading = frag->leading;2000 trailing = frag->trailing;20012002 /*2003 * A hunk to change lines at the beginning would begin with2004 * @@ -1,L +N,M @@2005 * but we need to be careful. -U0 that inserts before the second2006 * line also has this pattern.2007 *2008 * And a hunk to add to an empty file would begin with2009 * @@ -0,0 +N,M @@2010 *2011 * In other words, a hunk that is (frag->oldpos <= 1) with or2012 * without leading context must match at the beginning.2013 */2014 match_beginning = (!frag->oldpos ||2015 (frag->oldpos == 1 && !unidiff_zero));20162017 /*2018 * A hunk without trailing lines must match at the end.2019 * However, we simply cannot tell if a hunk must match end2020 * from the lack of trailing lines if the patch was generated2021 * with unidiff without any context.2022 */2023 match_end = !unidiff_zero && !trailing;20242025 pos = frag->newpos ? (frag->newpos - 1) : 0;2026 preimage.buf = oldlines;2027 preimage.len = old - oldlines;2028 postimage.buf = newlines;2029 postimage.len = new - newlines;2030 preimage.line = preimage.line_allocated;2031 postimage.line = postimage.line_allocated;20322033 for (;;) {20342035 applied_pos = find_pos(img, &preimage, &postimage, pos,2036 ws_rule, match_beginning, match_end);20372038 if (applied_pos >= 0)2039 break;20402041 /* Am I at my context limits? */2042 if ((leading <= p_context) && (trailing <= p_context))2043 break;2044 if (match_beginning || match_end) {2045 match_beginning = match_end = 0;2046 continue;2047 }20482049 /*2050 * Reduce the number of context lines; reduce both2051 * leading and trailing if they are equal otherwise2052 * just reduce the larger context.2053 */2054 if (leading >= trailing) {2055 remove_first_line(&preimage);2056 remove_first_line(&postimage);2057 pos--;2058 leading--;2059 }2060 if (trailing > leading) {2061 remove_last_line(&preimage);2062 remove_last_line(&postimage);2063 trailing--;2064 }2065 }20662067 if (applied_pos >= 0) {2068 if (ws_error_action == correct_ws_error &&2069 new_blank_lines_at_end &&2070 postimage.nr + applied_pos == img->nr) {2071 /*2072 * If the patch application adds blank lines2073 * at the end, and if the patch applies at the2074 * end of the image, remove those added blank2075 * lines.2076 */2077 while (new_blank_lines_at_end--)2078 remove_last_line(&postimage);2079 }20802081 /*2082 * Warn if it was necessary to reduce the number2083 * of context lines.2084 */2085 if ((leading != frag->leading) ||2086 (trailing != frag->trailing))2087 fprintf(stderr, "Context reduced to (%ld/%ld)"2088 " to apply fragment at %d\n",2089 leading, trailing, applied_pos+1);2090 update_image(img, applied_pos, &preimage, &postimage);2091 } else {2092 if (apply_verbosely)2093 error("while searching for:\n%.*s",2094 (int)(old - oldlines), oldlines);2095 }20962097 free(oldlines);2098 free(newlines);2099 free(preimage.line_allocated);2100 free(postimage.line_allocated);21012102 return (applied_pos < 0);2103}21042105static int apply_binary_fragment(struct image *img, struct patch *patch)2106{2107 struct fragment *fragment = patch->fragments;2108 unsigned long len;2109 void *dst;21102111 /* Binary patch is irreversible without the optional second hunk */2112 if (apply_in_reverse) {2113 if (!fragment->next)2114 return error("cannot reverse-apply a binary patch "2115 "without the reverse hunk to '%s'",2116 patch->new_name2117 ? patch->new_name : patch->old_name);2118 fragment = fragment->next;2119 }2120 switch (fragment->binary_patch_method) {2121 case BINARY_DELTA_DEFLATED:2122 dst = patch_delta(img->buf, img->len, fragment->patch,2123 fragment->size, &len);2124 if (!dst)2125 return -1;2126 clear_image(img);2127 img->buf = dst;2128 img->len = len;2129 return 0;2130 case BINARY_LITERAL_DEFLATED:2131 clear_image(img);2132 img->len = fragment->size;2133 img->buf = xmalloc(img->len+1);2134 memcpy(img->buf, fragment->patch, img->len);2135 img->buf[img->len] = '\0';2136 return 0;2137 }2138 return -1;2139}21402141static int apply_binary(struct image *img, struct patch *patch)2142{2143 const char *name = patch->old_name ? patch->old_name : patch->new_name;2144 unsigned char sha1[20];21452146 /*2147 * For safety, we require patch index line to contain2148 * full 40-byte textual SHA1 for old and new, at least for now.2149 */2150 if (strlen(patch->old_sha1_prefix) != 40 ||2151 strlen(patch->new_sha1_prefix) != 40 ||2152 get_sha1_hex(patch->old_sha1_prefix, sha1) ||2153 get_sha1_hex(patch->new_sha1_prefix, sha1))2154 return error("cannot apply binary patch to '%s' "2155 "without full index line", name);21562157 if (patch->old_name) {2158 /*2159 * See if the old one matches what the patch2160 * applies to.2161 */2162 hash_sha1_file(img->buf, img->len, blob_type, sha1);2163 if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))2164 return error("the patch applies to '%s' (%s), "2165 "which does not match the "2166 "current contents.",2167 name, sha1_to_hex(sha1));2168 }2169 else {2170 /* Otherwise, the old one must be empty. */2171 if (img->len)2172 return error("the patch applies to an empty "2173 "'%s' but it is not empty", name);2174 }21752176 get_sha1_hex(patch->new_sha1_prefix, sha1);2177 if (is_null_sha1(sha1)) {2178 clear_image(img);2179 return 0; /* deletion patch */2180 }21812182 if (has_sha1_file(sha1)) {2183 /* We already have the postimage */2184 enum object_type type;2185 unsigned long size;2186 char *result;21872188 result = read_sha1_file(sha1, &type, &size);2189 if (!result)2190 return error("the necessary postimage %s for "2191 "'%s' cannot be read",2192 patch->new_sha1_prefix, name);2193 clear_image(img);2194 img->buf = result;2195 img->len = size;2196 } else {2197 /*2198 * We have verified buf matches the preimage;2199 * apply the patch data to it, which is stored2200 * in the patch->fragments->{patch,size}.2201 */2202 if (apply_binary_fragment(img, patch))2203 return error("binary patch does not apply to '%s'",2204 name);22052206 /* verify that the result matches */2207 hash_sha1_file(img->buf, img->len, blob_type, sha1);2208 if (strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))2209 return error("binary patch to '%s' creates incorrect result (expecting %s, got %s)",2210 name, patch->new_sha1_prefix, sha1_to_hex(sha1));2211 }22122213 return 0;2214}22152216static int apply_fragments(struct image *img, struct patch *patch)2217{2218 struct fragment *frag = patch->fragments;2219 const char *name = patch->old_name ? patch->old_name : patch->new_name;2220 unsigned ws_rule = patch->ws_rule;2221 unsigned inaccurate_eof = patch->inaccurate_eof;22222223 if (patch->is_binary)2224 return apply_binary(img, patch);22252226 while (frag) {2227 if (apply_one_fragment(img, frag, inaccurate_eof, ws_rule)) {2228 error("patch failed: %s:%ld", name, frag->oldpos);2229 if (!apply_with_reject)2230 return -1;2231 frag->rejected = 1;2232 }2233 frag = frag->next;2234 }2235 return 0;2236}22372238static int read_file_or_gitlink(struct cache_entry *ce, struct strbuf *buf)2239{2240 if (!ce)2241 return 0;22422243 if (S_ISGITLINK(ce->ce_mode)) {2244 strbuf_grow(buf, 100);2245 strbuf_addf(buf, "Subproject commit %s\n", sha1_to_hex(ce->sha1));2246 } else {2247 enum object_type type;2248 unsigned long sz;2249 char *result;22502251 result = read_sha1_file(ce->sha1, &type, &sz);2252 if (!result)2253 return -1;2254 /* XXX read_sha1_file NUL-terminates */2255 strbuf_attach(buf, result, sz, sz + 1);2256 }2257 return 0;2258}22592260static struct patch *in_fn_table(const char *name)2261{2262 struct string_list_item *item;22632264 if (name == NULL)2265 return NULL;22662267 item = string_list_lookup(name, &fn_table);2268 if (item != NULL)2269 return (struct patch *)item->util;22702271 return NULL;2272}22732274/*2275 * item->util in the filename table records the status of the path.2276 * Usually it points at a patch (whose result records the contents2277 * of it after applying it), but it could be PATH_WAS_DELETED for a2278 * path that a previously applied patch has already removed.2279 */2280 #define PATH_TO_BE_DELETED ((struct patch *) -2)2281#define PATH_WAS_DELETED ((struct patch *) -1)22822283static int to_be_deleted(struct patch *patch)2284{2285 return patch == PATH_TO_BE_DELETED;2286}22872288static int was_deleted(struct patch *patch)2289{2290 return patch == PATH_WAS_DELETED;2291}22922293static void add_to_fn_table(struct patch *patch)2294{2295 struct string_list_item *item;22962297 /*2298 * Always add new_name unless patch is a deletion2299 * This should cover the cases for normal diffs,2300 * file creations and copies2301 */2302 if (patch->new_name != NULL) {2303 item = string_list_insert(patch->new_name, &fn_table);2304 item->util = patch;2305 }23062307 /*2308 * store a failure on rename/deletion cases because2309 * later chunks shouldn't patch old names2310 */2311 if ((patch->new_name == NULL) || (patch->is_rename)) {2312 item = string_list_insert(patch->old_name, &fn_table);2313 item->util = PATH_WAS_DELETED;2314 }2315}23162317static void prepare_fn_table(struct patch *patch)2318{2319 /*2320 * store information about incoming file deletion2321 */2322 while (patch) {2323 if ((patch->new_name == NULL) || (patch->is_rename)) {2324 struct string_list_item *item;2325 item = string_list_insert(patch->old_name, &fn_table);2326 item->util = PATH_TO_BE_DELETED;2327 }2328 patch = patch->next;2329 }2330}23312332static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *ce)2333{2334 struct strbuf buf = STRBUF_INIT;2335 struct image image;2336 size_t len;2337 char *img;2338 struct patch *tpatch;23392340 if (!(patch->is_copy || patch->is_rename) &&2341 (tpatch = in_fn_table(patch->old_name)) != NULL && !to_be_deleted(tpatch)) {2342 if (was_deleted(tpatch)) {2343 return error("patch %s has been renamed/deleted",2344 patch->old_name);2345 }2346 /* We have a patched copy in memory use that */2347 strbuf_add(&buf, tpatch->result, tpatch->resultsize);2348 } else if (cached) {2349 if (read_file_or_gitlink(ce, &buf))2350 return error("read of %s failed", patch->old_name);2351 } else if (patch->old_name) {2352 if (S_ISGITLINK(patch->old_mode)) {2353 if (ce) {2354 read_file_or_gitlink(ce, &buf);2355 } else {2356 /*2357 * There is no way to apply subproject2358 * patch without looking at the index.2359 */2360 patch->fragments = NULL;2361 }2362 } else {2363 if (read_old_data(st, patch->old_name, &buf))2364 return error("read of %s failed", patch->old_name);2365 }2366 }23672368 img = strbuf_detach(&buf, &len);2369 prepare_image(&image, img, len, !patch->is_binary);23702371 if (apply_fragments(&image, patch) < 0)2372 return -1; /* note with --reject this succeeds. */2373 patch->result = image.buf;2374 patch->resultsize = image.len;2375 add_to_fn_table(patch);2376 free(image.line_allocated);23772378 if (0 < patch->is_delete && patch->resultsize)2379 return error("removal patch leaves file contents");23802381 return 0;2382}23832384static int check_to_create_blob(const char *new_name, int ok_if_exists)2385{2386 struct stat nst;2387 if (!lstat(new_name, &nst)) {2388 if (S_ISDIR(nst.st_mode) || ok_if_exists)2389 return 0;2390 /*2391 * A leading component of new_name might be a symlink2392 * that is going to be removed with this patch, but2393 * still pointing at somewhere that has the path.2394 * In such a case, path "new_name" does not exist as2395 * far as git is concerned.2396 */2397 if (has_symlink_leading_path(strlen(new_name), new_name))2398 return 0;23992400 return error("%s: already exists in working directory", new_name);2401 }2402 else if ((errno != ENOENT) && (errno != ENOTDIR))2403 return error("%s: %s", new_name, strerror(errno));2404 return 0;2405}24062407static int verify_index_match(struct cache_entry *ce, struct stat *st)2408{2409 if (S_ISGITLINK(ce->ce_mode)) {2410 if (!S_ISDIR(st->st_mode))2411 return -1;2412 return 0;2413 }2414 return ce_match_stat(ce, st, CE_MATCH_IGNORE_VALID);2415}24162417static int check_preimage(struct patch *patch, struct cache_entry **ce, struct stat *st)2418{2419 const char *old_name = patch->old_name;2420 struct patch *tpatch = NULL;2421 int stat_ret = 0;2422 unsigned st_mode = 0;24232424 /*2425 * Make sure that we do not have local modifications from the2426 * index when we are looking at the index. Also make sure2427 * we have the preimage file to be patched in the work tree,2428 * unless --cached, which tells git to apply only in the index.2429 */2430 if (!old_name)2431 return 0;24322433 assert(patch->is_new <= 0);24342435 if (!(patch->is_copy || patch->is_rename) &&2436 (tpatch = in_fn_table(old_name)) != NULL && !to_be_deleted(tpatch)) {2437 if (was_deleted(tpatch))2438 return error("%s: has been deleted/renamed", old_name);2439 st_mode = tpatch->new_mode;2440 } else if (!cached) {2441 stat_ret = lstat(old_name, st);2442 if (stat_ret && errno != ENOENT)2443 return error("%s: %s", old_name, strerror(errno));2444 }24452446 if (to_be_deleted(tpatch))2447 tpatch = NULL;24482449 if (check_index && !tpatch) {2450 int pos = cache_name_pos(old_name, strlen(old_name));2451 if (pos < 0) {2452 if (patch->is_new < 0)2453 goto is_new;2454 return error("%s: does not exist in index", old_name);2455 }2456 *ce = active_cache[pos];2457 if (stat_ret < 0) {2458 struct checkout costate;2459 /* checkout */2460 costate.base_dir = "";2461 costate.base_dir_len = 0;2462 costate.force = 0;2463 costate.quiet = 0;2464 costate.not_new = 0;2465 costate.refresh_cache = 1;2466 if (checkout_entry(*ce, &costate, NULL) ||2467 lstat(old_name, st))2468 return -1;2469 }2470 if (!cached && verify_index_match(*ce, st))2471 return error("%s: does not match index", old_name);2472 if (cached)2473 st_mode = (*ce)->ce_mode;2474 } else if (stat_ret < 0) {2475 if (patch->is_new < 0)2476 goto is_new;2477 return error("%s: %s", old_name, strerror(errno));2478 }24792480 if (!cached && !tpatch)2481 st_mode = ce_mode_from_stat(*ce, st->st_mode);24822483 if (patch->is_new < 0)2484 patch->is_new = 0;2485 if (!patch->old_mode)2486 patch->old_mode = st_mode;2487 if ((st_mode ^ patch->old_mode) & S_IFMT)2488 return error("%s: wrong type", old_name);2489 if (st_mode != patch->old_mode)2490 fprintf(stderr, "warning: %s has type %o, expected %o\n",2491 old_name, st_mode, patch->old_mode);2492 if (!patch->new_mode && !patch->is_delete)2493 patch->new_mode = st_mode;2494 return 0;24952496 is_new:2497 patch->is_new = 1;2498 patch->is_delete = 0;2499 patch->old_name = NULL;2500 return 0;2501}25022503static int check_patch(struct patch *patch)2504{2505 struct stat st;2506 const char *old_name = patch->old_name;2507 const char *new_name = patch->new_name;2508 const char *name = old_name ? old_name : new_name;2509 struct cache_entry *ce = NULL;2510 struct patch *tpatch;2511 int ok_if_exists;2512 int status;25132514 patch->rejected = 1; /* we will drop this after we succeed */25152516 status = check_preimage(patch, &ce, &st);2517 if (status)2518 return status;2519 old_name = patch->old_name;25202521 if ((tpatch = in_fn_table(new_name)) &&2522 (was_deleted(tpatch) || to_be_deleted(tpatch)))2523 /*2524 * A type-change diff is always split into a patch to2525 * delete old, immediately followed by a patch to2526 * create new (see diff.c::run_diff()); in such a case2527 * it is Ok that the entry to be deleted by the2528 * previous patch is still in the working tree and in2529 * the index.2530 */2531 ok_if_exists = 1;2532 else2533 ok_if_exists = 0;25342535 if (new_name &&2536 ((0 < patch->is_new) | (0 < patch->is_rename) | patch->is_copy)) {2537 if (check_index &&2538 cache_name_pos(new_name, strlen(new_name)) >= 0 &&2539 !ok_if_exists)2540 return error("%s: already exists in index", new_name);2541 if (!cached) {2542 int err = check_to_create_blob(new_name, ok_if_exists);2543 if (err)2544 return err;2545 }2546 if (!patch->new_mode) {2547 if (0 < patch->is_new)2548 patch->new_mode = S_IFREG | 0644;2549 else2550 patch->new_mode = patch->old_mode;2551 }2552 }25532554 if (new_name && old_name) {2555 int same = !strcmp(old_name, new_name);2556 if (!patch->new_mode)2557 patch->new_mode = patch->old_mode;2558 if ((patch->old_mode ^ patch->new_mode) & S_IFMT)2559 return error("new mode (%o) of %s does not match old mode (%o)%s%s",2560 patch->new_mode, new_name, patch->old_mode,2561 same ? "" : " of ", same ? "" : old_name);2562 }25632564 if (apply_data(patch, &st, ce) < 0)2565 return error("%s: patch does not apply", name);2566 patch->rejected = 0;2567 return 0;2568}25692570static int check_patch_list(struct patch *patch)2571{2572 int err = 0;25732574 prepare_fn_table(patch);2575 while (patch) {2576 if (apply_verbosely)2577 say_patch_name(stderr,2578 "Checking patch ", patch, "...\n");2579 err |= check_patch(patch);2580 patch = patch->next;2581 }2582 return err;2583}25842585/* This function tries to read the sha1 from the current index */2586static int get_current_sha1(const char *path, unsigned char *sha1)2587{2588 int pos;25892590 if (read_cache() < 0)2591 return -1;2592 pos = cache_name_pos(path, strlen(path));2593 if (pos < 0)2594 return -1;2595 hashcpy(sha1, active_cache[pos]->sha1);2596 return 0;2597}25982599/* Build an index that contains the just the files needed for a 3way merge */2600static void build_fake_ancestor(struct patch *list, const char *filename)2601{2602 struct patch *patch;2603 struct index_state result = { 0 };2604 int fd;26052606 /* Once we start supporting the reverse patch, it may be2607 * worth showing the new sha1 prefix, but until then...2608 */2609 for (patch = list; patch; patch = patch->next) {2610 const unsigned char *sha1_ptr;2611 unsigned char sha1[20];2612 struct cache_entry *ce;2613 const char *name;26142615 name = patch->old_name ? patch->old_name : patch->new_name;2616 if (0 < patch->is_new)2617 continue;2618 else if (get_sha1(patch->old_sha1_prefix, sha1))2619 /* git diff has no index line for mode/type changes */2620 if (!patch->lines_added && !patch->lines_deleted) {2621 if (get_current_sha1(patch->new_name, sha1) ||2622 get_current_sha1(patch->old_name, sha1))2623 die("mode change for %s, which is not "2624 "in current HEAD", name);2625 sha1_ptr = sha1;2626 } else2627 die("sha1 information is lacking or useless "2628 "(%s).", name);2629 else2630 sha1_ptr = sha1;26312632 ce = make_cache_entry(patch->old_mode, sha1_ptr, name, 0, 0);2633 if (!ce)2634 die("make_cache_entry failed for path '%s'", name);2635 if (add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD))2636 die ("Could not add %s to temporary index", name);2637 }26382639 fd = open(filename, O_WRONLY | O_CREAT, 0666);2640 if (fd < 0 || write_index(&result, fd) || close(fd))2641 die ("Could not write temporary index to %s", filename);26422643 discard_index(&result);2644}26452646static void stat_patch_list(struct patch *patch)2647{2648 int files, adds, dels;26492650 for (files = adds = dels = 0 ; patch ; patch = patch->next) {2651 files++;2652 adds += patch->lines_added;2653 dels += patch->lines_deleted;2654 show_stats(patch);2655 }26562657 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files, adds, dels);2658}26592660static void numstat_patch_list(struct patch *patch)2661{2662 for ( ; patch; patch = patch->next) {2663 const char *name;2664 name = patch->new_name ? patch->new_name : patch->old_name;2665 if (patch->is_binary)2666 printf("-\t-\t");2667 else2668 printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);2669 write_name_quoted(name, stdout, line_termination);2670 }2671}26722673static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)2674{2675 if (mode)2676 printf(" %s mode %06o %s\n", newdelete, mode, name);2677 else2678 printf(" %s %s\n", newdelete, name);2679}26802681static void show_mode_change(struct patch *p, int show_name)2682{2683 if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {2684 if (show_name)2685 printf(" mode change %06o => %06o %s\n",2686 p->old_mode, p->new_mode, p->new_name);2687 else2688 printf(" mode change %06o => %06o\n",2689 p->old_mode, p->new_mode);2690 }2691}26922693static void show_rename_copy(struct patch *p)2694{2695 const char *renamecopy = p->is_rename ? "rename" : "copy";2696 const char *old, *new;26972698 /* Find common prefix */2699 old = p->old_name;2700 new = p->new_name;2701 while (1) {2702 const char *slash_old, *slash_new;2703 slash_old = strchr(old, '/');2704 slash_new = strchr(new, '/');2705 if (!slash_old ||2706 !slash_new ||2707 slash_old - old != slash_new - new ||2708 memcmp(old, new, slash_new - new))2709 break;2710 old = slash_old + 1;2711 new = slash_new + 1;2712 }2713 /* p->old_name thru old is the common prefix, and old and new2714 * through the end of names are renames2715 */2716 if (old != p->old_name)2717 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,2718 (int)(old - p->old_name), p->old_name,2719 old, new, p->score);2720 else2721 printf(" %s %s => %s (%d%%)\n", renamecopy,2722 p->old_name, p->new_name, p->score);2723 show_mode_change(p, 0);2724}27252726static void summary_patch_list(struct patch *patch)2727{2728 struct patch *p;27292730 for (p = patch; p; p = p->next) {2731 if (p->is_new)2732 show_file_mode_name("create", p->new_mode, p->new_name);2733 else if (p->is_delete)2734 show_file_mode_name("delete", p->old_mode, p->old_name);2735 else {2736 if (p->is_rename || p->is_copy)2737 show_rename_copy(p);2738 else {2739 if (p->score) {2740 printf(" rewrite %s (%d%%)\n",2741 p->new_name, p->score);2742 show_mode_change(p, 0);2743 }2744 else2745 show_mode_change(p, 1);2746 }2747 }2748 }2749}27502751static void patch_stats(struct patch *patch)2752{2753 int lines = patch->lines_added + patch->lines_deleted;27542755 if (lines > max_change)2756 max_change = lines;2757 if (patch->old_name) {2758 int len = quote_c_style(patch->old_name, NULL, NULL, 0);2759 if (!len)2760 len = strlen(patch->old_name);2761 if (len > max_len)2762 max_len = len;2763 }2764 if (patch->new_name) {2765 int len = quote_c_style(patch->new_name, NULL, NULL, 0);2766 if (!len)2767 len = strlen(patch->new_name);2768 if (len > max_len)2769 max_len = len;2770 }2771}27722773static void remove_file(struct patch *patch, int rmdir_empty)2774{2775 if (update_index) {2776 if (remove_file_from_cache(patch->old_name) < 0)2777 die("unable to remove %s from index", patch->old_name);2778 }2779 if (!cached) {2780 if (S_ISGITLINK(patch->old_mode)) {2781 if (rmdir(patch->old_name))2782 warning("unable to remove submodule %s",2783 patch->old_name);2784 } else if (!unlink(patch->old_name) && rmdir_empty) {2785 remove_path(patch->old_name);2786 }2787 }2788}27892790static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size)2791{2792 struct stat st;2793 struct cache_entry *ce;2794 int namelen = strlen(path);2795 unsigned ce_size = cache_entry_size(namelen);27962797 if (!update_index)2798 return;27992800 ce = xcalloc(1, ce_size);2801 memcpy(ce->name, path, namelen);2802 ce->ce_mode = create_ce_mode(mode);2803 ce->ce_flags = namelen;2804 if (S_ISGITLINK(mode)) {2805 const char *s = buf;28062807 if (get_sha1_hex(s + strlen("Subproject commit "), ce->sha1))2808 die("corrupt patch for subproject %s", path);2809 } else {2810 if (!cached) {2811 if (lstat(path, &st) < 0)2812 die("unable to stat newly created file %s",2813 path);2814 fill_stat_cache_info(ce, &st);2815 }2816 if (write_sha1_file(buf, size, blob_type, ce->sha1) < 0)2817 die("unable to create backing store for newly created file %s", path);2818 }2819 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)2820 die("unable to add cache entry for %s", path);2821}28222823static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)2824{2825 int fd;2826 struct strbuf nbuf = STRBUF_INIT;28272828 if (S_ISGITLINK(mode)) {2829 struct stat st;2830 if (!lstat(path, &st) && S_ISDIR(st.st_mode))2831 return 0;2832 return mkdir(path, 0777);2833 }28342835 if (has_symlinks && S_ISLNK(mode))2836 /* Although buf:size is counted string, it also is NUL2837 * terminated.2838 */2839 return symlink(buf, path);28402841 fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);2842 if (fd < 0)2843 return -1;28442845 if (convert_to_working_tree(path, buf, size, &nbuf)) {2846 size = nbuf.len;2847 buf = nbuf.buf;2848 }2849 write_or_die(fd, buf, size);2850 strbuf_release(&nbuf);28512852 if (close(fd) < 0)2853 die("closing file %s: %s", path, strerror(errno));2854 return 0;2855}28562857/*2858 * We optimistically assume that the directories exist,2859 * which is true 99% of the time anyway. If they don't,2860 * we create them and try again.2861 */2862static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size)2863{2864 if (cached)2865 return;2866 if (!try_create_file(path, mode, buf, size))2867 return;28682869 if (errno == ENOENT) {2870 if (safe_create_leading_directories(path))2871 return;2872 if (!try_create_file(path, mode, buf, size))2873 return;2874 }28752876 if (errno == EEXIST || errno == EACCES) {2877 /* We may be trying to create a file where a directory2878 * used to be.2879 */2880 struct stat st;2881 if (!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))2882 errno = EEXIST;2883 }28842885 if (errno == EEXIST) {2886 unsigned int nr = getpid();28872888 for (;;) {2889 char newpath[PATH_MAX];2890 mksnpath(newpath, sizeof(newpath), "%s~%u", path, nr);2891 if (!try_create_file(newpath, mode, buf, size)) {2892 if (!rename(newpath, path))2893 return;2894 unlink(newpath);2895 break;2896 }2897 if (errno != EEXIST)2898 break;2899 ++nr;2900 }2901 }2902 die("unable to write file %s mode %o", path, mode);2903}29042905static void create_file(struct patch *patch)2906{2907 char *path = patch->new_name;2908 unsigned mode = patch->new_mode;2909 unsigned long size = patch->resultsize;2910 char *buf = patch->result;29112912 if (!mode)2913 mode = S_IFREG | 0644;2914 create_one_file(path, mode, buf, size);2915 add_index_file(path, mode, buf, size);2916}29172918/* phase zero is to remove, phase one is to create */2919static void write_out_one_result(struct patch *patch, int phase)2920{2921 if (patch->is_delete > 0) {2922 if (phase == 0)2923 remove_file(patch, 1);2924 return;2925 }2926 if (patch->is_new > 0 || patch->is_copy) {2927 if (phase == 1)2928 create_file(patch);2929 return;2930 }2931 /*2932 * Rename or modification boils down to the same2933 * thing: remove the old, write the new2934 */2935 if (phase == 0)2936 remove_file(patch, patch->is_rename);2937 if (phase == 1)2938 create_file(patch);2939}29402941static int write_out_one_reject(struct patch *patch)2942{2943 FILE *rej;2944 char namebuf[PATH_MAX];2945 struct fragment *frag;2946 int cnt = 0;29472948 for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) {2949 if (!frag->rejected)2950 continue;2951 cnt++;2952 }29532954 if (!cnt) {2955 if (apply_verbosely)2956 say_patch_name(stderr,2957 "Applied patch ", patch, " cleanly.\n");2958 return 0;2959 }29602961 /* This should not happen, because a removal patch that leaves2962 * contents are marked "rejected" at the patch level.2963 */2964 if (!patch->new_name)2965 die("internal error");29662967 /* Say this even without --verbose */2968 say_patch_name(stderr, "Applying patch ", patch, " with");2969 fprintf(stderr, " %d rejects...\n", cnt);29702971 cnt = strlen(patch->new_name);2972 if (ARRAY_SIZE(namebuf) <= cnt + 5) {2973 cnt = ARRAY_SIZE(namebuf) - 5;2974 fprintf(stderr,2975 "warning: truncating .rej filename to %.*s.rej",2976 cnt - 1, patch->new_name);2977 }2978 memcpy(namebuf, patch->new_name, cnt);2979 memcpy(namebuf + cnt, ".rej", 5);29802981 rej = fopen(namebuf, "w");2982 if (!rej)2983 return error("cannot open %s: %s", namebuf, strerror(errno));29842985 /* Normal git tools never deal with .rej, so do not pretend2986 * this is a git patch by saying --git nor give extended2987 * headers. While at it, maybe please "kompare" that wants2988 * the trailing TAB and some garbage at the end of line ;-).2989 */2990 fprintf(rej, "diff a/%s b/%s\t(rejected hunks)\n",2991 patch->new_name, patch->new_name);2992 for (cnt = 1, frag = patch->fragments;2993 frag;2994 cnt++, frag = frag->next) {2995 if (!frag->rejected) {2996 fprintf(stderr, "Hunk #%d applied cleanly.\n", cnt);2997 continue;2998 }2999 fprintf(stderr, "Rejected hunk #%d.\n", cnt);3000 fprintf(rej, "%.*s", frag->size, frag->patch);3001 if (frag->patch[frag->size-1] != '\n')3002 fputc('\n', rej);3003 }3004 fclose(rej);3005 return -1;3006}30073008static int write_out_results(struct patch *list, int skipped_patch)3009{3010 int phase;3011 int errs = 0;3012 struct patch *l;30133014 if (!list && !skipped_patch)3015 return error("No changes");30163017 for (phase = 0; phase < 2; phase++) {3018 l = list;3019 while (l) {3020 if (l->rejected)3021 errs = 1;3022 else {3023 write_out_one_result(l, phase);3024 if (phase == 1 && write_out_one_reject(l))3025 errs = 1;3026 }3027 l = l->next;3028 }3029 }3030 return errs;3031}30323033static struct lock_file lock_file;30343035static struct string_list limit_by_name;3036static int has_include;3037static void add_name_limit(const char *name, int exclude)3038{3039 struct string_list_item *it;30403041 it = string_list_append(name, &limit_by_name);3042 it->util = exclude ? NULL : (void *) 1;3043}30443045static int use_patch(struct patch *p)3046{3047 const char *pathname = p->new_name ? p->new_name : p->old_name;3048 int i;30493050 /* Paths outside are not touched regardless of "--include" */3051 if (0 < prefix_length) {3052 int pathlen = strlen(pathname);3053 if (pathlen <= prefix_length ||3054 memcmp(prefix, pathname, prefix_length))3055 return 0;3056 }30573058 /* See if it matches any of exclude/include rule */3059 for (i = 0; i < limit_by_name.nr; i++) {3060 struct string_list_item *it = &limit_by_name.items[i];3061 if (!fnmatch(it->string, pathname, 0))3062 return (it->util != NULL);3063 }30643065 /*3066 * If we had any include, a path that does not match any rule is3067 * not used. Otherwise, we saw bunch of exclude rules (or none)3068 * and such a path is used.3069 */3070 return !has_include;3071}307230733074static void prefix_one(char **name)3075{3076 char *old_name = *name;3077 if (!old_name)3078 return;3079 *name = xstrdup(prefix_filename(prefix, prefix_length, *name));3080 free(old_name);3081}30823083static void prefix_patches(struct patch *p)3084{3085 if (!prefix || p->is_toplevel_relative)3086 return;3087 for ( ; p; p = p->next) {3088 if (p->new_name == p->old_name) {3089 char *prefixed = p->new_name;3090 prefix_one(&prefixed);3091 p->new_name = p->old_name = prefixed;3092 }3093 else {3094 prefix_one(&p->new_name);3095 prefix_one(&p->old_name);3096 }3097 }3098}30993100#define INACCURATE_EOF (1<<0)3101#define RECOUNT (1<<1)31023103static int apply_patch(int fd, const char *filename, int options)3104{3105 size_t offset;3106 struct strbuf buf = STRBUF_INIT;3107 struct patch *list = NULL, **listp = &list;3108 int skipped_patch = 0;31093110 /* FIXME - memory leak when using multiple patch files as inputs */3111 memset(&fn_table, 0, sizeof(struct string_list));3112 patch_input_file = filename;3113 read_patch_file(&buf, fd);3114 offset = 0;3115 while (offset < buf.len) {3116 struct patch *patch;3117 int nr;31183119 patch = xcalloc(1, sizeof(*patch));3120 patch->inaccurate_eof = !!(options & INACCURATE_EOF);3121 patch->recount = !!(options & RECOUNT);3122 nr = parse_chunk(buf.buf + offset, buf.len - offset, patch);3123 if (nr < 0)3124 break;3125 if (apply_in_reverse)3126 reverse_patches(patch);3127 if (prefix)3128 prefix_patches(patch);3129 if (use_patch(patch)) {3130 patch_stats(patch);3131 *listp = patch;3132 listp = &patch->next;3133 }3134 else {3135 /* perhaps free it a bit better? */3136 free(patch);3137 skipped_patch++;3138 }3139 offset += nr;3140 }31413142 if (whitespace_error && (ws_error_action == die_on_ws_error))3143 apply = 0;31443145 update_index = check_index && apply;3146 if (update_index && newfd < 0)3147 newfd = hold_locked_index(&lock_file, 1);31483149 if (check_index) {3150 if (read_cache() < 0)3151 die("unable to read index file");3152 }31533154 if ((check || apply) &&3155 check_patch_list(list) < 0 &&3156 !apply_with_reject)3157 exit(1);31583159 if (apply && write_out_results(list, skipped_patch))3160 exit(1);31613162 if (fake_ancestor)3163 build_fake_ancestor(list, fake_ancestor);31643165 if (diffstat)3166 stat_patch_list(list);31673168 if (numstat)3169 numstat_patch_list(list);31703171 if (summary)3172 summary_patch_list(list);31733174 strbuf_release(&buf);3175 return 0;3176}31773178static int git_apply_config(const char *var, const char *value, void *cb)3179{3180 if (!strcmp(var, "apply.whitespace"))3181 return git_config_string(&apply_default_whitespace, var, value);3182 return git_default_config(var, value, cb);3183}31843185static int option_parse_exclude(const struct option *opt,3186 const char *arg, int unset)3187{3188 add_name_limit(arg, 1);3189 return 0;3190}31913192static int option_parse_include(const struct option *opt,3193 const char *arg, int unset)3194{3195 add_name_limit(arg, 0);3196 has_include = 1;3197 return 0;3198}31993200static int option_parse_p(const struct option *opt,3201 const char *arg, int unset)3202{3203 p_value = atoi(arg);3204 p_value_known = 1;3205 return 0;3206}32073208static int option_parse_z(const struct option *opt,3209 const char *arg, int unset)3210{3211 if (unset)3212 line_termination = '\n';3213 else3214 line_termination = 0;3215 return 0;3216}32173218static int option_parse_whitespace(const struct option *opt,3219 const char *arg, int unset)3220{3221 const char **whitespace_option = opt->value;32223223 *whitespace_option = arg;3224 parse_whitespace_option(arg);3225 return 0;3226}32273228static int option_parse_directory(const struct option *opt,3229 const char *arg, int unset)3230{3231 root_len = strlen(arg);3232 if (root_len && arg[root_len - 1] != '/') {3233 char *new_root;3234 root = new_root = xmalloc(root_len + 2);3235 strcpy(new_root, arg);3236 strcpy(new_root + root_len++, "/");3237 } else3238 root = arg;3239 return 0;3240}32413242int cmd_apply(int argc, const char **argv, const char *unused_prefix)3243{3244 int i;3245 int errs = 0;3246 int is_not_gitdir;3247 int binary;3248 int force_apply = 0;32493250 const char *whitespace_option = NULL;32513252 struct option builtin_apply_options[] = {3253 { OPTION_CALLBACK, 0, "exclude", NULL, "path",3254 "don't apply changes matching the given path",3255 0, option_parse_exclude },3256 { OPTION_CALLBACK, 0, "include", NULL, "path",3257 "apply changes matching the given path",3258 0, option_parse_include },3259 { OPTION_CALLBACK, 'p', NULL, NULL, "num",3260 "remove <num> leading slashes from traditional diff paths",3261 0, option_parse_p },3262 OPT_BOOLEAN(0, "no-add", &no_add,3263 "ignore additions made by the patch"),3264 OPT_BOOLEAN(0, "stat", &diffstat,3265 "instead of applying the patch, output diffstat for the input"),3266 OPT_BOOLEAN(0, "allow-binary-replacement", &binary,3267 "now no-op"),3268 OPT_BOOLEAN(0, "binary", &binary,3269 "now no-op"),3270 OPT_BOOLEAN(0, "numstat", &numstat,3271 "shows number of added and deleted lines in decimal notation"),3272 OPT_BOOLEAN(0, "summary", &summary,3273 "instead of applying the patch, output a summary for the input"),3274 OPT_BOOLEAN(0, "check", &check,3275 "instead of applying the patch, see if the patch is applicable"),3276 OPT_BOOLEAN(0, "index", &check_index,3277 "make sure the patch is applicable to the current index"),3278 OPT_BOOLEAN(0, "cached", &cached,3279 "apply a patch without touching the working tree"),3280 OPT_BOOLEAN(0, "apply", &force_apply,3281 "also apply the patch (use with --stat/--summary/--check)"),3282 OPT_STRING(0, "build-fake-ancestor", &fake_ancestor, "file",3283 "build a temporary index based on embedded index information"),3284 { OPTION_CALLBACK, 'z', NULL, NULL, NULL,3285 "paths are separated with NUL character",3286 PARSE_OPT_NOARG, option_parse_z },3287 OPT_INTEGER('C', NULL, &p_context,3288 "ensure at least <n> lines of context match"),3289 { OPTION_CALLBACK, 0, "whitespace", &whitespace_option, "action",3290 "detect new or modified lines that have whitespace errors",3291 0, option_parse_whitespace },3292 OPT_BOOLEAN('R', "reverse", &apply_in_reverse,3293 "apply the patch in reverse"),3294 OPT_BOOLEAN(0, "unidiff-zero", &unidiff_zero,3295 "don't expect at least one line of context"),3296 OPT_BOOLEAN(0, "reject", &apply_with_reject,3297 "leave the rejected hunks in corresponding *.rej files"),3298 OPT__VERBOSE(&apply_verbosely),3299 OPT_BIT(0, "inaccurate-eof", &options,3300 "tolerate incorrectly detected missing new-line at the end of file",3301 INACCURATE_EOF),3302 OPT_BIT(0, "recount", &options,3303 "do not trust the line counts in the hunk headers",3304 RECOUNT),3305 { OPTION_CALLBACK, 0, "directory", NULL, "root",3306 "prepend <root> to all filenames",3307 0, option_parse_directory },3308 OPT_END()3309 };33103311 prefix = setup_git_directory_gently(&is_not_gitdir);3312 prefix_length = prefix ? strlen(prefix) : 0;3313 git_config(git_apply_config, NULL);3314 if (apply_default_whitespace)3315 parse_whitespace_option(apply_default_whitespace);33163317 argc = parse_options(argc, argv, builtin_apply_options,3318 apply_usage, 0);3319 if (apply_with_reject)3320 apply = apply_verbosely = 1;3321 if (!force_apply && (diffstat || numstat || summary || check || fake_ancestor))3322 apply = 0;3323 if (check_index && is_not_gitdir)3324 die("--index outside a repository");3325 if (cached) {3326 if (is_not_gitdir)3327 die("--cached outside a repository");3328 check_index = 1;3329 }3330 for (i = 0; i < argc; i++) {3331 const char *arg = argv[i];3332 int fd;33333334 if (!strcmp(arg, "-")) {3335 errs |= apply_patch(0, "<stdin>", options);3336 read_stdin = 0;3337 continue;3338 } else if (0 < prefix_length)3339 arg = prefix_filename(prefix, prefix_length, arg);33403341 fd = open(arg, O_RDONLY);3342 if (fd < 0)3343 die("can't open patch '%s': %s", arg, strerror(errno));3344 read_stdin = 0;3345 set_default_whitespace_mode(whitespace_option);3346 errs |= apply_patch(fd, arg, options);3347 close(fd);3348 }3349 set_default_whitespace_mode(whitespace_option);3350 if (read_stdin)3351 errs |= apply_patch(0, "<stdin>", options);3352 if (whitespace_error) {3353 if (squelch_whitespace_errors &&3354 squelch_whitespace_errors < whitespace_error) {3355 int squelched =3356 whitespace_error - squelch_whitespace_errors;3357 fprintf(stderr, "warning: squelched %d "3358 "whitespace error%s\n",3359 squelched,3360 squelched == 1 ? "" : "s");3361 }3362 if (ws_error_action == die_on_ws_error)3363 die("%d line%s add%s whitespace errors.",3364 whitespace_error,3365 whitespace_error == 1 ? "" : "s",3366 whitespace_error == 1 ? "s" : "");3367 if (applied_after_fixing_ws && apply)3368 fprintf(stderr, "warning: %d line%s applied after"3369 " fixing whitespace errors.\n",3370 applied_after_fixing_ws,3371 applied_after_fixing_ws == 1 ? "" : "s");3372 else if (whitespace_error)3373 fprintf(stderr, "warning: %d line%s add%s whitespace errors.\n",3374 whitespace_error,3375 whitespace_error == 1 ? "" : "s",3376 whitespace_error == 1 ? "s" : "");3377 }33783379 if (update_index) {3380 if (write_cache(newfd, active_cache, active_nr) ||3381 commit_locked_index(&lock_file))3382 die("Unable to write new index file");3383 }33843385 return !!errs;3386}