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 int unsafe_paths; 54static const char *fake_ancestor; 55static int line_termination = '\n'; 56static unsigned int p_context = UINT_MAX; 57static const char * const apply_usage[] = { 58 N_("git apply [options] [<patch>...]"), 59 NULL 60}; 61 62static enum ws_error_action { 63 nowarn_ws_error, 64 warn_on_ws_error, 65 die_on_ws_error, 66 correct_ws_error 67} ws_error_action = warn_on_ws_error; 68static int whitespace_error; 69static int squelch_whitespace_errors = 5; 70static int applied_after_fixing_ws; 71 72static enum ws_ignore { 73 ignore_ws_none, 74 ignore_ws_change 75} ws_ignore_action = ignore_ws_none; 76 77 78static const char *patch_input_file; 79static const char *root; 80static int root_len; 81static int read_stdin = 1; 82static int options; 83 84static void parse_whitespace_option(const char *option) 85{ 86 if (!option) { 87 ws_error_action = warn_on_ws_error; 88 return; 89 } 90 if (!strcmp(option, "warn")) { 91 ws_error_action = warn_on_ws_error; 92 return; 93 } 94 if (!strcmp(option, "nowarn")) { 95 ws_error_action = nowarn_ws_error; 96 return; 97 } 98 if (!strcmp(option, "error")) { 99 ws_error_action = die_on_ws_error; 100 return; 101 } 102 if (!strcmp(option, "error-all")) { 103 ws_error_action = die_on_ws_error; 104 squelch_whitespace_errors = 0; 105 return; 106 } 107 if (!strcmp(option, "strip") || !strcmp(option, "fix")) { 108 ws_error_action = correct_ws_error; 109 return; 110 } 111 die(_("unrecognized whitespace option '%s'"), option); 112} 113 114static void parse_ignorewhitespace_option(const char *option) 115{ 116 if (!option || !strcmp(option, "no") || 117 !strcmp(option, "false") || !strcmp(option, "never") || 118 !strcmp(option, "none")) { 119 ws_ignore_action = ignore_ws_none; 120 return; 121 } 122 if (!strcmp(option, "change")) { 123 ws_ignore_action = ignore_ws_change; 124 return; 125 } 126 die(_("unrecognized whitespace ignore option '%s'"), option); 127} 128 129static void set_default_whitespace_mode(const char *whitespace_option) 130{ 131 if (!whitespace_option && !apply_default_whitespace) 132 ws_error_action = (apply ? warn_on_ws_error : nowarn_ws_error); 133} 134 135/* 136 * For "diff-stat" like behaviour, we keep track of the biggest change 137 * we've seen, and the longest filename. That allows us to do simple 138 * scaling. 139 */ 140static int max_change, max_len; 141 142/* 143 * Various "current state", notably line numbers and what 144 * file (and how) we're patching right now.. The "is_xxxx" 145 * things are flags, where -1 means "don't know yet". 146 */ 147static int linenr = 1; 148 149/* 150 * This represents one "hunk" from a patch, starting with 151 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The 152 * patch text is pointed at by patch, and its byte length 153 * is stored in size. leading and trailing are the number 154 * of context lines. 155 */ 156struct fragment { 157 unsigned long leading, trailing; 158 unsigned long oldpos, oldlines; 159 unsigned long newpos, newlines; 160 /* 161 * 'patch' is usually borrowed from buf in apply_patch(), 162 * but some codepaths store an allocated buffer. 163 */ 164 const char *patch; 165 unsigned free_patch:1, 166 rejected:1; 167 int size; 168 int linenr; 169 struct fragment *next; 170}; 171 172/* 173 * When dealing with a binary patch, we reuse "leading" field 174 * to store the type of the binary hunk, either deflated "delta" 175 * or deflated "literal". 176 */ 177#define binary_patch_method leading 178#define BINARY_DELTA_DEFLATED 1 179#define BINARY_LITERAL_DEFLATED 2 180 181/* 182 * This represents a "patch" to a file, both metainfo changes 183 * such as creation/deletion, filemode and content changes represented 184 * as a series of fragments. 185 */ 186struct patch { 187 char *new_name, *old_name, *def_name; 188 unsigned int old_mode, new_mode; 189 int is_new, is_delete; /* -1 = unknown, 0 = false, 1 = true */ 190 int rejected; 191 unsigned ws_rule; 192 int lines_added, lines_deleted; 193 int score; 194 unsigned int is_toplevel_relative:1; 195 unsigned int inaccurate_eof:1; 196 unsigned int is_binary:1; 197 unsigned int is_copy:1; 198 unsigned int is_rename:1; 199 unsigned int recount:1; 200 unsigned int conflicted_threeway:1; 201 unsigned int direct_to_threeway:1; 202 struct fragment *fragments; 203 char *result; 204 size_t resultsize; 205 char old_sha1_prefix[41]; 206 char new_sha1_prefix[41]; 207 struct patch *next; 208 209 /* three-way fallback result */ 210 unsigned char threeway_stage[3][20]; 211}; 212 213static void free_fragment_list(struct fragment *list) 214{ 215 while (list) { 216 struct fragment *next = list->next; 217 if (list->free_patch) 218 free((char *)list->patch); 219 free(list); 220 list = next; 221 } 222} 223 224static void free_patch(struct patch *patch) 225{ 226 free_fragment_list(patch->fragments); 227 free(patch->def_name); 228 free(patch->old_name); 229 free(patch->new_name); 230 free(patch->result); 231 free(patch); 232} 233 234static void free_patch_list(struct patch *list) 235{ 236 while (list) { 237 struct patch *next = list->next; 238 free_patch(list); 239 list = next; 240 } 241} 242 243/* 244 * A line in a file, len-bytes long (includes the terminating LF, 245 * except for an incomplete line at the end if the file ends with 246 * one), and its contents hashes to 'hash'. 247 */ 248struct line { 249 size_t len; 250 unsigned hash : 24; 251 unsigned flag : 8; 252#define LINE_COMMON 1 253#define LINE_PATCHED 2 254}; 255 256/* 257 * This represents a "file", which is an array of "lines". 258 */ 259struct image { 260 char *buf; 261 size_t len; 262 size_t nr; 263 size_t alloc; 264 struct line *line_allocated; 265 struct line *line; 266}; 267 268/* 269 * Records filenames that have been touched, in order to handle 270 * the case where more than one patches touch the same file. 271 */ 272 273static struct string_list fn_table; 274 275static uint32_t hash_line(const char *cp, size_t len) 276{ 277 size_t i; 278 uint32_t h; 279 for (i = 0, h = 0; i < len; i++) { 280 if (!isspace(cp[i])) { 281 h = h * 3 + (cp[i] & 0xff); 282 } 283 } 284 return h; 285} 286 287/* 288 * Compare lines s1 of length n1 and s2 of length n2, ignoring 289 * whitespace difference. Returns 1 if they match, 0 otherwise 290 */ 291static int fuzzy_matchlines(const char *s1, size_t n1, 292 const char *s2, size_t n2) 293{ 294 const char *last1 = s1 + n1 - 1; 295 const char *last2 = s2 + n2 - 1; 296 int result = 0; 297 298 /* ignore line endings */ 299 while ((*last1 == '\r') || (*last1 == '\n')) 300 last1--; 301 while ((*last2 == '\r') || (*last2 == '\n')) 302 last2--; 303 304 /* skip leading whitespace */ 305 while (isspace(*s1) && (s1 <= last1)) 306 s1++; 307 while (isspace(*s2) && (s2 <= last2)) 308 s2++; 309 /* early return if both lines are empty */ 310 if ((s1 > last1) && (s2 > last2)) 311 return 1; 312 while (!result) { 313 result = *s1++ - *s2++; 314 /* 315 * Skip whitespace inside. We check for whitespace on 316 * both buffers because we don't want "a b" to match 317 * "ab" 318 */ 319 if (isspace(*s1) && isspace(*s2)) { 320 while (isspace(*s1) && s1 <= last1) 321 s1++; 322 while (isspace(*s2) && s2 <= last2) 323 s2++; 324 } 325 /* 326 * If we reached the end on one side only, 327 * lines don't match 328 */ 329 if ( 330 ((s2 > last2) && (s1 <= last1)) || 331 ((s1 > last1) && (s2 <= last2))) 332 return 0; 333 if ((s1 > last1) && (s2 > last2)) 334 break; 335 } 336 337 return !result; 338} 339 340static void add_line_info(struct image *img, const char *bol, size_t len, unsigned flag) 341{ 342 ALLOC_GROW(img->line_allocated, img->nr + 1, img->alloc); 343 img->line_allocated[img->nr].len = len; 344 img->line_allocated[img->nr].hash = hash_line(bol, len); 345 img->line_allocated[img->nr].flag = flag; 346 img->nr++; 347} 348 349/* 350 * "buf" has the file contents to be patched (read from various sources). 351 * attach it to "image" and add line-based index to it. 352 * "image" now owns the "buf". 353 */ 354static void prepare_image(struct image *image, char *buf, size_t len, 355 int prepare_linetable) 356{ 357 const char *cp, *ep; 358 359 memset(image, 0, sizeof(*image)); 360 image->buf = buf; 361 image->len = len; 362 363 if (!prepare_linetable) 364 return; 365 366 ep = image->buf + image->len; 367 cp = image->buf; 368 while (cp < ep) { 369 const char *next; 370 for (next = cp; next < ep && *next != '\n'; next++) 371 ; 372 if (next < ep) 373 next++; 374 add_line_info(image, cp, next - cp, 0); 375 cp = next; 376 } 377 image->line = image->line_allocated; 378} 379 380static void clear_image(struct image *image) 381{ 382 free(image->buf); 383 free(image->line_allocated); 384 memset(image, 0, sizeof(*image)); 385} 386 387/* fmt must contain _one_ %s and no other substitution */ 388static void say_patch_name(FILE *output, const char *fmt, struct patch *patch) 389{ 390 struct strbuf sb = STRBUF_INIT; 391 392 if (patch->old_name && patch->new_name && 393 strcmp(patch->old_name, patch->new_name)) { 394 quote_c_style(patch->old_name, &sb, NULL, 0); 395 strbuf_addstr(&sb, " => "); 396 quote_c_style(patch->new_name, &sb, NULL, 0); 397 } else { 398 const char *n = patch->new_name; 399 if (!n) 400 n = patch->old_name; 401 quote_c_style(n, &sb, NULL, 0); 402 } 403 fprintf(output, fmt, sb.buf); 404 fputc('\n', output); 405 strbuf_release(&sb); 406} 407 408#define SLOP (16) 409 410static void read_patch_file(struct strbuf *sb, int fd) 411{ 412 if (strbuf_read(sb, fd, 0) < 0) 413 die_errno("git apply: failed to read"); 414 415 /* 416 * Make sure that we have some slop in the buffer 417 * so that we can do speculative "memcmp" etc, and 418 * see to it that it is NUL-filled. 419 */ 420 strbuf_grow(sb, SLOP); 421 memset(sb->buf + sb->len, 0, SLOP); 422} 423 424static unsigned long linelen(const char *buffer, unsigned long size) 425{ 426 unsigned long len = 0; 427 while (size--) { 428 len++; 429 if (*buffer++ == '\n') 430 break; 431 } 432 return len; 433} 434 435static int is_dev_null(const char *str) 436{ 437 return !memcmp("/dev/null", str, 9) && isspace(str[9]); 438} 439 440#define TERM_SPACE 1 441#define TERM_TAB 2 442 443static int name_terminate(const char *name, int namelen, int c, int terminate) 444{ 445 if (c == ' ' && !(terminate & TERM_SPACE)) 446 return 0; 447 if (c == '\t' && !(terminate & TERM_TAB)) 448 return 0; 449 450 return 1; 451} 452 453/* remove double slashes to make --index work with such filenames */ 454static char *squash_slash(char *name) 455{ 456 int i = 0, j = 0; 457 458 if (!name) 459 return NULL; 460 461 while (name[i]) { 462 if ((name[j++] = name[i++]) == '/') 463 while (name[i] == '/') 464 i++; 465 } 466 name[j] = '\0'; 467 return name; 468} 469 470static char *find_name_gnu(const char *line, const char *def, int p_value) 471{ 472 struct strbuf name = STRBUF_INIT; 473 char *cp; 474 475 /* 476 * Proposed "new-style" GNU patch/diff format; see 477 * http://marc.info/?l=git&m=112927316408690&w=2 478 */ 479 if (unquote_c_style(&name, line, NULL)) { 480 strbuf_release(&name); 481 return NULL; 482 } 483 484 for (cp = name.buf; p_value; p_value--) { 485 cp = strchr(cp, '/'); 486 if (!cp) { 487 strbuf_release(&name); 488 return NULL; 489 } 490 cp++; 491 } 492 493 strbuf_remove(&name, 0, cp - name.buf); 494 if (root) 495 strbuf_insert(&name, 0, root, root_len); 496 return squash_slash(strbuf_detach(&name, NULL)); 497} 498 499static size_t sane_tz_len(const char *line, size_t len) 500{ 501 const char *tz, *p; 502 503 if (len < strlen(" +0500") || line[len-strlen(" +0500")] != ' ') 504 return 0; 505 tz = line + len - strlen(" +0500"); 506 507 if (tz[1] != '+' && tz[1] != '-') 508 return 0; 509 510 for (p = tz + 2; p != line + len; p++) 511 if (!isdigit(*p)) 512 return 0; 513 514 return line + len - tz; 515} 516 517static size_t tz_with_colon_len(const char *line, size_t len) 518{ 519 const char *tz, *p; 520 521 if (len < strlen(" +08:00") || line[len - strlen(":00")] != ':') 522 return 0; 523 tz = line + len - strlen(" +08:00"); 524 525 if (tz[0] != ' ' || (tz[1] != '+' && tz[1] != '-')) 526 return 0; 527 p = tz + 2; 528 if (!isdigit(*p++) || !isdigit(*p++) || *p++ != ':' || 529 !isdigit(*p++) || !isdigit(*p++)) 530 return 0; 531 532 return line + len - tz; 533} 534 535static size_t date_len(const char *line, size_t len) 536{ 537 const char *date, *p; 538 539 if (len < strlen("72-02-05") || line[len-strlen("-05")] != '-') 540 return 0; 541 p = date = line + len - strlen("72-02-05"); 542 543 if (!isdigit(*p++) || !isdigit(*p++) || *p++ != '-' || 544 !isdigit(*p++) || !isdigit(*p++) || *p++ != '-' || 545 !isdigit(*p++) || !isdigit(*p++)) /* Not a date. */ 546 return 0; 547 548 if (date - line >= strlen("19") && 549 isdigit(date[-1]) && isdigit(date[-2])) /* 4-digit year */ 550 date -= strlen("19"); 551 552 return line + len - date; 553} 554 555static size_t short_time_len(const char *line, size_t len) 556{ 557 const char *time, *p; 558 559 if (len < strlen(" 07:01:32") || line[len-strlen(":32")] != ':') 560 return 0; 561 p = time = line + len - strlen(" 07:01:32"); 562 563 /* Permit 1-digit hours? */ 564 if (*p++ != ' ' || 565 !isdigit(*p++) || !isdigit(*p++) || *p++ != ':' || 566 !isdigit(*p++) || !isdigit(*p++) || *p++ != ':' || 567 !isdigit(*p++) || !isdigit(*p++)) /* Not a time. */ 568 return 0; 569 570 return line + len - time; 571} 572 573static size_t fractional_time_len(const char *line, size_t len) 574{ 575 const char *p; 576 size_t n; 577 578 /* Expected format: 19:41:17.620000023 */ 579 if (!len || !isdigit(line[len - 1])) 580 return 0; 581 p = line + len - 1; 582 583 /* Fractional seconds. */ 584 while (p > line && isdigit(*p)) 585 p--; 586 if (*p != '.') 587 return 0; 588 589 /* Hours, minutes, and whole seconds. */ 590 n = short_time_len(line, p - line); 591 if (!n) 592 return 0; 593 594 return line + len - p + n; 595} 596 597static size_t trailing_spaces_len(const char *line, size_t len) 598{ 599 const char *p; 600 601 /* Expected format: ' ' x (1 or more) */ 602 if (!len || line[len - 1] != ' ') 603 return 0; 604 605 p = line + len; 606 while (p != line) { 607 p--; 608 if (*p != ' ') 609 return line + len - (p + 1); 610 } 611 612 /* All spaces! */ 613 return len; 614} 615 616static size_t diff_timestamp_len(const char *line, size_t len) 617{ 618 const char *end = line + len; 619 size_t n; 620 621 /* 622 * Posix: 2010-07-05 19:41:17 623 * GNU: 2010-07-05 19:41:17.620000023 -0500 624 */ 625 626 if (!isdigit(end[-1])) 627 return 0; 628 629 n = sane_tz_len(line, end - line); 630 if (!n) 631 n = tz_with_colon_len(line, end - line); 632 end -= n; 633 634 n = short_time_len(line, end - line); 635 if (!n) 636 n = fractional_time_len(line, end - line); 637 end -= n; 638 639 n = date_len(line, end - line); 640 if (!n) /* No date. Too bad. */ 641 return 0; 642 end -= n; 643 644 if (end == line) /* No space before date. */ 645 return 0; 646 if (end[-1] == '\t') { /* Success! */ 647 end--; 648 return line + len - end; 649 } 650 if (end[-1] != ' ') /* No space before date. */ 651 return 0; 652 653 /* Whitespace damage. */ 654 end -= trailing_spaces_len(line, end - line); 655 return line + len - end; 656} 657 658static char *null_strdup(const char *s) 659{ 660 return s ? xstrdup(s) : NULL; 661} 662 663static char *find_name_common(const char *line, const char *def, 664 int p_value, const char *end, int terminate) 665{ 666 int len; 667 const char *start = NULL; 668 669 if (p_value == 0) 670 start = line; 671 while (line != end) { 672 char c = *line; 673 674 if (!end && isspace(c)) { 675 if (c == '\n') 676 break; 677 if (name_terminate(start, line-start, c, terminate)) 678 break; 679 } 680 line++; 681 if (c == '/' && !--p_value) 682 start = line; 683 } 684 if (!start) 685 return squash_slash(null_strdup(def)); 686 len = line - start; 687 if (!len) 688 return squash_slash(null_strdup(def)); 689 690 /* 691 * Generally we prefer the shorter name, especially 692 * if the other one is just a variation of that with 693 * something else tacked on to the end (ie "file.orig" 694 * or "file~"). 695 */ 696 if (def) { 697 int deflen = strlen(def); 698 if (deflen < len && !strncmp(start, def, deflen)) 699 return squash_slash(xstrdup(def)); 700 } 701 702 if (root) { 703 char *ret = xmalloc(root_len + len + 1); 704 strcpy(ret, root); 705 memcpy(ret + root_len, start, len); 706 ret[root_len + len] = '\0'; 707 return squash_slash(ret); 708 } 709 710 return squash_slash(xmemdupz(start, len)); 711} 712 713static char *find_name(const char *line, char *def, int p_value, int terminate) 714{ 715 if (*line == '"') { 716 char *name = find_name_gnu(line, def, p_value); 717 if (name) 718 return name; 719 } 720 721 return find_name_common(line, def, p_value, NULL, terminate); 722} 723 724static char *find_name_traditional(const char *line, char *def, int p_value) 725{ 726 size_t len; 727 size_t date_len; 728 729 if (*line == '"') { 730 char *name = find_name_gnu(line, def, p_value); 731 if (name) 732 return name; 733 } 734 735 len = strchrnul(line, '\n') - line; 736 date_len = diff_timestamp_len(line, len); 737 if (!date_len) 738 return find_name_common(line, def, p_value, NULL, TERM_TAB); 739 len -= date_len; 740 741 return find_name_common(line, def, p_value, line + len, 0); 742} 743 744static int count_slashes(const char *cp) 745{ 746 int cnt = 0; 747 char ch; 748 749 while ((ch = *cp++)) 750 if (ch == '/') 751 cnt++; 752 return cnt; 753} 754 755/* 756 * Given the string after "--- " or "+++ ", guess the appropriate 757 * p_value for the given patch. 758 */ 759static int guess_p_value(const char *nameline) 760{ 761 char *name, *cp; 762 int val = -1; 763 764 if (is_dev_null(nameline)) 765 return -1; 766 name = find_name_traditional(nameline, NULL, 0); 767 if (!name) 768 return -1; 769 cp = strchr(name, '/'); 770 if (!cp) 771 val = 0; 772 else if (prefix) { 773 /* 774 * Does it begin with "a/$our-prefix" and such? Then this is 775 * very likely to apply to our directory. 776 */ 777 if (!strncmp(name, prefix, prefix_length)) 778 val = count_slashes(prefix); 779 else { 780 cp++; 781 if (!strncmp(cp, prefix, prefix_length)) 782 val = count_slashes(prefix) + 1; 783 } 784 } 785 free(name); 786 return val; 787} 788 789/* 790 * Does the ---/+++ line has the POSIX timestamp after the last HT? 791 * GNU diff puts epoch there to signal a creation/deletion event. Is 792 * this such a timestamp? 793 */ 794static int has_epoch_timestamp(const char *nameline) 795{ 796 /* 797 * We are only interested in epoch timestamp; any non-zero 798 * fraction cannot be one, hence "(\.0+)?" in the regexp below. 799 * For the same reason, the date must be either 1969-12-31 or 800 * 1970-01-01, and the seconds part must be "00". 801 */ 802 const char stamp_regexp[] = 803 "^(1969-12-31|1970-01-01)" 804 " " 805 "[0-2][0-9]:[0-5][0-9]:00(\\.0+)?" 806 " " 807 "([-+][0-2][0-9]:?[0-5][0-9])\n"; 808 const char *timestamp = NULL, *cp, *colon; 809 static regex_t *stamp; 810 regmatch_t m[10]; 811 int zoneoffset; 812 int hourminute; 813 int status; 814 815 for (cp = nameline; *cp != '\n'; cp++) { 816 if (*cp == '\t') 817 timestamp = cp + 1; 818 } 819 if (!timestamp) 820 return 0; 821 if (!stamp) { 822 stamp = xmalloc(sizeof(*stamp)); 823 if (regcomp(stamp, stamp_regexp, REG_EXTENDED)) { 824 warning(_("Cannot prepare timestamp regexp %s"), 825 stamp_regexp); 826 return 0; 827 } 828 } 829 830 status = regexec(stamp, timestamp, ARRAY_SIZE(m), m, 0); 831 if (status) { 832 if (status != REG_NOMATCH) 833 warning(_("regexec returned %d for input: %s"), 834 status, timestamp); 835 return 0; 836 } 837 838 zoneoffset = strtol(timestamp + m[3].rm_so + 1, (char **) &colon, 10); 839 if (*colon == ':') 840 zoneoffset = zoneoffset * 60 + strtol(colon + 1, NULL, 10); 841 else 842 zoneoffset = (zoneoffset / 100) * 60 + (zoneoffset % 100); 843 if (timestamp[m[3].rm_so] == '-') 844 zoneoffset = -zoneoffset; 845 846 /* 847 * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31 848 * (west of GMT) or 1970-01-01 (east of GMT) 849 */ 850 if ((zoneoffset < 0 && memcmp(timestamp, "1969-12-31", 10)) || 851 (0 <= zoneoffset && memcmp(timestamp, "1970-01-01", 10))) 852 return 0; 853 854 hourminute = (strtol(timestamp + 11, NULL, 10) * 60 + 855 strtol(timestamp + 14, NULL, 10) - 856 zoneoffset); 857 858 return ((zoneoffset < 0 && hourminute == 1440) || 859 (0 <= zoneoffset && !hourminute)); 860} 861 862/* 863 * Get the name etc info from the ---/+++ lines of a traditional patch header 864 * 865 * FIXME! The end-of-filename heuristics are kind of screwy. For existing 866 * files, we can happily check the index for a match, but for creating a 867 * new file we should try to match whatever "patch" does. I have no idea. 868 */ 869static void parse_traditional_patch(const char *first, const char *second, struct patch *patch) 870{ 871 char *name; 872 873 first += 4; /* skip "--- " */ 874 second += 4; /* skip "+++ " */ 875 if (!p_value_known) { 876 int p, q; 877 p = guess_p_value(first); 878 q = guess_p_value(second); 879 if (p < 0) p = q; 880 if (0 <= p && p == q) { 881 p_value = p; 882 p_value_known = 1; 883 } 884 } 885 if (is_dev_null(first)) { 886 patch->is_new = 1; 887 patch->is_delete = 0; 888 name = find_name_traditional(second, NULL, p_value); 889 patch->new_name = name; 890 } else if (is_dev_null(second)) { 891 patch->is_new = 0; 892 patch->is_delete = 1; 893 name = find_name_traditional(first, NULL, p_value); 894 patch->old_name = name; 895 } else { 896 char *first_name; 897 first_name = find_name_traditional(first, NULL, p_value); 898 name = find_name_traditional(second, first_name, p_value); 899 free(first_name); 900 if (has_epoch_timestamp(first)) { 901 patch->is_new = 1; 902 patch->is_delete = 0; 903 patch->new_name = name; 904 } else if (has_epoch_timestamp(second)) { 905 patch->is_new = 0; 906 patch->is_delete = 1; 907 patch->old_name = name; 908 } else { 909 patch->old_name = name; 910 patch->new_name = null_strdup(name); 911 } 912 } 913 if (!name) 914 die(_("unable to find filename in patch at line %d"), linenr); 915} 916 917static int gitdiff_hdrend(const char *line, struct patch *patch) 918{ 919 return -1; 920} 921 922/* 923 * We're anal about diff header consistency, to make 924 * sure that we don't end up having strange ambiguous 925 * patches floating around. 926 * 927 * As a result, gitdiff_{old|new}name() will check 928 * their names against any previous information, just 929 * to make sure.. 930 */ 931#define DIFF_OLD_NAME 0 932#define DIFF_NEW_NAME 1 933 934static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, int side) 935{ 936 if (!orig_name && !isnull) 937 return find_name(line, NULL, p_value, TERM_TAB); 938 939 if (orig_name) { 940 int len; 941 const char *name; 942 char *another; 943 name = orig_name; 944 len = strlen(name); 945 if (isnull) 946 die(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"), name, linenr); 947 another = find_name(line, NULL, p_value, TERM_TAB); 948 if (!another || memcmp(another, name, len + 1)) 949 die((side == DIFF_NEW_NAME) ? 950 _("git apply: bad git-diff - inconsistent new filename on line %d") : 951 _("git apply: bad git-diff - inconsistent old filename on line %d"), linenr); 952 free(another); 953 return orig_name; 954 } 955 else { 956 /* expect "/dev/null" */ 957 if (memcmp("/dev/null", line, 9) || line[9] != '\n') 958 die(_("git apply: bad git-diff - expected /dev/null on line %d"), linenr); 959 return NULL; 960 } 961} 962 963static int gitdiff_oldname(const char *line, struct patch *patch) 964{ 965 char *orig = patch->old_name; 966 patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name, 967 DIFF_OLD_NAME); 968 if (orig != patch->old_name) 969 free(orig); 970 return 0; 971} 972 973static int gitdiff_newname(const char *line, struct patch *patch) 974{ 975 char *orig = patch->new_name; 976 patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name, 977 DIFF_NEW_NAME); 978 if (orig != patch->new_name) 979 free(orig); 980 return 0; 981} 982 983static int gitdiff_oldmode(const char *line, struct patch *patch) 984{ 985 patch->old_mode = strtoul(line, NULL, 8); 986 return 0; 987} 988 989static int gitdiff_newmode(const char *line, struct patch *patch) 990{ 991 patch->new_mode = strtoul(line, NULL, 8); 992 return 0; 993} 994 995static int gitdiff_delete(const char *line, struct patch *patch) 996{ 997 patch->is_delete = 1; 998 free(patch->old_name); 999 patch->old_name = null_strdup(patch->def_name);1000 return gitdiff_oldmode(line, patch);1001}10021003static int gitdiff_newfile(const char *line, struct patch *patch)1004{1005 patch->is_new = 1;1006 free(patch->new_name);1007 patch->new_name = null_strdup(patch->def_name);1008 return gitdiff_newmode(line, patch);1009}10101011static int gitdiff_copysrc(const char *line, struct patch *patch)1012{1013 patch->is_copy = 1;1014 free(patch->old_name);1015 patch->old_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0);1016 return 0;1017}10181019static int gitdiff_copydst(const char *line, struct patch *patch)1020{1021 patch->is_copy = 1;1022 free(patch->new_name);1023 patch->new_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0);1024 return 0;1025}10261027static int gitdiff_renamesrc(const char *line, struct patch *patch)1028{1029 patch->is_rename = 1;1030 free(patch->old_name);1031 patch->old_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0);1032 return 0;1033}10341035static int gitdiff_renamedst(const char *line, struct patch *patch)1036{1037 patch->is_rename = 1;1038 free(patch->new_name);1039 patch->new_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0);1040 return 0;1041}10421043static int gitdiff_similarity(const char *line, struct patch *patch)1044{1045 unsigned long val = strtoul(line, NULL, 10);1046 if (val <= 100)1047 patch->score = val;1048 return 0;1049}10501051static int gitdiff_dissimilarity(const char *line, struct patch *patch)1052{1053 unsigned long val = strtoul(line, NULL, 10);1054 if (val <= 100)1055 patch->score = val;1056 return 0;1057}10581059static int gitdiff_index(const char *line, struct patch *patch)1060{1061 /*1062 * index line is N hexadecimal, "..", N hexadecimal,1063 * and optional space with octal mode.1064 */1065 const char *ptr, *eol;1066 int len;10671068 ptr = strchr(line, '.');1069 if (!ptr || ptr[1] != '.' || 40 < ptr - line)1070 return 0;1071 len = ptr - line;1072 memcpy(patch->old_sha1_prefix, line, len);1073 patch->old_sha1_prefix[len] = 0;10741075 line = ptr + 2;1076 ptr = strchr(line, ' ');1077 eol = strchr(line, '\n');10781079 if (!ptr || eol < ptr)1080 ptr = eol;1081 len = ptr - line;10821083 if (40 < len)1084 return 0;1085 memcpy(patch->new_sha1_prefix, line, len);1086 patch->new_sha1_prefix[len] = 0;1087 if (*ptr == ' ')1088 patch->old_mode = strtoul(ptr+1, NULL, 8);1089 return 0;1090}10911092/*1093 * This is normal for a diff that doesn't change anything: we'll fall through1094 * into the next diff. Tell the parser to break out.1095 */1096static int gitdiff_unrecognized(const char *line, struct patch *patch)1097{1098 return -1;1099}11001101/*1102 * Skip p_value leading components from "line"; as we do not accept1103 * absolute paths, return NULL in that case.1104 */1105static const char *skip_tree_prefix(const char *line, int llen)1106{1107 int nslash;1108 int i;11091110 if (!p_value)1111 return (llen && line[0] == '/') ? NULL : line;11121113 nslash = p_value;1114 for (i = 0; i < llen; i++) {1115 int ch = line[i];1116 if (ch == '/' && --nslash <= 0)1117 return (i == 0) ? NULL : &line[i + 1];1118 }1119 return NULL;1120}11211122/*1123 * This is to extract the same name that appears on "diff --git"1124 * line. We do not find and return anything if it is a rename1125 * patch, and it is OK because we will find the name elsewhere.1126 * We need to reliably find name only when it is mode-change only,1127 * creation or deletion of an empty file. In any of these cases,1128 * both sides are the same name under a/ and b/ respectively.1129 */1130static char *git_header_name(const char *line, int llen)1131{1132 const char *name;1133 const char *second = NULL;1134 size_t len, line_len;11351136 line += strlen("diff --git ");1137 llen -= strlen("diff --git ");11381139 if (*line == '"') {1140 const char *cp;1141 struct strbuf first = STRBUF_INIT;1142 struct strbuf sp = STRBUF_INIT;11431144 if (unquote_c_style(&first, line, &second))1145 goto free_and_fail1;11461147 /* strip the a/b prefix including trailing slash */1148 cp = skip_tree_prefix(first.buf, first.len);1149 if (!cp)1150 goto free_and_fail1;1151 strbuf_remove(&first, 0, cp - first.buf);11521153 /*1154 * second points at one past closing dq of name.1155 * find the second name.1156 */1157 while ((second < line + llen) && isspace(*second))1158 second++;11591160 if (line + llen <= second)1161 goto free_and_fail1;1162 if (*second == '"') {1163 if (unquote_c_style(&sp, second, NULL))1164 goto free_and_fail1;1165 cp = skip_tree_prefix(sp.buf, sp.len);1166 if (!cp)1167 goto free_and_fail1;1168 /* They must match, otherwise ignore */1169 if (strcmp(cp, first.buf))1170 goto free_and_fail1;1171 strbuf_release(&sp);1172 return strbuf_detach(&first, NULL);1173 }11741175 /* unquoted second */1176 cp = skip_tree_prefix(second, line + llen - second);1177 if (!cp)1178 goto free_and_fail1;1179 if (line + llen - cp != first.len ||1180 memcmp(first.buf, cp, first.len))1181 goto free_and_fail1;1182 return strbuf_detach(&first, NULL);11831184 free_and_fail1:1185 strbuf_release(&first);1186 strbuf_release(&sp);1187 return NULL;1188 }11891190 /* unquoted first name */1191 name = skip_tree_prefix(line, llen);1192 if (!name)1193 return NULL;11941195 /*1196 * since the first name is unquoted, a dq if exists must be1197 * the beginning of the second name.1198 */1199 for (second = name; second < line + llen; second++) {1200 if (*second == '"') {1201 struct strbuf sp = STRBUF_INIT;1202 const char *np;12031204 if (unquote_c_style(&sp, second, NULL))1205 goto free_and_fail2;12061207 np = skip_tree_prefix(sp.buf, sp.len);1208 if (!np)1209 goto free_and_fail2;12101211 len = sp.buf + sp.len - np;1212 if (len < second - name &&1213 !strncmp(np, name, len) &&1214 isspace(name[len])) {1215 /* Good */1216 strbuf_remove(&sp, 0, np - sp.buf);1217 return strbuf_detach(&sp, NULL);1218 }12191220 free_and_fail2:1221 strbuf_release(&sp);1222 return NULL;1223 }1224 }12251226 /*1227 * Accept a name only if it shows up twice, exactly the same1228 * form.1229 */1230 second = strchr(name, '\n');1231 if (!second)1232 return NULL;1233 line_len = second - name;1234 for (len = 0 ; ; len++) {1235 switch (name[len]) {1236 default:1237 continue;1238 case '\n':1239 return NULL;1240 case '\t': case ' ':1241 /*1242 * Is this the separator between the preimage1243 * and the postimage pathname? Again, we are1244 * only interested in the case where there is1245 * no rename, as this is only to set def_name1246 * and a rename patch has the names elsewhere1247 * in an unambiguous form.1248 */1249 if (!name[len + 1])1250 return NULL; /* no postimage name */1251 second = skip_tree_prefix(name + len + 1,1252 line_len - (len + 1));1253 if (!second)1254 return NULL;1255 /*1256 * Does len bytes starting at "name" and "second"1257 * (that are separated by one HT or SP we just1258 * found) exactly match?1259 */1260 if (second[len] == '\n' && !strncmp(name, second, len))1261 return xmemdupz(name, len);1262 }1263 }1264}12651266/* Verify that we recognize the lines following a git header */1267static int parse_git_header(const char *line, int len, unsigned int size, struct patch *patch)1268{1269 unsigned long offset;12701271 /* A git diff has explicit new/delete information, so we don't guess */1272 patch->is_new = 0;1273 patch->is_delete = 0;12741275 /*1276 * Some things may not have the old name in the1277 * rest of the headers anywhere (pure mode changes,1278 * or removing or adding empty files), so we get1279 * the default name from the header.1280 */1281 patch->def_name = git_header_name(line, len);1282 if (patch->def_name && root) {1283 char *s = xmalloc(root_len + strlen(patch->def_name) + 1);1284 strcpy(s, root);1285 strcpy(s + root_len, patch->def_name);1286 free(patch->def_name);1287 patch->def_name = s;1288 }12891290 line += len;1291 size -= len;1292 linenr++;1293 for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {1294 static const struct opentry {1295 const char *str;1296 int (*fn)(const char *, struct patch *);1297 } optable[] = {1298 { "@@ -", gitdiff_hdrend },1299 { "--- ", gitdiff_oldname },1300 { "+++ ", gitdiff_newname },1301 { "old mode ", gitdiff_oldmode },1302 { "new mode ", gitdiff_newmode },1303 { "deleted file mode ", gitdiff_delete },1304 { "new file mode ", gitdiff_newfile },1305 { "copy from ", gitdiff_copysrc },1306 { "copy to ", gitdiff_copydst },1307 { "rename old ", gitdiff_renamesrc },1308 { "rename new ", gitdiff_renamedst },1309 { "rename from ", gitdiff_renamesrc },1310 { "rename to ", gitdiff_renamedst },1311 { "similarity index ", gitdiff_similarity },1312 { "dissimilarity index ", gitdiff_dissimilarity },1313 { "index ", gitdiff_index },1314 { "", gitdiff_unrecognized },1315 };1316 int i;13171318 len = linelen(line, size);1319 if (!len || line[len-1] != '\n')1320 break;1321 for (i = 0; i < ARRAY_SIZE(optable); i++) {1322 const struct opentry *p = optable + i;1323 int oplen = strlen(p->str);1324 if (len < oplen || memcmp(p->str, line, oplen))1325 continue;1326 if (p->fn(line + oplen, patch) < 0)1327 return offset;1328 break;1329 }1330 }13311332 return offset;1333}13341335static int parse_num(const char *line, unsigned long *p)1336{1337 char *ptr;13381339 if (!isdigit(*line))1340 return 0;1341 *p = strtoul(line, &ptr, 10);1342 return ptr - line;1343}13441345static int parse_range(const char *line, int len, int offset, const char *expect,1346 unsigned long *p1, unsigned long *p2)1347{1348 int digits, ex;13491350 if (offset < 0 || offset >= len)1351 return -1;1352 line += offset;1353 len -= offset;13541355 digits = parse_num(line, p1);1356 if (!digits)1357 return -1;13581359 offset += digits;1360 line += digits;1361 len -= digits;13621363 *p2 = 1;1364 if (*line == ',') {1365 digits = parse_num(line+1, p2);1366 if (!digits)1367 return -1;13681369 offset += digits+1;1370 line += digits+1;1371 len -= digits+1;1372 }13731374 ex = strlen(expect);1375 if (ex > len)1376 return -1;1377 if (memcmp(line, expect, ex))1378 return -1;13791380 return offset + ex;1381}13821383static void recount_diff(const char *line, int size, struct fragment *fragment)1384{1385 int oldlines = 0, newlines = 0, ret = 0;13861387 if (size < 1) {1388 warning("recount: ignore empty hunk");1389 return;1390 }13911392 for (;;) {1393 int len = linelen(line, size);1394 size -= len;1395 line += len;13961397 if (size < 1)1398 break;13991400 switch (*line) {1401 case ' ': case '\n':1402 newlines++;1403 /* fall through */1404 case '-':1405 oldlines++;1406 continue;1407 case '+':1408 newlines++;1409 continue;1410 case '\\':1411 continue;1412 case '@':1413 ret = size < 3 || prefixcmp(line, "@@ ");1414 break;1415 case 'd':1416 ret = size < 5 || prefixcmp(line, "diff ");1417 break;1418 default:1419 ret = -1;1420 break;1421 }1422 if (ret) {1423 warning(_("recount: unexpected line: %.*s"),1424 (int)linelen(line, size), line);1425 return;1426 }1427 break;1428 }1429 fragment->oldlines = oldlines;1430 fragment->newlines = newlines;1431}14321433/*1434 * Parse a unified diff fragment header of the1435 * form "@@ -a,b +c,d @@"1436 */1437static int parse_fragment_header(const char *line, int len, struct fragment *fragment)1438{1439 int offset;14401441 if (!len || line[len-1] != '\n')1442 return -1;14431444 /* Figure out the number of lines in a fragment */1445 offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);1446 offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);14471448 return offset;1449}14501451static int find_header(const char *line, unsigned long size, int *hdrsize, struct patch *patch)1452{1453 unsigned long offset, len;14541455 patch->is_toplevel_relative = 0;1456 patch->is_rename = patch->is_copy = 0;1457 patch->is_new = patch->is_delete = -1;1458 patch->old_mode = patch->new_mode = 0;1459 patch->old_name = patch->new_name = NULL;1460 for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {1461 unsigned long nextlen;14621463 len = linelen(line, size);1464 if (!len)1465 break;14661467 /* Testing this early allows us to take a few shortcuts.. */1468 if (len < 6)1469 continue;14701471 /*1472 * Make sure we don't find any unconnected patch fragments.1473 * That's a sign that we didn't find a header, and that a1474 * patch has become corrupted/broken up.1475 */1476 if (!memcmp("@@ -", line, 4)) {1477 struct fragment dummy;1478 if (parse_fragment_header(line, len, &dummy) < 0)1479 continue;1480 die(_("patch fragment without header at line %d: %.*s"),1481 linenr, (int)len-1, line);1482 }14831484 if (size < len + 6)1485 break;14861487 /*1488 * Git patch? It might not have a real patch, just a rename1489 * or mode change, so we handle that specially1490 */1491 if (!memcmp("diff --git ", line, 11)) {1492 int git_hdr_len = parse_git_header(line, len, size, patch);1493 if (git_hdr_len <= len)1494 continue;1495 if (!patch->old_name && !patch->new_name) {1496 if (!patch->def_name)1497 die(Q_("git diff header lacks filename information when removing "1498 "%d leading pathname component (line %d)",1499 "git diff header lacks filename information when removing "1500 "%d leading pathname components (line %d)",1501 p_value),1502 p_value, linenr);1503 patch->old_name = xstrdup(patch->def_name);1504 patch->new_name = xstrdup(patch->def_name);1505 }1506 if (!patch->is_delete && !patch->new_name)1507 die("git diff header lacks filename information "1508 "(line %d)", linenr);1509 patch->is_toplevel_relative = 1;1510 *hdrsize = git_hdr_len;1511 return offset;1512 }15131514 /* --- followed by +++ ? */1515 if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4))1516 continue;15171518 /*1519 * We only accept unified patches, so we want it to1520 * at least have "@@ -a,b +c,d @@\n", which is 14 chars1521 * minimum ("@@ -0,0 +1 @@\n" is the shortest).1522 */1523 nextlen = linelen(line + len, size - len);1524 if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))1525 continue;15261527 /* Ok, we'll consider it a patch */1528 parse_traditional_patch(line, line+len, patch);1529 *hdrsize = len + nextlen;1530 linenr += 2;1531 return offset;1532 }1533 return -1;1534}15351536static void record_ws_error(unsigned result, const char *line, int len, int linenr)1537{1538 char *err;15391540 if (!result)1541 return;15421543 whitespace_error++;1544 if (squelch_whitespace_errors &&1545 squelch_whitespace_errors < whitespace_error)1546 return;15471548 err = whitespace_error_string(result);1549 fprintf(stderr, "%s:%d: %s.\n%.*s\n",1550 patch_input_file, linenr, err, len, line);1551 free(err);1552}15531554static void check_whitespace(const char *line, int len, unsigned ws_rule)1555{1556 unsigned result = ws_check(line + 1, len - 1, ws_rule);15571558 record_ws_error(result, line + 1, len - 2, linenr);1559}15601561/*1562 * Parse a unified diff. Note that this really needs to parse each1563 * fragment separately, since the only way to know the difference1564 * between a "---" that is part of a patch, and a "---" that starts1565 * the next patch is to look at the line counts..1566 */1567static int parse_fragment(const char *line, unsigned long size,1568 struct patch *patch, struct fragment *fragment)1569{1570 int added, deleted;1571 int len = linelen(line, size), offset;1572 unsigned long oldlines, newlines;1573 unsigned long leading, trailing;15741575 offset = parse_fragment_header(line, len, fragment);1576 if (offset < 0)1577 return -1;1578 if (offset > 0 && patch->recount)1579 recount_diff(line + offset, size - offset, fragment);1580 oldlines = fragment->oldlines;1581 newlines = fragment->newlines;1582 leading = 0;1583 trailing = 0;15841585 /* Parse the thing.. */1586 line += len;1587 size -= len;1588 linenr++;1589 added = deleted = 0;1590 for (offset = len;1591 0 < size;1592 offset += len, size -= len, line += len, linenr++) {1593 if (!oldlines && !newlines)1594 break;1595 len = linelen(line, size);1596 if (!len || line[len-1] != '\n')1597 return -1;1598 switch (*line) {1599 default:1600 return -1;1601 case '\n': /* newer GNU diff, an empty context line */1602 case ' ':1603 oldlines--;1604 newlines--;1605 if (!deleted && !added)1606 leading++;1607 trailing++;1608 break;1609 case '-':1610 if (apply_in_reverse &&1611 ws_error_action != nowarn_ws_error)1612 check_whitespace(line, len, patch->ws_rule);1613 deleted++;1614 oldlines--;1615 trailing = 0;1616 break;1617 case '+':1618 if (!apply_in_reverse &&1619 ws_error_action != nowarn_ws_error)1620 check_whitespace(line, len, patch->ws_rule);1621 added++;1622 newlines--;1623 trailing = 0;1624 break;16251626 /*1627 * We allow "\ No newline at end of file". Depending1628 * on locale settings when the patch was produced we1629 * don't know what this line looks like. The only1630 * thing we do know is that it begins with "\ ".1631 * Checking for 12 is just for sanity check -- any1632 * l10n of "\ No newline..." is at least that long.1633 */1634 case '\\':1635 if (len < 12 || memcmp(line, "\\ ", 2))1636 return -1;1637 break;1638 }1639 }1640 if (oldlines || newlines)1641 return -1;1642 fragment->leading = leading;1643 fragment->trailing = trailing;16441645 /*1646 * If a fragment ends with an incomplete line, we failed to include1647 * it in the above loop because we hit oldlines == newlines == 01648 * before seeing it.1649 */1650 if (12 < size && !memcmp(line, "\\ ", 2))1651 offset += linelen(line, size);16521653 patch->lines_added += added;1654 patch->lines_deleted += deleted;16551656 if (0 < patch->is_new && oldlines)1657 return error(_("new file depends on old contents"));1658 if (0 < patch->is_delete && newlines)1659 return error(_("deleted file still has contents"));1660 return offset;1661}16621663/*1664 * We have seen "diff --git a/... b/..." header (or a traditional patch1665 * header). Read hunks that belong to this patch into fragments and hang1666 * them to the given patch structure.1667 *1668 * The (fragment->patch, fragment->size) pair points into the memory given1669 * by the caller, not a copy, when we return.1670 */1671static int parse_single_patch(const char *line, unsigned long size, struct patch *patch)1672{1673 unsigned long offset = 0;1674 unsigned long oldlines = 0, newlines = 0, context = 0;1675 struct fragment **fragp = &patch->fragments;16761677 while (size > 4 && !memcmp(line, "@@ -", 4)) {1678 struct fragment *fragment;1679 int len;16801681 fragment = xcalloc(1, sizeof(*fragment));1682 fragment->linenr = linenr;1683 len = parse_fragment(line, size, patch, fragment);1684 if (len <= 0)1685 die(_("corrupt patch at line %d"), linenr);1686 fragment->patch = line;1687 fragment->size = len;1688 oldlines += fragment->oldlines;1689 newlines += fragment->newlines;1690 context += fragment->leading + fragment->trailing;16911692 *fragp = fragment;1693 fragp = &fragment->next;16941695 offset += len;1696 line += len;1697 size -= len;1698 }16991700 /*1701 * If something was removed (i.e. we have old-lines) it cannot1702 * be creation, and if something was added it cannot be1703 * deletion. However, the reverse is not true; --unified=01704 * patches that only add are not necessarily creation even1705 * though they do not have any old lines, and ones that only1706 * delete are not necessarily deletion.1707 *1708 * Unfortunately, a real creation/deletion patch do _not_ have1709 * any context line by definition, so we cannot safely tell it1710 * apart with --unified=0 insanity. At least if the patch has1711 * more than one hunk it is not creation or deletion.1712 */1713 if (patch->is_new < 0 &&1714 (oldlines || (patch->fragments && patch->fragments->next)))1715 patch->is_new = 0;1716 if (patch->is_delete < 0 &&1717 (newlines || (patch->fragments && patch->fragments->next)))1718 patch->is_delete = 0;17191720 if (0 < patch->is_new && oldlines)1721 die(_("new file %s depends on old contents"), patch->new_name);1722 if (0 < patch->is_delete && newlines)1723 die(_("deleted file %s still has contents"), patch->old_name);1724 if (!patch->is_delete && !newlines && context)1725 fprintf_ln(stderr,1726 _("** warning: "1727 "file %s becomes empty but is not deleted"),1728 patch->new_name);17291730 return offset;1731}17321733static inline int metadata_changes(struct patch *patch)1734{1735 return patch->is_rename > 0 ||1736 patch->is_copy > 0 ||1737 patch->is_new > 0 ||1738 patch->is_delete ||1739 (patch->old_mode && patch->new_mode &&1740 patch->old_mode != patch->new_mode);1741}17421743static char *inflate_it(const void *data, unsigned long size,1744 unsigned long inflated_size)1745{1746 git_zstream stream;1747 void *out;1748 int st;17491750 memset(&stream, 0, sizeof(stream));17511752 stream.next_in = (unsigned char *)data;1753 stream.avail_in = size;1754 stream.next_out = out = xmalloc(inflated_size);1755 stream.avail_out = inflated_size;1756 git_inflate_init(&stream);1757 st = git_inflate(&stream, Z_FINISH);1758 git_inflate_end(&stream);1759 if ((st != Z_STREAM_END) || stream.total_out != inflated_size) {1760 free(out);1761 return NULL;1762 }1763 return out;1764}17651766/*1767 * Read a binary hunk and return a new fragment; fragment->patch1768 * points at an allocated memory that the caller must free, so1769 * it is marked as "->free_patch = 1".1770 */1771static struct fragment *parse_binary_hunk(char **buf_p,1772 unsigned long *sz_p,1773 int *status_p,1774 int *used_p)1775{1776 /*1777 * Expect a line that begins with binary patch method ("literal"1778 * or "delta"), followed by the length of data before deflating.1779 * a sequence of 'length-byte' followed by base-85 encoded data1780 * should follow, terminated by a newline.1781 *1782 * Each 5-byte sequence of base-85 encodes up to 4 bytes,1783 * and we would limit the patch line to 66 characters,1784 * so one line can fit up to 13 groups that would decode1785 * to 52 bytes max. The length byte 'A'-'Z' corresponds1786 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.1787 */1788 int llen, used;1789 unsigned long size = *sz_p;1790 char *buffer = *buf_p;1791 int patch_method;1792 unsigned long origlen;1793 char *data = NULL;1794 int hunk_size = 0;1795 struct fragment *frag;17961797 llen = linelen(buffer, size);1798 used = llen;17991800 *status_p = 0;18011802 if (!prefixcmp(buffer, "delta ")) {1803 patch_method = BINARY_DELTA_DEFLATED;1804 origlen = strtoul(buffer + 6, NULL, 10);1805 }1806 else if (!prefixcmp(buffer, "literal ")) {1807 patch_method = BINARY_LITERAL_DEFLATED;1808 origlen = strtoul(buffer + 8, NULL, 10);1809 }1810 else1811 return NULL;18121813 linenr++;1814 buffer += llen;1815 while (1) {1816 int byte_length, max_byte_length, newsize;1817 llen = linelen(buffer, size);1818 used += llen;1819 linenr++;1820 if (llen == 1) {1821 /* consume the blank line */1822 buffer++;1823 size--;1824 break;1825 }1826 /*1827 * Minimum line is "A00000\n" which is 7-byte long,1828 * and the line length must be multiple of 5 plus 2.1829 */1830 if ((llen < 7) || (llen-2) % 5)1831 goto corrupt;1832 max_byte_length = (llen - 2) / 5 * 4;1833 byte_length = *buffer;1834 if ('A' <= byte_length && byte_length <= 'Z')1835 byte_length = byte_length - 'A' + 1;1836 else if ('a' <= byte_length && byte_length <= 'z')1837 byte_length = byte_length - 'a' + 27;1838 else1839 goto corrupt;1840 /* if the input length was not multiple of 4, we would1841 * have filler at the end but the filler should never1842 * exceed 3 bytes1843 */1844 if (max_byte_length < byte_length ||1845 byte_length <= max_byte_length - 4)1846 goto corrupt;1847 newsize = hunk_size + byte_length;1848 data = xrealloc(data, newsize);1849 if (decode_85(data + hunk_size, buffer + 1, byte_length))1850 goto corrupt;1851 hunk_size = newsize;1852 buffer += llen;1853 size -= llen;1854 }18551856 frag = xcalloc(1, sizeof(*frag));1857 frag->patch = inflate_it(data, hunk_size, origlen);1858 frag->free_patch = 1;1859 if (!frag->patch)1860 goto corrupt;1861 free(data);1862 frag->size = origlen;1863 *buf_p = buffer;1864 *sz_p = size;1865 *used_p = used;1866 frag->binary_patch_method = patch_method;1867 return frag;18681869 corrupt:1870 free(data);1871 *status_p = -1;1872 error(_("corrupt binary patch at line %d: %.*s"),1873 linenr-1, llen-1, buffer);1874 return NULL;1875}18761877static int parse_binary(char *buffer, unsigned long size, struct patch *patch)1878{1879 /*1880 * We have read "GIT binary patch\n"; what follows is a line1881 * that says the patch method (currently, either "literal" or1882 * "delta") and the length of data before deflating; a1883 * sequence of 'length-byte' followed by base-85 encoded data1884 * follows.1885 *1886 * When a binary patch is reversible, there is another binary1887 * hunk in the same format, starting with patch method (either1888 * "literal" or "delta") with the length of data, and a sequence1889 * of length-byte + base-85 encoded data, terminated with another1890 * empty line. This data, when applied to the postimage, produces1891 * the preimage.1892 */1893 struct fragment *forward;1894 struct fragment *reverse;1895 int status;1896 int used, used_1;18971898 forward = parse_binary_hunk(&buffer, &size, &status, &used);1899 if (!forward && !status)1900 /* there has to be one hunk (forward hunk) */1901 return error(_("unrecognized binary patch at line %d"), linenr-1);1902 if (status)1903 /* otherwise we already gave an error message */1904 return status;19051906 reverse = parse_binary_hunk(&buffer, &size, &status, &used_1);1907 if (reverse)1908 used += used_1;1909 else if (status) {1910 /*1911 * Not having reverse hunk is not an error, but having1912 * a corrupt reverse hunk is.1913 */1914 free((void*) forward->patch);1915 free(forward);1916 return status;1917 }1918 forward->next = reverse;1919 patch->fragments = forward;1920 patch->is_binary = 1;1921 return used;1922}19231924/*1925 * Read the patch text in "buffer" that extends for "size" bytes; stop1926 * reading after seeing a single patch (i.e. changes to a single file).1927 * Create fragments (i.e. patch hunks) and hang them to the given patch.1928 * Return the number of bytes consumed, so that the caller can call us1929 * again for the next patch.1930 */1931static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)1932{1933 int hdrsize, patchsize;1934 int offset = find_header(buffer, size, &hdrsize, patch);19351936 if (offset < 0)1937 return offset;19381939 patch->ws_rule = whitespace_rule(patch->new_name1940 ? patch->new_name1941 : patch->old_name);19421943 patchsize = parse_single_patch(buffer + offset + hdrsize,1944 size - offset - hdrsize, patch);19451946 if (!patchsize) {1947 static const char *binhdr[] = {1948 "Binary files ",1949 "Files ",1950 NULL,1951 };1952 static const char git_binary[] = "GIT binary patch\n";1953 int i;1954 int hd = hdrsize + offset;1955 unsigned long llen = linelen(buffer + hd, size - hd);19561957 if (llen == sizeof(git_binary) - 1 &&1958 !memcmp(git_binary, buffer + hd, llen)) {1959 int used;1960 linenr++;1961 used = parse_binary(buffer + hd + llen,1962 size - hd - llen, patch);1963 if (used)1964 patchsize = used + llen;1965 else1966 patchsize = 0;1967 }1968 else if (!memcmp(" differ\n", buffer + hd + llen - 8, 8)) {1969 for (i = 0; binhdr[i]; i++) {1970 int len = strlen(binhdr[i]);1971 if (len < size - hd &&1972 !memcmp(binhdr[i], buffer + hd, len)) {1973 linenr++;1974 patch->is_binary = 1;1975 patchsize = llen;1976 break;1977 }1978 }1979 }19801981 /* Empty patch cannot be applied if it is a text patch1982 * without metadata change. A binary patch appears1983 * empty to us here.1984 */1985 if ((apply || check) &&1986 (!patch->is_binary && !metadata_changes(patch)))1987 die(_("patch with only garbage at line %d"), linenr);1988 }19891990 return offset + hdrsize + patchsize;1991}19921993#define swap(a,b) myswap((a),(b),sizeof(a))19941995#define myswap(a, b, size) do { \1996 unsigned char mytmp[size]; \1997 memcpy(mytmp, &a, size); \1998 memcpy(&a, &b, size); \1999 memcpy(&b, mytmp, size); \2000} while (0)20012002static void reverse_patches(struct patch *p)2003{2004 for (; p; p = p->next) {2005 struct fragment *frag = p->fragments;20062007 swap(p->new_name, p->old_name);2008 swap(p->new_mode, p->old_mode);2009 swap(p->is_new, p->is_delete);2010 swap(p->lines_added, p->lines_deleted);2011 swap(p->old_sha1_prefix, p->new_sha1_prefix);20122013 for (; frag; frag = frag->next) {2014 swap(frag->newpos, frag->oldpos);2015 swap(frag->newlines, frag->oldlines);2016 }2017 }2018}20192020static const char pluses[] =2021"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";2022static const char minuses[]=2023"----------------------------------------------------------------------";20242025static void show_stats(struct patch *patch)2026{2027 struct strbuf qname = STRBUF_INIT;2028 char *cp = patch->new_name ? patch->new_name : patch->old_name;2029 int max, add, del;20302031 quote_c_style(cp, &qname, NULL, 0);20322033 /*2034 * "scale" the filename2035 */2036 max = max_len;2037 if (max > 50)2038 max = 50;20392040 if (qname.len > max) {2041 cp = strchr(qname.buf + qname.len + 3 - max, '/');2042 if (!cp)2043 cp = qname.buf + qname.len + 3 - max;2044 strbuf_splice(&qname, 0, cp - qname.buf, "...", 3);2045 }20462047 if (patch->is_binary) {2048 printf(" %-*s | Bin\n", max, qname.buf);2049 strbuf_release(&qname);2050 return;2051 }20522053 printf(" %-*s |", max, qname.buf);2054 strbuf_release(&qname);20552056 /*2057 * scale the add/delete2058 */2059 max = max + max_change > 70 ? 70 - max : max_change;2060 add = patch->lines_added;2061 del = patch->lines_deleted;20622063 if (max_change > 0) {2064 int total = ((add + del) * max + max_change / 2) / max_change;2065 add = (add * max + max_change / 2) / max_change;2066 del = total - add;2067 }2068 printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,2069 add, pluses, del, minuses);2070}20712072static int read_old_data(struct stat *st, const char *path, struct strbuf *buf)2073{2074 switch (st->st_mode & S_IFMT) {2075 case S_IFLNK:2076 if (strbuf_readlink(buf, path, st->st_size) < 0)2077 return error(_("unable to read symlink %s"), path);2078 return 0;2079 case S_IFREG:2080 if (strbuf_read_file(buf, path, st->st_size) != st->st_size)2081 return error(_("unable to open or read %s"), path);2082 convert_to_git(path, buf->buf, buf->len, buf, 0);2083 return 0;2084 default:2085 return -1;2086 }2087}20882089/*2090 * Update the preimage, and the common lines in postimage,2091 * from buffer buf of length len. If postlen is 0 the postimage2092 * is updated in place, otherwise it's updated on a new buffer2093 * of length postlen2094 */20952096static void update_pre_post_images(struct image *preimage,2097 struct image *postimage,2098 char *buf,2099 size_t len, size_t postlen)2100{2101 int i, ctx, reduced;2102 char *new, *old, *fixed;2103 struct image fixed_preimage;21042105 /*2106 * Update the preimage with whitespace fixes. Note that we2107 * are not losing preimage->buf -- apply_one_fragment() will2108 * free "oldlines".2109 */2110 prepare_image(&fixed_preimage, buf, len, 1);2111 assert(postlen2112 ? fixed_preimage.nr == preimage->nr2113 : fixed_preimage.nr <= preimage->nr);2114 for (i = 0; i < fixed_preimage.nr; i++)2115 fixed_preimage.line[i].flag = preimage->line[i].flag;2116 free(preimage->line_allocated);2117 *preimage = fixed_preimage;21182119 /*2120 * Adjust the common context lines in postimage. This can be2121 * done in-place when we are shrinking it with whitespace2122 * fixing, but needs a new buffer when ignoring whitespace or2123 * expanding leading tabs to spaces.2124 *2125 * We trust the caller to tell us if the update can be done2126 * in place (postlen==0) or not.2127 */2128 old = postimage->buf;2129 if (postlen)2130 new = postimage->buf = xmalloc(postlen);2131 else2132 new = old;2133 fixed = preimage->buf;21342135 for (i = reduced = ctx = 0; i < postimage->nr; i++) {2136 size_t len = postimage->line[i].len;2137 if (!(postimage->line[i].flag & LINE_COMMON)) {2138 /* an added line -- no counterparts in preimage */2139 memmove(new, old, len);2140 old += len;2141 new += len;2142 continue;2143 }21442145 /* a common context -- skip it in the original postimage */2146 old += len;21472148 /* and find the corresponding one in the fixed preimage */2149 while (ctx < preimage->nr &&2150 !(preimage->line[ctx].flag & LINE_COMMON)) {2151 fixed += preimage->line[ctx].len;2152 ctx++;2153 }21542155 /*2156 * preimage is expected to run out, if the caller2157 * fixed addition of trailing blank lines.2158 */2159 if (preimage->nr <= ctx) {2160 reduced++;2161 continue;2162 }21632164 /* and copy it in, while fixing the line length */2165 len = preimage->line[ctx].len;2166 memcpy(new, fixed, len);2167 new += len;2168 fixed += len;2169 postimage->line[i].len = len;2170 ctx++;2171 }21722173 /* Fix the length of the whole thing */2174 postimage->len = new - postimage->buf;2175 postimage->nr -= reduced;2176}21772178static int match_fragment(struct image *img,2179 struct image *preimage,2180 struct image *postimage,2181 unsigned long try,2182 int try_lno,2183 unsigned ws_rule,2184 int match_beginning, int match_end)2185{2186 int i;2187 char *fixed_buf, *buf, *orig, *target;2188 struct strbuf fixed;2189 size_t fixed_len, postlen;2190 int preimage_limit;21912192 if (preimage->nr + try_lno <= img->nr) {2193 /*2194 * The hunk falls within the boundaries of img.2195 */2196 preimage_limit = preimage->nr;2197 if (match_end && (preimage->nr + try_lno != img->nr))2198 return 0;2199 } else if (ws_error_action == correct_ws_error &&2200 (ws_rule & WS_BLANK_AT_EOF)) {2201 /*2202 * This hunk extends beyond the end of img, and we are2203 * removing blank lines at the end of the file. This2204 * many lines from the beginning of the preimage must2205 * match with img, and the remainder of the preimage2206 * must be blank.2207 */2208 preimage_limit = img->nr - try_lno;2209 } else {2210 /*2211 * The hunk extends beyond the end of the img and2212 * we are not removing blanks at the end, so we2213 * should reject the hunk at this position.2214 */2215 return 0;2216 }22172218 if (match_beginning && try_lno)2219 return 0;22202221 /* Quick hash check */2222 for (i = 0; i < preimage_limit; i++)2223 if ((img->line[try_lno + i].flag & LINE_PATCHED) ||2224 (preimage->line[i].hash != img->line[try_lno + i].hash))2225 return 0;22262227 if (preimage_limit == preimage->nr) {2228 /*2229 * Do we have an exact match? If we were told to match2230 * at the end, size must be exactly at try+fragsize,2231 * otherwise try+fragsize must be still within the preimage,2232 * and either case, the old piece should match the preimage2233 * exactly.2234 */2235 if ((match_end2236 ? (try + preimage->len == img->len)2237 : (try + preimage->len <= img->len)) &&2238 !memcmp(img->buf + try, preimage->buf, preimage->len))2239 return 1;2240 } else {2241 /*2242 * The preimage extends beyond the end of img, so2243 * there cannot be an exact match.2244 *2245 * There must be one non-blank context line that match2246 * a line before the end of img.2247 */2248 char *buf_end;22492250 buf = preimage->buf;2251 buf_end = buf;2252 for (i = 0; i < preimage_limit; i++)2253 buf_end += preimage->line[i].len;22542255 for ( ; buf < buf_end; buf++)2256 if (!isspace(*buf))2257 break;2258 if (buf == buf_end)2259 return 0;2260 }22612262 /*2263 * No exact match. If we are ignoring whitespace, run a line-by-line2264 * fuzzy matching. We collect all the line length information because2265 * we need it to adjust whitespace if we match.2266 */2267 if (ws_ignore_action == ignore_ws_change) {2268 size_t imgoff = 0;2269 size_t preoff = 0;2270 size_t postlen = postimage->len;2271 size_t extra_chars;2272 char *preimage_eof;2273 char *preimage_end;2274 for (i = 0; i < preimage_limit; i++) {2275 size_t prelen = preimage->line[i].len;2276 size_t imglen = img->line[try_lno+i].len;22772278 if (!fuzzy_matchlines(img->buf + try + imgoff, imglen,2279 preimage->buf + preoff, prelen))2280 return 0;2281 if (preimage->line[i].flag & LINE_COMMON)2282 postlen += imglen - prelen;2283 imgoff += imglen;2284 preoff += prelen;2285 }22862287 /*2288 * Ok, the preimage matches with whitespace fuzz.2289 *2290 * imgoff now holds the true length of the target that2291 * matches the preimage before the end of the file.2292 *2293 * Count the number of characters in the preimage that fall2294 * beyond the end of the file and make sure that all of them2295 * are whitespace characters. (This can only happen if2296 * we are removing blank lines at the end of the file.)2297 */2298 buf = preimage_eof = preimage->buf + preoff;2299 for ( ; i < preimage->nr; i++)2300 preoff += preimage->line[i].len;2301 preimage_end = preimage->buf + preoff;2302 for ( ; buf < preimage_end; buf++)2303 if (!isspace(*buf))2304 return 0;23052306 /*2307 * Update the preimage and the common postimage context2308 * lines to use the same whitespace as the target.2309 * If whitespace is missing in the target (i.e.2310 * if the preimage extends beyond the end of the file),2311 * use the whitespace from the preimage.2312 */2313 extra_chars = preimage_end - preimage_eof;2314 strbuf_init(&fixed, imgoff + extra_chars);2315 strbuf_add(&fixed, img->buf + try, imgoff);2316 strbuf_add(&fixed, preimage_eof, extra_chars);2317 fixed_buf = strbuf_detach(&fixed, &fixed_len);2318 update_pre_post_images(preimage, postimage,2319 fixed_buf, fixed_len, postlen);2320 return 1;2321 }23222323 if (ws_error_action != correct_ws_error)2324 return 0;23252326 /*2327 * The hunk does not apply byte-by-byte, but the hash says2328 * it might with whitespace fuzz. We haven't been asked to2329 * ignore whitespace, we were asked to correct whitespace2330 * errors, so let's try matching after whitespace correction.2331 *2332 * The preimage may extend beyond the end of the file,2333 * but in this loop we will only handle the part of the2334 * preimage that falls within the file.2335 */2336 strbuf_init(&fixed, preimage->len + 1);2337 orig = preimage->buf;2338 target = img->buf + try;2339 postlen = 0;2340 for (i = 0; i < preimage_limit; i++) {2341 size_t oldlen = preimage->line[i].len;2342 size_t tgtlen = img->line[try_lno + i].len;2343 size_t fixstart = fixed.len;2344 struct strbuf tgtfix;2345 int match;23462347 /* Try fixing the line in the preimage */2348 ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);23492350 /* Try fixing the line in the target */2351 strbuf_init(&tgtfix, tgtlen);2352 ws_fix_copy(&tgtfix, target, tgtlen, ws_rule, NULL);23532354 /*2355 * If they match, either the preimage was based on2356 * a version before our tree fixed whitespace breakage,2357 * or we are lacking a whitespace-fix patch the tree2358 * the preimage was based on already had (i.e. target2359 * has whitespace breakage, the preimage doesn't).2360 * In either case, we are fixing the whitespace breakages2361 * so we might as well take the fix together with their2362 * real change.2363 */2364 match = (tgtfix.len == fixed.len - fixstart &&2365 !memcmp(tgtfix.buf, fixed.buf + fixstart,2366 fixed.len - fixstart));2367 postlen += tgtfix.len;23682369 strbuf_release(&tgtfix);2370 if (!match)2371 goto unmatch_exit;23722373 orig += oldlen;2374 target += tgtlen;2375 }237623772378 /*2379 * Now handle the lines in the preimage that falls beyond the2380 * end of the file (if any). They will only match if they are2381 * empty or only contain whitespace (if WS_BLANK_AT_EOL is2382 * false).2383 */2384 for ( ; i < preimage->nr; i++) {2385 size_t fixstart = fixed.len; /* start of the fixed preimage */2386 size_t oldlen = preimage->line[i].len;2387 int j;23882389 /* Try fixing the line in the preimage */2390 ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);23912392 for (j = fixstart; j < fixed.len; j++)2393 if (!isspace(fixed.buf[j]))2394 goto unmatch_exit;23952396 orig += oldlen;2397 }23982399 /*2400 * Yes, the preimage is based on an older version that still2401 * has whitespace breakages unfixed, and fixing them makes the2402 * hunk match. Update the context lines in the postimage.2403 */2404 fixed_buf = strbuf_detach(&fixed, &fixed_len);2405 if (postlen < postimage->len)2406 postlen = 0;2407 update_pre_post_images(preimage, postimage,2408 fixed_buf, fixed_len, postlen);2409 return 1;24102411 unmatch_exit:2412 strbuf_release(&fixed);2413 return 0;2414}24152416static int find_pos(struct image *img,2417 struct image *preimage,2418 struct image *postimage,2419 int line,2420 unsigned ws_rule,2421 int match_beginning, int match_end)2422{2423 int i;2424 unsigned long backwards, forwards, try;2425 int backwards_lno, forwards_lno, try_lno;24262427 /*2428 * If match_beginning or match_end is specified, there is no2429 * point starting from a wrong line that will never match and2430 * wander around and wait for a match at the specified end.2431 */2432 if (match_beginning)2433 line = 0;2434 else if (match_end)2435 line = img->nr - preimage->nr;24362437 /*2438 * Because the comparison is unsigned, the following test2439 * will also take care of a negative line number that can2440 * result when match_end and preimage is larger than the target.2441 */2442 if ((size_t) line > img->nr)2443 line = img->nr;24442445 try = 0;2446 for (i = 0; i < line; i++)2447 try += img->line[i].len;24482449 /*2450 * There's probably some smart way to do this, but I'll leave2451 * that to the smart and beautiful people. I'm simple and stupid.2452 */2453 backwards = try;2454 backwards_lno = line;2455 forwards = try;2456 forwards_lno = line;2457 try_lno = line;24582459 for (i = 0; ; i++) {2460 if (match_fragment(img, preimage, postimage,2461 try, try_lno, ws_rule,2462 match_beginning, match_end))2463 return try_lno;24642465 again:2466 if (backwards_lno == 0 && forwards_lno == img->nr)2467 break;24682469 if (i & 1) {2470 if (backwards_lno == 0) {2471 i++;2472 goto again;2473 }2474 backwards_lno--;2475 backwards -= img->line[backwards_lno].len;2476 try = backwards;2477 try_lno = backwards_lno;2478 } else {2479 if (forwards_lno == img->nr) {2480 i++;2481 goto again;2482 }2483 forwards += img->line[forwards_lno].len;2484 forwards_lno++;2485 try = forwards;2486 try_lno = forwards_lno;2487 }24882489 }2490 return -1;2491}24922493static void remove_first_line(struct image *img)2494{2495 img->buf += img->line[0].len;2496 img->len -= img->line[0].len;2497 img->line++;2498 img->nr--;2499}25002501static void remove_last_line(struct image *img)2502{2503 img->len -= img->line[--img->nr].len;2504}25052506/*2507 * The change from "preimage" and "postimage" has been found to2508 * apply at applied_pos (counts in line numbers) in "img".2509 * Update "img" to remove "preimage" and replace it with "postimage".2510 */2511static void update_image(struct image *img,2512 int applied_pos,2513 struct image *preimage,2514 struct image *postimage)2515{2516 /*2517 * remove the copy of preimage at offset in img2518 * and replace it with postimage2519 */2520 int i, nr;2521 size_t remove_count, insert_count, applied_at = 0;2522 char *result;2523 int preimage_limit;25242525 /*2526 * If we are removing blank lines at the end of img,2527 * the preimage may extend beyond the end.2528 * If that is the case, we must be careful only to2529 * remove the part of the preimage that falls within2530 * the boundaries of img. Initialize preimage_limit2531 * to the number of lines in the preimage that falls2532 * within the boundaries.2533 */2534 preimage_limit = preimage->nr;2535 if (preimage_limit > img->nr - applied_pos)2536 preimage_limit = img->nr - applied_pos;25372538 for (i = 0; i < applied_pos; i++)2539 applied_at += img->line[i].len;25402541 remove_count = 0;2542 for (i = 0; i < preimage_limit; i++)2543 remove_count += img->line[applied_pos + i].len;2544 insert_count = postimage->len;25452546 /* Adjust the contents */2547 result = xmalloc(img->len + insert_count - remove_count + 1);2548 memcpy(result, img->buf, applied_at);2549 memcpy(result + applied_at, postimage->buf, postimage->len);2550 memcpy(result + applied_at + postimage->len,2551 img->buf + (applied_at + remove_count),2552 img->len - (applied_at + remove_count));2553 free(img->buf);2554 img->buf = result;2555 img->len += insert_count - remove_count;2556 result[img->len] = '\0';25572558 /* Adjust the line table */2559 nr = img->nr + postimage->nr - preimage_limit;2560 if (preimage_limit < postimage->nr) {2561 /*2562 * NOTE: this knows that we never call remove_first_line()2563 * on anything other than pre/post image.2564 */2565 img->line = xrealloc(img->line, nr * sizeof(*img->line));2566 img->line_allocated = img->line;2567 }2568 if (preimage_limit != postimage->nr)2569 memmove(img->line + applied_pos + postimage->nr,2570 img->line + applied_pos + preimage_limit,2571 (img->nr - (applied_pos + preimage_limit)) *2572 sizeof(*img->line));2573 memcpy(img->line + applied_pos,2574 postimage->line,2575 postimage->nr * sizeof(*img->line));2576 if (!allow_overlap)2577 for (i = 0; i < postimage->nr; i++)2578 img->line[applied_pos + i].flag |= LINE_PATCHED;2579 img->nr = nr;2580}25812582/*2583 * Use the patch-hunk text in "frag" to prepare two images (preimage and2584 * postimage) for the hunk. Find lines that match "preimage" in "img" and2585 * replace the part of "img" with "postimage" text.2586 */2587static int apply_one_fragment(struct image *img, struct fragment *frag,2588 int inaccurate_eof, unsigned ws_rule,2589 int nth_fragment)2590{2591 int match_beginning, match_end;2592 const char *patch = frag->patch;2593 int size = frag->size;2594 char *old, *oldlines;2595 struct strbuf newlines;2596 int new_blank_lines_at_end = 0;2597 int found_new_blank_lines_at_end = 0;2598 int hunk_linenr = frag->linenr;2599 unsigned long leading, trailing;2600 int pos, applied_pos;2601 struct image preimage;2602 struct image postimage;26032604 memset(&preimage, 0, sizeof(preimage));2605 memset(&postimage, 0, sizeof(postimage));2606 oldlines = xmalloc(size);2607 strbuf_init(&newlines, size);26082609 old = oldlines;2610 while (size > 0) {2611 char first;2612 int len = linelen(patch, size);2613 int plen;2614 int added_blank_line = 0;2615 int is_blank_context = 0;2616 size_t start;26172618 if (!len)2619 break;26202621 /*2622 * "plen" is how much of the line we should use for2623 * the actual patch data. Normally we just remove the2624 * first character on the line, but if the line is2625 * followed by "\ No newline", then we also remove the2626 * last one (which is the newline, of course).2627 */2628 plen = len - 1;2629 if (len < size && patch[len] == '\\')2630 plen--;2631 first = *patch;2632 if (apply_in_reverse) {2633 if (first == '-')2634 first = '+';2635 else if (first == '+')2636 first = '-';2637 }26382639 switch (first) {2640 case '\n':2641 /* Newer GNU diff, empty context line */2642 if (plen < 0)2643 /* ... followed by '\No newline'; nothing */2644 break;2645 *old++ = '\n';2646 strbuf_addch(&newlines, '\n');2647 add_line_info(&preimage, "\n", 1, LINE_COMMON);2648 add_line_info(&postimage, "\n", 1, LINE_COMMON);2649 is_blank_context = 1;2650 break;2651 case ' ':2652 if (plen && (ws_rule & WS_BLANK_AT_EOF) &&2653 ws_blank_line(patch + 1, plen, ws_rule))2654 is_blank_context = 1;2655 case '-':2656 memcpy(old, patch + 1, plen);2657 add_line_info(&preimage, old, plen,2658 (first == ' ' ? LINE_COMMON : 0));2659 old += plen;2660 if (first == '-')2661 break;2662 /* Fall-through for ' ' */2663 case '+':2664 /* --no-add does not add new lines */2665 if (first == '+' && no_add)2666 break;26672668 start = newlines.len;2669 if (first != '+' ||2670 !whitespace_error ||2671 ws_error_action != correct_ws_error) {2672 strbuf_add(&newlines, patch + 1, plen);2673 }2674 else {2675 ws_fix_copy(&newlines, patch + 1, plen, ws_rule, &applied_after_fixing_ws);2676 }2677 add_line_info(&postimage, newlines.buf + start, newlines.len - start,2678 (first == '+' ? 0 : LINE_COMMON));2679 if (first == '+' &&2680 (ws_rule & WS_BLANK_AT_EOF) &&2681 ws_blank_line(patch + 1, plen, ws_rule))2682 added_blank_line = 1;2683 break;2684 case '@': case '\\':2685 /* Ignore it, we already handled it */2686 break;2687 default:2688 if (apply_verbosely)2689 error(_("invalid start of line: '%c'"), first);2690 return -1;2691 }2692 if (added_blank_line) {2693 if (!new_blank_lines_at_end)2694 found_new_blank_lines_at_end = hunk_linenr;2695 new_blank_lines_at_end++;2696 }2697 else if (is_blank_context)2698 ;2699 else2700 new_blank_lines_at_end = 0;2701 patch += len;2702 size -= len;2703 hunk_linenr++;2704 }2705 if (inaccurate_eof &&2706 old > oldlines && old[-1] == '\n' &&2707 newlines.len > 0 && newlines.buf[newlines.len - 1] == '\n') {2708 old--;2709 strbuf_setlen(&newlines, newlines.len - 1);2710 }27112712 leading = frag->leading;2713 trailing = frag->trailing;27142715 /*2716 * A hunk to change lines at the beginning would begin with2717 * @@ -1,L +N,M @@2718 * but we need to be careful. -U0 that inserts before the second2719 * line also has this pattern.2720 *2721 * And a hunk to add to an empty file would begin with2722 * @@ -0,0 +N,M @@2723 *2724 * In other words, a hunk that is (frag->oldpos <= 1) with or2725 * without leading context must match at the beginning.2726 */2727 match_beginning = (!frag->oldpos ||2728 (frag->oldpos == 1 && !unidiff_zero));27292730 /*2731 * A hunk without trailing lines must match at the end.2732 * However, we simply cannot tell if a hunk must match end2733 * from the lack of trailing lines if the patch was generated2734 * with unidiff without any context.2735 */2736 match_end = !unidiff_zero && !trailing;27372738 pos = frag->newpos ? (frag->newpos - 1) : 0;2739 preimage.buf = oldlines;2740 preimage.len = old - oldlines;2741 postimage.buf = newlines.buf;2742 postimage.len = newlines.len;2743 preimage.line = preimage.line_allocated;2744 postimage.line = postimage.line_allocated;27452746 for (;;) {27472748 applied_pos = find_pos(img, &preimage, &postimage, pos,2749 ws_rule, match_beginning, match_end);27502751 if (applied_pos >= 0)2752 break;27532754 /* Am I at my context limits? */2755 if ((leading <= p_context) && (trailing <= p_context))2756 break;2757 if (match_beginning || match_end) {2758 match_beginning = match_end = 0;2759 continue;2760 }27612762 /*2763 * Reduce the number of context lines; reduce both2764 * leading and trailing if they are equal otherwise2765 * just reduce the larger context.2766 */2767 if (leading >= trailing) {2768 remove_first_line(&preimage);2769 remove_first_line(&postimage);2770 pos--;2771 leading--;2772 }2773 if (trailing > leading) {2774 remove_last_line(&preimage);2775 remove_last_line(&postimage);2776 trailing--;2777 }2778 }27792780 if (applied_pos >= 0) {2781 if (new_blank_lines_at_end &&2782 preimage.nr + applied_pos >= img->nr &&2783 (ws_rule & WS_BLANK_AT_EOF) &&2784 ws_error_action != nowarn_ws_error) {2785 record_ws_error(WS_BLANK_AT_EOF, "+", 1,2786 found_new_blank_lines_at_end);2787 if (ws_error_action == correct_ws_error) {2788 while (new_blank_lines_at_end--)2789 remove_last_line(&postimage);2790 }2791 /*2792 * We would want to prevent write_out_results()2793 * from taking place in apply_patch() that follows2794 * the callchain led us here, which is:2795 * apply_patch->check_patch_list->check_patch->2796 * apply_data->apply_fragments->apply_one_fragment2797 */2798 if (ws_error_action == die_on_ws_error)2799 apply = 0;2800 }28012802 if (apply_verbosely && applied_pos != pos) {2803 int offset = applied_pos - pos;2804 if (apply_in_reverse)2805 offset = 0 - offset;2806 fprintf_ln(stderr,2807 Q_("Hunk #%d succeeded at %d (offset %d line).",2808 "Hunk #%d succeeded at %d (offset %d lines).",2809 offset),2810 nth_fragment, applied_pos + 1, offset);2811 }28122813 /*2814 * Warn if it was necessary to reduce the number2815 * of context lines.2816 */2817 if ((leading != frag->leading) ||2818 (trailing != frag->trailing))2819 fprintf_ln(stderr, _("Context reduced to (%ld/%ld)"2820 " to apply fragment at %d"),2821 leading, trailing, applied_pos+1);2822 update_image(img, applied_pos, &preimage, &postimage);2823 } else {2824 if (apply_verbosely)2825 error(_("while searching for:\n%.*s"),2826 (int)(old - oldlines), oldlines);2827 }28282829 free(oldlines);2830 strbuf_release(&newlines);2831 free(preimage.line_allocated);2832 free(postimage.line_allocated);28332834 return (applied_pos < 0);2835}28362837static int apply_binary_fragment(struct image *img, struct patch *patch)2838{2839 struct fragment *fragment = patch->fragments;2840 unsigned long len;2841 void *dst;28422843 if (!fragment)2844 return error(_("missing binary patch data for '%s'"),2845 patch->new_name ?2846 patch->new_name :2847 patch->old_name);28482849 /* Binary patch is irreversible without the optional second hunk */2850 if (apply_in_reverse) {2851 if (!fragment->next)2852 return error("cannot reverse-apply a binary patch "2853 "without the reverse hunk to '%s'",2854 patch->new_name2855 ? patch->new_name : patch->old_name);2856 fragment = fragment->next;2857 }2858 switch (fragment->binary_patch_method) {2859 case BINARY_DELTA_DEFLATED:2860 dst = patch_delta(img->buf, img->len, fragment->patch,2861 fragment->size, &len);2862 if (!dst)2863 return -1;2864 clear_image(img);2865 img->buf = dst;2866 img->len = len;2867 return 0;2868 case BINARY_LITERAL_DEFLATED:2869 clear_image(img);2870 img->len = fragment->size;2871 img->buf = xmalloc(img->len+1);2872 memcpy(img->buf, fragment->patch, img->len);2873 img->buf[img->len] = '\0';2874 return 0;2875 }2876 return -1;2877}28782879/*2880 * Replace "img" with the result of applying the binary patch.2881 * The binary patch data itself in patch->fragment is still kept2882 * but the preimage prepared by the caller in "img" is freed here2883 * or in the helper function apply_binary_fragment() this calls.2884 */2885static int apply_binary(struct image *img, struct patch *patch)2886{2887 const char *name = patch->old_name ? patch->old_name : patch->new_name;2888 unsigned char sha1[20];28892890 /*2891 * For safety, we require patch index line to contain2892 * full 40-byte textual SHA1 for old and new, at least for now.2893 */2894 if (strlen(patch->old_sha1_prefix) != 40 ||2895 strlen(patch->new_sha1_prefix) != 40 ||2896 get_sha1_hex(patch->old_sha1_prefix, sha1) ||2897 get_sha1_hex(patch->new_sha1_prefix, sha1))2898 return error("cannot apply binary patch to '%s' "2899 "without full index line", name);29002901 if (patch->old_name) {2902 /*2903 * See if the old one matches what the patch2904 * applies to.2905 */2906 hash_sha1_file(img->buf, img->len, blob_type, sha1);2907 if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))2908 return error("the patch applies to '%s' (%s), "2909 "which does not match the "2910 "current contents.",2911 name, sha1_to_hex(sha1));2912 }2913 else {2914 /* Otherwise, the old one must be empty. */2915 if (img->len)2916 return error("the patch applies to an empty "2917 "'%s' but it is not empty", name);2918 }29192920 get_sha1_hex(patch->new_sha1_prefix, sha1);2921 if (is_null_sha1(sha1)) {2922 clear_image(img);2923 return 0; /* deletion patch */2924 }29252926 if (has_sha1_file(sha1)) {2927 /* We already have the postimage */2928 enum object_type type;2929 unsigned long size;2930 char *result;29312932 result = read_sha1_file(sha1, &type, &size);2933 if (!result)2934 return error("the necessary postimage %s for "2935 "'%s' cannot be read",2936 patch->new_sha1_prefix, name);2937 clear_image(img);2938 img->buf = result;2939 img->len = size;2940 } else {2941 /*2942 * We have verified buf matches the preimage;2943 * apply the patch data to it, which is stored2944 * in the patch->fragments->{patch,size}.2945 */2946 if (apply_binary_fragment(img, patch))2947 return error(_("binary patch does not apply to '%s'"),2948 name);29492950 /* verify that the result matches */2951 hash_sha1_file(img->buf, img->len, blob_type, sha1);2952 if (strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))2953 return error(_("binary patch to '%s' creates incorrect result (expecting %s, got %s)"),2954 name, patch->new_sha1_prefix, sha1_to_hex(sha1));2955 }29562957 return 0;2958}29592960static int apply_fragments(struct image *img, struct patch *patch)2961{2962 struct fragment *frag = patch->fragments;2963 const char *name = patch->old_name ? patch->old_name : patch->new_name;2964 unsigned ws_rule = patch->ws_rule;2965 unsigned inaccurate_eof = patch->inaccurate_eof;2966 int nth = 0;29672968 if (patch->is_binary)2969 return apply_binary(img, patch);29702971 while (frag) {2972 nth++;2973 if (apply_one_fragment(img, frag, inaccurate_eof, ws_rule, nth)) {2974 error(_("patch failed: %s:%ld"), name, frag->oldpos);2975 if (!apply_with_reject)2976 return -1;2977 frag->rejected = 1;2978 }2979 frag = frag->next;2980 }2981 return 0;2982}29832984static int read_blob_object(struct strbuf *buf, const unsigned char *sha1, unsigned mode)2985{2986 if (S_ISGITLINK(mode)) {2987 strbuf_grow(buf, 100);2988 strbuf_addf(buf, "Subproject commit %s\n", sha1_to_hex(sha1));2989 } else {2990 enum object_type type;2991 unsigned long sz;2992 char *result;29932994 result = read_sha1_file(sha1, &type, &sz);2995 if (!result)2996 return -1;2997 /* XXX read_sha1_file NUL-terminates */2998 strbuf_attach(buf, result, sz, sz + 1);2999 }3000 return 0;3001}30023003static int read_file_or_gitlink(const struct cache_entry *ce, struct strbuf *buf)3004{3005 if (!ce)3006 return 0;3007 return read_blob_object(buf, ce->sha1, ce->ce_mode);3008}30093010static struct patch *in_fn_table(const char *name)3011{3012 struct string_list_item *item;30133014 if (name == NULL)3015 return NULL;30163017 item = string_list_lookup(&fn_table, name);3018 if (item != NULL)3019 return (struct patch *)item->util;30203021 return NULL;3022}30233024/*3025 * item->util in the filename table records the status of the path.3026 * Usually it points at a patch (whose result records the contents3027 * of it after applying it), but it could be PATH_WAS_DELETED for a3028 * path that a previously applied patch has already removed, or3029 * PATH_TO_BE_DELETED for a path that a later patch would remove.3030 *3031 * The latter is needed to deal with a case where two paths A and B3032 * are swapped by first renaming A to B and then renaming B to A;3033 * moving A to B should not be prevented due to presence of B as we3034 * will remove it in a later patch.3035 */3036#define PATH_TO_BE_DELETED ((struct patch *) -2)3037#define PATH_WAS_DELETED ((struct patch *) -1)30383039static int to_be_deleted(struct patch *patch)3040{3041 return patch == PATH_TO_BE_DELETED;3042}30433044static int was_deleted(struct patch *patch)3045{3046 return patch == PATH_WAS_DELETED;3047}30483049static void add_to_fn_table(struct patch *patch)3050{3051 struct string_list_item *item;30523053 /*3054 * Always add new_name unless patch is a deletion3055 * This should cover the cases for normal diffs,3056 * file creations and copies3057 */3058 if (patch->new_name != NULL) {3059 item = string_list_insert(&fn_table, patch->new_name);3060 item->util = patch;3061 }30623063 /*3064 * store a failure on rename/deletion cases because3065 * later chunks shouldn't patch old names3066 */3067 if ((patch->new_name == NULL) || (patch->is_rename)) {3068 item = string_list_insert(&fn_table, patch->old_name);3069 item->util = PATH_WAS_DELETED;3070 }3071}30723073static void prepare_fn_table(struct patch *patch)3074{3075 /*3076 * store information about incoming file deletion3077 */3078 while (patch) {3079 if ((patch->new_name == NULL) || (patch->is_rename)) {3080 struct string_list_item *item;3081 item = string_list_insert(&fn_table, patch->old_name);3082 item->util = PATH_TO_BE_DELETED;3083 }3084 patch = patch->next;3085 }3086}30873088static int checkout_target(struct cache_entry *ce, struct stat *st)3089{3090 struct checkout costate;30913092 memset(&costate, 0, sizeof(costate));3093 costate.base_dir = "";3094 costate.refresh_cache = 1;3095 if (checkout_entry(ce, &costate, NULL) || lstat(ce->name, st))3096 return error(_("cannot checkout %s"), ce->name);3097 return 0;3098}30993100static struct patch *previous_patch(struct patch *patch, int *gone)3101{3102 struct patch *previous;31033104 *gone = 0;3105 if (patch->is_copy || patch->is_rename)3106 return NULL; /* "git" patches do not depend on the order */31073108 previous = in_fn_table(patch->old_name);3109 if (!previous)3110 return NULL;31113112 if (to_be_deleted(previous))3113 return NULL; /* the deletion hasn't happened yet */31143115 if (was_deleted(previous))3116 *gone = 1;31173118 return previous;3119}31203121static int verify_index_match(const struct cache_entry *ce, struct stat *st)3122{3123 if (S_ISGITLINK(ce->ce_mode)) {3124 if (!S_ISDIR(st->st_mode))3125 return -1;3126 return 0;3127 }3128 return ce_match_stat(ce, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);3129}31303131#define SUBMODULE_PATCH_WITHOUT_INDEX 131323133static int load_patch_target(struct strbuf *buf,3134 const struct cache_entry *ce,3135 struct stat *st,3136 const char *name,3137 unsigned expected_mode)3138{3139 if (cached || check_index) {3140 if (read_file_or_gitlink(ce, buf))3141 return error(_("read of %s failed"), name);3142 } else if (name) {3143 if (S_ISGITLINK(expected_mode)) {3144 if (ce)3145 return read_file_or_gitlink(ce, buf);3146 else3147 return SUBMODULE_PATCH_WITHOUT_INDEX;3148 } else if (has_symlink_leading_path(name, strlen(name))) {3149 return error(_("reading from '%s' beyond a symbolic link"), name);3150 } else {3151 if (read_old_data(st, name, buf))3152 return error(_("read of %s failed"), name);3153 }3154 }3155 return 0;3156}31573158/*3159 * We are about to apply "patch"; populate the "image" with the3160 * current version we have, from the working tree or from the index,3161 * depending on the situation e.g. --cached/--index. If we are3162 * applying a non-git patch that incrementally updates the tree,3163 * we read from the result of a previous diff.3164 */3165static int load_preimage(struct image *image,3166 struct patch *patch, struct stat *st,3167 const struct cache_entry *ce)3168{3169 struct strbuf buf = STRBUF_INIT;3170 size_t len;3171 char *img;3172 struct patch *previous;3173 int status;31743175 previous = previous_patch(patch, &status);3176 if (status)3177 return error(_("path %s has been renamed/deleted"),3178 patch->old_name);3179 if (previous) {3180 /* We have a patched copy in memory; use that. */3181 strbuf_add(&buf, previous->result, previous->resultsize);3182 } else {3183 status = load_patch_target(&buf, ce, st,3184 patch->old_name, patch->old_mode);3185 if (status < 0)3186 return status;3187 else if (status == SUBMODULE_PATCH_WITHOUT_INDEX) {3188 /*3189 * There is no way to apply subproject3190 * patch without looking at the index.3191 * NEEDSWORK: shouldn't this be flagged3192 * as an error???3193 */3194 free_fragment_list(patch->fragments);3195 patch->fragments = NULL;3196 } else if (status) {3197 return error(_("read of %s failed"), patch->old_name);3198 }3199 }32003201 img = strbuf_detach(&buf, &len);3202 prepare_image(image, img, len, !patch->is_binary);3203 return 0;3204}32053206static int three_way_merge(struct image *image,3207 char *path,3208 const unsigned char *base,3209 const unsigned char *ours,3210 const unsigned char *theirs)3211{3212 mmfile_t base_file, our_file, their_file;3213 mmbuffer_t result = { NULL };3214 int status;32153216 read_mmblob(&base_file, base);3217 read_mmblob(&our_file, ours);3218 read_mmblob(&their_file, theirs);3219 status = ll_merge(&result, path,3220 &base_file, "base",3221 &our_file, "ours",3222 &their_file, "theirs", NULL);3223 free(base_file.ptr);3224 free(our_file.ptr);3225 free(their_file.ptr);3226 if (status < 0 || !result.ptr) {3227 free(result.ptr);3228 return -1;3229 }3230 clear_image(image);3231 image->buf = result.ptr;3232 image->len = result.size;32333234 return status;3235}32363237/*3238 * When directly falling back to add/add three-way merge, we read from3239 * the current contents of the new_name. In no cases other than that3240 * this function will be called.3241 */3242static int load_current(struct image *image, struct patch *patch)3243{3244 struct strbuf buf = STRBUF_INIT;3245 int status, pos;3246 size_t len;3247 char *img;3248 struct stat st;3249 struct cache_entry *ce;3250 char *name = patch->new_name;3251 unsigned mode = patch->new_mode;32523253 if (!patch->is_new)3254 die("BUG: patch to %s is not a creation", patch->old_name);32553256 pos = cache_name_pos(name, strlen(name));3257 if (pos < 0)3258 return error(_("%s: does not exist in index"), name);3259 ce = active_cache[pos];3260 if (lstat(name, &st)) {3261 if (errno != ENOENT)3262 return error(_("%s: %s"), name, strerror(errno));3263 if (checkout_target(ce, &st))3264 return -1;3265 }3266 if (verify_index_match(ce, &st))3267 return error(_("%s: does not match index"), name);32683269 status = load_patch_target(&buf, ce, &st, name, mode);3270 if (status < 0)3271 return status;3272 else if (status)3273 return -1;3274 img = strbuf_detach(&buf, &len);3275 prepare_image(image, img, len, !patch->is_binary);3276 return 0;3277}32783279static int try_threeway(struct image *image, struct patch *patch,3280 struct stat *st, const struct cache_entry *ce)3281{3282 unsigned char pre_sha1[20], post_sha1[20], our_sha1[20];3283 struct strbuf buf = STRBUF_INIT;3284 size_t len;3285 int status;3286 char *img;3287 struct image tmp_image;32883289 /* No point falling back to 3-way merge in these cases */3290 if (patch->is_delete ||3291 S_ISGITLINK(patch->old_mode) || S_ISGITLINK(patch->new_mode))3292 return -1;32933294 /* Preimage the patch was prepared for */3295 if (patch->is_new)3296 write_sha1_file("", 0, blob_type, pre_sha1);3297 else if (get_sha1(patch->old_sha1_prefix, pre_sha1) ||3298 read_blob_object(&buf, pre_sha1, patch->old_mode))3299 return error("repository lacks the necessary blob to fall back on 3-way merge.");33003301 fprintf(stderr, "Falling back to three-way merge...\n");33023303 img = strbuf_detach(&buf, &len);3304 prepare_image(&tmp_image, img, len, 1);3305 /* Apply the patch to get the post image */3306 if (apply_fragments(&tmp_image, patch) < 0) {3307 clear_image(&tmp_image);3308 return -1;3309 }3310 /* post_sha1[] is theirs */3311 write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, post_sha1);3312 clear_image(&tmp_image);33133314 /* our_sha1[] is ours */3315 if (patch->is_new) {3316 if (load_current(&tmp_image, patch))3317 return error("cannot read the current contents of '%s'",3318 patch->new_name);3319 } else {3320 if (load_preimage(&tmp_image, patch, st, ce))3321 return error("cannot read the current contents of '%s'",3322 patch->old_name);3323 }3324 write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, our_sha1);3325 clear_image(&tmp_image);33263327 /* in-core three-way merge between post and our using pre as base */3328 status = three_way_merge(image, patch->new_name,3329 pre_sha1, our_sha1, post_sha1);3330 if (status < 0) {3331 fprintf(stderr, "Failed to fall back on three-way merge...\n");3332 return status;3333 }33343335 if (status) {3336 patch->conflicted_threeway = 1;3337 if (patch->is_new)3338 hashclr(patch->threeway_stage[0]);3339 else3340 hashcpy(patch->threeway_stage[0], pre_sha1);3341 hashcpy(patch->threeway_stage[1], our_sha1);3342 hashcpy(patch->threeway_stage[2], post_sha1);3343 fprintf(stderr, "Applied patch to '%s' with conflicts.\n", patch->new_name);3344 } else {3345 fprintf(stderr, "Applied patch to '%s' cleanly.\n", patch->new_name);3346 }3347 return 0;3348}33493350static int apply_data(struct patch *patch, struct stat *st, const struct cache_entry *ce)3351{3352 struct image image;33533354 if (load_preimage(&image, patch, st, ce) < 0)3355 return -1;33563357 if (patch->direct_to_threeway ||3358 apply_fragments(&image, patch) < 0) {3359 /* Note: with --reject, apply_fragments() returns 0 */3360 if (!threeway || try_threeway(&image, patch, st, ce) < 0)3361 return -1;3362 }3363 patch->result = image.buf;3364 patch->resultsize = image.len;3365 add_to_fn_table(patch);3366 free(image.line_allocated);33673368 if (0 < patch->is_delete && patch->resultsize)3369 return error(_("removal patch leaves file contents"));33703371 return 0;3372}33733374/*3375 * If "patch" that we are looking at modifies or deletes what we have,3376 * we would want it not to lose any local modification we have, either3377 * in the working tree or in the index.3378 *3379 * This also decides if a non-git patch is a creation patch or a3380 * modification to an existing empty file. We do not check the state3381 * of the current tree for a creation patch in this function; the caller3382 * check_patch() separately makes sure (and errors out otherwise) that3383 * the path the patch creates does not exist in the current tree.3384 */3385static int check_preimage(struct patch *patch, struct cache_entry **ce, struct stat *st)3386{3387 const char *old_name = patch->old_name;3388 struct patch *previous = NULL;3389 int stat_ret = 0, status;3390 unsigned st_mode = 0;33913392 if (!old_name)3393 return 0;33943395 assert(patch->is_new <= 0);3396 previous = previous_patch(patch, &status);33973398 if (status)3399 return error(_("path %s has been renamed/deleted"), old_name);3400 if (previous) {3401 st_mode = previous->new_mode;3402 } else if (!cached) {3403 stat_ret = lstat(old_name, st);3404 if (stat_ret && errno != ENOENT)3405 return error(_("%s: %s"), old_name, strerror(errno));3406 }34073408 if (check_index && !previous) {3409 int pos = cache_name_pos(old_name, strlen(old_name));3410 if (pos < 0) {3411 if (patch->is_new < 0)3412 goto is_new;3413 return error(_("%s: does not exist in index"), old_name);3414 }3415 *ce = active_cache[pos];3416 if (stat_ret < 0) {3417 if (checkout_target(*ce, st))3418 return -1;3419 }3420 if (!cached && verify_index_match(*ce, st))3421 return error(_("%s: does not match index"), old_name);3422 if (cached)3423 st_mode = (*ce)->ce_mode;3424 } else if (stat_ret < 0) {3425 if (patch->is_new < 0)3426 goto is_new;3427 return error(_("%s: %s"), old_name, strerror(errno));3428 }34293430 if (!cached && !previous)3431 st_mode = ce_mode_from_stat(*ce, st->st_mode);34323433 if (patch->is_new < 0)3434 patch->is_new = 0;3435 if (!patch->old_mode)3436 patch->old_mode = st_mode;3437 if ((st_mode ^ patch->old_mode) & S_IFMT)3438 return error(_("%s: wrong type"), old_name);3439 if (st_mode != patch->old_mode)3440 warning(_("%s has type %o, expected %o"),3441 old_name, st_mode, patch->old_mode);3442 if (!patch->new_mode && !patch->is_delete)3443 patch->new_mode = st_mode;3444 return 0;34453446 is_new:3447 patch->is_new = 1;3448 patch->is_delete = 0;3449 free(patch->old_name);3450 patch->old_name = NULL;3451 return 0;3452}345334543455#define EXISTS_IN_INDEX 13456#define EXISTS_IN_WORKTREE 234573458static int check_to_create(const char *new_name, int ok_if_exists)3459{3460 struct stat nst;34613462 if (check_index &&3463 cache_name_pos(new_name, strlen(new_name)) >= 0 &&3464 !ok_if_exists)3465 return EXISTS_IN_INDEX;3466 if (cached)3467 return 0;34683469 if (!lstat(new_name, &nst)) {3470 if (S_ISDIR(nst.st_mode) || ok_if_exists)3471 return 0;3472 /*3473 * A leading component of new_name might be a symlink3474 * that is going to be removed with this patch, but3475 * still pointing at somewhere that has the path.3476 * In such a case, path "new_name" does not exist as3477 * far as git is concerned.3478 */3479 if (has_symlink_leading_path(new_name, strlen(new_name)))3480 return 0;34813482 return EXISTS_IN_WORKTREE;3483 } else if ((errno != ENOENT) && (errno != ENOTDIR)) {3484 return error("%s: %s", new_name, strerror(errno));3485 }3486 return 0;3487}34883489static void die_on_unsafe_path(struct patch *patch)3490{3491 const char *old_name = NULL;3492 const char *new_name = NULL;3493 if (patch->is_delete)3494 old_name = patch->old_name;3495 else if (!patch->is_new && !patch->is_copy)3496 old_name = patch->old_name;3497 if (!patch->is_delete)3498 new_name = patch->new_name;34993500 if (old_name && !verify_path(old_name))3501 die(_("invalid path '%s'"), old_name);3502 if (new_name && !verify_path(new_name))3503 die(_("invalid path '%s'"), new_name);3504}35053506/*3507 * Check and apply the patch in-core; leave the result in patch->result3508 * for the caller to write it out to the final destination.3509 */3510static int check_patch(struct patch *patch)3511{3512 struct stat st;3513 const char *old_name = patch->old_name;3514 const char *new_name = patch->new_name;3515 const char *name = old_name ? old_name : new_name;3516 struct cache_entry *ce = NULL;3517 struct patch *tpatch;3518 int ok_if_exists;3519 int status;35203521 patch->rejected = 1; /* we will drop this after we succeed */35223523 status = check_preimage(patch, &ce, &st);3524 if (status)3525 return status;3526 old_name = patch->old_name;35273528 /*3529 * A type-change diff is always split into a patch to delete3530 * old, immediately followed by a patch to create new (see3531 * diff.c::run_diff()); in such a case it is Ok that the entry3532 * to be deleted by the previous patch is still in the working3533 * tree and in the index.3534 *3535 * A patch to swap-rename between A and B would first rename A3536 * to B and then rename B to A. While applying the first one,3537 * the presence of B should not stop A from getting renamed to3538 * B; ask to_be_deleted() about the later rename. Removal of3539 * B and rename from A to B is handled the same way by asking3540 * was_deleted().3541 */3542 if ((tpatch = in_fn_table(new_name)) &&3543 (was_deleted(tpatch) || to_be_deleted(tpatch)))3544 ok_if_exists = 1;3545 else3546 ok_if_exists = 0;35473548 if (new_name &&3549 ((0 < patch->is_new) || patch->is_rename || patch->is_copy)) {3550 int err = check_to_create(new_name, ok_if_exists);35513552 if (err && threeway) {3553 patch->direct_to_threeway = 1;3554 } else switch (err) {3555 case 0:3556 break; /* happy */3557 case EXISTS_IN_INDEX:3558 return error(_("%s: already exists in index"), new_name);3559 break;3560 case EXISTS_IN_WORKTREE:3561 return error(_("%s: already exists in working directory"),3562 new_name);3563 default:3564 return err;3565 }35663567 if (!patch->new_mode) {3568 if (0 < patch->is_new)3569 patch->new_mode = S_IFREG | 0644;3570 else3571 patch->new_mode = patch->old_mode;3572 }3573 }35743575 if (new_name && old_name) {3576 int same = !strcmp(old_name, new_name);3577 if (!patch->new_mode)3578 patch->new_mode = patch->old_mode;3579 if ((patch->old_mode ^ patch->new_mode) & S_IFMT) {3580 if (same)3581 return error(_("new mode (%o) of %s does not "3582 "match old mode (%o)"),3583 patch->new_mode, new_name,3584 patch->old_mode);3585 else3586 return error(_("new mode (%o) of %s does not "3587 "match old mode (%o) of %s"),3588 patch->new_mode, new_name,3589 patch->old_mode, old_name);3590 }3591 }35923593 if (!unsafe_paths)3594 die_on_unsafe_path(patch);35953596 if (apply_data(patch, &st, ce) < 0)3597 return error(_("%s: patch does not apply"), name);3598 patch->rejected = 0;3599 return 0;3600}36013602static int check_patch_list(struct patch *patch)3603{3604 int err = 0;36053606 prepare_fn_table(patch);3607 while (patch) {3608 if (apply_verbosely)3609 say_patch_name(stderr,3610 _("Checking patch %s..."), patch);3611 err |= check_patch(patch);3612 patch = patch->next;3613 }3614 return err;3615}36163617/* This function tries to read the sha1 from the current index */3618static int get_current_sha1(const char *path, unsigned char *sha1)3619{3620 int pos;36213622 if (read_cache() < 0)3623 return -1;3624 pos = cache_name_pos(path, strlen(path));3625 if (pos < 0)3626 return -1;3627 hashcpy(sha1, active_cache[pos]->sha1);3628 return 0;3629}36303631static int preimage_sha1_in_gitlink_patch(struct patch *p, unsigned char sha1[20])3632{3633 /*3634 * A usable gitlink patch has only one fragment (hunk) that looks like:3635 * @@ -1 +1 @@3636 * -Subproject commit <old sha1>3637 * +Subproject commit <new sha1>3638 * or3639 * @@ -1 +0,0 @@3640 * -Subproject commit <old sha1>3641 * for a removal patch.3642 */3643 struct fragment *hunk = p->fragments;3644 static const char heading[] = "-Subproject commit ";3645 char *preimage;36463647 if (/* does the patch have only one hunk? */3648 hunk && !hunk->next &&3649 /* is its preimage one line? */3650 hunk->oldpos == 1 && hunk->oldlines == 1 &&3651 /* does preimage begin with the heading? */3652 (preimage = memchr(hunk->patch, '\n', hunk->size)) != NULL &&3653 !prefixcmp(++preimage, heading) &&3654 /* does it record full SHA-1? */3655 !get_sha1_hex(preimage + sizeof(heading) - 1, sha1) &&3656 preimage[sizeof(heading) + 40 - 1] == '\n' &&3657 /* does the abbreviated name on the index line agree with it? */3658 !prefixcmp(preimage + sizeof(heading) - 1, p->old_sha1_prefix))3659 return 0; /* it all looks fine */36603661 /* we may have full object name on the index line */3662 return get_sha1_hex(p->old_sha1_prefix, sha1);3663}36643665/* Build an index that contains the just the files needed for a 3way merge */3666static void build_fake_ancestor(struct patch *list, const char *filename)3667{3668 struct patch *patch;3669 struct index_state result = { NULL };3670 int fd;36713672 /* Once we start supporting the reverse patch, it may be3673 * worth showing the new sha1 prefix, but until then...3674 */3675 for (patch = list; patch; patch = patch->next) {3676 unsigned char sha1[20];3677 struct cache_entry *ce;3678 const char *name;36793680 name = patch->old_name ? patch->old_name : patch->new_name;3681 if (0 < patch->is_new)3682 continue;36833684 if (S_ISGITLINK(patch->old_mode)) {3685 if (!preimage_sha1_in_gitlink_patch(patch, sha1))3686 ; /* ok, the textual part looks sane */3687 else3688 die("sha1 information is lacking or useless for submoule %s",3689 name);3690 } else if (!get_sha1_blob(patch->old_sha1_prefix, sha1)) {3691 ; /* ok */3692 } else if (!patch->lines_added && !patch->lines_deleted) {3693 /* mode-only change: update the current */3694 if (get_current_sha1(patch->old_name, sha1))3695 die("mode change for %s, which is not "3696 "in current HEAD", name);3697 } else3698 die("sha1 information is lacking or useless "3699 "(%s).", name);37003701 ce = make_cache_entry(patch->old_mode, sha1, name, 0, 0);3702 if (!ce)3703 die(_("make_cache_entry failed for path '%s'"), name);3704 if (add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD))3705 die ("Could not add %s to temporary index", name);3706 }37073708 fd = open(filename, O_WRONLY | O_CREAT, 0666);3709 if (fd < 0 || write_index(&result, fd) || close(fd))3710 die ("Could not write temporary index to %s", filename);37113712 discard_index(&result);3713}37143715static void stat_patch_list(struct patch *patch)3716{3717 int files, adds, dels;37183719 for (files = adds = dels = 0 ; patch ; patch = patch->next) {3720 files++;3721 adds += patch->lines_added;3722 dels += patch->lines_deleted;3723 show_stats(patch);3724 }37253726 print_stat_summary(stdout, files, adds, dels);3727}37283729static void numstat_patch_list(struct patch *patch)3730{3731 for ( ; patch; patch = patch->next) {3732 const char *name;3733 name = patch->new_name ? patch->new_name : patch->old_name;3734 if (patch->is_binary)3735 printf("-\t-\t");3736 else3737 printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);3738 write_name_quoted(name, stdout, line_termination);3739 }3740}37413742static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)3743{3744 if (mode)3745 printf(" %s mode %06o %s\n", newdelete, mode, name);3746 else3747 printf(" %s %s\n", newdelete, name);3748}37493750static void show_mode_change(struct patch *p, int show_name)3751{3752 if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {3753 if (show_name)3754 printf(" mode change %06o => %06o %s\n",3755 p->old_mode, p->new_mode, p->new_name);3756 else3757 printf(" mode change %06o => %06o\n",3758 p->old_mode, p->new_mode);3759 }3760}37613762static void show_rename_copy(struct patch *p)3763{3764 const char *renamecopy = p->is_rename ? "rename" : "copy";3765 const char *old, *new;37663767 /* Find common prefix */3768 old = p->old_name;3769 new = p->new_name;3770 while (1) {3771 const char *slash_old, *slash_new;3772 slash_old = strchr(old, '/');3773 slash_new = strchr(new, '/');3774 if (!slash_old ||3775 !slash_new ||3776 slash_old - old != slash_new - new ||3777 memcmp(old, new, slash_new - new))3778 break;3779 old = slash_old + 1;3780 new = slash_new + 1;3781 }3782 /* p->old_name thru old is the common prefix, and old and new3783 * through the end of names are renames3784 */3785 if (old != p->old_name)3786 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,3787 (int)(old - p->old_name), p->old_name,3788 old, new, p->score);3789 else3790 printf(" %s %s => %s (%d%%)\n", renamecopy,3791 p->old_name, p->new_name, p->score);3792 show_mode_change(p, 0);3793}37943795static void summary_patch_list(struct patch *patch)3796{3797 struct patch *p;37983799 for (p = patch; p; p = p->next) {3800 if (p->is_new)3801 show_file_mode_name("create", p->new_mode, p->new_name);3802 else if (p->is_delete)3803 show_file_mode_name("delete", p->old_mode, p->old_name);3804 else {3805 if (p->is_rename || p->is_copy)3806 show_rename_copy(p);3807 else {3808 if (p->score) {3809 printf(" rewrite %s (%d%%)\n",3810 p->new_name, p->score);3811 show_mode_change(p, 0);3812 }3813 else3814 show_mode_change(p, 1);3815 }3816 }3817 }3818}38193820static void patch_stats(struct patch *patch)3821{3822 int lines = patch->lines_added + patch->lines_deleted;38233824 if (lines > max_change)3825 max_change = lines;3826 if (patch->old_name) {3827 int len = quote_c_style(patch->old_name, NULL, NULL, 0);3828 if (!len)3829 len = strlen(patch->old_name);3830 if (len > max_len)3831 max_len = len;3832 }3833 if (patch->new_name) {3834 int len = quote_c_style(patch->new_name, NULL, NULL, 0);3835 if (!len)3836 len = strlen(patch->new_name);3837 if (len > max_len)3838 max_len = len;3839 }3840}38413842static void remove_file(struct patch *patch, int rmdir_empty)3843{3844 if (update_index) {3845 if (remove_file_from_cache(patch->old_name) < 0)3846 die(_("unable to remove %s from index"), patch->old_name);3847 }3848 if (!cached) {3849 if (!remove_or_warn(patch->old_mode, patch->old_name) && rmdir_empty) {3850 remove_path(patch->old_name);3851 }3852 }3853}38543855static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size)3856{3857 struct stat st;3858 struct cache_entry *ce;3859 int namelen = strlen(path);3860 unsigned ce_size = cache_entry_size(namelen);38613862 if (!update_index)3863 return;38643865 ce = xcalloc(1, ce_size);3866 memcpy(ce->name, path, namelen);3867 ce->ce_mode = create_ce_mode(mode);3868 ce->ce_flags = create_ce_flags(0);3869 ce->ce_namelen = namelen;3870 if (S_ISGITLINK(mode)) {3871 const char *s = buf;38723873 if (get_sha1_hex(s + strlen("Subproject commit "), ce->sha1))3874 die(_("corrupt patch for submodule %s"), path);3875 } else {3876 if (!cached) {3877 if (lstat(path, &st) < 0)3878 die_errno(_("unable to stat newly created file '%s'"),3879 path);3880 fill_stat_cache_info(ce, &st);3881 }3882 if (write_sha1_file(buf, size, blob_type, ce->sha1) < 0)3883 die(_("unable to create backing store for newly created file %s"), path);3884 }3885 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)3886 die(_("unable to add cache entry for %s"), path);3887}38883889static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)3890{3891 int fd;3892 struct strbuf nbuf = STRBUF_INIT;38933894 if (S_ISGITLINK(mode)) {3895 struct stat st;3896 if (!lstat(path, &st) && S_ISDIR(st.st_mode))3897 return 0;3898 return mkdir(path, 0777);3899 }39003901 if (has_symlinks && S_ISLNK(mode))3902 /* Although buf:size is counted string, it also is NUL3903 * terminated.3904 */3905 return symlink(buf, path);39063907 fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);3908 if (fd < 0)3909 return -1;39103911 if (convert_to_working_tree(path, buf, size, &nbuf)) {3912 size = nbuf.len;3913 buf = nbuf.buf;3914 }3915 write_or_die(fd, buf, size);3916 strbuf_release(&nbuf);39173918 if (close(fd) < 0)3919 die_errno(_("closing file '%s'"), path);3920 return 0;3921}39223923/*3924 * We optimistically assume that the directories exist,3925 * which is true 99% of the time anyway. If they don't,3926 * we create them and try again.3927 */3928static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size)3929{3930 if (cached)3931 return;3932 if (!try_create_file(path, mode, buf, size))3933 return;39343935 if (errno == ENOENT) {3936 if (safe_create_leading_directories(path))3937 return;3938 if (!try_create_file(path, mode, buf, size))3939 return;3940 }39413942 if (errno == EEXIST || errno == EACCES) {3943 /* We may be trying to create a file where a directory3944 * used to be.3945 */3946 struct stat st;3947 if (!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))3948 errno = EEXIST;3949 }39503951 if (errno == EEXIST) {3952 unsigned int nr = getpid();39533954 for (;;) {3955 char newpath[PATH_MAX];3956 mksnpath(newpath, sizeof(newpath), "%s~%u", path, nr);3957 if (!try_create_file(newpath, mode, buf, size)) {3958 if (!rename(newpath, path))3959 return;3960 unlink_or_warn(newpath);3961 break;3962 }3963 if (errno != EEXIST)3964 break;3965 ++nr;3966 }3967 }3968 die_errno(_("unable to write file '%s' mode %o"), path, mode);3969}39703971static void add_conflicted_stages_file(struct patch *patch)3972{3973 int stage, namelen;3974 unsigned ce_size, mode;3975 struct cache_entry *ce;39763977 if (!update_index)3978 return;3979 namelen = strlen(patch->new_name);3980 ce_size = cache_entry_size(namelen);3981 mode = patch->new_mode ? patch->new_mode : (S_IFREG | 0644);39823983 remove_file_from_cache(patch->new_name);3984 for (stage = 1; stage < 4; stage++) {3985 if (is_null_sha1(patch->threeway_stage[stage - 1]))3986 continue;3987 ce = xcalloc(1, ce_size);3988 memcpy(ce->name, patch->new_name, namelen);3989 ce->ce_mode = create_ce_mode(mode);3990 ce->ce_flags = create_ce_flags(stage);3991 ce->ce_namelen = namelen;3992 hashcpy(ce->sha1, patch->threeway_stage[stage - 1]);3993 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)3994 die(_("unable to add cache entry for %s"), patch->new_name);3995 }3996}39973998static void create_file(struct patch *patch)3999{4000 char *path = patch->new_name;4001 unsigned mode = patch->new_mode;4002 unsigned long size = patch->resultsize;4003 char *buf = patch->result;40044005 if (!mode)4006 mode = S_IFREG | 0644;4007 create_one_file(path, mode, buf, size);40084009 if (patch->conflicted_threeway)4010 add_conflicted_stages_file(patch);4011 else4012 add_index_file(path, mode, buf, size);4013}40144015/* phase zero is to remove, phase one is to create */4016static void write_out_one_result(struct patch *patch, int phase)4017{4018 if (patch->is_delete > 0) {4019 if (phase == 0)4020 remove_file(patch, 1);4021 return;4022 }4023 if (patch->is_new > 0 || patch->is_copy) {4024 if (phase == 1)4025 create_file(patch);4026 return;4027 }4028 /*4029 * Rename or modification boils down to the same4030 * thing: remove the old, write the new4031 */4032 if (phase == 0)4033 remove_file(patch, patch->is_rename);4034 if (phase == 1)4035 create_file(patch);4036}40374038static int write_out_one_reject(struct patch *patch)4039{4040 FILE *rej;4041 char namebuf[PATH_MAX];4042 struct fragment *frag;4043 int cnt = 0;4044 struct strbuf sb = STRBUF_INIT;40454046 for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) {4047 if (!frag->rejected)4048 continue;4049 cnt++;4050 }40514052 if (!cnt) {4053 if (apply_verbosely)4054 say_patch_name(stderr,4055 _("Applied patch %s cleanly."), patch);4056 return 0;4057 }40584059 /* This should not happen, because a removal patch that leaves4060 * contents are marked "rejected" at the patch level.4061 */4062 if (!patch->new_name)4063 die(_("internal error"));40644065 /* Say this even without --verbose */4066 strbuf_addf(&sb, Q_("Applying patch %%s with %d reject...",4067 "Applying patch %%s with %d rejects...",4068 cnt),4069 cnt);4070 say_patch_name(stderr, sb.buf, patch);4071 strbuf_release(&sb);40724073 cnt = strlen(patch->new_name);4074 if (ARRAY_SIZE(namebuf) <= cnt + 5) {4075 cnt = ARRAY_SIZE(namebuf) - 5;4076 warning(_("truncating .rej filename to %.*s.rej"),4077 cnt - 1, patch->new_name);4078 }4079 memcpy(namebuf, patch->new_name, cnt);4080 memcpy(namebuf + cnt, ".rej", 5);40814082 rej = fopen(namebuf, "w");4083 if (!rej)4084 return error(_("cannot open %s: %s"), namebuf, strerror(errno));40854086 /* Normal git tools never deal with .rej, so do not pretend4087 * this is a git patch by saying --git nor give extended4088 * headers. While at it, maybe please "kompare" that wants4089 * the trailing TAB and some garbage at the end of line ;-).4090 */4091 fprintf(rej, "diff a/%s b/%s\t(rejected hunks)\n",4092 patch->new_name, patch->new_name);4093 for (cnt = 1, frag = patch->fragments;4094 frag;4095 cnt++, frag = frag->next) {4096 if (!frag->rejected) {4097 fprintf_ln(stderr, _("Hunk #%d applied cleanly."), cnt);4098 continue;4099 }4100 fprintf_ln(stderr, _("Rejected hunk #%d."), cnt);4101 fprintf(rej, "%.*s", frag->size, frag->patch);4102 if (frag->patch[frag->size-1] != '\n')4103 fputc('\n', rej);4104 }4105 fclose(rej);4106 return -1;4107}41084109static int write_out_results(struct patch *list)4110{4111 int phase;4112 int errs = 0;4113 struct patch *l;4114 struct string_list cpath = STRING_LIST_INIT_DUP;41154116 for (phase = 0; phase < 2; phase++) {4117 l = list;4118 while (l) {4119 if (l->rejected)4120 errs = 1;4121 else {4122 write_out_one_result(l, phase);4123 if (phase == 1) {4124 if (write_out_one_reject(l))4125 errs = 1;4126 if (l->conflicted_threeway) {4127 string_list_append(&cpath, l->new_name);4128 errs = 1;4129 }4130 }4131 }4132 l = l->next;4133 }4134 }41354136 if (cpath.nr) {4137 struct string_list_item *item;41384139 sort_string_list(&cpath);4140 for_each_string_list_item(item, &cpath)4141 fprintf(stderr, "U %s\n", item->string);4142 string_list_clear(&cpath, 0);41434144 rerere(0);4145 }41464147 return errs;4148}41494150static struct lock_file lock_file;41514152static struct string_list limit_by_name;4153static int has_include;4154static void add_name_limit(const char *name, int exclude)4155{4156 struct string_list_item *it;41574158 it = string_list_append(&limit_by_name, name);4159 it->util = exclude ? NULL : (void *) 1;4160}41614162static int use_patch(struct patch *p)4163{4164 const char *pathname = p->new_name ? p->new_name : p->old_name;4165 int i;41664167 /* Paths outside are not touched regardless of "--include" */4168 if (0 < prefix_length) {4169 int pathlen = strlen(pathname);4170 if (pathlen <= prefix_length ||4171 memcmp(prefix, pathname, prefix_length))4172 return 0;4173 }41744175 /* See if it matches any of exclude/include rule */4176 for (i = 0; i < limit_by_name.nr; i++) {4177 struct string_list_item *it = &limit_by_name.items[i];4178 if (!fnmatch(it->string, pathname, 0))4179 return (it->util != NULL);4180 }41814182 /*4183 * If we had any include, a path that does not match any rule is4184 * not used. Otherwise, we saw bunch of exclude rules (or none)4185 * and such a path is used.4186 */4187 return !has_include;4188}418941904191static void prefix_one(char **name)4192{4193 char *old_name = *name;4194 if (!old_name)4195 return;4196 *name = xstrdup(prefix_filename(prefix, prefix_length, *name));4197 free(old_name);4198}41994200static void prefix_patches(struct patch *p)4201{4202 if (!prefix || p->is_toplevel_relative)4203 return;4204 for ( ; p; p = p->next) {4205 prefix_one(&p->new_name);4206 prefix_one(&p->old_name);4207 }4208}42094210#define INACCURATE_EOF (1<<0)4211#define RECOUNT (1<<1)42124213static int apply_patch(int fd, const char *filename, int options)4214{4215 size_t offset;4216 struct strbuf buf = STRBUF_INIT; /* owns the patch text */4217 struct patch *list = NULL, **listp = &list;4218 int skipped_patch = 0;42194220 patch_input_file = filename;4221 read_patch_file(&buf, fd);4222 offset = 0;4223 while (offset < buf.len) {4224 struct patch *patch;4225 int nr;42264227 patch = xcalloc(1, sizeof(*patch));4228 patch->inaccurate_eof = !!(options & INACCURATE_EOF);4229 patch->recount = !!(options & RECOUNT);4230 nr = parse_chunk(buf.buf + offset, buf.len - offset, patch);4231 if (nr < 0)4232 break;4233 if (apply_in_reverse)4234 reverse_patches(patch);4235 if (prefix)4236 prefix_patches(patch);4237 if (use_patch(patch)) {4238 patch_stats(patch);4239 *listp = patch;4240 listp = &patch->next;4241 }4242 else {4243 free_patch(patch);4244 skipped_patch++;4245 }4246 offset += nr;4247 }42484249 if (!list && !skipped_patch)4250 die(_("unrecognized input"));42514252 if (whitespace_error && (ws_error_action == die_on_ws_error))4253 apply = 0;42544255 update_index = check_index && apply;4256 if (update_index && newfd < 0)4257 newfd = hold_locked_index(&lock_file, 1);42584259 if (check_index) {4260 if (read_cache() < 0)4261 die(_("unable to read index file"));4262 }42634264 if ((check || apply) &&4265 check_patch_list(list) < 0 &&4266 !apply_with_reject)4267 exit(1);42684269 if (apply && write_out_results(list)) {4270 if (apply_with_reject)4271 exit(1);4272 /* with --3way, we still need to write the index out */4273 return 1;4274 }42754276 if (fake_ancestor)4277 build_fake_ancestor(list, fake_ancestor);42784279 if (diffstat)4280 stat_patch_list(list);42814282 if (numstat)4283 numstat_patch_list(list);42844285 if (summary)4286 summary_patch_list(list);42874288 free_patch_list(list);4289 strbuf_release(&buf);4290 string_list_clear(&fn_table, 0);4291 return 0;4292}42934294static int git_apply_config(const char *var, const char *value, void *cb)4295{4296 if (!strcmp(var, "apply.whitespace"))4297 return git_config_string(&apply_default_whitespace, var, value);4298 else if (!strcmp(var, "apply.ignorewhitespace"))4299 return git_config_string(&apply_default_ignorewhitespace, var, value);4300 return git_default_config(var, value, cb);4301}43024303static int option_parse_exclude(const struct option *opt,4304 const char *arg, int unset)4305{4306 add_name_limit(arg, 1);4307 return 0;4308}43094310static int option_parse_include(const struct option *opt,4311 const char *arg, int unset)4312{4313 add_name_limit(arg, 0);4314 has_include = 1;4315 return 0;4316}43174318static int option_parse_p(const struct option *opt,4319 const char *arg, int unset)4320{4321 p_value = atoi(arg);4322 p_value_known = 1;4323 return 0;4324}43254326static int option_parse_z(const struct option *opt,4327 const char *arg, int unset)4328{4329 if (unset)4330 line_termination = '\n';4331 else4332 line_termination = 0;4333 return 0;4334}43354336static int option_parse_space_change(const struct option *opt,4337 const char *arg, int unset)4338{4339 if (unset)4340 ws_ignore_action = ignore_ws_none;4341 else4342 ws_ignore_action = ignore_ws_change;4343 return 0;4344}43454346static int option_parse_whitespace(const struct option *opt,4347 const char *arg, int unset)4348{4349 const char **whitespace_option = opt->value;43504351 *whitespace_option = arg;4352 parse_whitespace_option(arg);4353 return 0;4354}43554356static int option_parse_directory(const struct option *opt,4357 const char *arg, int unset)4358{4359 root_len = strlen(arg);4360 if (root_len && arg[root_len - 1] != '/') {4361 char *new_root;4362 root = new_root = xmalloc(root_len + 2);4363 strcpy(new_root, arg);4364 strcpy(new_root + root_len++, "/");4365 } else4366 root = arg;4367 return 0;4368}43694370int cmd_apply(int argc, const char **argv, const char *prefix_)4371{4372 int i;4373 int errs = 0;4374 int is_not_gitdir = !startup_info->have_repository;4375 int force_apply = 0;43764377 const char *whitespace_option = NULL;43784379 struct option builtin_apply_options[] = {4380 { OPTION_CALLBACK, 0, "exclude", NULL, N_("path"),4381 N_("don't apply changes matching the given path"),4382 0, option_parse_exclude },4383 { OPTION_CALLBACK, 0, "include", NULL, N_("path"),4384 N_("apply changes matching the given path"),4385 0, option_parse_include },4386 { OPTION_CALLBACK, 'p', NULL, NULL, N_("num"),4387 N_("remove <num> leading slashes from traditional diff paths"),4388 0, option_parse_p },4389 OPT_BOOL(0, "no-add", &no_add,4390 N_("ignore additions made by the patch")),4391 OPT_BOOL(0, "stat", &diffstat,4392 N_("instead of applying the patch, output diffstat for the input")),4393 OPT_NOOP_NOARG(0, "allow-binary-replacement"),4394 OPT_NOOP_NOARG(0, "binary"),4395 OPT_BOOL(0, "numstat", &numstat,4396 N_("show number of added and deleted lines in decimal notation")),4397 OPT_BOOL(0, "summary", &summary,4398 N_("instead of applying the patch, output a summary for the input")),4399 OPT_BOOL(0, "check", &check,4400 N_("instead of applying the patch, see if the patch is applicable")),4401 OPT_BOOL(0, "index", &check_index,4402 N_("make sure the patch is applicable to the current index")),4403 OPT_BOOL(0, "cached", &cached,4404 N_("apply a patch without touching the working tree")),4405 OPT_BOOL(0, "unsafe-paths", &unsafe_paths,4406 N_("accept a patch that touches outside the working area")),4407 OPT_BOOL(0, "apply", &force_apply,4408 N_("also apply the patch (use with --stat/--summary/--check)")),4409 OPT_BOOL('3', "3way", &threeway,4410 N_( "attempt three-way merge if a patch does not apply")),4411 OPT_FILENAME(0, "build-fake-ancestor", &fake_ancestor,4412 N_("build a temporary index based on embedded index information")),4413 { OPTION_CALLBACK, 'z', NULL, NULL, NULL,4414 N_("paths are separated with NUL character"),4415 PARSE_OPT_NOARG, option_parse_z },4416 OPT_INTEGER('C', NULL, &p_context,4417 N_("ensure at least <n> lines of context match")),4418 { OPTION_CALLBACK, 0, "whitespace", &whitespace_option, N_("action"),4419 N_("detect new or modified lines that have whitespace errors"),4420 0, option_parse_whitespace },4421 { OPTION_CALLBACK, 0, "ignore-space-change", NULL, NULL,4422 N_("ignore changes in whitespace when finding context"),4423 PARSE_OPT_NOARG, option_parse_space_change },4424 { OPTION_CALLBACK, 0, "ignore-whitespace", NULL, NULL,4425 N_("ignore changes in whitespace when finding context"),4426 PARSE_OPT_NOARG, option_parse_space_change },4427 OPT_BOOL('R', "reverse", &apply_in_reverse,4428 N_("apply the patch in reverse")),4429 OPT_BOOL(0, "unidiff-zero", &unidiff_zero,4430 N_("don't expect at least one line of context")),4431 OPT_BOOL(0, "reject", &apply_with_reject,4432 N_("leave the rejected hunks in corresponding *.rej files")),4433 OPT_BOOL(0, "allow-overlap", &allow_overlap,4434 N_("allow overlapping hunks")),4435 OPT__VERBOSE(&apply_verbosely, N_("be verbose")),4436 OPT_BIT(0, "inaccurate-eof", &options,4437 N_("tolerate incorrectly detected missing new-line at the end of file"),4438 INACCURATE_EOF),4439 OPT_BIT(0, "recount", &options,4440 N_("do not trust the line counts in the hunk headers"),4441 RECOUNT),4442 { OPTION_CALLBACK, 0, "directory", NULL, N_("root"),4443 N_("prepend <root> to all filenames"),4444 0, option_parse_directory },4445 OPT_END()4446 };44474448 prefix = prefix_;4449 prefix_length = prefix ? strlen(prefix) : 0;4450 git_config(git_apply_config, NULL);4451 if (apply_default_whitespace)4452 parse_whitespace_option(apply_default_whitespace);4453 if (apply_default_ignorewhitespace)4454 parse_ignorewhitespace_option(apply_default_ignorewhitespace);44554456 argc = parse_options(argc, argv, prefix, builtin_apply_options,4457 apply_usage, 0);44584459 if (apply_with_reject && threeway)4460 die("--reject and --3way cannot be used together.");4461 if (cached && threeway)4462 die("--cached and --3way cannot be used together.");4463 if (threeway) {4464 if (is_not_gitdir)4465 die(_("--3way outside a repository"));4466 check_index = 1;4467 }4468 if (apply_with_reject)4469 apply = apply_verbosely = 1;4470 if (!force_apply && (diffstat || numstat || summary || check || fake_ancestor))4471 apply = 0;4472 if (check_index && is_not_gitdir)4473 die(_("--index outside a repository"));4474 if (cached) {4475 if (is_not_gitdir)4476 die(_("--cached outside a repository"));4477 check_index = 1;4478 }4479 if (check_index)4480 unsafe_paths = 0;44814482 for (i = 0; i < argc; i++) {4483 const char *arg = argv[i];4484 int fd;44854486 if (!strcmp(arg, "-")) {4487 errs |= apply_patch(0, "<stdin>", options);4488 read_stdin = 0;4489 continue;4490 } else if (0 < prefix_length)4491 arg = prefix_filename(prefix, prefix_length, arg);44924493 fd = open(arg, O_RDONLY);4494 if (fd < 0)4495 die_errno(_("can't open patch '%s'"), arg);4496 read_stdin = 0;4497 set_default_whitespace_mode(whitespace_option);4498 errs |= apply_patch(fd, arg, options);4499 close(fd);4500 }4501 set_default_whitespace_mode(whitespace_option);4502 if (read_stdin)4503 errs |= apply_patch(0, "<stdin>", options);4504 if (whitespace_error) {4505 if (squelch_whitespace_errors &&4506 squelch_whitespace_errors < whitespace_error) {4507 int squelched =4508 whitespace_error - squelch_whitespace_errors;4509 warning(Q_("squelched %d whitespace error",4510 "squelched %d whitespace errors",4511 squelched),4512 squelched);4513 }4514 if (ws_error_action == die_on_ws_error)4515 die(Q_("%d line adds whitespace errors.",4516 "%d lines add whitespace errors.",4517 whitespace_error),4518 whitespace_error);4519 if (applied_after_fixing_ws && apply)4520 warning("%d line%s applied after"4521 " fixing whitespace errors.",4522 applied_after_fixing_ws,4523 applied_after_fixing_ws == 1 ? "" : "s");4524 else if (whitespace_error)4525 warning(Q_("%d line adds whitespace errors.",4526 "%d lines add whitespace errors.",4527 whitespace_error),4528 whitespace_error);4529 }45304531 if (update_index) {4532 if (write_cache(newfd, active_cache, active_nr) ||4533 commit_locked_index(&lock_file))4534 die(_("Unable to write new index file"));4535 }45364537 return !!errs;4538}