1/* 2 * Builtin "git am" 3 * 4 * Based on git-am.sh by Junio C Hamano. 5 */ 6#include"cache.h" 7#include"config.h" 8#include"builtin.h" 9#include"exec_cmd.h" 10#include"parse-options.h" 11#include"dir.h" 12#include"run-command.h" 13#include"quote.h" 14#include"tempfile.h" 15#include"lockfile.h" 16#include"cache-tree.h" 17#include"refs.h" 18#include"commit.h" 19#include"diff.h" 20#include"diffcore.h" 21#include"unpack-trees.h" 22#include"branch.h" 23#include"sequencer.h" 24#include"revision.h" 25#include"merge-recursive.h" 26#include"revision.h" 27#include"log-tree.h" 28#include"notes-utils.h" 29#include"rerere.h" 30#include"prompt.h" 31#include"mailinfo.h" 32#include"apply.h" 33#include"string-list.h" 34#include"packfile.h" 35 36/** 37 * Returns 1 if the file is empty or does not exist, 0 otherwise. 38 */ 39static intis_empty_file(const char*filename) 40{ 41struct stat st; 42 43if(stat(filename, &st) <0) { 44if(errno == ENOENT) 45return1; 46die_errno(_("could not stat%s"), filename); 47} 48 49return!st.st_size; 50} 51 52/** 53 * Returns the length of the first line of msg. 54 */ 55static intlinelen(const char*msg) 56{ 57returnstrchrnul(msg,'\n') - msg; 58} 59 60/** 61 * Returns true if `str` consists of only whitespace, false otherwise. 62 */ 63static intstr_isspace(const char*str) 64{ 65for(; *str; str++) 66if(!isspace(*str)) 67return0; 68 69return1; 70} 71 72enum patch_format { 73 PATCH_FORMAT_UNKNOWN =0, 74 PATCH_FORMAT_MBOX, 75 PATCH_FORMAT_STGIT, 76 PATCH_FORMAT_STGIT_SERIES, 77 PATCH_FORMAT_HG, 78 PATCH_FORMAT_MBOXRD 79}; 80 81enum keep_type { 82 KEEP_FALSE =0, 83 KEEP_TRUE,/* pass -k flag to git-mailinfo */ 84 KEEP_NON_PATCH /* pass -b flag to git-mailinfo */ 85}; 86 87enum scissors_type { 88 SCISSORS_UNSET = -1, 89 SCISSORS_FALSE =0,/* pass --no-scissors to git-mailinfo */ 90 SCISSORS_TRUE /* pass --scissors to git-mailinfo */ 91}; 92 93enum signoff_type { 94 SIGNOFF_FALSE =0, 95 SIGNOFF_TRUE =1, 96 SIGNOFF_EXPLICIT /* --signoff was set on the command-line */ 97}; 98 99struct am_state { 100/* state directory path */ 101char*dir; 102 103/* current and last patch numbers, 1-indexed */ 104int cur; 105int last; 106 107/* commit metadata and message */ 108char*author_name; 109char*author_email; 110char*author_date; 111char*msg; 112size_t msg_len; 113 114/* when --rebasing, records the original commit the patch came from */ 115struct object_id orig_commit; 116 117/* number of digits in patch filename */ 118int prec; 119 120/* various operating modes and command line options */ 121int interactive; 122int threeway; 123int quiet; 124int signoff;/* enum signoff_type */ 125int utf8; 126int keep;/* enum keep_type */ 127int message_id; 128int scissors;/* enum scissors_type */ 129struct argv_array git_apply_opts; 130const char*resolvemsg; 131int committer_date_is_author_date; 132int ignore_date; 133int allow_rerere_autoupdate; 134const char*sign_commit; 135int rebasing; 136}; 137 138/** 139 * Initializes am_state with the default values. 140 */ 141static voidam_state_init(struct am_state *state) 142{ 143int gpgsign; 144 145memset(state,0,sizeof(*state)); 146 147 state->dir =git_pathdup("rebase-apply"); 148 149 state->prec =4; 150 151git_config_get_bool("am.threeway", &state->threeway); 152 153 state->utf8 =1; 154 155git_config_get_bool("am.messageid", &state->message_id); 156 157 state->scissors = SCISSORS_UNSET; 158 159argv_array_init(&state->git_apply_opts); 160 161if(!git_config_get_bool("commit.gpgsign", &gpgsign)) 162 state->sign_commit = gpgsign ?"": NULL; 163} 164 165/** 166 * Releases memory allocated by an am_state. 167 */ 168static voidam_state_release(struct am_state *state) 169{ 170free(state->dir); 171free(state->author_name); 172free(state->author_email); 173free(state->author_date); 174free(state->msg); 175argv_array_clear(&state->git_apply_opts); 176} 177 178/** 179 * Returns path relative to the am_state directory. 180 */ 181staticinlineconst char*am_path(const struct am_state *state,const char*path) 182{ 183returnmkpath("%s/%s", state->dir, path); 184} 185 186/** 187 * For convenience to call write_file() 188 */ 189static voidwrite_state_text(const struct am_state *state, 190const char*name,const char*string) 191{ 192write_file(am_path(state, name),"%s", string); 193} 194 195static voidwrite_state_count(const struct am_state *state, 196const char*name,int value) 197{ 198write_file(am_path(state, name),"%d", value); 199} 200 201static voidwrite_state_bool(const struct am_state *state, 202const char*name,int value) 203{ 204write_state_text(state, name, value ?"t":"f"); 205} 206 207/** 208 * If state->quiet is false, calls fprintf(fp, fmt, ...), and appends a newline 209 * at the end. 210 */ 211static voidsay(const struct am_state *state,FILE*fp,const char*fmt, ...) 212{ 213va_list ap; 214 215va_start(ap, fmt); 216if(!state->quiet) { 217vfprintf(fp, fmt, ap); 218putc('\n', fp); 219} 220va_end(ap); 221} 222 223/** 224 * Returns 1 if there is an am session in progress, 0 otherwise. 225 */ 226static intam_in_progress(const struct am_state *state) 227{ 228struct stat st; 229 230if(lstat(state->dir, &st) <0|| !S_ISDIR(st.st_mode)) 231return0; 232if(lstat(am_path(state,"last"), &st) || !S_ISREG(st.st_mode)) 233return0; 234if(lstat(am_path(state,"next"), &st) || !S_ISREG(st.st_mode)) 235return0; 236return1; 237} 238 239/** 240 * Reads the contents of `file` in the `state` directory into `sb`. Returns the 241 * number of bytes read on success, -1 if the file does not exist. If `trim` is 242 * set, trailing whitespace will be removed. 243 */ 244static intread_state_file(struct strbuf *sb,const struct am_state *state, 245const char*file,int trim) 246{ 247strbuf_reset(sb); 248 249if(strbuf_read_file(sb,am_path(state, file),0) >=0) { 250if(trim) 251strbuf_trim(sb); 252 253return sb->len; 254} 255 256if(errno == ENOENT) 257return-1; 258 259die_errno(_("could not read '%s'"),am_path(state, file)); 260} 261 262/** 263 * Take a series of KEY='VALUE' lines where VALUE part is 264 * sq-quoted, and append <KEY, VALUE> at the end of the string list 265 */ 266static intparse_key_value_squoted(char*buf,struct string_list *list) 267{ 268while(*buf) { 269struct string_list_item *item; 270char*np; 271char*cp =strchr(buf,'='); 272if(!cp) 273return-1; 274 np =strchrnul(cp,'\n'); 275*cp++ ='\0'; 276 item =string_list_append(list, buf); 277 278 buf = np + (*np =='\n'); 279*np ='\0'; 280 cp =sq_dequote(cp); 281if(!cp) 282return-1; 283 item->util =xstrdup(cp); 284} 285return0; 286} 287 288/** 289 * Reads and parses the state directory's "author-script" file, and sets 290 * state->author_name, state->author_email and state->author_date accordingly. 291 * Returns 0 on success, -1 if the file could not be parsed. 292 * 293 * The author script is of the format: 294 * 295 * GIT_AUTHOR_NAME='$author_name' 296 * GIT_AUTHOR_EMAIL='$author_email' 297 * GIT_AUTHOR_DATE='$author_date' 298 * 299 * where $author_name, $author_email and $author_date are quoted. We are strict 300 * with our parsing, as the file was meant to be eval'd in the old git-am.sh 301 * script, and thus if the file differs from what this function expects, it is 302 * better to bail out than to do something that the user does not expect. 303 */ 304static intread_author_script(struct am_state *state) 305{ 306const char*filename =am_path(state,"author-script"); 307struct strbuf buf = STRBUF_INIT; 308struct string_list kv = STRING_LIST_INIT_DUP; 309int retval = -1;/* assume failure */ 310int fd; 311 312assert(!state->author_name); 313assert(!state->author_email); 314assert(!state->author_date); 315 316 fd =open(filename, O_RDONLY); 317if(fd <0) { 318if(errno == ENOENT) 319return0; 320die_errno(_("could not open '%s' for reading"), filename); 321} 322strbuf_read(&buf, fd,0); 323close(fd); 324if(parse_key_value_squoted(buf.buf, &kv)) 325goto finish; 326 327if(kv.nr !=3|| 328strcmp(kv.items[0].string,"GIT_AUTHOR_NAME") || 329strcmp(kv.items[1].string,"GIT_AUTHOR_EMAIL") || 330strcmp(kv.items[2].string,"GIT_AUTHOR_DATE")) 331goto finish; 332 state->author_name = kv.items[0].util; 333 state->author_email = kv.items[1].util; 334 state->author_date = kv.items[2].util; 335 retval =0; 336finish: 337string_list_clear(&kv, !!retval); 338strbuf_release(&buf); 339return retval; 340} 341 342/** 343 * Saves state->author_name, state->author_email and state->author_date in the 344 * state directory's "author-script" file. 345 */ 346static voidwrite_author_script(const struct am_state *state) 347{ 348struct strbuf sb = STRBUF_INIT; 349 350strbuf_addstr(&sb,"GIT_AUTHOR_NAME="); 351sq_quote_buf(&sb, state->author_name); 352strbuf_addch(&sb,'\n'); 353 354strbuf_addstr(&sb,"GIT_AUTHOR_EMAIL="); 355sq_quote_buf(&sb, state->author_email); 356strbuf_addch(&sb,'\n'); 357 358strbuf_addstr(&sb,"GIT_AUTHOR_DATE="); 359sq_quote_buf(&sb, state->author_date); 360strbuf_addch(&sb,'\n'); 361 362write_state_text(state,"author-script", sb.buf); 363 364strbuf_release(&sb); 365} 366 367/** 368 * Reads the commit message from the state directory's "final-commit" file, 369 * setting state->msg to its contents and state->msg_len to the length of its 370 * contents in bytes. 371 * 372 * Returns 0 on success, -1 if the file does not exist. 373 */ 374static intread_commit_msg(struct am_state *state) 375{ 376struct strbuf sb = STRBUF_INIT; 377 378assert(!state->msg); 379 380if(read_state_file(&sb, state,"final-commit",0) <0) { 381strbuf_release(&sb); 382return-1; 383} 384 385 state->msg =strbuf_detach(&sb, &state->msg_len); 386return0; 387} 388 389/** 390 * Saves state->msg in the state directory's "final-commit" file. 391 */ 392static voidwrite_commit_msg(const struct am_state *state) 393{ 394const char*filename =am_path(state,"final-commit"); 395write_file_buf(filename, state->msg, state->msg_len); 396} 397 398/** 399 * Loads state from disk. 400 */ 401static voidam_load(struct am_state *state) 402{ 403struct strbuf sb = STRBUF_INIT; 404 405if(read_state_file(&sb, state,"next",1) <0) 406die("BUG: state file 'next' does not exist"); 407 state->cur =strtol(sb.buf, NULL,10); 408 409if(read_state_file(&sb, state,"last",1) <0) 410die("BUG: state file 'last' does not exist"); 411 state->last =strtol(sb.buf, NULL,10); 412 413if(read_author_script(state) <0) 414die(_("could not parse author script")); 415 416read_commit_msg(state); 417 418if(read_state_file(&sb, state,"original-commit",1) <0) 419oidclr(&state->orig_commit); 420else if(get_oid_hex(sb.buf, &state->orig_commit) <0) 421die(_("could not parse%s"),am_path(state,"original-commit")); 422 423read_state_file(&sb, state,"threeway",1); 424 state->threeway = !strcmp(sb.buf,"t"); 425 426read_state_file(&sb, state,"quiet",1); 427 state->quiet = !strcmp(sb.buf,"t"); 428 429read_state_file(&sb, state,"sign",1); 430 state->signoff = !strcmp(sb.buf,"t"); 431 432read_state_file(&sb, state,"utf8",1); 433 state->utf8 = !strcmp(sb.buf,"t"); 434 435if(file_exists(am_path(state,"rerere-autoupdate"))) { 436read_state_file(&sb, state,"rerere-autoupdate",1); 437 state->allow_rerere_autoupdate =strcmp(sb.buf,"t") ? 438 RERERE_NOAUTOUPDATE : RERERE_AUTOUPDATE; 439}else{ 440 state->allow_rerere_autoupdate =0; 441} 442 443read_state_file(&sb, state,"keep",1); 444if(!strcmp(sb.buf,"t")) 445 state->keep = KEEP_TRUE; 446else if(!strcmp(sb.buf,"b")) 447 state->keep = KEEP_NON_PATCH; 448else 449 state->keep = KEEP_FALSE; 450 451read_state_file(&sb, state,"messageid",1); 452 state->message_id = !strcmp(sb.buf,"t"); 453 454read_state_file(&sb, state,"scissors",1); 455if(!strcmp(sb.buf,"t")) 456 state->scissors = SCISSORS_TRUE; 457else if(!strcmp(sb.buf,"f")) 458 state->scissors = SCISSORS_FALSE; 459else 460 state->scissors = SCISSORS_UNSET; 461 462read_state_file(&sb, state,"apply-opt",1); 463argv_array_clear(&state->git_apply_opts); 464if(sq_dequote_to_argv_array(sb.buf, &state->git_apply_opts) <0) 465die(_("could not parse%s"),am_path(state,"apply-opt")); 466 467 state->rebasing = !!file_exists(am_path(state,"rebasing")); 468 469strbuf_release(&sb); 470} 471 472/** 473 * Removes the am_state directory, forcefully terminating the current am 474 * session. 475 */ 476static voidam_destroy(const struct am_state *state) 477{ 478struct strbuf sb = STRBUF_INIT; 479 480strbuf_addstr(&sb, state->dir); 481remove_dir_recursively(&sb,0); 482strbuf_release(&sb); 483} 484 485/** 486 * Runs applypatch-msg hook. Returns its exit code. 487 */ 488static intrun_applypatch_msg_hook(struct am_state *state) 489{ 490int ret; 491 492assert(state->msg); 493 ret =run_hook_le(NULL,"applypatch-msg",am_path(state,"final-commit"), NULL); 494 495if(!ret) { 496FREE_AND_NULL(state->msg); 497if(read_commit_msg(state) <0) 498die(_("'%s' was deleted by the applypatch-msg hook"), 499am_path(state,"final-commit")); 500} 501 502return ret; 503} 504 505/** 506 * Runs post-rewrite hook. Returns it exit code. 507 */ 508static intrun_post_rewrite_hook(const struct am_state *state) 509{ 510struct child_process cp = CHILD_PROCESS_INIT; 511const char*hook =find_hook("post-rewrite"); 512int ret; 513 514if(!hook) 515return0; 516 517argv_array_push(&cp.args, hook); 518argv_array_push(&cp.args,"rebase"); 519 520 cp.in =xopen(am_path(state,"rewritten"), O_RDONLY); 521 cp.stdout_to_stderr =1; 522 523 ret =run_command(&cp); 524 525close(cp.in); 526return ret; 527} 528 529/** 530 * Reads the state directory's "rewritten" file, and copies notes from the old 531 * commits listed in the file to their rewritten commits. 532 * 533 * Returns 0 on success, -1 on failure. 534 */ 535static intcopy_notes_for_rebase(const struct am_state *state) 536{ 537struct notes_rewrite_cfg *c; 538struct strbuf sb = STRBUF_INIT; 539const char*invalid_line =_("Malformed input line: '%s'."); 540const char*msg ="Notes added by 'git rebase'"; 541FILE*fp; 542int ret =0; 543 544assert(state->rebasing); 545 546 c =init_copy_notes_for_rewrite("rebase"); 547if(!c) 548return0; 549 550 fp =xfopen(am_path(state,"rewritten"),"r"); 551 552while(!strbuf_getline_lf(&sb, fp)) { 553struct object_id from_obj, to_obj; 554 555if(sb.len != GIT_SHA1_HEXSZ *2+1) { 556 ret =error(invalid_line, sb.buf); 557goto finish; 558} 559 560if(get_oid_hex(sb.buf, &from_obj)) { 561 ret =error(invalid_line, sb.buf); 562goto finish; 563} 564 565if(sb.buf[GIT_SHA1_HEXSZ] !=' ') { 566 ret =error(invalid_line, sb.buf); 567goto finish; 568} 569 570if(get_oid_hex(sb.buf + GIT_SHA1_HEXSZ +1, &to_obj)) { 571 ret =error(invalid_line, sb.buf); 572goto finish; 573} 574 575if(copy_note_for_rewrite(c, &from_obj, &to_obj)) 576 ret =error(_("Failed to copy notes from '%s' to '%s'"), 577oid_to_hex(&from_obj),oid_to_hex(&to_obj)); 578} 579 580finish: 581finish_copy_notes_for_rewrite(c, msg); 582fclose(fp); 583strbuf_release(&sb); 584return ret; 585} 586 587/** 588 * Determines if the file looks like a piece of RFC2822 mail by grabbing all 589 * non-indented lines and checking if they look like they begin with valid 590 * header field names. 591 * 592 * Returns 1 if the file looks like a piece of mail, 0 otherwise. 593 */ 594static intis_mail(FILE*fp) 595{ 596const char*header_regex ="^[!-9;-~]+:"; 597struct strbuf sb = STRBUF_INIT; 598 regex_t regex; 599int ret =1; 600 601if(fseek(fp,0L, SEEK_SET)) 602die_errno(_("fseek failed")); 603 604if(regcomp(®ex, header_regex, REG_NOSUB | REG_EXTENDED)) 605die("invalid pattern:%s", header_regex); 606 607while(!strbuf_getline(&sb, fp)) { 608if(!sb.len) 609break;/* End of header */ 610 611/* Ignore indented folded lines */ 612if(*sb.buf =='\t'|| *sb.buf ==' ') 613continue; 614 615/* It's a header if it matches header_regex */ 616if(regexec(®ex, sb.buf,0, NULL,0)) { 617 ret =0; 618goto done; 619} 620} 621 622done: 623regfree(®ex); 624strbuf_release(&sb); 625return ret; 626} 627 628/** 629 * Attempts to detect the patch_format of the patches contained in `paths`, 630 * returning the PATCH_FORMAT_* enum value. Returns PATCH_FORMAT_UNKNOWN if 631 * detection fails. 632 */ 633static intdetect_patch_format(const char**paths) 634{ 635enum patch_format ret = PATCH_FORMAT_UNKNOWN; 636struct strbuf l1 = STRBUF_INIT; 637struct strbuf l2 = STRBUF_INIT; 638struct strbuf l3 = STRBUF_INIT; 639FILE*fp; 640 641/* 642 * We default to mbox format if input is from stdin and for directories 643 */ 644if(!*paths || !strcmp(*paths,"-") ||is_directory(*paths)) 645return PATCH_FORMAT_MBOX; 646 647/* 648 * Otherwise, check the first few lines of the first patch, starting 649 * from the first non-blank line, to try to detect its format. 650 */ 651 652 fp =xfopen(*paths,"r"); 653 654while(!strbuf_getline(&l1, fp)) { 655if(l1.len) 656break; 657} 658 659if(starts_with(l1.buf,"From ") ||starts_with(l1.buf,"From: ")) { 660 ret = PATCH_FORMAT_MBOX; 661goto done; 662} 663 664if(starts_with(l1.buf,"# This series applies on GIT commit")) { 665 ret = PATCH_FORMAT_STGIT_SERIES; 666goto done; 667} 668 669if(!strcmp(l1.buf,"# HG changeset patch")) { 670 ret = PATCH_FORMAT_HG; 671goto done; 672} 673 674strbuf_reset(&l2); 675strbuf_getline(&l2, fp); 676strbuf_reset(&l3); 677strbuf_getline(&l3, fp); 678 679/* 680 * If the second line is empty and the third is a From, Author or Date 681 * entry, this is likely an StGit patch. 682 */ 683if(l1.len && !l2.len && 684(starts_with(l3.buf,"From:") || 685starts_with(l3.buf,"Author:") || 686starts_with(l3.buf,"Date:"))) { 687 ret = PATCH_FORMAT_STGIT; 688goto done; 689} 690 691if(l1.len &&is_mail(fp)) { 692 ret = PATCH_FORMAT_MBOX; 693goto done; 694} 695 696done: 697fclose(fp); 698strbuf_release(&l1); 699return ret; 700} 701 702/** 703 * Splits out individual email patches from `paths`, where each path is either 704 * a mbox file or a Maildir. Returns 0 on success, -1 on failure. 705 */ 706static intsplit_mail_mbox(struct am_state *state,const char**paths, 707int keep_cr,int mboxrd) 708{ 709struct child_process cp = CHILD_PROCESS_INIT; 710struct strbuf last = STRBUF_INIT; 711 712 cp.git_cmd =1; 713argv_array_push(&cp.args,"mailsplit"); 714argv_array_pushf(&cp.args,"-d%d", state->prec); 715argv_array_pushf(&cp.args,"-o%s", state->dir); 716argv_array_push(&cp.args,"-b"); 717if(keep_cr) 718argv_array_push(&cp.args,"--keep-cr"); 719if(mboxrd) 720argv_array_push(&cp.args,"--mboxrd"); 721argv_array_push(&cp.args,"--"); 722argv_array_pushv(&cp.args, paths); 723 724if(capture_command(&cp, &last,8)) 725return-1; 726 727 state->cur =1; 728 state->last =strtol(last.buf, NULL,10); 729 730return0; 731} 732 733/** 734 * Callback signature for split_mail_conv(). The foreign patch should be 735 * read from `in`, and the converted patch (in RFC2822 mail format) should be 736 * written to `out`. Return 0 on success, or -1 on failure. 737 */ 738typedefint(*mail_conv_fn)(FILE*out,FILE*in,int keep_cr); 739 740/** 741 * Calls `fn` for each file in `paths` to convert the foreign patch to the 742 * RFC2822 mail format suitable for parsing with git-mailinfo. 743 * 744 * Returns 0 on success, -1 on failure. 745 */ 746static intsplit_mail_conv(mail_conv_fn fn,struct am_state *state, 747const char**paths,int keep_cr) 748{ 749static const char*stdin_only[] = {"-", NULL}; 750int i; 751 752if(!*paths) 753 paths = stdin_only; 754 755for(i =0; *paths; paths++, i++) { 756FILE*in, *out; 757const char*mail; 758int ret; 759 760if(!strcmp(*paths,"-")) 761 in = stdin; 762else 763 in =fopen(*paths,"r"); 764 765if(!in) 766returnerror_errno(_("could not open '%s' for reading"), 767*paths); 768 769 mail =mkpath("%s/%0*d", state->dir, state->prec, i +1); 770 771 out =fopen(mail,"w"); 772if(!out) { 773if(in != stdin) 774fclose(in); 775returnerror_errno(_("could not open '%s' for writing"), 776 mail); 777} 778 779 ret =fn(out, in, keep_cr); 780 781fclose(out); 782if(in != stdin) 783fclose(in); 784 785if(ret) 786returnerror(_("could not parse patch '%s'"), *paths); 787} 788 789 state->cur =1; 790 state->last = i; 791return0; 792} 793 794/** 795 * A split_mail_conv() callback that converts an StGit patch to an RFC2822 796 * message suitable for parsing with git-mailinfo. 797 */ 798static intstgit_patch_to_mail(FILE*out,FILE*in,int keep_cr) 799{ 800struct strbuf sb = STRBUF_INIT; 801int subject_printed =0; 802 803while(!strbuf_getline_lf(&sb, in)) { 804const char*str; 805 806if(str_isspace(sb.buf)) 807continue; 808else if(skip_prefix(sb.buf,"Author:", &str)) 809fprintf(out,"From:%s\n", str); 810else if(starts_with(sb.buf,"From") ||starts_with(sb.buf,"Date")) 811fprintf(out,"%s\n", sb.buf); 812else if(!subject_printed) { 813fprintf(out,"Subject:%s\n", sb.buf); 814 subject_printed =1; 815}else{ 816fprintf(out,"\n%s\n", sb.buf); 817break; 818} 819} 820 821strbuf_reset(&sb); 822while(strbuf_fread(&sb,8192, in) >0) { 823fwrite(sb.buf,1, sb.len, out); 824strbuf_reset(&sb); 825} 826 827strbuf_release(&sb); 828return0; 829} 830 831/** 832 * This function only supports a single StGit series file in `paths`. 833 * 834 * Given an StGit series file, converts the StGit patches in the series into 835 * RFC2822 messages suitable for parsing with git-mailinfo, and queues them in 836 * the state directory. 837 * 838 * Returns 0 on success, -1 on failure. 839 */ 840static intsplit_mail_stgit_series(struct am_state *state,const char**paths, 841int keep_cr) 842{ 843const char*series_dir; 844char*series_dir_buf; 845FILE*fp; 846struct argv_array patches = ARGV_ARRAY_INIT; 847struct strbuf sb = STRBUF_INIT; 848int ret; 849 850if(!paths[0] || paths[1]) 851returnerror(_("Only one StGIT patch series can be applied at once")); 852 853 series_dir_buf =xstrdup(*paths); 854 series_dir =dirname(series_dir_buf); 855 856 fp =fopen(*paths,"r"); 857if(!fp) 858returnerror_errno(_("could not open '%s' for reading"), *paths); 859 860while(!strbuf_getline_lf(&sb, fp)) { 861if(*sb.buf =='#') 862continue;/* skip comment lines */ 863 864argv_array_push(&patches,mkpath("%s/%s", series_dir, sb.buf)); 865} 866 867fclose(fp); 868strbuf_release(&sb); 869free(series_dir_buf); 870 871 ret =split_mail_conv(stgit_patch_to_mail, state, patches.argv, keep_cr); 872 873argv_array_clear(&patches); 874return ret; 875} 876 877/** 878 * A split_patches_conv() callback that converts a mercurial patch to a RFC2822 879 * message suitable for parsing with git-mailinfo. 880 */ 881static inthg_patch_to_mail(FILE*out,FILE*in,int keep_cr) 882{ 883struct strbuf sb = STRBUF_INIT; 884 885while(!strbuf_getline_lf(&sb, in)) { 886const char*str; 887 888if(skip_prefix(sb.buf,"# User ", &str)) 889fprintf(out,"From:%s\n", str); 890else if(skip_prefix(sb.buf,"# Date ", &str)) { 891 timestamp_t timestamp; 892long tz, tz2; 893char*end; 894 895 errno =0; 896 timestamp =parse_timestamp(str, &end,10); 897if(errno) 898returnerror(_("invalid timestamp")); 899 900if(!skip_prefix(end," ", &str)) 901returnerror(_("invalid Date line")); 902 903 errno =0; 904 tz =strtol(str, &end,10); 905if(errno) 906returnerror(_("invalid timezone offset")); 907 908if(*end) 909returnerror(_("invalid Date line")); 910 911/* 912 * mercurial's timezone is in seconds west of UTC, 913 * however git's timezone is in hours + minutes east of 914 * UTC. Convert it. 915 */ 916 tz2 =labs(tz) /3600*100+labs(tz) %3600/60; 917if(tz >0) 918 tz2 = -tz2; 919 920fprintf(out,"Date:%s\n",show_date(timestamp, tz2,DATE_MODE(RFC2822))); 921}else if(starts_with(sb.buf,"# ")) { 922continue; 923}else{ 924fprintf(out,"\n%s\n", sb.buf); 925break; 926} 927} 928 929strbuf_reset(&sb); 930while(strbuf_fread(&sb,8192, in) >0) { 931fwrite(sb.buf,1, sb.len, out); 932strbuf_reset(&sb); 933} 934 935strbuf_release(&sb); 936return0; 937} 938 939/** 940 * Splits a list of files/directories into individual email patches. Each path 941 * in `paths` must be a file/directory that is formatted according to 942 * `patch_format`. 943 * 944 * Once split out, the individual email patches will be stored in the state 945 * directory, with each patch's filename being its index, padded to state->prec 946 * digits. 947 * 948 * state->cur will be set to the index of the first mail, and state->last will 949 * be set to the index of the last mail. 950 * 951 * Set keep_cr to 0 to convert all lines ending with \r\n to end with \n, 1 952 * to disable this behavior, -1 to use the default configured setting. 953 * 954 * Returns 0 on success, -1 on failure. 955 */ 956static intsplit_mail(struct am_state *state,enum patch_format patch_format, 957const char**paths,int keep_cr) 958{ 959if(keep_cr <0) { 960 keep_cr =0; 961git_config_get_bool("am.keepcr", &keep_cr); 962} 963 964switch(patch_format) { 965case PATCH_FORMAT_MBOX: 966returnsplit_mail_mbox(state, paths, keep_cr,0); 967case PATCH_FORMAT_STGIT: 968returnsplit_mail_conv(stgit_patch_to_mail, state, paths, keep_cr); 969case PATCH_FORMAT_STGIT_SERIES: 970returnsplit_mail_stgit_series(state, paths, keep_cr); 971case PATCH_FORMAT_HG: 972returnsplit_mail_conv(hg_patch_to_mail, state, paths, keep_cr); 973case PATCH_FORMAT_MBOXRD: 974returnsplit_mail_mbox(state, paths, keep_cr,1); 975default: 976die("BUG: invalid patch_format"); 977} 978return-1; 979} 980 981/** 982 * Setup a new am session for applying patches 983 */ 984static voidam_setup(struct am_state *state,enum patch_format patch_format, 985const char**paths,int keep_cr) 986{ 987struct object_id curr_head; 988const char*str; 989struct strbuf sb = STRBUF_INIT; 990 991if(!patch_format) 992 patch_format =detect_patch_format(paths); 993 994if(!patch_format) { 995fprintf_ln(stderr,_("Patch format detection failed.")); 996exit(128); 997} 998 999if(mkdir(state->dir,0777) <0&& errno != EEXIST)1000die_errno(_("failed to create directory '%s'"), state->dir);10011002if(split_mail(state, patch_format, paths, keep_cr) <0) {1003am_destroy(state);1004die(_("Failed to split patches."));1005}10061007if(state->rebasing)1008 state->threeway =1;10091010write_state_bool(state,"threeway", state->threeway);1011write_state_bool(state,"quiet", state->quiet);1012write_state_bool(state,"sign", state->signoff);1013write_state_bool(state,"utf8", state->utf8);10141015if(state->allow_rerere_autoupdate)1016write_state_bool(state,"rerere-autoupdate",1017 state->allow_rerere_autoupdate == RERERE_AUTOUPDATE);10181019switch(state->keep) {1020case KEEP_FALSE:1021 str ="f";1022break;1023case KEEP_TRUE:1024 str ="t";1025break;1026case KEEP_NON_PATCH:1027 str ="b";1028break;1029default:1030die("BUG: invalid value for state->keep");1031}10321033write_state_text(state,"keep", str);1034write_state_bool(state,"messageid", state->message_id);10351036switch(state->scissors) {1037case SCISSORS_UNSET:1038 str ="";1039break;1040case SCISSORS_FALSE:1041 str ="f";1042break;1043case SCISSORS_TRUE:1044 str ="t";1045break;1046default:1047die("BUG: invalid value for state->scissors");1048}1049write_state_text(state,"scissors", str);10501051sq_quote_argv(&sb, state->git_apply_opts.argv,0);1052write_state_text(state,"apply-opt", sb.buf);10531054if(state->rebasing)1055write_state_text(state,"rebasing","");1056else1057write_state_text(state,"applying","");10581059if(!get_oid("HEAD", &curr_head)) {1060write_state_text(state,"abort-safety",oid_to_hex(&curr_head));1061if(!state->rebasing)1062update_ref_oid("am","ORIG_HEAD", &curr_head, NULL,0,1063 UPDATE_REFS_DIE_ON_ERR);1064}else{1065write_state_text(state,"abort-safety","");1066if(!state->rebasing)1067delete_ref(NULL,"ORIG_HEAD", NULL,0);1068}10691070/*1071 * NOTE: Since the "next" and "last" files determine if an am_state1072 * session is in progress, they should be written last.1073 */10741075write_state_count(state,"next", state->cur);1076write_state_count(state,"last", state->last);10771078strbuf_release(&sb);1079}10801081/**1082 * Increments the patch pointer, and cleans am_state for the application of the1083 * next patch.1084 */1085static voidam_next(struct am_state *state)1086{1087struct object_id head;10881089FREE_AND_NULL(state->author_name);1090FREE_AND_NULL(state->author_email);1091FREE_AND_NULL(state->author_date);1092FREE_AND_NULL(state->msg);1093 state->msg_len =0;10941095unlink(am_path(state,"author-script"));1096unlink(am_path(state,"final-commit"));10971098oidclr(&state->orig_commit);1099unlink(am_path(state,"original-commit"));11001101if(!get_oid("HEAD", &head))1102write_state_text(state,"abort-safety",oid_to_hex(&head));1103else1104write_state_text(state,"abort-safety","");11051106 state->cur++;1107write_state_count(state,"next", state->cur);1108}11091110/**1111 * Returns the filename of the current patch email.1112 */1113static const char*msgnum(const struct am_state *state)1114{1115static struct strbuf sb = STRBUF_INIT;11161117strbuf_reset(&sb);1118strbuf_addf(&sb,"%0*d", state->prec, state->cur);11191120return sb.buf;1121}11221123/**1124 * Refresh and write index.1125 */1126static voidrefresh_and_write_cache(void)1127{1128struct lock_file *lock_file =xcalloc(1,sizeof(struct lock_file));11291130hold_locked_index(lock_file, LOCK_DIE_ON_ERROR);1131refresh_cache(REFRESH_QUIET);1132if(write_locked_index(&the_index, lock_file, COMMIT_LOCK))1133die(_("unable to write index file"));1134}11351136/**1137 * Returns 1 if the index differs from HEAD, 0 otherwise. When on an unborn1138 * branch, returns 1 if there are entries in the index, 0 otherwise. If an1139 * strbuf is provided, the space-separated list of files that differ will be1140 * appended to it.1141 */1142static intindex_has_changes(struct strbuf *sb)1143{1144struct object_id head;1145int i;11461147if(!get_oid_tree("HEAD", &head)) {1148struct diff_options opt;11491150diff_setup(&opt);1151DIFF_OPT_SET(&opt, EXIT_WITH_STATUS);1152if(!sb)1153DIFF_OPT_SET(&opt, QUICK);1154do_diff_cache(&head, &opt);1155diffcore_std(&opt);1156for(i =0; sb && i < diff_queued_diff.nr; i++) {1157if(i)1158strbuf_addch(sb,' ');1159strbuf_addstr(sb, diff_queued_diff.queue[i]->two->path);1160}1161diff_flush(&opt);1162returnDIFF_OPT_TST(&opt, HAS_CHANGES) !=0;1163}else{1164for(i =0; sb && i < active_nr; i++) {1165if(i)1166strbuf_addch(sb,' ');1167strbuf_addstr(sb, active_cache[i]->name);1168}1169return!!active_nr;1170}1171}11721173/**1174 * Dies with a user-friendly message on how to proceed after resolving the1175 * problem. This message can be overridden with state->resolvemsg.1176 */1177static void NORETURN die_user_resolve(const struct am_state *state)1178{1179if(state->resolvemsg) {1180printf_ln("%s", state->resolvemsg);1181}else{1182const char*cmdline = state->interactive ?"git am -i":"git am";11831184printf_ln(_("When you have resolved this problem, run\"%s--continue\"."), cmdline);1185printf_ln(_("If you prefer to skip this patch, run\"%s--skip\"instead."), cmdline);1186printf_ln(_("To restore the original branch and stop patching, run\"%s--abort\"."), cmdline);1187}11881189exit(128);1190}11911192/**1193 * Appends signoff to the "msg" field of the am_state.1194 */1195static voidam_append_signoff(struct am_state *state)1196{1197struct strbuf sb = STRBUF_INIT;11981199strbuf_attach(&sb, state->msg, state->msg_len, state->msg_len);1200append_signoff(&sb,0,0);1201 state->msg =strbuf_detach(&sb, &state->msg_len);1202}12031204/**1205 * Parses `mail` using git-mailinfo, extracting its patch and authorship info.1206 * state->msg will be set to the patch message. state->author_name,1207 * state->author_email and state->author_date will be set to the patch author's1208 * name, email and date respectively. The patch body will be written to the1209 * state directory's "patch" file.1210 *1211 * Returns 1 if the patch should be skipped, 0 otherwise.1212 */1213static intparse_mail(struct am_state *state,const char*mail)1214{1215FILE*fp;1216struct strbuf sb = STRBUF_INIT;1217struct strbuf msg = STRBUF_INIT;1218struct strbuf author_name = STRBUF_INIT;1219struct strbuf author_date = STRBUF_INIT;1220struct strbuf author_email = STRBUF_INIT;1221int ret =0;1222struct mailinfo mi;12231224setup_mailinfo(&mi);12251226if(state->utf8)1227 mi.metainfo_charset =get_commit_output_encoding();1228else1229 mi.metainfo_charset = NULL;12301231switch(state->keep) {1232case KEEP_FALSE:1233break;1234case KEEP_TRUE:1235 mi.keep_subject =1;1236break;1237case KEEP_NON_PATCH:1238 mi.keep_non_patch_brackets_in_subject =1;1239break;1240default:1241die("BUG: invalid value for state->keep");1242}12431244if(state->message_id)1245 mi.add_message_id =1;12461247switch(state->scissors) {1248case SCISSORS_UNSET:1249break;1250case SCISSORS_FALSE:1251 mi.use_scissors =0;1252break;1253case SCISSORS_TRUE:1254 mi.use_scissors =1;1255break;1256default:1257die("BUG: invalid value for state->scissors");1258}12591260 mi.input =xfopen(mail,"r");1261 mi.output =xfopen(am_path(state,"info"),"w");1262if(mailinfo(&mi,am_path(state,"msg"),am_path(state,"patch")))1263die("could not parse patch");12641265fclose(mi.input);1266fclose(mi.output);12671268/* Extract message and author information */1269 fp =xfopen(am_path(state,"info"),"r");1270while(!strbuf_getline_lf(&sb, fp)) {1271const char*x;12721273if(skip_prefix(sb.buf,"Subject: ", &x)) {1274if(msg.len)1275strbuf_addch(&msg,'\n');1276strbuf_addstr(&msg, x);1277}else if(skip_prefix(sb.buf,"Author: ", &x))1278strbuf_addstr(&author_name, x);1279else if(skip_prefix(sb.buf,"Email: ", &x))1280strbuf_addstr(&author_email, x);1281else if(skip_prefix(sb.buf,"Date: ", &x))1282strbuf_addstr(&author_date, x);1283}1284fclose(fp);12851286/* Skip pine's internal folder data */1287if(!strcmp(author_name.buf,"Mail System Internal Data")) {1288 ret =1;1289goto finish;1290}12911292if(is_empty_file(am_path(state,"patch"))) {1293printf_ln(_("Patch is empty."));1294die_user_resolve(state);1295}12961297strbuf_addstr(&msg,"\n\n");1298strbuf_addbuf(&msg, &mi.log_message);1299strbuf_stripspace(&msg,0);13001301assert(!state->author_name);1302 state->author_name =strbuf_detach(&author_name, NULL);13031304assert(!state->author_email);1305 state->author_email =strbuf_detach(&author_email, NULL);13061307assert(!state->author_date);1308 state->author_date =strbuf_detach(&author_date, NULL);13091310assert(!state->msg);1311 state->msg =strbuf_detach(&msg, &state->msg_len);13121313finish:1314strbuf_release(&msg);1315strbuf_release(&author_date);1316strbuf_release(&author_email);1317strbuf_release(&author_name);1318strbuf_release(&sb);1319clear_mailinfo(&mi);1320return ret;1321}13221323/**1324 * Sets commit_id to the commit hash where the mail was generated from.1325 * Returns 0 on success, -1 on failure.1326 */1327static intget_mail_commit_oid(struct object_id *commit_id,const char*mail)1328{1329struct strbuf sb = STRBUF_INIT;1330FILE*fp =xfopen(mail,"r");1331const char*x;1332int ret =0;13331334if(strbuf_getline_lf(&sb, fp) ||1335!skip_prefix(sb.buf,"From ", &x) ||1336get_oid_hex(x, commit_id) <0)1337 ret = -1;13381339strbuf_release(&sb);1340fclose(fp);1341return ret;1342}13431344/**1345 * Sets state->msg, state->author_name, state->author_email, state->author_date1346 * to the commit's respective info.1347 */1348static voidget_commit_info(struct am_state *state,struct commit *commit)1349{1350const char*buffer, *ident_line, *msg;1351size_t ident_len;1352struct ident_split id;13531354 buffer =logmsg_reencode(commit, NULL,get_commit_output_encoding());13551356 ident_line =find_commit_header(buffer,"author", &ident_len);13571358if(split_ident_line(&id, ident_line, ident_len) <0)1359die(_("invalid ident line: %.*s"), (int)ident_len, ident_line);13601361assert(!state->author_name);1362if(id.name_begin)1363 state->author_name =1364xmemdupz(id.name_begin, id.name_end - id.name_begin);1365else1366 state->author_name =xstrdup("");13671368assert(!state->author_email);1369if(id.mail_begin)1370 state->author_email =1371xmemdupz(id.mail_begin, id.mail_end - id.mail_begin);1372else1373 state->author_email =xstrdup("");13741375assert(!state->author_date);1376 state->author_date =xstrdup(show_ident_date(&id,DATE_MODE(NORMAL)));13771378assert(!state->msg);1379 msg =strstr(buffer,"\n\n");1380if(!msg)1381die(_("unable to parse commit%s"),oid_to_hex(&commit->object.oid));1382 state->msg =xstrdup(msg +2);1383 state->msg_len =strlen(state->msg);1384unuse_commit_buffer(commit, buffer);1385}13861387/**1388 * Writes `commit` as a patch to the state directory's "patch" file.1389 */1390static voidwrite_commit_patch(const struct am_state *state,struct commit *commit)1391{1392struct rev_info rev_info;1393FILE*fp;13941395 fp =xfopen(am_path(state,"patch"),"w");1396init_revisions(&rev_info, NULL);1397 rev_info.diff =1;1398 rev_info.abbrev =0;1399 rev_info.disable_stdin =1;1400 rev_info.show_root_diff =1;1401 rev_info.diffopt.output_format = DIFF_FORMAT_PATCH;1402 rev_info.no_commit_id =1;1403DIFF_OPT_SET(&rev_info.diffopt, BINARY);1404DIFF_OPT_SET(&rev_info.diffopt, FULL_INDEX);1405 rev_info.diffopt.use_color =0;1406 rev_info.diffopt.file = fp;1407 rev_info.diffopt.close_file =1;1408add_pending_object(&rev_info, &commit->object,"");1409diff_setup_done(&rev_info.diffopt);1410log_tree_commit(&rev_info, commit);1411}14121413/**1414 * Writes the diff of the index against HEAD as a patch to the state1415 * directory's "patch" file.1416 */1417static voidwrite_index_patch(const struct am_state *state)1418{1419struct tree *tree;1420struct object_id head;1421struct rev_info rev_info;1422FILE*fp;14231424if(!get_oid_tree("HEAD", &head))1425 tree =lookup_tree(&head);1426else1427 tree =lookup_tree(&empty_tree_oid);14281429 fp =xfopen(am_path(state,"patch"),"w");1430init_revisions(&rev_info, NULL);1431 rev_info.diff =1;1432 rev_info.disable_stdin =1;1433 rev_info.no_commit_id =1;1434 rev_info.diffopt.output_format = DIFF_FORMAT_PATCH;1435 rev_info.diffopt.use_color =0;1436 rev_info.diffopt.file = fp;1437 rev_info.diffopt.close_file =1;1438add_pending_object(&rev_info, &tree->object,"");1439diff_setup_done(&rev_info.diffopt);1440run_diff_index(&rev_info,1);1441}14421443/**1444 * Like parse_mail(), but parses the mail by looking up its commit ID1445 * directly. This is used in --rebasing mode to bypass git-mailinfo's munging1446 * of patches.1447 *1448 * state->orig_commit will be set to the original commit ID.1449 *1450 * Will always return 0 as the patch should never be skipped.1451 */1452static intparse_mail_rebase(struct am_state *state,const char*mail)1453{1454struct commit *commit;1455struct object_id commit_oid;14561457if(get_mail_commit_oid(&commit_oid, mail) <0)1458die(_("could not parse%s"), mail);14591460 commit =lookup_commit_or_die(&commit_oid, mail);14611462get_commit_info(state, commit);14631464write_commit_patch(state, commit);14651466oidcpy(&state->orig_commit, &commit_oid);1467write_state_text(state,"original-commit",oid_to_hex(&commit_oid));14681469return0;1470}14711472/**1473 * Applies current patch with git-apply. Returns 0 on success, -1 otherwise. If1474 * `index_file` is not NULL, the patch will be applied to that index.1475 */1476static intrun_apply(const struct am_state *state,const char*index_file)1477{1478struct argv_array apply_paths = ARGV_ARRAY_INIT;1479struct argv_array apply_opts = ARGV_ARRAY_INIT;1480struct apply_state apply_state;1481int res, opts_left;1482static struct lock_file lock_file;1483int force_apply =0;1484int options =0;14851486if(init_apply_state(&apply_state, NULL, &lock_file))1487die("BUG: init_apply_state() failed");14881489argv_array_push(&apply_opts,"apply");1490argv_array_pushv(&apply_opts, state->git_apply_opts.argv);14911492 opts_left =apply_parse_options(apply_opts.argc, apply_opts.argv,1493&apply_state, &force_apply, &options,1494 NULL);14951496if(opts_left !=0)1497die("unknown option passed through to git apply");14981499if(index_file) {1500 apply_state.index_file = index_file;1501 apply_state.cached =1;1502}else1503 apply_state.check_index =1;15041505/*1506 * If we are allowed to fall back on 3-way merge, don't give false1507 * errors during the initial attempt.1508 */1509if(state->threeway && !index_file)1510 apply_state.apply_verbosity = verbosity_silent;15111512if(check_apply_state(&apply_state, force_apply))1513die("BUG: check_apply_state() failed");15141515argv_array_push(&apply_paths,am_path(state,"patch"));15161517 res =apply_all_patches(&apply_state, apply_paths.argc, apply_paths.argv, options);15181519argv_array_clear(&apply_paths);1520argv_array_clear(&apply_opts);1521clear_apply_state(&apply_state);15221523if(res)1524return res;15251526if(index_file) {1527/* Reload index as apply_all_patches() will have modified it. */1528discard_cache();1529read_cache_from(index_file);1530}15311532return0;1533}15341535/**1536 * Builds an index that contains just the blobs needed for a 3way merge.1537 */1538static intbuild_fake_ancestor(const struct am_state *state,const char*index_file)1539{1540struct child_process cp = CHILD_PROCESS_INIT;15411542 cp.git_cmd =1;1543argv_array_push(&cp.args,"apply");1544argv_array_pushv(&cp.args, state->git_apply_opts.argv);1545argv_array_pushf(&cp.args,"--build-fake-ancestor=%s", index_file);1546argv_array_push(&cp.args,am_path(state,"patch"));15471548if(run_command(&cp))1549return-1;15501551return0;1552}15531554/**1555 * Attempt a threeway merge, using index_path as the temporary index.1556 */1557static intfall_back_threeway(const struct am_state *state,const char*index_path)1558{1559struct object_id orig_tree, their_tree, our_tree;1560const struct object_id *bases[1] = { &orig_tree };1561struct merge_options o;1562struct commit *result;1563char*their_tree_name;15641565if(get_oid("HEAD", &our_tree) <0)1566hashcpy(our_tree.hash, EMPTY_TREE_SHA1_BIN);15671568if(build_fake_ancestor(state, index_path))1569returnerror("could not build fake ancestor");15701571discard_cache();1572read_cache_from(index_path);15731574if(write_index_as_tree(orig_tree.hash, &the_index, index_path,0, NULL))1575returnerror(_("Repository lacks necessary blobs to fall back on 3-way merge."));15761577say(state, stdout,_("Using index info to reconstruct a base tree..."));15781579if(!state->quiet) {1580/*1581 * List paths that needed 3-way fallback, so that the user can1582 * review them with extra care to spot mismerges.1583 */1584struct rev_info rev_info;1585const char*diff_filter_str ="--diff-filter=AM";15861587init_revisions(&rev_info, NULL);1588 rev_info.diffopt.output_format = DIFF_FORMAT_NAME_STATUS;1589diff_opt_parse(&rev_info.diffopt, &diff_filter_str,1, rev_info.prefix);1590add_pending_oid(&rev_info,"HEAD", &our_tree,0);1591diff_setup_done(&rev_info.diffopt);1592run_diff_index(&rev_info,1);1593}15941595if(run_apply(state, index_path))1596returnerror(_("Did you hand edit your patch?\n"1597"It does not apply to blobs recorded in its index."));15981599if(write_index_as_tree(their_tree.hash, &the_index, index_path,0, NULL))1600returnerror("could not write tree");16011602say(state, stdout,_("Falling back to patching base and 3-way merge..."));16031604discard_cache();1605read_cache();16061607/*1608 * This is not so wrong. Depending on which base we picked, orig_tree1609 * may be wildly different from ours, but their_tree has the same set of1610 * wildly different changes in parts the patch did not touch, so1611 * recursive ends up canceling them, saying that we reverted all those1612 * changes.1613 */16141615init_merge_options(&o);16161617 o.branch1 ="HEAD";1618 their_tree_name =xstrfmt("%.*s",linelen(state->msg), state->msg);1619 o.branch2 = their_tree_name;16201621if(state->quiet)1622 o.verbosity =0;16231624if(merge_recursive_generic(&o, &our_tree, &their_tree,1, bases, &result)) {1625rerere(state->allow_rerere_autoupdate);1626free(their_tree_name);1627returnerror(_("Failed to merge in the changes."));1628}16291630free(their_tree_name);1631return0;1632}16331634/**1635 * Commits the current index with state->msg as the commit message and1636 * state->author_name, state->author_email and state->author_date as the author1637 * information.1638 */1639static voiddo_commit(const struct am_state *state)1640{1641struct object_id tree, parent, commit;1642const struct object_id *old_oid;1643struct commit_list *parents = NULL;1644const char*reflog_msg, *author;1645struct strbuf sb = STRBUF_INIT;16461647if(run_hook_le(NULL,"pre-applypatch", NULL))1648exit(1);16491650if(write_cache_as_tree(tree.hash,0, NULL))1651die(_("git write-tree failed to write a tree"));16521653if(!get_oid_commit("HEAD", &parent)) {1654 old_oid = &parent;1655commit_list_insert(lookup_commit(&parent), &parents);1656}else{1657 old_oid = NULL;1658say(state, stderr,_("applying to an empty history"));1659}16601661 author =fmt_ident(state->author_name, state->author_email,1662 state->ignore_date ? NULL : state->author_date,1663 IDENT_STRICT);16641665if(state->committer_date_is_author_date)1666setenv("GIT_COMMITTER_DATE",1667 state->ignore_date ?"": state->author_date,1);16681669if(commit_tree(state->msg, state->msg_len, tree.hash, parents, commit.hash,1670 author, state->sign_commit))1671die(_("failed to write commit object"));16721673 reflog_msg =getenv("GIT_REFLOG_ACTION");1674if(!reflog_msg)1675 reflog_msg ="am";16761677strbuf_addf(&sb,"%s: %.*s", reflog_msg,linelen(state->msg),1678 state->msg);16791680update_ref_oid(sb.buf,"HEAD", &commit, old_oid,0,1681 UPDATE_REFS_DIE_ON_ERR);16821683if(state->rebasing) {1684FILE*fp =xfopen(am_path(state,"rewritten"),"a");16851686assert(!is_null_oid(&state->orig_commit));1687fprintf(fp,"%s",oid_to_hex(&state->orig_commit));1688fprintf(fp,"%s\n",oid_to_hex(&commit));1689fclose(fp);1690}16911692run_hook_le(NULL,"post-applypatch", NULL);16931694strbuf_release(&sb);1695}16961697/**1698 * Validates the am_state for resuming -- the "msg" and authorship fields must1699 * be filled up.1700 */1701static voidvalidate_resume_state(const struct am_state *state)1702{1703if(!state->msg)1704die(_("cannot resume:%sdoes not exist."),1705am_path(state,"final-commit"));17061707if(!state->author_name || !state->author_email || !state->author_date)1708die(_("cannot resume:%sdoes not exist."),1709am_path(state,"author-script"));1710}17111712/**1713 * Interactively prompt the user on whether the current patch should be1714 * applied.1715 *1716 * Returns 0 if the user chooses to apply the patch, 1 if the user chooses to1717 * skip it.1718 */1719static intdo_interactive(struct am_state *state)1720{1721assert(state->msg);17221723if(!isatty(0))1724die(_("cannot be interactive without stdin connected to a terminal."));17251726for(;;) {1727const char*reply;17281729puts(_("Commit Body is:"));1730puts("--------------------------");1731printf("%s", state->msg);1732puts("--------------------------");17331734/*1735 * TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]1736 * in your translation. The program will only accept English1737 * input at this point.1738 */1739 reply =git_prompt(_("Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "), PROMPT_ECHO);17401741if(!reply) {1742continue;1743}else if(*reply =='y'|| *reply =='Y') {1744return0;1745}else if(*reply =='a'|| *reply =='A') {1746 state->interactive =0;1747return0;1748}else if(*reply =='n'|| *reply =='N') {1749return1;1750}else if(*reply =='e'|| *reply =='E') {1751struct strbuf msg = STRBUF_INIT;17521753if(!launch_editor(am_path(state,"final-commit"), &msg, NULL)) {1754free(state->msg);1755 state->msg =strbuf_detach(&msg, &state->msg_len);1756}1757strbuf_release(&msg);1758}else if(*reply =='v'|| *reply =='V') {1759const char*pager =git_pager(1);1760struct child_process cp = CHILD_PROCESS_INIT;17611762if(!pager)1763 pager ="cat";1764prepare_pager_args(&cp, pager);1765argv_array_push(&cp.args,am_path(state,"patch"));1766run_command(&cp);1767}1768}1769}17701771/**1772 * Applies all queued mail.1773 *1774 * If `resume` is true, we are "resuming". The "msg" and authorship fields, as1775 * well as the state directory's "patch" file is used as-is for applying the1776 * patch and committing it.1777 */1778static voidam_run(struct am_state *state,int resume)1779{1780const char*argv_gc_auto[] = {"gc","--auto", NULL};1781struct strbuf sb = STRBUF_INIT;17821783unlink(am_path(state,"dirtyindex"));17841785refresh_and_write_cache();17861787if(index_has_changes(&sb)) {1788write_state_bool(state,"dirtyindex",1);1789die(_("Dirty index: cannot apply patches (dirty:%s)"), sb.buf);1790}17911792strbuf_release(&sb);17931794while(state->cur <= state->last) {1795const char*mail =am_path(state,msgnum(state));1796int apply_status;17971798reset_ident_date();17991800if(!file_exists(mail))1801goto next;18021803if(resume) {1804validate_resume_state(state);1805}else{1806int skip;18071808if(state->rebasing)1809 skip =parse_mail_rebase(state, mail);1810else1811 skip =parse_mail(state, mail);18121813if(skip)1814goto next;/* mail should be skipped */18151816if(state->signoff)1817am_append_signoff(state);18181819write_author_script(state);1820write_commit_msg(state);1821}18221823if(state->interactive &&do_interactive(state))1824goto next;18251826if(run_applypatch_msg_hook(state))1827exit(1);18281829say(state, stdout,_("Applying: %.*s"),linelen(state->msg), state->msg);18301831 apply_status =run_apply(state, NULL);18321833if(apply_status && state->threeway) {1834struct strbuf sb = STRBUF_INIT;18351836strbuf_addstr(&sb,am_path(state,"patch-merge-index"));1837 apply_status =fall_back_threeway(state, sb.buf);1838strbuf_release(&sb);18391840/*1841 * Applying the patch to an earlier tree and merging1842 * the result may have produced the same tree as ours.1843 */1844if(!apply_status && !index_has_changes(NULL)) {1845say(state, stdout,_("No changes -- Patch already applied."));1846goto next;1847}1848}18491850if(apply_status) {1851int advice_amworkdir =1;18521853printf_ln(_("Patch failed at%s%.*s"),msgnum(state),1854linelen(state->msg), state->msg);18551856git_config_get_bool("advice.amworkdir", &advice_amworkdir);18571858if(advice_amworkdir)1859printf_ln(_("The copy of the patch that failed is found in:%s"),1860am_path(state,"patch"));18611862die_user_resolve(state);1863}18641865do_commit(state);18661867next:1868am_next(state);18691870if(resume)1871am_load(state);1872 resume =0;1873}18741875if(!is_empty_file(am_path(state,"rewritten"))) {1876assert(state->rebasing);1877copy_notes_for_rebase(state);1878run_post_rewrite_hook(state);1879}18801881/*1882 * In rebasing mode, it's up to the caller to take care of1883 * housekeeping.1884 */1885if(!state->rebasing) {1886am_destroy(state);1887close_all_packs();1888run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);1889}1890}18911892/**1893 * Resume the current am session after patch application failure. The user did1894 * all the hard work, and we do not have to do any patch application. Just1895 * trust and commit what the user has in the index and working tree.1896 */1897static voidam_resolve(struct am_state *state)1898{1899validate_resume_state(state);19001901say(state, stdout,_("Applying: %.*s"),linelen(state->msg), state->msg);19021903if(!index_has_changes(NULL)) {1904printf_ln(_("No changes - did you forget to use 'git add'?\n"1905"If there is nothing left to stage, chances are that something else\n"1906"already introduced the same changes; you might want to skip this patch."));1907die_user_resolve(state);1908}19091910if(unmerged_cache()) {1911printf_ln(_("You still have unmerged paths in your index.\n"1912"You should 'git add' each file with resolved conflicts to mark them as such.\n"1913"You might run `git rm` on a file to accept\"deleted by them\"for it."));1914die_user_resolve(state);1915}19161917if(state->interactive) {1918write_index_patch(state);1919if(do_interactive(state))1920goto next;1921}19221923rerere(0);19241925do_commit(state);19261927next:1928am_next(state);1929am_load(state);1930am_run(state,0);1931}19321933/**1934 * Performs a checkout fast-forward from `head` to `remote`. If `reset` is1935 * true, any unmerged entries will be discarded. Returns 0 on success, -1 on1936 * failure.1937 */1938static intfast_forward_to(struct tree *head,struct tree *remote,int reset)1939{1940struct lock_file *lock_file;1941struct unpack_trees_options opts;1942struct tree_desc t[2];19431944if(parse_tree(head) ||parse_tree(remote))1945return-1;19461947 lock_file =xcalloc(1,sizeof(struct lock_file));1948hold_locked_index(lock_file, LOCK_DIE_ON_ERROR);19491950refresh_cache(REFRESH_QUIET);19511952memset(&opts,0,sizeof(opts));1953 opts.head_idx =1;1954 opts.src_index = &the_index;1955 opts.dst_index = &the_index;1956 opts.update =1;1957 opts.merge =1;1958 opts.reset = reset;1959 opts.fn = twoway_merge;1960init_tree_desc(&t[0], head->buffer, head->size);1961init_tree_desc(&t[1], remote->buffer, remote->size);19621963if(unpack_trees(2, t, &opts)) {1964rollback_lock_file(lock_file);1965return-1;1966}19671968if(write_locked_index(&the_index, lock_file, COMMIT_LOCK))1969die(_("unable to write new index file"));19701971return0;1972}19731974/**1975 * Merges a tree into the index. The index's stat info will take precedence1976 * over the merged tree's. Returns 0 on success, -1 on failure.1977 */1978static intmerge_tree(struct tree *tree)1979{1980struct lock_file *lock_file;1981struct unpack_trees_options opts;1982struct tree_desc t[1];19831984if(parse_tree(tree))1985return-1;19861987 lock_file =xcalloc(1,sizeof(struct lock_file));1988hold_locked_index(lock_file, LOCK_DIE_ON_ERROR);19891990memset(&opts,0,sizeof(opts));1991 opts.head_idx =1;1992 opts.src_index = &the_index;1993 opts.dst_index = &the_index;1994 opts.merge =1;1995 opts.fn = oneway_merge;1996init_tree_desc(&t[0], tree->buffer, tree->size);19971998if(unpack_trees(1, t, &opts)) {1999rollback_lock_file(lock_file);2000return-1;2001}20022003if(write_locked_index(&the_index, lock_file, COMMIT_LOCK))2004die(_("unable to write new index file"));20052006return0;2007}20082009/**2010 * Clean the index without touching entries that are not modified between2011 * `head` and `remote`.2012 */2013static intclean_index(const struct object_id *head,const struct object_id *remote)2014{2015struct tree *head_tree, *remote_tree, *index_tree;2016struct object_id index;20172018 head_tree =parse_tree_indirect(head);2019if(!head_tree)2020returnerror(_("Could not parse object '%s'."),oid_to_hex(head));20212022 remote_tree =parse_tree_indirect(remote);2023if(!remote_tree)2024returnerror(_("Could not parse object '%s'."),oid_to_hex(remote));20252026read_cache_unmerged();20272028if(fast_forward_to(head_tree, head_tree,1))2029return-1;20302031if(write_cache_as_tree(index.hash,0, NULL))2032return-1;20332034 index_tree =parse_tree_indirect(&index);2035if(!index_tree)2036returnerror(_("Could not parse object '%s'."),oid_to_hex(&index));20372038if(fast_forward_to(index_tree, remote_tree,0))2039return-1;20402041if(merge_tree(remote_tree))2042return-1;20432044remove_branch_state();20452046return0;2047}20482049/**2050 * Resets rerere's merge resolution metadata.2051 */2052static voidam_rerere_clear(void)2053{2054struct string_list merge_rr = STRING_LIST_INIT_DUP;2055rerere_clear(&merge_rr);2056string_list_clear(&merge_rr,1);2057}20582059/**2060 * Resume the current am session by skipping the current patch.2061 */2062static voidam_skip(struct am_state *state)2063{2064struct object_id head;20652066am_rerere_clear();20672068if(get_oid("HEAD", &head))2069hashcpy(head.hash, EMPTY_TREE_SHA1_BIN);20702071if(clean_index(&head, &head))2072die(_("failed to clean index"));20732074am_next(state);2075am_load(state);2076am_run(state,0);2077}20782079/**2080 * Returns true if it is safe to reset HEAD to the ORIG_HEAD, false otherwise.2081 *2082 * It is not safe to reset HEAD when:2083 * 1. git-am previously failed because the index was dirty.2084 * 2. HEAD has moved since git-am previously failed.2085 */2086static intsafe_to_abort(const struct am_state *state)2087{2088struct strbuf sb = STRBUF_INIT;2089struct object_id abort_safety, head;20902091if(file_exists(am_path(state,"dirtyindex")))2092return0;20932094if(read_state_file(&sb, state,"abort-safety",1) >0) {2095if(get_oid_hex(sb.buf, &abort_safety))2096die(_("could not parse%s"),am_path(state,"abort-safety"));2097}else2098oidclr(&abort_safety);20992100if(get_oid("HEAD", &head))2101oidclr(&head);21022103if(!oidcmp(&head, &abort_safety))2104return1;21052106warning(_("You seem to have moved HEAD since the last 'am' failure.\n"2107"Not rewinding to ORIG_HEAD"));21082109return0;2110}21112112/**2113 * Aborts the current am session if it is safe to do so.2114 */2115static voidam_abort(struct am_state *state)2116{2117struct object_id curr_head, orig_head;2118int has_curr_head, has_orig_head;2119char*curr_branch;21202121if(!safe_to_abort(state)) {2122am_destroy(state);2123return;2124}21252126am_rerere_clear();21272128 curr_branch =resolve_refdup("HEAD",0, curr_head.hash, NULL);2129 has_curr_head = curr_branch && !is_null_oid(&curr_head);2130if(!has_curr_head)2131hashcpy(curr_head.hash, EMPTY_TREE_SHA1_BIN);21322133 has_orig_head = !get_oid("ORIG_HEAD", &orig_head);2134if(!has_orig_head)2135hashcpy(orig_head.hash, EMPTY_TREE_SHA1_BIN);21362137clean_index(&curr_head, &orig_head);21382139if(has_orig_head)2140update_ref_oid("am --abort","HEAD", &orig_head,2141 has_curr_head ? &curr_head : NULL,0,2142 UPDATE_REFS_DIE_ON_ERR);2143else if(curr_branch)2144delete_ref(NULL, curr_branch, NULL, REF_NODEREF);21452146free(curr_branch);2147am_destroy(state);2148}21492150/**2151 * parse_options() callback that validates and sets opt->value to the2152 * PATCH_FORMAT_* enum value corresponding to `arg`.2153 */2154static intparse_opt_patchformat(const struct option *opt,const char*arg,int unset)2155{2156int*opt_value = opt->value;21572158if(!strcmp(arg,"mbox"))2159*opt_value = PATCH_FORMAT_MBOX;2160else if(!strcmp(arg,"stgit"))2161*opt_value = PATCH_FORMAT_STGIT;2162else if(!strcmp(arg,"stgit-series"))2163*opt_value = PATCH_FORMAT_STGIT_SERIES;2164else if(!strcmp(arg,"hg"))2165*opt_value = PATCH_FORMAT_HG;2166else if(!strcmp(arg,"mboxrd"))2167*opt_value = PATCH_FORMAT_MBOXRD;2168else2169returnerror(_("Invalid value for --patch-format:%s"), arg);2170return0;2171}21722173enum resume_mode {2174 RESUME_FALSE =0,2175 RESUME_APPLY,2176 RESUME_RESOLVED,2177 RESUME_SKIP,2178 RESUME_ABORT2179};21802181static intgit_am_config(const char*k,const char*v,void*cb)2182{2183int status;21842185 status =git_gpg_config(k, v, NULL);2186if(status)2187return status;21882189returngit_default_config(k, v, NULL);2190}21912192intcmd_am(int argc,const char**argv,const char*prefix)2193{2194struct am_state state;2195int binary = -1;2196int keep_cr = -1;2197int patch_format = PATCH_FORMAT_UNKNOWN;2198enum resume_mode resume = RESUME_FALSE;2199int in_progress;22002201const char*const usage[] = {2202N_("git am [<options>] [(<mbox> | <Maildir>)...]"),2203N_("git am [<options>] (--continue | --skip | --abort)"),2204 NULL2205};22062207struct option options[] = {2208OPT_BOOL('i',"interactive", &state.interactive,2209N_("run interactively")),2210OPT_HIDDEN_BOOL('b',"binary", &binary,2211N_("historical option -- no-op")),2212OPT_BOOL('3',"3way", &state.threeway,2213N_("allow fall back on 3way merging if needed")),2214OPT__QUIET(&state.quiet,N_("be quiet")),2215OPT_SET_INT('s',"signoff", &state.signoff,2216N_("add a Signed-off-by line to the commit message"),2217 SIGNOFF_EXPLICIT),2218OPT_BOOL('u',"utf8", &state.utf8,2219N_("recode into utf8 (default)")),2220OPT_SET_INT('k',"keep", &state.keep,2221N_("pass -k flag to git-mailinfo"), KEEP_TRUE),2222OPT_SET_INT(0,"keep-non-patch", &state.keep,2223N_("pass -b flag to git-mailinfo"), KEEP_NON_PATCH),2224OPT_BOOL('m',"message-id", &state.message_id,2225N_("pass -m flag to git-mailinfo")),2226{ OPTION_SET_INT,0,"keep-cr", &keep_cr, NULL,2227N_("pass --keep-cr flag to git-mailsplit for mbox format"),2228 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL,1},2229{ OPTION_SET_INT,0,"no-keep-cr", &keep_cr, NULL,2230N_("do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"),2231 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL,0},2232OPT_BOOL('c',"scissors", &state.scissors,2233N_("strip everything before a scissors line")),2234OPT_PASSTHRU_ARGV(0,"whitespace", &state.git_apply_opts,N_("action"),2235N_("pass it through git-apply"),22360),2237OPT_PASSTHRU_ARGV(0,"ignore-space-change", &state.git_apply_opts, NULL,2238N_("pass it through git-apply"),2239 PARSE_OPT_NOARG),2240OPT_PASSTHRU_ARGV(0,"ignore-whitespace", &state.git_apply_opts, NULL,2241N_("pass it through git-apply"),2242 PARSE_OPT_NOARG),2243OPT_PASSTHRU_ARGV(0,"directory", &state.git_apply_opts,N_("root"),2244N_("pass it through git-apply"),22450),2246OPT_PASSTHRU_ARGV(0,"exclude", &state.git_apply_opts,N_("path"),2247N_("pass it through git-apply"),22480),2249OPT_PASSTHRU_ARGV(0,"include", &state.git_apply_opts,N_("path"),2250N_("pass it through git-apply"),22510),2252OPT_PASSTHRU_ARGV('C', NULL, &state.git_apply_opts,N_("n"),2253N_("pass it through git-apply"),22540),2255OPT_PASSTHRU_ARGV('p', NULL, &state.git_apply_opts,N_("num"),2256N_("pass it through git-apply"),22570),2258OPT_CALLBACK(0,"patch-format", &patch_format,N_("format"),2259N_("format the patch(es) are in"),2260 parse_opt_patchformat),2261OPT_PASSTHRU_ARGV(0,"reject", &state.git_apply_opts, NULL,2262N_("pass it through git-apply"),2263 PARSE_OPT_NOARG),2264OPT_STRING(0,"resolvemsg", &state.resolvemsg, NULL,2265N_("override error message when patch failure occurs")),2266OPT_CMDMODE(0,"continue", &resume,2267N_("continue applying patches after resolving a conflict"),2268 RESUME_RESOLVED),2269OPT_CMDMODE('r',"resolved", &resume,2270N_("synonyms for --continue"),2271 RESUME_RESOLVED),2272OPT_CMDMODE(0,"skip", &resume,2273N_("skip the current patch"),2274 RESUME_SKIP),2275OPT_CMDMODE(0,"abort", &resume,2276N_("restore the original branch and abort the patching operation."),2277 RESUME_ABORT),2278OPT_BOOL(0,"committer-date-is-author-date",2279&state.committer_date_is_author_date,2280N_("lie about committer date")),2281OPT_BOOL(0,"ignore-date", &state.ignore_date,2282N_("use current timestamp for author date")),2283OPT_RERERE_AUTOUPDATE(&state.allow_rerere_autoupdate),2284{ OPTION_STRING,'S',"gpg-sign", &state.sign_commit,N_("key-id"),2285N_("GPG-sign commits"),2286 PARSE_OPT_OPTARG, NULL, (intptr_t)""},2287OPT_HIDDEN_BOOL(0,"rebasing", &state.rebasing,2288N_("(internal use for git-rebase)")),2289OPT_END()2290};22912292if(argc ==2&& !strcmp(argv[1],"-h"))2293usage_with_options(usage, options);22942295git_config(git_am_config, NULL);22962297am_state_init(&state);22982299 in_progress =am_in_progress(&state);2300if(in_progress)2301am_load(&state);23022303 argc =parse_options(argc, argv, prefix, options, usage,0);23042305if(binary >=0)2306fprintf_ln(stderr,_("The -b/--binary option has been a no-op for long time, and\n"2307"it will be removed. Please do not use it anymore."));23082309/* Ensure a valid committer ident can be constructed */2310git_committer_info(IDENT_STRICT);23112312if(read_index_preload(&the_index, NULL) <0)2313die(_("failed to read the index"));23142315if(in_progress) {2316/*2317 * Catch user error to feed us patches when there is a session2318 * in progress:2319 *2320 * 1. mbox path(s) are provided on the command-line.2321 * 2. stdin is not a tty: the user is trying to feed us a patch2322 * from standard input. This is somewhat unreliable -- stdin2323 * could be /dev/null for example and the caller did not2324 * intend to feed us a patch but wanted to continue2325 * unattended.2326 */2327if(argc || (resume == RESUME_FALSE && !isatty(0)))2328die(_("previous rebase directory%sstill exists but mbox given."),2329 state.dir);23302331if(resume == RESUME_FALSE)2332 resume = RESUME_APPLY;23332334if(state.signoff == SIGNOFF_EXPLICIT)2335am_append_signoff(&state);2336}else{2337struct argv_array paths = ARGV_ARRAY_INIT;2338int i;23392340/*2341 * Handle stray state directory in the independent-run case. In2342 * the --rebasing case, it is up to the caller to take care of2343 * stray directories.2344 */2345if(file_exists(state.dir) && !state.rebasing) {2346if(resume == RESUME_ABORT) {2347am_destroy(&state);2348am_state_release(&state);2349return0;2350}23512352die(_("Stray%sdirectory found.\n"2353"Use\"git am --abort\"to remove it."),2354 state.dir);2355}23562357if(resume)2358die(_("Resolve operation not in progress, we are not resuming."));23592360for(i =0; i < argc; i++) {2361if(is_absolute_path(argv[i]) || !prefix)2362argv_array_push(&paths, argv[i]);2363else2364argv_array_push(&paths,mkpath("%s/%s", prefix, argv[i]));2365}23662367am_setup(&state, patch_format, paths.argv, keep_cr);23682369argv_array_clear(&paths);2370}23712372switch(resume) {2373case RESUME_FALSE:2374am_run(&state,0);2375break;2376case RESUME_APPLY:2377am_run(&state,1);2378break;2379case RESUME_RESOLVED:2380am_resolve(&state);2381break;2382case RESUME_SKIP:2383am_skip(&state);2384break;2385case RESUME_ABORT:2386am_abort(&state);2387break;2388default:2389die("BUG: invalid resume value");2390}23912392am_state_release(&state);23932394return0;2395}