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 "diff.h" 18#include "parse-options.h" 19#include "xdiff-interface.h" 20#include "ll-merge.h" 21#include "rerere.h" 22 23/* 24 * --check turns on checking that the working tree matches the 25 * files that are being modified, but doesn't apply the patch 26 * --stat does just a diffstat, and doesn't actually apply 27 * --numstat does numeric diffstat, and doesn't actually apply 28 * --index-info shows the old and new index info for paths if available. 29 * --index updates the cache as well. 30 * --cached updates only the cache without ever touching the working tree. 31 */ 32static const char *prefix; 33static int prefix_length = -1; 34static int newfd = -1; 35 36static int unidiff_zero; 37static int p_value = 1; 38static int p_value_known; 39static int check_index; 40static int update_index; 41static int cached; 42static int diffstat; 43static int numstat; 44static int summary; 45static int check; 46static int apply = 1; 47static int apply_in_reverse; 48static int apply_with_reject; 49static int apply_verbosely; 50static int allow_overlap; 51static int no_add; 52static int threeway; 53static const char *fake_ancestor; 54static int line_termination = '\n'; 55static unsigned int p_context = UINT_MAX; 56static const char * const apply_usage[] = { 57 N_("git apply [options] [<patch>...]"), 58 NULL 59}; 60 61static enum ws_error_action { 62 nowarn_ws_error, 63 warn_on_ws_error, 64 die_on_ws_error, 65 correct_ws_error 66} ws_error_action = warn_on_ws_error; 67static int whitespace_error; 68static int squelch_whitespace_errors = 5; 69static int applied_after_fixing_ws; 70 71static enum ws_ignore { 72 ignore_ws_none, 73 ignore_ws_change 74} ws_ignore_action = ignore_ws_none; 75 76 77static const char *patch_input_file; 78static const char *root; 79static int root_len; 80static int read_stdin = 1; 81static int options; 82 83static void parse_whitespace_option(const char *option) 84{ 85 if (!option) { 86 ws_error_action = warn_on_ws_error; 87 return; 88 } 89 if (!strcmp(option, "warn")) { 90 ws_error_action = warn_on_ws_error; 91 return; 92 } 93 if (!strcmp(option, "nowarn")) { 94 ws_error_action = nowarn_ws_error; 95 return; 96 } 97 if (!strcmp(option, "error")) { 98 ws_error_action = die_on_ws_error; 99 return; 100 } 101 if (!strcmp(option, "error-all")) { 102 ws_error_action = die_on_ws_error; 103 squelch_whitespace_errors = 0; 104 return; 105 } 106 if (!strcmp(option, "strip") || !strcmp(option, "fix")) { 107 ws_error_action = correct_ws_error; 108 return; 109 } 110 die(_("unrecognized whitespace option '%s'"), option); 111} 112 113static void parse_ignorewhitespace_option(const char *option) 114{ 115 if (!option || !strcmp(option, "no") || 116 !strcmp(option, "false") || !strcmp(option, "never") || 117 !strcmp(option, "none")) { 118 ws_ignore_action = ignore_ws_none; 119 return; 120 } 121 if (!strcmp(option, "change")) { 122 ws_ignore_action = ignore_ws_change; 123 return; 124 } 125 die(_("unrecognized whitespace ignore option '%s'"), option); 126} 127 128static void set_default_whitespace_mode(const char *whitespace_option) 129{ 130 if (!whitespace_option && !apply_default_whitespace) 131 ws_error_action = (apply ? warn_on_ws_error : nowarn_ws_error); 132} 133 134/* 135 * For "diff-stat" like behaviour, we keep track of the biggest change 136 * we've seen, and the longest filename. That allows us to do simple 137 * scaling. 138 */ 139static int max_change, max_len; 140 141/* 142 * Various "current state", notably line numbers and what 143 * file (and how) we're patching right now.. The "is_xxxx" 144 * things are flags, where -1 means "don't know yet". 145 */ 146static int linenr = 1; 147 148/* 149 * This represents one "hunk" from a patch, starting with 150 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The 151 * patch text is pointed at by patch, and its byte length 152 * is stored in size. leading and trailing are the number 153 * of context lines. 154 */ 155struct fragment { 156 unsigned long leading, trailing; 157 unsigned long oldpos, oldlines; 158 unsigned long newpos, newlines; 159 /* 160 * 'patch' is usually borrowed from buf in apply_patch(), 161 * but some codepaths store an allocated buffer. 162 */ 163 const char *patch; 164 unsigned free_patch:1, 165 rejected:1; 166 int size; 167 int linenr; 168 struct fragment *next; 169}; 170 171/* 172 * When dealing with a binary patch, we reuse "leading" field 173 * to store the type of the binary hunk, either deflated "delta" 174 * or deflated "literal". 175 */ 176#define binary_patch_method leading 177#define BINARY_DELTA_DEFLATED 1 178#define BINARY_LITERAL_DEFLATED 2 179 180/* 181 * This represents a "patch" to a file, both metainfo changes 182 * such as creation/deletion, filemode and content changes represented 183 * as a series of fragments. 184 */ 185struct patch { 186 char *new_name, *old_name, *def_name; 187 unsigned int old_mode, new_mode; 188 int is_new, is_delete; /* -1 = unknown, 0 = false, 1 = true */ 189 int rejected; 190 unsigned ws_rule; 191 int lines_added, lines_deleted; 192 int score; 193 unsigned int is_toplevel_relative:1; 194 unsigned int inaccurate_eof:1; 195 unsigned int is_binary:1; 196 unsigned int is_copy:1; 197 unsigned int is_rename:1; 198 unsigned int recount:1; 199 unsigned int conflicted_threeway:1; 200 unsigned int direct_to_threeway:1; 201 struct fragment *fragments; 202 char *result; 203 size_t resultsize; 204 char old_sha1_prefix[41]; 205 char new_sha1_prefix[41]; 206 struct patch *next; 207 208 /* three-way fallback result */ 209 unsigned char threeway_stage[3][20]; 210}; 211 212static void free_fragment_list(struct fragment *list) 213{ 214 while (list) { 215 struct fragment *next = list->next; 216 if (list->free_patch) 217 free((char *)list->patch); 218 free(list); 219 list = next; 220 } 221} 222 223static void free_patch(struct patch *patch) 224{ 225 free_fragment_list(patch->fragments); 226 free(patch->def_name); 227 free(patch->old_name); 228 free(patch->new_name); 229 free(patch->result); 230 free(patch); 231} 232 233static void free_patch_list(struct patch *list) 234{ 235 while (list) { 236 struct patch *next = list->next; 237 free_patch(list); 238 list = next; 239 } 240} 241 242/* 243 * A line in a file, len-bytes long (includes the terminating LF, 244 * except for an incomplete line at the end if the file ends with 245 * one), and its contents hashes to 'hash'. 246 */ 247struct line { 248 size_t len; 249 unsigned hash : 24; 250 unsigned flag : 8; 251#define LINE_COMMON 1 252#define LINE_PATCHED 2 253}; 254 255/* 256 * This represents a "file", which is an array of "lines". 257 */ 258struct image { 259 char *buf; 260 size_t len; 261 size_t nr; 262 size_t alloc; 263 struct line *line_allocated; 264 struct line *line; 265}; 266 267/* 268 * Records filenames that have been touched, in order to handle 269 * the case where more than one patches touch the same file. 270 */ 271 272static struct string_list fn_table; 273 274static uint32_t hash_line(const char *cp, size_t len) 275{ 276 size_t i; 277 uint32_t h; 278 for (i = 0, h = 0; i < len; i++) { 279 if (!isspace(cp[i])) { 280 h = h * 3 + (cp[i] & 0xff); 281 } 282 } 283 return h; 284} 285 286/* 287 * Compare lines s1 of length n1 and s2 of length n2, ignoring 288 * whitespace difference. Returns 1 if they match, 0 otherwise 289 */ 290static int fuzzy_matchlines(const char *s1, size_t n1, 291 const char *s2, size_t n2) 292{ 293 const char *last1 = s1 + n1 - 1; 294 const char *last2 = s2 + n2 - 1; 295 int result = 0; 296 297 /* ignore line endings */ 298 while ((*last1 == '\r') || (*last1 == '\n')) 299 last1--; 300 while ((*last2 == '\r') || (*last2 == '\n')) 301 last2--; 302 303 /* skip leading whitespaces, if both begin with whitespace */ 304 if (s1 <= last1 && s2 <= last2 && isspace(*s1) && isspace(*s2)) { 305 while (isspace(*s1) && (s1 <= last1)) 306 s1++; 307 while (isspace(*s2) && (s2 <= last2)) 308 s2++; 309 } 310 /* early return if both lines are empty */ 311 if ((s1 > last1) && (s2 > last2)) 312 return 1; 313 while (!result) { 314 result = *s1++ - *s2++; 315 /* 316 * Skip whitespace inside. We check for whitespace on 317 * both buffers because we don't want "a b" to match 318 * "ab" 319 */ 320 if (isspace(*s1) && isspace(*s2)) { 321 while (isspace(*s1) && s1 <= last1) 322 s1++; 323 while (isspace(*s2) && s2 <= last2) 324 s2++; 325 } 326 /* 327 * If we reached the end on one side only, 328 * lines don't match 329 */ 330 if ( 331 ((s2 > last2) && (s1 <= last1)) || 332 ((s1 > last1) && (s2 <= last2))) 333 return 0; 334 if ((s1 > last1) && (s2 > last2)) 335 break; 336 } 337 338 return !result; 339} 340 341static void add_line_info(struct image *img, const char *bol, size_t len, unsigned flag) 342{ 343 ALLOC_GROW(img->line_allocated, img->nr + 1, img->alloc); 344 img->line_allocated[img->nr].len = len; 345 img->line_allocated[img->nr].hash = hash_line(bol, len); 346 img->line_allocated[img->nr].flag = flag; 347 img->nr++; 348} 349 350/* 351 * "buf" has the file contents to be patched (read from various sources). 352 * attach it to "image" and add line-based index to it. 353 * "image" now owns the "buf". 354 */ 355static void prepare_image(struct image *image, char *buf, size_t len, 356 int prepare_linetable) 357{ 358 const char *cp, *ep; 359 360 memset(image, 0, sizeof(*image)); 361 image->buf = buf; 362 image->len = len; 363 364 if (!prepare_linetable) 365 return; 366 367 ep = image->buf + image->len; 368 cp = image->buf; 369 while (cp < ep) { 370 const char *next; 371 for (next = cp; next < ep && *next != '\n'; next++) 372 ; 373 if (next < ep) 374 next++; 375 add_line_info(image, cp, next - cp, 0); 376 cp = next; 377 } 378 image->line = image->line_allocated; 379} 380 381static void clear_image(struct image *image) 382{ 383 free(image->buf); 384 free(image->line_allocated); 385 memset(image, 0, sizeof(*image)); 386} 387 388/* fmt must contain _one_ %s and no other substitution */ 389static void say_patch_name(FILE *output, const char *fmt, struct patch *patch) 390{ 391 struct strbuf sb = STRBUF_INIT; 392 393 if (patch->old_name && patch->new_name && 394 strcmp(patch->old_name, patch->new_name)) { 395 quote_c_style(patch->old_name, &sb, NULL, 0); 396 strbuf_addstr(&sb, " => "); 397 quote_c_style(patch->new_name, &sb, NULL, 0); 398 } else { 399 const char *n = patch->new_name; 400 if (!n) 401 n = patch->old_name; 402 quote_c_style(n, &sb, NULL, 0); 403 } 404 fprintf(output, fmt, sb.buf); 405 fputc('\n', output); 406 strbuf_release(&sb); 407} 408 409#define SLOP (16) 410 411static void read_patch_file(struct strbuf *sb, int fd) 412{ 413 if (strbuf_read(sb, fd, 0) < 0) 414 die_errno("git apply: failed to read"); 415 416 /* 417 * Make sure that we have some slop in the buffer 418 * so that we can do speculative "memcmp" etc, and 419 * see to it that it is NUL-filled. 420 */ 421 strbuf_grow(sb, SLOP); 422 memset(sb->buf + sb->len, 0, SLOP); 423} 424 425static unsigned long linelen(const char *buffer, unsigned long size) 426{ 427 unsigned long len = 0; 428 while (size--) { 429 len++; 430 if (*buffer++ == '\n') 431 break; 432 } 433 return len; 434} 435 436static int is_dev_null(const char *str) 437{ 438 return !memcmp("/dev/null", str, 9) && isspace(str[9]); 439} 440 441#define TERM_SPACE 1 442#define TERM_TAB 2 443 444static int name_terminate(const char *name, int namelen, int c, int terminate) 445{ 446 if (c == ' ' && !(terminate & TERM_SPACE)) 447 return 0; 448 if (c == '\t' && !(terminate & TERM_TAB)) 449 return 0; 450 451 return 1; 452} 453 454/* remove double slashes to make --index work with such filenames */ 455static char *squash_slash(char *name) 456{ 457 int i = 0, j = 0; 458 459 if (!name) 460 return NULL; 461 462 while (name[i]) { 463 if ((name[j++] = name[i++]) == '/') 464 while (name[i] == '/') 465 i++; 466 } 467 name[j] = '\0'; 468 return name; 469} 470 471static char *find_name_gnu(const char *line, const char *def, int p_value) 472{ 473 struct strbuf name = STRBUF_INIT; 474 char *cp; 475 476 /* 477 * Proposed "new-style" GNU patch/diff format; see 478 * http://marc.info/?l=git&m=112927316408690&w=2 479 */ 480 if (unquote_c_style(&name, line, NULL)) { 481 strbuf_release(&name); 482 return NULL; 483 } 484 485 for (cp = name.buf; p_value; p_value--) { 486 cp = strchr(cp, '/'); 487 if (!cp) { 488 strbuf_release(&name); 489 return NULL; 490 } 491 cp++; 492 } 493 494 strbuf_remove(&name, 0, cp - name.buf); 495 if (root) 496 strbuf_insert(&name, 0, root, root_len); 497 return squash_slash(strbuf_detach(&name, NULL)); 498} 499 500static size_t sane_tz_len(const char *line, size_t len) 501{ 502 const char *tz, *p; 503 504 if (len < strlen(" +0500") || line[len-strlen(" +0500")] != ' ') 505 return 0; 506 tz = line + len - strlen(" +0500"); 507 508 if (tz[1] != '+' && tz[1] != '-') 509 return 0; 510 511 for (p = tz + 2; p != line + len; p++) 512 if (!isdigit(*p)) 513 return 0; 514 515 return line + len - tz; 516} 517 518static size_t tz_with_colon_len(const char *line, size_t len) 519{ 520 const char *tz, *p; 521 522 if (len < strlen(" +08:00") || line[len - strlen(":00")] != ':') 523 return 0; 524 tz = line + len - strlen(" +08:00"); 525 526 if (tz[0] != ' ' || (tz[1] != '+' && tz[1] != '-')) 527 return 0; 528 p = tz + 2; 529 if (!isdigit(*p++) || !isdigit(*p++) || *p++ != ':' || 530 !isdigit(*p++) || !isdigit(*p++)) 531 return 0; 532 533 return line + len - tz; 534} 535 536static size_t date_len(const char *line, size_t len) 537{ 538 const char *date, *p; 539 540 if (len < strlen("72-02-05") || line[len-strlen("-05")] != '-') 541 return 0; 542 p = date = line + len - strlen("72-02-05"); 543 544 if (!isdigit(*p++) || !isdigit(*p++) || *p++ != '-' || 545 !isdigit(*p++) || !isdigit(*p++) || *p++ != '-' || 546 !isdigit(*p++) || !isdigit(*p++)) /* Not a date. */ 547 return 0; 548 549 if (date - line >= strlen("19") && 550 isdigit(date[-1]) && isdigit(date[-2])) /* 4-digit year */ 551 date -= strlen("19"); 552 553 return line + len - date; 554} 555 556static size_t short_time_len(const char *line, size_t len) 557{ 558 const char *time, *p; 559 560 if (len < strlen(" 07:01:32") || line[len-strlen(":32")] != ':') 561 return 0; 562 p = time = line + len - strlen(" 07:01:32"); 563 564 /* Permit 1-digit hours? */ 565 if (*p++ != ' ' || 566 !isdigit(*p++) || !isdigit(*p++) || *p++ != ':' || 567 !isdigit(*p++) || !isdigit(*p++) || *p++ != ':' || 568 !isdigit(*p++) || !isdigit(*p++)) /* Not a time. */ 569 return 0; 570 571 return line + len - time; 572} 573 574static size_t fractional_time_len(const char *line, size_t len) 575{ 576 const char *p; 577 size_t n; 578 579 /* Expected format: 19:41:17.620000023 */ 580 if (!len || !isdigit(line[len - 1])) 581 return 0; 582 p = line + len - 1; 583 584 /* Fractional seconds. */ 585 while (p > line && isdigit(*p)) 586 p--; 587 if (*p != '.') 588 return 0; 589 590 /* Hours, minutes, and whole seconds. */ 591 n = short_time_len(line, p - line); 592 if (!n) 593 return 0; 594 595 return line + len - p + n; 596} 597 598static size_t trailing_spaces_len(const char *line, size_t len) 599{ 600 const char *p; 601 602 /* Expected format: ' ' x (1 or more) */ 603 if (!len || line[len - 1] != ' ') 604 return 0; 605 606 p = line + len; 607 while (p != line) { 608 p--; 609 if (*p != ' ') 610 return line + len - (p + 1); 611 } 612 613 /* All spaces! */ 614 return len; 615} 616 617static size_t diff_timestamp_len(const char *line, size_t len) 618{ 619 const char *end = line + len; 620 size_t n; 621 622 /* 623 * Posix: 2010-07-05 19:41:17 624 * GNU: 2010-07-05 19:41:17.620000023 -0500 625 */ 626 627 if (!isdigit(end[-1])) 628 return 0; 629 630 n = sane_tz_len(line, end - line); 631 if (!n) 632 n = tz_with_colon_len(line, end - line); 633 end -= n; 634 635 n = short_time_len(line, end - line); 636 if (!n) 637 n = fractional_time_len(line, end - line); 638 end -= n; 639 640 n = date_len(line, end - line); 641 if (!n) /* No date. Too bad. */ 642 return 0; 643 end -= n; 644 645 if (end == line) /* No space before date. */ 646 return 0; 647 if (end[-1] == '\t') { /* Success! */ 648 end--; 649 return line + len - end; 650 } 651 if (end[-1] != ' ') /* No space before date. */ 652 return 0; 653 654 /* Whitespace damage. */ 655 end -= trailing_spaces_len(line, end - line); 656 return line + len - end; 657} 658 659static char *null_strdup(const char *s) 660{ 661 return s ? xstrdup(s) : NULL; 662} 663 664static char *find_name_common(const char *line, const char *def, 665 int p_value, const char *end, int terminate) 666{ 667 int len; 668 const char *start = NULL; 669 670 if (p_value == 0) 671 start = line; 672 while (line != end) { 673 char c = *line; 674 675 if (!end && isspace(c)) { 676 if (c == '\n') 677 break; 678 if (name_terminate(start, line-start, c, terminate)) 679 break; 680 } 681 line++; 682 if (c == '/' && !--p_value) 683 start = line; 684 } 685 if (!start) 686 return squash_slash(null_strdup(def)); 687 len = line - start; 688 if (!len) 689 return squash_slash(null_strdup(def)); 690 691 /* 692 * Generally we prefer the shorter name, especially 693 * if the other one is just a variation of that with 694 * something else tacked on to the end (ie "file.orig" 695 * or "file~"). 696 */ 697 if (def) { 698 int deflen = strlen(def); 699 if (deflen < len && !strncmp(start, def, deflen)) 700 return squash_slash(xstrdup(def)); 701 } 702 703 if (root) { 704 char *ret = xmalloc(root_len + len + 1); 705 strcpy(ret, root); 706 memcpy(ret + root_len, start, len); 707 ret[root_len + len] = '\0'; 708 return squash_slash(ret); 709 } 710 711 return squash_slash(xmemdupz(start, len)); 712} 713 714static char *find_name(const char *line, char *def, int p_value, int terminate) 715{ 716 if (*line == '"') { 717 char *name = find_name_gnu(line, def, p_value); 718 if (name) 719 return name; 720 } 721 722 return find_name_common(line, def, p_value, NULL, terminate); 723} 724 725static char *find_name_traditional(const char *line, char *def, int p_value) 726{ 727 size_t len; 728 size_t date_len; 729 730 if (*line == '"') { 731 char *name = find_name_gnu(line, def, p_value); 732 if (name) 733 return name; 734 } 735 736 len = strchrnul(line, '\n') - line; 737 date_len = diff_timestamp_len(line, len); 738 if (!date_len) 739 return find_name_common(line, def, p_value, NULL, TERM_TAB); 740 len -= date_len; 741 742 return find_name_common(line, def, p_value, line + len, 0); 743} 744 745static int count_slashes(const char *cp) 746{ 747 int cnt = 0; 748 char ch; 749 750 while ((ch = *cp++)) 751 if (ch == '/') 752 cnt++; 753 return cnt; 754} 755 756/* 757 * Given the string after "--- " or "+++ ", guess the appropriate 758 * p_value for the given patch. 759 */ 760static int guess_p_value(const char *nameline) 761{ 762 char *name, *cp; 763 int val = -1; 764 765 if (is_dev_null(nameline)) 766 return -1; 767 name = find_name_traditional(nameline, NULL, 0); 768 if (!name) 769 return -1; 770 cp = strchr(name, '/'); 771 if (!cp) 772 val = 0; 773 else if (prefix) { 774 /* 775 * Does it begin with "a/$our-prefix" and such? Then this is 776 * very likely to apply to our directory. 777 */ 778 if (!strncmp(name, prefix, prefix_length)) 779 val = count_slashes(prefix); 780 else { 781 cp++; 782 if (!strncmp(cp, prefix, prefix_length)) 783 val = count_slashes(prefix) + 1; 784 } 785 } 786 free(name); 787 return val; 788} 789 790/* 791 * Does the ---/+++ line has the POSIX timestamp after the last HT? 792 * GNU diff puts epoch there to signal a creation/deletion event. Is 793 * this such a timestamp? 794 */ 795static int has_epoch_timestamp(const char *nameline) 796{ 797 /* 798 * We are only interested in epoch timestamp; any non-zero 799 * fraction cannot be one, hence "(\.0+)?" in the regexp below. 800 * For the same reason, the date must be either 1969-12-31 or 801 * 1970-01-01, and the seconds part must be "00". 802 */ 803 const char stamp_regexp[] = 804 "^(1969-12-31|1970-01-01)" 805 " " 806 "[0-2][0-9]:[0-5][0-9]:00(\\.0+)?" 807 " " 808 "([-+][0-2][0-9]:?[0-5][0-9])\n"; 809 const char *timestamp = NULL, *cp, *colon; 810 static regex_t *stamp; 811 regmatch_t m[10]; 812 int zoneoffset; 813 int hourminute; 814 int status; 815 816 for (cp = nameline; *cp != '\n'; cp++) { 817 if (*cp == '\t') 818 timestamp = cp + 1; 819 } 820 if (!timestamp) 821 return 0; 822 if (!stamp) { 823 stamp = xmalloc(sizeof(*stamp)); 824 if (regcomp(stamp, stamp_regexp, REG_EXTENDED)) { 825 warning(_("Cannot prepare timestamp regexp %s"), 826 stamp_regexp); 827 return 0; 828 } 829 } 830 831 status = regexec(stamp, timestamp, ARRAY_SIZE(m), m, 0); 832 if (status) { 833 if (status != REG_NOMATCH) 834 warning(_("regexec returned %d for input: %s"), 835 status, timestamp); 836 return 0; 837 } 838 839 zoneoffset = strtol(timestamp + m[3].rm_so + 1, (char **) &colon, 10); 840 if (*colon == ':') 841 zoneoffset = zoneoffset * 60 + strtol(colon + 1, NULL, 10); 842 else 843 zoneoffset = (zoneoffset / 100) * 60 + (zoneoffset % 100); 844 if (timestamp[m[3].rm_so] == '-') 845 zoneoffset = -zoneoffset; 846 847 /* 848 * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31 849 * (west of GMT) or 1970-01-01 (east of GMT) 850 */ 851 if ((zoneoffset < 0 && memcmp(timestamp, "1969-12-31", 10)) || 852 (0 <= zoneoffset && memcmp(timestamp, "1970-01-01", 10))) 853 return 0; 854 855 hourminute = (strtol(timestamp + 11, NULL, 10) * 60 + 856 strtol(timestamp + 14, NULL, 10) - 857 zoneoffset); 858 859 return ((zoneoffset < 0 && hourminute == 1440) || 860 (0 <= zoneoffset && !hourminute)); 861} 862 863/* 864 * Get the name etc info from the ---/+++ lines of a traditional patch header 865 * 866 * FIXME! The end-of-filename heuristics are kind of screwy. For existing 867 * files, we can happily check the index for a match, but for creating a 868 * new file we should try to match whatever "patch" does. I have no idea. 869 */ 870static void parse_traditional_patch(const char *first, const char *second, struct patch *patch) 871{ 872 char *name; 873 874 first += 4; /* skip "--- " */ 875 second += 4; /* skip "+++ " */ 876 if (!p_value_known) { 877 int p, q; 878 p = guess_p_value(first); 879 q = guess_p_value(second); 880 if (p < 0) p = q; 881 if (0 <= p && p == q) { 882 p_value = p; 883 p_value_known = 1; 884 } 885 } 886 if (is_dev_null(first)) { 887 patch->is_new = 1; 888 patch->is_delete = 0; 889 name = find_name_traditional(second, NULL, p_value); 890 patch->new_name = name; 891 } else if (is_dev_null(second)) { 892 patch->is_new = 0; 893 patch->is_delete = 1; 894 name = find_name_traditional(first, NULL, p_value); 895 patch->old_name = name; 896 } else { 897 char *first_name; 898 first_name = find_name_traditional(first, NULL, p_value); 899 name = find_name_traditional(second, first_name, p_value); 900 free(first_name); 901 if (has_epoch_timestamp(first)) { 902 patch->is_new = 1; 903 patch->is_delete = 0; 904 patch->new_name = name; 905 } else if (has_epoch_timestamp(second)) { 906 patch->is_new = 0; 907 patch->is_delete = 1; 908 patch->old_name = name; 909 } else { 910 patch->old_name = name; 911 patch->new_name = null_strdup(name); 912 } 913 } 914 if (!name) 915 die(_("unable to find filename in patch at line %d"), linenr); 916} 917 918static int gitdiff_hdrend(const char *line, struct patch *patch) 919{ 920 return -1; 921} 922 923/* 924 * We're anal about diff header consistency, to make 925 * sure that we don't end up having strange ambiguous 926 * patches floating around. 927 * 928 * As a result, gitdiff_{old|new}name() will check 929 * their names against any previous information, just 930 * to make sure.. 931 */ 932#define DIFF_OLD_NAME 0 933#define DIFF_NEW_NAME 1 934 935static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, int side) 936{ 937 if (!orig_name && !isnull) 938 return find_name(line, NULL, p_value, TERM_TAB); 939 940 if (orig_name) { 941 int len; 942 const char *name; 943 char *another; 944 name = orig_name; 945 len = strlen(name); 946 if (isnull) 947 die(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"), name, linenr); 948 another = find_name(line, NULL, p_value, TERM_TAB); 949 if (!another || memcmp(another, name, len + 1)) 950 die((side == DIFF_NEW_NAME) ? 951 _("git apply: bad git-diff - inconsistent new filename on line %d") : 952 _("git apply: bad git-diff - inconsistent old filename on line %d"), linenr); 953 free(another); 954 return orig_name; 955 } 956 else { 957 /* expect "/dev/null" */ 958 if (memcmp("/dev/null", line, 9) || line[9] != '\n') 959 die(_("git apply: bad git-diff - expected /dev/null on line %d"), linenr); 960 return NULL; 961 } 962} 963 964static int gitdiff_oldname(const char *line, struct patch *patch) 965{ 966 char *orig = patch->old_name; 967 patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name, 968 DIFF_OLD_NAME); 969 if (orig != patch->old_name) 970 free(orig); 971 return 0; 972} 973 974static int gitdiff_newname(const char *line, struct patch *patch) 975{ 976 char *orig = patch->new_name; 977 patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name, 978 DIFF_NEW_NAME); 979 if (orig != patch->new_name) 980 free(orig); 981 return 0; 982} 983 984static int gitdiff_oldmode(const char *line, struct patch *patch) 985{ 986 patch->old_mode = strtoul(line, NULL, 8); 987 return 0; 988} 989 990static int gitdiff_newmode(const char *line, struct patch *patch) 991{ 992 patch->new_mode = strtoul(line, NULL, 8); 993 return 0; 994} 995 996static int gitdiff_delete(const char *line, struct patch *patch) 997{ 998 patch->is_delete = 1; 999 free(patch->old_name);1000 patch->old_name = null_strdup(patch->def_name);1001 return gitdiff_oldmode(line, patch);1002}10031004static int gitdiff_newfile(const char *line, struct patch *patch)1005{1006 patch->is_new = 1;1007 free(patch->new_name);1008 patch->new_name = null_strdup(patch->def_name);1009 return gitdiff_newmode(line, patch);1010}10111012static int gitdiff_copysrc(const char *line, struct patch *patch)1013{1014 patch->is_copy = 1;1015 free(patch->old_name);1016 patch->old_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0);1017 return 0;1018}10191020static int gitdiff_copydst(const char *line, struct patch *patch)1021{1022 patch->is_copy = 1;1023 free(patch->new_name);1024 patch->new_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0);1025 return 0;1026}10271028static int gitdiff_renamesrc(const char *line, struct patch *patch)1029{1030 patch->is_rename = 1;1031 free(patch->old_name);1032 patch->old_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0);1033 return 0;1034}10351036static int gitdiff_renamedst(const char *line, struct patch *patch)1037{1038 patch->is_rename = 1;1039 free(patch->new_name);1040 patch->new_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0);1041 return 0;1042}10431044static int gitdiff_similarity(const char *line, struct patch *patch)1045{1046 unsigned long val = strtoul(line, NULL, 10);1047 if (val <= 100)1048 patch->score = val;1049 return 0;1050}10511052static int gitdiff_dissimilarity(const char *line, struct patch *patch)1053{1054 unsigned long val = strtoul(line, NULL, 10);1055 if (val <= 100)1056 patch->score = val;1057 return 0;1058}10591060static int gitdiff_index(const char *line, struct patch *patch)1061{1062 /*1063 * index line is N hexadecimal, "..", N hexadecimal,1064 * and optional space with octal mode.1065 */1066 const char *ptr, *eol;1067 int len;10681069 ptr = strchr(line, '.');1070 if (!ptr || ptr[1] != '.' || 40 < ptr - line)1071 return 0;1072 len = ptr - line;1073 memcpy(patch->old_sha1_prefix, line, len);1074 patch->old_sha1_prefix[len] = 0;10751076 line = ptr + 2;1077 ptr = strchr(line, ' ');1078 eol = strchr(line, '\n');10791080 if (!ptr || eol < ptr)1081 ptr = eol;1082 len = ptr - line;10831084 if (40 < len)1085 return 0;1086 memcpy(patch->new_sha1_prefix, line, len);1087 patch->new_sha1_prefix[len] = 0;1088 if (*ptr == ' ')1089 patch->old_mode = strtoul(ptr+1, NULL, 8);1090 return 0;1091}10921093/*1094 * This is normal for a diff that doesn't change anything: we'll fall through1095 * into the next diff. Tell the parser to break out.1096 */1097static int gitdiff_unrecognized(const char *line, struct patch *patch)1098{1099 return -1;1100}11011102/*1103 * Skip p_value leading components from "line"; as we do not accept1104 * absolute paths, return NULL in that case.1105 */1106static const char *skip_tree_prefix(const char *line, int llen)1107{1108 int nslash;1109 int i;11101111 if (!p_value)1112 return (llen && line[0] == '/') ? NULL : line;11131114 nslash = p_value;1115 for (i = 0; i < llen; i++) {1116 int ch = line[i];1117 if (ch == '/' && --nslash <= 0)1118 return (i == 0) ? NULL : &line[i + 1];1119 }1120 return NULL;1121}11221123/*1124 * This is to extract the same name that appears on "diff --git"1125 * line. We do not find and return anything if it is a rename1126 * patch, and it is OK because we will find the name elsewhere.1127 * We need to reliably find name only when it is mode-change only,1128 * creation or deletion of an empty file. In any of these cases,1129 * both sides are the same name under a/ and b/ respectively.1130 */1131static char *git_header_name(const char *line, int llen)1132{1133 const char *name;1134 const char *second = NULL;1135 size_t len, line_len;11361137 line += strlen("diff --git ");1138 llen -= strlen("diff --git ");11391140 if (*line == '"') {1141 const char *cp;1142 struct strbuf first = STRBUF_INIT;1143 struct strbuf sp = STRBUF_INIT;11441145 if (unquote_c_style(&first, line, &second))1146 goto free_and_fail1;11471148 /* strip the a/b prefix including trailing slash */1149 cp = skip_tree_prefix(first.buf, first.len);1150 if (!cp)1151 goto free_and_fail1;1152 strbuf_remove(&first, 0, cp - first.buf);11531154 /*1155 * second points at one past closing dq of name.1156 * find the second name.1157 */1158 while ((second < line + llen) && isspace(*second))1159 second++;11601161 if (line + llen <= second)1162 goto free_and_fail1;1163 if (*second == '"') {1164 if (unquote_c_style(&sp, second, NULL))1165 goto free_and_fail1;1166 cp = skip_tree_prefix(sp.buf, sp.len);1167 if (!cp)1168 goto free_and_fail1;1169 /* They must match, otherwise ignore */1170 if (strcmp(cp, first.buf))1171 goto free_and_fail1;1172 strbuf_release(&sp);1173 return strbuf_detach(&first, NULL);1174 }11751176 /* unquoted second */1177 cp = skip_tree_prefix(second, line + llen - second);1178 if (!cp)1179 goto free_and_fail1;1180 if (line + llen - cp != first.len ||1181 memcmp(first.buf, cp, first.len))1182 goto free_and_fail1;1183 return strbuf_detach(&first, NULL);11841185 free_and_fail1:1186 strbuf_release(&first);1187 strbuf_release(&sp);1188 return NULL;1189 }11901191 /* unquoted first name */1192 name = skip_tree_prefix(line, llen);1193 if (!name)1194 return NULL;11951196 /*1197 * since the first name is unquoted, a dq if exists must be1198 * the beginning of the second name.1199 */1200 for (second = name; second < line + llen; second++) {1201 if (*second == '"') {1202 struct strbuf sp = STRBUF_INIT;1203 const char *np;12041205 if (unquote_c_style(&sp, second, NULL))1206 goto free_and_fail2;12071208 np = skip_tree_prefix(sp.buf, sp.len);1209 if (!np)1210 goto free_and_fail2;12111212 len = sp.buf + sp.len - np;1213 if (len < second - name &&1214 !strncmp(np, name, len) &&1215 isspace(name[len])) {1216 /* Good */1217 strbuf_remove(&sp, 0, np - sp.buf);1218 return strbuf_detach(&sp, NULL);1219 }12201221 free_and_fail2:1222 strbuf_release(&sp);1223 return NULL;1224 }1225 }12261227 /*1228 * Accept a name only if it shows up twice, exactly the same1229 * form.1230 */1231 second = strchr(name, '\n');1232 if (!second)1233 return NULL;1234 line_len = second - name;1235 for (len = 0 ; ; len++) {1236 switch (name[len]) {1237 default:1238 continue;1239 case '\n':1240 return NULL;1241 case '\t': case ' ':1242 /*1243 * Is this the separator between the preimage1244 * and the postimage pathname? Again, we are1245 * only interested in the case where there is1246 * no rename, as this is only to set def_name1247 * and a rename patch has the names elsewhere1248 * in an unambiguous form.1249 */1250 if (!name[len + 1])1251 return NULL; /* no postimage name */1252 second = skip_tree_prefix(name + len + 1,1253 line_len - (len + 1));1254 if (!second)1255 return NULL;1256 /*1257 * Does len bytes starting at "name" and "second"1258 * (that are separated by one HT or SP we just1259 * found) exactly match?1260 */1261 if (second[len] == '\n' && !strncmp(name, second, len))1262 return xmemdupz(name, len);1263 }1264 }1265}12661267/* Verify that we recognize the lines following a git header */1268static int parse_git_header(const char *line, int len, unsigned int size, struct patch *patch)1269{1270 unsigned long offset;12711272 /* A git diff has explicit new/delete information, so we don't guess */1273 patch->is_new = 0;1274 patch->is_delete = 0;12751276 /*1277 * Some things may not have the old name in the1278 * rest of the headers anywhere (pure mode changes,1279 * or removing or adding empty files), so we get1280 * the default name from the header.1281 */1282 patch->def_name = git_header_name(line, len);1283 if (patch->def_name && root) {1284 char *s = xmalloc(root_len + strlen(patch->def_name) + 1);1285 strcpy(s, root);1286 strcpy(s + root_len, patch->def_name);1287 free(patch->def_name);1288 patch->def_name = s;1289 }12901291 line += len;1292 size -= len;1293 linenr++;1294 for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {1295 static const struct opentry {1296 const char *str;1297 int (*fn)(const char *, struct patch *);1298 } optable[] = {1299 { "@@ -", gitdiff_hdrend },1300 { "--- ", gitdiff_oldname },1301 { "+++ ", gitdiff_newname },1302 { "old mode ", gitdiff_oldmode },1303 { "new mode ", gitdiff_newmode },1304 { "deleted file mode ", gitdiff_delete },1305 { "new file mode ", gitdiff_newfile },1306 { "copy from ", gitdiff_copysrc },1307 { "copy to ", gitdiff_copydst },1308 { "rename old ", gitdiff_renamesrc },1309 { "rename new ", gitdiff_renamedst },1310 { "rename from ", gitdiff_renamesrc },1311 { "rename to ", gitdiff_renamedst },1312 { "similarity index ", gitdiff_similarity },1313 { "dissimilarity index ", gitdiff_dissimilarity },1314 { "index ", gitdiff_index },1315 { "", gitdiff_unrecognized },1316 };1317 int i;13181319 len = linelen(line, size);1320 if (!len || line[len-1] != '\n')1321 break;1322 for (i = 0; i < ARRAY_SIZE(optable); i++) {1323 const struct opentry *p = optable + i;1324 int oplen = strlen(p->str);1325 if (len < oplen || memcmp(p->str, line, oplen))1326 continue;1327 if (p->fn(line + oplen, patch) < 0)1328 return offset;1329 break;1330 }1331 }13321333 return offset;1334}13351336static int parse_num(const char *line, unsigned long *p)1337{1338 char *ptr;13391340 if (!isdigit(*line))1341 return 0;1342 *p = strtoul(line, &ptr, 10);1343 return ptr - line;1344}13451346static int parse_range(const char *line, int len, int offset, const char *expect,1347 unsigned long *p1, unsigned long *p2)1348{1349 int digits, ex;13501351 if (offset < 0 || offset >= len)1352 return -1;1353 line += offset;1354 len -= offset;13551356 digits = parse_num(line, p1);1357 if (!digits)1358 return -1;13591360 offset += digits;1361 line += digits;1362 len -= digits;13631364 *p2 = 1;1365 if (*line == ',') {1366 digits = parse_num(line+1, p2);1367 if (!digits)1368 return -1;13691370 offset += digits+1;1371 line += digits+1;1372 len -= digits+1;1373 }13741375 ex = strlen(expect);1376 if (ex > len)1377 return -1;1378 if (memcmp(line, expect, ex))1379 return -1;13801381 return offset + ex;1382}13831384static void recount_diff(const char *line, int size, struct fragment *fragment)1385{1386 int oldlines = 0, newlines = 0, ret = 0;13871388 if (size < 1) {1389 warning("recount: ignore empty hunk");1390 return;1391 }13921393 for (;;) {1394 int len = linelen(line, size);1395 size -= len;1396 line += len;13971398 if (size < 1)1399 break;14001401 switch (*line) {1402 case ' ': case '\n':1403 newlines++;1404 /* fall through */1405 case '-':1406 oldlines++;1407 continue;1408 case '+':1409 newlines++;1410 continue;1411 case '\\':1412 continue;1413 case '@':1414 ret = size < 3 || !starts_with(line, "@@ ");1415 break;1416 case 'd':1417 ret = size < 5 || !starts_with(line, "diff ");1418 break;1419 default:1420 ret = -1;1421 break;1422 }1423 if (ret) {1424 warning(_("recount: unexpected line: %.*s"),1425 (int)linelen(line, size), line);1426 return;1427 }1428 break;1429 }1430 fragment->oldlines = oldlines;1431 fragment->newlines = newlines;1432}14331434/*1435 * Parse a unified diff fragment header of the1436 * form "@@ -a,b +c,d @@"1437 */1438static int parse_fragment_header(const char *line, int len, struct fragment *fragment)1439{1440 int offset;14411442 if (!len || line[len-1] != '\n')1443 return -1;14441445 /* Figure out the number of lines in a fragment */1446 offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);1447 offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);14481449 return offset;1450}14511452static int find_header(const char *line, unsigned long size, int *hdrsize, struct patch *patch)1453{1454 unsigned long offset, len;14551456 patch->is_toplevel_relative = 0;1457 patch->is_rename = patch->is_copy = 0;1458 patch->is_new = patch->is_delete = -1;1459 patch->old_mode = patch->new_mode = 0;1460 patch->old_name = patch->new_name = NULL;1461 for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {1462 unsigned long nextlen;14631464 len = linelen(line, size);1465 if (!len)1466 break;14671468 /* Testing this early allows us to take a few shortcuts.. */1469 if (len < 6)1470 continue;14711472 /*1473 * Make sure we don't find any unconnected patch fragments.1474 * That's a sign that we didn't find a header, and that a1475 * patch has become corrupted/broken up.1476 */1477 if (!memcmp("@@ -", line, 4)) {1478 struct fragment dummy;1479 if (parse_fragment_header(line, len, &dummy) < 0)1480 continue;1481 die(_("patch fragment without header at line %d: %.*s"),1482 linenr, (int)len-1, line);1483 }14841485 if (size < len + 6)1486 break;14871488 /*1489 * Git patch? It might not have a real patch, just a rename1490 * or mode change, so we handle that specially1491 */1492 if (!memcmp("diff --git ", line, 11)) {1493 int git_hdr_len = parse_git_header(line, len, size, patch);1494 if (git_hdr_len <= len)1495 continue;1496 if (!patch->old_name && !patch->new_name) {1497 if (!patch->def_name)1498 die(Q_("git diff header lacks filename information when removing "1499 "%d leading pathname component (line %d)",1500 "git diff header lacks filename information when removing "1501 "%d leading pathname components (line %d)",1502 p_value),1503 p_value, linenr);1504 patch->old_name = xstrdup(patch->def_name);1505 patch->new_name = xstrdup(patch->def_name);1506 }1507 if (!patch->is_delete && !patch->new_name)1508 die("git diff header lacks filename information "1509 "(line %d)", linenr);1510 patch->is_toplevel_relative = 1;1511 *hdrsize = git_hdr_len;1512 return offset;1513 }15141515 /* --- followed by +++ ? */1516 if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4))1517 continue;15181519 /*1520 * We only accept unified patches, so we want it to1521 * at least have "@@ -a,b +c,d @@\n", which is 14 chars1522 * minimum ("@@ -0,0 +1 @@\n" is the shortest).1523 */1524 nextlen = linelen(line + len, size - len);1525 if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))1526 continue;15271528 /* Ok, we'll consider it a patch */1529 parse_traditional_patch(line, line+len, patch);1530 *hdrsize = len + nextlen;1531 linenr += 2;1532 return offset;1533 }1534 return -1;1535}15361537static void record_ws_error(unsigned result, const char *line, int len, int linenr)1538{1539 char *err;15401541 if (!result)1542 return;15431544 whitespace_error++;1545 if (squelch_whitespace_errors &&1546 squelch_whitespace_errors < whitespace_error)1547 return;15481549 err = whitespace_error_string(result);1550 fprintf(stderr, "%s:%d: %s.\n%.*s\n",1551 patch_input_file, linenr, err, len, line);1552 free(err);1553}15541555static void check_whitespace(const char *line, int len, unsigned ws_rule)1556{1557 unsigned result = ws_check(line + 1, len - 1, ws_rule);15581559 record_ws_error(result, line + 1, len - 2, linenr);1560}15611562/*1563 * Parse a unified diff. Note that this really needs to parse each1564 * fragment separately, since the only way to know the difference1565 * between a "---" that is part of a patch, and a "---" that starts1566 * the next patch is to look at the line counts..1567 */1568static int parse_fragment(const char *line, unsigned long size,1569 struct patch *patch, struct fragment *fragment)1570{1571 int added, deleted;1572 int len = linelen(line, size), offset;1573 unsigned long oldlines, newlines;1574 unsigned long leading, trailing;15751576 offset = parse_fragment_header(line, len, fragment);1577 if (offset < 0)1578 return -1;1579 if (offset > 0 && patch->recount)1580 recount_diff(line + offset, size - offset, fragment);1581 oldlines = fragment->oldlines;1582 newlines = fragment->newlines;1583 leading = 0;1584 trailing = 0;15851586 /* Parse the thing.. */1587 line += len;1588 size -= len;1589 linenr++;1590 added = deleted = 0;1591 for (offset = len;1592 0 < size;1593 offset += len, size -= len, line += len, linenr++) {1594 if (!oldlines && !newlines)1595 break;1596 len = linelen(line, size);1597 if (!len || line[len-1] != '\n')1598 return -1;1599 switch (*line) {1600 default:1601 return -1;1602 case '\n': /* newer GNU diff, an empty context line */1603 case ' ':1604 oldlines--;1605 newlines--;1606 if (!deleted && !added)1607 leading++;1608 trailing++;1609 break;1610 case '-':1611 if (apply_in_reverse &&1612 ws_error_action != nowarn_ws_error)1613 check_whitespace(line, len, patch->ws_rule);1614 deleted++;1615 oldlines--;1616 trailing = 0;1617 break;1618 case '+':1619 if (!apply_in_reverse &&1620 ws_error_action != nowarn_ws_error)1621 check_whitespace(line, len, patch->ws_rule);1622 added++;1623 newlines--;1624 trailing = 0;1625 break;16261627 /*1628 * We allow "\ No newline at end of file". Depending1629 * on locale settings when the patch was produced we1630 * don't know what this line looks like. The only1631 * thing we do know is that it begins with "\ ".1632 * Checking for 12 is just for sanity check -- any1633 * l10n of "\ No newline..." is at least that long.1634 */1635 case '\\':1636 if (len < 12 || memcmp(line, "\\ ", 2))1637 return -1;1638 break;1639 }1640 }1641 if (oldlines || newlines)1642 return -1;1643 fragment->leading = leading;1644 fragment->trailing = trailing;16451646 /*1647 * If a fragment ends with an incomplete line, we failed to include1648 * it in the above loop because we hit oldlines == newlines == 01649 * before seeing it.1650 */1651 if (12 < size && !memcmp(line, "\\ ", 2))1652 offset += linelen(line, size);16531654 patch->lines_added += added;1655 patch->lines_deleted += deleted;16561657 if (0 < patch->is_new && oldlines)1658 return error(_("new file depends on old contents"));1659 if (0 < patch->is_delete && newlines)1660 return error(_("deleted file still has contents"));1661 return offset;1662}16631664/*1665 * We have seen "diff --git a/... b/..." header (or a traditional patch1666 * header). Read hunks that belong to this patch into fragments and hang1667 * them to the given patch structure.1668 *1669 * The (fragment->patch, fragment->size) pair points into the memory given1670 * by the caller, not a copy, when we return.1671 */1672static int parse_single_patch(const char *line, unsigned long size, struct patch *patch)1673{1674 unsigned long offset = 0;1675 unsigned long oldlines = 0, newlines = 0, context = 0;1676 struct fragment **fragp = &patch->fragments;16771678 while (size > 4 && !memcmp(line, "@@ -", 4)) {1679 struct fragment *fragment;1680 int len;16811682 fragment = xcalloc(1, sizeof(*fragment));1683 fragment->linenr = linenr;1684 len = parse_fragment(line, size, patch, fragment);1685 if (len <= 0)1686 die(_("corrupt patch at line %d"), linenr);1687 fragment->patch = line;1688 fragment->size = len;1689 oldlines += fragment->oldlines;1690 newlines += fragment->newlines;1691 context += fragment->leading + fragment->trailing;16921693 *fragp = fragment;1694 fragp = &fragment->next;16951696 offset += len;1697 line += len;1698 size -= len;1699 }17001701 /*1702 * If something was removed (i.e. we have old-lines) it cannot1703 * be creation, and if something was added it cannot be1704 * deletion. However, the reverse is not true; --unified=01705 * patches that only add are not necessarily creation even1706 * though they do not have any old lines, and ones that only1707 * delete are not necessarily deletion.1708 *1709 * Unfortunately, a real creation/deletion patch do _not_ have1710 * any context line by definition, so we cannot safely tell it1711 * apart with --unified=0 insanity. At least if the patch has1712 * more than one hunk it is not creation or deletion.1713 */1714 if (patch->is_new < 0 &&1715 (oldlines || (patch->fragments && patch->fragments->next)))1716 patch->is_new = 0;1717 if (patch->is_delete < 0 &&1718 (newlines || (patch->fragments && patch->fragments->next)))1719 patch->is_delete = 0;17201721 if (0 < patch->is_new && oldlines)1722 die(_("new file %s depends on old contents"), patch->new_name);1723 if (0 < patch->is_delete && newlines)1724 die(_("deleted file %s still has contents"), patch->old_name);1725 if (!patch->is_delete && !newlines && context)1726 fprintf_ln(stderr,1727 _("** warning: "1728 "file %s becomes empty but is not deleted"),1729 patch->new_name);17301731 return offset;1732}17331734static inline int metadata_changes(struct patch *patch)1735{1736 return patch->is_rename > 0 ||1737 patch->is_copy > 0 ||1738 patch->is_new > 0 ||1739 patch->is_delete ||1740 (patch->old_mode && patch->new_mode &&1741 patch->old_mode != patch->new_mode);1742}17431744static char *inflate_it(const void *data, unsigned long size,1745 unsigned long inflated_size)1746{1747 git_zstream stream;1748 void *out;1749 int st;17501751 memset(&stream, 0, sizeof(stream));17521753 stream.next_in = (unsigned char *)data;1754 stream.avail_in = size;1755 stream.next_out = out = xmalloc(inflated_size);1756 stream.avail_out = inflated_size;1757 git_inflate_init(&stream);1758 st = git_inflate(&stream, Z_FINISH);1759 git_inflate_end(&stream);1760 if ((st != Z_STREAM_END) || stream.total_out != inflated_size) {1761 free(out);1762 return NULL;1763 }1764 return out;1765}17661767/*1768 * Read a binary hunk and return a new fragment; fragment->patch1769 * points at an allocated memory that the caller must free, so1770 * it is marked as "->free_patch = 1".1771 */1772static struct fragment *parse_binary_hunk(char **buf_p,1773 unsigned long *sz_p,1774 int *status_p,1775 int *used_p)1776{1777 /*1778 * Expect a line that begins with binary patch method ("literal"1779 * or "delta"), followed by the length of data before deflating.1780 * a sequence of 'length-byte' followed by base-85 encoded data1781 * should follow, terminated by a newline.1782 *1783 * Each 5-byte sequence of base-85 encodes up to 4 bytes,1784 * and we would limit the patch line to 66 characters,1785 * so one line can fit up to 13 groups that would decode1786 * to 52 bytes max. The length byte 'A'-'Z' corresponds1787 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.1788 */1789 int llen, used;1790 unsigned long size = *sz_p;1791 char *buffer = *buf_p;1792 int patch_method;1793 unsigned long origlen;1794 char *data = NULL;1795 int hunk_size = 0;1796 struct fragment *frag;17971798 llen = linelen(buffer, size);1799 used = llen;18001801 *status_p = 0;18021803 if (starts_with(buffer, "delta ")) {1804 patch_method = BINARY_DELTA_DEFLATED;1805 origlen = strtoul(buffer + 6, NULL, 10);1806 }1807 else if (starts_with(buffer, "literal ")) {1808 patch_method = BINARY_LITERAL_DEFLATED;1809 origlen = strtoul(buffer + 8, NULL, 10);1810 }1811 else1812 return NULL;18131814 linenr++;1815 buffer += llen;1816 while (1) {1817 int byte_length, max_byte_length, newsize;1818 llen = linelen(buffer, size);1819 used += llen;1820 linenr++;1821 if (llen == 1) {1822 /* consume the blank line */1823 buffer++;1824 size--;1825 break;1826 }1827 /*1828 * Minimum line is "A00000\n" which is 7-byte long,1829 * and the line length must be multiple of 5 plus 2.1830 */1831 if ((llen < 7) || (llen-2) % 5)1832 goto corrupt;1833 max_byte_length = (llen - 2) / 5 * 4;1834 byte_length = *buffer;1835 if ('A' <= byte_length && byte_length <= 'Z')1836 byte_length = byte_length - 'A' + 1;1837 else if ('a' <= byte_length && byte_length <= 'z')1838 byte_length = byte_length - 'a' + 27;1839 else1840 goto corrupt;1841 /* if the input length was not multiple of 4, we would1842 * have filler at the end but the filler should never1843 * exceed 3 bytes1844 */1845 if (max_byte_length < byte_length ||1846 byte_length <= max_byte_length - 4)1847 goto corrupt;1848 newsize = hunk_size + byte_length;1849 data = xrealloc(data, newsize);1850 if (decode_85(data + hunk_size, buffer + 1, byte_length))1851 goto corrupt;1852 hunk_size = newsize;1853 buffer += llen;1854 size -= llen;1855 }18561857 frag = xcalloc(1, sizeof(*frag));1858 frag->patch = inflate_it(data, hunk_size, origlen);1859 frag->free_patch = 1;1860 if (!frag->patch)1861 goto corrupt;1862 free(data);1863 frag->size = origlen;1864 *buf_p = buffer;1865 *sz_p = size;1866 *used_p = used;1867 frag->binary_patch_method = patch_method;1868 return frag;18691870 corrupt:1871 free(data);1872 *status_p = -1;1873 error(_("corrupt binary patch at line %d: %.*s"),1874 linenr-1, llen-1, buffer);1875 return NULL;1876}18771878static int parse_binary(char *buffer, unsigned long size, struct patch *patch)1879{1880 /*1881 * We have read "GIT binary patch\n"; what follows is a line1882 * that says the patch method (currently, either "literal" or1883 * "delta") and the length of data before deflating; a1884 * sequence of 'length-byte' followed by base-85 encoded data1885 * follows.1886 *1887 * When a binary patch is reversible, there is another binary1888 * hunk in the same format, starting with patch method (either1889 * "literal" or "delta") with the length of data, and a sequence1890 * of length-byte + base-85 encoded data, terminated with another1891 * empty line. This data, when applied to the postimage, produces1892 * the preimage.1893 */1894 struct fragment *forward;1895 struct fragment *reverse;1896 int status;1897 int used, used_1;18981899 forward = parse_binary_hunk(&buffer, &size, &status, &used);1900 if (!forward && !status)1901 /* there has to be one hunk (forward hunk) */1902 return error(_("unrecognized binary patch at line %d"), linenr-1);1903 if (status)1904 /* otherwise we already gave an error message */1905 return status;19061907 reverse = parse_binary_hunk(&buffer, &size, &status, &used_1);1908 if (reverse)1909 used += used_1;1910 else if (status) {1911 /*1912 * Not having reverse hunk is not an error, but having1913 * a corrupt reverse hunk is.1914 */1915 free((void*) forward->patch);1916 free(forward);1917 return status;1918 }1919 forward->next = reverse;1920 patch->fragments = forward;1921 patch->is_binary = 1;1922 return used;1923}19241925/*1926 * Read the patch text in "buffer" that extends for "size" bytes; stop1927 * reading after seeing a single patch (i.e. changes to a single file).1928 * Create fragments (i.e. patch hunks) and hang them to the given patch.1929 * Return the number of bytes consumed, so that the caller can call us1930 * again for the next patch.1931 */1932static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)1933{1934 int hdrsize, patchsize;1935 int offset = find_header(buffer, size, &hdrsize, patch);19361937 if (offset < 0)1938 return offset;19391940 patch->ws_rule = whitespace_rule(patch->new_name1941 ? patch->new_name1942 : patch->old_name);19431944 patchsize = parse_single_patch(buffer + offset + hdrsize,1945 size - offset - hdrsize, patch);19461947 if (!patchsize) {1948 static const char git_binary[] = "GIT binary patch\n";1949 int hd = hdrsize + offset;1950 unsigned long llen = linelen(buffer + hd, size - hd);19511952 if (llen == sizeof(git_binary) - 1 &&1953 !memcmp(git_binary, buffer + hd, llen)) {1954 int used;1955 linenr++;1956 used = parse_binary(buffer + hd + llen,1957 size - hd - llen, patch);1958 if (used)1959 patchsize = used + llen;1960 else1961 patchsize = 0;1962 }1963 else if (!memcmp(" differ\n", buffer + hd + llen - 8, 8)) {1964 static const char *binhdr[] = {1965 "Binary files ",1966 "Files ",1967 NULL,1968 };1969 int i;1970 for (i = 0; binhdr[i]; i++) {1971 int len = strlen(binhdr[i]);1972 if (len < size - hd &&1973 !memcmp(binhdr[i], buffer + hd, len)) {1974 linenr++;1975 patch->is_binary = 1;1976 patchsize = llen;1977 break;1978 }1979 }1980 }19811982 /* Empty patch cannot be applied if it is a text patch1983 * without metadata change. A binary patch appears1984 * empty to us here.1985 */1986 if ((apply || check) &&1987 (!patch->is_binary && !metadata_changes(patch)))1988 die(_("patch with only garbage at line %d"), linenr);1989 }19901991 return offset + hdrsize + patchsize;1992}19931994#define swap(a,b) myswap((a),(b),sizeof(a))19951996#define myswap(a, b, size) do { \1997 unsigned char mytmp[size]; \1998 memcpy(mytmp, &a, size); \1999 memcpy(&a, &b, size); \2000 memcpy(&b, mytmp, size); \2001} while (0)20022003static void reverse_patches(struct patch *p)2004{2005 for (; p; p = p->next) {2006 struct fragment *frag = p->fragments;20072008 swap(p->new_name, p->old_name);2009 swap(p->new_mode, p->old_mode);2010 swap(p->is_new, p->is_delete);2011 swap(p->lines_added, p->lines_deleted);2012 swap(p->old_sha1_prefix, p->new_sha1_prefix);20132014 for (; frag; frag = frag->next) {2015 swap(frag->newpos, frag->oldpos);2016 swap(frag->newlines, frag->oldlines);2017 }2018 }2019}20202021static const char pluses[] =2022"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";2023static const char minuses[]=2024"----------------------------------------------------------------------";20252026static void show_stats(struct patch *patch)2027{2028 struct strbuf qname = STRBUF_INIT;2029 char *cp = patch->new_name ? patch->new_name : patch->old_name;2030 int max, add, del;20312032 quote_c_style(cp, &qname, NULL, 0);20332034 /*2035 * "scale" the filename2036 */2037 max = max_len;2038 if (max > 50)2039 max = 50;20402041 if (qname.len > max) {2042 cp = strchr(qname.buf + qname.len + 3 - max, '/');2043 if (!cp)2044 cp = qname.buf + qname.len + 3 - max;2045 strbuf_splice(&qname, 0, cp - qname.buf, "...", 3);2046 }20472048 if (patch->is_binary) {2049 printf(" %-*s | Bin\n", max, qname.buf);2050 strbuf_release(&qname);2051 return;2052 }20532054 printf(" %-*s |", max, qname.buf);2055 strbuf_release(&qname);20562057 /*2058 * scale the add/delete2059 */2060 max = max + max_change > 70 ? 70 - max : max_change;2061 add = patch->lines_added;2062 del = patch->lines_deleted;20632064 if (max_change > 0) {2065 int total = ((add + del) * max + max_change / 2) / max_change;2066 add = (add * max + max_change / 2) / max_change;2067 del = total - add;2068 }2069 printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,2070 add, pluses, del, minuses);2071}20722073static int read_old_data(struct stat *st, const char *path, struct strbuf *buf)2074{2075 switch (st->st_mode & S_IFMT) {2076 case S_IFLNK:2077 if (strbuf_readlink(buf, path, st->st_size) < 0)2078 return error(_("unable to read symlink %s"), path);2079 return 0;2080 case S_IFREG:2081 if (strbuf_read_file(buf, path, st->st_size) != st->st_size)2082 return error(_("unable to open or read %s"), path);2083 convert_to_git(path, buf->buf, buf->len, buf, 0);2084 return 0;2085 default:2086 return -1;2087 }2088}20892090/*2091 * Update the preimage, and the common lines in postimage,2092 * from buffer buf of length len. If postlen is 0 the postimage2093 * is updated in place, otherwise it's updated on a new buffer2094 * of length postlen2095 */20962097static void update_pre_post_images(struct image *preimage,2098 struct image *postimage,2099 char *buf,2100 size_t len, size_t postlen)2101{2102 int i, ctx, reduced;2103 char *new, *old, *fixed;2104 struct image fixed_preimage;21052106 /*2107 * Update the preimage with whitespace fixes. Note that we2108 * are not losing preimage->buf -- apply_one_fragment() will2109 * free "oldlines".2110 */2111 prepare_image(&fixed_preimage, buf, len, 1);2112 assert(postlen2113 ? fixed_preimage.nr == preimage->nr2114 : fixed_preimage.nr <= preimage->nr);2115 for (i = 0; i < fixed_preimage.nr; i++)2116 fixed_preimage.line[i].flag = preimage->line[i].flag;2117 free(preimage->line_allocated);2118 *preimage = fixed_preimage;21192120 /*2121 * Adjust the common context lines in postimage. This can be2122 * done in-place when we are shrinking it with whitespace2123 * fixing, but needs a new buffer when ignoring whitespace or2124 * expanding leading tabs to spaces.2125 *2126 * We trust the caller to tell us if the update can be done2127 * in place (postlen==0) or not.2128 */2129 old = postimage->buf;2130 if (postlen)2131 new = postimage->buf = xmalloc(postlen);2132 else2133 new = old;2134 fixed = preimage->buf;21352136 for (i = reduced = ctx = 0; i < postimage->nr; i++) {2137 size_t len = postimage->line[i].len;2138 if (!(postimage->line[i].flag & LINE_COMMON)) {2139 /* an added line -- no counterparts in preimage */2140 memmove(new, old, len);2141 old += len;2142 new += len;2143 continue;2144 }21452146 /* a common context -- skip it in the original postimage */2147 old += len;21482149 /* and find the corresponding one in the fixed preimage */2150 while (ctx < preimage->nr &&2151 !(preimage->line[ctx].flag & LINE_COMMON)) {2152 fixed += preimage->line[ctx].len;2153 ctx++;2154 }21552156 /*2157 * preimage is expected to run out, if the caller2158 * fixed addition of trailing blank lines.2159 */2160 if (preimage->nr <= ctx) {2161 reduced++;2162 continue;2163 }21642165 /* and copy it in, while fixing the line length */2166 len = preimage->line[ctx].len;2167 memcpy(new, fixed, len);2168 new += len;2169 fixed += len;2170 postimage->line[i].len = len;2171 ctx++;2172 }21732174 /* Fix the length of the whole thing */2175 postimage->len = new - postimage->buf;2176 postimage->nr -= reduced;2177}21782179static int match_fragment(struct image *img,2180 struct image *preimage,2181 struct image *postimage,2182 unsigned long try,2183 int try_lno,2184 unsigned ws_rule,2185 int match_beginning, int match_end)2186{2187 int i;2188 char *fixed_buf, *buf, *orig, *target;2189 struct strbuf fixed;2190 size_t fixed_len, postlen;2191 int preimage_limit;21922193 if (preimage->nr + try_lno <= img->nr) {2194 /*2195 * The hunk falls within the boundaries of img.2196 */2197 preimage_limit = preimage->nr;2198 if (match_end && (preimage->nr + try_lno != img->nr))2199 return 0;2200 } else if (ws_error_action == correct_ws_error &&2201 (ws_rule & WS_BLANK_AT_EOF)) {2202 /*2203 * This hunk extends beyond the end of img, and we are2204 * removing blank lines at the end of the file. This2205 * many lines from the beginning of the preimage must2206 * match with img, and the remainder of the preimage2207 * must be blank.2208 */2209 preimage_limit = img->nr - try_lno;2210 } else {2211 /*2212 * The hunk extends beyond the end of the img and2213 * we are not removing blanks at the end, so we2214 * should reject the hunk at this position.2215 */2216 return 0;2217 }22182219 if (match_beginning && try_lno)2220 return 0;22212222 /* Quick hash check */2223 for (i = 0; i < preimage_limit; i++)2224 if ((img->line[try_lno + i].flag & LINE_PATCHED) ||2225 (preimage->line[i].hash != img->line[try_lno + i].hash))2226 return 0;22272228 if (preimage_limit == preimage->nr) {2229 /*2230 * Do we have an exact match? If we were told to match2231 * at the end, size must be exactly at try+fragsize,2232 * otherwise try+fragsize must be still within the preimage,2233 * and either case, the old piece should match the preimage2234 * exactly.2235 */2236 if ((match_end2237 ? (try + preimage->len == img->len)2238 : (try + preimage->len <= img->len)) &&2239 !memcmp(img->buf + try, preimage->buf, preimage->len))2240 return 1;2241 } else {2242 /*2243 * The preimage extends beyond the end of img, so2244 * there cannot be an exact match.2245 *2246 * There must be one non-blank context line that match2247 * a line before the end of img.2248 */2249 char *buf_end;22502251 buf = preimage->buf;2252 buf_end = buf;2253 for (i = 0; i < preimage_limit; i++)2254 buf_end += preimage->line[i].len;22552256 for ( ; buf < buf_end; buf++)2257 if (!isspace(*buf))2258 break;2259 if (buf == buf_end)2260 return 0;2261 }22622263 /*2264 * No exact match. If we are ignoring whitespace, run a line-by-line2265 * fuzzy matching. We collect all the line length information because2266 * we need it to adjust whitespace if we match.2267 */2268 if (ws_ignore_action == ignore_ws_change) {2269 size_t imgoff = 0;2270 size_t preoff = 0;2271 size_t postlen = postimage->len;2272 size_t extra_chars;2273 char *preimage_eof;2274 char *preimage_end;2275 for (i = 0; i < preimage_limit; i++) {2276 size_t prelen = preimage->line[i].len;2277 size_t imglen = img->line[try_lno+i].len;22782279 if (!fuzzy_matchlines(img->buf + try + imgoff, imglen,2280 preimage->buf + preoff, prelen))2281 return 0;2282 if (preimage->line[i].flag & LINE_COMMON)2283 postlen += imglen - prelen;2284 imgoff += imglen;2285 preoff += prelen;2286 }22872288 /*2289 * Ok, the preimage matches with whitespace fuzz.2290 *2291 * imgoff now holds the true length of the target that2292 * matches the preimage before the end of the file.2293 *2294 * Count the number of characters in the preimage that fall2295 * beyond the end of the file and make sure that all of them2296 * are whitespace characters. (This can only happen if2297 * we are removing blank lines at the end of the file.)2298 */2299 buf = preimage_eof = preimage->buf + preoff;2300 for ( ; i < preimage->nr; i++)2301 preoff += preimage->line[i].len;2302 preimage_end = preimage->buf + preoff;2303 for ( ; buf < preimage_end; buf++)2304 if (!isspace(*buf))2305 return 0;23062307 /*2308 * Update the preimage and the common postimage context2309 * lines to use the same whitespace as the target.2310 * If whitespace is missing in the target (i.e.2311 * if the preimage extends beyond the end of the file),2312 * use the whitespace from the preimage.2313 */2314 extra_chars = preimage_end - preimage_eof;2315 strbuf_init(&fixed, imgoff + extra_chars);2316 strbuf_add(&fixed, img->buf + try, imgoff);2317 strbuf_add(&fixed, preimage_eof, extra_chars);2318 fixed_buf = strbuf_detach(&fixed, &fixed_len);2319 update_pre_post_images(preimage, postimage,2320 fixed_buf, fixed_len, postlen);2321 return 1;2322 }23232324 if (ws_error_action != correct_ws_error)2325 return 0;23262327 /*2328 * The hunk does not apply byte-by-byte, but the hash says2329 * it might with whitespace fuzz. We haven't been asked to2330 * ignore whitespace, we were asked to correct whitespace2331 * errors, so let's try matching after whitespace correction.2332 *2333 * The preimage may extend beyond the end of the file,2334 * but in this loop we will only handle the part of the2335 * preimage that falls within the file.2336 */2337 strbuf_init(&fixed, preimage->len + 1);2338 orig = preimage->buf;2339 target = img->buf + try;2340 postlen = 0;2341 for (i = 0; i < preimage_limit; i++) {2342 size_t oldlen = preimage->line[i].len;2343 size_t tgtlen = img->line[try_lno + i].len;2344 size_t fixstart = fixed.len;2345 struct strbuf tgtfix;2346 int match;23472348 /* Try fixing the line in the preimage */2349 ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);23502351 /* Try fixing the line in the target */2352 strbuf_init(&tgtfix, tgtlen);2353 ws_fix_copy(&tgtfix, target, tgtlen, ws_rule, NULL);23542355 /*2356 * If they match, either the preimage was based on2357 * a version before our tree fixed whitespace breakage,2358 * or we are lacking a whitespace-fix patch the tree2359 * the preimage was based on already had (i.e. target2360 * has whitespace breakage, the preimage doesn't).2361 * In either case, we are fixing the whitespace breakages2362 * so we might as well take the fix together with their2363 * real change.2364 */2365 match = (tgtfix.len == fixed.len - fixstart &&2366 !memcmp(tgtfix.buf, fixed.buf + fixstart,2367 fixed.len - fixstart));2368 postlen += tgtfix.len;23692370 strbuf_release(&tgtfix);2371 if (!match)2372 goto unmatch_exit;23732374 orig += oldlen;2375 target += tgtlen;2376 }237723782379 /*2380 * Now handle the lines in the preimage that falls beyond the2381 * end of the file (if any). They will only match if they are2382 * empty or only contain whitespace (if WS_BLANK_AT_EOL is2383 * false).2384 */2385 for ( ; i < preimage->nr; i++) {2386 size_t fixstart = fixed.len; /* start of the fixed preimage */2387 size_t oldlen = preimage->line[i].len;2388 int j;23892390 /* Try fixing the line in the preimage */2391 ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);23922393 for (j = fixstart; j < fixed.len; j++)2394 if (!isspace(fixed.buf[j]))2395 goto unmatch_exit;23962397 orig += oldlen;2398 }23992400 /*2401 * Yes, the preimage is based on an older version that still2402 * has whitespace breakages unfixed, and fixing them makes the2403 * hunk match. Update the context lines in the postimage.2404 */2405 fixed_buf = strbuf_detach(&fixed, &fixed_len);2406 if (postlen < postimage->len)2407 postlen = 0;2408 update_pre_post_images(preimage, postimage,2409 fixed_buf, fixed_len, postlen);2410 return 1;24112412 unmatch_exit:2413 strbuf_release(&fixed);2414 return 0;2415}24162417static int find_pos(struct image *img,2418 struct image *preimage,2419 struct image *postimage,2420 int line,2421 unsigned ws_rule,2422 int match_beginning, int match_end)2423{2424 int i;2425 unsigned long backwards, forwards, try;2426 int backwards_lno, forwards_lno, try_lno;24272428 /*2429 * If match_beginning or match_end is specified, there is no2430 * point starting from a wrong line that will never match and2431 * wander around and wait for a match at the specified end.2432 */2433 if (match_beginning)2434 line = 0;2435 else if (match_end)2436 line = img->nr - preimage->nr;24372438 /*2439 * Because the comparison is unsigned, the following test2440 * will also take care of a negative line number that can2441 * result when match_end and preimage is larger than the target.2442 */2443 if ((size_t) line > img->nr)2444 line = img->nr;24452446 try = 0;2447 for (i = 0; i < line; i++)2448 try += img->line[i].len;24492450 /*2451 * There's probably some smart way to do this, but I'll leave2452 * that to the smart and beautiful people. I'm simple and stupid.2453 */2454 backwards = try;2455 backwards_lno = line;2456 forwards = try;2457 forwards_lno = line;2458 try_lno = line;24592460 for (i = 0; ; i++) {2461 if (match_fragment(img, preimage, postimage,2462 try, try_lno, ws_rule,2463 match_beginning, match_end))2464 return try_lno;24652466 again:2467 if (backwards_lno == 0 && forwards_lno == img->nr)2468 break;24692470 if (i & 1) {2471 if (backwards_lno == 0) {2472 i++;2473 goto again;2474 }2475 backwards_lno--;2476 backwards -= img->line[backwards_lno].len;2477 try = backwards;2478 try_lno = backwards_lno;2479 } else {2480 if (forwards_lno == img->nr) {2481 i++;2482 goto again;2483 }2484 forwards += img->line[forwards_lno].len;2485 forwards_lno++;2486 try = forwards;2487 try_lno = forwards_lno;2488 }24892490 }2491 return -1;2492}24932494static void remove_first_line(struct image *img)2495{2496 img->buf += img->line[0].len;2497 img->len -= img->line[0].len;2498 img->line++;2499 img->nr--;2500}25012502static void remove_last_line(struct image *img)2503{2504 img->len -= img->line[--img->nr].len;2505}25062507/*2508 * The change from "preimage" and "postimage" has been found to2509 * apply at applied_pos (counts in line numbers) in "img".2510 * Update "img" to remove "preimage" and replace it with "postimage".2511 */2512static void update_image(struct image *img,2513 int applied_pos,2514 struct image *preimage,2515 struct image *postimage)2516{2517 /*2518 * remove the copy of preimage at offset in img2519 * and replace it with postimage2520 */2521 int i, nr;2522 size_t remove_count, insert_count, applied_at = 0;2523 char *result;2524 int preimage_limit;25252526 /*2527 * If we are removing blank lines at the end of img,2528 * the preimage may extend beyond the end.2529 * If that is the case, we must be careful only to2530 * remove the part of the preimage that falls within2531 * the boundaries of img. Initialize preimage_limit2532 * to the number of lines in the preimage that falls2533 * within the boundaries.2534 */2535 preimage_limit = preimage->nr;2536 if (preimage_limit > img->nr - applied_pos)2537 preimage_limit = img->nr - applied_pos;25382539 for (i = 0; i < applied_pos; i++)2540 applied_at += img->line[i].len;25412542 remove_count = 0;2543 for (i = 0; i < preimage_limit; i++)2544 remove_count += img->line[applied_pos + i].len;2545 insert_count = postimage->len;25462547 /* Adjust the contents */2548 result = xmalloc(img->len + insert_count - remove_count + 1);2549 memcpy(result, img->buf, applied_at);2550 memcpy(result + applied_at, postimage->buf, postimage->len);2551 memcpy(result + applied_at + postimage->len,2552 img->buf + (applied_at + remove_count),2553 img->len - (applied_at + remove_count));2554 free(img->buf);2555 img->buf = result;2556 img->len += insert_count - remove_count;2557 result[img->len] = '\0';25582559 /* Adjust the line table */2560 nr = img->nr + postimage->nr - preimage_limit;2561 if (preimage_limit < postimage->nr) {2562 /*2563 * NOTE: this knows that we never call remove_first_line()2564 * on anything other than pre/post image.2565 */2566 img->line = xrealloc(img->line, nr * sizeof(*img->line));2567 img->line_allocated = img->line;2568 }2569 if (preimage_limit != postimage->nr)2570 memmove(img->line + applied_pos + postimage->nr,2571 img->line + applied_pos + preimage_limit,2572 (img->nr - (applied_pos + preimage_limit)) *2573 sizeof(*img->line));2574 memcpy(img->line + applied_pos,2575 postimage->line,2576 postimage->nr * sizeof(*img->line));2577 if (!allow_overlap)2578 for (i = 0; i < postimage->nr; i++)2579 img->line[applied_pos + i].flag |= LINE_PATCHED;2580 img->nr = nr;2581}25822583/*2584 * Use the patch-hunk text in "frag" to prepare two images (preimage and2585 * postimage) for the hunk. Find lines that match "preimage" in "img" and2586 * replace the part of "img" with "postimage" text.2587 */2588static int apply_one_fragment(struct image *img, struct fragment *frag,2589 int inaccurate_eof, unsigned ws_rule,2590 int nth_fragment)2591{2592 int match_beginning, match_end;2593 const char *patch = frag->patch;2594 int size = frag->size;2595 char *old, *oldlines;2596 struct strbuf newlines;2597 int new_blank_lines_at_end = 0;2598 int found_new_blank_lines_at_end = 0;2599 int hunk_linenr = frag->linenr;2600 unsigned long leading, trailing;2601 int pos, applied_pos;2602 struct image preimage;2603 struct image postimage;26042605 memset(&preimage, 0, sizeof(preimage));2606 memset(&postimage, 0, sizeof(postimage));2607 oldlines = xmalloc(size);2608 strbuf_init(&newlines, size);26092610 old = oldlines;2611 while (size > 0) {2612 char first;2613 int len = linelen(patch, size);2614 int plen;2615 int added_blank_line = 0;2616 int is_blank_context = 0;2617 size_t start;26182619 if (!len)2620 break;26212622 /*2623 * "plen" is how much of the line we should use for2624 * the actual patch data. Normally we just remove the2625 * first character on the line, but if the line is2626 * followed by "\ No newline", then we also remove the2627 * last one (which is the newline, of course).2628 */2629 plen = len - 1;2630 if (len < size && patch[len] == '\\')2631 plen--;2632 first = *patch;2633 if (apply_in_reverse) {2634 if (first == '-')2635 first = '+';2636 else if (first == '+')2637 first = '-';2638 }26392640 switch (first) {2641 case '\n':2642 /* Newer GNU diff, empty context line */2643 if (plen < 0)2644 /* ... followed by '\No newline'; nothing */2645 break;2646 *old++ = '\n';2647 strbuf_addch(&newlines, '\n');2648 add_line_info(&preimage, "\n", 1, LINE_COMMON);2649 add_line_info(&postimage, "\n", 1, LINE_COMMON);2650 is_blank_context = 1;2651 break;2652 case ' ':2653 if (plen && (ws_rule & WS_BLANK_AT_EOF) &&2654 ws_blank_line(patch + 1, plen, ws_rule))2655 is_blank_context = 1;2656 case '-':2657 memcpy(old, patch + 1, plen);2658 add_line_info(&preimage, old, plen,2659 (first == ' ' ? LINE_COMMON : 0));2660 old += plen;2661 if (first == '-')2662 break;2663 /* Fall-through for ' ' */2664 case '+':2665 /* --no-add does not add new lines */2666 if (first == '+' && no_add)2667 break;26682669 start = newlines.len;2670 if (first != '+' ||2671 !whitespace_error ||2672 ws_error_action != correct_ws_error) {2673 strbuf_add(&newlines, patch + 1, plen);2674 }2675 else {2676 ws_fix_copy(&newlines, patch + 1, plen, ws_rule, &applied_after_fixing_ws);2677 }2678 add_line_info(&postimage, newlines.buf + start, newlines.len - start,2679 (first == '+' ? 0 : LINE_COMMON));2680 if (first == '+' &&2681 (ws_rule & WS_BLANK_AT_EOF) &&2682 ws_blank_line(patch + 1, plen, ws_rule))2683 added_blank_line = 1;2684 break;2685 case '@': case '\\':2686 /* Ignore it, we already handled it */2687 break;2688 default:2689 if (apply_verbosely)2690 error(_("invalid start of line: '%c'"), first);2691 return -1;2692 }2693 if (added_blank_line) {2694 if (!new_blank_lines_at_end)2695 found_new_blank_lines_at_end = hunk_linenr;2696 new_blank_lines_at_end++;2697 }2698 else if (is_blank_context)2699 ;2700 else2701 new_blank_lines_at_end = 0;2702 patch += len;2703 size -= len;2704 hunk_linenr++;2705 }2706 if (inaccurate_eof &&2707 old > oldlines && old[-1] == '\n' &&2708 newlines.len > 0 && newlines.buf[newlines.len - 1] == '\n') {2709 old--;2710 strbuf_setlen(&newlines, newlines.len - 1);2711 }27122713 leading = frag->leading;2714 trailing = frag->trailing;27152716 /*2717 * A hunk to change lines at the beginning would begin with2718 * @@ -1,L +N,M @@2719 * but we need to be careful. -U0 that inserts before the second2720 * line also has this pattern.2721 *2722 * And a hunk to add to an empty file would begin with2723 * @@ -0,0 +N,M @@2724 *2725 * In other words, a hunk that is (frag->oldpos <= 1) with or2726 * without leading context must match at the beginning.2727 */2728 match_beginning = (!frag->oldpos ||2729 (frag->oldpos == 1 && !unidiff_zero));27302731 /*2732 * A hunk without trailing lines must match at the end.2733 * However, we simply cannot tell if a hunk must match end2734 * from the lack of trailing lines if the patch was generated2735 * with unidiff without any context.2736 */2737 match_end = !unidiff_zero && !trailing;27382739 pos = frag->newpos ? (frag->newpos - 1) : 0;2740 preimage.buf = oldlines;2741 preimage.len = old - oldlines;2742 postimage.buf = newlines.buf;2743 postimage.len = newlines.len;2744 preimage.line = preimage.line_allocated;2745 postimage.line = postimage.line_allocated;27462747 for (;;) {27482749 applied_pos = find_pos(img, &preimage, &postimage, pos,2750 ws_rule, match_beginning, match_end);27512752 if (applied_pos >= 0)2753 break;27542755 /* Am I at my context limits? */2756 if ((leading <= p_context) && (trailing <= p_context))2757 break;2758 if (match_beginning || match_end) {2759 match_beginning = match_end = 0;2760 continue;2761 }27622763 /*2764 * Reduce the number of context lines; reduce both2765 * leading and trailing if they are equal otherwise2766 * just reduce the larger context.2767 */2768 if (leading >= trailing) {2769 remove_first_line(&preimage);2770 remove_first_line(&postimage);2771 pos--;2772 leading--;2773 }2774 if (trailing > leading) {2775 remove_last_line(&preimage);2776 remove_last_line(&postimage);2777 trailing--;2778 }2779 }27802781 if (applied_pos >= 0) {2782 if (new_blank_lines_at_end &&2783 preimage.nr + applied_pos >= img->nr &&2784 (ws_rule & WS_BLANK_AT_EOF) &&2785 ws_error_action != nowarn_ws_error) {2786 record_ws_error(WS_BLANK_AT_EOF, "+", 1,2787 found_new_blank_lines_at_end);2788 if (ws_error_action == correct_ws_error) {2789 while (new_blank_lines_at_end--)2790 remove_last_line(&postimage);2791 }2792 /*2793 * We would want to prevent write_out_results()2794 * from taking place in apply_patch() that follows2795 * the callchain led us here, which is:2796 * apply_patch->check_patch_list->check_patch->2797 * apply_data->apply_fragments->apply_one_fragment2798 */2799 if (ws_error_action == die_on_ws_error)2800 apply = 0;2801 }28022803 if (apply_verbosely && applied_pos != pos) {2804 int offset = applied_pos - pos;2805 if (apply_in_reverse)2806 offset = 0 - offset;2807 fprintf_ln(stderr,2808 Q_("Hunk #%d succeeded at %d (offset %d line).",2809 "Hunk #%d succeeded at %d (offset %d lines).",2810 offset),2811 nth_fragment, applied_pos + 1, offset);2812 }28132814 /*2815 * Warn if it was necessary to reduce the number2816 * of context lines.2817 */2818 if ((leading != frag->leading) ||2819 (trailing != frag->trailing))2820 fprintf_ln(stderr, _("Context reduced to (%ld/%ld)"2821 " to apply fragment at %d"),2822 leading, trailing, applied_pos+1);2823 update_image(img, applied_pos, &preimage, &postimage);2824 } else {2825 if (apply_verbosely)2826 error(_("while searching for:\n%.*s"),2827 (int)(old - oldlines), oldlines);2828 }28292830 free(oldlines);2831 strbuf_release(&newlines);2832 free(preimage.line_allocated);2833 free(postimage.line_allocated);28342835 return (applied_pos < 0);2836}28372838static int apply_binary_fragment(struct image *img, struct patch *patch)2839{2840 struct fragment *fragment = patch->fragments;2841 unsigned long len;2842 void *dst;28432844 if (!fragment)2845 return error(_("missing binary patch data for '%s'"),2846 patch->new_name ?2847 patch->new_name :2848 patch->old_name);28492850 /* Binary patch is irreversible without the optional second hunk */2851 if (apply_in_reverse) {2852 if (!fragment->next)2853 return error("cannot reverse-apply a binary patch "2854 "without the reverse hunk to '%s'",2855 patch->new_name2856 ? patch->new_name : patch->old_name);2857 fragment = fragment->next;2858 }2859 switch (fragment->binary_patch_method) {2860 case BINARY_DELTA_DEFLATED:2861 dst = patch_delta(img->buf, img->len, fragment->patch,2862 fragment->size, &len);2863 if (!dst)2864 return -1;2865 clear_image(img);2866 img->buf = dst;2867 img->len = len;2868 return 0;2869 case BINARY_LITERAL_DEFLATED:2870 clear_image(img);2871 img->len = fragment->size;2872 img->buf = xmalloc(img->len+1);2873 memcpy(img->buf, fragment->patch, img->len);2874 img->buf[img->len] = '\0';2875 return 0;2876 }2877 return -1;2878}28792880/*2881 * Replace "img" with the result of applying the binary patch.2882 * The binary patch data itself in patch->fragment is still kept2883 * but the preimage prepared by the caller in "img" is freed here2884 * or in the helper function apply_binary_fragment() this calls.2885 */2886static int apply_binary(struct image *img, struct patch *patch)2887{2888 const char *name = patch->old_name ? patch->old_name : patch->new_name;2889 unsigned char sha1[20];28902891 /*2892 * For safety, we require patch index line to contain2893 * full 40-byte textual SHA1 for old and new, at least for now.2894 */2895 if (strlen(patch->old_sha1_prefix) != 40 ||2896 strlen(patch->new_sha1_prefix) != 40 ||2897 get_sha1_hex(patch->old_sha1_prefix, sha1) ||2898 get_sha1_hex(patch->new_sha1_prefix, sha1))2899 return error("cannot apply binary patch to '%s' "2900 "without full index line", name);29012902 if (patch->old_name) {2903 /*2904 * See if the old one matches what the patch2905 * applies to.2906 */2907 hash_sha1_file(img->buf, img->len, blob_type, sha1);2908 if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))2909 return error("the patch applies to '%s' (%s), "2910 "which does not match the "2911 "current contents.",2912 name, sha1_to_hex(sha1));2913 }2914 else {2915 /* Otherwise, the old one must be empty. */2916 if (img->len)2917 return error("the patch applies to an empty "2918 "'%s' but it is not empty", name);2919 }29202921 get_sha1_hex(patch->new_sha1_prefix, sha1);2922 if (is_null_sha1(sha1)) {2923 clear_image(img);2924 return 0; /* deletion patch */2925 }29262927 if (has_sha1_file(sha1)) {2928 /* We already have the postimage */2929 enum object_type type;2930 unsigned long size;2931 char *result;29322933 result = read_sha1_file(sha1, &type, &size);2934 if (!result)2935 return error("the necessary postimage %s for "2936 "'%s' cannot be read",2937 patch->new_sha1_prefix, name);2938 clear_image(img);2939 img->buf = result;2940 img->len = size;2941 } else {2942 /*2943 * We have verified buf matches the preimage;2944 * apply the patch data to it, which is stored2945 * in the patch->fragments->{patch,size}.2946 */2947 if (apply_binary_fragment(img, patch))2948 return error(_("binary patch does not apply to '%s'"),2949 name);29502951 /* verify that the result matches */2952 hash_sha1_file(img->buf, img->len, blob_type, sha1);2953 if (strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))2954 return error(_("binary patch to '%s' creates incorrect result (expecting %s, got %s)"),2955 name, patch->new_sha1_prefix, sha1_to_hex(sha1));2956 }29572958 return 0;2959}29602961static int apply_fragments(struct image *img, struct patch *patch)2962{2963 struct fragment *frag = patch->fragments;2964 const char *name = patch->old_name ? patch->old_name : patch->new_name;2965 unsigned ws_rule = patch->ws_rule;2966 unsigned inaccurate_eof = patch->inaccurate_eof;2967 int nth = 0;29682969 if (patch->is_binary)2970 return apply_binary(img, patch);29712972 while (frag) {2973 nth++;2974 if (apply_one_fragment(img, frag, inaccurate_eof, ws_rule, nth)) {2975 error(_("patch failed: %s:%ld"), name, frag->oldpos);2976 if (!apply_with_reject)2977 return -1;2978 frag->rejected = 1;2979 }2980 frag = frag->next;2981 }2982 return 0;2983}29842985static int read_blob_object(struct strbuf *buf, const unsigned char *sha1, unsigned mode)2986{2987 if (S_ISGITLINK(mode)) {2988 strbuf_grow(buf, 100);2989 strbuf_addf(buf, "Subproject commit %s\n", sha1_to_hex(sha1));2990 } else {2991 enum object_type type;2992 unsigned long sz;2993 char *result;29942995 result = read_sha1_file(sha1, &type, &sz);2996 if (!result)2997 return -1;2998 /* XXX read_sha1_file NUL-terminates */2999 strbuf_attach(buf, result, sz, sz + 1);3000 }3001 return 0;3002}30033004static int read_file_or_gitlink(const struct cache_entry *ce, struct strbuf *buf)3005{3006 if (!ce)3007 return 0;3008 return read_blob_object(buf, ce->sha1, ce->ce_mode);3009}30103011static struct patch *in_fn_table(const char *name)3012{3013 struct string_list_item *item;30143015 if (name == NULL)3016 return NULL;30173018 item = string_list_lookup(&fn_table, name);3019 if (item != NULL)3020 return (struct patch *)item->util;30213022 return NULL;3023}30243025/*3026 * item->util in the filename table records the status of the path.3027 * Usually it points at a patch (whose result records the contents3028 * of it after applying it), but it could be PATH_WAS_DELETED for a3029 * path that a previously applied patch has already removed, or3030 * PATH_TO_BE_DELETED for a path that a later patch would remove.3031 *3032 * The latter is needed to deal with a case where two paths A and B3033 * are swapped by first renaming A to B and then renaming B to A;3034 * moving A to B should not be prevented due to presence of B as we3035 * will remove it in a later patch.3036 */3037#define PATH_TO_BE_DELETED ((struct patch *) -2)3038#define PATH_WAS_DELETED ((struct patch *) -1)30393040static int to_be_deleted(struct patch *patch)3041{3042 return patch == PATH_TO_BE_DELETED;3043}30443045static int was_deleted(struct patch *patch)3046{3047 return patch == PATH_WAS_DELETED;3048}30493050static void add_to_fn_table(struct patch *patch)3051{3052 struct string_list_item *item;30533054 /*3055 * Always add new_name unless patch is a deletion3056 * This should cover the cases for normal diffs,3057 * file creations and copies3058 */3059 if (patch->new_name != NULL) {3060 item = string_list_insert(&fn_table, patch->new_name);3061 item->util = patch;3062 }30633064 /*3065 * store a failure on rename/deletion cases because3066 * later chunks shouldn't patch old names3067 */3068 if ((patch->new_name == NULL) || (patch->is_rename)) {3069 item = string_list_insert(&fn_table, patch->old_name);3070 item->util = PATH_WAS_DELETED;3071 }3072}30733074static void prepare_fn_table(struct patch *patch)3075{3076 /*3077 * store information about incoming file deletion3078 */3079 while (patch) {3080 if ((patch->new_name == NULL) || (patch->is_rename)) {3081 struct string_list_item *item;3082 item = string_list_insert(&fn_table, patch->old_name);3083 item->util = PATH_TO_BE_DELETED;3084 }3085 patch = patch->next;3086 }3087}30883089static int checkout_target(struct cache_entry *ce, struct stat *st)3090{3091 struct checkout costate;30923093 memset(&costate, 0, sizeof(costate));3094 costate.base_dir = "";3095 costate.refresh_cache = 1;3096 if (checkout_entry(ce, &costate, NULL) || lstat(ce->name, st))3097 return error(_("cannot checkout %s"), ce->name);3098 return 0;3099}31003101static struct patch *previous_patch(struct patch *patch, int *gone)3102{3103 struct patch *previous;31043105 *gone = 0;3106 if (patch->is_copy || patch->is_rename)3107 return NULL; /* "git" patches do not depend on the order */31083109 previous = in_fn_table(patch->old_name);3110 if (!previous)3111 return NULL;31123113 if (to_be_deleted(previous))3114 return NULL; /* the deletion hasn't happened yet */31153116 if (was_deleted(previous))3117 *gone = 1;31183119 return previous;3120}31213122static int verify_index_match(const struct cache_entry *ce, struct stat *st)3123{3124 if (S_ISGITLINK(ce->ce_mode)) {3125 if (!S_ISDIR(st->st_mode))3126 return -1;3127 return 0;3128 }3129 return ce_match_stat(ce, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);3130}31313132#define SUBMODULE_PATCH_WITHOUT_INDEX 131333134static int load_patch_target(struct strbuf *buf,3135 const struct cache_entry *ce,3136 struct stat *st,3137 const char *name,3138 unsigned expected_mode)3139{3140 if (cached) {3141 if (read_file_or_gitlink(ce, buf))3142 return error(_("read of %s failed"), name);3143 } else if (name) {3144 if (S_ISGITLINK(expected_mode)) {3145 if (ce)3146 return read_file_or_gitlink(ce, buf);3147 else3148 return SUBMODULE_PATCH_WITHOUT_INDEX;3149 } else {3150 if (read_old_data(st, name, buf))3151 return error(_("read of %s failed"), name);3152 }3153 }3154 return 0;3155}31563157/*3158 * We are about to apply "patch"; populate the "image" with the3159 * current version we have, from the working tree or from the index,3160 * depending on the situation e.g. --cached/--index. If we are3161 * applying a non-git patch that incrementally updates the tree,3162 * we read from the result of a previous diff.3163 */3164static int load_preimage(struct image *image,3165 struct patch *patch, struct stat *st,3166 const struct cache_entry *ce)3167{3168 struct strbuf buf = STRBUF_INIT;3169 size_t len;3170 char *img;3171 struct patch *previous;3172 int status;31733174 previous = previous_patch(patch, &status);3175 if (status)3176 return error(_("path %s has been renamed/deleted"),3177 patch->old_name);3178 if (previous) {3179 /* We have a patched copy in memory; use that. */3180 strbuf_add(&buf, previous->result, previous->resultsize);3181 } else {3182 status = load_patch_target(&buf, ce, st,3183 patch->old_name, patch->old_mode);3184 if (status < 0)3185 return status;3186 else if (status == SUBMODULE_PATCH_WITHOUT_INDEX) {3187 /*3188 * There is no way to apply subproject3189 * patch without looking at the index.3190 * NEEDSWORK: shouldn't this be flagged3191 * as an error???3192 */3193 free_fragment_list(patch->fragments);3194 patch->fragments = NULL;3195 } else if (status) {3196 return error(_("read of %s failed"), patch->old_name);3197 }3198 }31993200 img = strbuf_detach(&buf, &len);3201 prepare_image(image, img, len, !patch->is_binary);3202 return 0;3203}32043205static int three_way_merge(struct image *image,3206 char *path,3207 const unsigned char *base,3208 const unsigned char *ours,3209 const unsigned char *theirs)3210{3211 mmfile_t base_file, our_file, their_file;3212 mmbuffer_t result = { NULL };3213 int status;32143215 read_mmblob(&base_file, base);3216 read_mmblob(&our_file, ours);3217 read_mmblob(&their_file, theirs);3218 status = ll_merge(&result, path,3219 &base_file, "base",3220 &our_file, "ours",3221 &their_file, "theirs", NULL);3222 free(base_file.ptr);3223 free(our_file.ptr);3224 free(their_file.ptr);3225 if (status < 0 || !result.ptr) {3226 free(result.ptr);3227 return -1;3228 }3229 clear_image(image);3230 image->buf = result.ptr;3231 image->len = result.size;32323233 return status;3234}32353236/*3237 * When directly falling back to add/add three-way merge, we read from3238 * the current contents of the new_name. In no cases other than that3239 * this function will be called.3240 */3241static int load_current(struct image *image, struct patch *patch)3242{3243 struct strbuf buf = STRBUF_INIT;3244 int status, pos;3245 size_t len;3246 char *img;3247 struct stat st;3248 struct cache_entry *ce;3249 char *name = patch->new_name;3250 unsigned mode = patch->new_mode;32513252 if (!patch->is_new)3253 die("BUG: patch to %s is not a creation", patch->old_name);32543255 pos = cache_name_pos(name, strlen(name));3256 if (pos < 0)3257 return error(_("%s: does not exist in index"), name);3258 ce = active_cache[pos];3259 if (lstat(name, &st)) {3260 if (errno != ENOENT)3261 return error(_("%s: %s"), name, strerror(errno));3262 if (checkout_target(ce, &st))3263 return -1;3264 }3265 if (verify_index_match(ce, &st))3266 return error(_("%s: does not match index"), name);32673268 status = load_patch_target(&buf, ce, &st, name, mode);3269 if (status < 0)3270 return status;3271 else if (status)3272 return -1;3273 img = strbuf_detach(&buf, &len);3274 prepare_image(image, img, len, !patch->is_binary);3275 return 0;3276}32773278static int try_threeway(struct image *image, struct patch *patch,3279 struct stat *st, const struct cache_entry *ce)3280{3281 unsigned char pre_sha1[20], post_sha1[20], our_sha1[20];3282 struct strbuf buf = STRBUF_INIT;3283 size_t len;3284 int status;3285 char *img;3286 struct image tmp_image;32873288 /* No point falling back to 3-way merge in these cases */3289 if (patch->is_delete ||3290 S_ISGITLINK(patch->old_mode) || S_ISGITLINK(patch->new_mode))3291 return -1;32923293 /* Preimage the patch was prepared for */3294 if (patch->is_new)3295 write_sha1_file("", 0, blob_type, pre_sha1);3296 else if (get_sha1(patch->old_sha1_prefix, pre_sha1) ||3297 read_blob_object(&buf, pre_sha1, patch->old_mode))3298 return error("repository lacks the necessary blob to fall back on 3-way merge.");32993300 fprintf(stderr, "Falling back to three-way merge...\n");33013302 img = strbuf_detach(&buf, &len);3303 prepare_image(&tmp_image, img, len, 1);3304 /* Apply the patch to get the post image */3305 if (apply_fragments(&tmp_image, patch) < 0) {3306 clear_image(&tmp_image);3307 return -1;3308 }3309 /* post_sha1[] is theirs */3310 write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, post_sha1);3311 clear_image(&tmp_image);33123313 /* our_sha1[] is ours */3314 if (patch->is_new) {3315 if (load_current(&tmp_image, patch))3316 return error("cannot read the current contents of '%s'",3317 patch->new_name);3318 } else {3319 if (load_preimage(&tmp_image, patch, st, ce))3320 return error("cannot read the current contents of '%s'",3321 patch->old_name);3322 }3323 write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, our_sha1);3324 clear_image(&tmp_image);33253326 /* in-core three-way merge between post and our using pre as base */3327 status = three_way_merge(image, patch->new_name,3328 pre_sha1, our_sha1, post_sha1);3329 if (status < 0) {3330 fprintf(stderr, "Failed to fall back on three-way merge...\n");3331 return status;3332 }33333334 if (status) {3335 patch->conflicted_threeway = 1;3336 if (patch->is_new)3337 hashclr(patch->threeway_stage[0]);3338 else3339 hashcpy(patch->threeway_stage[0], pre_sha1);3340 hashcpy(patch->threeway_stage[1], our_sha1);3341 hashcpy(patch->threeway_stage[2], post_sha1);3342 fprintf(stderr, "Applied patch to '%s' with conflicts.\n", patch->new_name);3343 } else {3344 fprintf(stderr, "Applied patch to '%s' cleanly.\n", patch->new_name);3345 }3346 return 0;3347}33483349static int apply_data(struct patch *patch, struct stat *st, const struct cache_entry *ce)3350{3351 struct image image;33523353 if (load_preimage(&image, patch, st, ce) < 0)3354 return -1;33553356 if (patch->direct_to_threeway ||3357 apply_fragments(&image, patch) < 0) {3358 /* Note: with --reject, apply_fragments() returns 0 */3359 if (!threeway || try_threeway(&image, patch, st, ce) < 0)3360 return -1;3361 }3362 patch->result = image.buf;3363 patch->resultsize = image.len;3364 add_to_fn_table(patch);3365 free(image.line_allocated);33663367 if (0 < patch->is_delete && patch->resultsize)3368 return error(_("removal patch leaves file contents"));33693370 return 0;3371}33723373/*3374 * If "patch" that we are looking at modifies or deletes what we have,3375 * we would want it not to lose any local modification we have, either3376 * in the working tree or in the index.3377 *3378 * This also decides if a non-git patch is a creation patch or a3379 * modification to an existing empty file. We do not check the state3380 * of the current tree for a creation patch in this function; the caller3381 * check_patch() separately makes sure (and errors out otherwise) that3382 * the path the patch creates does not exist in the current tree.3383 */3384static int check_preimage(struct patch *patch, struct cache_entry **ce, struct stat *st)3385{3386 const char *old_name = patch->old_name;3387 struct patch *previous = NULL;3388 int stat_ret = 0, status;3389 unsigned st_mode = 0;33903391 if (!old_name)3392 return 0;33933394 assert(patch->is_new <= 0);3395 previous = previous_patch(patch, &status);33963397 if (status)3398 return error(_("path %s has been renamed/deleted"), old_name);3399 if (previous) {3400 st_mode = previous->new_mode;3401 } else if (!cached) {3402 stat_ret = lstat(old_name, st);3403 if (stat_ret && errno != ENOENT)3404 return error(_("%s: %s"), old_name, strerror(errno));3405 }34063407 if (check_index && !previous) {3408 int pos = cache_name_pos(old_name, strlen(old_name));3409 if (pos < 0) {3410 if (patch->is_new < 0)3411 goto is_new;3412 return error(_("%s: does not exist in index"), old_name);3413 }3414 *ce = active_cache[pos];3415 if (stat_ret < 0) {3416 if (checkout_target(*ce, st))3417 return -1;3418 }3419 if (!cached && verify_index_match(*ce, st))3420 return error(_("%s: does not match index"), old_name);3421 if (cached)3422 st_mode = (*ce)->ce_mode;3423 } else if (stat_ret < 0) {3424 if (patch->is_new < 0)3425 goto is_new;3426 return error(_("%s: %s"), old_name, strerror(errno));3427 }34283429 if (!cached && !previous)3430 st_mode = ce_mode_from_stat(*ce, st->st_mode);34313432 if (patch->is_new < 0)3433 patch->is_new = 0;3434 if (!patch->old_mode)3435 patch->old_mode = st_mode;3436 if ((st_mode ^ patch->old_mode) & S_IFMT)3437 return error(_("%s: wrong type"), old_name);3438 if (st_mode != patch->old_mode)3439 warning(_("%s has type %o, expected %o"),3440 old_name, st_mode, patch->old_mode);3441 if (!patch->new_mode && !patch->is_delete)3442 patch->new_mode = st_mode;3443 return 0;34443445 is_new:3446 patch->is_new = 1;3447 patch->is_delete = 0;3448 free(patch->old_name);3449 patch->old_name = NULL;3450 return 0;3451}345234533454#define EXISTS_IN_INDEX 13455#define EXISTS_IN_WORKTREE 234563457static int check_to_create(const char *new_name, int ok_if_exists)3458{3459 struct stat nst;34603461 if (check_index &&3462 cache_name_pos(new_name, strlen(new_name)) >= 0 &&3463 !ok_if_exists)3464 return EXISTS_IN_INDEX;3465 if (cached)3466 return 0;34673468 if (!lstat(new_name, &nst)) {3469 if (S_ISDIR(nst.st_mode) || ok_if_exists)3470 return 0;3471 /*3472 * A leading component of new_name might be a symlink3473 * that is going to be removed with this patch, but3474 * still pointing at somewhere that has the path.3475 * In such a case, path "new_name" does not exist as3476 * far as git is concerned.3477 */3478 if (has_symlink_leading_path(new_name, strlen(new_name)))3479 return 0;34803481 return EXISTS_IN_WORKTREE;3482 } else if ((errno != ENOENT) && (errno != ENOTDIR)) {3483 return error("%s: %s", new_name, strerror(errno));3484 }3485 return 0;3486}34873488/*3489 * Check and apply the patch in-core; leave the result in patch->result3490 * for the caller to write it out to the final destination.3491 */3492static int check_patch(struct patch *patch)3493{3494 struct stat st;3495 const char *old_name = patch->old_name;3496 const char *new_name = patch->new_name;3497 const char *name = old_name ? old_name : new_name;3498 struct cache_entry *ce = NULL;3499 struct patch *tpatch;3500 int ok_if_exists;3501 int status;35023503 patch->rejected = 1; /* we will drop this after we succeed */35043505 status = check_preimage(patch, &ce, &st);3506 if (status)3507 return status;3508 old_name = patch->old_name;35093510 /*3511 * A type-change diff is always split into a patch to delete3512 * old, immediately followed by a patch to create new (see3513 * diff.c::run_diff()); in such a case it is Ok that the entry3514 * to be deleted by the previous patch is still in the working3515 * tree and in the index.3516 *3517 * A patch to swap-rename between A and B would first rename A3518 * to B and then rename B to A. While applying the first one,3519 * the presence of B should not stop A from getting renamed to3520 * B; ask to_be_deleted() about the later rename. Removal of3521 * B and rename from A to B is handled the same way by asking3522 * was_deleted().3523 */3524 if ((tpatch = in_fn_table(new_name)) &&3525 (was_deleted(tpatch) || to_be_deleted(tpatch)))3526 ok_if_exists = 1;3527 else3528 ok_if_exists = 0;35293530 if (new_name &&3531 ((0 < patch->is_new) || patch->is_rename || patch->is_copy)) {3532 int err = check_to_create(new_name, ok_if_exists);35333534 if (err && threeway) {3535 patch->direct_to_threeway = 1;3536 } else switch (err) {3537 case 0:3538 break; /* happy */3539 case EXISTS_IN_INDEX:3540 return error(_("%s: already exists in index"), new_name);3541 break;3542 case EXISTS_IN_WORKTREE:3543 return error(_("%s: already exists in working directory"),3544 new_name);3545 default:3546 return err;3547 }35483549 if (!patch->new_mode) {3550 if (0 < patch->is_new)3551 patch->new_mode = S_IFREG | 0644;3552 else3553 patch->new_mode = patch->old_mode;3554 }3555 }35563557 if (new_name && old_name) {3558 int same = !strcmp(old_name, new_name);3559 if (!patch->new_mode)3560 patch->new_mode = patch->old_mode;3561 if ((patch->old_mode ^ patch->new_mode) & S_IFMT) {3562 if (same)3563 return error(_("new mode (%o) of %s does not "3564 "match old mode (%o)"),3565 patch->new_mode, new_name,3566 patch->old_mode);3567 else3568 return error(_("new mode (%o) of %s does not "3569 "match old mode (%o) of %s"),3570 patch->new_mode, new_name,3571 patch->old_mode, old_name);3572 }3573 }35743575 if (apply_data(patch, &st, ce) < 0)3576 return error(_("%s: patch does not apply"), name);3577 patch->rejected = 0;3578 return 0;3579}35803581static int check_patch_list(struct patch *patch)3582{3583 int err = 0;35843585 prepare_fn_table(patch);3586 while (patch) {3587 if (apply_verbosely)3588 say_patch_name(stderr,3589 _("Checking patch %s..."), patch);3590 err |= check_patch(patch);3591 patch = patch->next;3592 }3593 return err;3594}35953596/* This function tries to read the sha1 from the current index */3597static int get_current_sha1(const char *path, unsigned char *sha1)3598{3599 int pos;36003601 if (read_cache() < 0)3602 return -1;3603 pos = cache_name_pos(path, strlen(path));3604 if (pos < 0)3605 return -1;3606 hashcpy(sha1, active_cache[pos]->sha1);3607 return 0;3608}36093610static int preimage_sha1_in_gitlink_patch(struct patch *p, unsigned char sha1[20])3611{3612 /*3613 * A usable gitlink patch has only one fragment (hunk) that looks like:3614 * @@ -1 +1 @@3615 * -Subproject commit <old sha1>3616 * +Subproject commit <new sha1>3617 * or3618 * @@ -1 +0,0 @@3619 * -Subproject commit <old sha1>3620 * for a removal patch.3621 */3622 struct fragment *hunk = p->fragments;3623 static const char heading[] = "-Subproject commit ";3624 char *preimage;36253626 if (/* does the patch have only one hunk? */3627 hunk && !hunk->next &&3628 /* is its preimage one line? */3629 hunk->oldpos == 1 && hunk->oldlines == 1 &&3630 /* does preimage begin with the heading? */3631 (preimage = memchr(hunk->patch, '\n', hunk->size)) != NULL &&3632 starts_with(++preimage, heading) &&3633 /* does it record full SHA-1? */3634 !get_sha1_hex(preimage + sizeof(heading) - 1, sha1) &&3635 preimage[sizeof(heading) + 40 - 1] == '\n' &&3636 /* does the abbreviated name on the index line agree with it? */3637 starts_with(preimage + sizeof(heading) - 1, p->old_sha1_prefix))3638 return 0; /* it all looks fine */36393640 /* we may have full object name on the index line */3641 return get_sha1_hex(p->old_sha1_prefix, sha1);3642}36433644/* Build an index that contains the just the files needed for a 3way merge */3645static void build_fake_ancestor(struct patch *list, const char *filename)3646{3647 struct patch *patch;3648 struct index_state result = { NULL };3649 int fd;36503651 /* Once we start supporting the reverse patch, it may be3652 * worth showing the new sha1 prefix, but until then...3653 */3654 for (patch = list; patch; patch = patch->next) {3655 unsigned char sha1[20];3656 struct cache_entry *ce;3657 const char *name;36583659 name = patch->old_name ? patch->old_name : patch->new_name;3660 if (0 < patch->is_new)3661 continue;36623663 if (S_ISGITLINK(patch->old_mode)) {3664 if (!preimage_sha1_in_gitlink_patch(patch, sha1))3665 ; /* ok, the textual part looks sane */3666 else3667 die("sha1 information is lacking or useless for submoule %s",3668 name);3669 } else if (!get_sha1_blob(patch->old_sha1_prefix, sha1)) {3670 ; /* ok */3671 } else if (!patch->lines_added && !patch->lines_deleted) {3672 /* mode-only change: update the current */3673 if (get_current_sha1(patch->old_name, sha1))3674 die("mode change for %s, which is not "3675 "in current HEAD", name);3676 } else3677 die("sha1 information is lacking or useless "3678 "(%s).", name);36793680 ce = make_cache_entry(patch->old_mode, sha1, name, 0, 0);3681 if (!ce)3682 die(_("make_cache_entry failed for path '%s'"), name);3683 if (add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD))3684 die ("Could not add %s to temporary index", name);3685 }36863687 fd = open(filename, O_WRONLY | O_CREAT, 0666);3688 if (fd < 0 || write_index(&result, fd) || close(fd))3689 die ("Could not write temporary index to %s", filename);36903691 discard_index(&result);3692}36933694static void stat_patch_list(struct patch *patch)3695{3696 int files, adds, dels;36973698 for (files = adds = dels = 0 ; patch ; patch = patch->next) {3699 files++;3700 adds += patch->lines_added;3701 dels += patch->lines_deleted;3702 show_stats(patch);3703 }37043705 print_stat_summary(stdout, files, adds, dels);3706}37073708static void numstat_patch_list(struct patch *patch)3709{3710 for ( ; patch; patch = patch->next) {3711 const char *name;3712 name = patch->new_name ? patch->new_name : patch->old_name;3713 if (patch->is_binary)3714 printf("-\t-\t");3715 else3716 printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);3717 write_name_quoted(name, stdout, line_termination);3718 }3719}37203721static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)3722{3723 if (mode)3724 printf(" %s mode %06o %s\n", newdelete, mode, name);3725 else3726 printf(" %s %s\n", newdelete, name);3727}37283729static void show_mode_change(struct patch *p, int show_name)3730{3731 if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {3732 if (show_name)3733 printf(" mode change %06o => %06o %s\n",3734 p->old_mode, p->new_mode, p->new_name);3735 else3736 printf(" mode change %06o => %06o\n",3737 p->old_mode, p->new_mode);3738 }3739}37403741static void show_rename_copy(struct patch *p)3742{3743 const char *renamecopy = p->is_rename ? "rename" : "copy";3744 const char *old, *new;37453746 /* Find common prefix */3747 old = p->old_name;3748 new = p->new_name;3749 while (1) {3750 const char *slash_old, *slash_new;3751 slash_old = strchr(old, '/');3752 slash_new = strchr(new, '/');3753 if (!slash_old ||3754 !slash_new ||3755 slash_old - old != slash_new - new ||3756 memcmp(old, new, slash_new - new))3757 break;3758 old = slash_old + 1;3759 new = slash_new + 1;3760 }3761 /* p->old_name thru old is the common prefix, and old and new3762 * through the end of names are renames3763 */3764 if (old != p->old_name)3765 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,3766 (int)(old - p->old_name), p->old_name,3767 old, new, p->score);3768 else3769 printf(" %s %s => %s (%d%%)\n", renamecopy,3770 p->old_name, p->new_name, p->score);3771 show_mode_change(p, 0);3772}37733774static void summary_patch_list(struct patch *patch)3775{3776 struct patch *p;37773778 for (p = patch; p; p = p->next) {3779 if (p->is_new)3780 show_file_mode_name("create", p->new_mode, p->new_name);3781 else if (p->is_delete)3782 show_file_mode_name("delete", p->old_mode, p->old_name);3783 else {3784 if (p->is_rename || p->is_copy)3785 show_rename_copy(p);3786 else {3787 if (p->score) {3788 printf(" rewrite %s (%d%%)\n",3789 p->new_name, p->score);3790 show_mode_change(p, 0);3791 }3792 else3793 show_mode_change(p, 1);3794 }3795 }3796 }3797}37983799static void patch_stats(struct patch *patch)3800{3801 int lines = patch->lines_added + patch->lines_deleted;38023803 if (lines > max_change)3804 max_change = lines;3805 if (patch->old_name) {3806 int len = quote_c_style(patch->old_name, NULL, NULL, 0);3807 if (!len)3808 len = strlen(patch->old_name);3809 if (len > max_len)3810 max_len = len;3811 }3812 if (patch->new_name) {3813 int len = quote_c_style(patch->new_name, NULL, NULL, 0);3814 if (!len)3815 len = strlen(patch->new_name);3816 if (len > max_len)3817 max_len = len;3818 }3819}38203821static void remove_file(struct patch *patch, int rmdir_empty)3822{3823 if (update_index) {3824 if (remove_file_from_cache(patch->old_name) < 0)3825 die(_("unable to remove %s from index"), patch->old_name);3826 }3827 if (!cached) {3828 if (!remove_or_warn(patch->old_mode, patch->old_name) && rmdir_empty) {3829 remove_path(patch->old_name);3830 }3831 }3832}38333834static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size)3835{3836 struct stat st;3837 struct cache_entry *ce;3838 int namelen = strlen(path);3839 unsigned ce_size = cache_entry_size(namelen);38403841 if (!update_index)3842 return;38433844 ce = xcalloc(1, ce_size);3845 memcpy(ce->name, path, namelen);3846 ce->ce_mode = create_ce_mode(mode);3847 ce->ce_flags = create_ce_flags(0);3848 ce->ce_namelen = namelen;3849 if (S_ISGITLINK(mode)) {3850 const char *s = buf;38513852 if (get_sha1_hex(s + strlen("Subproject commit "), ce->sha1))3853 die(_("corrupt patch for submodule %s"), path);3854 } else {3855 if (!cached) {3856 if (lstat(path, &st) < 0)3857 die_errno(_("unable to stat newly created file '%s'"),3858 path);3859 fill_stat_cache_info(ce, &st);3860 }3861 if (write_sha1_file(buf, size, blob_type, ce->sha1) < 0)3862 die(_("unable to create backing store for newly created file %s"), path);3863 }3864 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)3865 die(_("unable to add cache entry for %s"), path);3866}38673868static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)3869{3870 int fd;3871 struct strbuf nbuf = STRBUF_INIT;38723873 if (S_ISGITLINK(mode)) {3874 struct stat st;3875 if (!lstat(path, &st) && S_ISDIR(st.st_mode))3876 return 0;3877 return mkdir(path, 0777);3878 }38793880 if (has_symlinks && S_ISLNK(mode))3881 /* Although buf:size is counted string, it also is NUL3882 * terminated.3883 */3884 return symlink(buf, path);38853886 fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);3887 if (fd < 0)3888 return -1;38893890 if (convert_to_working_tree(path, buf, size, &nbuf)) {3891 size = nbuf.len;3892 buf = nbuf.buf;3893 }3894 write_or_die(fd, buf, size);3895 strbuf_release(&nbuf);38963897 if (close(fd) < 0)3898 die_errno(_("closing file '%s'"), path);3899 return 0;3900}39013902/*3903 * We optimistically assume that the directories exist,3904 * which is true 99% of the time anyway. If they don't,3905 * we create them and try again.3906 */3907static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size)3908{3909 if (cached)3910 return;3911 if (!try_create_file(path, mode, buf, size))3912 return;39133914 if (errno == ENOENT) {3915 if (safe_create_leading_directories(path))3916 return;3917 if (!try_create_file(path, mode, buf, size))3918 return;3919 }39203921 if (errno == EEXIST || errno == EACCES) {3922 /* We may be trying to create a file where a directory3923 * used to be.3924 */3925 struct stat st;3926 if (!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))3927 errno = EEXIST;3928 }39293930 if (errno == EEXIST) {3931 unsigned int nr = getpid();39323933 for (;;) {3934 char newpath[PATH_MAX];3935 mksnpath(newpath, sizeof(newpath), "%s~%u", path, nr);3936 if (!try_create_file(newpath, mode, buf, size)) {3937 if (!rename(newpath, path))3938 return;3939 unlink_or_warn(newpath);3940 break;3941 }3942 if (errno != EEXIST)3943 break;3944 ++nr;3945 }3946 }3947 die_errno(_("unable to write file '%s' mode %o"), path, mode);3948}39493950static void add_conflicted_stages_file(struct patch *patch)3951{3952 int stage, namelen;3953 unsigned ce_size, mode;3954 struct cache_entry *ce;39553956 if (!update_index)3957 return;3958 namelen = strlen(patch->new_name);3959 ce_size = cache_entry_size(namelen);3960 mode = patch->new_mode ? patch->new_mode : (S_IFREG | 0644);39613962 remove_file_from_cache(patch->new_name);3963 for (stage = 1; stage < 4; stage++) {3964 if (is_null_sha1(patch->threeway_stage[stage - 1]))3965 continue;3966 ce = xcalloc(1, ce_size);3967 memcpy(ce->name, patch->new_name, namelen);3968 ce->ce_mode = create_ce_mode(mode);3969 ce->ce_flags = create_ce_flags(stage);3970 ce->ce_namelen = namelen;3971 hashcpy(ce->sha1, patch->threeway_stage[stage - 1]);3972 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)3973 die(_("unable to add cache entry for %s"), patch->new_name);3974 }3975}39763977static void create_file(struct patch *patch)3978{3979 char *path = patch->new_name;3980 unsigned mode = patch->new_mode;3981 unsigned long size = patch->resultsize;3982 char *buf = patch->result;39833984 if (!mode)3985 mode = S_IFREG | 0644;3986 create_one_file(path, mode, buf, size);39873988 if (patch->conflicted_threeway)3989 add_conflicted_stages_file(patch);3990 else3991 add_index_file(path, mode, buf, size);3992}39933994/* phase zero is to remove, phase one is to create */3995static void write_out_one_result(struct patch *patch, int phase)3996{3997 if (patch->is_delete > 0) {3998 if (phase == 0)3999 remove_file(patch, 1);4000 return;4001 }4002 if (patch->is_new > 0 || patch->is_copy) {4003 if (phase == 1)4004 create_file(patch);4005 return;4006 }4007 /*4008 * Rename or modification boils down to the same4009 * thing: remove the old, write the new4010 */4011 if (phase == 0)4012 remove_file(patch, patch->is_rename);4013 if (phase == 1)4014 create_file(patch);4015}40164017static int write_out_one_reject(struct patch *patch)4018{4019 FILE *rej;4020 char namebuf[PATH_MAX];4021 struct fragment *frag;4022 int cnt = 0;4023 struct strbuf sb = STRBUF_INIT;40244025 for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) {4026 if (!frag->rejected)4027 continue;4028 cnt++;4029 }40304031 if (!cnt) {4032 if (apply_verbosely)4033 say_patch_name(stderr,4034 _("Applied patch %s cleanly."), patch);4035 return 0;4036 }40374038 /* This should not happen, because a removal patch that leaves4039 * contents are marked "rejected" at the patch level.4040 */4041 if (!patch->new_name)4042 die(_("internal error"));40434044 /* Say this even without --verbose */4045 strbuf_addf(&sb, Q_("Applying patch %%s with %d reject...",4046 "Applying patch %%s with %d rejects...",4047 cnt),4048 cnt);4049 say_patch_name(stderr, sb.buf, patch);4050 strbuf_release(&sb);40514052 cnt = strlen(patch->new_name);4053 if (ARRAY_SIZE(namebuf) <= cnt + 5) {4054 cnt = ARRAY_SIZE(namebuf) - 5;4055 warning(_("truncating .rej filename to %.*s.rej"),4056 cnt - 1, patch->new_name);4057 }4058 memcpy(namebuf, patch->new_name, cnt);4059 memcpy(namebuf + cnt, ".rej", 5);40604061 rej = fopen(namebuf, "w");4062 if (!rej)4063 return error(_("cannot open %s: %s"), namebuf, strerror(errno));40644065 /* Normal git tools never deal with .rej, so do not pretend4066 * this is a git patch by saying --git or giving extended4067 * headers. While at it, maybe please "kompare" that wants4068 * the trailing TAB and some garbage at the end of line ;-).4069 */4070 fprintf(rej, "diff a/%s b/%s\t(rejected hunks)\n",4071 patch->new_name, patch->new_name);4072 for (cnt = 1, frag = patch->fragments;4073 frag;4074 cnt++, frag = frag->next) {4075 if (!frag->rejected) {4076 fprintf_ln(stderr, _("Hunk #%d applied cleanly."), cnt);4077 continue;4078 }4079 fprintf_ln(stderr, _("Rejected hunk #%d."), cnt);4080 fprintf(rej, "%.*s", frag->size, frag->patch);4081 if (frag->patch[frag->size-1] != '\n')4082 fputc('\n', rej);4083 }4084 fclose(rej);4085 return -1;4086}40874088static int write_out_results(struct patch *list)4089{4090 int phase;4091 int errs = 0;4092 struct patch *l;4093 struct string_list cpath = STRING_LIST_INIT_DUP;40944095 for (phase = 0; phase < 2; phase++) {4096 l = list;4097 while (l) {4098 if (l->rejected)4099 errs = 1;4100 else {4101 write_out_one_result(l, phase);4102 if (phase == 1) {4103 if (write_out_one_reject(l))4104 errs = 1;4105 if (l->conflicted_threeway) {4106 string_list_append(&cpath, l->new_name);4107 errs = 1;4108 }4109 }4110 }4111 l = l->next;4112 }4113 }41144115 if (cpath.nr) {4116 struct string_list_item *item;41174118 sort_string_list(&cpath);4119 for_each_string_list_item(item, &cpath)4120 fprintf(stderr, "U %s\n", item->string);4121 string_list_clear(&cpath, 0);41224123 rerere(0);4124 }41254126 return errs;4127}41284129static struct lock_file lock_file;41304131static struct string_list limit_by_name;4132static int has_include;4133static void add_name_limit(const char *name, int exclude)4134{4135 struct string_list_item *it;41364137 it = string_list_append(&limit_by_name, name);4138 it->util = exclude ? NULL : (void *) 1;4139}41404141static int use_patch(struct patch *p)4142{4143 const char *pathname = p->new_name ? p->new_name : p->old_name;4144 int i;41454146 /* Paths outside are not touched regardless of "--include" */4147 if (0 < prefix_length) {4148 int pathlen = strlen(pathname);4149 if (pathlen <= prefix_length ||4150 memcmp(prefix, pathname, prefix_length))4151 return 0;4152 }41534154 /* See if it matches any of exclude/include rule */4155 for (i = 0; i < limit_by_name.nr; i++) {4156 struct string_list_item *it = &limit_by_name.items[i];4157 if (!wildmatch(it->string, pathname, 0, NULL))4158 return (it->util != NULL);4159 }41604161 /*4162 * If we had any include, a path that does not match any rule is4163 * not used. Otherwise, we saw bunch of exclude rules (or none)4164 * and such a path is used.4165 */4166 return !has_include;4167}416841694170static void prefix_one(char **name)4171{4172 char *old_name = *name;4173 if (!old_name)4174 return;4175 *name = xstrdup(prefix_filename(prefix, prefix_length, *name));4176 free(old_name);4177}41784179static void prefix_patches(struct patch *p)4180{4181 if (!prefix || p->is_toplevel_relative)4182 return;4183 for ( ; p; p = p->next) {4184 prefix_one(&p->new_name);4185 prefix_one(&p->old_name);4186 }4187}41884189#define INACCURATE_EOF (1<<0)4190#define RECOUNT (1<<1)41914192static int apply_patch(int fd, const char *filename, int options)4193{4194 size_t offset;4195 struct strbuf buf = STRBUF_INIT; /* owns the patch text */4196 struct patch *list = NULL, **listp = &list;4197 int skipped_patch = 0;41984199 patch_input_file = filename;4200 read_patch_file(&buf, fd);4201 offset = 0;4202 while (offset < buf.len) {4203 struct patch *patch;4204 int nr;42054206 patch = xcalloc(1, sizeof(*patch));4207 patch->inaccurate_eof = !!(options & INACCURATE_EOF);4208 patch->recount = !!(options & RECOUNT);4209 nr = parse_chunk(buf.buf + offset, buf.len - offset, patch);4210 if (nr < 0)4211 break;4212 if (apply_in_reverse)4213 reverse_patches(patch);4214 if (prefix)4215 prefix_patches(patch);4216 if (use_patch(patch)) {4217 patch_stats(patch);4218 *listp = patch;4219 listp = &patch->next;4220 }4221 else {4222 free_patch(patch);4223 skipped_patch++;4224 }4225 offset += nr;4226 }42274228 if (!list && !skipped_patch)4229 die(_("unrecognized input"));42304231 if (whitespace_error && (ws_error_action == die_on_ws_error))4232 apply = 0;42334234 update_index = check_index && apply;4235 if (update_index && newfd < 0)4236 newfd = hold_locked_index(&lock_file, 1);42374238 if (check_index) {4239 if (read_cache() < 0)4240 die(_("unable to read index file"));4241 }42424243 if ((check || apply) &&4244 check_patch_list(list) < 0 &&4245 !apply_with_reject)4246 exit(1);42474248 if (apply && write_out_results(list)) {4249 if (apply_with_reject)4250 exit(1);4251 /* with --3way, we still need to write the index out */4252 return 1;4253 }42544255 if (fake_ancestor)4256 build_fake_ancestor(list, fake_ancestor);42574258 if (diffstat)4259 stat_patch_list(list);42604261 if (numstat)4262 numstat_patch_list(list);42634264 if (summary)4265 summary_patch_list(list);42664267 free_patch_list(list);4268 strbuf_release(&buf);4269 string_list_clear(&fn_table, 0);4270 return 0;4271}42724273static int git_apply_config(const char *var, const char *value, void *cb)4274{4275 if (!strcmp(var, "apply.whitespace"))4276 return git_config_string(&apply_default_whitespace, var, value);4277 else if (!strcmp(var, "apply.ignorewhitespace"))4278 return git_config_string(&apply_default_ignorewhitespace, var, value);4279 return git_default_config(var, value, cb);4280}42814282static int option_parse_exclude(const struct option *opt,4283 const char *arg, int unset)4284{4285 add_name_limit(arg, 1);4286 return 0;4287}42884289static int option_parse_include(const struct option *opt,4290 const char *arg, int unset)4291{4292 add_name_limit(arg, 0);4293 has_include = 1;4294 return 0;4295}42964297static int option_parse_p(const struct option *opt,4298 const char *arg, int unset)4299{4300 p_value = atoi(arg);4301 p_value_known = 1;4302 return 0;4303}43044305static int option_parse_z(const struct option *opt,4306 const char *arg, int unset)4307{4308 if (unset)4309 line_termination = '\n';4310 else4311 line_termination = 0;4312 return 0;4313}43144315static int option_parse_space_change(const struct option *opt,4316 const char *arg, int unset)4317{4318 if (unset)4319 ws_ignore_action = ignore_ws_none;4320 else4321 ws_ignore_action = ignore_ws_change;4322 return 0;4323}43244325static int option_parse_whitespace(const struct option *opt,4326 const char *arg, int unset)4327{4328 const char **whitespace_option = opt->value;43294330 *whitespace_option = arg;4331 parse_whitespace_option(arg);4332 return 0;4333}43344335static int option_parse_directory(const struct option *opt,4336 const char *arg, int unset)4337{4338 root_len = strlen(arg);4339 if (root_len && arg[root_len - 1] != '/') {4340 char *new_root;4341 root = new_root = xmalloc(root_len + 2);4342 strcpy(new_root, arg);4343 strcpy(new_root + root_len++, "/");4344 } else4345 root = arg;4346 return 0;4347}43484349int cmd_apply(int argc, const char **argv, const char *prefix_)4350{4351 int i;4352 int errs = 0;4353 int is_not_gitdir = !startup_info->have_repository;4354 int force_apply = 0;43554356 const char *whitespace_option = NULL;43574358 struct option builtin_apply_options[] = {4359 { OPTION_CALLBACK, 0, "exclude", NULL, N_("path"),4360 N_("don't apply changes matching the given path"),4361 0, option_parse_exclude },4362 { OPTION_CALLBACK, 0, "include", NULL, N_("path"),4363 N_("apply changes matching the given path"),4364 0, option_parse_include },4365 { OPTION_CALLBACK, 'p', NULL, NULL, N_("num"),4366 N_("remove <num> leading slashes from traditional diff paths"),4367 0, option_parse_p },4368 OPT_BOOL(0, "no-add", &no_add,4369 N_("ignore additions made by the patch")),4370 OPT_BOOL(0, "stat", &diffstat,4371 N_("instead of applying the patch, output diffstat for the input")),4372 OPT_NOOP_NOARG(0, "allow-binary-replacement"),4373 OPT_NOOP_NOARG(0, "binary"),4374 OPT_BOOL(0, "numstat", &numstat,4375 N_("show number of added and deleted lines in decimal notation")),4376 OPT_BOOL(0, "summary", &summary,4377 N_("instead of applying the patch, output a summary for the input")),4378 OPT_BOOL(0, "check", &check,4379 N_("instead of applying the patch, see if the patch is applicable")),4380 OPT_BOOL(0, "index", &check_index,4381 N_("make sure the patch is applicable to the current index")),4382 OPT_BOOL(0, "cached", &cached,4383 N_("apply a patch without touching the working tree")),4384 OPT_BOOL(0, "apply", &force_apply,4385 N_("also apply the patch (use with --stat/--summary/--check)")),4386 OPT_BOOL('3', "3way", &threeway,4387 N_( "attempt three-way merge if a patch does not apply")),4388 OPT_FILENAME(0, "build-fake-ancestor", &fake_ancestor,4389 N_("build a temporary index based on embedded index information")),4390 { OPTION_CALLBACK, 'z', NULL, NULL, NULL,4391 N_("paths are separated with NUL character"),4392 PARSE_OPT_NOARG, option_parse_z },4393 OPT_INTEGER('C', NULL, &p_context,4394 N_("ensure at least <n> lines of context match")),4395 { OPTION_CALLBACK, 0, "whitespace", &whitespace_option, N_("action"),4396 N_("detect new or modified lines that have whitespace errors"),4397 0, option_parse_whitespace },4398 { OPTION_CALLBACK, 0, "ignore-space-change", NULL, NULL,4399 N_("ignore changes in whitespace when finding context"),4400 PARSE_OPT_NOARG, option_parse_space_change },4401 { OPTION_CALLBACK, 0, "ignore-whitespace", NULL, NULL,4402 N_("ignore changes in whitespace when finding context"),4403 PARSE_OPT_NOARG, option_parse_space_change },4404 OPT_BOOL('R', "reverse", &apply_in_reverse,4405 N_("apply the patch in reverse")),4406 OPT_BOOL(0, "unidiff-zero", &unidiff_zero,4407 N_("don't expect at least one line of context")),4408 OPT_BOOL(0, "reject", &apply_with_reject,4409 N_("leave the rejected hunks in corresponding *.rej files")),4410 OPT_BOOL(0, "allow-overlap", &allow_overlap,4411 N_("allow overlapping hunks")),4412 OPT__VERBOSE(&apply_verbosely, N_("be verbose")),4413 OPT_BIT(0, "inaccurate-eof", &options,4414 N_("tolerate incorrectly detected missing new-line at the end of file"),4415 INACCURATE_EOF),4416 OPT_BIT(0, "recount", &options,4417 N_("do not trust the line counts in the hunk headers"),4418 RECOUNT),4419 { OPTION_CALLBACK, 0, "directory", NULL, N_("root"),4420 N_("prepend <root> to all filenames"),4421 0, option_parse_directory },4422 OPT_END()4423 };44244425 prefix = prefix_;4426 prefix_length = prefix ? strlen(prefix) : 0;4427 git_config(git_apply_config, NULL);4428 if (apply_default_whitespace)4429 parse_whitespace_option(apply_default_whitespace);4430 if (apply_default_ignorewhitespace)4431 parse_ignorewhitespace_option(apply_default_ignorewhitespace);44324433 argc = parse_options(argc, argv, prefix, builtin_apply_options,4434 apply_usage, 0);44354436 if (apply_with_reject && threeway)4437 die("--reject and --3way cannot be used together.");4438 if (cached && threeway)4439 die("--cached and --3way cannot be used together.");4440 if (threeway) {4441 if (is_not_gitdir)4442 die(_("--3way outside a repository"));4443 check_index = 1;4444 }4445 if (apply_with_reject)4446 apply = apply_verbosely = 1;4447 if (!force_apply && (diffstat || numstat || summary || check || fake_ancestor))4448 apply = 0;4449 if (check_index && is_not_gitdir)4450 die(_("--index outside a repository"));4451 if (cached) {4452 if (is_not_gitdir)4453 die(_("--cached outside a repository"));4454 check_index = 1;4455 }4456 for (i = 0; i < argc; i++) {4457 const char *arg = argv[i];4458 int fd;44594460 if (!strcmp(arg, "-")) {4461 errs |= apply_patch(0, "<stdin>", options);4462 read_stdin = 0;4463 continue;4464 } else if (0 < prefix_length)4465 arg = prefix_filename(prefix, prefix_length, arg);44664467 fd = open(arg, O_RDONLY);4468 if (fd < 0)4469 die_errno(_("can't open patch '%s'"), arg);4470 read_stdin = 0;4471 set_default_whitespace_mode(whitespace_option);4472 errs |= apply_patch(fd, arg, options);4473 close(fd);4474 }4475 set_default_whitespace_mode(whitespace_option);4476 if (read_stdin)4477 errs |= apply_patch(0, "<stdin>", options);4478 if (whitespace_error) {4479 if (squelch_whitespace_errors &&4480 squelch_whitespace_errors < whitespace_error) {4481 int squelched =4482 whitespace_error - squelch_whitespace_errors;4483 warning(Q_("squelched %d whitespace error",4484 "squelched %d whitespace errors",4485 squelched),4486 squelched);4487 }4488 if (ws_error_action == die_on_ws_error)4489 die(Q_("%d line adds whitespace errors.",4490 "%d lines add whitespace errors.",4491 whitespace_error),4492 whitespace_error);4493 if (applied_after_fixing_ws && apply)4494 warning("%d line%s applied after"4495 " fixing whitespace errors.",4496 applied_after_fixing_ws,4497 applied_after_fixing_ws == 1 ? "" : "s");4498 else if (whitespace_error)4499 warning(Q_("%d line adds whitespace errors.",4500 "%d lines add whitespace errors.",4501 whitespace_error),4502 whitespace_error);4503 }45044505 if (update_index) {4506 if (write_cache(newfd, active_cache, active_nr) ||4507 commit_locked_index(&lock_file))4508 die(_("Unable to write new index file"));4509 }45104511 return !!errs;4512}