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 35/** 36 * Returns 1 if the file is empty or does not exist, 0 otherwise. 37 */ 38static intis_empty_file(const char*filename) 39{ 40struct stat st; 41 42if(stat(filename, &st) <0) { 43if(errno == ENOENT) 44return1; 45die_errno(_("could not stat%s"), filename); 46} 47 48return!st.st_size; 49} 50 51/** 52 * Returns the length of the first line of msg. 53 */ 54static intlinelen(const char*msg) 55{ 56returnstrchrnul(msg,'\n') - msg; 57} 58 59/** 60 * Returns true if `str` consists of only whitespace, false otherwise. 61 */ 62static intstr_isspace(const char*str) 63{ 64for(; *str; str++) 65if(!isspace(*str)) 66return0; 67 68return1; 69} 70 71enum patch_format { 72 PATCH_FORMAT_UNKNOWN =0, 73 PATCH_FORMAT_MBOX, 74 PATCH_FORMAT_STGIT, 75 PATCH_FORMAT_STGIT_SERIES, 76 PATCH_FORMAT_HG, 77 PATCH_FORMAT_MBOXRD 78}; 79 80enum keep_type { 81 KEEP_FALSE =0, 82 KEEP_TRUE,/* pass -k flag to git-mailinfo */ 83 KEEP_NON_PATCH /* pass -b flag to git-mailinfo */ 84}; 85 86enum scissors_type { 87 SCISSORS_UNSET = -1, 88 SCISSORS_FALSE =0,/* pass --no-scissors to git-mailinfo */ 89 SCISSORS_TRUE /* pass --scissors to git-mailinfo */ 90}; 91 92enum signoff_type { 93 SIGNOFF_FALSE =0, 94 SIGNOFF_TRUE =1, 95 SIGNOFF_EXPLICIT /* --signoff was set on the command-line */ 96}; 97 98struct am_state { 99/* state directory path */ 100char*dir; 101 102/* current and last patch numbers, 1-indexed */ 103int cur; 104int last; 105 106/* commit metadata and message */ 107char*author_name; 108char*author_email; 109char*author_date; 110char*msg; 111size_t msg_len; 112 113/* when --rebasing, records the original commit the patch came from */ 114struct object_id orig_commit; 115 116/* number of digits in patch filename */ 117int prec; 118 119/* various operating modes and command line options */ 120int interactive; 121int threeway; 122int quiet; 123int signoff;/* enum signoff_type */ 124int utf8; 125int keep;/* enum keep_type */ 126int message_id; 127int scissors;/* enum scissors_type */ 128struct argv_array git_apply_opts; 129const char*resolvemsg; 130int committer_date_is_author_date; 131int ignore_date; 132int allow_rerere_autoupdate; 133const char*sign_commit; 134int rebasing; 135}; 136 137/** 138 * Initializes am_state with the default values. 139 */ 140static voidam_state_init(struct am_state *state) 141{ 142int gpgsign; 143 144memset(state,0,sizeof(*state)); 145 146 state->dir =git_pathdup("rebase-apply"); 147 148 state->prec =4; 149 150git_config_get_bool("am.threeway", &state->threeway); 151 152 state->utf8 =1; 153 154git_config_get_bool("am.messageid", &state->message_id); 155 156 state->scissors = SCISSORS_UNSET; 157 158argv_array_init(&state->git_apply_opts); 159 160if(!git_config_get_bool("commit.gpgsign", &gpgsign)) 161 state->sign_commit = gpgsign ?"": NULL; 162} 163 164/** 165 * Releases memory allocated by an am_state. 166 */ 167static voidam_state_release(struct am_state *state) 168{ 169free(state->dir); 170free(state->author_name); 171free(state->author_email); 172free(state->author_date); 173free(state->msg); 174argv_array_clear(&state->git_apply_opts); 175} 176 177/** 178 * Returns path relative to the am_state directory. 179 */ 180staticinlineconst char*am_path(const struct am_state *state,const char*path) 181{ 182returnmkpath("%s/%s", state->dir, path); 183} 184 185/** 186 * For convenience to call write_file() 187 */ 188static voidwrite_state_text(const struct am_state *state, 189const char*name,const char*string) 190{ 191write_file(am_path(state, name),"%s", string); 192} 193 194static voidwrite_state_count(const struct am_state *state, 195const char*name,int value) 196{ 197write_file(am_path(state, name),"%d", value); 198} 199 200static voidwrite_state_bool(const struct am_state *state, 201const char*name,int value) 202{ 203write_state_text(state, name, value ?"t":"f"); 204} 205 206/** 207 * If state->quiet is false, calls fprintf(fp, fmt, ...), and appends a newline 208 * at the end. 209 */ 210static voidsay(const struct am_state *state,FILE*fp,const char*fmt, ...) 211{ 212va_list ap; 213 214va_start(ap, fmt); 215if(!state->quiet) { 216vfprintf(fp, fmt, ap); 217putc('\n', fp); 218} 219va_end(ap); 220} 221 222/** 223 * Returns 1 if there is an am session in progress, 0 otherwise. 224 */ 225static intam_in_progress(const struct am_state *state) 226{ 227struct stat st; 228 229if(lstat(state->dir, &st) <0|| !S_ISDIR(st.st_mode)) 230return0; 231if(lstat(am_path(state,"last"), &st) || !S_ISREG(st.st_mode)) 232return0; 233if(lstat(am_path(state,"next"), &st) || !S_ISREG(st.st_mode)) 234return0; 235return1; 236} 237 238/** 239 * Reads the contents of `file` in the `state` directory into `sb`. Returns the 240 * number of bytes read on success, -1 if the file does not exist. If `trim` is 241 * set, trailing whitespace will be removed. 242 */ 243static intread_state_file(struct strbuf *sb,const struct am_state *state, 244const char*file,int trim) 245{ 246strbuf_reset(sb); 247 248if(strbuf_read_file(sb,am_path(state, file),0) >=0) { 249if(trim) 250strbuf_trim(sb); 251 252return sb->len; 253} 254 255if(errno == ENOENT) 256return-1; 257 258die_errno(_("could not read '%s'"),am_path(state, file)); 259} 260 261/** 262 * Take a series of KEY='VALUE' lines where VALUE part is 263 * sq-quoted, and append <KEY, VALUE> at the end of the string list 264 */ 265static intparse_key_value_squoted(char*buf,struct string_list *list) 266{ 267while(*buf) { 268struct string_list_item *item; 269char*np; 270char*cp =strchr(buf,'='); 271if(!cp) 272return-1; 273 np =strchrnul(cp,'\n'); 274*cp++ ='\0'; 275 item =string_list_append(list, buf); 276 277 buf = np + (*np =='\n'); 278*np ='\0'; 279 cp =sq_dequote(cp); 280if(!cp) 281return-1; 282 item->util =xstrdup(cp); 283} 284return0; 285} 286 287/** 288 * Reads and parses the state directory's "author-script" file, and sets 289 * state->author_name, state->author_email and state->author_date accordingly. 290 * Returns 0 on success, -1 if the file could not be parsed. 291 * 292 * The author script is of the format: 293 * 294 * GIT_AUTHOR_NAME='$author_name' 295 * GIT_AUTHOR_EMAIL='$author_email' 296 * GIT_AUTHOR_DATE='$author_date' 297 * 298 * where $author_name, $author_email and $author_date are quoted. We are strict 299 * with our parsing, as the file was meant to be eval'd in the old git-am.sh 300 * script, and thus if the file differs from what this function expects, it is 301 * better to bail out than to do something that the user does not expect. 302 */ 303static intread_author_script(struct am_state *state) 304{ 305const char*filename =am_path(state,"author-script"); 306struct strbuf buf = STRBUF_INIT; 307struct string_list kv = STRING_LIST_INIT_DUP; 308int retval = -1;/* assume failure */ 309int fd; 310 311assert(!state->author_name); 312assert(!state->author_email); 313assert(!state->author_date); 314 315 fd =open(filename, O_RDONLY); 316if(fd <0) { 317if(errno == ENOENT) 318return0; 319die_errno(_("could not open '%s' for reading"), filename); 320} 321strbuf_read(&buf, fd,0); 322close(fd); 323if(parse_key_value_squoted(buf.buf, &kv)) 324goto finish; 325 326if(kv.nr !=3|| 327strcmp(kv.items[0].string,"GIT_AUTHOR_NAME") || 328strcmp(kv.items[1].string,"GIT_AUTHOR_EMAIL") || 329strcmp(kv.items[2].string,"GIT_AUTHOR_DATE")) 330goto finish; 331 state->author_name = kv.items[0].util; 332 state->author_email = kv.items[1].util; 333 state->author_date = kv.items[2].util; 334 retval =0; 335finish: 336string_list_clear(&kv, !!retval); 337strbuf_release(&buf); 338return retval; 339} 340 341/** 342 * Saves state->author_name, state->author_email and state->author_date in the 343 * state directory's "author-script" file. 344 */ 345static voidwrite_author_script(const struct am_state *state) 346{ 347struct strbuf sb = STRBUF_INIT; 348 349strbuf_addstr(&sb,"GIT_AUTHOR_NAME="); 350sq_quote_buf(&sb, state->author_name); 351strbuf_addch(&sb,'\n'); 352 353strbuf_addstr(&sb,"GIT_AUTHOR_EMAIL="); 354sq_quote_buf(&sb, state->author_email); 355strbuf_addch(&sb,'\n'); 356 357strbuf_addstr(&sb,"GIT_AUTHOR_DATE="); 358sq_quote_buf(&sb, state->author_date); 359strbuf_addch(&sb,'\n'); 360 361write_state_text(state,"author-script", sb.buf); 362 363strbuf_release(&sb); 364} 365 366/** 367 * Reads the commit message from the state directory's "final-commit" file, 368 * setting state->msg to its contents and state->msg_len to the length of its 369 * contents in bytes. 370 * 371 * Returns 0 on success, -1 if the file does not exist. 372 */ 373static intread_commit_msg(struct am_state *state) 374{ 375struct strbuf sb = STRBUF_INIT; 376 377assert(!state->msg); 378 379if(read_state_file(&sb, state,"final-commit",0) <0) { 380strbuf_release(&sb); 381return-1; 382} 383 384 state->msg =strbuf_detach(&sb, &state->msg_len); 385return0; 386} 387 388/** 389 * Saves state->msg in the state directory's "final-commit" file. 390 */ 391static voidwrite_commit_msg(const struct am_state *state) 392{ 393const char*filename =am_path(state,"final-commit"); 394write_file_buf(filename, state->msg, state->msg_len); 395} 396 397/** 398 * Loads state from disk. 399 */ 400static voidam_load(struct am_state *state) 401{ 402struct strbuf sb = STRBUF_INIT; 403 404if(read_state_file(&sb, state,"next",1) <0) 405die("BUG: state file 'next' does not exist"); 406 state->cur =strtol(sb.buf, NULL,10); 407 408if(read_state_file(&sb, state,"last",1) <0) 409die("BUG: state file 'last' does not exist"); 410 state->last =strtol(sb.buf, NULL,10); 411 412if(read_author_script(state) <0) 413die(_("could not parse author script")); 414 415read_commit_msg(state); 416 417if(read_state_file(&sb, state,"original-commit",1) <0) 418oidclr(&state->orig_commit); 419else if(get_oid_hex(sb.buf, &state->orig_commit) <0) 420die(_("could not parse%s"),am_path(state,"original-commit")); 421 422read_state_file(&sb, state,"threeway",1); 423 state->threeway = !strcmp(sb.buf,"t"); 424 425read_state_file(&sb, state,"quiet",1); 426 state->quiet = !strcmp(sb.buf,"t"); 427 428read_state_file(&sb, state,"sign",1); 429 state->signoff = !strcmp(sb.buf,"t"); 430 431read_state_file(&sb, state,"utf8",1); 432 state->utf8 = !strcmp(sb.buf,"t"); 433 434read_state_file(&sb, state,"keep",1); 435if(!strcmp(sb.buf,"t")) 436 state->keep = KEEP_TRUE; 437else if(!strcmp(sb.buf,"b")) 438 state->keep = KEEP_NON_PATCH; 439else 440 state->keep = KEEP_FALSE; 441 442read_state_file(&sb, state,"messageid",1); 443 state->message_id = !strcmp(sb.buf,"t"); 444 445read_state_file(&sb, state,"scissors",1); 446if(!strcmp(sb.buf,"t")) 447 state->scissors = SCISSORS_TRUE; 448else if(!strcmp(sb.buf,"f")) 449 state->scissors = SCISSORS_FALSE; 450else 451 state->scissors = SCISSORS_UNSET; 452 453read_state_file(&sb, state,"apply-opt",1); 454argv_array_clear(&state->git_apply_opts); 455if(sq_dequote_to_argv_array(sb.buf, &state->git_apply_opts) <0) 456die(_("could not parse%s"),am_path(state,"apply-opt")); 457 458 state->rebasing = !!file_exists(am_path(state,"rebasing")); 459 460strbuf_release(&sb); 461} 462 463/** 464 * Removes the am_state directory, forcefully terminating the current am 465 * session. 466 */ 467static voidam_destroy(const struct am_state *state) 468{ 469struct strbuf sb = STRBUF_INIT; 470 471strbuf_addstr(&sb, state->dir); 472remove_dir_recursively(&sb,0); 473strbuf_release(&sb); 474} 475 476/** 477 * Runs applypatch-msg hook. Returns its exit code. 478 */ 479static intrun_applypatch_msg_hook(struct am_state *state) 480{ 481int ret; 482 483assert(state->msg); 484 ret =run_hook_le(NULL,"applypatch-msg",am_path(state,"final-commit"), NULL); 485 486if(!ret) { 487FREE_AND_NULL(state->msg); 488if(read_commit_msg(state) <0) 489die(_("'%s' was deleted by the applypatch-msg hook"), 490am_path(state,"final-commit")); 491} 492 493return ret; 494} 495 496/** 497 * Runs post-rewrite hook. Returns it exit code. 498 */ 499static intrun_post_rewrite_hook(const struct am_state *state) 500{ 501struct child_process cp = CHILD_PROCESS_INIT; 502const char*hook =find_hook("post-rewrite"); 503int ret; 504 505if(!hook) 506return0; 507 508argv_array_push(&cp.args, hook); 509argv_array_push(&cp.args,"rebase"); 510 511 cp.in =xopen(am_path(state,"rewritten"), O_RDONLY); 512 cp.stdout_to_stderr =1; 513 514 ret =run_command(&cp); 515 516close(cp.in); 517return ret; 518} 519 520/** 521 * Reads the state directory's "rewritten" file, and copies notes from the old 522 * commits listed in the file to their rewritten commits. 523 * 524 * Returns 0 on success, -1 on failure. 525 */ 526static intcopy_notes_for_rebase(const struct am_state *state) 527{ 528struct notes_rewrite_cfg *c; 529struct strbuf sb = STRBUF_INIT; 530const char*invalid_line =_("Malformed input line: '%s'."); 531const char*msg ="Notes added by 'git rebase'"; 532FILE*fp; 533int ret =0; 534 535assert(state->rebasing); 536 537 c =init_copy_notes_for_rewrite("rebase"); 538if(!c) 539return0; 540 541 fp =xfopen(am_path(state,"rewritten"),"r"); 542 543while(!strbuf_getline_lf(&sb, fp)) { 544struct object_id from_obj, to_obj; 545 546if(sb.len != GIT_SHA1_HEXSZ *2+1) { 547 ret =error(invalid_line, sb.buf); 548goto finish; 549} 550 551if(get_oid_hex(sb.buf, &from_obj)) { 552 ret =error(invalid_line, sb.buf); 553goto finish; 554} 555 556if(sb.buf[GIT_SHA1_HEXSZ] !=' ') { 557 ret =error(invalid_line, sb.buf); 558goto finish; 559} 560 561if(get_oid_hex(sb.buf + GIT_SHA1_HEXSZ +1, &to_obj)) { 562 ret =error(invalid_line, sb.buf); 563goto finish; 564} 565 566if(copy_note_for_rewrite(c, &from_obj, &to_obj)) 567 ret =error(_("Failed to copy notes from '%s' to '%s'"), 568oid_to_hex(&from_obj),oid_to_hex(&to_obj)); 569} 570 571finish: 572finish_copy_notes_for_rewrite(c, msg); 573fclose(fp); 574strbuf_release(&sb); 575return ret; 576} 577 578/** 579 * Determines if the file looks like a piece of RFC2822 mail by grabbing all 580 * non-indented lines and checking if they look like they begin with valid 581 * header field names. 582 * 583 * Returns 1 if the file looks like a piece of mail, 0 otherwise. 584 */ 585static intis_mail(FILE*fp) 586{ 587const char*header_regex ="^[!-9;-~]+:"; 588struct strbuf sb = STRBUF_INIT; 589 regex_t regex; 590int ret =1; 591 592if(fseek(fp,0L, SEEK_SET)) 593die_errno(_("fseek failed")); 594 595if(regcomp(®ex, header_regex, REG_NOSUB | REG_EXTENDED)) 596die("invalid pattern:%s", header_regex); 597 598while(!strbuf_getline(&sb, fp)) { 599if(!sb.len) 600break;/* End of header */ 601 602/* Ignore indented folded lines */ 603if(*sb.buf =='\t'|| *sb.buf ==' ') 604continue; 605 606/* It's a header if it matches header_regex */ 607if(regexec(®ex, sb.buf,0, NULL,0)) { 608 ret =0; 609goto done; 610} 611} 612 613done: 614regfree(®ex); 615strbuf_release(&sb); 616return ret; 617} 618 619/** 620 * Attempts to detect the patch_format of the patches contained in `paths`, 621 * returning the PATCH_FORMAT_* enum value. Returns PATCH_FORMAT_UNKNOWN if 622 * detection fails. 623 */ 624static intdetect_patch_format(const char**paths) 625{ 626enum patch_format ret = PATCH_FORMAT_UNKNOWN; 627struct strbuf l1 = STRBUF_INIT; 628struct strbuf l2 = STRBUF_INIT; 629struct strbuf l3 = STRBUF_INIT; 630FILE*fp; 631 632/* 633 * We default to mbox format if input is from stdin and for directories 634 */ 635if(!*paths || !strcmp(*paths,"-") ||is_directory(*paths)) 636return PATCH_FORMAT_MBOX; 637 638/* 639 * Otherwise, check the first few lines of the first patch, starting 640 * from the first non-blank line, to try to detect its format. 641 */ 642 643 fp =xfopen(*paths,"r"); 644 645while(!strbuf_getline(&l1, fp)) { 646if(l1.len) 647break; 648} 649 650if(starts_with(l1.buf,"From ") ||starts_with(l1.buf,"From: ")) { 651 ret = PATCH_FORMAT_MBOX; 652goto done; 653} 654 655if(starts_with(l1.buf,"# This series applies on GIT commit")) { 656 ret = PATCH_FORMAT_STGIT_SERIES; 657goto done; 658} 659 660if(!strcmp(l1.buf,"# HG changeset patch")) { 661 ret = PATCH_FORMAT_HG; 662goto done; 663} 664 665strbuf_reset(&l2); 666strbuf_getline(&l2, fp); 667strbuf_reset(&l3); 668strbuf_getline(&l3, fp); 669 670/* 671 * If the second line is empty and the third is a From, Author or Date 672 * entry, this is likely an StGit patch. 673 */ 674if(l1.len && !l2.len && 675(starts_with(l3.buf,"From:") || 676starts_with(l3.buf,"Author:") || 677starts_with(l3.buf,"Date:"))) { 678 ret = PATCH_FORMAT_STGIT; 679goto done; 680} 681 682if(l1.len &&is_mail(fp)) { 683 ret = PATCH_FORMAT_MBOX; 684goto done; 685} 686 687done: 688fclose(fp); 689strbuf_release(&l1); 690return ret; 691} 692 693/** 694 * Splits out individual email patches from `paths`, where each path is either 695 * a mbox file or a Maildir. Returns 0 on success, -1 on failure. 696 */ 697static intsplit_mail_mbox(struct am_state *state,const char**paths, 698int keep_cr,int mboxrd) 699{ 700struct child_process cp = CHILD_PROCESS_INIT; 701struct strbuf last = STRBUF_INIT; 702 703 cp.git_cmd =1; 704argv_array_push(&cp.args,"mailsplit"); 705argv_array_pushf(&cp.args,"-d%d", state->prec); 706argv_array_pushf(&cp.args,"-o%s", state->dir); 707argv_array_push(&cp.args,"-b"); 708if(keep_cr) 709argv_array_push(&cp.args,"--keep-cr"); 710if(mboxrd) 711argv_array_push(&cp.args,"--mboxrd"); 712argv_array_push(&cp.args,"--"); 713argv_array_pushv(&cp.args, paths); 714 715if(capture_command(&cp, &last,8)) 716return-1; 717 718 state->cur =1; 719 state->last =strtol(last.buf, NULL,10); 720 721return0; 722} 723 724/** 725 * Callback signature for split_mail_conv(). The foreign patch should be 726 * read from `in`, and the converted patch (in RFC2822 mail format) should be 727 * written to `out`. Return 0 on success, or -1 on failure. 728 */ 729typedefint(*mail_conv_fn)(FILE*out,FILE*in,int keep_cr); 730 731/** 732 * Calls `fn` for each file in `paths` to convert the foreign patch to the 733 * RFC2822 mail format suitable for parsing with git-mailinfo. 734 * 735 * Returns 0 on success, -1 on failure. 736 */ 737static intsplit_mail_conv(mail_conv_fn fn,struct am_state *state, 738const char**paths,int keep_cr) 739{ 740static const char*stdin_only[] = {"-", NULL}; 741int i; 742 743if(!*paths) 744 paths = stdin_only; 745 746for(i =0; *paths; paths++, i++) { 747FILE*in, *out; 748const char*mail; 749int ret; 750 751if(!strcmp(*paths,"-")) 752 in = stdin; 753else 754 in =fopen(*paths,"r"); 755 756if(!in) 757returnerror_errno(_("could not open '%s' for reading"), 758*paths); 759 760 mail =mkpath("%s/%0*d", state->dir, state->prec, i +1); 761 762 out =fopen(mail,"w"); 763if(!out) { 764if(in != stdin) 765fclose(in); 766returnerror_errno(_("could not open '%s' for writing"), 767 mail); 768} 769 770 ret =fn(out, in, keep_cr); 771 772fclose(out); 773if(in != stdin) 774fclose(in); 775 776if(ret) 777returnerror(_("could not parse patch '%s'"), *paths); 778} 779 780 state->cur =1; 781 state->last = i; 782return0; 783} 784 785/** 786 * A split_mail_conv() callback that converts an StGit patch to an RFC2822 787 * message suitable for parsing with git-mailinfo. 788 */ 789static intstgit_patch_to_mail(FILE*out,FILE*in,int keep_cr) 790{ 791struct strbuf sb = STRBUF_INIT; 792int subject_printed =0; 793 794while(!strbuf_getline_lf(&sb, in)) { 795const char*str; 796 797if(str_isspace(sb.buf)) 798continue; 799else if(skip_prefix(sb.buf,"Author:", &str)) 800fprintf(out,"From:%s\n", str); 801else if(starts_with(sb.buf,"From") ||starts_with(sb.buf,"Date")) 802fprintf(out,"%s\n", sb.buf); 803else if(!subject_printed) { 804fprintf(out,"Subject:%s\n", sb.buf); 805 subject_printed =1; 806}else{ 807fprintf(out,"\n%s\n", sb.buf); 808break; 809} 810} 811 812strbuf_reset(&sb); 813while(strbuf_fread(&sb,8192, in) >0) { 814fwrite(sb.buf,1, sb.len, out); 815strbuf_reset(&sb); 816} 817 818strbuf_release(&sb); 819return0; 820} 821 822/** 823 * This function only supports a single StGit series file in `paths`. 824 * 825 * Given an StGit series file, converts the StGit patches in the series into 826 * RFC2822 messages suitable for parsing with git-mailinfo, and queues them in 827 * the state directory. 828 * 829 * Returns 0 on success, -1 on failure. 830 */ 831static intsplit_mail_stgit_series(struct am_state *state,const char**paths, 832int keep_cr) 833{ 834const char*series_dir; 835char*series_dir_buf; 836FILE*fp; 837struct argv_array patches = ARGV_ARRAY_INIT; 838struct strbuf sb = STRBUF_INIT; 839int ret; 840 841if(!paths[0] || paths[1]) 842returnerror(_("Only one StGIT patch series can be applied at once")); 843 844 series_dir_buf =xstrdup(*paths); 845 series_dir =dirname(series_dir_buf); 846 847 fp =fopen(*paths,"r"); 848if(!fp) 849returnerror_errno(_("could not open '%s' for reading"), *paths); 850 851while(!strbuf_getline_lf(&sb, fp)) { 852if(*sb.buf =='#') 853continue;/* skip comment lines */ 854 855argv_array_push(&patches,mkpath("%s/%s", series_dir, sb.buf)); 856} 857 858fclose(fp); 859strbuf_release(&sb); 860free(series_dir_buf); 861 862 ret =split_mail_conv(stgit_patch_to_mail, state, patches.argv, keep_cr); 863 864argv_array_clear(&patches); 865return ret; 866} 867 868/** 869 * A split_patches_conv() callback that converts a mercurial patch to a RFC2822 870 * message suitable for parsing with git-mailinfo. 871 */ 872static inthg_patch_to_mail(FILE*out,FILE*in,int keep_cr) 873{ 874struct strbuf sb = STRBUF_INIT; 875 876while(!strbuf_getline_lf(&sb, in)) { 877const char*str; 878 879if(skip_prefix(sb.buf,"# User ", &str)) 880fprintf(out,"From:%s\n", str); 881else if(skip_prefix(sb.buf,"# Date ", &str)) { 882 timestamp_t timestamp; 883long tz, tz2; 884char*end; 885 886 errno =0; 887 timestamp =parse_timestamp(str, &end,10); 888if(errno) 889returnerror(_("invalid timestamp")); 890 891if(!skip_prefix(end," ", &str)) 892returnerror(_("invalid Date line")); 893 894 errno =0; 895 tz =strtol(str, &end,10); 896if(errno) 897returnerror(_("invalid timezone offset")); 898 899if(*end) 900returnerror(_("invalid Date line")); 901 902/* 903 * mercurial's timezone is in seconds west of UTC, 904 * however git's timezone is in hours + minutes east of 905 * UTC. Convert it. 906 */ 907 tz2 =labs(tz) /3600*100+labs(tz) %3600/60; 908if(tz >0) 909 tz2 = -tz2; 910 911fprintf(out,"Date:%s\n",show_date(timestamp, tz2,DATE_MODE(RFC2822))); 912}else if(starts_with(sb.buf,"# ")) { 913continue; 914}else{ 915fprintf(out,"\n%s\n", sb.buf); 916break; 917} 918} 919 920strbuf_reset(&sb); 921while(strbuf_fread(&sb,8192, in) >0) { 922fwrite(sb.buf,1, sb.len, out); 923strbuf_reset(&sb); 924} 925 926strbuf_release(&sb); 927return0; 928} 929 930/** 931 * Splits a list of files/directories into individual email patches. Each path 932 * in `paths` must be a file/directory that is formatted according to 933 * `patch_format`. 934 * 935 * Once split out, the individual email patches will be stored in the state 936 * directory, with each patch's filename being its index, padded to state->prec 937 * digits. 938 * 939 * state->cur will be set to the index of the first mail, and state->last will 940 * be set to the index of the last mail. 941 * 942 * Set keep_cr to 0 to convert all lines ending with \r\n to end with \n, 1 943 * to disable this behavior, -1 to use the default configured setting. 944 * 945 * Returns 0 on success, -1 on failure. 946 */ 947static intsplit_mail(struct am_state *state,enum patch_format patch_format, 948const char**paths,int keep_cr) 949{ 950if(keep_cr <0) { 951 keep_cr =0; 952git_config_get_bool("am.keepcr", &keep_cr); 953} 954 955switch(patch_format) { 956case PATCH_FORMAT_MBOX: 957returnsplit_mail_mbox(state, paths, keep_cr,0); 958case PATCH_FORMAT_STGIT: 959returnsplit_mail_conv(stgit_patch_to_mail, state, paths, keep_cr); 960case PATCH_FORMAT_STGIT_SERIES: 961returnsplit_mail_stgit_series(state, paths, keep_cr); 962case PATCH_FORMAT_HG: 963returnsplit_mail_conv(hg_patch_to_mail, state, paths, keep_cr); 964case PATCH_FORMAT_MBOXRD: 965returnsplit_mail_mbox(state, paths, keep_cr,1); 966default: 967die("BUG: invalid patch_format"); 968} 969return-1; 970} 971 972/** 973 * Setup a new am session for applying patches 974 */ 975static voidam_setup(struct am_state *state,enum patch_format patch_format, 976const char**paths,int keep_cr) 977{ 978struct object_id curr_head; 979const char*str; 980struct strbuf sb = STRBUF_INIT; 981 982if(!patch_format) 983 patch_format =detect_patch_format(paths); 984 985if(!patch_format) { 986fprintf_ln(stderr,_("Patch format detection failed.")); 987exit(128); 988} 989 990if(mkdir(state->dir,0777) <0&& errno != EEXIST) 991die_errno(_("failed to create directory '%s'"), state->dir); 992 993if(split_mail(state, patch_format, paths, keep_cr) <0) { 994am_destroy(state); 995die(_("Failed to split patches.")); 996} 997 998if(state->rebasing) 999 state->threeway =1;10001001write_state_bool(state,"threeway", state->threeway);1002write_state_bool(state,"quiet", state->quiet);1003write_state_bool(state,"sign", state->signoff);1004write_state_bool(state,"utf8", state->utf8);10051006switch(state->keep) {1007case KEEP_FALSE:1008 str ="f";1009break;1010case KEEP_TRUE:1011 str ="t";1012break;1013case KEEP_NON_PATCH:1014 str ="b";1015break;1016default:1017die("BUG: invalid value for state->keep");1018}10191020write_state_text(state,"keep", str);1021write_state_bool(state,"messageid", state->message_id);10221023switch(state->scissors) {1024case SCISSORS_UNSET:1025 str ="";1026break;1027case SCISSORS_FALSE:1028 str ="f";1029break;1030case SCISSORS_TRUE:1031 str ="t";1032break;1033default:1034die("BUG: invalid value for state->scissors");1035}1036write_state_text(state,"scissors", str);10371038sq_quote_argv(&sb, state->git_apply_opts.argv,0);1039write_state_text(state,"apply-opt", sb.buf);10401041if(state->rebasing)1042write_state_text(state,"rebasing","");1043else1044write_state_text(state,"applying","");10451046if(!get_oid("HEAD", &curr_head)) {1047write_state_text(state,"abort-safety",oid_to_hex(&curr_head));1048if(!state->rebasing)1049update_ref_oid("am","ORIG_HEAD", &curr_head, NULL,0,1050 UPDATE_REFS_DIE_ON_ERR);1051}else{1052write_state_text(state,"abort-safety","");1053if(!state->rebasing)1054delete_ref(NULL,"ORIG_HEAD", NULL,0);1055}10561057/*1058 * NOTE: Since the "next" and "last" files determine if an am_state1059 * session is in progress, they should be written last.1060 */10611062write_state_count(state,"next", state->cur);1063write_state_count(state,"last", state->last);10641065strbuf_release(&sb);1066}10671068/**1069 * Increments the patch pointer, and cleans am_state for the application of the1070 * next patch.1071 */1072static voidam_next(struct am_state *state)1073{1074struct object_id head;10751076FREE_AND_NULL(state->author_name);1077FREE_AND_NULL(state->author_email);1078FREE_AND_NULL(state->author_date);1079FREE_AND_NULL(state->msg);1080 state->msg_len =0;10811082unlink(am_path(state,"author-script"));1083unlink(am_path(state,"final-commit"));10841085oidclr(&state->orig_commit);1086unlink(am_path(state,"original-commit"));10871088if(!get_oid("HEAD", &head))1089write_state_text(state,"abort-safety",oid_to_hex(&head));1090else1091write_state_text(state,"abort-safety","");10921093 state->cur++;1094write_state_count(state,"next", state->cur);1095}10961097/**1098 * Returns the filename of the current patch email.1099 */1100static const char*msgnum(const struct am_state *state)1101{1102static struct strbuf sb = STRBUF_INIT;11031104strbuf_reset(&sb);1105strbuf_addf(&sb,"%0*d", state->prec, state->cur);11061107return sb.buf;1108}11091110/**1111 * Refresh and write index.1112 */1113static voidrefresh_and_write_cache(void)1114{1115struct lock_file *lock_file =xcalloc(1,sizeof(struct lock_file));11161117hold_locked_index(lock_file, LOCK_DIE_ON_ERROR);1118refresh_cache(REFRESH_QUIET);1119if(write_locked_index(&the_index, lock_file, COMMIT_LOCK))1120die(_("unable to write index file"));1121}11221123/**1124 * Returns 1 if the index differs from HEAD, 0 otherwise. When on an unborn1125 * branch, returns 1 if there are entries in the index, 0 otherwise. If an1126 * strbuf is provided, the space-separated list of files that differ will be1127 * appended to it.1128 */1129static intindex_has_changes(struct strbuf *sb)1130{1131struct object_id head;1132int i;11331134if(!get_sha1_tree("HEAD", head.hash)) {1135struct diff_options opt;11361137diff_setup(&opt);1138DIFF_OPT_SET(&opt, EXIT_WITH_STATUS);1139if(!sb)1140DIFF_OPT_SET(&opt, QUICK);1141do_diff_cache(&head, &opt);1142diffcore_std(&opt);1143for(i =0; sb && i < diff_queued_diff.nr; i++) {1144if(i)1145strbuf_addch(sb,' ');1146strbuf_addstr(sb, diff_queued_diff.queue[i]->two->path);1147}1148diff_flush(&opt);1149returnDIFF_OPT_TST(&opt, HAS_CHANGES) !=0;1150}else{1151for(i =0; sb && i < active_nr; i++) {1152if(i)1153strbuf_addch(sb,' ');1154strbuf_addstr(sb, active_cache[i]->name);1155}1156return!!active_nr;1157}1158}11591160/**1161 * Dies with a user-friendly message on how to proceed after resolving the1162 * problem. This message can be overridden with state->resolvemsg.1163 */1164static void NORETURN die_user_resolve(const struct am_state *state)1165{1166if(state->resolvemsg) {1167printf_ln("%s", state->resolvemsg);1168}else{1169const char*cmdline = state->interactive ?"git am -i":"git am";11701171printf_ln(_("When you have resolved this problem, run\"%s--continue\"."), cmdline);1172printf_ln(_("If you prefer to skip this patch, run\"%s--skip\"instead."), cmdline);1173printf_ln(_("To restore the original branch and stop patching, run\"%s--abort\"."), cmdline);1174}11751176exit(128);1177}11781179/**1180 * Appends signoff to the "msg" field of the am_state.1181 */1182static voidam_append_signoff(struct am_state *state)1183{1184char*cp;1185struct strbuf mine = STRBUF_INIT;1186struct strbuf sb = STRBUF_INIT;11871188strbuf_attach(&sb, state->msg, state->msg_len, state->msg_len);11891190/* our sign-off */1191strbuf_addf(&mine,"\n%s%s\n",1192 sign_off_header,1193fmt_name(getenv("GIT_COMMITTER_NAME"),1194getenv("GIT_COMMITTER_EMAIL")));11951196/* Does sb end with it already? */1197if(mine.len < sb.len &&1198!strcmp(mine.buf, sb.buf + sb.len - mine.len))1199goto exit;/* no need to duplicate */12001201/* Does it have any Signed-off-by: in the text */1202for(cp = sb.buf;1203 cp && *cp && (cp =strstr(cp, sign_off_header)) != NULL;1204 cp =strchr(cp,'\n')) {1205if(sb.buf == cp || cp[-1] =='\n')1206break;1207}12081209strbuf_addstr(&sb, mine.buf + !!cp);1210exit:1211strbuf_release(&mine);1212 state->msg =strbuf_detach(&sb, &state->msg_len);1213}12141215/**1216 * Parses `mail` using git-mailinfo, extracting its patch and authorship info.1217 * state->msg will be set to the patch message. state->author_name,1218 * state->author_email and state->author_date will be set to the patch author's1219 * name, email and date respectively. The patch body will be written to the1220 * state directory's "patch" file.1221 *1222 * Returns 1 if the patch should be skipped, 0 otherwise.1223 */1224static intparse_mail(struct am_state *state,const char*mail)1225{1226FILE*fp;1227struct strbuf sb = STRBUF_INIT;1228struct strbuf msg = STRBUF_INIT;1229struct strbuf author_name = STRBUF_INIT;1230struct strbuf author_date = STRBUF_INIT;1231struct strbuf author_email = STRBUF_INIT;1232int ret =0;1233struct mailinfo mi;12341235setup_mailinfo(&mi);12361237if(state->utf8)1238 mi.metainfo_charset =get_commit_output_encoding();1239else1240 mi.metainfo_charset = NULL;12411242switch(state->keep) {1243case KEEP_FALSE:1244break;1245case KEEP_TRUE:1246 mi.keep_subject =1;1247break;1248case KEEP_NON_PATCH:1249 mi.keep_non_patch_brackets_in_subject =1;1250break;1251default:1252die("BUG: invalid value for state->keep");1253}12541255if(state->message_id)1256 mi.add_message_id =1;12571258switch(state->scissors) {1259case SCISSORS_UNSET:1260break;1261case SCISSORS_FALSE:1262 mi.use_scissors =0;1263break;1264case SCISSORS_TRUE:1265 mi.use_scissors =1;1266break;1267default:1268die("BUG: invalid value for state->scissors");1269}12701271 mi.input =xfopen(mail,"r");1272 mi.output =xfopen(am_path(state,"info"),"w");1273if(mailinfo(&mi,am_path(state,"msg"),am_path(state,"patch")))1274die("could not parse patch");12751276fclose(mi.input);1277fclose(mi.output);12781279/* Extract message and author information */1280 fp =xfopen(am_path(state,"info"),"r");1281while(!strbuf_getline_lf(&sb, fp)) {1282const char*x;12831284if(skip_prefix(sb.buf,"Subject: ", &x)) {1285if(msg.len)1286strbuf_addch(&msg,'\n');1287strbuf_addstr(&msg, x);1288}else if(skip_prefix(sb.buf,"Author: ", &x))1289strbuf_addstr(&author_name, x);1290else if(skip_prefix(sb.buf,"Email: ", &x))1291strbuf_addstr(&author_email, x);1292else if(skip_prefix(sb.buf,"Date: ", &x))1293strbuf_addstr(&author_date, x);1294}1295fclose(fp);12961297/* Skip pine's internal folder data */1298if(!strcmp(author_name.buf,"Mail System Internal Data")) {1299 ret =1;1300goto finish;1301}13021303if(is_empty_file(am_path(state,"patch"))) {1304printf_ln(_("Patch is empty."));1305die_user_resolve(state);1306}13071308strbuf_addstr(&msg,"\n\n");1309strbuf_addbuf(&msg, &mi.log_message);1310strbuf_stripspace(&msg,0);13111312assert(!state->author_name);1313 state->author_name =strbuf_detach(&author_name, NULL);13141315assert(!state->author_email);1316 state->author_email =strbuf_detach(&author_email, NULL);13171318assert(!state->author_date);1319 state->author_date =strbuf_detach(&author_date, NULL);13201321assert(!state->msg);1322 state->msg =strbuf_detach(&msg, &state->msg_len);13231324finish:1325strbuf_release(&msg);1326strbuf_release(&author_date);1327strbuf_release(&author_email);1328strbuf_release(&author_name);1329strbuf_release(&sb);1330clear_mailinfo(&mi);1331return ret;1332}13331334/**1335 * Sets commit_id to the commit hash where the mail was generated from.1336 * Returns 0 on success, -1 on failure.1337 */1338static intget_mail_commit_oid(struct object_id *commit_id,const char*mail)1339{1340struct strbuf sb = STRBUF_INIT;1341FILE*fp =xfopen(mail,"r");1342const char*x;1343int ret =0;13441345if(strbuf_getline_lf(&sb, fp) ||1346!skip_prefix(sb.buf,"From ", &x) ||1347get_oid_hex(x, commit_id) <0)1348 ret = -1;13491350strbuf_release(&sb);1351fclose(fp);1352return ret;1353}13541355/**1356 * Sets state->msg, state->author_name, state->author_email, state->author_date1357 * to the commit's respective info.1358 */1359static voidget_commit_info(struct am_state *state,struct commit *commit)1360{1361const char*buffer, *ident_line, *msg;1362size_t ident_len;1363struct ident_split id;13641365 buffer =logmsg_reencode(commit, NULL,get_commit_output_encoding());13661367 ident_line =find_commit_header(buffer,"author", &ident_len);13681369if(split_ident_line(&id, ident_line, ident_len) <0)1370die(_("invalid ident line: %.*s"), (int)ident_len, ident_line);13711372assert(!state->author_name);1373if(id.name_begin)1374 state->author_name =1375xmemdupz(id.name_begin, id.name_end - id.name_begin);1376else1377 state->author_name =xstrdup("");13781379assert(!state->author_email);1380if(id.mail_begin)1381 state->author_email =1382xmemdupz(id.mail_begin, id.mail_end - id.mail_begin);1383else1384 state->author_email =xstrdup("");13851386assert(!state->author_date);1387 state->author_date =xstrdup(show_ident_date(&id,DATE_MODE(NORMAL)));13881389assert(!state->msg);1390 msg =strstr(buffer,"\n\n");1391if(!msg)1392die(_("unable to parse commit%s"),oid_to_hex(&commit->object.oid));1393 state->msg =xstrdup(msg +2);1394 state->msg_len =strlen(state->msg);1395unuse_commit_buffer(commit, buffer);1396}13971398/**1399 * Writes `commit` as a patch to the state directory's "patch" file.1400 */1401static voidwrite_commit_patch(const struct am_state *state,struct commit *commit)1402{1403struct rev_info rev_info;1404FILE*fp;14051406 fp =xfopen(am_path(state,"patch"),"w");1407init_revisions(&rev_info, NULL);1408 rev_info.diff =1;1409 rev_info.abbrev =0;1410 rev_info.disable_stdin =1;1411 rev_info.show_root_diff =1;1412 rev_info.diffopt.output_format = DIFF_FORMAT_PATCH;1413 rev_info.no_commit_id =1;1414DIFF_OPT_SET(&rev_info.diffopt, BINARY);1415DIFF_OPT_SET(&rev_info.diffopt, FULL_INDEX);1416 rev_info.diffopt.use_color =0;1417 rev_info.diffopt.file = fp;1418 rev_info.diffopt.close_file =1;1419add_pending_object(&rev_info, &commit->object,"");1420diff_setup_done(&rev_info.diffopt);1421log_tree_commit(&rev_info, commit);1422}14231424/**1425 * Writes the diff of the index against HEAD as a patch to the state1426 * directory's "patch" file.1427 */1428static voidwrite_index_patch(const struct am_state *state)1429{1430struct tree *tree;1431struct object_id head;1432struct rev_info rev_info;1433FILE*fp;14341435if(!get_sha1_tree("HEAD", head.hash))1436 tree =lookup_tree(&head);1437else1438 tree =lookup_tree(&empty_tree_oid);14391440 fp =xfopen(am_path(state,"patch"),"w");1441init_revisions(&rev_info, NULL);1442 rev_info.diff =1;1443 rev_info.disable_stdin =1;1444 rev_info.no_commit_id =1;1445 rev_info.diffopt.output_format = DIFF_FORMAT_PATCH;1446 rev_info.diffopt.use_color =0;1447 rev_info.diffopt.file = fp;1448 rev_info.diffopt.close_file =1;1449add_pending_object(&rev_info, &tree->object,"");1450diff_setup_done(&rev_info.diffopt);1451run_diff_index(&rev_info,1);1452}14531454/**1455 * Like parse_mail(), but parses the mail by looking up its commit ID1456 * directly. This is used in --rebasing mode to bypass git-mailinfo's munging1457 * of patches.1458 *1459 * state->orig_commit will be set to the original commit ID.1460 *1461 * Will always return 0 as the patch should never be skipped.1462 */1463static intparse_mail_rebase(struct am_state *state,const char*mail)1464{1465struct commit *commit;1466struct object_id commit_oid;14671468if(get_mail_commit_oid(&commit_oid, mail) <0)1469die(_("could not parse%s"), mail);14701471 commit =lookup_commit_or_die(&commit_oid, mail);14721473get_commit_info(state, commit);14741475write_commit_patch(state, commit);14761477oidcpy(&state->orig_commit, &commit_oid);1478write_state_text(state,"original-commit",oid_to_hex(&commit_oid));14791480return0;1481}14821483/**1484 * Applies current patch with git-apply. Returns 0 on success, -1 otherwise. If1485 * `index_file` is not NULL, the patch will be applied to that index.1486 */1487static intrun_apply(const struct am_state *state,const char*index_file)1488{1489struct argv_array apply_paths = ARGV_ARRAY_INIT;1490struct argv_array apply_opts = ARGV_ARRAY_INIT;1491struct apply_state apply_state;1492int res, opts_left;1493static struct lock_file lock_file;1494int force_apply =0;1495int options =0;14961497if(init_apply_state(&apply_state, NULL, &lock_file))1498die("BUG: init_apply_state() failed");14991500argv_array_push(&apply_opts,"apply");1501argv_array_pushv(&apply_opts, state->git_apply_opts.argv);15021503 opts_left =apply_parse_options(apply_opts.argc, apply_opts.argv,1504&apply_state, &force_apply, &options,1505 NULL);15061507if(opts_left !=0)1508die("unknown option passed through to git apply");15091510if(index_file) {1511 apply_state.index_file = index_file;1512 apply_state.cached =1;1513}else1514 apply_state.check_index =1;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 apply_state.apply_verbosity = verbosity_silent;15221523if(check_apply_state(&apply_state, force_apply))1524die("BUG: check_apply_state() failed");15251526argv_array_push(&apply_paths,am_path(state,"patch"));15271528 res =apply_all_patches(&apply_state, apply_paths.argc, apply_paths.argv, options);15291530argv_array_clear(&apply_paths);1531argv_array_clear(&apply_opts);1532clear_apply_state(&apply_state);15331534if(res)1535return res;15361537if(index_file) {1538/* Reload index as apply_all_patches() will have modified it. */1539discard_cache();1540read_cache_from(index_file);1541}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{1570struct object_id orig_tree, their_tree, our_tree;1571const struct object_id *bases[1] = { &orig_tree };1572struct merge_options o;1573struct commit *result;1574char*their_tree_name;15751576if(get_oid("HEAD", &our_tree) <0)1577hashcpy(our_tree.hash, EMPTY_TREE_SHA1_BIN);15781579if(build_fake_ancestor(state, index_path))1580returnerror("could not build fake ancestor");15811582discard_cache();1583read_cache_from(index_path);15841585if(write_index_as_tree(orig_tree.hash, &the_index, index_path,0, NULL))1586returnerror(_("Repository lacks necessary blobs to fall back on 3-way merge."));15871588say(state, stdout,_("Using index info to reconstruct a base tree..."));15891590if(!state->quiet) {1591/*1592 * List paths that needed 3-way fallback, so that the user can1593 * review them with extra care to spot mismerges.1594 */1595struct rev_info rev_info;1596const char*diff_filter_str ="--diff-filter=AM";15971598init_revisions(&rev_info, NULL);1599 rev_info.diffopt.output_format = DIFF_FORMAT_NAME_STATUS;1600diff_opt_parse(&rev_info.diffopt, &diff_filter_str,1, rev_info.prefix);1601add_pending_oid(&rev_info,"HEAD", &our_tree,0);1602diff_setup_done(&rev_info.diffopt);1603run_diff_index(&rev_info,1);1604}16051606if(run_apply(state, index_path))1607returnerror(_("Did you hand edit your patch?\n"1608"It does not apply to blobs recorded in its index."));16091610if(write_index_as_tree(their_tree.hash, &the_index, index_path,0, NULL))1611returnerror("could not write tree");16121613say(state, stdout,_("Falling back to patching base and 3-way merge..."));16141615discard_cache();1616read_cache();16171618/*1619 * This is not so wrong. Depending on which base we picked, orig_tree1620 * may be wildly different from ours, but their_tree has the same set of1621 * wildly different changes in parts the patch did not touch, so1622 * recursive ends up canceling them, saying that we reverted all those1623 * changes.1624 */16251626init_merge_options(&o);16271628 o.branch1 ="HEAD";1629 their_tree_name =xstrfmt("%.*s",linelen(state->msg), state->msg);1630 o.branch2 = their_tree_name;16311632if(state->quiet)1633 o.verbosity =0;16341635if(merge_recursive_generic(&o, &our_tree, &their_tree,1, bases, &result)) {1636rerere(state->allow_rerere_autoupdate);1637free(their_tree_name);1638returnerror(_("Failed to merge in the changes."));1639}16401641free(their_tree_name);1642return0;1643}16441645/**1646 * Commits the current index with state->msg as the commit message and1647 * state->author_name, state->author_email and state->author_date as the author1648 * information.1649 */1650static voiddo_commit(const struct am_state *state)1651{1652struct object_id tree, parent, commit;1653const struct object_id *old_oid;1654struct commit_list *parents = NULL;1655const char*reflog_msg, *author;1656struct strbuf sb = STRBUF_INIT;16571658if(run_hook_le(NULL,"pre-applypatch", NULL))1659exit(1);16601661if(write_cache_as_tree(tree.hash,0, NULL))1662die(_("git write-tree failed to write a tree"));16631664if(!get_sha1_commit("HEAD", parent.hash)) {1665 old_oid = &parent;1666commit_list_insert(lookup_commit(&parent), &parents);1667}else{1668 old_oid = NULL;1669say(state, stderr,_("applying to an empty history"));1670}16711672 author =fmt_ident(state->author_name, state->author_email,1673 state->ignore_date ? NULL : state->author_date,1674 IDENT_STRICT);16751676if(state->committer_date_is_author_date)1677setenv("GIT_COMMITTER_DATE",1678 state->ignore_date ?"": state->author_date,1);16791680if(commit_tree(state->msg, state->msg_len, tree.hash, parents, commit.hash,1681 author, state->sign_commit))1682die(_("failed to write commit object"));16831684 reflog_msg =getenv("GIT_REFLOG_ACTION");1685if(!reflog_msg)1686 reflog_msg ="am";16871688strbuf_addf(&sb,"%s: %.*s", reflog_msg,linelen(state->msg),1689 state->msg);16901691update_ref_oid(sb.buf,"HEAD", &commit, old_oid,0,1692 UPDATE_REFS_DIE_ON_ERR);16931694if(state->rebasing) {1695FILE*fp =xfopen(am_path(state,"rewritten"),"a");16961697assert(!is_null_oid(&state->orig_commit));1698fprintf(fp,"%s",oid_to_hex(&state->orig_commit));1699fprintf(fp,"%s\n",oid_to_hex(&commit));1700fclose(fp);1701}17021703run_hook_le(NULL,"post-applypatch", NULL);17041705strbuf_release(&sb);1706}17071708/**1709 * Validates the am_state for resuming -- the "msg" and authorship fields must1710 * be filled up.1711 */1712static voidvalidate_resume_state(const struct am_state *state)1713{1714if(!state->msg)1715die(_("cannot resume:%sdoes not exist."),1716am_path(state,"final-commit"));17171718if(!state->author_name || !state->author_email || !state->author_date)1719die(_("cannot resume:%sdoes not exist."),1720am_path(state,"author-script"));1721}17221723/**1724 * Interactively prompt the user on whether the current patch should be1725 * applied.1726 *1727 * Returns 0 if the user chooses to apply the patch, 1 if the user chooses to1728 * skip it.1729 */1730static intdo_interactive(struct am_state *state)1731{1732assert(state->msg);17331734if(!isatty(0))1735die(_("cannot be interactive without stdin connected to a terminal."));17361737for(;;) {1738const char*reply;17391740puts(_("Commit Body is:"));1741puts("--------------------------");1742printf("%s", state->msg);1743puts("--------------------------");17441745/*1746 * TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]1747 * in your translation. The program will only accept English1748 * input at this point.1749 */1750 reply =git_prompt(_("Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "), PROMPT_ECHO);17511752if(!reply) {1753continue;1754}else if(*reply =='y'|| *reply =='Y') {1755return0;1756}else if(*reply =='a'|| *reply =='A') {1757 state->interactive =0;1758return0;1759}else if(*reply =='n'|| *reply =='N') {1760return1;1761}else if(*reply =='e'|| *reply =='E') {1762struct strbuf msg = STRBUF_INIT;17631764if(!launch_editor(am_path(state,"final-commit"), &msg, NULL)) {1765free(state->msg);1766 state->msg =strbuf_detach(&msg, &state->msg_len);1767}1768strbuf_release(&msg);1769}else if(*reply =='v'|| *reply =='V') {1770const char*pager =git_pager(1);1771struct child_process cp = CHILD_PROCESS_INIT;17721773if(!pager)1774 pager ="cat";1775prepare_pager_args(&cp, pager);1776argv_array_push(&cp.args,am_path(state,"patch"));1777run_command(&cp);1778}1779}1780}17811782/**1783 * Applies all queued mail.1784 *1785 * If `resume` is true, we are "resuming". The "msg" and authorship fields, as1786 * well as the state directory's "patch" file is used as-is for applying the1787 * patch and committing it.1788 */1789static voidam_run(struct am_state *state,int resume)1790{1791const char*argv_gc_auto[] = {"gc","--auto", NULL};1792struct strbuf sb = STRBUF_INIT;17931794unlink(am_path(state,"dirtyindex"));17951796refresh_and_write_cache();17971798if(index_has_changes(&sb)) {1799write_state_bool(state,"dirtyindex",1);1800die(_("Dirty index: cannot apply patches (dirty:%s)"), sb.buf);1801}18021803strbuf_release(&sb);18041805while(state->cur <= state->last) {1806const char*mail =am_path(state,msgnum(state));1807int apply_status;18081809reset_ident_date();18101811if(!file_exists(mail))1812goto next;18131814if(resume) {1815validate_resume_state(state);1816}else{1817int skip;18181819if(state->rebasing)1820 skip =parse_mail_rebase(state, mail);1821else1822 skip =parse_mail(state, mail);18231824if(skip)1825goto next;/* mail should be skipped */18261827if(state->signoff)1828am_append_signoff(state);18291830write_author_script(state);1831write_commit_msg(state);1832}18331834if(state->interactive &&do_interactive(state))1835goto next;18361837if(run_applypatch_msg_hook(state))1838exit(1);18391840say(state, stdout,_("Applying: %.*s"),linelen(state->msg), state->msg);18411842 apply_status =run_apply(state, NULL);18431844if(apply_status && state->threeway) {1845struct strbuf sb = STRBUF_INIT;18461847strbuf_addstr(&sb,am_path(state,"patch-merge-index"));1848 apply_status =fall_back_threeway(state, sb.buf);1849strbuf_release(&sb);18501851/*1852 * Applying the patch to an earlier tree and merging1853 * the result may have produced the same tree as ours.1854 */1855if(!apply_status && !index_has_changes(NULL)) {1856say(state, stdout,_("No changes -- Patch already applied."));1857goto next;1858}1859}18601861if(apply_status) {1862int advice_amworkdir =1;18631864printf_ln(_("Patch failed at%s%.*s"),msgnum(state),1865linelen(state->msg), state->msg);18661867git_config_get_bool("advice.amworkdir", &advice_amworkdir);18681869if(advice_amworkdir)1870printf_ln(_("The copy of the patch that failed is found in:%s"),1871am_path(state,"patch"));18721873die_user_resolve(state);1874}18751876do_commit(state);18771878next:1879am_next(state);18801881if(resume)1882am_load(state);1883 resume =0;1884}18851886if(!is_empty_file(am_path(state,"rewritten"))) {1887assert(state->rebasing);1888copy_notes_for_rebase(state);1889run_post_rewrite_hook(state);1890}18911892/*1893 * In rebasing mode, it's up to the caller to take care of1894 * housekeeping.1895 */1896if(!state->rebasing) {1897am_destroy(state);1898close_all_packs();1899run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);1900}1901}19021903/**1904 * Resume the current am session after patch application failure. The user did1905 * all the hard work, and we do not have to do any patch application. Just1906 * trust and commit what the user has in the index and working tree.1907 */1908static voidam_resolve(struct am_state *state)1909{1910validate_resume_state(state);19111912say(state, stdout,_("Applying: %.*s"),linelen(state->msg), state->msg);19131914if(!index_has_changes(NULL)) {1915printf_ln(_("No changes - did you forget to use 'git add'?\n"1916"If there is nothing left to stage, chances are that something else\n"1917"already introduced the same changes; you might want to skip this patch."));1918die_user_resolve(state);1919}19201921if(unmerged_cache()) {1922printf_ln(_("You still have unmerged paths in your index.\n"1923"You should 'git add' each file with resolved conflicts to mark them as such.\n"1924"You might run `git rm` on a file to accept\"deleted by them\"for it."));1925die_user_resolve(state);1926}19271928if(state->interactive) {1929write_index_patch(state);1930if(do_interactive(state))1931goto next;1932}19331934rerere(0);19351936do_commit(state);19371938next:1939am_next(state);1940am_load(state);1941am_run(state,0);1942}19431944/**1945 * Performs a checkout fast-forward from `head` to `remote`. If `reset` is1946 * true, any unmerged entries will be discarded. Returns 0 on success, -1 on1947 * failure.1948 */1949static intfast_forward_to(struct tree *head,struct tree *remote,int reset)1950{1951struct lock_file *lock_file;1952struct unpack_trees_options opts;1953struct tree_desc t[2];19541955if(parse_tree(head) ||parse_tree(remote))1956return-1;19571958 lock_file =xcalloc(1,sizeof(struct lock_file));1959hold_locked_index(lock_file, LOCK_DIE_ON_ERROR);19601961refresh_cache(REFRESH_QUIET);19621963memset(&opts,0,sizeof(opts));1964 opts.head_idx =1;1965 opts.src_index = &the_index;1966 opts.dst_index = &the_index;1967 opts.update =1;1968 opts.merge =1;1969 opts.reset = reset;1970 opts.fn = twoway_merge;1971init_tree_desc(&t[0], head->buffer, head->size);1972init_tree_desc(&t[1], remote->buffer, remote->size);19731974if(unpack_trees(2, t, &opts)) {1975rollback_lock_file(lock_file);1976return-1;1977}19781979if(write_locked_index(&the_index, lock_file, COMMIT_LOCK))1980die(_("unable to write new index file"));19811982return0;1983}19841985/**1986 * Merges a tree into the index. The index's stat info will take precedence1987 * over the merged tree's. Returns 0 on success, -1 on failure.1988 */1989static intmerge_tree(struct tree *tree)1990{1991struct lock_file *lock_file;1992struct unpack_trees_options opts;1993struct tree_desc t[1];19941995if(parse_tree(tree))1996return-1;19971998 lock_file =xcalloc(1,sizeof(struct lock_file));1999hold_locked_index(lock_file, LOCK_DIE_ON_ERROR);20002001memset(&opts,0,sizeof(opts));2002 opts.head_idx =1;2003 opts.src_index = &the_index;2004 opts.dst_index = &the_index;2005 opts.merge =1;2006 opts.fn = oneway_merge;2007init_tree_desc(&t[0], tree->buffer, tree->size);20082009if(unpack_trees(1, t, &opts)) {2010rollback_lock_file(lock_file);2011return-1;2012}20132014if(write_locked_index(&the_index, lock_file, COMMIT_LOCK))2015die(_("unable to write new index file"));20162017return0;2018}20192020/**2021 * Clean the index without touching entries that are not modified between2022 * `head` and `remote`.2023 */2024static intclean_index(const struct object_id *head,const struct object_id *remote)2025{2026struct tree *head_tree, *remote_tree, *index_tree;2027struct object_id index;20282029 head_tree =parse_tree_indirect(head);2030if(!head_tree)2031returnerror(_("Could not parse object '%s'."),oid_to_hex(head));20322033 remote_tree =parse_tree_indirect(remote);2034if(!remote_tree)2035returnerror(_("Could not parse object '%s'."),oid_to_hex(remote));20362037read_cache_unmerged();20382039if(fast_forward_to(head_tree, head_tree,1))2040return-1;20412042if(write_cache_as_tree(index.hash,0, NULL))2043return-1;20442045 index_tree =parse_tree_indirect(&index);2046if(!index_tree)2047returnerror(_("Could not parse object '%s'."),oid_to_hex(&index));20482049if(fast_forward_to(index_tree, remote_tree,0))2050return-1;20512052if(merge_tree(remote_tree))2053return-1;20542055remove_branch_state();20562057return0;2058}20592060/**2061 * Resets rerere's merge resolution metadata.2062 */2063static voidam_rerere_clear(void)2064{2065struct string_list merge_rr = STRING_LIST_INIT_DUP;2066rerere_clear(&merge_rr);2067string_list_clear(&merge_rr,1);2068}20692070/**2071 * Resume the current am session by skipping the current patch.2072 */2073static voidam_skip(struct am_state *state)2074{2075struct object_id head;20762077am_rerere_clear();20782079if(get_oid("HEAD", &head))2080hashcpy(head.hash, EMPTY_TREE_SHA1_BIN);20812082if(clean_index(&head, &head))2083die(_("failed to clean index"));20842085am_next(state);2086am_load(state);2087am_run(state,0);2088}20892090/**2091 * Returns true if it is safe to reset HEAD to the ORIG_HEAD, false otherwise.2092 *2093 * It is not safe to reset HEAD when:2094 * 1. git-am previously failed because the index was dirty.2095 * 2. HEAD has moved since git-am previously failed.2096 */2097static intsafe_to_abort(const struct am_state *state)2098{2099struct strbuf sb = STRBUF_INIT;2100struct object_id abort_safety, head;21012102if(file_exists(am_path(state,"dirtyindex")))2103return0;21042105if(read_state_file(&sb, state,"abort-safety",1) >0) {2106if(get_oid_hex(sb.buf, &abort_safety))2107die(_("could not parse%s"),am_path(state,"abort-safety"));2108}else2109oidclr(&abort_safety);21102111if(get_oid("HEAD", &head))2112oidclr(&head);21132114if(!oidcmp(&head, &abort_safety))2115return1;21162117warning(_("You seem to have moved HEAD since the last 'am' failure.\n"2118"Not rewinding to ORIG_HEAD"));21192120return0;2121}21222123/**2124 * Aborts the current am session if it is safe to do so.2125 */2126static voidam_abort(struct am_state *state)2127{2128struct object_id curr_head, orig_head;2129int has_curr_head, has_orig_head;2130char*curr_branch;21312132if(!safe_to_abort(state)) {2133am_destroy(state);2134return;2135}21362137am_rerere_clear();21382139 curr_branch =resolve_refdup("HEAD",0, curr_head.hash, NULL);2140 has_curr_head = curr_branch && !is_null_oid(&curr_head);2141if(!has_curr_head)2142hashcpy(curr_head.hash, EMPTY_TREE_SHA1_BIN);21432144 has_orig_head = !get_oid("ORIG_HEAD", &orig_head);2145if(!has_orig_head)2146hashcpy(orig_head.hash, EMPTY_TREE_SHA1_BIN);21472148clean_index(&curr_head, &orig_head);21492150if(has_orig_head)2151update_ref_oid("am --abort","HEAD", &orig_head,2152 has_curr_head ? &curr_head : NULL,0,2153 UPDATE_REFS_DIE_ON_ERR);2154else if(curr_branch)2155delete_ref(NULL, curr_branch, NULL, REF_NODEREF);21562157free(curr_branch);2158am_destroy(state);2159}21602161/**2162 * parse_options() callback that validates and sets opt->value to the2163 * PATCH_FORMAT_* enum value corresponding to `arg`.2164 */2165static intparse_opt_patchformat(const struct option *opt,const char*arg,int unset)2166{2167int*opt_value = opt->value;21682169if(!strcmp(arg,"mbox"))2170*opt_value = PATCH_FORMAT_MBOX;2171else if(!strcmp(arg,"stgit"))2172*opt_value = PATCH_FORMAT_STGIT;2173else if(!strcmp(arg,"stgit-series"))2174*opt_value = PATCH_FORMAT_STGIT_SERIES;2175else if(!strcmp(arg,"hg"))2176*opt_value = PATCH_FORMAT_HG;2177else if(!strcmp(arg,"mboxrd"))2178*opt_value = PATCH_FORMAT_MBOXRD;2179else2180returnerror(_("Invalid value for --patch-format:%s"), arg);2181return0;2182}21832184enum resume_mode {2185 RESUME_FALSE =0,2186 RESUME_APPLY,2187 RESUME_RESOLVED,2188 RESUME_SKIP,2189 RESUME_ABORT2190};21912192static intgit_am_config(const char*k,const char*v,void*cb)2193{2194int status;21952196 status =git_gpg_config(k, v, NULL);2197if(status)2198return status;21992200returngit_default_config(k, v, NULL);2201}22022203intcmd_am(int argc,const char**argv,const char*prefix)2204{2205struct am_state state;2206int binary = -1;2207int keep_cr = -1;2208int patch_format = PATCH_FORMAT_UNKNOWN;2209enum resume_mode resume = RESUME_FALSE;2210int in_progress;22112212const char*const usage[] = {2213N_("git am [<options>] [(<mbox> | <Maildir>)...]"),2214N_("git am [<options>] (--continue | --skip | --abort)"),2215 NULL2216};22172218struct option options[] = {2219OPT_BOOL('i',"interactive", &state.interactive,2220N_("run interactively")),2221OPT_HIDDEN_BOOL('b',"binary", &binary,2222N_("historical option -- no-op")),2223OPT_BOOL('3',"3way", &state.threeway,2224N_("allow fall back on 3way merging if needed")),2225OPT__QUIET(&state.quiet,N_("be quiet")),2226OPT_SET_INT('s',"signoff", &state.signoff,2227N_("add a Signed-off-by line to the commit message"),2228 SIGNOFF_EXPLICIT),2229OPT_BOOL('u',"utf8", &state.utf8,2230N_("recode into utf8 (default)")),2231OPT_SET_INT('k',"keep", &state.keep,2232N_("pass -k flag to git-mailinfo"), KEEP_TRUE),2233OPT_SET_INT(0,"keep-non-patch", &state.keep,2234N_("pass -b flag to git-mailinfo"), KEEP_NON_PATCH),2235OPT_BOOL('m',"message-id", &state.message_id,2236N_("pass -m flag to git-mailinfo")),2237{ OPTION_SET_INT,0,"keep-cr", &keep_cr, NULL,2238N_("pass --keep-cr flag to git-mailsplit for mbox format"),2239 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL,1},2240{ OPTION_SET_INT,0,"no-keep-cr", &keep_cr, NULL,2241N_("do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"),2242 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL,0},2243OPT_BOOL('c',"scissors", &state.scissors,2244N_("strip everything before a scissors line")),2245OPT_PASSTHRU_ARGV(0,"whitespace", &state.git_apply_opts,N_("action"),2246N_("pass it through git-apply"),22470),2248OPT_PASSTHRU_ARGV(0,"ignore-space-change", &state.git_apply_opts, NULL,2249N_("pass it through git-apply"),2250 PARSE_OPT_NOARG),2251OPT_PASSTHRU_ARGV(0,"ignore-whitespace", &state.git_apply_opts, NULL,2252N_("pass it through git-apply"),2253 PARSE_OPT_NOARG),2254OPT_PASSTHRU_ARGV(0,"directory", &state.git_apply_opts,N_("root"),2255N_("pass it through git-apply"),22560),2257OPT_PASSTHRU_ARGV(0,"exclude", &state.git_apply_opts,N_("path"),2258N_("pass it through git-apply"),22590),2260OPT_PASSTHRU_ARGV(0,"include", &state.git_apply_opts,N_("path"),2261N_("pass it through git-apply"),22620),2263OPT_PASSTHRU_ARGV('C', NULL, &state.git_apply_opts,N_("n"),2264N_("pass it through git-apply"),22650),2266OPT_PASSTHRU_ARGV('p', NULL, &state.git_apply_opts,N_("num"),2267N_("pass it through git-apply"),22680),2269OPT_CALLBACK(0,"patch-format", &patch_format,N_("format"),2270N_("format the patch(es) are in"),2271 parse_opt_patchformat),2272OPT_PASSTHRU_ARGV(0,"reject", &state.git_apply_opts, NULL,2273N_("pass it through git-apply"),2274 PARSE_OPT_NOARG),2275OPT_STRING(0,"resolvemsg", &state.resolvemsg, NULL,2276N_("override error message when patch failure occurs")),2277OPT_CMDMODE(0,"continue", &resume,2278N_("continue applying patches after resolving a conflict"),2279 RESUME_RESOLVED),2280OPT_CMDMODE('r',"resolved", &resume,2281N_("synonyms for --continue"),2282 RESUME_RESOLVED),2283OPT_CMDMODE(0,"skip", &resume,2284N_("skip the current patch"),2285 RESUME_SKIP),2286OPT_CMDMODE(0,"abort", &resume,2287N_("restore the original branch and abort the patching operation."),2288 RESUME_ABORT),2289OPT_BOOL(0,"committer-date-is-author-date",2290&state.committer_date_is_author_date,2291N_("lie about committer date")),2292OPT_BOOL(0,"ignore-date", &state.ignore_date,2293N_("use current timestamp for author date")),2294OPT_RERERE_AUTOUPDATE(&state.allow_rerere_autoupdate),2295{ OPTION_STRING,'S',"gpg-sign", &state.sign_commit,N_("key-id"),2296N_("GPG-sign commits"),2297 PARSE_OPT_OPTARG, NULL, (intptr_t)""},2298OPT_HIDDEN_BOOL(0,"rebasing", &state.rebasing,2299N_("(internal use for git-rebase)")),2300OPT_END()2301};23022303if(argc ==2&& !strcmp(argv[1],"-h"))2304usage_with_options(usage, options);23052306git_config(git_am_config, NULL);23072308am_state_init(&state);23092310 in_progress =am_in_progress(&state);2311if(in_progress)2312am_load(&state);23132314 argc =parse_options(argc, argv, prefix, options, usage,0);23152316if(binary >=0)2317fprintf_ln(stderr,_("The -b/--binary option has been a no-op for long time, and\n"2318"it will be removed. Please do not use it anymore."));23192320/* Ensure a valid committer ident can be constructed */2321git_committer_info(IDENT_STRICT);23222323if(read_index_preload(&the_index, NULL) <0)2324die(_("failed to read the index"));23252326if(in_progress) {2327/*2328 * Catch user error to feed us patches when there is a session2329 * in progress:2330 *2331 * 1. mbox path(s) are provided on the command-line.2332 * 2. stdin is not a tty: the user is trying to feed us a patch2333 * from standard input. This is somewhat unreliable -- stdin2334 * could be /dev/null for example and the caller did not2335 * intend to feed us a patch but wanted to continue2336 * unattended.2337 */2338if(argc || (resume == RESUME_FALSE && !isatty(0)))2339die(_("previous rebase directory%sstill exists but mbox given."),2340 state.dir);23412342if(resume == RESUME_FALSE)2343 resume = RESUME_APPLY;23442345if(state.signoff == SIGNOFF_EXPLICIT)2346am_append_signoff(&state);2347}else{2348struct argv_array paths = ARGV_ARRAY_INIT;2349int i;23502351/*2352 * Handle stray state directory in the independent-run case. In2353 * the --rebasing case, it is up to the caller to take care of2354 * stray directories.2355 */2356if(file_exists(state.dir) && !state.rebasing) {2357if(resume == RESUME_ABORT) {2358am_destroy(&state);2359am_state_release(&state);2360return0;2361}23622363die(_("Stray%sdirectory found.\n"2364"Use\"git am --abort\"to remove it."),2365 state.dir);2366}23672368if(resume)2369die(_("Resolve operation not in progress, we are not resuming."));23702371for(i =0; i < argc; i++) {2372if(is_absolute_path(argv[i]) || !prefix)2373argv_array_push(&paths, argv[i]);2374else2375argv_array_push(&paths,mkpath("%s/%s", prefix, argv[i]));2376}23772378am_setup(&state, patch_format, paths.argv, keep_cr);23792380argv_array_clear(&paths);2381}23822383switch(resume) {2384case RESUME_FALSE:2385am_run(&state,0);2386break;2387case RESUME_APPLY:2388am_run(&state,1);2389break;2390case RESUME_RESOLVED:2391am_resolve(&state);2392break;2393case RESUME_SKIP:2394am_skip(&state);2395break;2396case RESUME_ABORT:2397am_abort(&state);2398break;2399default:2400die("BUG: invalid resume value");2401}24022403am_state_release(&state);24042405return0;2406}