1/* 2 * Builtin "git am" 3 * 4 * Based on git-am.sh by Junio C Hamano. 5 */ 6#include"cache.h" 7#include"builtin.h" 8#include"exec_cmd.h" 9#include"parse-options.h" 10#include"dir.h" 11#include"run-command.h" 12#include"quote.h" 13#include"tempfile.h" 14#include"lockfile.h" 15#include"cache-tree.h" 16#include"refs.h" 17#include"commit.h" 18#include"diff.h" 19#include"diffcore.h" 20#include"unpack-trees.h" 21#include"branch.h" 22#include"sequencer.h" 23#include"revision.h" 24#include"merge-recursive.h" 25#include"revision.h" 26#include"log-tree.h" 27#include"notes-utils.h" 28#include"rerere.h" 29#include"prompt.h" 30 31/** 32 * Returns 1 if the file is empty or does not exist, 0 otherwise. 33 */ 34static intis_empty_file(const char*filename) 35{ 36struct stat st; 37 38if(stat(filename, &st) <0) { 39if(errno == ENOENT) 40return1; 41die_errno(_("could not stat%s"), filename); 42} 43 44return!st.st_size; 45} 46 47/** 48 * Like strbuf_getline(), but treats both '\n' and "\r\n" as line terminators. 49 */ 50static intstrbuf_getline_crlf(struct strbuf *sb,FILE*fp) 51{ 52if(strbuf_getwholeline(sb, fp,'\n')) 53return EOF; 54if(sb->buf[sb->len -1] =='\n') { 55strbuf_setlen(sb, sb->len -1); 56if(sb->len >0&& sb->buf[sb->len -1] =='\r') 57strbuf_setlen(sb, sb->len -1); 58} 59return0; 60} 61 62/** 63 * Returns the length of the first line of msg. 64 */ 65static intlinelen(const char*msg) 66{ 67returnstrchrnul(msg,'\n') - msg; 68} 69 70/** 71 * Returns true if `str` consists of only whitespace, false otherwise. 72 */ 73static intstr_isspace(const char*str) 74{ 75for(; *str; str++) 76if(!isspace(*str)) 77return0; 78 79return1; 80} 81 82enum patch_format { 83 PATCH_FORMAT_UNKNOWN =0, 84 PATCH_FORMAT_MBOX, 85 PATCH_FORMAT_STGIT, 86 PATCH_FORMAT_STGIT_SERIES, 87 PATCH_FORMAT_HG 88}; 89 90enum keep_type { 91 KEEP_FALSE =0, 92 KEEP_TRUE,/* pass -k flag to git-mailinfo */ 93 KEEP_NON_PATCH /* pass -b flag to git-mailinfo */ 94}; 95 96enum scissors_type { 97 SCISSORS_UNSET = -1, 98 SCISSORS_FALSE =0,/* pass --no-scissors to git-mailinfo */ 99 SCISSORS_TRUE /* pass --scissors to git-mailinfo */ 100}; 101 102enum signoff_type { 103 SIGNOFF_FALSE =0, 104 SIGNOFF_TRUE =1, 105 SIGNOFF_EXPLICIT /* --signoff was set on the command-line */ 106}; 107 108struct am_state { 109/* state directory path */ 110char*dir; 111 112/* current and last patch numbers, 1-indexed */ 113int cur; 114int last; 115 116/* commit metadata and message */ 117char*author_name; 118char*author_email; 119char*author_date; 120char*msg; 121size_t msg_len; 122 123/* when --rebasing, records the original commit the patch came from */ 124unsigned char orig_commit[GIT_SHA1_RAWSZ]; 125 126/* number of digits in patch filename */ 127int prec; 128 129/* various operating modes and command line options */ 130int interactive; 131int threeway; 132int quiet; 133int signoff;/* enum signoff_type */ 134int utf8; 135int keep;/* enum keep_type */ 136int message_id; 137int scissors;/* enum scissors_type */ 138struct argv_array git_apply_opts; 139const char*resolvemsg; 140int committer_date_is_author_date; 141int ignore_date; 142int allow_rerere_autoupdate; 143const char*sign_commit; 144int rebasing; 145}; 146 147/** 148 * Initializes am_state with the default values. The state directory is set to 149 * dir. 150 */ 151static voidam_state_init(struct am_state *state,const char*dir) 152{ 153int gpgsign; 154 155memset(state,0,sizeof(*state)); 156 157assert(dir); 158 state->dir =xstrdup(dir); 159 160 state->prec =4; 161 162git_config_get_bool("am.threeway", &state->threeway); 163 164 state->utf8 =1; 165 166git_config_get_bool("am.messageid", &state->message_id); 167 168 state->scissors = SCISSORS_UNSET; 169 170argv_array_init(&state->git_apply_opts); 171 172if(!git_config_get_bool("commit.gpgsign", &gpgsign)) 173 state->sign_commit = gpgsign ?"": NULL; 174} 175 176/** 177 * Releases memory allocated by an am_state. 178 */ 179static voidam_state_release(struct am_state *state) 180{ 181free(state->dir); 182free(state->author_name); 183free(state->author_email); 184free(state->author_date); 185free(state->msg); 186argv_array_clear(&state->git_apply_opts); 187} 188 189/** 190 * Returns path relative to the am_state directory. 191 */ 192staticinlineconst char*am_path(const struct am_state *state,const char*path) 193{ 194returnmkpath("%s/%s", state->dir, path); 195} 196 197/** 198 * For convenience to call write_file() 199 */ 200static intwrite_state_text(const struct am_state *state, 201const char*name,const char*string) 202{ 203returnwrite_file(am_path(state, name),"%s", string); 204} 205 206static intwrite_state_count(const struct am_state *state, 207const char*name,int value) 208{ 209returnwrite_file(am_path(state, name),"%d", value); 210} 211 212static intwrite_state_bool(const struct am_state *state, 213const char*name,int value) 214{ 215returnwrite_state_text(state, name, value ?"t":"f"); 216} 217 218/** 219 * If state->quiet is false, calls fprintf(fp, fmt, ...), and appends a newline 220 * at the end. 221 */ 222static voidsay(const struct am_state *state,FILE*fp,const char*fmt, ...) 223{ 224va_list ap; 225 226va_start(ap, fmt); 227if(!state->quiet) { 228vfprintf(fp, fmt, ap); 229putc('\n', fp); 230} 231va_end(ap); 232} 233 234/** 235 * Returns 1 if there is an am session in progress, 0 otherwise. 236 */ 237static intam_in_progress(const struct am_state *state) 238{ 239struct stat st; 240 241if(lstat(state->dir, &st) <0|| !S_ISDIR(st.st_mode)) 242return0; 243if(lstat(am_path(state,"last"), &st) || !S_ISREG(st.st_mode)) 244return0; 245if(lstat(am_path(state,"next"), &st) || !S_ISREG(st.st_mode)) 246return0; 247return1; 248} 249 250/** 251 * Reads the contents of `file` in the `state` directory into `sb`. Returns the 252 * number of bytes read on success, -1 if the file does not exist. If `trim` is 253 * set, trailing whitespace will be removed. 254 */ 255static intread_state_file(struct strbuf *sb,const struct am_state *state, 256const char*file,int trim) 257{ 258strbuf_reset(sb); 259 260if(strbuf_read_file(sb,am_path(state, file),0) >=0) { 261if(trim) 262strbuf_trim(sb); 263 264return sb->len; 265} 266 267if(errno == ENOENT) 268return-1; 269 270die_errno(_("could not read '%s'"),am_path(state, file)); 271} 272 273/** 274 * Reads a KEY=VALUE shell variable assignment from `fp`, returning the VALUE 275 * as a newly-allocated string. VALUE must be a quoted string, and the KEY must 276 * match `key`. Returns NULL on failure. 277 * 278 * This is used by read_author_script() to read the GIT_AUTHOR_* variables from 279 * the author-script. 280 */ 281static char*read_shell_var(FILE*fp,const char*key) 282{ 283struct strbuf sb = STRBUF_INIT; 284const char*str; 285 286if(strbuf_getline(&sb, fp,'\n')) 287goto fail; 288 289if(!skip_prefix(sb.buf, key, &str)) 290goto fail; 291 292if(!skip_prefix(str,"=", &str)) 293goto fail; 294 295strbuf_remove(&sb,0, str - sb.buf); 296 297 str =sq_dequote(sb.buf); 298if(!str) 299goto fail; 300 301returnstrbuf_detach(&sb, NULL); 302 303fail: 304strbuf_release(&sb); 305return NULL; 306} 307 308/** 309 * Reads and parses the state directory's "author-script" file, and sets 310 * state->author_name, state->author_email and state->author_date accordingly. 311 * Returns 0 on success, -1 if the file could not be parsed. 312 * 313 * The author script is of the format: 314 * 315 * GIT_AUTHOR_NAME='$author_name' 316 * GIT_AUTHOR_EMAIL='$author_email' 317 * GIT_AUTHOR_DATE='$author_date' 318 * 319 * where $author_name, $author_email and $author_date are quoted. We are strict 320 * with our parsing, as the file was meant to be eval'd in the old git-am.sh 321 * script, and thus if the file differs from what this function expects, it is 322 * better to bail out than to do something that the user does not expect. 323 */ 324static intread_author_script(struct am_state *state) 325{ 326const char*filename =am_path(state,"author-script"); 327FILE*fp; 328 329assert(!state->author_name); 330assert(!state->author_email); 331assert(!state->author_date); 332 333 fp =fopen(filename,"r"); 334if(!fp) { 335if(errno == ENOENT) 336return0; 337die_errno(_("could not open '%s' for reading"), filename); 338} 339 340 state->author_name =read_shell_var(fp,"GIT_AUTHOR_NAME"); 341if(!state->author_name) { 342fclose(fp); 343return-1; 344} 345 346 state->author_email =read_shell_var(fp,"GIT_AUTHOR_EMAIL"); 347if(!state->author_email) { 348fclose(fp); 349return-1; 350} 351 352 state->author_date =read_shell_var(fp,"GIT_AUTHOR_DATE"); 353if(!state->author_date) { 354fclose(fp); 355return-1; 356} 357 358if(fgetc(fp) != EOF) { 359fclose(fp); 360return-1; 361} 362 363fclose(fp); 364return0; 365} 366 367/** 368 * Saves state->author_name, state->author_email and state->author_date in the 369 * state directory's "author-script" file. 370 */ 371static voidwrite_author_script(const struct am_state *state) 372{ 373struct strbuf sb = STRBUF_INIT; 374 375strbuf_addstr(&sb,"GIT_AUTHOR_NAME="); 376sq_quote_buf(&sb, state->author_name); 377strbuf_addch(&sb,'\n'); 378 379strbuf_addstr(&sb,"GIT_AUTHOR_EMAIL="); 380sq_quote_buf(&sb, state->author_email); 381strbuf_addch(&sb,'\n'); 382 383strbuf_addstr(&sb,"GIT_AUTHOR_DATE="); 384sq_quote_buf(&sb, state->author_date); 385strbuf_addch(&sb,'\n'); 386 387write_state_text(state,"author-script", sb.buf); 388 389strbuf_release(&sb); 390} 391 392/** 393 * Reads the commit message from the state directory's "final-commit" file, 394 * setting state->msg to its contents and state->msg_len to the length of its 395 * contents in bytes. 396 * 397 * Returns 0 on success, -1 if the file does not exist. 398 */ 399static intread_commit_msg(struct am_state *state) 400{ 401struct strbuf sb = STRBUF_INIT; 402 403assert(!state->msg); 404 405if(read_state_file(&sb, state,"final-commit",0) <0) { 406strbuf_release(&sb); 407return-1; 408} 409 410 state->msg =strbuf_detach(&sb, &state->msg_len); 411return0; 412} 413 414/** 415 * Saves state->msg in the state directory's "final-commit" file. 416 */ 417static voidwrite_commit_msg(const struct am_state *state) 418{ 419int fd; 420const char*filename =am_path(state,"final-commit"); 421 422 fd =xopen(filename, O_WRONLY | O_CREAT,0666); 423if(write_in_full(fd, state->msg, state->msg_len) <0) 424die_errno(_("could not write to%s"), filename); 425close(fd); 426} 427 428/** 429 * Loads state from disk. 430 */ 431static voidam_load(struct am_state *state) 432{ 433struct strbuf sb = STRBUF_INIT; 434 435if(read_state_file(&sb, state,"next",1) <0) 436die("BUG: state file 'next' does not exist"); 437 state->cur =strtol(sb.buf, NULL,10); 438 439if(read_state_file(&sb, state,"last",1) <0) 440die("BUG: state file 'last' does not exist"); 441 state->last =strtol(sb.buf, NULL,10); 442 443if(read_author_script(state) <0) 444die(_("could not parse author script")); 445 446read_commit_msg(state); 447 448if(read_state_file(&sb, state,"original-commit",1) <0) 449hashclr(state->orig_commit); 450else if(get_sha1_hex(sb.buf, state->orig_commit) <0) 451die(_("could not parse%s"),am_path(state,"original-commit")); 452 453read_state_file(&sb, state,"threeway",1); 454 state->threeway = !strcmp(sb.buf,"t"); 455 456read_state_file(&sb, state,"quiet",1); 457 state->quiet = !strcmp(sb.buf,"t"); 458 459read_state_file(&sb, state,"sign",1); 460 state->signoff = !strcmp(sb.buf,"t"); 461 462read_state_file(&sb, state,"utf8",1); 463 state->utf8 = !strcmp(sb.buf,"t"); 464 465read_state_file(&sb, state,"keep",1); 466if(!strcmp(sb.buf,"t")) 467 state->keep = KEEP_TRUE; 468else if(!strcmp(sb.buf,"b")) 469 state->keep = KEEP_NON_PATCH; 470else 471 state->keep = KEEP_FALSE; 472 473read_state_file(&sb, state,"messageid",1); 474 state->message_id = !strcmp(sb.buf,"t"); 475 476read_state_file(&sb, state,"scissors",1); 477if(!strcmp(sb.buf,"t")) 478 state->scissors = SCISSORS_TRUE; 479else if(!strcmp(sb.buf,"f")) 480 state->scissors = SCISSORS_FALSE; 481else 482 state->scissors = SCISSORS_UNSET; 483 484read_state_file(&sb, state,"apply-opt",1); 485argv_array_clear(&state->git_apply_opts); 486if(sq_dequote_to_argv_array(sb.buf, &state->git_apply_opts) <0) 487die(_("could not parse%s"),am_path(state,"apply-opt")); 488 489 state->rebasing = !!file_exists(am_path(state,"rebasing")); 490 491strbuf_release(&sb); 492} 493 494/** 495 * Removes the am_state directory, forcefully terminating the current am 496 * session. 497 */ 498static voidam_destroy(const struct am_state *state) 499{ 500struct strbuf sb = STRBUF_INIT; 501 502strbuf_addstr(&sb, state->dir); 503remove_dir_recursively(&sb,0); 504strbuf_release(&sb); 505} 506 507/** 508 * Runs applypatch-msg hook. Returns its exit code. 509 */ 510static intrun_applypatch_msg_hook(struct am_state *state) 511{ 512int ret; 513 514assert(state->msg); 515 ret =run_hook_le(NULL,"applypatch-msg",am_path(state,"final-commit"), NULL); 516 517if(!ret) { 518free(state->msg); 519 state->msg = NULL; 520if(read_commit_msg(state) <0) 521die(_("'%s' was deleted by the applypatch-msg hook"), 522am_path(state,"final-commit")); 523} 524 525return ret; 526} 527 528/** 529 * Runs post-rewrite hook. Returns it exit code. 530 */ 531static intrun_post_rewrite_hook(const struct am_state *state) 532{ 533struct child_process cp = CHILD_PROCESS_INIT; 534const char*hook =find_hook("post-rewrite"); 535int ret; 536 537if(!hook) 538return0; 539 540argv_array_push(&cp.args, hook); 541argv_array_push(&cp.args,"rebase"); 542 543 cp.in =xopen(am_path(state,"rewritten"), O_RDONLY); 544 cp.stdout_to_stderr =1; 545 546 ret =run_command(&cp); 547 548close(cp.in); 549return ret; 550} 551 552/** 553 * Reads the state directory's "rewritten" file, and copies notes from the old 554 * commits listed in the file to their rewritten commits. 555 * 556 * Returns 0 on success, -1 on failure. 557 */ 558static intcopy_notes_for_rebase(const struct am_state *state) 559{ 560struct notes_rewrite_cfg *c; 561struct strbuf sb = STRBUF_INIT; 562const char*invalid_line =_("Malformed input line: '%s'."); 563const char*msg ="Notes added by 'git rebase'"; 564FILE*fp; 565int ret =0; 566 567assert(state->rebasing); 568 569 c =init_copy_notes_for_rewrite("rebase"); 570if(!c) 571return0; 572 573 fp =xfopen(am_path(state,"rewritten"),"r"); 574 575while(!strbuf_getline(&sb, fp,'\n')) { 576unsigned char from_obj[GIT_SHA1_RAWSZ], to_obj[GIT_SHA1_RAWSZ]; 577 578if(sb.len != GIT_SHA1_HEXSZ *2+1) { 579 ret =error(invalid_line, sb.buf); 580goto finish; 581} 582 583if(get_sha1_hex(sb.buf, from_obj)) { 584 ret =error(invalid_line, sb.buf); 585goto finish; 586} 587 588if(sb.buf[GIT_SHA1_HEXSZ] !=' ') { 589 ret =error(invalid_line, sb.buf); 590goto finish; 591} 592 593if(get_sha1_hex(sb.buf + GIT_SHA1_HEXSZ +1, to_obj)) { 594 ret =error(invalid_line, sb.buf); 595goto finish; 596} 597 598if(copy_note_for_rewrite(c, from_obj, to_obj)) 599 ret =error(_("Failed to copy notes from '%s' to '%s'"), 600sha1_to_hex(from_obj),sha1_to_hex(to_obj)); 601} 602 603finish: 604finish_copy_notes_for_rewrite(c, msg); 605fclose(fp); 606strbuf_release(&sb); 607return ret; 608} 609 610/** 611 * Determines if the file looks like a piece of RFC2822 mail by grabbing all 612 * non-indented lines and checking if they look like they begin with valid 613 * header field names. 614 * 615 * Returns 1 if the file looks like a piece of mail, 0 otherwise. 616 */ 617static intis_mail(FILE*fp) 618{ 619const char*header_regex ="^[!-9;-~]+:"; 620struct strbuf sb = STRBUF_INIT; 621 regex_t regex; 622int ret =1; 623 624if(fseek(fp,0L, SEEK_SET)) 625die_errno(_("fseek failed")); 626 627if(regcomp(®ex, header_regex, REG_NOSUB | REG_EXTENDED)) 628die("invalid pattern:%s", header_regex); 629 630while(!strbuf_getline_crlf(&sb, fp)) { 631if(!sb.len) 632break;/* End of header */ 633 634/* Ignore indented folded lines */ 635if(*sb.buf =='\t'|| *sb.buf ==' ') 636continue; 637 638/* It's a header if it matches header_regex */ 639if(regexec(®ex, sb.buf,0, NULL,0)) { 640 ret =0; 641goto done; 642} 643} 644 645done: 646regfree(®ex); 647strbuf_release(&sb); 648return ret; 649} 650 651/** 652 * Attempts to detect the patch_format of the patches contained in `paths`, 653 * returning the PATCH_FORMAT_* enum value. Returns PATCH_FORMAT_UNKNOWN if 654 * detection fails. 655 */ 656static intdetect_patch_format(const char**paths) 657{ 658enum patch_format ret = PATCH_FORMAT_UNKNOWN; 659struct strbuf l1 = STRBUF_INIT; 660struct strbuf l2 = STRBUF_INIT; 661struct strbuf l3 = STRBUF_INIT; 662FILE*fp; 663 664/* 665 * We default to mbox format if input is from stdin and for directories 666 */ 667if(!*paths || !strcmp(*paths,"-") ||is_directory(*paths)) 668return PATCH_FORMAT_MBOX; 669 670/* 671 * Otherwise, check the first few lines of the first patch, starting 672 * from the first non-blank line, to try to detect its format. 673 */ 674 675 fp =xfopen(*paths,"r"); 676 677while(!strbuf_getline_crlf(&l1, fp)) { 678if(l1.len) 679break; 680} 681 682if(starts_with(l1.buf,"From ") ||starts_with(l1.buf,"From: ")) { 683 ret = PATCH_FORMAT_MBOX; 684goto done; 685} 686 687if(starts_with(l1.buf,"# This series applies on GIT commit")) { 688 ret = PATCH_FORMAT_STGIT_SERIES; 689goto done; 690} 691 692if(!strcmp(l1.buf,"# HG changeset patch")) { 693 ret = PATCH_FORMAT_HG; 694goto done; 695} 696 697strbuf_reset(&l2); 698strbuf_getline_crlf(&l2, fp); 699strbuf_reset(&l3); 700strbuf_getline_crlf(&l3, fp); 701 702/* 703 * If the second line is empty and the third is a From, Author or Date 704 * entry, this is likely an StGit patch. 705 */ 706if(l1.len && !l2.len && 707(starts_with(l3.buf,"From:") || 708starts_with(l3.buf,"Author:") || 709starts_with(l3.buf,"Date:"))) { 710 ret = PATCH_FORMAT_STGIT; 711goto done; 712} 713 714if(l1.len &&is_mail(fp)) { 715 ret = PATCH_FORMAT_MBOX; 716goto done; 717} 718 719done: 720fclose(fp); 721strbuf_release(&l1); 722return ret; 723} 724 725/** 726 * Splits out individual email patches from `paths`, where each path is either 727 * a mbox file or a Maildir. Returns 0 on success, -1 on failure. 728 */ 729static intsplit_mail_mbox(struct am_state *state,const char**paths,int keep_cr) 730{ 731struct child_process cp = CHILD_PROCESS_INIT; 732struct strbuf last = STRBUF_INIT; 733 734 cp.git_cmd =1; 735argv_array_push(&cp.args,"mailsplit"); 736argv_array_pushf(&cp.args,"-d%d", state->prec); 737argv_array_pushf(&cp.args,"-o%s", state->dir); 738argv_array_push(&cp.args,"-b"); 739if(keep_cr) 740argv_array_push(&cp.args,"--keep-cr"); 741argv_array_push(&cp.args,"--"); 742argv_array_pushv(&cp.args, paths); 743 744if(capture_command(&cp, &last,8)) 745return-1; 746 747 state->cur =1; 748 state->last =strtol(last.buf, NULL,10); 749 750return0; 751} 752 753/** 754 * Callback signature for split_mail_conv(). The foreign patch should be 755 * read from `in`, and the converted patch (in RFC2822 mail format) should be 756 * written to `out`. Return 0 on success, or -1 on failure. 757 */ 758typedefint(*mail_conv_fn)(FILE*out,FILE*in,int keep_cr); 759 760/** 761 * Calls `fn` for each file in `paths` to convert the foreign patch to the 762 * RFC2822 mail format suitable for parsing with git-mailinfo. 763 * 764 * Returns 0 on success, -1 on failure. 765 */ 766static intsplit_mail_conv(mail_conv_fn fn,struct am_state *state, 767const char**paths,int keep_cr) 768{ 769static const char*stdin_only[] = {"-", NULL}; 770int i; 771 772if(!*paths) 773 paths = stdin_only; 774 775for(i =0; *paths; paths++, i++) { 776FILE*in, *out; 777const char*mail; 778int ret; 779 780if(!strcmp(*paths,"-")) 781 in = stdin; 782else 783 in =fopen(*paths,"r"); 784 785if(!in) 786returnerror(_("could not open '%s' for reading:%s"), 787*paths,strerror(errno)); 788 789 mail =mkpath("%s/%0*d", state->dir, state->prec, i +1); 790 791 out =fopen(mail,"w"); 792if(!out) 793returnerror(_("could not open '%s' for writing:%s"), 794 mail,strerror(errno)); 795 796 ret =fn(out, in, keep_cr); 797 798fclose(out); 799fclose(in); 800 801if(ret) 802returnerror(_("could not parse patch '%s'"), *paths); 803} 804 805 state->cur =1; 806 state->last = i; 807return0; 808} 809 810/** 811 * A split_mail_conv() callback that converts an StGit patch to an RFC2822 812 * message suitable for parsing with git-mailinfo. 813 */ 814static intstgit_patch_to_mail(FILE*out,FILE*in,int keep_cr) 815{ 816struct strbuf sb = STRBUF_INIT; 817int subject_printed =0; 818 819while(!strbuf_getline(&sb, in,'\n')) { 820const char*str; 821 822if(str_isspace(sb.buf)) 823continue; 824else if(skip_prefix(sb.buf,"Author:", &str)) 825fprintf(out,"From:%s\n", str); 826else if(starts_with(sb.buf,"From") ||starts_with(sb.buf,"Date")) 827fprintf(out,"%s\n", sb.buf); 828else if(!subject_printed) { 829fprintf(out,"Subject:%s\n", sb.buf); 830 subject_printed =1; 831}else{ 832fprintf(out,"\n%s\n", sb.buf); 833break; 834} 835} 836 837strbuf_reset(&sb); 838while(strbuf_fread(&sb,8192, in) >0) { 839fwrite(sb.buf,1, sb.len, out); 840strbuf_reset(&sb); 841} 842 843strbuf_release(&sb); 844return0; 845} 846 847/** 848 * This function only supports a single StGit series file in `paths`. 849 * 850 * Given an StGit series file, converts the StGit patches in the series into 851 * RFC2822 messages suitable for parsing with git-mailinfo, and queues them in 852 * the state directory. 853 * 854 * Returns 0 on success, -1 on failure. 855 */ 856static intsplit_mail_stgit_series(struct am_state *state,const char**paths, 857int keep_cr) 858{ 859const char*series_dir; 860char*series_dir_buf; 861FILE*fp; 862struct argv_array patches = ARGV_ARRAY_INIT; 863struct strbuf sb = STRBUF_INIT; 864int ret; 865 866if(!paths[0] || paths[1]) 867returnerror(_("Only one StGIT patch series can be applied at once")); 868 869 series_dir_buf =xstrdup(*paths); 870 series_dir =dirname(series_dir_buf); 871 872 fp =fopen(*paths,"r"); 873if(!fp) 874returnerror(_("could not open '%s' for reading:%s"), *paths, 875strerror(errno)); 876 877while(!strbuf_getline(&sb, fp,'\n')) { 878if(*sb.buf =='#') 879continue;/* skip comment lines */ 880 881argv_array_push(&patches,mkpath("%s/%s", series_dir, sb.buf)); 882} 883 884fclose(fp); 885strbuf_release(&sb); 886free(series_dir_buf); 887 888 ret =split_mail_conv(stgit_patch_to_mail, state, patches.argv, keep_cr); 889 890argv_array_clear(&patches); 891return ret; 892} 893 894/** 895 * A split_patches_conv() callback that converts a mercurial patch to a RFC2822 896 * message suitable for parsing with git-mailinfo. 897 */ 898static inthg_patch_to_mail(FILE*out,FILE*in,int keep_cr) 899{ 900struct strbuf sb = STRBUF_INIT; 901 902while(!strbuf_getline(&sb, in,'\n')) { 903const char*str; 904 905if(skip_prefix(sb.buf,"# User ", &str)) 906fprintf(out,"From:%s\n", str); 907else if(skip_prefix(sb.buf,"# Date ", &str)) { 908unsigned long timestamp; 909long tz, tz2; 910char*end; 911 912 errno =0; 913 timestamp =strtoul(str, &end,10); 914if(errno) 915returnerror(_("invalid timestamp")); 916 917if(!skip_prefix(end," ", &str)) 918returnerror(_("invalid Date line")); 919 920 errno =0; 921 tz =strtol(str, &end,10); 922if(errno) 923returnerror(_("invalid timezone offset")); 924 925if(*end) 926returnerror(_("invalid Date line")); 927 928/* 929 * mercurial's timezone is in seconds west of UTC, 930 * however git's timezone is in hours + minutes east of 931 * UTC. Convert it. 932 */ 933 tz2 =labs(tz) /3600*100+labs(tz) %3600/60; 934if(tz >0) 935 tz2 = -tz2; 936 937fprintf(out,"Date:%s\n",show_date(timestamp, tz2,DATE_MODE(RFC2822))); 938}else if(starts_with(sb.buf,"# ")) { 939continue; 940}else{ 941fprintf(out,"\n%s\n", sb.buf); 942break; 943} 944} 945 946strbuf_reset(&sb); 947while(strbuf_fread(&sb,8192, in) >0) { 948fwrite(sb.buf,1, sb.len, out); 949strbuf_reset(&sb); 950} 951 952strbuf_release(&sb); 953return0; 954} 955 956/** 957 * Splits a list of files/directories into individual email patches. Each path 958 * in `paths` must be a file/directory that is formatted according to 959 * `patch_format`. 960 * 961 * Once split out, the individual email patches will be stored in the state 962 * directory, with each patch's filename being its index, padded to state->prec 963 * digits. 964 * 965 * state->cur will be set to the index of the first mail, and state->last will 966 * be set to the index of the last mail. 967 * 968 * Set keep_cr to 0 to convert all lines ending with \r\n to end with \n, 1 969 * to disable this behavior, -1 to use the default configured setting. 970 * 971 * Returns 0 on success, -1 on failure. 972 */ 973static intsplit_mail(struct am_state *state,enum patch_format patch_format, 974const char**paths,int keep_cr) 975{ 976if(keep_cr <0) { 977 keep_cr =0; 978git_config_get_bool("am.keepcr", &keep_cr); 979} 980 981switch(patch_format) { 982case PATCH_FORMAT_MBOX: 983returnsplit_mail_mbox(state, paths, keep_cr); 984case PATCH_FORMAT_STGIT: 985returnsplit_mail_conv(stgit_patch_to_mail, state, paths, keep_cr); 986case PATCH_FORMAT_STGIT_SERIES: 987returnsplit_mail_stgit_series(state, paths, keep_cr); 988case PATCH_FORMAT_HG: 989returnsplit_mail_conv(hg_patch_to_mail, state, paths, keep_cr); 990default: 991die("BUG: invalid patch_format"); 992} 993return-1; 994} 995 996/** 997 * Setup a new am session for applying patches 998 */ 999static voidam_setup(struct am_state *state,enum patch_format patch_format,1000const char**paths,int keep_cr)1001{1002unsigned char curr_head[GIT_SHA1_RAWSZ];1003const char*str;1004struct strbuf sb = STRBUF_INIT;10051006if(!patch_format)1007 patch_format =detect_patch_format(paths);10081009if(!patch_format) {1010fprintf_ln(stderr,_("Patch format detection failed."));1011exit(128);1012}10131014if(mkdir(state->dir,0777) <0&& errno != EEXIST)1015die_errno(_("failed to create directory '%s'"), state->dir);10161017if(split_mail(state, patch_format, paths, keep_cr) <0) {1018am_destroy(state);1019die(_("Failed to split patches."));1020}10211022if(state->rebasing)1023 state->threeway =1;10241025write_state_bool(state,"threeway", state->threeway);1026write_state_bool(state,"quiet", state->quiet);1027write_state_bool(state,"sign", state->signoff);1028write_state_bool(state,"utf8", state->utf8);10291030switch(state->keep) {1031case KEEP_FALSE:1032 str ="f";1033break;1034case KEEP_TRUE:1035 str ="t";1036break;1037case KEEP_NON_PATCH:1038 str ="b";1039break;1040default:1041die("BUG: invalid value for state->keep");1042}10431044write_state_text(state,"keep", str);1045write_state_bool(state,"messageid", state->message_id);10461047switch(state->scissors) {1048case SCISSORS_UNSET:1049 str ="";1050break;1051case SCISSORS_FALSE:1052 str ="f";1053break;1054case SCISSORS_TRUE:1055 str ="t";1056break;1057default:1058die("BUG: invalid value for state->scissors");1059}1060write_state_text(state,"scissors", str);10611062sq_quote_argv(&sb, state->git_apply_opts.argv,0);1063write_state_text(state,"apply-opt", sb.buf);10641065if(state->rebasing)1066write_state_text(state,"rebasing","");1067else1068write_state_text(state,"applying","");10691070if(!get_sha1("HEAD", curr_head)) {1071write_state_text(state,"abort-safety",sha1_to_hex(curr_head));1072if(!state->rebasing)1073update_ref("am","ORIG_HEAD", curr_head, NULL,0,1074 UPDATE_REFS_DIE_ON_ERR);1075}else{1076write_state_text(state,"abort-safety","");1077if(!state->rebasing)1078delete_ref("ORIG_HEAD", NULL,0);1079}10801081/*1082 * NOTE: Since the "next" and "last" files determine if an am_state1083 * session is in progress, they should be written last.1084 */10851086write_state_count(state,"next", state->cur);1087write_state_count(state,"last", state->last);10881089strbuf_release(&sb);1090}10911092/**1093 * Increments the patch pointer, and cleans am_state for the application of the1094 * next patch.1095 */1096static voidam_next(struct am_state *state)1097{1098unsigned char head[GIT_SHA1_RAWSZ];10991100free(state->author_name);1101 state->author_name = NULL;11021103free(state->author_email);1104 state->author_email = NULL;11051106free(state->author_date);1107 state->author_date = NULL;11081109free(state->msg);1110 state->msg = NULL;1111 state->msg_len =0;11121113unlink(am_path(state,"author-script"));1114unlink(am_path(state,"final-commit"));11151116hashclr(state->orig_commit);1117unlink(am_path(state,"original-commit"));11181119if(!get_sha1("HEAD", head))1120write_state_text(state,"abort-safety",sha1_to_hex(head));1121else1122write_state_text(state,"abort-safety","");11231124 state->cur++;1125write_state_count(state,"next", state->cur);1126}11271128/**1129 * Returns the filename of the current patch email.1130 */1131static const char*msgnum(const struct am_state *state)1132{1133static struct strbuf sb = STRBUF_INIT;11341135strbuf_reset(&sb);1136strbuf_addf(&sb,"%0*d", state->prec, state->cur);11371138return sb.buf;1139}11401141/**1142 * Refresh and write index.1143 */1144static voidrefresh_and_write_cache(void)1145{1146struct lock_file *lock_file =xcalloc(1,sizeof(struct lock_file));11471148hold_locked_index(lock_file,1);1149refresh_cache(REFRESH_QUIET);1150if(write_locked_index(&the_index, lock_file, COMMIT_LOCK))1151die(_("unable to write index file"));1152}11531154/**1155 * Returns 1 if the index differs from HEAD, 0 otherwise. When on an unborn1156 * branch, returns 1 if there are entries in the index, 0 otherwise. If an1157 * strbuf is provided, the space-separated list of files that differ will be1158 * appended to it.1159 */1160static intindex_has_changes(struct strbuf *sb)1161{1162unsigned char head[GIT_SHA1_RAWSZ];1163int i;11641165if(!get_sha1_tree("HEAD", head)) {1166struct diff_options opt;11671168diff_setup(&opt);1169DIFF_OPT_SET(&opt, EXIT_WITH_STATUS);1170if(!sb)1171DIFF_OPT_SET(&opt, QUICK);1172do_diff_cache(head, &opt);1173diffcore_std(&opt);1174for(i =0; sb && i < diff_queued_diff.nr; i++) {1175if(i)1176strbuf_addch(sb,' ');1177strbuf_addstr(sb, diff_queued_diff.queue[i]->two->path);1178}1179diff_flush(&opt);1180returnDIFF_OPT_TST(&opt, HAS_CHANGES) !=0;1181}else{1182for(i =0; sb && i < active_nr; i++) {1183if(i)1184strbuf_addch(sb,' ');1185strbuf_addstr(sb, active_cache[i]->name);1186}1187return!!active_nr;1188}1189}11901191/**1192 * Dies with a user-friendly message on how to proceed after resolving the1193 * problem. This message can be overridden with state->resolvemsg.1194 */1195static void NORETURN die_user_resolve(const struct am_state *state)1196{1197if(state->resolvemsg) {1198printf_ln("%s", state->resolvemsg);1199}else{1200const char*cmdline = state->interactive ?"git am -i":"git am";12011202printf_ln(_("When you have resolved this problem, run\"%s--continue\"."), cmdline);1203printf_ln(_("If you prefer to skip this patch, run\"%s--skip\"instead."), cmdline);1204printf_ln(_("To restore the original branch and stop patching, run\"%s--abort\"."), cmdline);1205}12061207exit(128);1208}12091210/**1211 * Appends signoff to the "msg" field of the am_state.1212 */1213static voidam_append_signoff(struct am_state *state)1214{1215struct strbuf sb = STRBUF_INIT;12161217strbuf_attach(&sb, state->msg, state->msg_len, state->msg_len);1218append_signoff(&sb,0,0);1219 state->msg =strbuf_detach(&sb, &state->msg_len);1220}12211222/**1223 * Parses `mail` using git-mailinfo, extracting its patch and authorship info.1224 * state->msg will be set to the patch message. state->author_name,1225 * state->author_email and state->author_date will be set to the patch author's1226 * name, email and date respectively. The patch body will be written to the1227 * state directory's "patch" file.1228 *1229 * Returns 1 if the patch should be skipped, 0 otherwise.1230 */1231static intparse_mail(struct am_state *state,const char*mail)1232{1233FILE*fp;1234struct child_process cp = CHILD_PROCESS_INIT;1235struct strbuf sb = STRBUF_INIT;1236struct strbuf msg = STRBUF_INIT;1237struct strbuf author_name = STRBUF_INIT;1238struct strbuf author_date = STRBUF_INIT;1239struct strbuf author_email = STRBUF_INIT;1240int ret =0;12411242 cp.git_cmd =1;1243 cp.in =xopen(mail, O_RDONLY,0);1244 cp.out =xopen(am_path(state,"info"), O_WRONLY | O_CREAT,0777);12451246argv_array_push(&cp.args,"mailinfo");1247argv_array_push(&cp.args, state->utf8 ?"-u":"-n");12481249switch(state->keep) {1250case KEEP_FALSE:1251break;1252case KEEP_TRUE:1253argv_array_push(&cp.args,"-k");1254break;1255case KEEP_NON_PATCH:1256argv_array_push(&cp.args,"-b");1257break;1258default:1259die("BUG: invalid value for state->keep");1260}12611262if(state->message_id)1263argv_array_push(&cp.args,"-m");12641265switch(state->scissors) {1266case SCISSORS_UNSET:1267break;1268case SCISSORS_FALSE:1269argv_array_push(&cp.args,"--no-scissors");1270break;1271case SCISSORS_TRUE:1272argv_array_push(&cp.args,"--scissors");1273break;1274default:1275die("BUG: invalid value for state->scissors");1276}12771278argv_array_push(&cp.args,am_path(state,"msg"));1279argv_array_push(&cp.args,am_path(state,"patch"));12801281if(run_command(&cp) <0)1282die("could not parse patch");12831284close(cp.in);1285close(cp.out);12861287/* Extract message and author information */1288 fp =xfopen(am_path(state,"info"),"r");1289while(!strbuf_getline(&sb, fp,'\n')) {1290const char*x;12911292if(skip_prefix(sb.buf,"Subject: ", &x)) {1293if(msg.len)1294strbuf_addch(&msg,'\n');1295strbuf_addstr(&msg, x);1296}else if(skip_prefix(sb.buf,"Author: ", &x))1297strbuf_addstr(&author_name, x);1298else if(skip_prefix(sb.buf,"Email: ", &x))1299strbuf_addstr(&author_email, x);1300else if(skip_prefix(sb.buf,"Date: ", &x))1301strbuf_addstr(&author_date, x);1302}1303fclose(fp);13041305/* Skip pine's internal folder data */1306if(!strcmp(author_name.buf,"Mail System Internal Data")) {1307 ret =1;1308goto finish;1309}13101311if(is_empty_file(am_path(state,"patch"))) {1312printf_ln(_("Patch is empty. Was it split wrong?"));1313die_user_resolve(state);1314}13151316strbuf_addstr(&msg,"\n\n");1317if(strbuf_read_file(&msg,am_path(state,"msg"),0) <0)1318die_errno(_("could not read '%s'"),am_path(state,"msg"));1319stripspace(&msg,0);13201321if(state->signoff)1322append_signoff(&msg,0,0);13231324assert(!state->author_name);1325 state->author_name =strbuf_detach(&author_name, NULL);13261327assert(!state->author_email);1328 state->author_email =strbuf_detach(&author_email, NULL);13291330assert(!state->author_date);1331 state->author_date =strbuf_detach(&author_date, NULL);13321333assert(!state->msg);1334 state->msg =strbuf_detach(&msg, &state->msg_len);13351336finish:1337strbuf_release(&msg);1338strbuf_release(&author_date);1339strbuf_release(&author_email);1340strbuf_release(&author_name);1341strbuf_release(&sb);1342return ret;1343}13441345/**1346 * Sets commit_id to the commit hash where the mail was generated from.1347 * Returns 0 on success, -1 on failure.1348 */1349static intget_mail_commit_sha1(unsigned char*commit_id,const char*mail)1350{1351struct strbuf sb = STRBUF_INIT;1352FILE*fp =xfopen(mail,"r");1353const char*x;13541355if(strbuf_getline(&sb, fp,'\n'))1356return-1;13571358if(!skip_prefix(sb.buf,"From ", &x))1359return-1;13601361if(get_sha1_hex(x, commit_id) <0)1362return-1;13631364strbuf_release(&sb);1365fclose(fp);1366return0;1367}13681369/**1370 * Sets state->msg, state->author_name, state->author_email, state->author_date1371 * to the commit's respective info.1372 */1373static voidget_commit_info(struct am_state *state,struct commit *commit)1374{1375const char*buffer, *ident_line, *author_date, *msg;1376size_t ident_len;1377struct ident_split ident_split;1378struct strbuf sb = STRBUF_INIT;13791380 buffer =logmsg_reencode(commit, NULL,get_commit_output_encoding());13811382 ident_line =find_commit_header(buffer,"author", &ident_len);13831384if(split_ident_line(&ident_split, ident_line, ident_len) <0) {1385strbuf_add(&sb, ident_line, ident_len);1386die(_("invalid ident line:%s"), sb.buf);1387}13881389assert(!state->author_name);1390if(ident_split.name_begin) {1391strbuf_add(&sb, ident_split.name_begin,1392 ident_split.name_end - ident_split.name_begin);1393 state->author_name =strbuf_detach(&sb, NULL);1394}else1395 state->author_name =xstrdup("");13961397assert(!state->author_email);1398if(ident_split.mail_begin) {1399strbuf_add(&sb, ident_split.mail_begin,1400 ident_split.mail_end - ident_split.mail_begin);1401 state->author_email =strbuf_detach(&sb, NULL);1402}else1403 state->author_email =xstrdup("");14041405 author_date =show_ident_date(&ident_split,DATE_MODE(NORMAL));1406strbuf_addstr(&sb, author_date);1407assert(!state->author_date);1408 state->author_date =strbuf_detach(&sb, NULL);14091410assert(!state->msg);1411 msg =strstr(buffer,"\n\n");1412if(!msg)1413die(_("unable to parse commit%s"),sha1_to_hex(commit->object.sha1));1414 state->msg =xstrdup(msg +2);1415 state->msg_len =strlen(state->msg);1416}14171418/**1419 * Writes `commit` as a patch to the state directory's "patch" file.1420 */1421static voidwrite_commit_patch(const struct am_state *state,struct commit *commit)1422{1423struct rev_info rev_info;1424FILE*fp;14251426 fp =xfopen(am_path(state,"patch"),"w");1427init_revisions(&rev_info, NULL);1428 rev_info.diff =1;1429 rev_info.abbrev =0;1430 rev_info.disable_stdin =1;1431 rev_info.show_root_diff =1;1432 rev_info.diffopt.output_format = DIFF_FORMAT_PATCH;1433 rev_info.no_commit_id =1;1434DIFF_OPT_SET(&rev_info.diffopt, BINARY);1435DIFF_OPT_SET(&rev_info.diffopt, FULL_INDEX);1436 rev_info.diffopt.use_color =0;1437 rev_info.diffopt.file = fp;1438 rev_info.diffopt.close_file =1;1439add_pending_object(&rev_info, &commit->object,"");1440diff_setup_done(&rev_info.diffopt);1441log_tree_commit(&rev_info, commit);1442}14431444/**1445 * Writes the diff of the index against HEAD as a patch to the state1446 * directory's "patch" file.1447 */1448static voidwrite_index_patch(const struct am_state *state)1449{1450struct tree *tree;1451unsigned char head[GIT_SHA1_RAWSZ];1452struct rev_info rev_info;1453FILE*fp;14541455if(!get_sha1_tree("HEAD", head))1456 tree =lookup_tree(head);1457else1458 tree =lookup_tree(EMPTY_TREE_SHA1_BIN);14591460 fp =xfopen(am_path(state,"patch"),"w");1461init_revisions(&rev_info, NULL);1462 rev_info.diff =1;1463 rev_info.disable_stdin =1;1464 rev_info.no_commit_id =1;1465 rev_info.diffopt.output_format = DIFF_FORMAT_PATCH;1466 rev_info.diffopt.use_color =0;1467 rev_info.diffopt.file = fp;1468 rev_info.diffopt.close_file =1;1469add_pending_object(&rev_info, &tree->object,"");1470diff_setup_done(&rev_info.diffopt);1471run_diff_index(&rev_info,1);1472}14731474/**1475 * Like parse_mail(), but parses the mail by looking up its commit ID1476 * directly. This is used in --rebasing mode to bypass git-mailinfo's munging1477 * of patches.1478 *1479 * state->orig_commit will be set to the original commit ID.1480 *1481 * Will always return 0 as the patch should never be skipped.1482 */1483static intparse_mail_rebase(struct am_state *state,const char*mail)1484{1485struct commit *commit;1486unsigned char commit_sha1[GIT_SHA1_RAWSZ];14871488if(get_mail_commit_sha1(commit_sha1, mail) <0)1489die(_("could not parse%s"), mail);14901491 commit =lookup_commit_or_die(commit_sha1, mail);14921493get_commit_info(state, commit);14941495write_commit_patch(state, commit);14961497hashcpy(state->orig_commit, commit_sha1);1498write_state_text(state,"original-commit",sha1_to_hex(commit_sha1));14991500return0;1501}15021503/**1504 * Applies current patch with git-apply. Returns 0 on success, -1 otherwise. If1505 * `index_file` is not NULL, the patch will be applied to that index.1506 */1507static intrun_apply(const struct am_state *state,const char*index_file)1508{1509struct child_process cp = CHILD_PROCESS_INIT;15101511 cp.git_cmd =1;15121513if(index_file)1514argv_array_pushf(&cp.env_array,"GIT_INDEX_FILE=%s", index_file);15151516/*1517 * If we are allowed to fall back on 3-way merge, don't give false1518 * errors during the initial attempt.1519 */1520if(state->threeway && !index_file) {1521 cp.no_stdout =1;1522 cp.no_stderr =1;1523}15241525argv_array_push(&cp.args,"apply");15261527argv_array_pushv(&cp.args, state->git_apply_opts.argv);15281529if(index_file)1530argv_array_push(&cp.args,"--cached");1531else1532argv_array_push(&cp.args,"--index");15331534argv_array_push(&cp.args,am_path(state,"patch"));15351536if(run_command(&cp))1537return-1;15381539/* Reload index as git-apply will have modified it. */1540discard_cache();1541read_cache_from(index_file ? index_file :get_index_file());15421543return0;1544}15451546/**1547 * Builds an index that contains just the blobs needed for a 3way merge.1548 */1549static intbuild_fake_ancestor(const struct am_state *state,const char*index_file)1550{1551struct child_process cp = CHILD_PROCESS_INIT;15521553 cp.git_cmd =1;1554argv_array_push(&cp.args,"apply");1555argv_array_pushv(&cp.args, state->git_apply_opts.argv);1556argv_array_pushf(&cp.args,"--build-fake-ancestor=%s", index_file);1557argv_array_push(&cp.args,am_path(state,"patch"));15581559if(run_command(&cp))1560return-1;15611562return0;1563}15641565/**1566 * Attempt a threeway merge, using index_path as the temporary index.1567 */1568static intfall_back_threeway(const struct am_state *state,const char*index_path)1569{1570unsigned char orig_tree[GIT_SHA1_RAWSZ], his_tree[GIT_SHA1_RAWSZ],1571 our_tree[GIT_SHA1_RAWSZ];1572const unsigned char*bases[1] = {orig_tree};1573struct merge_options o;1574struct commit *result;1575char*his_tree_name;15761577if(get_sha1("HEAD", our_tree) <0)1578hashcpy(our_tree, EMPTY_TREE_SHA1_BIN);15791580if(build_fake_ancestor(state, index_path))1581returnerror("could not build fake ancestor");15821583discard_cache();1584read_cache_from(index_path);15851586if(write_index_as_tree(orig_tree, &the_index, index_path,0, NULL))1587returnerror(_("Repository lacks necessary blobs to fall back on 3-way merge."));15881589say(state, stdout,_("Using index info to reconstruct a base tree..."));15901591if(!state->quiet) {1592/*1593 * List paths that needed 3-way fallback, so that the user can1594 * review them with extra care to spot mismerges.1595 */1596struct rev_info rev_info;1597const char*diff_filter_str ="--diff-filter=AM";15981599init_revisions(&rev_info, NULL);1600 rev_info.diffopt.output_format = DIFF_FORMAT_NAME_STATUS;1601diff_opt_parse(&rev_info.diffopt, &diff_filter_str,1);1602add_pending_sha1(&rev_info,"HEAD", our_tree,0);1603diff_setup_done(&rev_info.diffopt);1604run_diff_index(&rev_info,1);1605}16061607if(run_apply(state, index_path))1608returnerror(_("Did you hand edit your patch?\n"1609"It does not apply to blobs recorded in its index."));16101611if(write_index_as_tree(his_tree, &the_index, index_path,0, NULL))1612returnerror("could not write tree");16131614say(state, stdout,_("Falling back to patching base and 3-way merge..."));16151616discard_cache();1617read_cache();16181619/*1620 * This is not so wrong. Depending on which base we picked, orig_tree1621 * may be wildly different from ours, but his_tree has the same set of1622 * wildly different changes in parts the patch did not touch, so1623 * recursive ends up canceling them, saying that we reverted all those1624 * changes.1625 */16261627init_merge_options(&o);16281629 o.branch1 ="HEAD";1630 his_tree_name =xstrfmt("%.*s",linelen(state->msg), state->msg);1631 o.branch2 = his_tree_name;16321633if(state->quiet)1634 o.verbosity =0;16351636if(merge_recursive_generic(&o, our_tree, his_tree,1, bases, &result)) {1637rerere(state->allow_rerere_autoupdate);1638free(his_tree_name);1639returnerror(_("Failed to merge in the changes."));1640}16411642free(his_tree_name);1643return0;1644}16451646/**1647 * Commits the current index with state->msg as the commit message and1648 * state->author_name, state->author_email and state->author_date as the author1649 * information.1650 */1651static voiddo_commit(const struct am_state *state)1652{1653unsigned char tree[GIT_SHA1_RAWSZ], parent[GIT_SHA1_RAWSZ],1654 commit[GIT_SHA1_RAWSZ];1655unsigned char*ptr;1656struct commit_list *parents = NULL;1657const char*reflog_msg, *author;1658struct strbuf sb = STRBUF_INIT;16591660if(run_hook_le(NULL,"pre-applypatch", NULL))1661exit(1);16621663if(write_cache_as_tree(tree,0, NULL))1664die(_("git write-tree failed to write a tree"));16651666if(!get_sha1_commit("HEAD", parent)) {1667 ptr = parent;1668commit_list_insert(lookup_commit(parent), &parents);1669}else{1670 ptr = NULL;1671say(state, stderr,_("applying to an empty history"));1672}16731674 author =fmt_ident(state->author_name, state->author_email,1675 state->ignore_date ? NULL : state->author_date,1676 IDENT_STRICT);16771678if(state->committer_date_is_author_date)1679setenv("GIT_COMMITTER_DATE",1680 state->ignore_date ?"": state->author_date,1);16811682if(commit_tree(state->msg, state->msg_len, tree, parents, commit,1683 author, state->sign_commit))1684die(_("failed to write commit object"));16851686 reflog_msg =getenv("GIT_REFLOG_ACTION");1687if(!reflog_msg)1688 reflog_msg ="am";16891690strbuf_addf(&sb,"%s: %.*s", reflog_msg,linelen(state->msg),1691 state->msg);16921693update_ref(sb.buf,"HEAD", commit, ptr,0, UPDATE_REFS_DIE_ON_ERR);16941695if(state->rebasing) {1696FILE*fp =xfopen(am_path(state,"rewritten"),"a");16971698assert(!is_null_sha1(state->orig_commit));1699fprintf(fp,"%s",sha1_to_hex(state->orig_commit));1700fprintf(fp,"%s\n",sha1_to_hex(commit));1701fclose(fp);1702}17031704run_hook_le(NULL,"post-applypatch", NULL);17051706strbuf_release(&sb);1707}17081709/**1710 * Validates the am_state for resuming -- the "msg" and authorship fields must1711 * be filled up.1712 */1713static voidvalidate_resume_state(const struct am_state *state)1714{1715if(!state->msg)1716die(_("cannot resume:%sdoes not exist."),1717am_path(state,"final-commit"));17181719if(!state->author_name || !state->author_email || !state->author_date)1720die(_("cannot resume:%sdoes not exist."),1721am_path(state,"author-script"));1722}17231724/**1725 * Interactively prompt the user on whether the current patch should be1726 * applied.1727 *1728 * Returns 0 if the user chooses to apply the patch, 1 if the user chooses to1729 * skip it.1730 */1731static intdo_interactive(struct am_state *state)1732{1733assert(state->msg);17341735if(!isatty(0))1736die(_("cannot be interactive without stdin connected to a terminal."));17371738for(;;) {1739const char*reply;17401741puts(_("Commit Body is:"));1742puts("--------------------------");1743printf("%s", state->msg);1744puts("--------------------------");17451746/*1747 * TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]1748 * in your translation. The program will only accept English1749 * input at this point.1750 */1751 reply =git_prompt(_("Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "), PROMPT_ECHO);17521753if(!reply) {1754continue;1755}else if(*reply =='y'|| *reply =='Y') {1756return0;1757}else if(*reply =='a'|| *reply =='A') {1758 state->interactive =0;1759return0;1760}else if(*reply =='n'|| *reply =='N') {1761return1;1762}else if(*reply =='e'|| *reply =='E') {1763struct strbuf msg = STRBUF_INIT;17641765if(!launch_editor(am_path(state,"final-commit"), &msg, NULL)) {1766free(state->msg);1767 state->msg =strbuf_detach(&msg, &state->msg_len);1768}1769strbuf_release(&msg);1770}else if(*reply =='v'|| *reply =='V') {1771const char*pager =git_pager(1);1772struct child_process cp = CHILD_PROCESS_INIT;17731774if(!pager)1775 pager ="cat";1776argv_array_push(&cp.args, pager);1777argv_array_push(&cp.args,am_path(state,"patch"));1778run_command(&cp);1779}1780}1781}17821783/**1784 * Applies all queued mail.1785 *1786 * If `resume` is true, we are "resuming". The "msg" and authorship fields, as1787 * well as the state directory's "patch" file is used as-is for applying the1788 * patch and committing it.1789 */1790static voidam_run(struct am_state *state,int resume)1791{1792const char*argv_gc_auto[] = {"gc","--auto", NULL};1793struct strbuf sb = STRBUF_INIT;17941795unlink(am_path(state,"dirtyindex"));17961797refresh_and_write_cache();17981799if(index_has_changes(&sb)) {1800write_state_bool(state,"dirtyindex",1);1801die(_("Dirty index: cannot apply patches (dirty:%s)"), sb.buf);1802}18031804strbuf_release(&sb);18051806while(state->cur <= state->last) {1807const char*mail =am_path(state,msgnum(state));1808int apply_status;18091810if(!file_exists(mail))1811goto next;18121813if(resume) {1814validate_resume_state(state);1815}else{1816int skip;18171818if(state->rebasing)1819 skip =parse_mail_rebase(state, mail);1820else1821 skip =parse_mail(state, mail);18221823if(skip)1824goto next;/* mail should be skipped */18251826write_author_script(state);1827write_commit_msg(state);1828}18291830if(state->interactive &&do_interactive(state))1831goto next;18321833if(run_applypatch_msg_hook(state))1834exit(1);18351836say(state, stdout,_("Applying: %.*s"),linelen(state->msg), state->msg);18371838 apply_status =run_apply(state, NULL);18391840if(apply_status && state->threeway) {1841struct strbuf sb = STRBUF_INIT;18421843strbuf_addstr(&sb,am_path(state,"patch-merge-index"));1844 apply_status =fall_back_threeway(state, sb.buf);1845strbuf_release(&sb);18461847/*1848 * Applying the patch to an earlier tree and merging1849 * the result may have produced the same tree as ours.1850 */1851if(!apply_status && !index_has_changes(NULL)) {1852say(state, stdout,_("No changes -- Patch already applied."));1853goto next;1854}1855}18561857if(apply_status) {1858int advice_amworkdir =1;18591860printf_ln(_("Patch failed at%s%.*s"),msgnum(state),1861linelen(state->msg), state->msg);18621863git_config_get_bool("advice.amworkdir", &advice_amworkdir);18641865if(advice_amworkdir)1866printf_ln(_("The copy of the patch that failed is found in:%s"),1867am_path(state,"patch"));18681869die_user_resolve(state);1870}18711872do_commit(state);18731874next:1875am_next(state);18761877if(resume)1878am_load(state);1879 resume =0;1880}18811882if(!is_empty_file(am_path(state,"rewritten"))) {1883assert(state->rebasing);1884copy_notes_for_rebase(state);1885run_post_rewrite_hook(state);1886}18871888/*1889 * In rebasing mode, it's up to the caller to take care of1890 * housekeeping.1891 */1892if(!state->rebasing) {1893am_destroy(state);1894run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);1895}1896}18971898/**1899 * Resume the current am session after patch application failure. The user did1900 * all the hard work, and we do not have to do any patch application. Just1901 * trust and commit what the user has in the index and working tree.1902 */1903static voidam_resolve(struct am_state *state)1904{1905validate_resume_state(state);19061907say(state, stdout,_("Applying: %.*s"),linelen(state->msg), state->msg);19081909if(!index_has_changes(NULL)) {1910printf_ln(_("No changes - did you forget to use 'git add'?\n"1911"If there is nothing left to stage, chances are that something else\n"1912"already introduced the same changes; you might want to skip this patch."));1913die_user_resolve(state);1914}19151916if(unmerged_cache()) {1917printf_ln(_("You still have unmerged paths in your index.\n"1918"Did you forget to use 'git add'?"));1919die_user_resolve(state);1920}19211922if(state->interactive) {1923write_index_patch(state);1924if(do_interactive(state))1925goto next;1926}19271928rerere(0);19291930do_commit(state);19311932next:1933am_next(state);1934am_load(state);1935am_run(state,0);1936}19371938/**1939 * Performs a checkout fast-forward from `head` to `remote`. If `reset` is1940 * true, any unmerged entries will be discarded. Returns 0 on success, -1 on1941 * failure.1942 */1943static intfast_forward_to(struct tree *head,struct tree *remote,int reset)1944{1945struct lock_file *lock_file;1946struct unpack_trees_options opts;1947struct tree_desc t[2];19481949if(parse_tree(head) ||parse_tree(remote))1950return-1;19511952 lock_file =xcalloc(1,sizeof(struct lock_file));1953hold_locked_index(lock_file,1);19541955refresh_cache(REFRESH_QUIET);19561957memset(&opts,0,sizeof(opts));1958 opts.head_idx =1;1959 opts.src_index = &the_index;1960 opts.dst_index = &the_index;1961 opts.update =1;1962 opts.merge =1;1963 opts.reset = reset;1964 opts.fn = twoway_merge;1965init_tree_desc(&t[0], head->buffer, head->size);1966init_tree_desc(&t[1], remote->buffer, remote->size);19671968if(unpack_trees(2, t, &opts)) {1969rollback_lock_file(lock_file);1970return-1;1971}19721973if(write_locked_index(&the_index, lock_file, COMMIT_LOCK))1974die(_("unable to write new index file"));19751976return0;1977}19781979/**1980 * Merges a tree into the index. The index's stat info will take precedence1981 * over the merged tree's. Returns 0 on success, -1 on failure.1982 */1983static intmerge_tree(struct tree *tree)1984{1985struct lock_file *lock_file;1986struct unpack_trees_options opts;1987struct tree_desc t[1];19881989if(parse_tree(tree))1990return-1;19911992 lock_file =xcalloc(1,sizeof(struct lock_file));1993hold_locked_index(lock_file,1);19941995memset(&opts,0,sizeof(opts));1996 opts.head_idx =1;1997 opts.src_index = &the_index;1998 opts.dst_index = &the_index;1999 opts.merge =1;2000 opts.fn = oneway_merge;2001init_tree_desc(&t[0], tree->buffer, tree->size);20022003if(unpack_trees(1, t, &opts)) {2004rollback_lock_file(lock_file);2005return-1;2006}20072008if(write_locked_index(&the_index, lock_file, COMMIT_LOCK))2009die(_("unable to write new index file"));20102011return0;2012}20132014/**2015 * Clean the index without touching entries that are not modified between2016 * `head` and `remote`.2017 */2018static intclean_index(const unsigned char*head,const unsigned char*remote)2019{2020struct tree *head_tree, *remote_tree, *index_tree;2021unsigned char index[GIT_SHA1_RAWSZ];20222023 head_tree =parse_tree_indirect(head);2024if(!head_tree)2025returnerror(_("Could not parse object '%s'."),sha1_to_hex(head));20262027 remote_tree =parse_tree_indirect(remote);2028if(!remote_tree)2029returnerror(_("Could not parse object '%s'."),sha1_to_hex(remote));20302031read_cache_unmerged();20322033if(fast_forward_to(head_tree, head_tree,1))2034return-1;20352036if(write_cache_as_tree(index,0, NULL))2037return-1;20382039 index_tree =parse_tree_indirect(index);2040if(!index_tree)2041returnerror(_("Could not parse object '%s'."),sha1_to_hex(index));20422043if(fast_forward_to(index_tree, remote_tree,0))2044return-1;20452046if(merge_tree(remote_tree))2047return-1;20482049remove_branch_state();20502051return0;2052}20532054/**2055 * Resets rerere's merge resolution metadata.2056 */2057static voidam_rerere_clear(void)2058{2059struct string_list merge_rr = STRING_LIST_INIT_DUP;2060int fd =setup_rerere(&merge_rr,0);20612062if(fd <0)2063return;20642065rerere_clear(&merge_rr);2066string_list_clear(&merge_rr,1);2067}20682069/**2070 * Resume the current am session by skipping the current patch.2071 */2072static voidam_skip(struct am_state *state)2073{2074unsigned char head[GIT_SHA1_RAWSZ];20752076am_rerere_clear();20772078if(get_sha1("HEAD", head))2079hashcpy(head, EMPTY_TREE_SHA1_BIN);20802081if(clean_index(head, head))2082die(_("failed to clean index"));20832084am_next(state);2085am_load(state);2086am_run(state,0);2087}20882089/**2090 * Returns true if it is safe to reset HEAD to the ORIG_HEAD, false otherwise.2091 *2092 * It is not safe to reset HEAD when:2093 * 1. git-am previously failed because the index was dirty.2094 * 2. HEAD has moved since git-am previously failed.2095 */2096static intsafe_to_abort(const struct am_state *state)2097{2098struct strbuf sb = STRBUF_INIT;2099unsigned char abort_safety[GIT_SHA1_RAWSZ], head[GIT_SHA1_RAWSZ];21002101if(file_exists(am_path(state,"dirtyindex")))2102return0;21032104if(read_state_file(&sb, state,"abort-safety",1) >0) {2105if(get_sha1_hex(sb.buf, abort_safety))2106die(_("could not parse%s"),am_path(state,"abort_safety"));2107}else2108hashclr(abort_safety);21092110if(get_sha1("HEAD", head))2111hashclr(head);21122113if(!hashcmp(head, abort_safety))2114return1;21152116error(_("You seem to have moved HEAD since the last 'am' failure.\n"2117"Not rewinding to ORIG_HEAD"));21182119return0;2120}21212122/**2123 * Aborts the current am session if it is safe to do so.2124 */2125static voidam_abort(struct am_state *state)2126{2127unsigned char curr_head[GIT_SHA1_RAWSZ], orig_head[GIT_SHA1_RAWSZ];2128int has_curr_head, has_orig_head;2129char*curr_branch;21302131if(!safe_to_abort(state)) {2132am_destroy(state);2133return;2134}21352136am_rerere_clear();21372138 curr_branch =resolve_refdup("HEAD",0, curr_head, NULL);2139 has_curr_head = !is_null_sha1(curr_head);2140if(!has_curr_head)2141hashcpy(curr_head, EMPTY_TREE_SHA1_BIN);21422143 has_orig_head = !get_sha1("ORIG_HEAD", orig_head);2144if(!has_orig_head)2145hashcpy(orig_head, EMPTY_TREE_SHA1_BIN);21462147clean_index(curr_head, orig_head);21482149if(has_orig_head)2150update_ref("am --abort","HEAD", orig_head,2151 has_curr_head ? curr_head : NULL,0,2152 UPDATE_REFS_DIE_ON_ERR);2153else if(curr_branch)2154delete_ref(curr_branch, NULL, REF_NODEREF);21552156free(curr_branch);2157am_destroy(state);2158}21592160/**2161 * parse_options() callback that validates and sets opt->value to the2162 * PATCH_FORMAT_* enum value corresponding to `arg`.2163 */2164static intparse_opt_patchformat(const struct option *opt,const char*arg,int unset)2165{2166int*opt_value = opt->value;21672168if(!strcmp(arg,"mbox"))2169*opt_value = PATCH_FORMAT_MBOX;2170else if(!strcmp(arg,"stgit"))2171*opt_value = PATCH_FORMAT_STGIT;2172else if(!strcmp(arg,"stgit-series"))2173*opt_value = PATCH_FORMAT_STGIT_SERIES;2174else if(!strcmp(arg,"hg"))2175*opt_value = PATCH_FORMAT_HG;2176else2177returnerror(_("Invalid value for --patch-format:%s"), arg);2178return0;2179}21802181enum resume_mode {2182 RESUME_FALSE =0,2183 RESUME_APPLY,2184 RESUME_RESOLVED,2185 RESUME_SKIP,2186 RESUME_ABORT2187};21882189intcmd_am(int argc,const char**argv,const char*prefix)2190{2191struct am_state state;2192int binary = -1;2193int keep_cr = -1;2194int patch_format = PATCH_FORMAT_UNKNOWN;2195enum resume_mode resume = RESUME_FALSE;2196int in_progress;21972198const char*const usage[] = {2199N_("git am [options] [(<mbox>|<Maildir>)...]"),2200N_("git am [options] (--continue | --skip | --abort)"),2201 NULL2202};22032204struct option options[] = {2205OPT_BOOL('i',"interactive", &state.interactive,2206N_("run interactively")),2207OPT_HIDDEN_BOOL('b',"binary", &binary,2208N_("historical option -- no-op")),2209OPT_BOOL('3',"3way", &state.threeway,2210N_("allow fall back on 3way merging if needed")),2211OPT__QUIET(&state.quiet,N_("be quiet")),2212OPT_SET_INT('s',"signoff", &state.signoff,2213N_("add a Signed-off-by line to the commit message"),2214 SIGNOFF_EXPLICIT),2215OPT_BOOL('u',"utf8", &state.utf8,2216N_("recode into utf8 (default)")),2217OPT_SET_INT('k',"keep", &state.keep,2218N_("pass -k flag to git-mailinfo"), KEEP_TRUE),2219OPT_SET_INT(0,"keep-non-patch", &state.keep,2220N_("pass -b flag to git-mailinfo"), KEEP_NON_PATCH),2221OPT_BOOL('m',"message-id", &state.message_id,2222N_("pass -m flag to git-mailinfo")),2223{ OPTION_SET_INT,0,"keep-cr", &keep_cr, NULL,2224N_("pass --keep-cr flag to git-mailsplit for mbox format"),2225 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL,1},2226{ OPTION_SET_INT,0,"no-keep-cr", &keep_cr, NULL,2227N_("do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"),2228 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL,0},2229OPT_BOOL('c',"scissors", &state.scissors,2230N_("strip everything before a scissors line")),2231OPT_PASSTHRU_ARGV(0,"whitespace", &state.git_apply_opts,N_("action"),2232N_("pass it through git-apply"),22330),2234OPT_PASSTHRU_ARGV(0,"ignore-space-change", &state.git_apply_opts, NULL,2235N_("pass it through git-apply"),2236 PARSE_OPT_NOARG),2237OPT_PASSTHRU_ARGV(0,"ignore-whitespace", &state.git_apply_opts, NULL,2238N_("pass it through git-apply"),2239 PARSE_OPT_NOARG),2240OPT_PASSTHRU_ARGV(0,"directory", &state.git_apply_opts,N_("root"),2241N_("pass it through git-apply"),22420),2243OPT_PASSTHRU_ARGV(0,"exclude", &state.git_apply_opts,N_("path"),2244N_("pass it through git-apply"),22450),2246OPT_PASSTHRU_ARGV(0,"include", &state.git_apply_opts,N_("path"),2247N_("pass it through git-apply"),22480),2249OPT_PASSTHRU_ARGV('C', NULL, &state.git_apply_opts,N_("n"),2250N_("pass it through git-apply"),22510),2252OPT_PASSTHRU_ARGV('p', NULL, &state.git_apply_opts,N_("num"),2253N_("pass it through git-apply"),22540),2255OPT_CALLBACK(0,"patch-format", &patch_format,N_("format"),2256N_("format the patch(es) are in"),2257 parse_opt_patchformat),2258OPT_PASSTHRU_ARGV(0,"reject", &state.git_apply_opts, NULL,2259N_("pass it through git-apply"),2260 PARSE_OPT_NOARG),2261OPT_STRING(0,"resolvemsg", &state.resolvemsg, NULL,2262N_("override error message when patch failure occurs")),2263OPT_CMDMODE(0,"continue", &resume,2264N_("continue applying patches after resolving a conflict"),2265 RESUME_RESOLVED),2266OPT_CMDMODE('r',"resolved", &resume,2267N_("synonyms for --continue"),2268 RESUME_RESOLVED),2269OPT_CMDMODE(0,"skip", &resume,2270N_("skip the current patch"),2271 RESUME_SKIP),2272OPT_CMDMODE(0,"abort", &resume,2273N_("restore the original branch and abort the patching operation."),2274 RESUME_ABORT),2275OPT_BOOL(0,"committer-date-is-author-date",2276&state.committer_date_is_author_date,2277N_("lie about committer date")),2278OPT_BOOL(0,"ignore-date", &state.ignore_date,2279N_("use current timestamp for author date")),2280OPT_RERERE_AUTOUPDATE(&state.allow_rerere_autoupdate),2281{ OPTION_STRING,'S',"gpg-sign", &state.sign_commit,N_("key-id"),2282N_("GPG-sign commits"),2283 PARSE_OPT_OPTARG, NULL, (intptr_t)""},2284OPT_HIDDEN_BOOL(0,"rebasing", &state.rebasing,2285N_("(internal use for git-rebase)")),2286OPT_END()2287};22882289git_config(git_default_config, NULL);22902291am_state_init(&state,git_path("rebase-apply"));22922293 in_progress =am_in_progress(&state);2294if(in_progress)2295am_load(&state);22962297 argc =parse_options(argc, argv, prefix, options, usage,0);22982299if(binary >=0)2300fprintf_ln(stderr,_("The -b/--binary option has been a no-op for long time, and\n"2301"it will be removed. Please do not use it anymore."));23022303/* Ensure a valid committer ident can be constructed */2304git_committer_info(IDENT_STRICT);23052306if(read_index_preload(&the_index, NULL) <0)2307die(_("failed to read the index"));23082309if(in_progress) {2310/*2311 * Catch user error to feed us patches when there is a session2312 * in progress:2313 *2314 * 1. mbox path(s) are provided on the command-line.2315 * 2. stdin is not a tty: the user is trying to feed us a patch2316 * from standard input. This is somewhat unreliable -- stdin2317 * could be /dev/null for example and the caller did not2318 * intend to feed us a patch but wanted to continue2319 * unattended.2320 */2321if(argc || (resume == RESUME_FALSE && !isatty(0)))2322die(_("previous rebase directory%sstill exists but mbox given."),2323 state.dir);23242325if(resume == RESUME_FALSE)2326 resume = RESUME_APPLY;23272328if(state.signoff == SIGNOFF_EXPLICIT)2329am_append_signoff(&state);2330}else{2331struct argv_array paths = ARGV_ARRAY_INIT;2332int i;23332334/*2335 * Handle stray state directory in the independent-run case. In2336 * the --rebasing case, it is up to the caller to take care of2337 * stray directories.2338 */2339if(file_exists(state.dir) && !state.rebasing) {2340if(resume == RESUME_ABORT) {2341am_destroy(&state);2342am_state_release(&state);2343return0;2344}23452346die(_("Stray%sdirectory found.\n"2347"Use\"git am --abort\"to remove it."),2348 state.dir);2349}23502351if(resume)2352die(_("Resolve operation not in progress, we are not resuming."));23532354for(i =0; i < argc; i++) {2355if(is_absolute_path(argv[i]) || !prefix)2356argv_array_push(&paths, argv[i]);2357else2358argv_array_push(&paths,mkpath("%s/%s", prefix, argv[i]));2359}23602361am_setup(&state, patch_format, paths.argv, keep_cr);23622363argv_array_clear(&paths);2364}23652366switch(resume) {2367case RESUME_FALSE:2368am_run(&state,0);2369break;2370case RESUME_APPLY:2371am_run(&state,1);2372break;2373case RESUME_RESOLVED:2374am_resolve(&state);2375break;2376case RESUME_SKIP:2377am_skip(&state);2378break;2379case RESUME_ABORT:2380am_abort(&state);2381break;2382default:2383die("BUG: invalid resume value");2384}23852386am_state_release(&state);23872388return0;2389}