1/* 2 * apply.c 3 * 4 * Copyright (C) Linus Torvalds, 2005 5 * 6 * This applies patches on top of some (arbitrary) version of the SCM. 7 * 8 */ 9#include "cache.h" 10#include "cache-tree.h" 11#include "quote.h" 12#include "blob.h" 13#include "delta.h" 14#include "builtin.h" 15#include "string-list.h" 16#include "dir.h" 17#include "diff.h" 18#include "parse-options.h" 19#include "xdiff-interface.h" 20#include "ll-merge.h" 21#include "rerere.h" 22 23/* 24 * --check turns on checking that the working tree matches the 25 * files that are being modified, but doesn't apply the patch 26 * --stat does just a diffstat, and doesn't actually apply 27 * --numstat does numeric diffstat, and doesn't actually apply 28 * --index-info shows the old and new index info for paths if available. 29 * --index updates the cache as well. 30 * --cached updates only the cache without ever touching the working tree. 31 */ 32static const char *prefix; 33static int prefix_length = -1; 34static int newfd = -1; 35 36static int unidiff_zero; 37static int p_value = 1; 38static int p_value_known; 39static int check_index; 40static int update_index; 41static int cached; 42static int diffstat; 43static int numstat; 44static int summary; 45static int check; 46static int apply = 1; 47static int apply_in_reverse; 48static int apply_with_reject; 49static int apply_verbosely; 50static int allow_overlap; 51static int no_add; 52static int threeway; 53static const char *fake_ancestor; 54static int line_termination = '\n'; 55static unsigned int p_context = UINT_MAX; 56static const char * const apply_usage[] = { 57 N_("git apply [options] [<patch>...]"), 58 NULL 59}; 60 61static enum ws_error_action { 62 nowarn_ws_error, 63 warn_on_ws_error, 64 die_on_ws_error, 65 correct_ws_error 66} ws_error_action = warn_on_ws_error; 67static int whitespace_error; 68static int squelch_whitespace_errors = 5; 69static int applied_after_fixing_ws; 70 71static enum ws_ignore { 72 ignore_ws_none, 73 ignore_ws_change 74} ws_ignore_action = ignore_ws_none; 75 76 77static const char *patch_input_file; 78static const char *root; 79static int root_len; 80static int read_stdin = 1; 81static int options; 82 83static void parse_whitespace_option(const char *option) 84{ 85 if (!option) { 86 ws_error_action = warn_on_ws_error; 87 return; 88 } 89 if (!strcmp(option, "warn")) { 90 ws_error_action = warn_on_ws_error; 91 return; 92 } 93 if (!strcmp(option, "nowarn")) { 94 ws_error_action = nowarn_ws_error; 95 return; 96 } 97 if (!strcmp(option, "error")) { 98 ws_error_action = die_on_ws_error; 99 return; 100 } 101 if (!strcmp(option, "error-all")) { 102 ws_error_action = die_on_ws_error; 103 squelch_whitespace_errors = 0; 104 return; 105 } 106 if (!strcmp(option, "strip") || !strcmp(option, "fix")) { 107 ws_error_action = correct_ws_error; 108 return; 109 } 110 die(_("unrecognized whitespace option '%s'"), option); 111} 112 113static void parse_ignorewhitespace_option(const char *option) 114{ 115 if (!option || !strcmp(option, "no") || 116 !strcmp(option, "false") || !strcmp(option, "never") || 117 !strcmp(option, "none")) { 118 ws_ignore_action = ignore_ws_none; 119 return; 120 } 121 if (!strcmp(option, "change")) { 122 ws_ignore_action = ignore_ws_change; 123 return; 124 } 125 die(_("unrecognized whitespace ignore option '%s'"), option); 126} 127 128static void set_default_whitespace_mode(const char *whitespace_option) 129{ 130 if (!whitespace_option && !apply_default_whitespace) 131 ws_error_action = (apply ? warn_on_ws_error : nowarn_ws_error); 132} 133 134/* 135 * For "diff-stat" like behaviour, we keep track of the biggest change 136 * we've seen, and the longest filename. That allows us to do simple 137 * scaling. 138 */ 139static int max_change, max_len; 140 141/* 142 * Various "current state", notably line numbers and what 143 * file (and how) we're patching right now.. The "is_xxxx" 144 * things are flags, where -1 means "don't know yet". 145 */ 146static int linenr = 1; 147 148/* 149 * This represents one "hunk" from a patch, starting with 150 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The 151 * patch text is pointed at by patch, and its byte length 152 * is stored in size. leading and trailing are the number 153 * of context lines. 154 */ 155struct fragment { 156 unsigned long leading, trailing; 157 unsigned long oldpos, oldlines; 158 unsigned long newpos, newlines; 159 /* 160 * 'patch' is usually borrowed from buf in apply_patch(), 161 * but some codepaths store an allocated buffer. 162 */ 163 const char *patch; 164 unsigned free_patch:1, 165 rejected:1; 166 int size; 167 int linenr; 168 struct fragment *next; 169}; 170 171/* 172 * When dealing with a binary patch, we reuse "leading" field 173 * to store the type of the binary hunk, either deflated "delta" 174 * or deflated "literal". 175 */ 176#define binary_patch_method leading 177#define BINARY_DELTA_DEFLATED 1 178#define BINARY_LITERAL_DEFLATED 2 179 180/* 181 * This represents a "patch" to a file, both metainfo changes 182 * such as creation/deletion, filemode and content changes represented 183 * as a series of fragments. 184 */ 185struct patch { 186 char *new_name, *old_name, *def_name; 187 unsigned int old_mode, new_mode; 188 int is_new, is_delete; /* -1 = unknown, 0 = false, 1 = true */ 189 int rejected; 190 unsigned ws_rule; 191 int lines_added, lines_deleted; 192 int score; 193 unsigned int is_toplevel_relative:1; 194 unsigned int inaccurate_eof:1; 195 unsigned int is_binary:1; 196 unsigned int is_copy:1; 197 unsigned int is_rename:1; 198 unsigned int recount:1; 199 unsigned int conflicted_threeway:1; 200 unsigned int direct_to_threeway:1; 201 struct fragment *fragments; 202 char *result; 203 size_t resultsize; 204 char old_sha1_prefix[41]; 205 char new_sha1_prefix[41]; 206 struct patch *next; 207 208 /* three-way fallback result */ 209 unsigned char threeway_stage[3][20]; 210}; 211 212static void free_fragment_list(struct fragment *list) 213{ 214 while (list) { 215 struct fragment *next = list->next; 216 if (list->free_patch) 217 free((char *)list->patch); 218 free(list); 219 list = next; 220 } 221} 222 223static void free_patch(struct patch *patch) 224{ 225 free_fragment_list(patch->fragments); 226 free(patch->def_name); 227 free(patch->old_name); 228 free(patch->new_name); 229 free(patch->result); 230 free(patch); 231} 232 233static void free_patch_list(struct patch *list) 234{ 235 while (list) { 236 struct patch *next = list->next; 237 free_patch(list); 238 list = next; 239 } 240} 241 242/* 243 * A line in a file, len-bytes long (includes the terminating LF, 244 * except for an incomplete line at the end if the file ends with 245 * one), and its contents hashes to 'hash'. 246 */ 247struct line { 248 size_t len; 249 unsigned hash : 24; 250 unsigned flag : 8; 251#define LINE_COMMON 1 252#define LINE_PATCHED 2 253}; 254 255/* 256 * This represents a "file", which is an array of "lines". 257 */ 258struct image { 259 char *buf; 260 size_t len; 261 size_t nr; 262 size_t alloc; 263 struct line *line_allocated; 264 struct line *line; 265}; 266 267/* 268 * Records filenames that have been touched, in order to handle 269 * the case where more than one patches touch the same file. 270 */ 271 272static struct string_list fn_table; 273 274static uint32_t hash_line(const char *cp, size_t len) 275{ 276 size_t i; 277 uint32_t h; 278 for (i = 0, h = 0; i < len; i++) { 279 if (!isspace(cp[i])) { 280 h = h * 3 + (cp[i] & 0xff); 281 } 282 } 283 return h; 284} 285 286/* 287 * Compare lines s1 of length n1 and s2 of length n2, ignoring 288 * whitespace difference. Returns 1 if they match, 0 otherwise 289 */ 290static int fuzzy_matchlines(const char *s1, size_t n1, 291 const char *s2, size_t n2) 292{ 293 const char *last1 = s1 + n1 - 1; 294 const char *last2 = s2 + n2 - 1; 295 int result = 0; 296 297 /* ignore line endings */ 298 while ((*last1 == '\r') || (*last1 == '\n')) 299 last1--; 300 while ((*last2 == '\r') || (*last2 == '\n')) 301 last2--; 302 303 /* skip leading whitespace */ 304 while (isspace(*s1) && (s1 <= last1)) 305 s1++; 306 while (isspace(*s2) && (s2 <= last2)) 307 s2++; 308 /* early return if both lines are empty */ 309 if ((s1 > last1) && (s2 > last2)) 310 return 1; 311 while (!result) { 312 result = *s1++ - *s2++; 313 /* 314 * Skip whitespace inside. We check for whitespace on 315 * both buffers because we don't want "a b" to match 316 * "ab" 317 */ 318 if (isspace(*s1) && isspace(*s2)) { 319 while (isspace(*s1) && s1 <= last1) 320 s1++; 321 while (isspace(*s2) && s2 <= last2) 322 s2++; 323 } 324 /* 325 * If we reached the end on one side only, 326 * lines don't match 327 */ 328 if ( 329 ((s2 > last2) && (s1 <= last1)) || 330 ((s1 > last1) && (s2 <= last2))) 331 return 0; 332 if ((s1 > last1) && (s2 > last2)) 333 break; 334 } 335 336 return !result; 337} 338 339static void add_line_info(struct image *img, const char *bol, size_t len, unsigned flag) 340{ 341 ALLOC_GROW(img->line_allocated, img->nr + 1, img->alloc); 342 img->line_allocated[img->nr].len = len; 343 img->line_allocated[img->nr].hash = hash_line(bol, len); 344 img->line_allocated[img->nr].flag = flag; 345 img->nr++; 346} 347 348/* 349 * "buf" has the file contents to be patched (read from various sources). 350 * attach it to "image" and add line-based index to it. 351 * "image" now owns the "buf". 352 */ 353static void prepare_image(struct image *image, char *buf, size_t len, 354 int prepare_linetable) 355{ 356 const char *cp, *ep; 357 358 memset(image, 0, sizeof(*image)); 359 image->buf = buf; 360 image->len = len; 361 362 if (!prepare_linetable) 363 return; 364 365 ep = image->buf + image->len; 366 cp = image->buf; 367 while (cp < ep) { 368 const char *next; 369 for (next = cp; next < ep && *next != '\n'; next++) 370 ; 371 if (next < ep) 372 next++; 373 add_line_info(image, cp, next - cp, 0); 374 cp = next; 375 } 376 image->line = image->line_allocated; 377} 378 379static void clear_image(struct image *image) 380{ 381 free(image->buf); 382 free(image->line_allocated); 383 memset(image, 0, sizeof(*image)); 384} 385 386/* fmt must contain _one_ %s and no other substitution */ 387static void say_patch_name(FILE *output, const char *fmt, struct patch *patch) 388{ 389 struct strbuf sb = STRBUF_INIT; 390 391 if (patch->old_name && patch->new_name && 392 strcmp(patch->old_name, patch->new_name)) { 393 quote_c_style(patch->old_name, &sb, NULL, 0); 394 strbuf_addstr(&sb, " => "); 395 quote_c_style(patch->new_name, &sb, NULL, 0); 396 } else { 397 const char *n = patch->new_name; 398 if (!n) 399 n = patch->old_name; 400 quote_c_style(n, &sb, NULL, 0); 401 } 402 fprintf(output, fmt, sb.buf); 403 fputc('\n', output); 404 strbuf_release(&sb); 405} 406 407#define SLOP (16) 408 409static void read_patch_file(struct strbuf *sb, int fd) 410{ 411 if (strbuf_read(sb, fd, 0) < 0) 412 die_errno("git apply: failed to read"); 413 414 /* 415 * Make sure that we have some slop in the buffer 416 * so that we can do speculative "memcmp" etc, and 417 * see to it that it is NUL-filled. 418 */ 419 strbuf_grow(sb, SLOP); 420 memset(sb->buf + sb->len, 0, SLOP); 421} 422 423static unsigned long linelen(const char *buffer, unsigned long size) 424{ 425 unsigned long len = 0; 426 while (size--) { 427 len++; 428 if (*buffer++ == '\n') 429 break; 430 } 431 return len; 432} 433 434static int is_dev_null(const char *str) 435{ 436 return !memcmp("/dev/null", str, 9) && isspace(str[9]); 437} 438 439#define TERM_SPACE 1 440#define TERM_TAB 2 441 442static int name_terminate(const char *name, int namelen, int c, int terminate) 443{ 444 if (c == ' ' && !(terminate & TERM_SPACE)) 445 return 0; 446 if (c == '\t' && !(terminate & TERM_TAB)) 447 return 0; 448 449 return 1; 450} 451 452/* remove double slashes to make --index work with such filenames */ 453static char *squash_slash(char *name) 454{ 455 int i = 0, j = 0; 456 457 if (!name) 458 return NULL; 459 460 while (name[i]) { 461 if ((name[j++] = name[i++]) == '/') 462 while (name[i] == '/') 463 i++; 464 } 465 name[j] = '\0'; 466 return name; 467} 468 469static char *find_name_gnu(const char *line, const char *def, int p_value) 470{ 471 struct strbuf name = STRBUF_INIT; 472 char *cp; 473 474 /* 475 * Proposed "new-style" GNU patch/diff format; see 476 * http://marc.info/?l=git&m=112927316408690&w=2 477 */ 478 if (unquote_c_style(&name, line, NULL)) { 479 strbuf_release(&name); 480 return NULL; 481 } 482 483 for (cp = name.buf; p_value; p_value--) { 484 cp = strchr(cp, '/'); 485 if (!cp) { 486 strbuf_release(&name); 487 return NULL; 488 } 489 cp++; 490 } 491 492 strbuf_remove(&name, 0, cp - name.buf); 493 if (root) 494 strbuf_insert(&name, 0, root, root_len); 495 return squash_slash(strbuf_detach(&name, NULL)); 496} 497 498static size_t sane_tz_len(const char *line, size_t len) 499{ 500 const char *tz, *p; 501 502 if (len < strlen(" +0500") || line[len-strlen(" +0500")] != ' ') 503 return 0; 504 tz = line + len - strlen(" +0500"); 505 506 if (tz[1] != '+' && tz[1] != '-') 507 return 0; 508 509 for (p = tz + 2; p != line + len; p++) 510 if (!isdigit(*p)) 511 return 0; 512 513 return line + len - tz; 514} 515 516static size_t tz_with_colon_len(const char *line, size_t len) 517{ 518 const char *tz, *p; 519 520 if (len < strlen(" +08:00") || line[len - strlen(":00")] != ':') 521 return 0; 522 tz = line + len - strlen(" +08:00"); 523 524 if (tz[0] != ' ' || (tz[1] != '+' && tz[1] != '-')) 525 return 0; 526 p = tz + 2; 527 if (!isdigit(*p++) || !isdigit(*p++) || *p++ != ':' || 528 !isdigit(*p++) || !isdigit(*p++)) 529 return 0; 530 531 return line + len - tz; 532} 533 534static size_t date_len(const char *line, size_t len) 535{ 536 const char *date, *p; 537 538 if (len < strlen("72-02-05") || line[len-strlen("-05")] != '-') 539 return 0; 540 p = date = line + len - strlen("72-02-05"); 541 542 if (!isdigit(*p++) || !isdigit(*p++) || *p++ != '-' || 543 !isdigit(*p++) || !isdigit(*p++) || *p++ != '-' || 544 !isdigit(*p++) || !isdigit(*p++)) /* Not a date. */ 545 return 0; 546 547 if (date - line >= strlen("19") && 548 isdigit(date[-1]) && isdigit(date[-2])) /* 4-digit year */ 549 date -= strlen("19"); 550 551 return line + len - date; 552} 553 554static size_t short_time_len(const char *line, size_t len) 555{ 556 const char *time, *p; 557 558 if (len < strlen(" 07:01:32") || line[len-strlen(":32")] != ':') 559 return 0; 560 p = time = line + len - strlen(" 07:01:32"); 561 562 /* Permit 1-digit hours? */ 563 if (*p++ != ' ' || 564 !isdigit(*p++) || !isdigit(*p++) || *p++ != ':' || 565 !isdigit(*p++) || !isdigit(*p++) || *p++ != ':' || 566 !isdigit(*p++) || !isdigit(*p++)) /* Not a time. */ 567 return 0; 568 569 return line + len - time; 570} 571 572static size_t fractional_time_len(const char *line, size_t len) 573{ 574 const char *p; 575 size_t n; 576 577 /* Expected format: 19:41:17.620000023 */ 578 if (!len || !isdigit(line[len - 1])) 579 return 0; 580 p = line + len - 1; 581 582 /* Fractional seconds. */ 583 while (p > line && isdigit(*p)) 584 p--; 585 if (*p != '.') 586 return 0; 587 588 /* Hours, minutes, and whole seconds. */ 589 n = short_time_len(line, p - line); 590 if (!n) 591 return 0; 592 593 return line + len - p + n; 594} 595 596static size_t trailing_spaces_len(const char *line, size_t len) 597{ 598 const char *p; 599 600 /* Expected format: ' ' x (1 or more) */ 601 if (!len || line[len - 1] != ' ') 602 return 0; 603 604 p = line + len; 605 while (p != line) { 606 p--; 607 if (*p != ' ') 608 return line + len - (p + 1); 609 } 610 611 /* All spaces! */ 612 return len; 613} 614 615static size_t diff_timestamp_len(const char *line, size_t len) 616{ 617 const char *end = line + len; 618 size_t n; 619 620 /* 621 * Posix: 2010-07-05 19:41:17 622 * GNU: 2010-07-05 19:41:17.620000023 -0500 623 */ 624 625 if (!isdigit(end[-1])) 626 return 0; 627 628 n = sane_tz_len(line, end - line); 629 if (!n) 630 n = tz_with_colon_len(line, end - line); 631 end -= n; 632 633 n = short_time_len(line, end - line); 634 if (!n) 635 n = fractional_time_len(line, end - line); 636 end -= n; 637 638 n = date_len(line, end - line); 639 if (!n) /* No date. Too bad. */ 640 return 0; 641 end -= n; 642 643 if (end == line) /* No space before date. */ 644 return 0; 645 if (end[-1] == '\t') { /* Success! */ 646 end--; 647 return line + len - end; 648 } 649 if (end[-1] != ' ') /* No space before date. */ 650 return 0; 651 652 /* Whitespace damage. */ 653 end -= trailing_spaces_len(line, end - line); 654 return line + len - end; 655} 656 657static char *null_strdup(const char *s) 658{ 659 return s ? xstrdup(s) : NULL; 660} 661 662static char *find_name_common(const char *line, const char *def, 663 int p_value, const char *end, int terminate) 664{ 665 int len; 666 const char *start = NULL; 667 668 if (p_value == 0) 669 start = line; 670 while (line != end) { 671 char c = *line; 672 673 if (!end && isspace(c)) { 674 if (c == '\n') 675 break; 676 if (name_terminate(start, line-start, c, terminate)) 677 break; 678 } 679 line++; 680 if (c == '/' && !--p_value) 681 start = line; 682 } 683 if (!start) 684 return squash_slash(null_strdup(def)); 685 len = line - start; 686 if (!len) 687 return squash_slash(null_strdup(def)); 688 689 /* 690 * Generally we prefer the shorter name, especially 691 * if the other one is just a variation of that with 692 * something else tacked on to the end (ie "file.orig" 693 * or "file~"). 694 */ 695 if (def) { 696 int deflen = strlen(def); 697 if (deflen < len && !strncmp(start, def, deflen)) 698 return squash_slash(xstrdup(def)); 699 } 700 701 if (root) { 702 char *ret = xmalloc(root_len + len + 1); 703 strcpy(ret, root); 704 memcpy(ret + root_len, start, len); 705 ret[root_len + len] = '\0'; 706 return squash_slash(ret); 707 } 708 709 return squash_slash(xmemdupz(start, len)); 710} 711 712static char *find_name(const char *line, char *def, int p_value, int terminate) 713{ 714 if (*line == '"') { 715 char *name = find_name_gnu(line, def, p_value); 716 if (name) 717 return name; 718 } 719 720 return find_name_common(line, def, p_value, NULL, terminate); 721} 722 723static char *find_name_traditional(const char *line, char *def, int p_value) 724{ 725 size_t len; 726 size_t date_len; 727 728 if (*line == '"') { 729 char *name = find_name_gnu(line, def, p_value); 730 if (name) 731 return name; 732 } 733 734 len = strchrnul(line, '\n') - line; 735 date_len = diff_timestamp_len(line, len); 736 if (!date_len) 737 return find_name_common(line, def, p_value, NULL, TERM_TAB); 738 len -= date_len; 739 740 return find_name_common(line, def, p_value, line + len, 0); 741} 742 743static int count_slashes(const char *cp) 744{ 745 int cnt = 0; 746 char ch; 747 748 while ((ch = *cp++)) 749 if (ch == '/') 750 cnt++; 751 return cnt; 752} 753 754/* 755 * Given the string after "--- " or "+++ ", guess the appropriate 756 * p_value for the given patch. 757 */ 758static int guess_p_value(const char *nameline) 759{ 760 char *name, *cp; 761 int val = -1; 762 763 if (is_dev_null(nameline)) 764 return -1; 765 name = find_name_traditional(nameline, NULL, 0); 766 if (!name) 767 return -1; 768 cp = strchr(name, '/'); 769 if (!cp) 770 val = 0; 771 else if (prefix) { 772 /* 773 * Does it begin with "a/$our-prefix" and such? Then this is 774 * very likely to apply to our directory. 775 */ 776 if (!strncmp(name, prefix, prefix_length)) 777 val = count_slashes(prefix); 778 else { 779 cp++; 780 if (!strncmp(cp, prefix, prefix_length)) 781 val = count_slashes(prefix) + 1; 782 } 783 } 784 free(name); 785 return val; 786} 787 788/* 789 * Does the ---/+++ line has the POSIX timestamp after the last HT? 790 * GNU diff puts epoch there to signal a creation/deletion event. Is 791 * this such a timestamp? 792 */ 793static int has_epoch_timestamp(const char *nameline) 794{ 795 /* 796 * We are only interested in epoch timestamp; any non-zero 797 * fraction cannot be one, hence "(\.0+)?" in the regexp below. 798 * For the same reason, the date must be either 1969-12-31 or 799 * 1970-01-01, and the seconds part must be "00". 800 */ 801 const char stamp_regexp[] = 802 "^(1969-12-31|1970-01-01)" 803 " " 804 "[0-2][0-9]:[0-5][0-9]:00(\\.0+)?" 805 " " 806 "([-+][0-2][0-9]:?[0-5][0-9])\n"; 807 const char *timestamp = NULL, *cp, *colon; 808 static regex_t *stamp; 809 regmatch_t m[10]; 810 int zoneoffset; 811 int hourminute; 812 int status; 813 814 for (cp = nameline; *cp != '\n'; cp++) { 815 if (*cp == '\t') 816 timestamp = cp + 1; 817 } 818 if (!timestamp) 819 return 0; 820 if (!stamp) { 821 stamp = xmalloc(sizeof(*stamp)); 822 if (regcomp(stamp, stamp_regexp, REG_EXTENDED)) { 823 warning(_("Cannot prepare timestamp regexp %s"), 824 stamp_regexp); 825 return 0; 826 } 827 } 828 829 status = regexec(stamp, timestamp, ARRAY_SIZE(m), m, 0); 830 if (status) { 831 if (status != REG_NOMATCH) 832 warning(_("regexec returned %d for input: %s"), 833 status, timestamp); 834 return 0; 835 } 836 837 zoneoffset = strtol(timestamp + m[3].rm_so + 1, (char **) &colon, 10); 838 if (*colon == ':') 839 zoneoffset = zoneoffset * 60 + strtol(colon + 1, NULL, 10); 840 else 841 zoneoffset = (zoneoffset / 100) * 60 + (zoneoffset % 100); 842 if (timestamp[m[3].rm_so] == '-') 843 zoneoffset = -zoneoffset; 844 845 /* 846 * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31 847 * (west of GMT) or 1970-01-01 (east of GMT) 848 */ 849 if ((zoneoffset < 0 && memcmp(timestamp, "1969-12-31", 10)) || 850 (0 <= zoneoffset && memcmp(timestamp, "1970-01-01", 10))) 851 return 0; 852 853 hourminute = (strtol(timestamp + 11, NULL, 10) * 60 + 854 strtol(timestamp + 14, NULL, 10) - 855 zoneoffset); 856 857 return ((zoneoffset < 0 && hourminute == 1440) || 858 (0 <= zoneoffset && !hourminute)); 859} 860 861/* 862 * Get the name etc info from the ---/+++ lines of a traditional patch header 863 * 864 * FIXME! The end-of-filename heuristics are kind of screwy. For existing 865 * files, we can happily check the index for a match, but for creating a 866 * new file we should try to match whatever "patch" does. I have no idea. 867 */ 868static void parse_traditional_patch(const char *first, const char *second, struct patch *patch) 869{ 870 char *name; 871 872 first += 4; /* skip "--- " */ 873 second += 4; /* skip "+++ " */ 874 if (!p_value_known) { 875 int p, q; 876 p = guess_p_value(first); 877 q = guess_p_value(second); 878 if (p < 0) p = q; 879 if (0 <= p && p == q) { 880 p_value = p; 881 p_value_known = 1; 882 } 883 } 884 if (is_dev_null(first)) { 885 patch->is_new = 1; 886 patch->is_delete = 0; 887 name = find_name_traditional(second, NULL, p_value); 888 patch->new_name = name; 889 } else if (is_dev_null(second)) { 890 patch->is_new = 0; 891 patch->is_delete = 1; 892 name = find_name_traditional(first, NULL, p_value); 893 patch->old_name = name; 894 } else { 895 char *first_name; 896 first_name = find_name_traditional(first, NULL, p_value); 897 name = find_name_traditional(second, first_name, p_value); 898 free(first_name); 899 if (has_epoch_timestamp(first)) { 900 patch->is_new = 1; 901 patch->is_delete = 0; 902 patch->new_name = name; 903 } else if (has_epoch_timestamp(second)) { 904 patch->is_new = 0; 905 patch->is_delete = 1; 906 patch->old_name = name; 907 } else { 908 patch->old_name = name; 909 patch->new_name = null_strdup(name); 910 } 911 } 912 if (!name) 913 die(_("unable to find filename in patch at line %d"), linenr); 914} 915 916static int gitdiff_hdrend(const char *line, struct patch *patch) 917{ 918 return -1; 919} 920 921/* 922 * We're anal about diff header consistency, to make 923 * sure that we don't end up having strange ambiguous 924 * patches floating around. 925 * 926 * As a result, gitdiff_{old|new}name() will check 927 * their names against any previous information, just 928 * to make sure.. 929 */ 930#define DIFF_OLD_NAME 0 931#define DIFF_NEW_NAME 1 932 933static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, int side) 934{ 935 if (!orig_name && !isnull) 936 return find_name(line, NULL, p_value, TERM_TAB); 937 938 if (orig_name) { 939 int len; 940 const char *name; 941 char *another; 942 name = orig_name; 943 len = strlen(name); 944 if (isnull) 945 die(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"), name, linenr); 946 another = find_name(line, NULL, p_value, TERM_TAB); 947 if (!another || memcmp(another, name, len + 1)) 948 die((side == DIFF_NEW_NAME) ? 949 _("git apply: bad git-diff - inconsistent new filename on line %d") : 950 _("git apply: bad git-diff - inconsistent old filename on line %d"), linenr); 951 free(another); 952 return orig_name; 953 } 954 else { 955 /* expect "/dev/null" */ 956 if (memcmp("/dev/null", line, 9) || line[9] != '\n') 957 die(_("git apply: bad git-diff - expected /dev/null on line %d"), linenr); 958 return NULL; 959 } 960} 961 962static int gitdiff_oldname(const char *line, struct patch *patch) 963{ 964 char *orig = patch->old_name; 965 patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name, 966 DIFF_OLD_NAME); 967 if (orig != patch->old_name) 968 free(orig); 969 return 0; 970} 971 972static int gitdiff_newname(const char *line, struct patch *patch) 973{ 974 char *orig = patch->new_name; 975 patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name, 976 DIFF_NEW_NAME); 977 if (orig != patch->new_name) 978 free(orig); 979 return 0; 980} 981 982static int gitdiff_oldmode(const char *line, struct patch *patch) 983{ 984 patch->old_mode = strtoul(line, NULL, 8); 985 return 0; 986} 987 988static int gitdiff_newmode(const char *line, struct patch *patch) 989{ 990 patch->new_mode = strtoul(line, NULL, 8); 991 return 0; 992} 993 994static int gitdiff_delete(const char *line, struct patch *patch) 995{ 996 patch->is_delete = 1; 997 free(patch->old_name); 998 patch->old_name = null_strdup(patch->def_name); 999 return gitdiff_oldmode(line, patch);1000}10011002static int gitdiff_newfile(const char *line, struct patch *patch)1003{1004 patch->is_new = 1;1005 free(patch->new_name);1006 patch->new_name = null_strdup(patch->def_name);1007 return gitdiff_newmode(line, patch);1008}10091010static int gitdiff_copysrc(const char *line, struct patch *patch)1011{1012 patch->is_copy = 1;1013 free(patch->old_name);1014 patch->old_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0);1015 return 0;1016}10171018static int gitdiff_copydst(const char *line, struct patch *patch)1019{1020 patch->is_copy = 1;1021 free(patch->new_name);1022 patch->new_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0);1023 return 0;1024}10251026static int gitdiff_renamesrc(const char *line, struct patch *patch)1027{1028 patch->is_rename = 1;1029 free(patch->old_name);1030 patch->old_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0);1031 return 0;1032}10331034static int gitdiff_renamedst(const char *line, struct patch *patch)1035{1036 patch->is_rename = 1;1037 free(patch->new_name);1038 patch->new_name = find_name(line, NULL, p_value ? p_value - 1 : 0, 0);1039 return 0;1040}10411042static int gitdiff_similarity(const char *line, struct patch *patch)1043{1044 unsigned long val = strtoul(line, NULL, 10);1045 if (val <= 100)1046 patch->score = val;1047 return 0;1048}10491050static int gitdiff_dissimilarity(const char *line, struct patch *patch)1051{1052 unsigned long val = strtoul(line, NULL, 10);1053 if (val <= 100)1054 patch->score = val;1055 return 0;1056}10571058static int gitdiff_index(const char *line, struct patch *patch)1059{1060 /*1061 * index line is N hexadecimal, "..", N hexadecimal,1062 * and optional space with octal mode.1063 */1064 const char *ptr, *eol;1065 int len;10661067 ptr = strchr(line, '.');1068 if (!ptr || ptr[1] != '.' || 40 < ptr - line)1069 return 0;1070 len = ptr - line;1071 memcpy(patch->old_sha1_prefix, line, len);1072 patch->old_sha1_prefix[len] = 0;10731074 line = ptr + 2;1075 ptr = strchr(line, ' ');1076 eol = strchr(line, '\n');10771078 if (!ptr || eol < ptr)1079 ptr = eol;1080 len = ptr - line;10811082 if (40 < len)1083 return 0;1084 memcpy(patch->new_sha1_prefix, line, len);1085 patch->new_sha1_prefix[len] = 0;1086 if (*ptr == ' ')1087 patch->old_mode = strtoul(ptr+1, NULL, 8);1088 return 0;1089}10901091/*1092 * This is normal for a diff that doesn't change anything: we'll fall through1093 * into the next diff. Tell the parser to break out.1094 */1095static int gitdiff_unrecognized(const char *line, struct patch *patch)1096{1097 return -1;1098}10991100/*1101 * Skip p_value leading components from "line"; as we do not accept1102 * absolute paths, return NULL in that case.1103 */1104static const char *skip_tree_prefix(const char *line, int llen)1105{1106 int nslash;1107 int i;11081109 if (!p_value)1110 return (llen && line[0] == '/') ? NULL : line;11111112 nslash = p_value;1113 for (i = 0; i < llen; i++) {1114 int ch = line[i];1115 if (ch == '/' && --nslash <= 0)1116 return (i == 0) ? NULL : &line[i + 1];1117 }1118 return NULL;1119}11201121/*1122 * This is to extract the same name that appears on "diff --git"1123 * line. We do not find and return anything if it is a rename1124 * patch, and it is OK because we will find the name elsewhere.1125 * We need to reliably find name only when it is mode-change only,1126 * creation or deletion of an empty file. In any of these cases,1127 * both sides are the same name under a/ and b/ respectively.1128 */1129static char *git_header_name(const char *line, int llen)1130{1131 const char *name;1132 const char *second = NULL;1133 size_t len, line_len;11341135 line += strlen("diff --git ");1136 llen -= strlen("diff --git ");11371138 if (*line == '"') {1139 const char *cp;1140 struct strbuf first = STRBUF_INIT;1141 struct strbuf sp = STRBUF_INIT;11421143 if (unquote_c_style(&first, line, &second))1144 goto free_and_fail1;11451146 /* strip the a/b prefix including trailing slash */1147 cp = skip_tree_prefix(first.buf, first.len);1148 if (!cp)1149 goto free_and_fail1;1150 strbuf_remove(&first, 0, cp - first.buf);11511152 /*1153 * second points at one past closing dq of name.1154 * find the second name.1155 */1156 while ((second < line + llen) && isspace(*second))1157 second++;11581159 if (line + llen <= second)1160 goto free_and_fail1;1161 if (*second == '"') {1162 if (unquote_c_style(&sp, second, NULL))1163 goto free_and_fail1;1164 cp = skip_tree_prefix(sp.buf, sp.len);1165 if (!cp)1166 goto free_and_fail1;1167 /* They must match, otherwise ignore */1168 if (strcmp(cp, first.buf))1169 goto free_and_fail1;1170 strbuf_release(&sp);1171 return strbuf_detach(&first, NULL);1172 }11731174 /* unquoted second */1175 cp = skip_tree_prefix(second, line + llen - second);1176 if (!cp)1177 goto free_and_fail1;1178 if (line + llen - cp != first.len ||1179 memcmp(first.buf, cp, first.len))1180 goto free_and_fail1;1181 return strbuf_detach(&first, NULL);11821183 free_and_fail1:1184 strbuf_release(&first);1185 strbuf_release(&sp);1186 return NULL;1187 }11881189 /* unquoted first name */1190 name = skip_tree_prefix(line, llen);1191 if (!name)1192 return NULL;11931194 /*1195 * since the first name is unquoted, a dq if exists must be1196 * the beginning of the second name.1197 */1198 for (second = name; second < line + llen; second++) {1199 if (*second == '"') {1200 struct strbuf sp = STRBUF_INIT;1201 const char *np;12021203 if (unquote_c_style(&sp, second, NULL))1204 goto free_and_fail2;12051206 np = skip_tree_prefix(sp.buf, sp.len);1207 if (!np)1208 goto free_and_fail2;12091210 len = sp.buf + sp.len - np;1211 if (len < second - name &&1212 !strncmp(np, name, len) &&1213 isspace(name[len])) {1214 /* Good */1215 strbuf_remove(&sp, 0, np - sp.buf);1216 return strbuf_detach(&sp, NULL);1217 }12181219 free_and_fail2:1220 strbuf_release(&sp);1221 return NULL;1222 }1223 }12241225 /*1226 * Accept a name only if it shows up twice, exactly the same1227 * form.1228 */1229 second = strchr(name, '\n');1230 if (!second)1231 return NULL;1232 line_len = second - name;1233 for (len = 0 ; ; len++) {1234 switch (name[len]) {1235 default:1236 continue;1237 case '\n':1238 return NULL;1239 case '\t': case ' ':1240 /*1241 * Is this the separator between the preimage1242 * and the postimage pathname? Again, we are1243 * only interested in the case where there is1244 * no rename, as this is only to set def_name1245 * and a rename patch has the names elsewhere1246 * in an unambiguous form.1247 */1248 if (!name[len + 1])1249 return NULL; /* no postimage name */1250 second = skip_tree_prefix(name + len + 1,1251 line_len - (len + 1));1252 if (!second)1253 return NULL;1254 /*1255 * Does len bytes starting at "name" and "second"1256 * (that are separated by one HT or SP we just1257 * found) exactly match?1258 */1259 if (second[len] == '\n' && !strncmp(name, second, len))1260 return xmemdupz(name, len);1261 }1262 }1263}12641265/* Verify that we recognize the lines following a git header */1266static int parse_git_header(const char *line, int len, unsigned int size, struct patch *patch)1267{1268 unsigned long offset;12691270 /* A git diff has explicit new/delete information, so we don't guess */1271 patch->is_new = 0;1272 patch->is_delete = 0;12731274 /*1275 * Some things may not have the old name in the1276 * rest of the headers anywhere (pure mode changes,1277 * or removing or adding empty files), so we get1278 * the default name from the header.1279 */1280 patch->def_name = git_header_name(line, len);1281 if (patch->def_name && root) {1282 char *s = xmalloc(root_len + strlen(patch->def_name) + 1);1283 strcpy(s, root);1284 strcpy(s + root_len, patch->def_name);1285 free(patch->def_name);1286 patch->def_name = s;1287 }12881289 line += len;1290 size -= len;1291 linenr++;1292 for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {1293 static const struct opentry {1294 const char *str;1295 int (*fn)(const char *, struct patch *);1296 } optable[] = {1297 { "@@ -", gitdiff_hdrend },1298 { "--- ", gitdiff_oldname },1299 { "+++ ", gitdiff_newname },1300 { "old mode ", gitdiff_oldmode },1301 { "new mode ", gitdiff_newmode },1302 { "deleted file mode ", gitdiff_delete },1303 { "new file mode ", gitdiff_newfile },1304 { "copy from ", gitdiff_copysrc },1305 { "copy to ", gitdiff_copydst },1306 { "rename old ", gitdiff_renamesrc },1307 { "rename new ", gitdiff_renamedst },1308 { "rename from ", gitdiff_renamesrc },1309 { "rename to ", gitdiff_renamedst },1310 { "similarity index ", gitdiff_similarity },1311 { "dissimilarity index ", gitdiff_dissimilarity },1312 { "index ", gitdiff_index },1313 { "", gitdiff_unrecognized },1314 };1315 int i;13161317 len = linelen(line, size);1318 if (!len || line[len-1] != '\n')1319 break;1320 for (i = 0; i < ARRAY_SIZE(optable); i++) {1321 const struct opentry *p = optable + i;1322 int oplen = strlen(p->str);1323 if (len < oplen || memcmp(p->str, line, oplen))1324 continue;1325 if (p->fn(line + oplen, patch) < 0)1326 return offset;1327 break;1328 }1329 }13301331 return offset;1332}13331334static int parse_num(const char *line, unsigned long *p)1335{1336 char *ptr;13371338 if (!isdigit(*line))1339 return 0;1340 *p = strtoul(line, &ptr, 10);1341 return ptr - line;1342}13431344static int parse_range(const char *line, int len, int offset, const char *expect,1345 unsigned long *p1, unsigned long *p2)1346{1347 int digits, ex;13481349 if (offset < 0 || offset >= len)1350 return -1;1351 line += offset;1352 len -= offset;13531354 digits = parse_num(line, p1);1355 if (!digits)1356 return -1;13571358 offset += digits;1359 line += digits;1360 len -= digits;13611362 *p2 = 1;1363 if (*line == ',') {1364 digits = parse_num(line+1, p2);1365 if (!digits)1366 return -1;13671368 offset += digits+1;1369 line += digits+1;1370 len -= digits+1;1371 }13721373 ex = strlen(expect);1374 if (ex > len)1375 return -1;1376 if (memcmp(line, expect, ex))1377 return -1;13781379 return offset + ex;1380}13811382static void recount_diff(const char *line, int size, struct fragment *fragment)1383{1384 int oldlines = 0, newlines = 0, ret = 0;13851386 if (size < 1) {1387 warning("recount: ignore empty hunk");1388 return;1389 }13901391 for (;;) {1392 int len = linelen(line, size);1393 size -= len;1394 line += len;13951396 if (size < 1)1397 break;13981399 switch (*line) {1400 case ' ': case '\n':1401 newlines++;1402 /* fall through */1403 case '-':1404 oldlines++;1405 continue;1406 case '+':1407 newlines++;1408 continue;1409 case '\\':1410 continue;1411 case '@':1412 ret = size < 3 || !starts_with(line, "@@ ");1413 break;1414 case 'd':1415 ret = size < 5 || !starts_with(line, "diff ");1416 break;1417 default:1418 ret = -1;1419 break;1420 }1421 if (ret) {1422 warning(_("recount: unexpected line: %.*s"),1423 (int)linelen(line, size), line);1424 return;1425 }1426 break;1427 }1428 fragment->oldlines = oldlines;1429 fragment->newlines = newlines;1430}14311432/*1433 * Parse a unified diff fragment header of the1434 * form "@@ -a,b +c,d @@"1435 */1436static int parse_fragment_header(const char *line, int len, struct fragment *fragment)1437{1438 int offset;14391440 if (!len || line[len-1] != '\n')1441 return -1;14421443 /* Figure out the number of lines in a fragment */1444 offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);1445 offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);14461447 return offset;1448}14491450static int find_header(const char *line, unsigned long size, int *hdrsize, struct patch *patch)1451{1452 unsigned long offset, len;14531454 patch->is_toplevel_relative = 0;1455 patch->is_rename = patch->is_copy = 0;1456 patch->is_new = patch->is_delete = -1;1457 patch->old_mode = patch->new_mode = 0;1458 patch->old_name = patch->new_name = NULL;1459 for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {1460 unsigned long nextlen;14611462 len = linelen(line, size);1463 if (!len)1464 break;14651466 /* Testing this early allows us to take a few shortcuts.. */1467 if (len < 6)1468 continue;14691470 /*1471 * Make sure we don't find any unconnected patch fragments.1472 * That's a sign that we didn't find a header, and that a1473 * patch has become corrupted/broken up.1474 */1475 if (!memcmp("@@ -", line, 4)) {1476 struct fragment dummy;1477 if (parse_fragment_header(line, len, &dummy) < 0)1478 continue;1479 die(_("patch fragment without header at line %d: %.*s"),1480 linenr, (int)len-1, line);1481 }14821483 if (size < len + 6)1484 break;14851486 /*1487 * Git patch? It might not have a real patch, just a rename1488 * or mode change, so we handle that specially1489 */1490 if (!memcmp("diff --git ", line, 11)) {1491 int git_hdr_len = parse_git_header(line, len, size, patch);1492 if (git_hdr_len <= len)1493 continue;1494 if (!patch->old_name && !patch->new_name) {1495 if (!patch->def_name)1496 die(Q_("git diff header lacks filename information when removing "1497 "%d leading pathname component (line %d)",1498 "git diff header lacks filename information when removing "1499 "%d leading pathname components (line %d)",1500 p_value),1501 p_value, linenr);1502 patch->old_name = xstrdup(patch->def_name);1503 patch->new_name = xstrdup(patch->def_name);1504 }1505 if (!patch->is_delete && !patch->new_name)1506 die("git diff header lacks filename information "1507 "(line %d)", linenr);1508 patch->is_toplevel_relative = 1;1509 *hdrsize = git_hdr_len;1510 return offset;1511 }15121513 /* --- followed by +++ ? */1514 if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4))1515 continue;15161517 /*1518 * We only accept unified patches, so we want it to1519 * at least have "@@ -a,b +c,d @@\n", which is 14 chars1520 * minimum ("@@ -0,0 +1 @@\n" is the shortest).1521 */1522 nextlen = linelen(line + len, size - len);1523 if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))1524 continue;15251526 /* Ok, we'll consider it a patch */1527 parse_traditional_patch(line, line+len, patch);1528 *hdrsize = len + nextlen;1529 linenr += 2;1530 return offset;1531 }1532 return -1;1533}15341535static void record_ws_error(unsigned result, const char *line, int len, int linenr)1536{1537 char *err;15381539 if (!result)1540 return;15411542 whitespace_error++;1543 if (squelch_whitespace_errors &&1544 squelch_whitespace_errors < whitespace_error)1545 return;15461547 err = whitespace_error_string(result);1548 fprintf(stderr, "%s:%d: %s.\n%.*s\n",1549 patch_input_file, linenr, err, len, line);1550 free(err);1551}15521553static void check_whitespace(const char *line, int len, unsigned ws_rule)1554{1555 unsigned result = ws_check(line + 1, len - 1, ws_rule);15561557 record_ws_error(result, line + 1, len - 2, linenr);1558}15591560/*1561 * Parse a unified diff. Note that this really needs to parse each1562 * fragment separately, since the only way to know the difference1563 * between a "---" that is part of a patch, and a "---" that starts1564 * the next patch is to look at the line counts..1565 */1566static int parse_fragment(const char *line, unsigned long size,1567 struct patch *patch, struct fragment *fragment)1568{1569 int added, deleted;1570 int len = linelen(line, size), offset;1571 unsigned long oldlines, newlines;1572 unsigned long leading, trailing;15731574 offset = parse_fragment_header(line, len, fragment);1575 if (offset < 0)1576 return -1;1577 if (offset > 0 && patch->recount)1578 recount_diff(line + offset, size - offset, fragment);1579 oldlines = fragment->oldlines;1580 newlines = fragment->newlines;1581 leading = 0;1582 trailing = 0;15831584 /* Parse the thing.. */1585 line += len;1586 size -= len;1587 linenr++;1588 added = deleted = 0;1589 for (offset = len;1590 0 < size;1591 offset += len, size -= len, line += len, linenr++) {1592 if (!oldlines && !newlines)1593 break;1594 len = linelen(line, size);1595 if (!len || line[len-1] != '\n')1596 return -1;1597 switch (*line) {1598 default:1599 return -1;1600 case '\n': /* newer GNU diff, an empty context line */1601 case ' ':1602 oldlines--;1603 newlines--;1604 if (!deleted && !added)1605 leading++;1606 trailing++;1607 break;1608 case '-':1609 if (apply_in_reverse &&1610 ws_error_action != nowarn_ws_error)1611 check_whitespace(line, len, patch->ws_rule);1612 deleted++;1613 oldlines--;1614 trailing = 0;1615 break;1616 case '+':1617 if (!apply_in_reverse &&1618 ws_error_action != nowarn_ws_error)1619 check_whitespace(line, len, patch->ws_rule);1620 added++;1621 newlines--;1622 trailing = 0;1623 break;16241625 /*1626 * We allow "\ No newline at end of file". Depending1627 * on locale settings when the patch was produced we1628 * don't know what this line looks like. The only1629 * thing we do know is that it begins with "\ ".1630 * Checking for 12 is just for sanity check -- any1631 * l10n of "\ No newline..." is at least that long.1632 */1633 case '\\':1634 if (len < 12 || memcmp(line, "\\ ", 2))1635 return -1;1636 break;1637 }1638 }1639 if (oldlines || newlines)1640 return -1;1641 fragment->leading = leading;1642 fragment->trailing = trailing;16431644 /*1645 * If a fragment ends with an incomplete line, we failed to include1646 * it in the above loop because we hit oldlines == newlines == 01647 * before seeing it.1648 */1649 if (12 < size && !memcmp(line, "\\ ", 2))1650 offset += linelen(line, size);16511652 patch->lines_added += added;1653 patch->lines_deleted += deleted;16541655 if (0 < patch->is_new && oldlines)1656 return error(_("new file depends on old contents"));1657 if (0 < patch->is_delete && newlines)1658 return error(_("deleted file still has contents"));1659 return offset;1660}16611662/*1663 * We have seen "diff --git a/... b/..." header (or a traditional patch1664 * header). Read hunks that belong to this patch into fragments and hang1665 * them to the given patch structure.1666 *1667 * The (fragment->patch, fragment->size) pair points into the memory given1668 * by the caller, not a copy, when we return.1669 */1670static int parse_single_patch(const char *line, unsigned long size, struct patch *patch)1671{1672 unsigned long offset = 0;1673 unsigned long oldlines = 0, newlines = 0, context = 0;1674 struct fragment **fragp = &patch->fragments;16751676 while (size > 4 && !memcmp(line, "@@ -", 4)) {1677 struct fragment *fragment;1678 int len;16791680 fragment = xcalloc(1, sizeof(*fragment));1681 fragment->linenr = linenr;1682 len = parse_fragment(line, size, patch, fragment);1683 if (len <= 0)1684 die(_("corrupt patch at line %d"), linenr);1685 fragment->patch = line;1686 fragment->size = len;1687 oldlines += fragment->oldlines;1688 newlines += fragment->newlines;1689 context += fragment->leading + fragment->trailing;16901691 *fragp = fragment;1692 fragp = &fragment->next;16931694 offset += len;1695 line += len;1696 size -= len;1697 }16981699 /*1700 * If something was removed (i.e. we have old-lines) it cannot1701 * be creation, and if something was added it cannot be1702 * deletion. However, the reverse is not true; --unified=01703 * patches that only add are not necessarily creation even1704 * though they do not have any old lines, and ones that only1705 * delete are not necessarily deletion.1706 *1707 * Unfortunately, a real creation/deletion patch do _not_ have1708 * any context line by definition, so we cannot safely tell it1709 * apart with --unified=0 insanity. At least if the patch has1710 * more than one hunk it is not creation or deletion.1711 */1712 if (patch->is_new < 0 &&1713 (oldlines || (patch->fragments && patch->fragments->next)))1714 patch->is_new = 0;1715 if (patch->is_delete < 0 &&1716 (newlines || (patch->fragments && patch->fragments->next)))1717 patch->is_delete = 0;17181719 if (0 < patch->is_new && oldlines)1720 die(_("new file %s depends on old contents"), patch->new_name);1721 if (0 < patch->is_delete && newlines)1722 die(_("deleted file %s still has contents"), patch->old_name);1723 if (!patch->is_delete && !newlines && context)1724 fprintf_ln(stderr,1725 _("** warning: "1726 "file %s becomes empty but is not deleted"),1727 patch->new_name);17281729 return offset;1730}17311732static inline int metadata_changes(struct patch *patch)1733{1734 return patch->is_rename > 0 ||1735 patch->is_copy > 0 ||1736 patch->is_new > 0 ||1737 patch->is_delete ||1738 (patch->old_mode && patch->new_mode &&1739 patch->old_mode != patch->new_mode);1740}17411742static char *inflate_it(const void *data, unsigned long size,1743 unsigned long inflated_size)1744{1745 git_zstream stream;1746 void *out;1747 int st;17481749 memset(&stream, 0, sizeof(stream));17501751 stream.next_in = (unsigned char *)data;1752 stream.avail_in = size;1753 stream.next_out = out = xmalloc(inflated_size);1754 stream.avail_out = inflated_size;1755 git_inflate_init(&stream);1756 st = git_inflate(&stream, Z_FINISH);1757 git_inflate_end(&stream);1758 if ((st != Z_STREAM_END) || stream.total_out != inflated_size) {1759 free(out);1760 return NULL;1761 }1762 return out;1763}17641765/*1766 * Read a binary hunk and return a new fragment; fragment->patch1767 * points at an allocated memory that the caller must free, so1768 * it is marked as "->free_patch = 1".1769 */1770static struct fragment *parse_binary_hunk(char **buf_p,1771 unsigned long *sz_p,1772 int *status_p,1773 int *used_p)1774{1775 /*1776 * Expect a line that begins with binary patch method ("literal"1777 * or "delta"), followed by the length of data before deflating.1778 * a sequence of 'length-byte' followed by base-85 encoded data1779 * should follow, terminated by a newline.1780 *1781 * Each 5-byte sequence of base-85 encodes up to 4 bytes,1782 * and we would limit the patch line to 66 characters,1783 * so one line can fit up to 13 groups that would decode1784 * to 52 bytes max. The length byte 'A'-'Z' corresponds1785 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.1786 */1787 int llen, used;1788 unsigned long size = *sz_p;1789 char *buffer = *buf_p;1790 int patch_method;1791 unsigned long origlen;1792 char *data = NULL;1793 int hunk_size = 0;1794 struct fragment *frag;17951796 llen = linelen(buffer, size);1797 used = llen;17981799 *status_p = 0;18001801 if (starts_with(buffer, "delta ")) {1802 patch_method = BINARY_DELTA_DEFLATED;1803 origlen = strtoul(buffer + 6, NULL, 10);1804 }1805 else if (starts_with(buffer, "literal ")) {1806 patch_method = BINARY_LITERAL_DEFLATED;1807 origlen = strtoul(buffer + 8, NULL, 10);1808 }1809 else1810 return NULL;18111812 linenr++;1813 buffer += llen;1814 while (1) {1815 int byte_length, max_byte_length, newsize;1816 llen = linelen(buffer, size);1817 used += llen;1818 linenr++;1819 if (llen == 1) {1820 /* consume the blank line */1821 buffer++;1822 size--;1823 break;1824 }1825 /*1826 * Minimum line is "A00000\n" which is 7-byte long,1827 * and the line length must be multiple of 5 plus 2.1828 */1829 if ((llen < 7) || (llen-2) % 5)1830 goto corrupt;1831 max_byte_length = (llen - 2) / 5 * 4;1832 byte_length = *buffer;1833 if ('A' <= byte_length && byte_length <= 'Z')1834 byte_length = byte_length - 'A' + 1;1835 else if ('a' <= byte_length && byte_length <= 'z')1836 byte_length = byte_length - 'a' + 27;1837 else1838 goto corrupt;1839 /* if the input length was not multiple of 4, we would1840 * have filler at the end but the filler should never1841 * exceed 3 bytes1842 */1843 if (max_byte_length < byte_length ||1844 byte_length <= max_byte_length - 4)1845 goto corrupt;1846 newsize = hunk_size + byte_length;1847 data = xrealloc(data, newsize);1848 if (decode_85(data + hunk_size, buffer + 1, byte_length))1849 goto corrupt;1850 hunk_size = newsize;1851 buffer += llen;1852 size -= llen;1853 }18541855 frag = xcalloc(1, sizeof(*frag));1856 frag->patch = inflate_it(data, hunk_size, origlen);1857 frag->free_patch = 1;1858 if (!frag->patch)1859 goto corrupt;1860 free(data);1861 frag->size = origlen;1862 *buf_p = buffer;1863 *sz_p = size;1864 *used_p = used;1865 frag->binary_patch_method = patch_method;1866 return frag;18671868 corrupt:1869 free(data);1870 *status_p = -1;1871 error(_("corrupt binary patch at line %d: %.*s"),1872 linenr-1, llen-1, buffer);1873 return NULL;1874}18751876static int parse_binary(char *buffer, unsigned long size, struct patch *patch)1877{1878 /*1879 * We have read "GIT binary patch\n"; what follows is a line1880 * that says the patch method (currently, either "literal" or1881 * "delta") and the length of data before deflating; a1882 * sequence of 'length-byte' followed by base-85 encoded data1883 * follows.1884 *1885 * When a binary patch is reversible, there is another binary1886 * hunk in the same format, starting with patch method (either1887 * "literal" or "delta") with the length of data, and a sequence1888 * of length-byte + base-85 encoded data, terminated with another1889 * empty line. This data, when applied to the postimage, produces1890 * the preimage.1891 */1892 struct fragment *forward;1893 struct fragment *reverse;1894 int status;1895 int used, used_1;18961897 forward = parse_binary_hunk(&buffer, &size, &status, &used);1898 if (!forward && !status)1899 /* there has to be one hunk (forward hunk) */1900 return error(_("unrecognized binary patch at line %d"), linenr-1);1901 if (status)1902 /* otherwise we already gave an error message */1903 return status;19041905 reverse = parse_binary_hunk(&buffer, &size, &status, &used_1);1906 if (reverse)1907 used += used_1;1908 else if (status) {1909 /*1910 * Not having reverse hunk is not an error, but having1911 * a corrupt reverse hunk is.1912 */1913 free((void*) forward->patch);1914 free(forward);1915 return status;1916 }1917 forward->next = reverse;1918 patch->fragments = forward;1919 patch->is_binary = 1;1920 return used;1921}19221923static void prefix_one(char **name)1924{1925 char *old_name = *name;1926 if (!old_name)1927 return;1928 *name = xstrdup(prefix_filename(prefix, prefix_length, *name));1929 free(old_name);1930}19311932static void prefix_patch(struct patch *p)1933{1934 if (!prefix || p->is_toplevel_relative)1935 return;1936 prefix_one(&p->new_name);1937 prefix_one(&p->old_name);1938}19391940/*1941 * Read the patch text in "buffer" that extends for "size" bytes; stop1942 * reading after seeing a single patch (i.e. changes to a single file).1943 * Create fragments (i.e. patch hunks) and hang them to the given patch.1944 * Return the number of bytes consumed, so that the caller can call us1945 * again for the next patch.1946 */1947static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)1948{1949 int hdrsize, patchsize;1950 int offset = find_header(buffer, size, &hdrsize, patch);19511952 if (offset < 0)1953 return offset;19541955 prefix_patch(patch);19561957 patch->ws_rule = whitespace_rule(patch->new_name1958 ? patch->new_name1959 : patch->old_name);19601961 patchsize = parse_single_patch(buffer + offset + hdrsize,1962 size - offset - hdrsize, patch);19631964 if (!patchsize) {1965 static const char *binhdr[] = {1966 "Binary files ",1967 "Files ",1968 NULL,1969 };1970 static const char git_binary[] = "GIT binary patch\n";1971 int i;1972 int hd = hdrsize + offset;1973 unsigned long llen = linelen(buffer + hd, size - hd);19741975 if (llen == sizeof(git_binary) - 1 &&1976 !memcmp(git_binary, buffer + hd, llen)) {1977 int used;1978 linenr++;1979 used = parse_binary(buffer + hd + llen,1980 size - hd - llen, patch);1981 if (used)1982 patchsize = used + llen;1983 else1984 patchsize = 0;1985 }1986 else if (!memcmp(" differ\n", buffer + hd + llen - 8, 8)) {1987 for (i = 0; binhdr[i]; i++) {1988 int len = strlen(binhdr[i]);1989 if (len < size - hd &&1990 !memcmp(binhdr[i], buffer + hd, len)) {1991 linenr++;1992 patch->is_binary = 1;1993 patchsize = llen;1994 break;1995 }1996 }1997 }19981999 /* Empty patch cannot be applied if it is a text patch2000 * without metadata change. A binary patch appears2001 * empty to us here.2002 */2003 if ((apply || check) &&2004 (!patch->is_binary && !metadata_changes(patch)))2005 die(_("patch with only garbage at line %d"), linenr);2006 }20072008 return offset + hdrsize + patchsize;2009}20102011#define swap(a,b) myswap((a),(b),sizeof(a))20122013#define myswap(a, b, size) do { \2014 unsigned char mytmp[size]; \2015 memcpy(mytmp, &a, size); \2016 memcpy(&a, &b, size); \2017 memcpy(&b, mytmp, size); \2018} while (0)20192020static void reverse_patches(struct patch *p)2021{2022 for (; p; p = p->next) {2023 struct fragment *frag = p->fragments;20242025 swap(p->new_name, p->old_name);2026 swap(p->new_mode, p->old_mode);2027 swap(p->is_new, p->is_delete);2028 swap(p->lines_added, p->lines_deleted);2029 swap(p->old_sha1_prefix, p->new_sha1_prefix);20302031 for (; frag; frag = frag->next) {2032 swap(frag->newpos, frag->oldpos);2033 swap(frag->newlines, frag->oldlines);2034 }2035 }2036}20372038static const char pluses[] =2039"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";2040static const char minuses[]=2041"----------------------------------------------------------------------";20422043static void show_stats(struct patch *patch)2044{2045 struct strbuf qname = STRBUF_INIT;2046 char *cp = patch->new_name ? patch->new_name : patch->old_name;2047 int max, add, del;20482049 quote_c_style(cp, &qname, NULL, 0);20502051 /*2052 * "scale" the filename2053 */2054 max = max_len;2055 if (max > 50)2056 max = 50;20572058 if (qname.len > max) {2059 cp = strchr(qname.buf + qname.len + 3 - max, '/');2060 if (!cp)2061 cp = qname.buf + qname.len + 3 - max;2062 strbuf_splice(&qname, 0, cp - qname.buf, "...", 3);2063 }20642065 if (patch->is_binary) {2066 printf(" %-*s | Bin\n", max, qname.buf);2067 strbuf_release(&qname);2068 return;2069 }20702071 printf(" %-*s |", max, qname.buf);2072 strbuf_release(&qname);20732074 /*2075 * scale the add/delete2076 */2077 max = max + max_change > 70 ? 70 - max : max_change;2078 add = patch->lines_added;2079 del = patch->lines_deleted;20802081 if (max_change > 0) {2082 int total = ((add + del) * max + max_change / 2) / max_change;2083 add = (add * max + max_change / 2) / max_change;2084 del = total - add;2085 }2086 printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,2087 add, pluses, del, minuses);2088}20892090static int read_old_data(struct stat *st, const char *path, struct strbuf *buf)2091{2092 switch (st->st_mode & S_IFMT) {2093 case S_IFLNK:2094 if (strbuf_readlink(buf, path, st->st_size) < 0)2095 return error(_("unable to read symlink %s"), path);2096 return 0;2097 case S_IFREG:2098 if (strbuf_read_file(buf, path, st->st_size) != st->st_size)2099 return error(_("unable to open or read %s"), path);2100 convert_to_git(path, buf->buf, buf->len, buf, 0);2101 return 0;2102 default:2103 return -1;2104 }2105}21062107/*2108 * Update the preimage, and the common lines in postimage,2109 * from buffer buf of length len. If postlen is 0 the postimage2110 * is updated in place, otherwise it's updated on a new buffer2111 * of length postlen2112 */21132114static void update_pre_post_images(struct image *preimage,2115 struct image *postimage,2116 char *buf,2117 size_t len, size_t postlen)2118{2119 int i, ctx, reduced;2120 char *new, *old, *fixed;2121 struct image fixed_preimage;21222123 /*2124 * Update the preimage with whitespace fixes. Note that we2125 * are not losing preimage->buf -- apply_one_fragment() will2126 * free "oldlines".2127 */2128 prepare_image(&fixed_preimage, buf, len, 1);2129 assert(postlen2130 ? fixed_preimage.nr == preimage->nr2131 : fixed_preimage.nr <= preimage->nr);2132 for (i = 0; i < fixed_preimage.nr; i++)2133 fixed_preimage.line[i].flag = preimage->line[i].flag;2134 free(preimage->line_allocated);2135 *preimage = fixed_preimage;21362137 /*2138 * Adjust the common context lines in postimage. This can be2139 * done in-place when we are shrinking it with whitespace2140 * fixing, but needs a new buffer when ignoring whitespace or2141 * expanding leading tabs to spaces.2142 *2143 * We trust the caller to tell us if the update can be done2144 * in place (postlen==0) or not.2145 */2146 old = postimage->buf;2147 if (postlen)2148 new = postimage->buf = xmalloc(postlen);2149 else2150 new = old;2151 fixed = preimage->buf;21522153 for (i = reduced = ctx = 0; i < postimage->nr; i++) {2154 size_t len = postimage->line[i].len;2155 if (!(postimage->line[i].flag & LINE_COMMON)) {2156 /* an added line -- no counterparts in preimage */2157 memmove(new, old, len);2158 old += len;2159 new += len;2160 continue;2161 }21622163 /* a common context -- skip it in the original postimage */2164 old += len;21652166 /* and find the corresponding one in the fixed preimage */2167 while (ctx < preimage->nr &&2168 !(preimage->line[ctx].flag & LINE_COMMON)) {2169 fixed += preimage->line[ctx].len;2170 ctx++;2171 }21722173 /*2174 * preimage is expected to run out, if the caller2175 * fixed addition of trailing blank lines.2176 */2177 if (preimage->nr <= ctx) {2178 reduced++;2179 continue;2180 }21812182 /* and copy it in, while fixing the line length */2183 len = preimage->line[ctx].len;2184 memcpy(new, fixed, len);2185 new += len;2186 fixed += len;2187 postimage->line[i].len = len;2188 ctx++;2189 }21902191 /* Fix the length of the whole thing */2192 postimage->len = new - postimage->buf;2193 postimage->nr -= reduced;2194}21952196static int match_fragment(struct image *img,2197 struct image *preimage,2198 struct image *postimage,2199 unsigned long try,2200 int try_lno,2201 unsigned ws_rule,2202 int match_beginning, int match_end)2203{2204 int i;2205 char *fixed_buf, *buf, *orig, *target;2206 struct strbuf fixed;2207 size_t fixed_len, postlen;2208 int preimage_limit;22092210 if (preimage->nr + try_lno <= img->nr) {2211 /*2212 * The hunk falls within the boundaries of img.2213 */2214 preimage_limit = preimage->nr;2215 if (match_end && (preimage->nr + try_lno != img->nr))2216 return 0;2217 } else if (ws_error_action == correct_ws_error &&2218 (ws_rule & WS_BLANK_AT_EOF)) {2219 /*2220 * This hunk extends beyond the end of img, and we are2221 * removing blank lines at the end of the file. This2222 * many lines from the beginning of the preimage must2223 * match with img, and the remainder of the preimage2224 * must be blank.2225 */2226 preimage_limit = img->nr - try_lno;2227 } else {2228 /*2229 * The hunk extends beyond the end of the img and2230 * we are not removing blanks at the end, so we2231 * should reject the hunk at this position.2232 */2233 return 0;2234 }22352236 if (match_beginning && try_lno)2237 return 0;22382239 /* Quick hash check */2240 for (i = 0; i < preimage_limit; i++)2241 if ((img->line[try_lno + i].flag & LINE_PATCHED) ||2242 (preimage->line[i].hash != img->line[try_lno + i].hash))2243 return 0;22442245 if (preimage_limit == preimage->nr) {2246 /*2247 * Do we have an exact match? If we were told to match2248 * at the end, size must be exactly at try+fragsize,2249 * otherwise try+fragsize must be still within the preimage,2250 * and either case, the old piece should match the preimage2251 * exactly.2252 */2253 if ((match_end2254 ? (try + preimage->len == img->len)2255 : (try + preimage->len <= img->len)) &&2256 !memcmp(img->buf + try, preimage->buf, preimage->len))2257 return 1;2258 } else {2259 /*2260 * The preimage extends beyond the end of img, so2261 * there cannot be an exact match.2262 *2263 * There must be one non-blank context line that match2264 * a line before the end of img.2265 */2266 char *buf_end;22672268 buf = preimage->buf;2269 buf_end = buf;2270 for (i = 0; i < preimage_limit; i++)2271 buf_end += preimage->line[i].len;22722273 for ( ; buf < buf_end; buf++)2274 if (!isspace(*buf))2275 break;2276 if (buf == buf_end)2277 return 0;2278 }22792280 /*2281 * No exact match. If we are ignoring whitespace, run a line-by-line2282 * fuzzy matching. We collect all the line length information because2283 * we need it to adjust whitespace if we match.2284 */2285 if (ws_ignore_action == ignore_ws_change) {2286 size_t imgoff = 0;2287 size_t preoff = 0;2288 size_t postlen = postimage->len;2289 size_t extra_chars;2290 char *preimage_eof;2291 char *preimage_end;2292 for (i = 0; i < preimage_limit; i++) {2293 size_t prelen = preimage->line[i].len;2294 size_t imglen = img->line[try_lno+i].len;22952296 if (!fuzzy_matchlines(img->buf + try + imgoff, imglen,2297 preimage->buf + preoff, prelen))2298 return 0;2299 if (preimage->line[i].flag & LINE_COMMON)2300 postlen += imglen - prelen;2301 imgoff += imglen;2302 preoff += prelen;2303 }23042305 /*2306 * Ok, the preimage matches with whitespace fuzz.2307 *2308 * imgoff now holds the true length of the target that2309 * matches the preimage before the end of the file.2310 *2311 * Count the number of characters in the preimage that fall2312 * beyond the end of the file and make sure that all of them2313 * are whitespace characters. (This can only happen if2314 * we are removing blank lines at the end of the file.)2315 */2316 buf = preimage_eof = preimage->buf + preoff;2317 for ( ; i < preimage->nr; i++)2318 preoff += preimage->line[i].len;2319 preimage_end = preimage->buf + preoff;2320 for ( ; buf < preimage_end; buf++)2321 if (!isspace(*buf))2322 return 0;23232324 /*2325 * Update the preimage and the common postimage context2326 * lines to use the same whitespace as the target.2327 * If whitespace is missing in the target (i.e.2328 * if the preimage extends beyond the end of the file),2329 * use the whitespace from the preimage.2330 */2331 extra_chars = preimage_end - preimage_eof;2332 strbuf_init(&fixed, imgoff + extra_chars);2333 strbuf_add(&fixed, img->buf + try, imgoff);2334 strbuf_add(&fixed, preimage_eof, extra_chars);2335 fixed_buf = strbuf_detach(&fixed, &fixed_len);2336 update_pre_post_images(preimage, postimage,2337 fixed_buf, fixed_len, postlen);2338 return 1;2339 }23402341 if (ws_error_action != correct_ws_error)2342 return 0;23432344 /*2345 * The hunk does not apply byte-by-byte, but the hash says2346 * it might with whitespace fuzz. We haven't been asked to2347 * ignore whitespace, we were asked to correct whitespace2348 * errors, so let's try matching after whitespace correction.2349 *2350 * The preimage may extend beyond the end of the file,2351 * but in this loop we will only handle the part of the2352 * preimage that falls within the file.2353 */2354 strbuf_init(&fixed, preimage->len + 1);2355 orig = preimage->buf;2356 target = img->buf + try;2357 postlen = 0;2358 for (i = 0; i < preimage_limit; i++) {2359 size_t oldlen = preimage->line[i].len;2360 size_t tgtlen = img->line[try_lno + i].len;2361 size_t fixstart = fixed.len;2362 struct strbuf tgtfix;2363 int match;23642365 /* Try fixing the line in the preimage */2366 ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);23672368 /* Try fixing the line in the target */2369 strbuf_init(&tgtfix, tgtlen);2370 ws_fix_copy(&tgtfix, target, tgtlen, ws_rule, NULL);23712372 /*2373 * If they match, either the preimage was based on2374 * a version before our tree fixed whitespace breakage,2375 * or we are lacking a whitespace-fix patch the tree2376 * the preimage was based on already had (i.e. target2377 * has whitespace breakage, the preimage doesn't).2378 * In either case, we are fixing the whitespace breakages2379 * so we might as well take the fix together with their2380 * real change.2381 */2382 match = (tgtfix.len == fixed.len - fixstart &&2383 !memcmp(tgtfix.buf, fixed.buf + fixstart,2384 fixed.len - fixstart));2385 postlen += tgtfix.len;23862387 strbuf_release(&tgtfix);2388 if (!match)2389 goto unmatch_exit;23902391 orig += oldlen;2392 target += tgtlen;2393 }239423952396 /*2397 * Now handle the lines in the preimage that falls beyond the2398 * end of the file (if any). They will only match if they are2399 * empty or only contain whitespace (if WS_BLANK_AT_EOL is2400 * false).2401 */2402 for ( ; i < preimage->nr; i++) {2403 size_t fixstart = fixed.len; /* start of the fixed preimage */2404 size_t oldlen = preimage->line[i].len;2405 int j;24062407 /* Try fixing the line in the preimage */2408 ws_fix_copy(&fixed, orig, oldlen, ws_rule, NULL);24092410 for (j = fixstart; j < fixed.len; j++)2411 if (!isspace(fixed.buf[j]))2412 goto unmatch_exit;24132414 orig += oldlen;2415 }24162417 /*2418 * Yes, the preimage is based on an older version that still2419 * has whitespace breakages unfixed, and fixing them makes the2420 * hunk match. Update the context lines in the postimage.2421 */2422 fixed_buf = strbuf_detach(&fixed, &fixed_len);2423 if (postlen < postimage->len)2424 postlen = 0;2425 update_pre_post_images(preimage, postimage,2426 fixed_buf, fixed_len, postlen);2427 return 1;24282429 unmatch_exit:2430 strbuf_release(&fixed);2431 return 0;2432}24332434static int find_pos(struct image *img,2435 struct image *preimage,2436 struct image *postimage,2437 int line,2438 unsigned ws_rule,2439 int match_beginning, int match_end)2440{2441 int i;2442 unsigned long backwards, forwards, try;2443 int backwards_lno, forwards_lno, try_lno;24442445 /*2446 * If match_beginning or match_end is specified, there is no2447 * point starting from a wrong line that will never match and2448 * wander around and wait for a match at the specified end.2449 */2450 if (match_beginning)2451 line = 0;2452 else if (match_end)2453 line = img->nr - preimage->nr;24542455 /*2456 * Because the comparison is unsigned, the following test2457 * will also take care of a negative line number that can2458 * result when match_end and preimage is larger than the target.2459 */2460 if ((size_t) line > img->nr)2461 line = img->nr;24622463 try = 0;2464 for (i = 0; i < line; i++)2465 try += img->line[i].len;24662467 /*2468 * There's probably some smart way to do this, but I'll leave2469 * that to the smart and beautiful people. I'm simple and stupid.2470 */2471 backwards = try;2472 backwards_lno = line;2473 forwards = try;2474 forwards_lno = line;2475 try_lno = line;24762477 for (i = 0; ; i++) {2478 if (match_fragment(img, preimage, postimage,2479 try, try_lno, ws_rule,2480 match_beginning, match_end))2481 return try_lno;24822483 again:2484 if (backwards_lno == 0 && forwards_lno == img->nr)2485 break;24862487 if (i & 1) {2488 if (backwards_lno == 0) {2489 i++;2490 goto again;2491 }2492 backwards_lno--;2493 backwards -= img->line[backwards_lno].len;2494 try = backwards;2495 try_lno = backwards_lno;2496 } else {2497 if (forwards_lno == img->nr) {2498 i++;2499 goto again;2500 }2501 forwards += img->line[forwards_lno].len;2502 forwards_lno++;2503 try = forwards;2504 try_lno = forwards_lno;2505 }25062507 }2508 return -1;2509}25102511static void remove_first_line(struct image *img)2512{2513 img->buf += img->line[0].len;2514 img->len -= img->line[0].len;2515 img->line++;2516 img->nr--;2517}25182519static void remove_last_line(struct image *img)2520{2521 img->len -= img->line[--img->nr].len;2522}25232524/*2525 * The change from "preimage" and "postimage" has been found to2526 * apply at applied_pos (counts in line numbers) in "img".2527 * Update "img" to remove "preimage" and replace it with "postimage".2528 */2529static void update_image(struct image *img,2530 int applied_pos,2531 struct image *preimage,2532 struct image *postimage)2533{2534 /*2535 * remove the copy of preimage at offset in img2536 * and replace it with postimage2537 */2538 int i, nr;2539 size_t remove_count, insert_count, applied_at = 0;2540 char *result;2541 int preimage_limit;25422543 /*2544 * If we are removing blank lines at the end of img,2545 * the preimage may extend beyond the end.2546 * If that is the case, we must be careful only to2547 * remove the part of the preimage that falls within2548 * the boundaries of img. Initialize preimage_limit2549 * to the number of lines in the preimage that falls2550 * within the boundaries.2551 */2552 preimage_limit = preimage->nr;2553 if (preimage_limit > img->nr - applied_pos)2554 preimage_limit = img->nr - applied_pos;25552556 for (i = 0; i < applied_pos; i++)2557 applied_at += img->line[i].len;25582559 remove_count = 0;2560 for (i = 0; i < preimage_limit; i++)2561 remove_count += img->line[applied_pos + i].len;2562 insert_count = postimage->len;25632564 /* Adjust the contents */2565 result = xmalloc(img->len + insert_count - remove_count + 1);2566 memcpy(result, img->buf, applied_at);2567 memcpy(result + applied_at, postimage->buf, postimage->len);2568 memcpy(result + applied_at + postimage->len,2569 img->buf + (applied_at + remove_count),2570 img->len - (applied_at + remove_count));2571 free(img->buf);2572 img->buf = result;2573 img->len += insert_count - remove_count;2574 result[img->len] = '\0';25752576 /* Adjust the line table */2577 nr = img->nr + postimage->nr - preimage_limit;2578 if (preimage_limit < postimage->nr) {2579 /*2580 * NOTE: this knows that we never call remove_first_line()2581 * on anything other than pre/post image.2582 */2583 img->line = xrealloc(img->line, nr * sizeof(*img->line));2584 img->line_allocated = img->line;2585 }2586 if (preimage_limit != postimage->nr)2587 memmove(img->line + applied_pos + postimage->nr,2588 img->line + applied_pos + preimage_limit,2589 (img->nr - (applied_pos + preimage_limit)) *2590 sizeof(*img->line));2591 memcpy(img->line + applied_pos,2592 postimage->line,2593 postimage->nr * sizeof(*img->line));2594 if (!allow_overlap)2595 for (i = 0; i < postimage->nr; i++)2596 img->line[applied_pos + i].flag |= LINE_PATCHED;2597 img->nr = nr;2598}25992600/*2601 * Use the patch-hunk text in "frag" to prepare two images (preimage and2602 * postimage) for the hunk. Find lines that match "preimage" in "img" and2603 * replace the part of "img" with "postimage" text.2604 */2605static int apply_one_fragment(struct image *img, struct fragment *frag,2606 int inaccurate_eof, unsigned ws_rule,2607 int nth_fragment)2608{2609 int match_beginning, match_end;2610 const char *patch = frag->patch;2611 int size = frag->size;2612 char *old, *oldlines;2613 struct strbuf newlines;2614 int new_blank_lines_at_end = 0;2615 int found_new_blank_lines_at_end = 0;2616 int hunk_linenr = frag->linenr;2617 unsigned long leading, trailing;2618 int pos, applied_pos;2619 struct image preimage;2620 struct image postimage;26212622 memset(&preimage, 0, sizeof(preimage));2623 memset(&postimage, 0, sizeof(postimage));2624 oldlines = xmalloc(size);2625 strbuf_init(&newlines, size);26262627 old = oldlines;2628 while (size > 0) {2629 char first;2630 int len = linelen(patch, size);2631 int plen;2632 int added_blank_line = 0;2633 int is_blank_context = 0;2634 size_t start;26352636 if (!len)2637 break;26382639 /*2640 * "plen" is how much of the line we should use for2641 * the actual patch data. Normally we just remove the2642 * first character on the line, but if the line is2643 * followed by "\ No newline", then we also remove the2644 * last one (which is the newline, of course).2645 */2646 plen = len - 1;2647 if (len < size && patch[len] == '\\')2648 plen--;2649 first = *patch;2650 if (apply_in_reverse) {2651 if (first == '-')2652 first = '+';2653 else if (first == '+')2654 first = '-';2655 }26562657 switch (first) {2658 case '\n':2659 /* Newer GNU diff, empty context line */2660 if (plen < 0)2661 /* ... followed by '\No newline'; nothing */2662 break;2663 *old++ = '\n';2664 strbuf_addch(&newlines, '\n');2665 add_line_info(&preimage, "\n", 1, LINE_COMMON);2666 add_line_info(&postimage, "\n", 1, LINE_COMMON);2667 is_blank_context = 1;2668 break;2669 case ' ':2670 if (plen && (ws_rule & WS_BLANK_AT_EOF) &&2671 ws_blank_line(patch + 1, plen, ws_rule))2672 is_blank_context = 1;2673 case '-':2674 memcpy(old, patch + 1, plen);2675 add_line_info(&preimage, old, plen,2676 (first == ' ' ? LINE_COMMON : 0));2677 old += plen;2678 if (first == '-')2679 break;2680 /* Fall-through for ' ' */2681 case '+':2682 /* --no-add does not add new lines */2683 if (first == '+' && no_add)2684 break;26852686 start = newlines.len;2687 if (first != '+' ||2688 !whitespace_error ||2689 ws_error_action != correct_ws_error) {2690 strbuf_add(&newlines, patch + 1, plen);2691 }2692 else {2693 ws_fix_copy(&newlines, patch + 1, plen, ws_rule, &applied_after_fixing_ws);2694 }2695 add_line_info(&postimage, newlines.buf + start, newlines.len - start,2696 (first == '+' ? 0 : LINE_COMMON));2697 if (first == '+' &&2698 (ws_rule & WS_BLANK_AT_EOF) &&2699 ws_blank_line(patch + 1, plen, ws_rule))2700 added_blank_line = 1;2701 break;2702 case '@': case '\\':2703 /* Ignore it, we already handled it */2704 break;2705 default:2706 if (apply_verbosely)2707 error(_("invalid start of line: '%c'"), first);2708 return -1;2709 }2710 if (added_blank_line) {2711 if (!new_blank_lines_at_end)2712 found_new_blank_lines_at_end = hunk_linenr;2713 new_blank_lines_at_end++;2714 }2715 else if (is_blank_context)2716 ;2717 else2718 new_blank_lines_at_end = 0;2719 patch += len;2720 size -= len;2721 hunk_linenr++;2722 }2723 if (inaccurate_eof &&2724 old > oldlines && old[-1] == '\n' &&2725 newlines.len > 0 && newlines.buf[newlines.len - 1] == '\n') {2726 old--;2727 strbuf_setlen(&newlines, newlines.len - 1);2728 }27292730 leading = frag->leading;2731 trailing = frag->trailing;27322733 /*2734 * A hunk to change lines at the beginning would begin with2735 * @@ -1,L +N,M @@2736 * but we need to be careful. -U0 that inserts before the second2737 * line also has this pattern.2738 *2739 * And a hunk to add to an empty file would begin with2740 * @@ -0,0 +N,M @@2741 *2742 * In other words, a hunk that is (frag->oldpos <= 1) with or2743 * without leading context must match at the beginning.2744 */2745 match_beginning = (!frag->oldpos ||2746 (frag->oldpos == 1 && !unidiff_zero));27472748 /*2749 * A hunk without trailing lines must match at the end.2750 * However, we simply cannot tell if a hunk must match end2751 * from the lack of trailing lines if the patch was generated2752 * with unidiff without any context.2753 */2754 match_end = !unidiff_zero && !trailing;27552756 pos = frag->newpos ? (frag->newpos - 1) : 0;2757 preimage.buf = oldlines;2758 preimage.len = old - oldlines;2759 postimage.buf = newlines.buf;2760 postimage.len = newlines.len;2761 preimage.line = preimage.line_allocated;2762 postimage.line = postimage.line_allocated;27632764 for (;;) {27652766 applied_pos = find_pos(img, &preimage, &postimage, pos,2767 ws_rule, match_beginning, match_end);27682769 if (applied_pos >= 0)2770 break;27712772 /* Am I at my context limits? */2773 if ((leading <= p_context) && (trailing <= p_context))2774 break;2775 if (match_beginning || match_end) {2776 match_beginning = match_end = 0;2777 continue;2778 }27792780 /*2781 * Reduce the number of context lines; reduce both2782 * leading and trailing if they are equal otherwise2783 * just reduce the larger context.2784 */2785 if (leading >= trailing) {2786 remove_first_line(&preimage);2787 remove_first_line(&postimage);2788 pos--;2789 leading--;2790 }2791 if (trailing > leading) {2792 remove_last_line(&preimage);2793 remove_last_line(&postimage);2794 trailing--;2795 }2796 }27972798 if (applied_pos >= 0) {2799 if (new_blank_lines_at_end &&2800 preimage.nr + applied_pos >= img->nr &&2801 (ws_rule & WS_BLANK_AT_EOF) &&2802 ws_error_action != nowarn_ws_error) {2803 record_ws_error(WS_BLANK_AT_EOF, "+", 1,2804 found_new_blank_lines_at_end);2805 if (ws_error_action == correct_ws_error) {2806 while (new_blank_lines_at_end--)2807 remove_last_line(&postimage);2808 }2809 /*2810 * We would want to prevent write_out_results()2811 * from taking place in apply_patch() that follows2812 * the callchain led us here, which is:2813 * apply_patch->check_patch_list->check_patch->2814 * apply_data->apply_fragments->apply_one_fragment2815 */2816 if (ws_error_action == die_on_ws_error)2817 apply = 0;2818 }28192820 if (apply_verbosely && applied_pos != pos) {2821 int offset = applied_pos - pos;2822 if (apply_in_reverse)2823 offset = 0 - offset;2824 fprintf_ln(stderr,2825 Q_("Hunk #%d succeeded at %d (offset %d line).",2826 "Hunk #%d succeeded at %d (offset %d lines).",2827 offset),2828 nth_fragment, applied_pos + 1, offset);2829 }28302831 /*2832 * Warn if it was necessary to reduce the number2833 * of context lines.2834 */2835 if ((leading != frag->leading) ||2836 (trailing != frag->trailing))2837 fprintf_ln(stderr, _("Context reduced to (%ld/%ld)"2838 " to apply fragment at %d"),2839 leading, trailing, applied_pos+1);2840 update_image(img, applied_pos, &preimage, &postimage);2841 } else {2842 if (apply_verbosely)2843 error(_("while searching for:\n%.*s"),2844 (int)(old - oldlines), oldlines);2845 }28462847 free(oldlines);2848 strbuf_release(&newlines);2849 free(preimage.line_allocated);2850 free(postimage.line_allocated);28512852 return (applied_pos < 0);2853}28542855static int apply_binary_fragment(struct image *img, struct patch *patch)2856{2857 struct fragment *fragment = patch->fragments;2858 unsigned long len;2859 void *dst;28602861 if (!fragment)2862 return error(_("missing binary patch data for '%s'"),2863 patch->new_name ?2864 patch->new_name :2865 patch->old_name);28662867 /* Binary patch is irreversible without the optional second hunk */2868 if (apply_in_reverse) {2869 if (!fragment->next)2870 return error("cannot reverse-apply a binary patch "2871 "without the reverse hunk to '%s'",2872 patch->new_name2873 ? patch->new_name : patch->old_name);2874 fragment = fragment->next;2875 }2876 switch (fragment->binary_patch_method) {2877 case BINARY_DELTA_DEFLATED:2878 dst = patch_delta(img->buf, img->len, fragment->patch,2879 fragment->size, &len);2880 if (!dst)2881 return -1;2882 clear_image(img);2883 img->buf = dst;2884 img->len = len;2885 return 0;2886 case BINARY_LITERAL_DEFLATED:2887 clear_image(img);2888 img->len = fragment->size;2889 img->buf = xmalloc(img->len+1);2890 memcpy(img->buf, fragment->patch, img->len);2891 img->buf[img->len] = '\0';2892 return 0;2893 }2894 return -1;2895}28962897/*2898 * Replace "img" with the result of applying the binary patch.2899 * The binary patch data itself in patch->fragment is still kept2900 * but the preimage prepared by the caller in "img" is freed here2901 * or in the helper function apply_binary_fragment() this calls.2902 */2903static int apply_binary(struct image *img, struct patch *patch)2904{2905 const char *name = patch->old_name ? patch->old_name : patch->new_name;2906 unsigned char sha1[20];29072908 /*2909 * For safety, we require patch index line to contain2910 * full 40-byte textual SHA1 for old and new, at least for now.2911 */2912 if (strlen(patch->old_sha1_prefix) != 40 ||2913 strlen(patch->new_sha1_prefix) != 40 ||2914 get_sha1_hex(patch->old_sha1_prefix, sha1) ||2915 get_sha1_hex(patch->new_sha1_prefix, sha1))2916 return error("cannot apply binary patch to '%s' "2917 "without full index line", name);29182919 if (patch->old_name) {2920 /*2921 * See if the old one matches what the patch2922 * applies to.2923 */2924 hash_sha1_file(img->buf, img->len, blob_type, sha1);2925 if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))2926 return error("the patch applies to '%s' (%s), "2927 "which does not match the "2928 "current contents.",2929 name, sha1_to_hex(sha1));2930 }2931 else {2932 /* Otherwise, the old one must be empty. */2933 if (img->len)2934 return error("the patch applies to an empty "2935 "'%s' but it is not empty", name);2936 }29372938 get_sha1_hex(patch->new_sha1_prefix, sha1);2939 if (is_null_sha1(sha1)) {2940 clear_image(img);2941 return 0; /* deletion patch */2942 }29432944 if (has_sha1_file(sha1)) {2945 /* We already have the postimage */2946 enum object_type type;2947 unsigned long size;2948 char *result;29492950 result = read_sha1_file(sha1, &type, &size);2951 if (!result)2952 return error("the necessary postimage %s for "2953 "'%s' cannot be read",2954 patch->new_sha1_prefix, name);2955 clear_image(img);2956 img->buf = result;2957 img->len = size;2958 } else {2959 /*2960 * We have verified buf matches the preimage;2961 * apply the patch data to it, which is stored2962 * in the patch->fragments->{patch,size}.2963 */2964 if (apply_binary_fragment(img, patch))2965 return error(_("binary patch does not apply to '%s'"),2966 name);29672968 /* verify that the result matches */2969 hash_sha1_file(img->buf, img->len, blob_type, sha1);2970 if (strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))2971 return error(_("binary patch to '%s' creates incorrect result (expecting %s, got %s)"),2972 name, patch->new_sha1_prefix, sha1_to_hex(sha1));2973 }29742975 return 0;2976}29772978static int apply_fragments(struct image *img, struct patch *patch)2979{2980 struct fragment *frag = patch->fragments;2981 const char *name = patch->old_name ? patch->old_name : patch->new_name;2982 unsigned ws_rule = patch->ws_rule;2983 unsigned inaccurate_eof = patch->inaccurate_eof;2984 int nth = 0;29852986 if (patch->is_binary)2987 return apply_binary(img, patch);29882989 while (frag) {2990 nth++;2991 if (apply_one_fragment(img, frag, inaccurate_eof, ws_rule, nth)) {2992 error(_("patch failed: %s:%ld"), name, frag->oldpos);2993 if (!apply_with_reject)2994 return -1;2995 frag->rejected = 1;2996 }2997 frag = frag->next;2998 }2999 return 0;3000}30013002static int read_blob_object(struct strbuf *buf, const unsigned char *sha1, unsigned mode)3003{3004 if (S_ISGITLINK(mode)) {3005 strbuf_grow(buf, 100);3006 strbuf_addf(buf, "Subproject commit %s\n", sha1_to_hex(sha1));3007 } else {3008 enum object_type type;3009 unsigned long sz;3010 char *result;30113012 result = read_sha1_file(sha1, &type, &sz);3013 if (!result)3014 return -1;3015 /* XXX read_sha1_file NUL-terminates */3016 strbuf_attach(buf, result, sz, sz + 1);3017 }3018 return 0;3019}30203021static int read_file_or_gitlink(const struct cache_entry *ce, struct strbuf *buf)3022{3023 if (!ce)3024 return 0;3025 return read_blob_object(buf, ce->sha1, ce->ce_mode);3026}30273028static struct patch *in_fn_table(const char *name)3029{3030 struct string_list_item *item;30313032 if (name == NULL)3033 return NULL;30343035 item = string_list_lookup(&fn_table, name);3036 if (item != NULL)3037 return (struct patch *)item->util;30383039 return NULL;3040}30413042/*3043 * item->util in the filename table records the status of the path.3044 * Usually it points at a patch (whose result records the contents3045 * of it after applying it), but it could be PATH_WAS_DELETED for a3046 * path that a previously applied patch has already removed, or3047 * PATH_TO_BE_DELETED for a path that a later patch would remove.3048 *3049 * The latter is needed to deal with a case where two paths A and B3050 * are swapped by first renaming A to B and then renaming B to A;3051 * moving A to B should not be prevented due to presence of B as we3052 * will remove it in a later patch.3053 */3054#define PATH_TO_BE_DELETED ((struct patch *) -2)3055#define PATH_WAS_DELETED ((struct patch *) -1)30563057static int to_be_deleted(struct patch *patch)3058{3059 return patch == PATH_TO_BE_DELETED;3060}30613062static int was_deleted(struct patch *patch)3063{3064 return patch == PATH_WAS_DELETED;3065}30663067static void add_to_fn_table(struct patch *patch)3068{3069 struct string_list_item *item;30703071 /*3072 * Always add new_name unless patch is a deletion3073 * This should cover the cases for normal diffs,3074 * file creations and copies3075 */3076 if (patch->new_name != NULL) {3077 item = string_list_insert(&fn_table, patch->new_name);3078 item->util = patch;3079 }30803081 /*3082 * store a failure on rename/deletion cases because3083 * later chunks shouldn't patch old names3084 */3085 if ((patch->new_name == NULL) || (patch->is_rename)) {3086 item = string_list_insert(&fn_table, patch->old_name);3087 item->util = PATH_WAS_DELETED;3088 }3089}30903091static void prepare_fn_table(struct patch *patch)3092{3093 /*3094 * store information about incoming file deletion3095 */3096 while (patch) {3097 if ((patch->new_name == NULL) || (patch->is_rename)) {3098 struct string_list_item *item;3099 item = string_list_insert(&fn_table, patch->old_name);3100 item->util = PATH_TO_BE_DELETED;3101 }3102 patch = patch->next;3103 }3104}31053106static int checkout_target(struct cache_entry *ce, struct stat *st)3107{3108 struct checkout costate;31093110 memset(&costate, 0, sizeof(costate));3111 costate.base_dir = "";3112 costate.refresh_cache = 1;3113 if (checkout_entry(ce, &costate, NULL) || lstat(ce->name, st))3114 return error(_("cannot checkout %s"), ce->name);3115 return 0;3116}31173118static struct patch *previous_patch(struct patch *patch, int *gone)3119{3120 struct patch *previous;31213122 *gone = 0;3123 if (patch->is_copy || patch->is_rename)3124 return NULL; /* "git" patches do not depend on the order */31253126 previous = in_fn_table(patch->old_name);3127 if (!previous)3128 return NULL;31293130 if (to_be_deleted(previous))3131 return NULL; /* the deletion hasn't happened yet */31323133 if (was_deleted(previous))3134 *gone = 1;31353136 return previous;3137}31383139static int verify_index_match(const struct cache_entry *ce, struct stat *st)3140{3141 if (S_ISGITLINK(ce->ce_mode)) {3142 if (!S_ISDIR(st->st_mode))3143 return -1;3144 return 0;3145 }3146 return ce_match_stat(ce, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);3147}31483149#define SUBMODULE_PATCH_WITHOUT_INDEX 131503151static int load_patch_target(struct strbuf *buf,3152 const struct cache_entry *ce,3153 struct stat *st,3154 const char *name,3155 unsigned expected_mode)3156{3157 if (cached) {3158 if (read_file_or_gitlink(ce, buf))3159 return error(_("read of %s failed"), name);3160 } else if (name) {3161 if (S_ISGITLINK(expected_mode)) {3162 if (ce)3163 return read_file_or_gitlink(ce, buf);3164 else3165 return SUBMODULE_PATCH_WITHOUT_INDEX;3166 } else {3167 if (read_old_data(st, name, buf))3168 return error(_("read of %s failed"), name);3169 }3170 }3171 return 0;3172}31733174/*3175 * We are about to apply "patch"; populate the "image" with the3176 * current version we have, from the working tree or from the index,3177 * depending on the situation e.g. --cached/--index. If we are3178 * applying a non-git patch that incrementally updates the tree,3179 * we read from the result of a previous diff.3180 */3181static int load_preimage(struct image *image,3182 struct patch *patch, struct stat *st,3183 const struct cache_entry *ce)3184{3185 struct strbuf buf = STRBUF_INIT;3186 size_t len;3187 char *img;3188 struct patch *previous;3189 int status;31903191 previous = previous_patch(patch, &status);3192 if (status)3193 return error(_("path %s has been renamed/deleted"),3194 patch->old_name);3195 if (previous) {3196 /* We have a patched copy in memory; use that. */3197 strbuf_add(&buf, previous->result, previous->resultsize);3198 } else {3199 status = load_patch_target(&buf, ce, st,3200 patch->old_name, patch->old_mode);3201 if (status < 0)3202 return status;3203 else if (status == SUBMODULE_PATCH_WITHOUT_INDEX) {3204 /*3205 * There is no way to apply subproject3206 * patch without looking at the index.3207 * NEEDSWORK: shouldn't this be flagged3208 * as an error???3209 */3210 free_fragment_list(patch->fragments);3211 patch->fragments = NULL;3212 } else if (status) {3213 return error(_("read of %s failed"), patch->old_name);3214 }3215 }32163217 img = strbuf_detach(&buf, &len);3218 prepare_image(image, img, len, !patch->is_binary);3219 return 0;3220}32213222static int three_way_merge(struct image *image,3223 char *path,3224 const unsigned char *base,3225 const unsigned char *ours,3226 const unsigned char *theirs)3227{3228 mmfile_t base_file, our_file, their_file;3229 mmbuffer_t result = { NULL };3230 int status;32313232 read_mmblob(&base_file, base);3233 read_mmblob(&our_file, ours);3234 read_mmblob(&their_file, theirs);3235 status = ll_merge(&result, path,3236 &base_file, "base",3237 &our_file, "ours",3238 &their_file, "theirs", NULL);3239 free(base_file.ptr);3240 free(our_file.ptr);3241 free(their_file.ptr);3242 if (status < 0 || !result.ptr) {3243 free(result.ptr);3244 return -1;3245 }3246 clear_image(image);3247 image->buf = result.ptr;3248 image->len = result.size;32493250 return status;3251}32523253/*3254 * When directly falling back to add/add three-way merge, we read from3255 * the current contents of the new_name. In no cases other than that3256 * this function will be called.3257 */3258static int load_current(struct image *image, struct patch *patch)3259{3260 struct strbuf buf = STRBUF_INIT;3261 int status, pos;3262 size_t len;3263 char *img;3264 struct stat st;3265 struct cache_entry *ce;3266 char *name = patch->new_name;3267 unsigned mode = patch->new_mode;32683269 if (!patch->is_new)3270 die("BUG: patch to %s is not a creation", patch->old_name);32713272 pos = cache_name_pos(name, strlen(name));3273 if (pos < 0)3274 return error(_("%s: does not exist in index"), name);3275 ce = active_cache[pos];3276 if (lstat(name, &st)) {3277 if (errno != ENOENT)3278 return error(_("%s: %s"), name, strerror(errno));3279 if (checkout_target(ce, &st))3280 return -1;3281 }3282 if (verify_index_match(ce, &st))3283 return error(_("%s: does not match index"), name);32843285 status = load_patch_target(&buf, ce, &st, name, mode);3286 if (status < 0)3287 return status;3288 else if (status)3289 return -1;3290 img = strbuf_detach(&buf, &len);3291 prepare_image(image, img, len, !patch->is_binary);3292 return 0;3293}32943295static int try_threeway(struct image *image, struct patch *patch,3296 struct stat *st, const struct cache_entry *ce)3297{3298 unsigned char pre_sha1[20], post_sha1[20], our_sha1[20];3299 struct strbuf buf = STRBUF_INIT;3300 size_t len;3301 int status;3302 char *img;3303 struct image tmp_image;33043305 /* No point falling back to 3-way merge in these cases */3306 if (patch->is_delete ||3307 S_ISGITLINK(patch->old_mode) || S_ISGITLINK(patch->new_mode))3308 return -1;33093310 /* Preimage the patch was prepared for */3311 if (patch->is_new)3312 write_sha1_file("", 0, blob_type, pre_sha1);3313 else if (get_sha1(patch->old_sha1_prefix, pre_sha1) ||3314 read_blob_object(&buf, pre_sha1, patch->old_mode))3315 return error("repository lacks the necessary blob to fall back on 3-way merge.");33163317 fprintf(stderr, "Falling back to three-way merge...\n");33183319 img = strbuf_detach(&buf, &len);3320 prepare_image(&tmp_image, img, len, 1);3321 /* Apply the patch to get the post image */3322 if (apply_fragments(&tmp_image, patch) < 0) {3323 clear_image(&tmp_image);3324 return -1;3325 }3326 /* post_sha1[] is theirs */3327 write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, post_sha1);3328 clear_image(&tmp_image);33293330 /* our_sha1[] is ours */3331 if (patch->is_new) {3332 if (load_current(&tmp_image, patch))3333 return error("cannot read the current contents of '%s'",3334 patch->new_name);3335 } else {3336 if (load_preimage(&tmp_image, patch, st, ce))3337 return error("cannot read the current contents of '%s'",3338 patch->old_name);3339 }3340 write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, our_sha1);3341 clear_image(&tmp_image);33423343 /* in-core three-way merge between post and our using pre as base */3344 status = three_way_merge(image, patch->new_name,3345 pre_sha1, our_sha1, post_sha1);3346 if (status < 0) {3347 fprintf(stderr, "Failed to fall back on three-way merge...\n");3348 return status;3349 }33503351 if (status) {3352 patch->conflicted_threeway = 1;3353 if (patch->is_new)3354 hashclr(patch->threeway_stage[0]);3355 else3356 hashcpy(patch->threeway_stage[0], pre_sha1);3357 hashcpy(patch->threeway_stage[1], our_sha1);3358 hashcpy(patch->threeway_stage[2], post_sha1);3359 fprintf(stderr, "Applied patch to '%s' with conflicts.\n", patch->new_name);3360 } else {3361 fprintf(stderr, "Applied patch to '%s' cleanly.\n", patch->new_name);3362 }3363 return 0;3364}33653366static int apply_data(struct patch *patch, struct stat *st, const struct cache_entry *ce)3367{3368 struct image image;33693370 if (load_preimage(&image, patch, st, ce) < 0)3371 return -1;33723373 if (patch->direct_to_threeway ||3374 apply_fragments(&image, patch) < 0) {3375 /* Note: with --reject, apply_fragments() returns 0 */3376 if (!threeway || try_threeway(&image, patch, st, ce) < 0)3377 return -1;3378 }3379 patch->result = image.buf;3380 patch->resultsize = image.len;3381 add_to_fn_table(patch);3382 free(image.line_allocated);33833384 if (0 < patch->is_delete && patch->resultsize)3385 return error(_("removal patch leaves file contents"));33863387 return 0;3388}33893390/*3391 * If "patch" that we are looking at modifies or deletes what we have,3392 * we would want it not to lose any local modification we have, either3393 * in the working tree or in the index.3394 *3395 * This also decides if a non-git patch is a creation patch or a3396 * modification to an existing empty file. We do not check the state3397 * of the current tree for a creation patch in this function; the caller3398 * check_patch() separately makes sure (and errors out otherwise) that3399 * the path the patch creates does not exist in the current tree.3400 */3401static int check_preimage(struct patch *patch, struct cache_entry **ce, struct stat *st)3402{3403 const char *old_name = patch->old_name;3404 struct patch *previous = NULL;3405 int stat_ret = 0, status;3406 unsigned st_mode = 0;34073408 if (!old_name)3409 return 0;34103411 assert(patch->is_new <= 0);3412 previous = previous_patch(patch, &status);34133414 if (status)3415 return error(_("path %s has been renamed/deleted"), old_name);3416 if (previous) {3417 st_mode = previous->new_mode;3418 } else if (!cached) {3419 stat_ret = lstat(old_name, st);3420 if (stat_ret && errno != ENOENT)3421 return error(_("%s: %s"), old_name, strerror(errno));3422 }34233424 if (check_index && !previous) {3425 int pos = cache_name_pos(old_name, strlen(old_name));3426 if (pos < 0) {3427 if (patch->is_new < 0)3428 goto is_new;3429 return error(_("%s: does not exist in index"), old_name);3430 }3431 *ce = active_cache[pos];3432 if (stat_ret < 0) {3433 if (checkout_target(*ce, st))3434 return -1;3435 }3436 if (!cached && verify_index_match(*ce, st))3437 return error(_("%s: does not match index"), old_name);3438 if (cached)3439 st_mode = (*ce)->ce_mode;3440 } else if (stat_ret < 0) {3441 if (patch->is_new < 0)3442 goto is_new;3443 return error(_("%s: %s"), old_name, strerror(errno));3444 }34453446 if (!cached && !previous)3447 st_mode = ce_mode_from_stat(*ce, st->st_mode);34483449 if (patch->is_new < 0)3450 patch->is_new = 0;3451 if (!patch->old_mode)3452 patch->old_mode = st_mode;3453 if ((st_mode ^ patch->old_mode) & S_IFMT)3454 return error(_("%s: wrong type"), old_name);3455 if (st_mode != patch->old_mode)3456 warning(_("%s has type %o, expected %o"),3457 old_name, st_mode, patch->old_mode);3458 if (!patch->new_mode && !patch->is_delete)3459 patch->new_mode = st_mode;3460 return 0;34613462 is_new:3463 patch->is_new = 1;3464 patch->is_delete = 0;3465 free(patch->old_name);3466 patch->old_name = NULL;3467 return 0;3468}346934703471#define EXISTS_IN_INDEX 13472#define EXISTS_IN_WORKTREE 234733474static int check_to_create(const char *new_name, int ok_if_exists)3475{3476 struct stat nst;34773478 if (check_index &&3479 cache_name_pos(new_name, strlen(new_name)) >= 0 &&3480 !ok_if_exists)3481 return EXISTS_IN_INDEX;3482 if (cached)3483 return 0;34843485 if (!lstat(new_name, &nst)) {3486 if (S_ISDIR(nst.st_mode) || ok_if_exists)3487 return 0;3488 /*3489 * A leading component of new_name might be a symlink3490 * that is going to be removed with this patch, but3491 * still pointing at somewhere that has the path.3492 * In such a case, path "new_name" does not exist as3493 * far as git is concerned.3494 */3495 if (has_symlink_leading_path(new_name, strlen(new_name)))3496 return 0;34973498 return EXISTS_IN_WORKTREE;3499 } else if ((errno != ENOENT) && (errno != ENOTDIR)) {3500 return error("%s: %s", new_name, strerror(errno));3501 }3502 return 0;3503}35043505/*3506 * Check and apply the patch in-core; leave the result in patch->result3507 * for the caller to write it out to the final destination.3508 */3509static int check_patch(struct patch *patch)3510{3511 struct stat st;3512 const char *old_name = patch->old_name;3513 const char *new_name = patch->new_name;3514 const char *name = old_name ? old_name : new_name;3515 struct cache_entry *ce = NULL;3516 struct patch *tpatch;3517 int ok_if_exists;3518 int status;35193520 patch->rejected = 1; /* we will drop this after we succeed */35213522 status = check_preimage(patch, &ce, &st);3523 if (status)3524 return status;3525 old_name = patch->old_name;35263527 /*3528 * A type-change diff is always split into a patch to delete3529 * old, immediately followed by a patch to create new (see3530 * diff.c::run_diff()); in such a case it is Ok that the entry3531 * to be deleted by the previous patch is still in the working3532 * tree and in the index.3533 *3534 * A patch to swap-rename between A and B would first rename A3535 * to B and then rename B to A. While applying the first one,3536 * the presence of B should not stop A from getting renamed to3537 * B; ask to_be_deleted() about the later rename. Removal of3538 * B and rename from A to B is handled the same way by asking3539 * was_deleted().3540 */3541 if ((tpatch = in_fn_table(new_name)) &&3542 (was_deleted(tpatch) || to_be_deleted(tpatch)))3543 ok_if_exists = 1;3544 else3545 ok_if_exists = 0;35463547 if (new_name &&3548 ((0 < patch->is_new) || patch->is_rename || patch->is_copy)) {3549 int err = check_to_create(new_name, ok_if_exists);35503551 if (err && threeway) {3552 patch->direct_to_threeway = 1;3553 } else switch (err) {3554 case 0:3555 break; /* happy */3556 case EXISTS_IN_INDEX:3557 return error(_("%s: already exists in index"), new_name);3558 break;3559 case EXISTS_IN_WORKTREE:3560 return error(_("%s: already exists in working directory"),3561 new_name);3562 default:3563 return err;3564 }35653566 if (!patch->new_mode) {3567 if (0 < patch->is_new)3568 patch->new_mode = S_IFREG | 0644;3569 else3570 patch->new_mode = patch->old_mode;3571 }3572 }35733574 if (new_name && old_name) {3575 int same = !strcmp(old_name, new_name);3576 if (!patch->new_mode)3577 patch->new_mode = patch->old_mode;3578 if ((patch->old_mode ^ patch->new_mode) & S_IFMT) {3579 if (same)3580 return error(_("new mode (%o) of %s does not "3581 "match old mode (%o)"),3582 patch->new_mode, new_name,3583 patch->old_mode);3584 else3585 return error(_("new mode (%o) of %s does not "3586 "match old mode (%o) of %s"),3587 patch->new_mode, new_name,3588 patch->old_mode, old_name);3589 }3590 }35913592 if (apply_data(patch, &st, ce) < 0)3593 return error(_("%s: patch does not apply"), name);3594 patch->rejected = 0;3595 return 0;3596}35973598static int check_patch_list(struct patch *patch)3599{3600 int err = 0;36013602 prepare_fn_table(patch);3603 while (patch) {3604 if (apply_verbosely)3605 say_patch_name(stderr,3606 _("Checking patch %s..."), patch);3607 err |= check_patch(patch);3608 patch = patch->next;3609 }3610 return err;3611}36123613/* This function tries to read the sha1 from the current index */3614static int get_current_sha1(const char *path, unsigned char *sha1)3615{3616 int pos;36173618 if (read_cache() < 0)3619 return -1;3620 pos = cache_name_pos(path, strlen(path));3621 if (pos < 0)3622 return -1;3623 hashcpy(sha1, active_cache[pos]->sha1);3624 return 0;3625}36263627static int preimage_sha1_in_gitlink_patch(struct patch *p, unsigned char sha1[20])3628{3629 /*3630 * A usable gitlink patch has only one fragment (hunk) that looks like:3631 * @@ -1 +1 @@3632 * -Subproject commit <old sha1>3633 * +Subproject commit <new sha1>3634 * or3635 * @@ -1 +0,0 @@3636 * -Subproject commit <old sha1>3637 * for a removal patch.3638 */3639 struct fragment *hunk = p->fragments;3640 static const char heading[] = "-Subproject commit ";3641 char *preimage;36423643 if (/* does the patch have only one hunk? */3644 hunk && !hunk->next &&3645 /* is its preimage one line? */3646 hunk->oldpos == 1 && hunk->oldlines == 1 &&3647 /* does preimage begin with the heading? */3648 (preimage = memchr(hunk->patch, '\n', hunk->size)) != NULL &&3649 starts_with(++preimage, heading) &&3650 /* does it record full SHA-1? */3651 !get_sha1_hex(preimage + sizeof(heading) - 1, sha1) &&3652 preimage[sizeof(heading) + 40 - 1] == '\n' &&3653 /* does the abbreviated name on the index line agree with it? */3654 starts_with(preimage + sizeof(heading) - 1, p->old_sha1_prefix))3655 return 0; /* it all looks fine */36563657 /* we may have full object name on the index line */3658 return get_sha1_hex(p->old_sha1_prefix, sha1);3659}36603661/* Build an index that contains the just the files needed for a 3way merge */3662static void build_fake_ancestor(struct patch *list, const char *filename)3663{3664 struct patch *patch;3665 struct index_state result = { NULL };3666 int fd;36673668 /* Once we start supporting the reverse patch, it may be3669 * worth showing the new sha1 prefix, but until then...3670 */3671 for (patch = list; patch; patch = patch->next) {3672 unsigned char sha1[20];3673 struct cache_entry *ce;3674 const char *name;36753676 name = patch->old_name ? patch->old_name : patch->new_name;3677 if (0 < patch->is_new)3678 continue;36793680 if (S_ISGITLINK(patch->old_mode)) {3681 if (!preimage_sha1_in_gitlink_patch(patch, sha1))3682 ; /* ok, the textual part looks sane */3683 else3684 die("sha1 information is lacking or useless for submoule %s",3685 name);3686 } else if (!get_sha1_blob(patch->old_sha1_prefix, sha1)) {3687 ; /* ok */3688 } else if (!patch->lines_added && !patch->lines_deleted) {3689 /* mode-only change: update the current */3690 if (get_current_sha1(patch->old_name, sha1))3691 die("mode change for %s, which is not "3692 "in current HEAD", name);3693 } else3694 die("sha1 information is lacking or useless "3695 "(%s).", name);36963697 ce = make_cache_entry(patch->old_mode, sha1, name, 0, 0);3698 if (!ce)3699 die(_("make_cache_entry failed for path '%s'"), name);3700 if (add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD))3701 die ("Could not add %s to temporary index", name);3702 }37033704 fd = open(filename, O_WRONLY | O_CREAT, 0666);3705 if (fd < 0 || write_index(&result, fd) || close(fd))3706 die ("Could not write temporary index to %s", filename);37073708 discard_index(&result);3709}37103711static void stat_patch_list(struct patch *patch)3712{3713 int files, adds, dels;37143715 for (files = adds = dels = 0 ; patch ; patch = patch->next) {3716 files++;3717 adds += patch->lines_added;3718 dels += patch->lines_deleted;3719 show_stats(patch);3720 }37213722 print_stat_summary(stdout, files, adds, dels);3723}37243725static void numstat_patch_list(struct patch *patch)3726{3727 for ( ; patch; patch = patch->next) {3728 const char *name;3729 name = patch->new_name ? patch->new_name : patch->old_name;3730 if (patch->is_binary)3731 printf("-\t-\t");3732 else3733 printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);3734 write_name_quoted(name, stdout, line_termination);3735 }3736}37373738static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)3739{3740 if (mode)3741 printf(" %s mode %06o %s\n", newdelete, mode, name);3742 else3743 printf(" %s %s\n", newdelete, name);3744}37453746static void show_mode_change(struct patch *p, int show_name)3747{3748 if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {3749 if (show_name)3750 printf(" mode change %06o => %06o %s\n",3751 p->old_mode, p->new_mode, p->new_name);3752 else3753 printf(" mode change %06o => %06o\n",3754 p->old_mode, p->new_mode);3755 }3756}37573758static void show_rename_copy(struct patch *p)3759{3760 const char *renamecopy = p->is_rename ? "rename" : "copy";3761 const char *old, *new;37623763 /* Find common prefix */3764 old = p->old_name;3765 new = p->new_name;3766 while (1) {3767 const char *slash_old, *slash_new;3768 slash_old = strchr(old, '/');3769 slash_new = strchr(new, '/');3770 if (!slash_old ||3771 !slash_new ||3772 slash_old - old != slash_new - new ||3773 memcmp(old, new, slash_new - new))3774 break;3775 old = slash_old + 1;3776 new = slash_new + 1;3777 }3778 /* p->old_name thru old is the common prefix, and old and new3779 * through the end of names are renames3780 */3781 if (old != p->old_name)3782 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,3783 (int)(old - p->old_name), p->old_name,3784 old, new, p->score);3785 else3786 printf(" %s %s => %s (%d%%)\n", renamecopy,3787 p->old_name, p->new_name, p->score);3788 show_mode_change(p, 0);3789}37903791static void summary_patch_list(struct patch *patch)3792{3793 struct patch *p;37943795 for (p = patch; p; p = p->next) {3796 if (p->is_new)3797 show_file_mode_name("create", p->new_mode, p->new_name);3798 else if (p->is_delete)3799 show_file_mode_name("delete", p->old_mode, p->old_name);3800 else {3801 if (p->is_rename || p->is_copy)3802 show_rename_copy(p);3803 else {3804 if (p->score) {3805 printf(" rewrite %s (%d%%)\n",3806 p->new_name, p->score);3807 show_mode_change(p, 0);3808 }3809 else3810 show_mode_change(p, 1);3811 }3812 }3813 }3814}38153816static void patch_stats(struct patch *patch)3817{3818 int lines = patch->lines_added + patch->lines_deleted;38193820 if (lines > max_change)3821 max_change = lines;3822 if (patch->old_name) {3823 int len = quote_c_style(patch->old_name, NULL, NULL, 0);3824 if (!len)3825 len = strlen(patch->old_name);3826 if (len > max_len)3827 max_len = len;3828 }3829 if (patch->new_name) {3830 int len = quote_c_style(patch->new_name, NULL, NULL, 0);3831 if (!len)3832 len = strlen(patch->new_name);3833 if (len > max_len)3834 max_len = len;3835 }3836}38373838static void remove_file(struct patch *patch, int rmdir_empty)3839{3840 if (update_index) {3841 if (remove_file_from_cache(patch->old_name) < 0)3842 die(_("unable to remove %s from index"), patch->old_name);3843 }3844 if (!cached) {3845 if (!remove_or_warn(patch->old_mode, patch->old_name) && rmdir_empty) {3846 remove_path(patch->old_name);3847 }3848 }3849}38503851static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size)3852{3853 struct stat st;3854 struct cache_entry *ce;3855 int namelen = strlen(path);3856 unsigned ce_size = cache_entry_size(namelen);38573858 if (!update_index)3859 return;38603861 ce = xcalloc(1, ce_size);3862 memcpy(ce->name, path, namelen);3863 ce->ce_mode = create_ce_mode(mode);3864 ce->ce_flags = create_ce_flags(0);3865 ce->ce_namelen = namelen;3866 if (S_ISGITLINK(mode)) {3867 const char *s = buf;38683869 if (get_sha1_hex(s + strlen("Subproject commit "), ce->sha1))3870 die(_("corrupt patch for submodule %s"), path);3871 } else {3872 if (!cached) {3873 if (lstat(path, &st) < 0)3874 die_errno(_("unable to stat newly created file '%s'"),3875 path);3876 fill_stat_cache_info(ce, &st);3877 }3878 if (write_sha1_file(buf, size, blob_type, ce->sha1) < 0)3879 die(_("unable to create backing store for newly created file %s"), path);3880 }3881 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)3882 die(_("unable to add cache entry for %s"), path);3883}38843885static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)3886{3887 int fd;3888 struct strbuf nbuf = STRBUF_INIT;38893890 if (S_ISGITLINK(mode)) {3891 struct stat st;3892 if (!lstat(path, &st) && S_ISDIR(st.st_mode))3893 return 0;3894 return mkdir(path, 0777);3895 }38963897 if (has_symlinks && S_ISLNK(mode))3898 /* Although buf:size is counted string, it also is NUL3899 * terminated.3900 */3901 return symlink(buf, path);39023903 fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);3904 if (fd < 0)3905 return -1;39063907 if (convert_to_working_tree(path, buf, size, &nbuf)) {3908 size = nbuf.len;3909 buf = nbuf.buf;3910 }3911 write_or_die(fd, buf, size);3912 strbuf_release(&nbuf);39133914 if (close(fd) < 0)3915 die_errno(_("closing file '%s'"), path);3916 return 0;3917}39183919/*3920 * We optimistically assume that the directories exist,3921 * which is true 99% of the time anyway. If they don't,3922 * we create them and try again.3923 */3924static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size)3925{3926 if (cached)3927 return;3928 if (!try_create_file(path, mode, buf, size))3929 return;39303931 if (errno == ENOENT) {3932 if (safe_create_leading_directories(path))3933 return;3934 if (!try_create_file(path, mode, buf, size))3935 return;3936 }39373938 if (errno == EEXIST || errno == EACCES) {3939 /* We may be trying to create a file where a directory3940 * used to be.3941 */3942 struct stat st;3943 if (!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))3944 errno = EEXIST;3945 }39463947 if (errno == EEXIST) {3948 unsigned int nr = getpid();39493950 for (;;) {3951 char newpath[PATH_MAX];3952 mksnpath(newpath, sizeof(newpath), "%s~%u", path, nr);3953 if (!try_create_file(newpath, mode, buf, size)) {3954 if (!rename(newpath, path))3955 return;3956 unlink_or_warn(newpath);3957 break;3958 }3959 if (errno != EEXIST)3960 break;3961 ++nr;3962 }3963 }3964 die_errno(_("unable to write file '%s' mode %o"), path, mode);3965}39663967static void add_conflicted_stages_file(struct patch *patch)3968{3969 int stage, namelen;3970 unsigned ce_size, mode;3971 struct cache_entry *ce;39723973 if (!update_index)3974 return;3975 namelen = strlen(patch->new_name);3976 ce_size = cache_entry_size(namelen);3977 mode = patch->new_mode ? patch->new_mode : (S_IFREG | 0644);39783979 remove_file_from_cache(patch->new_name);3980 for (stage = 1; stage < 4; stage++) {3981 if (is_null_sha1(patch->threeway_stage[stage - 1]))3982 continue;3983 ce = xcalloc(1, ce_size);3984 memcpy(ce->name, patch->new_name, namelen);3985 ce->ce_mode = create_ce_mode(mode);3986 ce->ce_flags = create_ce_flags(stage);3987 ce->ce_namelen = namelen;3988 hashcpy(ce->sha1, patch->threeway_stage[stage - 1]);3989 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)3990 die(_("unable to add cache entry for %s"), patch->new_name);3991 }3992}39933994static void create_file(struct patch *patch)3995{3996 char *path = patch->new_name;3997 unsigned mode = patch->new_mode;3998 unsigned long size = patch->resultsize;3999 char *buf = patch->result;40004001 if (!mode)4002 mode = S_IFREG | 0644;4003 create_one_file(path, mode, buf, size);40044005 if (patch->conflicted_threeway)4006 add_conflicted_stages_file(patch);4007 else4008 add_index_file(path, mode, buf, size);4009}40104011/* phase zero is to remove, phase one is to create */4012static void write_out_one_result(struct patch *patch, int phase)4013{4014 if (patch->is_delete > 0) {4015 if (phase == 0)4016 remove_file(patch, 1);4017 return;4018 }4019 if (patch->is_new > 0 || patch->is_copy) {4020 if (phase == 1)4021 create_file(patch);4022 return;4023 }4024 /*4025 * Rename or modification boils down to the same4026 * thing: remove the old, write the new4027 */4028 if (phase == 0)4029 remove_file(patch, patch->is_rename);4030 if (phase == 1)4031 create_file(patch);4032}40334034static int write_out_one_reject(struct patch *patch)4035{4036 FILE *rej;4037 char namebuf[PATH_MAX];4038 struct fragment *frag;4039 int cnt = 0;4040 struct strbuf sb = STRBUF_INIT;40414042 for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) {4043 if (!frag->rejected)4044 continue;4045 cnt++;4046 }40474048 if (!cnt) {4049 if (apply_verbosely)4050 say_patch_name(stderr,4051 _("Applied patch %s cleanly."), patch);4052 return 0;4053 }40544055 /* This should not happen, because a removal patch that leaves4056 * contents are marked "rejected" at the patch level.4057 */4058 if (!patch->new_name)4059 die(_("internal error"));40604061 /* Say this even without --verbose */4062 strbuf_addf(&sb, Q_("Applying patch %%s with %d reject...",4063 "Applying patch %%s with %d rejects...",4064 cnt),4065 cnt);4066 say_patch_name(stderr, sb.buf, patch);4067 strbuf_release(&sb);40684069 cnt = strlen(patch->new_name);4070 if (ARRAY_SIZE(namebuf) <= cnt + 5) {4071 cnt = ARRAY_SIZE(namebuf) - 5;4072 warning(_("truncating .rej filename to %.*s.rej"),4073 cnt - 1, patch->new_name);4074 }4075 memcpy(namebuf, patch->new_name, cnt);4076 memcpy(namebuf + cnt, ".rej", 5);40774078 rej = fopen(namebuf, "w");4079 if (!rej)4080 return error(_("cannot open %s: %s"), namebuf, strerror(errno));40814082 /* Normal git tools never deal with .rej, so do not pretend4083 * this is a git patch by saying --git or giving extended4084 * headers. While at it, maybe please "kompare" that wants4085 * the trailing TAB and some garbage at the end of line ;-).4086 */4087 fprintf(rej, "diff a/%s b/%s\t(rejected hunks)\n",4088 patch->new_name, patch->new_name);4089 for (cnt = 1, frag = patch->fragments;4090 frag;4091 cnt++, frag = frag->next) {4092 if (!frag->rejected) {4093 fprintf_ln(stderr, _("Hunk #%d applied cleanly."), cnt);4094 continue;4095 }4096 fprintf_ln(stderr, _("Rejected hunk #%d."), cnt);4097 fprintf(rej, "%.*s", frag->size, frag->patch);4098 if (frag->patch[frag->size-1] != '\n')4099 fputc('\n', rej);4100 }4101 fclose(rej);4102 return -1;4103}41044105static int write_out_results(struct patch *list)4106{4107 int phase;4108 int errs = 0;4109 struct patch *l;4110 struct string_list cpath = STRING_LIST_INIT_DUP;41114112 for (phase = 0; phase < 2; phase++) {4113 l = list;4114 while (l) {4115 if (l->rejected)4116 errs = 1;4117 else {4118 write_out_one_result(l, phase);4119 if (phase == 1) {4120 if (write_out_one_reject(l))4121 errs = 1;4122 if (l->conflicted_threeway) {4123 string_list_append(&cpath, l->new_name);4124 errs = 1;4125 }4126 }4127 }4128 l = l->next;4129 }4130 }41314132 if (cpath.nr) {4133 struct string_list_item *item;41344135 sort_string_list(&cpath);4136 for_each_string_list_item(item, &cpath)4137 fprintf(stderr, "U %s\n", item->string);4138 string_list_clear(&cpath, 0);41394140 rerere(0);4141 }41424143 return errs;4144}41454146static struct lock_file lock_file;41474148static struct string_list limit_by_name;4149static int has_include;4150static void add_name_limit(const char *name, int exclude)4151{4152 struct string_list_item *it;41534154 it = string_list_append(&limit_by_name, name);4155 it->util = exclude ? NULL : (void *) 1;4156}41574158static int use_patch(struct patch *p)4159{4160 const char *pathname = p->new_name ? p->new_name : p->old_name;4161 int i;41624163 /* Paths outside are not touched regardless of "--include" */4164 if (0 < prefix_length) {4165 int pathlen = strlen(pathname);4166 if (pathlen <= prefix_length ||4167 memcmp(prefix, pathname, prefix_length))4168 return 0;4169 }41704171 /* See if it matches any of exclude/include rule */4172 for (i = 0; i < limit_by_name.nr; i++) {4173 struct string_list_item *it = &limit_by_name.items[i];4174 if (!fnmatch(it->string, pathname, 0))4175 return (it->util != NULL);4176 }41774178 /*4179 * If we had any include, a path that does not match any rule is4180 * not used. Otherwise, we saw bunch of exclude rules (or none)4181 * and such a path is used.4182 */4183 return !has_include;4184}41854186#define INACCURATE_EOF (1<<0)4187#define RECOUNT (1<<1)41884189static int apply_patch(int fd, const char *filename, int options)4190{4191 size_t offset;4192 struct strbuf buf = STRBUF_INIT; /* owns the patch text */4193 struct patch *list = NULL, **listp = &list;4194 int skipped_patch = 0;41954196 patch_input_file = filename;4197 read_patch_file(&buf, fd);4198 offset = 0;4199 while (offset < buf.len) {4200 struct patch *patch;4201 int nr;42024203 patch = xcalloc(1, sizeof(*patch));4204 patch->inaccurate_eof = !!(options & INACCURATE_EOF);4205 patch->recount = !!(options & RECOUNT);4206 nr = parse_chunk(buf.buf + offset, buf.len - offset, patch);4207 if (nr < 0)4208 break;4209 if (apply_in_reverse)4210 reverse_patches(patch);4211 if (use_patch(patch)) {4212 patch_stats(patch);4213 *listp = patch;4214 listp = &patch->next;4215 }4216 else {4217 free_patch(patch);4218 skipped_patch++;4219 }4220 offset += nr;4221 }42224223 if (!list && !skipped_patch)4224 die(_("unrecognized input"));42254226 if (whitespace_error && (ws_error_action == die_on_ws_error))4227 apply = 0;42284229 update_index = check_index && apply;4230 if (update_index && newfd < 0)4231 newfd = hold_locked_index(&lock_file, 1);42324233 if (check_index) {4234 if (read_cache() < 0)4235 die(_("unable to read index file"));4236 }42374238 if ((check || apply) &&4239 check_patch_list(list) < 0 &&4240 !apply_with_reject)4241 exit(1);42424243 if (apply && write_out_results(list)) {4244 if (apply_with_reject)4245 exit(1);4246 /* with --3way, we still need to write the index out */4247 return 1;4248 }42494250 if (fake_ancestor)4251 build_fake_ancestor(list, fake_ancestor);42524253 if (diffstat)4254 stat_patch_list(list);42554256 if (numstat)4257 numstat_patch_list(list);42584259 if (summary)4260 summary_patch_list(list);42614262 free_patch_list(list);4263 strbuf_release(&buf);4264 string_list_clear(&fn_table, 0);4265 return 0;4266}42674268static int git_apply_config(const char *var, const char *value, void *cb)4269{4270 if (!strcmp(var, "apply.whitespace"))4271 return git_config_string(&apply_default_whitespace, var, value);4272 else if (!strcmp(var, "apply.ignorewhitespace"))4273 return git_config_string(&apply_default_ignorewhitespace, var, value);4274 return git_default_config(var, value, cb);4275}42764277static int option_parse_exclude(const struct option *opt,4278 const char *arg, int unset)4279{4280 add_name_limit(arg, 1);4281 return 0;4282}42834284static int option_parse_include(const struct option *opt,4285 const char *arg, int unset)4286{4287 add_name_limit(arg, 0);4288 has_include = 1;4289 return 0;4290}42914292static int option_parse_p(const struct option *opt,4293 const char *arg, int unset)4294{4295 p_value = atoi(arg);4296 p_value_known = 1;4297 return 0;4298}42994300static int option_parse_z(const struct option *opt,4301 const char *arg, int unset)4302{4303 if (unset)4304 line_termination = '\n';4305 else4306 line_termination = 0;4307 return 0;4308}43094310static int option_parse_space_change(const struct option *opt,4311 const char *arg, int unset)4312{4313 if (unset)4314 ws_ignore_action = ignore_ws_none;4315 else4316 ws_ignore_action = ignore_ws_change;4317 return 0;4318}43194320static int option_parse_whitespace(const struct option *opt,4321 const char *arg, int unset)4322{4323 const char **whitespace_option = opt->value;43244325 *whitespace_option = arg;4326 parse_whitespace_option(arg);4327 return 0;4328}43294330static int option_parse_directory(const struct option *opt,4331 const char *arg, int unset)4332{4333 root_len = strlen(arg);4334 if (root_len && arg[root_len - 1] != '/') {4335 char *new_root;4336 root = new_root = xmalloc(root_len + 2);4337 strcpy(new_root, arg);4338 strcpy(new_root + root_len++, "/");4339 } else4340 root = arg;4341 return 0;4342}43434344int cmd_apply(int argc, const char **argv, const char *prefix_)4345{4346 int i;4347 int errs = 0;4348 int is_not_gitdir = !startup_info->have_repository;4349 int force_apply = 0;43504351 const char *whitespace_option = NULL;43524353 struct option builtin_apply_options[] = {4354 { OPTION_CALLBACK, 0, "exclude", NULL, N_("path"),4355 N_("don't apply changes matching the given path"),4356 0, option_parse_exclude },4357 { OPTION_CALLBACK, 0, "include", NULL, N_("path"),4358 N_("apply changes matching the given path"),4359 0, option_parse_include },4360 { OPTION_CALLBACK, 'p', NULL, NULL, N_("num"),4361 N_("remove <num> leading slashes from traditional diff paths"),4362 0, option_parse_p },4363 OPT_BOOL(0, "no-add", &no_add,4364 N_("ignore additions made by the patch")),4365 OPT_BOOL(0, "stat", &diffstat,4366 N_("instead of applying the patch, output diffstat for the input")),4367 OPT_NOOP_NOARG(0, "allow-binary-replacement"),4368 OPT_NOOP_NOARG(0, "binary"),4369 OPT_BOOL(0, "numstat", &numstat,4370 N_("show number of added and deleted lines in decimal notation")),4371 OPT_BOOL(0, "summary", &summary,4372 N_("instead of applying the patch, output a summary for the input")),4373 OPT_BOOL(0, "check", &check,4374 N_("instead of applying the patch, see if the patch is applicable")),4375 OPT_BOOL(0, "index", &check_index,4376 N_("make sure the patch is applicable to the current index")),4377 OPT_BOOL(0, "cached", &cached,4378 N_("apply a patch without touching the working tree")),4379 OPT_BOOL(0, "apply", &force_apply,4380 N_("also apply the patch (use with --stat/--summary/--check)")),4381 OPT_BOOL('3', "3way", &threeway,4382 N_( "attempt three-way merge if a patch does not apply")),4383 OPT_FILENAME(0, "build-fake-ancestor", &fake_ancestor,4384 N_("build a temporary index based on embedded index information")),4385 { OPTION_CALLBACK, 'z', NULL, NULL, NULL,4386 N_("paths are separated with NUL character"),4387 PARSE_OPT_NOARG, option_parse_z },4388 OPT_INTEGER('C', NULL, &p_context,4389 N_("ensure at least <n> lines of context match")),4390 { OPTION_CALLBACK, 0, "whitespace", &whitespace_option, N_("action"),4391 N_("detect new or modified lines that have whitespace errors"),4392 0, option_parse_whitespace },4393 { OPTION_CALLBACK, 0, "ignore-space-change", NULL, NULL,4394 N_("ignore changes in whitespace when finding context"),4395 PARSE_OPT_NOARG, option_parse_space_change },4396 { OPTION_CALLBACK, 0, "ignore-whitespace", NULL, NULL,4397 N_("ignore changes in whitespace when finding context"),4398 PARSE_OPT_NOARG, option_parse_space_change },4399 OPT_BOOL('R', "reverse", &apply_in_reverse,4400 N_("apply the patch in reverse")),4401 OPT_BOOL(0, "unidiff-zero", &unidiff_zero,4402 N_("don't expect at least one line of context")),4403 OPT_BOOL(0, "reject", &apply_with_reject,4404 N_("leave the rejected hunks in corresponding *.rej files")),4405 OPT_BOOL(0, "allow-overlap", &allow_overlap,4406 N_("allow overlapping hunks")),4407 OPT__VERBOSE(&apply_verbosely, N_("be verbose")),4408 OPT_BIT(0, "inaccurate-eof", &options,4409 N_("tolerate incorrectly detected missing new-line at the end of file"),4410 INACCURATE_EOF),4411 OPT_BIT(0, "recount", &options,4412 N_("do not trust the line counts in the hunk headers"),4413 RECOUNT),4414 { OPTION_CALLBACK, 0, "directory", NULL, N_("root"),4415 N_("prepend <root> to all filenames"),4416 0, option_parse_directory },4417 OPT_END()4418 };44194420 prefix = prefix_;4421 prefix_length = prefix ? strlen(prefix) : 0;4422 git_config(git_apply_config, NULL);4423 if (apply_default_whitespace)4424 parse_whitespace_option(apply_default_whitespace);4425 if (apply_default_ignorewhitespace)4426 parse_ignorewhitespace_option(apply_default_ignorewhitespace);44274428 argc = parse_options(argc, argv, prefix, builtin_apply_options,4429 apply_usage, 0);44304431 if (apply_with_reject && threeway)4432 die("--reject and --3way cannot be used together.");4433 if (cached && threeway)4434 die("--cached and --3way cannot be used together.");4435 if (threeway) {4436 if (is_not_gitdir)4437 die(_("--3way outside a repository"));4438 check_index = 1;4439 }4440 if (apply_with_reject)4441 apply = apply_verbosely = 1;4442 if (!force_apply && (diffstat || numstat || summary || check || fake_ancestor))4443 apply = 0;4444 if (check_index && is_not_gitdir)4445 die(_("--index outside a repository"));4446 if (cached) {4447 if (is_not_gitdir)4448 die(_("--cached outside a repository"));4449 check_index = 1;4450 }4451 for (i = 0; i < argc; i++) {4452 const char *arg = argv[i];4453 int fd;44544455 if (!strcmp(arg, "-")) {4456 errs |= apply_patch(0, "<stdin>", options);4457 read_stdin = 0;4458 continue;4459 } else if (0 < prefix_length)4460 arg = prefix_filename(prefix, prefix_length, arg);44614462 fd = open(arg, O_RDONLY);4463 if (fd < 0)4464 die_errno(_("can't open patch '%s'"), arg);4465 read_stdin = 0;4466 set_default_whitespace_mode(whitespace_option);4467 errs |= apply_patch(fd, arg, options);4468 close(fd);4469 }4470 set_default_whitespace_mode(whitespace_option);4471 if (read_stdin)4472 errs |= apply_patch(0, "<stdin>", options);4473 if (whitespace_error) {4474 if (squelch_whitespace_errors &&4475 squelch_whitespace_errors < whitespace_error) {4476 int squelched =4477 whitespace_error - squelch_whitespace_errors;4478 warning(Q_("squelched %d whitespace error",4479 "squelched %d whitespace errors",4480 squelched),4481 squelched);4482 }4483 if (ws_error_action == die_on_ws_error)4484 die(Q_("%d line adds whitespace errors.",4485 "%d lines add whitespace errors.",4486 whitespace_error),4487 whitespace_error);4488 if (applied_after_fixing_ws && apply)4489 warning("%d line%s applied after"4490 " fixing whitespace errors.",4491 applied_after_fixing_ws,4492 applied_after_fixing_ws == 1 ? "" : "s");4493 else if (whitespace_error)4494 warning(Q_("%d line adds whitespace errors.",4495 "%d lines add whitespace errors.",4496 whitespace_error),4497 whitespace_error);4498 }44994500 if (update_index) {4501 if (write_cache(newfd, active_cache, active_nr) ||4502 commit_locked_index(&lock_file))4503 die(_("Unable to write new index file"));4504 }45054506 return !!errs;4507}