1/* 2 * Builtin "git am" 3 * 4 * Based on git-am.sh by Junio C Hamano. 5 */ 6#include"cache.h" 7#include"builtin.h" 8#include"exec_cmd.h" 9#include"parse-options.h" 10#include"dir.h" 11#include"run-command.h" 12#include"quote.h" 13#include"tempfile.h" 14#include"lockfile.h" 15#include"cache-tree.h" 16#include"refs.h" 17#include"commit.h" 18#include"diff.h" 19#include"diffcore.h" 20#include"unpack-trees.h" 21#include"branch.h" 22#include"sequencer.h" 23#include"revision.h" 24#include"merge-recursive.h" 25#include"revision.h" 26#include"log-tree.h" 27#include"notes-utils.h" 28#include"rerere.h" 29#include"prompt.h" 30#include"mailinfo.h" 31#include"apply.h" 32#include"string-list.h" 33 34/** 35 * Returns 1 if the file is empty or does not exist, 0 otherwise. 36 */ 37static intis_empty_file(const char*filename) 38{ 39struct stat st; 40 41if(stat(filename, &st) <0) { 42if(errno == ENOENT) 43return1; 44die_errno(_("could not stat%s"), filename); 45} 46 47return!st.st_size; 48} 49 50/** 51 * Returns the length of the first line of msg. 52 */ 53static intlinelen(const char*msg) 54{ 55returnstrchrnul(msg,'\n') - msg; 56} 57 58/** 59 * Returns true if `str` consists of only whitespace, false otherwise. 60 */ 61static intstr_isspace(const char*str) 62{ 63for(; *str; str++) 64if(!isspace(*str)) 65return0; 66 67return1; 68} 69 70enum patch_format { 71 PATCH_FORMAT_UNKNOWN =0, 72 PATCH_FORMAT_MBOX, 73 PATCH_FORMAT_STGIT, 74 PATCH_FORMAT_STGIT_SERIES, 75 PATCH_FORMAT_HG, 76 PATCH_FORMAT_MBOXRD 77}; 78 79enum keep_type { 80 KEEP_FALSE =0, 81 KEEP_TRUE,/* pass -k flag to git-mailinfo */ 82 KEEP_NON_PATCH /* pass -b flag to git-mailinfo */ 83}; 84 85enum scissors_type { 86 SCISSORS_UNSET = -1, 87 SCISSORS_FALSE =0,/* pass --no-scissors to git-mailinfo */ 88 SCISSORS_TRUE /* pass --scissors to git-mailinfo */ 89}; 90 91enum signoff_type { 92 SIGNOFF_FALSE =0, 93 SIGNOFF_TRUE =1, 94 SIGNOFF_EXPLICIT /* --signoff was set on the command-line */ 95}; 96 97struct am_state { 98/* state directory path */ 99char*dir; 100 101/* current and last patch numbers, 1-indexed */ 102int cur; 103int last; 104 105/* commit metadata and message */ 106char*author_name; 107char*author_email; 108char*author_date; 109char*msg; 110size_t msg_len; 111 112/* when --rebasing, records the original commit the patch came from */ 113struct object_id orig_commit; 114 115/* number of digits in patch filename */ 116int prec; 117 118/* various operating modes and command line options */ 119int interactive; 120int threeway; 121int quiet; 122int signoff;/* enum signoff_type */ 123int utf8; 124int keep;/* enum keep_type */ 125int message_id; 126int scissors;/* enum scissors_type */ 127struct argv_array git_apply_opts; 128const char*resolvemsg; 129int committer_date_is_author_date; 130int ignore_date; 131int allow_rerere_autoupdate; 132const char*sign_commit; 133int rebasing; 134}; 135 136/** 137 * Initializes am_state with the default values. The state directory is set to 138 * dir. 139 */ 140static voidam_state_init(struct am_state *state,const char*dir) 141{ 142int gpgsign; 143 144memset(state,0,sizeof(*state)); 145 146assert(dir); 147 state->dir =xstrdup(dir); 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 435read_state_file(&sb, state,"keep",1); 436if(!strcmp(sb.buf,"t")) 437 state->keep = KEEP_TRUE; 438else if(!strcmp(sb.buf,"b")) 439 state->keep = KEEP_NON_PATCH; 440else 441 state->keep = KEEP_FALSE; 442 443read_state_file(&sb, state,"messageid",1); 444 state->message_id = !strcmp(sb.buf,"t"); 445 446read_state_file(&sb, state,"scissors",1); 447if(!strcmp(sb.buf,"t")) 448 state->scissors = SCISSORS_TRUE; 449else if(!strcmp(sb.buf,"f")) 450 state->scissors = SCISSORS_FALSE; 451else 452 state->scissors = SCISSORS_UNSET; 453 454read_state_file(&sb, state,"apply-opt",1); 455argv_array_clear(&state->git_apply_opts); 456if(sq_dequote_to_argv_array(sb.buf, &state->git_apply_opts) <0) 457die(_("could not parse%s"),am_path(state,"apply-opt")); 458 459 state->rebasing = !!file_exists(am_path(state,"rebasing")); 460 461strbuf_release(&sb); 462} 463 464/** 465 * Removes the am_state directory, forcefully terminating the current am 466 * session. 467 */ 468static voidam_destroy(const struct am_state *state) 469{ 470struct strbuf sb = STRBUF_INIT; 471 472strbuf_addstr(&sb, state->dir); 473remove_dir_recursively(&sb,0); 474strbuf_release(&sb); 475} 476 477/** 478 * Runs applypatch-msg hook. Returns its exit code. 479 */ 480static intrun_applypatch_msg_hook(struct am_state *state) 481{ 482int ret; 483 484assert(state->msg); 485 ret =run_hook_le(NULL,"applypatch-msg",am_path(state,"final-commit"), NULL); 486 487if(!ret) { 488free(state->msg); 489 state->msg = NULL; 490if(read_commit_msg(state) <0) 491die(_("'%s' was deleted by the applypatch-msg hook"), 492am_path(state,"final-commit")); 493} 494 495return ret; 496} 497 498/** 499 * Runs post-rewrite hook. Returns it exit code. 500 */ 501static intrun_post_rewrite_hook(const struct am_state *state) 502{ 503struct child_process cp = CHILD_PROCESS_INIT; 504const char*hook =find_hook("post-rewrite"); 505int ret; 506 507if(!hook) 508return0; 509 510argv_array_push(&cp.args, hook); 511argv_array_push(&cp.args,"rebase"); 512 513 cp.in =xopen(am_path(state,"rewritten"), O_RDONLY); 514 cp.stdout_to_stderr =1; 515 516 ret =run_command(&cp); 517 518close(cp.in); 519return ret; 520} 521 522/** 523 * Reads the state directory's "rewritten" file, and copies notes from the old 524 * commits listed in the file to their rewritten commits. 525 * 526 * Returns 0 on success, -1 on failure. 527 */ 528static intcopy_notes_for_rebase(const struct am_state *state) 529{ 530struct notes_rewrite_cfg *c; 531struct strbuf sb = STRBUF_INIT; 532const char*invalid_line =_("Malformed input line: '%s'."); 533const char*msg ="Notes added by 'git rebase'"; 534FILE*fp; 535int ret =0; 536 537assert(state->rebasing); 538 539 c =init_copy_notes_for_rewrite("rebase"); 540if(!c) 541return0; 542 543 fp =xfopen(am_path(state,"rewritten"),"r"); 544 545while(!strbuf_getline_lf(&sb, fp)) { 546struct object_id from_obj, to_obj; 547 548if(sb.len != GIT_SHA1_HEXSZ *2+1) { 549 ret =error(invalid_line, sb.buf); 550goto finish; 551} 552 553if(get_oid_hex(sb.buf, &from_obj)) { 554 ret =error(invalid_line, sb.buf); 555goto finish; 556} 557 558if(sb.buf[GIT_SHA1_HEXSZ] !=' ') { 559 ret =error(invalid_line, sb.buf); 560goto finish; 561} 562 563if(get_oid_hex(sb.buf + GIT_SHA1_HEXSZ +1, &to_obj)) { 564 ret =error(invalid_line, sb.buf); 565goto finish; 566} 567 568if(copy_note_for_rewrite(c, from_obj.hash, to_obj.hash)) 569 ret =error(_("Failed to copy notes from '%s' to '%s'"), 570oid_to_hex(&from_obj),oid_to_hex(&to_obj)); 571} 572 573finish: 574finish_copy_notes_for_rewrite(c, msg); 575fclose(fp); 576strbuf_release(&sb); 577return ret; 578} 579 580/** 581 * Determines if the file looks like a piece of RFC2822 mail by grabbing all 582 * non-indented lines and checking if they look like they begin with valid 583 * header field names. 584 * 585 * Returns 1 if the file looks like a piece of mail, 0 otherwise. 586 */ 587static intis_mail(FILE*fp) 588{ 589const char*header_regex ="^[!-9;-~]+:"; 590struct strbuf sb = STRBUF_INIT; 591 regex_t regex; 592int ret =1; 593 594if(fseek(fp,0L, SEEK_SET)) 595die_errno(_("fseek failed")); 596 597if(regcomp(®ex, header_regex, REG_NOSUB | REG_EXTENDED)) 598die("invalid pattern:%s", header_regex); 599 600while(!strbuf_getline(&sb, fp)) { 601if(!sb.len) 602break;/* End of header */ 603 604/* Ignore indented folded lines */ 605if(*sb.buf =='\t'|| *sb.buf ==' ') 606continue; 607 608/* It's a header if it matches header_regex */ 609if(regexec(®ex, sb.buf,0, NULL,0)) { 610 ret =0; 611goto done; 612} 613} 614 615done: 616regfree(®ex); 617strbuf_release(&sb); 618return ret; 619} 620 621/** 622 * Attempts to detect the patch_format of the patches contained in `paths`, 623 * returning the PATCH_FORMAT_* enum value. Returns PATCH_FORMAT_UNKNOWN if 624 * detection fails. 625 */ 626static intdetect_patch_format(const char**paths) 627{ 628enum patch_format ret = PATCH_FORMAT_UNKNOWN; 629struct strbuf l1 = STRBUF_INIT; 630struct strbuf l2 = STRBUF_INIT; 631struct strbuf l3 = STRBUF_INIT; 632FILE*fp; 633 634/* 635 * We default to mbox format if input is from stdin and for directories 636 */ 637if(!*paths || !strcmp(*paths,"-") ||is_directory(*paths)) 638return PATCH_FORMAT_MBOX; 639 640/* 641 * Otherwise, check the first few lines of the first patch, starting 642 * from the first non-blank line, to try to detect its format. 643 */ 644 645 fp =xfopen(*paths,"r"); 646 647while(!strbuf_getline(&l1, fp)) { 648if(l1.len) 649break; 650} 651 652if(starts_with(l1.buf,"From ") ||starts_with(l1.buf,"From: ")) { 653 ret = PATCH_FORMAT_MBOX; 654goto done; 655} 656 657if(starts_with(l1.buf,"# This series applies on GIT commit")) { 658 ret = PATCH_FORMAT_STGIT_SERIES; 659goto done; 660} 661 662if(!strcmp(l1.buf,"# HG changeset patch")) { 663 ret = PATCH_FORMAT_HG; 664goto done; 665} 666 667strbuf_reset(&l2); 668strbuf_getline(&l2, fp); 669strbuf_reset(&l3); 670strbuf_getline(&l3, fp); 671 672/* 673 * If the second line is empty and the third is a From, Author or Date 674 * entry, this is likely an StGit patch. 675 */ 676if(l1.len && !l2.len && 677(starts_with(l3.buf,"From:") || 678starts_with(l3.buf,"Author:") || 679starts_with(l3.buf,"Date:"))) { 680 ret = PATCH_FORMAT_STGIT; 681goto done; 682} 683 684if(l1.len &&is_mail(fp)) { 685 ret = PATCH_FORMAT_MBOX; 686goto done; 687} 688 689done: 690fclose(fp); 691strbuf_release(&l1); 692return ret; 693} 694 695/** 696 * Splits out individual email patches from `paths`, where each path is either 697 * a mbox file or a Maildir. Returns 0 on success, -1 on failure. 698 */ 699static intsplit_mail_mbox(struct am_state *state,const char**paths, 700int keep_cr,int mboxrd) 701{ 702struct child_process cp = CHILD_PROCESS_INIT; 703struct strbuf last = STRBUF_INIT; 704 705 cp.git_cmd =1; 706argv_array_push(&cp.args,"mailsplit"); 707argv_array_pushf(&cp.args,"-d%d", state->prec); 708argv_array_pushf(&cp.args,"-o%s", state->dir); 709argv_array_push(&cp.args,"-b"); 710if(keep_cr) 711argv_array_push(&cp.args,"--keep-cr"); 712if(mboxrd) 713argv_array_push(&cp.args,"--mboxrd"); 714argv_array_push(&cp.args,"--"); 715argv_array_pushv(&cp.args, paths); 716 717if(capture_command(&cp, &last,8)) 718return-1; 719 720 state->cur =1; 721 state->last =strtol(last.buf, NULL,10); 722 723return0; 724} 725 726/** 727 * Callback signature for split_mail_conv(). The foreign patch should be 728 * read from `in`, and the converted patch (in RFC2822 mail format) should be 729 * written to `out`. Return 0 on success, or -1 on failure. 730 */ 731typedefint(*mail_conv_fn)(FILE*out,FILE*in,int keep_cr); 732 733/** 734 * Calls `fn` for each file in `paths` to convert the foreign patch to the 735 * RFC2822 mail format suitable for parsing with git-mailinfo. 736 * 737 * Returns 0 on success, -1 on failure. 738 */ 739static intsplit_mail_conv(mail_conv_fn fn,struct am_state *state, 740const char**paths,int keep_cr) 741{ 742static const char*stdin_only[] = {"-", NULL}; 743int i; 744 745if(!*paths) 746 paths = stdin_only; 747 748for(i =0; *paths; paths++, i++) { 749FILE*in, *out; 750const char*mail; 751int ret; 752 753if(!strcmp(*paths,"-")) 754 in = stdin; 755else 756 in =fopen(*paths,"r"); 757 758if(!in) 759returnerror_errno(_("could not open '%s' for reading"), 760*paths); 761 762 mail =mkpath("%s/%0*d", state->dir, state->prec, i +1); 763 764 out =fopen(mail,"w"); 765if(!out) 766returnerror_errno(_("could not open '%s' for writing"), 767 mail); 768 769 ret =fn(out, in, keep_cr); 770 771fclose(out); 772fclose(in); 773 774if(ret) 775returnerror(_("could not parse patch '%s'"), *paths); 776} 777 778 state->cur =1; 779 state->last = i; 780return0; 781} 782 783/** 784 * A split_mail_conv() callback that converts an StGit patch to an RFC2822 785 * message suitable for parsing with git-mailinfo. 786 */ 787static intstgit_patch_to_mail(FILE*out,FILE*in,int keep_cr) 788{ 789struct strbuf sb = STRBUF_INIT; 790int subject_printed =0; 791 792while(!strbuf_getline_lf(&sb, in)) { 793const char*str; 794 795if(str_isspace(sb.buf)) 796continue; 797else if(skip_prefix(sb.buf,"Author:", &str)) 798fprintf(out,"From:%s\n", str); 799else if(starts_with(sb.buf,"From") ||starts_with(sb.buf,"Date")) 800fprintf(out,"%s\n", sb.buf); 801else if(!subject_printed) { 802fprintf(out,"Subject:%s\n", sb.buf); 803 subject_printed =1; 804}else{ 805fprintf(out,"\n%s\n", sb.buf); 806break; 807} 808} 809 810strbuf_reset(&sb); 811while(strbuf_fread(&sb,8192, in) >0) { 812fwrite(sb.buf,1, sb.len, out); 813strbuf_reset(&sb); 814} 815 816strbuf_release(&sb); 817return0; 818} 819 820/** 821 * This function only supports a single StGit series file in `paths`. 822 * 823 * Given an StGit series file, converts the StGit patches in the series into 824 * RFC2822 messages suitable for parsing with git-mailinfo, and queues them in 825 * the state directory. 826 * 827 * Returns 0 on success, -1 on failure. 828 */ 829static intsplit_mail_stgit_series(struct am_state *state,const char**paths, 830int keep_cr) 831{ 832const char*series_dir; 833char*series_dir_buf; 834FILE*fp; 835struct argv_array patches = ARGV_ARRAY_INIT; 836struct strbuf sb = STRBUF_INIT; 837int ret; 838 839if(!paths[0] || paths[1]) 840returnerror(_("Only one StGIT patch series can be applied at once")); 841 842 series_dir_buf =xstrdup(*paths); 843 series_dir =dirname(series_dir_buf); 844 845 fp =fopen(*paths,"r"); 846if(!fp) 847returnerror_errno(_("could not open '%s' for reading"), *paths); 848 849while(!strbuf_getline_lf(&sb, fp)) { 850if(*sb.buf =='#') 851continue;/* skip comment lines */ 852 853argv_array_push(&patches,mkpath("%s/%s", series_dir, sb.buf)); 854} 855 856fclose(fp); 857strbuf_release(&sb); 858free(series_dir_buf); 859 860 ret =split_mail_conv(stgit_patch_to_mail, state, patches.argv, keep_cr); 861 862argv_array_clear(&patches); 863return ret; 864} 865 866/** 867 * A split_patches_conv() callback that converts a mercurial patch to a RFC2822 868 * message suitable for parsing with git-mailinfo. 869 */ 870static inthg_patch_to_mail(FILE*out,FILE*in,int keep_cr) 871{ 872struct strbuf sb = STRBUF_INIT; 873 874while(!strbuf_getline_lf(&sb, in)) { 875const char*str; 876 877if(skip_prefix(sb.buf,"# User ", &str)) 878fprintf(out,"From:%s\n", str); 879else if(skip_prefix(sb.buf,"# Date ", &str)) { 880unsigned long timestamp; 881long tz, tz2; 882char*end; 883 884 errno =0; 885 timestamp =strtoul(str, &end,10); 886if(errno) 887returnerror(_("invalid timestamp")); 888 889if(!skip_prefix(end," ", &str)) 890returnerror(_("invalid Date line")); 891 892 errno =0; 893 tz =strtol(str, &end,10); 894if(errno) 895returnerror(_("invalid timezone offset")); 896 897if(*end) 898returnerror(_("invalid Date line")); 899 900/* 901 * mercurial's timezone is in seconds west of UTC, 902 * however git's timezone is in hours + minutes east of 903 * UTC. Convert it. 904 */ 905 tz2 =labs(tz) /3600*100+labs(tz) %3600/60; 906if(tz >0) 907 tz2 = -tz2; 908 909fprintf(out,"Date:%s\n",show_date(timestamp, tz2,DATE_MODE(RFC2822))); 910}else if(starts_with(sb.buf,"# ")) { 911continue; 912}else{ 913fprintf(out,"\n%s\n", sb.buf); 914break; 915} 916} 917 918strbuf_reset(&sb); 919while(strbuf_fread(&sb,8192, in) >0) { 920fwrite(sb.buf,1, sb.len, out); 921strbuf_reset(&sb); 922} 923 924strbuf_release(&sb); 925return0; 926} 927 928/** 929 * Splits a list of files/directories into individual email patches. Each path 930 * in `paths` must be a file/directory that is formatted according to 931 * `patch_format`. 932 * 933 * Once split out, the individual email patches will be stored in the state 934 * directory, with each patch's filename being its index, padded to state->prec 935 * digits. 936 * 937 * state->cur will be set to the index of the first mail, and state->last will 938 * be set to the index of the last mail. 939 * 940 * Set keep_cr to 0 to convert all lines ending with \r\n to end with \n, 1 941 * to disable this behavior, -1 to use the default configured setting. 942 * 943 * Returns 0 on success, -1 on failure. 944 */ 945static intsplit_mail(struct am_state *state,enum patch_format patch_format, 946const char**paths,int keep_cr) 947{ 948if(keep_cr <0) { 949 keep_cr =0; 950git_config_get_bool("am.keepcr", &keep_cr); 951} 952 953switch(patch_format) { 954case PATCH_FORMAT_MBOX: 955returnsplit_mail_mbox(state, paths, keep_cr,0); 956case PATCH_FORMAT_STGIT: 957returnsplit_mail_conv(stgit_patch_to_mail, state, paths, keep_cr); 958case PATCH_FORMAT_STGIT_SERIES: 959returnsplit_mail_stgit_series(state, paths, keep_cr); 960case PATCH_FORMAT_HG: 961returnsplit_mail_conv(hg_patch_to_mail, state, paths, keep_cr); 962case PATCH_FORMAT_MBOXRD: 963returnsplit_mail_mbox(state, paths, keep_cr,1); 964default: 965die("BUG: invalid patch_format"); 966} 967return-1; 968} 969 970/** 971 * Setup a new am session for applying patches 972 */ 973static voidam_setup(struct am_state *state,enum patch_format patch_format, 974const char**paths,int keep_cr) 975{ 976struct object_id curr_head; 977const char*str; 978struct strbuf sb = STRBUF_INIT; 979 980if(!patch_format) 981 patch_format =detect_patch_format(paths); 982 983if(!patch_format) { 984fprintf_ln(stderr,_("Patch format detection failed.")); 985exit(128); 986} 987 988if(mkdir(state->dir,0777) <0&& errno != EEXIST) 989die_errno(_("failed to create directory '%s'"), state->dir); 990 991if(split_mail(state, patch_format, paths, keep_cr) <0) { 992am_destroy(state); 993die(_("Failed to split patches.")); 994} 995 996if(state->rebasing) 997 state->threeway =1; 998 999write_state_bool(state,"threeway", state->threeway);1000write_state_bool(state,"quiet", state->quiet);1001write_state_bool(state,"sign", state->signoff);1002write_state_bool(state,"utf8", state->utf8);10031004switch(state->keep) {1005case KEEP_FALSE:1006 str ="f";1007break;1008case KEEP_TRUE:1009 str ="t";1010break;1011case KEEP_NON_PATCH:1012 str ="b";1013break;1014default:1015die("BUG: invalid value for state->keep");1016}10171018write_state_text(state,"keep", str);1019write_state_bool(state,"messageid", state->message_id);10201021switch(state->scissors) {1022case SCISSORS_UNSET:1023 str ="";1024break;1025case SCISSORS_FALSE:1026 str ="f";1027break;1028case SCISSORS_TRUE:1029 str ="t";1030break;1031default:1032die("BUG: invalid value for state->scissors");1033}1034write_state_text(state,"scissors", str);10351036sq_quote_argv(&sb, state->git_apply_opts.argv,0);1037write_state_text(state,"apply-opt", sb.buf);10381039if(state->rebasing)1040write_state_text(state,"rebasing","");1041else1042write_state_text(state,"applying","");10431044if(!get_oid("HEAD", &curr_head)) {1045write_state_text(state,"abort-safety",oid_to_hex(&curr_head));1046if(!state->rebasing)1047update_ref_oid("am","ORIG_HEAD", &curr_head, NULL,0,1048 UPDATE_REFS_DIE_ON_ERR);1049}else{1050write_state_text(state,"abort-safety","");1051if(!state->rebasing)1052delete_ref(NULL,"ORIG_HEAD", NULL,0);1053}10541055/*1056 * NOTE: Since the "next" and "last" files determine if an am_state1057 * session is in progress, they should be written last.1058 */10591060write_state_count(state,"next", state->cur);1061write_state_count(state,"last", state->last);10621063strbuf_release(&sb);1064}10651066/**1067 * Increments the patch pointer, and cleans am_state for the application of the1068 * next patch.1069 */1070static voidam_next(struct am_state *state)1071{1072struct object_id head;10731074free(state->author_name);1075 state->author_name = NULL;10761077free(state->author_email);1078 state->author_email = NULL;10791080free(state->author_date);1081 state->author_date = NULL;10821083free(state->msg);1084 state->msg = NULL;1085 state->msg_len =0;10861087unlink(am_path(state,"author-script"));1088unlink(am_path(state,"final-commit"));10891090oidclr(&state->orig_commit);1091unlink(am_path(state,"original-commit"));10921093if(!get_oid("HEAD", &head))1094write_state_text(state,"abort-safety",oid_to_hex(&head));1095else1096write_state_text(state,"abort-safety","");10971098 state->cur++;1099write_state_count(state,"next", state->cur);1100}11011102/**1103 * Returns the filename of the current patch email.1104 */1105static const char*msgnum(const struct am_state *state)1106{1107static struct strbuf sb = STRBUF_INIT;11081109strbuf_reset(&sb);1110strbuf_addf(&sb,"%0*d", state->prec, state->cur);11111112return sb.buf;1113}11141115/**1116 * Refresh and write index.1117 */1118static voidrefresh_and_write_cache(void)1119{1120struct lock_file *lock_file =xcalloc(1,sizeof(struct lock_file));11211122hold_locked_index(lock_file, LOCK_DIE_ON_ERROR);1123refresh_cache(REFRESH_QUIET);1124if(write_locked_index(&the_index, lock_file, COMMIT_LOCK))1125die(_("unable to write index file"));1126}11271128/**1129 * Returns 1 if the index differs from HEAD, 0 otherwise. When on an unborn1130 * branch, returns 1 if there are entries in the index, 0 otherwise. If an1131 * strbuf is provided, the space-separated list of files that differ will be1132 * appended to it.1133 */1134static intindex_has_changes(struct strbuf *sb)1135{1136struct object_id head;1137int i;11381139if(!get_sha1_tree("HEAD", head.hash)) {1140struct diff_options opt;11411142diff_setup(&opt);1143DIFF_OPT_SET(&opt, EXIT_WITH_STATUS);1144if(!sb)1145DIFF_OPT_SET(&opt, QUICK);1146do_diff_cache(head.hash, &opt);1147diffcore_std(&opt);1148for(i =0; sb && i < diff_queued_diff.nr; i++) {1149if(i)1150strbuf_addch(sb,' ');1151strbuf_addstr(sb, diff_queued_diff.queue[i]->two->path);1152}1153diff_flush(&opt);1154returnDIFF_OPT_TST(&opt, HAS_CHANGES) !=0;1155}else{1156for(i =0; sb && i < active_nr; i++) {1157if(i)1158strbuf_addch(sb,' ');1159strbuf_addstr(sb, active_cache[i]->name);1160}1161return!!active_nr;1162}1163}11641165/**1166 * Dies with a user-friendly message on how to proceed after resolving the1167 * problem. This message can be overridden with state->resolvemsg.1168 */1169static void NORETURN die_user_resolve(const struct am_state *state)1170{1171if(state->resolvemsg) {1172printf_ln("%s", state->resolvemsg);1173}else{1174const char*cmdline = state->interactive ?"git am -i":"git am";11751176printf_ln(_("When you have resolved this problem, run\"%s--continue\"."), cmdline);1177printf_ln(_("If you prefer to skip this patch, run\"%s--skip\"instead."), cmdline);1178printf_ln(_("To restore the original branch and stop patching, run\"%s--abort\"."), cmdline);1179}11801181exit(128);1182}11831184static voidam_signoff(struct strbuf *sb)1185{1186char*cp;1187struct strbuf mine = STRBUF_INIT;11881189/* Does it end with our own sign-off? */1190strbuf_addf(&mine,"\n%s%s\n",1191 sign_off_header,1192fmt_name(getenv("GIT_COMMITTER_NAME"),1193getenv("GIT_COMMITTER_EMAIL")));1194if(mine.len < sb->len &&1195!strcmp(mine.buf, sb->buf + sb->len - mine.len))1196goto exit;/* no need to duplicate */11971198/* Does it have any Signed-off-by: in the text */1199for(cp = sb->buf;1200 cp && *cp && (cp =strstr(cp, sign_off_header)) != NULL;1201 cp =strchr(cp,'\n')) {1202if(sb->buf == cp || cp[-1] =='\n')1203break;1204}12051206strbuf_addstr(sb, mine.buf + !!cp);1207exit:1208strbuf_release(&mine);1209}12101211/**1212 * Appends signoff to the "msg" field of the am_state.1213 */1214static voidam_append_signoff(struct am_state *state)1215{1216struct strbuf sb = STRBUF_INIT;12171218strbuf_attach(&sb, state->msg, state->msg_len, state->msg_len);1219am_signoff(&sb);1220 state->msg =strbuf_detach(&sb, &state->msg_len);1221}12221223/**1224 * Parses `mail` using git-mailinfo, extracting its patch and authorship info.1225 * state->msg will be set to the patch message. state->author_name,1226 * state->author_email and state->author_date will be set to the patch author's1227 * name, email and date respectively. The patch body will be written to the1228 * state directory's "patch" file.1229 *1230 * Returns 1 if the patch should be skipped, 0 otherwise.1231 */1232static intparse_mail(struct am_state *state,const char*mail)1233{1234FILE*fp;1235struct strbuf sb = STRBUF_INIT;1236struct strbuf msg = STRBUF_INIT;1237struct strbuf author_name = STRBUF_INIT;1238struct strbuf author_date = STRBUF_INIT;1239struct strbuf author_email = STRBUF_INIT;1240int ret =0;1241struct mailinfo mi;12421243setup_mailinfo(&mi);12441245if(state->utf8)1246 mi.metainfo_charset =get_commit_output_encoding();1247else1248 mi.metainfo_charset = NULL;12491250switch(state->keep) {1251case KEEP_FALSE:1252break;1253case KEEP_TRUE:1254 mi.keep_subject =1;1255break;1256case KEEP_NON_PATCH:1257 mi.keep_non_patch_brackets_in_subject =1;1258break;1259default:1260die("BUG: invalid value for state->keep");1261}12621263if(state->message_id)1264 mi.add_message_id =1;12651266switch(state->scissors) {1267case SCISSORS_UNSET:1268break;1269case SCISSORS_FALSE:1270 mi.use_scissors =0;1271break;1272case SCISSORS_TRUE:1273 mi.use_scissors =1;1274break;1275default:1276die("BUG: invalid value for state->scissors");1277}12781279 mi.input =fopen(mail,"r");1280if(!mi.input)1281die("could not open input");1282 mi.output =fopen(am_path(state,"info"),"w");1283if(!mi.output)1284die("could not open output 'info'");1285if(mailinfo(&mi,am_path(state,"msg"),am_path(state,"patch")))1286die("could not parse patch");12871288fclose(mi.input);1289fclose(mi.output);12901291/* Extract message and author information */1292 fp =xfopen(am_path(state,"info"),"r");1293while(!strbuf_getline_lf(&sb, fp)) {1294const char*x;12951296if(skip_prefix(sb.buf,"Subject: ", &x)) {1297if(msg.len)1298strbuf_addch(&msg,'\n');1299strbuf_addstr(&msg, x);1300}else if(skip_prefix(sb.buf,"Author: ", &x))1301strbuf_addstr(&author_name, x);1302else if(skip_prefix(sb.buf,"Email: ", &x))1303strbuf_addstr(&author_email, x);1304else if(skip_prefix(sb.buf,"Date: ", &x))1305strbuf_addstr(&author_date, x);1306}1307fclose(fp);13081309/* Skip pine's internal folder data */1310if(!strcmp(author_name.buf,"Mail System Internal Data")) {1311 ret =1;1312goto finish;1313}13141315if(is_empty_file(am_path(state,"patch"))) {1316printf_ln(_("Patch is empty. Was it split wrong?"));1317die_user_resolve(state);1318}13191320strbuf_addstr(&msg,"\n\n");1321strbuf_addbuf(&msg, &mi.log_message);1322strbuf_stripspace(&msg,0);13231324if(state->signoff)1325am_signoff(&msg);13261327assert(!state->author_name);1328 state->author_name =strbuf_detach(&author_name, NULL);13291330assert(!state->author_email);1331 state->author_email =strbuf_detach(&author_email, NULL);13321333assert(!state->author_date);1334 state->author_date =strbuf_detach(&author_date, NULL);13351336assert(!state->msg);1337 state->msg =strbuf_detach(&msg, &state->msg_len);13381339finish:1340strbuf_release(&msg);1341strbuf_release(&author_date);1342strbuf_release(&author_email);1343strbuf_release(&author_name);1344strbuf_release(&sb);1345clear_mailinfo(&mi);1346return ret;1347}13481349/**1350 * Sets commit_id to the commit hash where the mail was generated from.1351 * Returns 0 on success, -1 on failure.1352 */1353static intget_mail_commit_oid(struct object_id *commit_id,const char*mail)1354{1355struct strbuf sb = STRBUF_INIT;1356FILE*fp =xfopen(mail,"r");1357const char*x;13581359if(strbuf_getline_lf(&sb, fp))1360return-1;13611362if(!skip_prefix(sb.buf,"From ", &x))1363return-1;13641365if(get_oid_hex(x, commit_id) <0)1366return-1;13671368strbuf_release(&sb);1369fclose(fp);1370return0;1371}13721373/**1374 * Sets state->msg, state->author_name, state->author_email, state->author_date1375 * to the commit's respective info.1376 */1377static voidget_commit_info(struct am_state *state,struct commit *commit)1378{1379const char*buffer, *ident_line, *author_date, *msg;1380size_t ident_len;1381struct ident_split ident_split;1382struct strbuf sb = STRBUF_INIT;13831384 buffer =logmsg_reencode(commit, NULL,get_commit_output_encoding());13851386 ident_line =find_commit_header(buffer,"author", &ident_len);13871388if(split_ident_line(&ident_split, ident_line, ident_len) <0) {1389strbuf_add(&sb, ident_line, ident_len);1390die(_("invalid ident line:%s"), sb.buf);1391}13921393assert(!state->author_name);1394if(ident_split.name_begin) {1395strbuf_add(&sb, ident_split.name_begin,1396 ident_split.name_end - ident_split.name_begin);1397 state->author_name =strbuf_detach(&sb, NULL);1398}else1399 state->author_name =xstrdup("");14001401assert(!state->author_email);1402if(ident_split.mail_begin) {1403strbuf_add(&sb, ident_split.mail_begin,1404 ident_split.mail_end - ident_split.mail_begin);1405 state->author_email =strbuf_detach(&sb, NULL);1406}else1407 state->author_email =xstrdup("");14081409 author_date =show_ident_date(&ident_split,DATE_MODE(NORMAL));1410strbuf_addstr(&sb, author_date);1411assert(!state->author_date);1412 state->author_date =strbuf_detach(&sb, NULL);14131414assert(!state->msg);1415 msg =strstr(buffer,"\n\n");1416if(!msg)1417die(_("unable to parse commit%s"),oid_to_hex(&commit->object.oid));1418 state->msg =xstrdup(msg +2);1419 state->msg_len =strlen(state->msg);1420}14211422/**1423 * Writes `commit` as a patch to the state directory's "patch" file.1424 */1425static voidwrite_commit_patch(const struct am_state *state,struct commit *commit)1426{1427struct rev_info rev_info;1428FILE*fp;14291430 fp =xfopen(am_path(state,"patch"),"w");1431init_revisions(&rev_info, NULL);1432 rev_info.diff =1;1433 rev_info.abbrev =0;1434 rev_info.disable_stdin =1;1435 rev_info.show_root_diff =1;1436 rev_info.diffopt.output_format = DIFF_FORMAT_PATCH;1437 rev_info.no_commit_id =1;1438DIFF_OPT_SET(&rev_info.diffopt, BINARY);1439DIFF_OPT_SET(&rev_info.diffopt, FULL_INDEX);1440 rev_info.diffopt.use_color =0;1441 rev_info.diffopt.file = fp;1442 rev_info.diffopt.close_file =1;1443add_pending_object(&rev_info, &commit->object,"");1444diff_setup_done(&rev_info.diffopt);1445log_tree_commit(&rev_info, commit);1446}14471448/**1449 * Writes the diff of the index against HEAD as a patch to the state1450 * directory's "patch" file.1451 */1452static voidwrite_index_patch(const struct am_state *state)1453{1454struct tree *tree;1455struct object_id head;1456struct rev_info rev_info;1457FILE*fp;14581459if(!get_sha1_tree("HEAD", head.hash))1460 tree =lookup_tree(head.hash);1461else1462 tree =lookup_tree(EMPTY_TREE_SHA1_BIN);14631464 fp =xfopen(am_path(state,"patch"),"w");1465init_revisions(&rev_info, NULL);1466 rev_info.diff =1;1467 rev_info.disable_stdin =1;1468 rev_info.no_commit_id =1;1469 rev_info.diffopt.output_format = DIFF_FORMAT_PATCH;1470 rev_info.diffopt.use_color =0;1471 rev_info.diffopt.file = fp;1472 rev_info.diffopt.close_file =1;1473add_pending_object(&rev_info, &tree->object,"");1474diff_setup_done(&rev_info.diffopt);1475run_diff_index(&rev_info,1);1476}14771478/**1479 * Like parse_mail(), but parses the mail by looking up its commit ID1480 * directly. This is used in --rebasing mode to bypass git-mailinfo's munging1481 * of patches.1482 *1483 * state->orig_commit will be set to the original commit ID.1484 *1485 * Will always return 0 as the patch should never be skipped.1486 */1487static intparse_mail_rebase(struct am_state *state,const char*mail)1488{1489struct commit *commit;1490struct object_id commit_oid;14911492if(get_mail_commit_oid(&commit_oid, mail) <0)1493die(_("could not parse%s"), mail);14941495 commit =lookup_commit_or_die(commit_oid.hash, mail);14961497get_commit_info(state, commit);14981499write_commit_patch(state, commit);15001501oidcpy(&state->orig_commit, &commit_oid);1502write_state_text(state,"original-commit",oid_to_hex(&commit_oid));15031504return0;1505}15061507/**1508 * Applies current patch with git-apply. Returns 0 on success, -1 otherwise. If1509 * `index_file` is not NULL, the patch will be applied to that index.1510 */1511static intrun_apply(const struct am_state *state,const char*index_file)1512{1513struct argv_array apply_paths = ARGV_ARRAY_INIT;1514struct argv_array apply_opts = ARGV_ARRAY_INIT;1515struct apply_state apply_state;1516int res, opts_left;1517static struct lock_file lock_file;1518int force_apply =0;1519int options =0;15201521if(init_apply_state(&apply_state, NULL, &lock_file))1522die("BUG: init_apply_state() failed");15231524argv_array_push(&apply_opts,"apply");1525argv_array_pushv(&apply_opts, state->git_apply_opts.argv);15261527 opts_left =apply_parse_options(apply_opts.argc, apply_opts.argv,1528&apply_state, &force_apply, &options,1529 NULL);15301531if(opts_left !=0)1532die("unknown option passed through to git apply");15331534if(index_file) {1535 apply_state.index_file = index_file;1536 apply_state.cached =1;1537}else1538 apply_state.check_index =1;15391540/*1541 * If we are allowed to fall back on 3-way merge, don't give false1542 * errors during the initial attempt.1543 */1544if(state->threeway && !index_file)1545 apply_state.apply_verbosity = verbosity_silent;15461547if(check_apply_state(&apply_state, force_apply))1548die("BUG: check_apply_state() failed");15491550argv_array_push(&apply_paths,am_path(state,"patch"));15511552 res =apply_all_patches(&apply_state, apply_paths.argc, apply_paths.argv, options);15531554argv_array_clear(&apply_paths);1555argv_array_clear(&apply_opts);1556clear_apply_state(&apply_state);15571558if(res)1559return res;15601561if(index_file) {1562/* Reload index as apply_all_patches() will have modified it. */1563discard_cache();1564read_cache_from(index_file);1565}15661567return0;1568}15691570/**1571 * Builds an index that contains just the blobs needed for a 3way merge.1572 */1573static intbuild_fake_ancestor(const struct am_state *state,const char*index_file)1574{1575struct child_process cp = CHILD_PROCESS_INIT;15761577 cp.git_cmd =1;1578argv_array_push(&cp.args,"apply");1579argv_array_pushv(&cp.args, state->git_apply_opts.argv);1580argv_array_pushf(&cp.args,"--build-fake-ancestor=%s", index_file);1581argv_array_push(&cp.args,am_path(state,"patch"));15821583if(run_command(&cp))1584return-1;15851586return0;1587}15881589/**1590 * Attempt a threeway merge, using index_path as the temporary index.1591 */1592static intfall_back_threeway(const struct am_state *state,const char*index_path)1593{1594struct object_id orig_tree, their_tree, our_tree;1595const struct object_id *bases[1] = { &orig_tree };1596struct merge_options o;1597struct commit *result;1598char*their_tree_name;15991600if(get_oid("HEAD", &our_tree) <0)1601hashcpy(our_tree.hash, EMPTY_TREE_SHA1_BIN);16021603if(build_fake_ancestor(state, index_path))1604returnerror("could not build fake ancestor");16051606discard_cache();1607read_cache_from(index_path);16081609if(write_index_as_tree(orig_tree.hash, &the_index, index_path,0, NULL))1610returnerror(_("Repository lacks necessary blobs to fall back on 3-way merge."));16111612say(state, stdout,_("Using index info to reconstruct a base tree..."));16131614if(!state->quiet) {1615/*1616 * List paths that needed 3-way fallback, so that the user can1617 * review them with extra care to spot mismerges.1618 */1619struct rev_info rev_info;1620const char*diff_filter_str ="--diff-filter=AM";16211622init_revisions(&rev_info, NULL);1623 rev_info.diffopt.output_format = DIFF_FORMAT_NAME_STATUS;1624diff_opt_parse(&rev_info.diffopt, &diff_filter_str,1, rev_info.prefix);1625add_pending_sha1(&rev_info,"HEAD", our_tree.hash,0);1626diff_setup_done(&rev_info.diffopt);1627run_diff_index(&rev_info,1);1628}16291630if(run_apply(state, index_path))1631returnerror(_("Did you hand edit your patch?\n"1632"It does not apply to blobs recorded in its index."));16331634if(write_index_as_tree(their_tree.hash, &the_index, index_path,0, NULL))1635returnerror("could not write tree");16361637say(state, stdout,_("Falling back to patching base and 3-way merge..."));16381639discard_cache();1640read_cache();16411642/*1643 * This is not so wrong. Depending on which base we picked, orig_tree1644 * may be wildly different from ours, but their_tree has the same set of1645 * wildly different changes in parts the patch did not touch, so1646 * recursive ends up canceling them, saying that we reverted all those1647 * changes.1648 */16491650init_merge_options(&o);16511652 o.branch1 ="HEAD";1653 their_tree_name =xstrfmt("%.*s",linelen(state->msg), state->msg);1654 o.branch2 = their_tree_name;16551656if(state->quiet)1657 o.verbosity =0;16581659if(merge_recursive_generic(&o, &our_tree, &their_tree,1, bases, &result)) {1660rerere(state->allow_rerere_autoupdate);1661free(their_tree_name);1662returnerror(_("Failed to merge in the changes."));1663}16641665free(their_tree_name);1666return0;1667}16681669/**1670 * Commits the current index with state->msg as the commit message and1671 * state->author_name, state->author_email and state->author_date as the author1672 * information.1673 */1674static voiddo_commit(const struct am_state *state)1675{1676struct object_id tree, parent, commit;1677const struct object_id *old_oid;1678struct commit_list *parents = NULL;1679const char*reflog_msg, *author;1680struct strbuf sb = STRBUF_INIT;16811682if(run_hook_le(NULL,"pre-applypatch", NULL))1683exit(1);16841685if(write_cache_as_tree(tree.hash,0, NULL))1686die(_("git write-tree failed to write a tree"));16871688if(!get_sha1_commit("HEAD", parent.hash)) {1689 old_oid = &parent;1690commit_list_insert(lookup_commit(parent.hash), &parents);1691}else{1692 old_oid = NULL;1693say(state, stderr,_("applying to an empty history"));1694}16951696 author =fmt_ident(state->author_name, state->author_email,1697 state->ignore_date ? NULL : state->author_date,1698 IDENT_STRICT);16991700if(state->committer_date_is_author_date)1701setenv("GIT_COMMITTER_DATE",1702 state->ignore_date ?"": state->author_date,1);17031704if(commit_tree(state->msg, state->msg_len, tree.hash, parents, commit.hash,1705 author, state->sign_commit))1706die(_("failed to write commit object"));17071708 reflog_msg =getenv("GIT_REFLOG_ACTION");1709if(!reflog_msg)1710 reflog_msg ="am";17111712strbuf_addf(&sb,"%s: %.*s", reflog_msg,linelen(state->msg),1713 state->msg);17141715update_ref_oid(sb.buf,"HEAD", &commit, old_oid,0,1716 UPDATE_REFS_DIE_ON_ERR);17171718if(state->rebasing) {1719FILE*fp =xfopen(am_path(state,"rewritten"),"a");17201721assert(!is_null_oid(&state->orig_commit));1722fprintf(fp,"%s",oid_to_hex(&state->orig_commit));1723fprintf(fp,"%s\n",oid_to_hex(&commit));1724fclose(fp);1725}17261727run_hook_le(NULL,"post-applypatch", NULL);17281729strbuf_release(&sb);1730}17311732/**1733 * Validates the am_state for resuming -- the "msg" and authorship fields must1734 * be filled up.1735 */1736static voidvalidate_resume_state(const struct am_state *state)1737{1738if(!state->msg)1739die(_("cannot resume:%sdoes not exist."),1740am_path(state,"final-commit"));17411742if(!state->author_name || !state->author_email || !state->author_date)1743die(_("cannot resume:%sdoes not exist."),1744am_path(state,"author-script"));1745}17461747/**1748 * Interactively prompt the user on whether the current patch should be1749 * applied.1750 *1751 * Returns 0 if the user chooses to apply the patch, 1 if the user chooses to1752 * skip it.1753 */1754static intdo_interactive(struct am_state *state)1755{1756assert(state->msg);17571758if(!isatty(0))1759die(_("cannot be interactive without stdin connected to a terminal."));17601761for(;;) {1762const char*reply;17631764puts(_("Commit Body is:"));1765puts("--------------------------");1766printf("%s", state->msg);1767puts("--------------------------");17681769/*1770 * TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]1771 * in your translation. The program will only accept English1772 * input at this point.1773 */1774 reply =git_prompt(_("Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "), PROMPT_ECHO);17751776if(!reply) {1777continue;1778}else if(*reply =='y'|| *reply =='Y') {1779return0;1780}else if(*reply =='a'|| *reply =='A') {1781 state->interactive =0;1782return0;1783}else if(*reply =='n'|| *reply =='N') {1784return1;1785}else if(*reply =='e'|| *reply =='E') {1786struct strbuf msg = STRBUF_INIT;17871788if(!launch_editor(am_path(state,"final-commit"), &msg, NULL)) {1789free(state->msg);1790 state->msg =strbuf_detach(&msg, &state->msg_len);1791}1792strbuf_release(&msg);1793}else if(*reply =='v'|| *reply =='V') {1794const char*pager =git_pager(1);1795struct child_process cp = CHILD_PROCESS_INIT;17961797if(!pager)1798 pager ="cat";1799prepare_pager_args(&cp, pager);1800argv_array_push(&cp.args,am_path(state,"patch"));1801run_command(&cp);1802}1803}1804}18051806/**1807 * Applies all queued mail.1808 *1809 * If `resume` is true, we are "resuming". The "msg" and authorship fields, as1810 * well as the state directory's "patch" file is used as-is for applying the1811 * patch and committing it.1812 */1813static voidam_run(struct am_state *state,int resume)1814{1815const char*argv_gc_auto[] = {"gc","--auto", NULL};1816struct strbuf sb = STRBUF_INIT;18171818unlink(am_path(state,"dirtyindex"));18191820refresh_and_write_cache();18211822if(index_has_changes(&sb)) {1823write_state_bool(state,"dirtyindex",1);1824die(_("Dirty index: cannot apply patches (dirty:%s)"), sb.buf);1825}18261827strbuf_release(&sb);18281829while(state->cur <= state->last) {1830const char*mail =am_path(state,msgnum(state));1831int apply_status;18321833reset_ident_date();18341835if(!file_exists(mail))1836goto next;18371838if(resume) {1839validate_resume_state(state);1840}else{1841int skip;18421843if(state->rebasing)1844 skip =parse_mail_rebase(state, mail);1845else1846 skip =parse_mail(state, mail);18471848if(skip)1849goto next;/* mail should be skipped */18501851write_author_script(state);1852write_commit_msg(state);1853}18541855if(state->interactive &&do_interactive(state))1856goto next;18571858if(run_applypatch_msg_hook(state))1859exit(1);18601861say(state, stdout,_("Applying: %.*s"),linelen(state->msg), state->msg);18621863 apply_status =run_apply(state, NULL);18641865if(apply_status && state->threeway) {1866struct strbuf sb = STRBUF_INIT;18671868strbuf_addstr(&sb,am_path(state,"patch-merge-index"));1869 apply_status =fall_back_threeway(state, sb.buf);1870strbuf_release(&sb);18711872/*1873 * Applying the patch to an earlier tree and merging1874 * the result may have produced the same tree as ours.1875 */1876if(!apply_status && !index_has_changes(NULL)) {1877say(state, stdout,_("No changes -- Patch already applied."));1878goto next;1879}1880}18811882if(apply_status) {1883int advice_amworkdir =1;18841885printf_ln(_("Patch failed at%s%.*s"),msgnum(state),1886linelen(state->msg), state->msg);18871888git_config_get_bool("advice.amworkdir", &advice_amworkdir);18891890if(advice_amworkdir)1891printf_ln(_("The copy of the patch that failed is found in:%s"),1892am_path(state,"patch"));18931894die_user_resolve(state);1895}18961897do_commit(state);18981899next:1900am_next(state);19011902if(resume)1903am_load(state);1904 resume =0;1905}19061907if(!is_empty_file(am_path(state,"rewritten"))) {1908assert(state->rebasing);1909copy_notes_for_rebase(state);1910run_post_rewrite_hook(state);1911}19121913/*1914 * In rebasing mode, it's up to the caller to take care of1915 * housekeeping.1916 */1917if(!state->rebasing) {1918am_destroy(state);1919close_all_packs();1920run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);1921}1922}19231924/**1925 * Resume the current am session after patch application failure. The user did1926 * all the hard work, and we do not have to do any patch application. Just1927 * trust and commit what the user has in the index and working tree.1928 */1929static voidam_resolve(struct am_state *state)1930{1931validate_resume_state(state);19321933say(state, stdout,_("Applying: %.*s"),linelen(state->msg), state->msg);19341935if(!index_has_changes(NULL)) {1936printf_ln(_("No changes - did you forget to use 'git add'?\n"1937"If there is nothing left to stage, chances are that something else\n"1938"already introduced the same changes; you might want to skip this patch."));1939die_user_resolve(state);1940}19411942if(unmerged_cache()) {1943printf_ln(_("You still have unmerged paths in your index.\n"1944"Did you forget to use 'git add'?"));1945die_user_resolve(state);1946}19471948if(state->interactive) {1949write_index_patch(state);1950if(do_interactive(state))1951goto next;1952}19531954rerere(0);19551956do_commit(state);19571958next:1959am_next(state);1960am_load(state);1961am_run(state,0);1962}19631964/**1965 * Performs a checkout fast-forward from `head` to `remote`. If `reset` is1966 * true, any unmerged entries will be discarded. Returns 0 on success, -1 on1967 * failure.1968 */1969static intfast_forward_to(struct tree *head,struct tree *remote,int reset)1970{1971struct lock_file *lock_file;1972struct unpack_trees_options opts;1973struct tree_desc t[2];19741975if(parse_tree(head) ||parse_tree(remote))1976return-1;19771978 lock_file =xcalloc(1,sizeof(struct lock_file));1979hold_locked_index(lock_file, LOCK_DIE_ON_ERROR);19801981refresh_cache(REFRESH_QUIET);19821983memset(&opts,0,sizeof(opts));1984 opts.head_idx =1;1985 opts.src_index = &the_index;1986 opts.dst_index = &the_index;1987 opts.update =1;1988 opts.merge =1;1989 opts.reset = reset;1990 opts.fn = twoway_merge;1991init_tree_desc(&t[0], head->buffer, head->size);1992init_tree_desc(&t[1], remote->buffer, remote->size);19931994if(unpack_trees(2, t, &opts)) {1995rollback_lock_file(lock_file);1996return-1;1997}19981999if(write_locked_index(&the_index, lock_file, COMMIT_LOCK))2000die(_("unable to write new index file"));20012002return0;2003}20042005/**2006 * Merges a tree into the index. The index's stat info will take precedence2007 * over the merged tree's. Returns 0 on success, -1 on failure.2008 */2009static intmerge_tree(struct tree *tree)2010{2011struct lock_file *lock_file;2012struct unpack_trees_options opts;2013struct tree_desc t[1];20142015if(parse_tree(tree))2016return-1;20172018 lock_file =xcalloc(1,sizeof(struct lock_file));2019hold_locked_index(lock_file, LOCK_DIE_ON_ERROR);20202021memset(&opts,0,sizeof(opts));2022 opts.head_idx =1;2023 opts.src_index = &the_index;2024 opts.dst_index = &the_index;2025 opts.merge =1;2026 opts.fn = oneway_merge;2027init_tree_desc(&t[0], tree->buffer, tree->size);20282029if(unpack_trees(1, t, &opts)) {2030rollback_lock_file(lock_file);2031return-1;2032}20332034if(write_locked_index(&the_index, lock_file, COMMIT_LOCK))2035die(_("unable to write new index file"));20362037return0;2038}20392040/**2041 * Clean the index without touching entries that are not modified between2042 * `head` and `remote`.2043 */2044static intclean_index(const struct object_id *head,const struct object_id *remote)2045{2046struct tree *head_tree, *remote_tree, *index_tree;2047struct object_id index;20482049 head_tree =parse_tree_indirect(head->hash);2050if(!head_tree)2051returnerror(_("Could not parse object '%s'."),oid_to_hex(head));20522053 remote_tree =parse_tree_indirect(remote->hash);2054if(!remote_tree)2055returnerror(_("Could not parse object '%s'."),oid_to_hex(remote));20562057read_cache_unmerged();20582059if(fast_forward_to(head_tree, head_tree,1))2060return-1;20612062if(write_cache_as_tree(index.hash,0, NULL))2063return-1;20642065 index_tree =parse_tree_indirect(index.hash);2066if(!index_tree)2067returnerror(_("Could not parse object '%s'."),oid_to_hex(&index));20682069if(fast_forward_to(index_tree, remote_tree,0))2070return-1;20712072if(merge_tree(remote_tree))2073return-1;20742075remove_branch_state();20762077return0;2078}20792080/**2081 * Resets rerere's merge resolution metadata.2082 */2083static voidam_rerere_clear(void)2084{2085struct string_list merge_rr = STRING_LIST_INIT_DUP;2086rerere_clear(&merge_rr);2087string_list_clear(&merge_rr,1);2088}20892090/**2091 * Resume the current am session by skipping the current patch.2092 */2093static voidam_skip(struct am_state *state)2094{2095struct object_id head;20962097am_rerere_clear();20982099if(get_oid("HEAD", &head))2100hashcpy(head.hash, EMPTY_TREE_SHA1_BIN);21012102if(clean_index(&head, &head))2103die(_("failed to clean index"));21042105am_next(state);2106am_load(state);2107am_run(state,0);2108}21092110/**2111 * Returns true if it is safe to reset HEAD to the ORIG_HEAD, false otherwise.2112 *2113 * It is not safe to reset HEAD when:2114 * 1. git-am previously failed because the index was dirty.2115 * 2. HEAD has moved since git-am previously failed.2116 */2117static intsafe_to_abort(const struct am_state *state)2118{2119struct strbuf sb = STRBUF_INIT;2120struct object_id abort_safety, head;21212122if(file_exists(am_path(state,"dirtyindex")))2123return0;21242125if(read_state_file(&sb, state,"abort-safety",1) >0) {2126if(get_oid_hex(sb.buf, &abort_safety))2127die(_("could not parse%s"),am_path(state,"abort-safety"));2128}else2129oidclr(&abort_safety);21302131if(get_oid("HEAD", &head))2132oidclr(&head);21332134if(!oidcmp(&head, &abort_safety))2135return1;21362137warning(_("You seem to have moved HEAD since the last 'am' failure.\n"2138"Not rewinding to ORIG_HEAD"));21392140return0;2141}21422143/**2144 * Aborts the current am session if it is safe to do so.2145 */2146static voidam_abort(struct am_state *state)2147{2148struct object_id curr_head, orig_head;2149int has_curr_head, has_orig_head;2150char*curr_branch;21512152if(!safe_to_abort(state)) {2153am_destroy(state);2154return;2155}21562157am_rerere_clear();21582159 curr_branch =resolve_refdup("HEAD",0, curr_head.hash, NULL);2160 has_curr_head = !is_null_oid(&curr_head);2161if(!has_curr_head)2162hashcpy(curr_head.hash, EMPTY_TREE_SHA1_BIN);21632164 has_orig_head = !get_oid("ORIG_HEAD", &orig_head);2165if(!has_orig_head)2166hashcpy(orig_head.hash, EMPTY_TREE_SHA1_BIN);21672168clean_index(&curr_head, &orig_head);21692170if(has_orig_head)2171update_ref_oid("am --abort","HEAD", &orig_head,2172 has_curr_head ? &curr_head : NULL,0,2173 UPDATE_REFS_DIE_ON_ERR);2174else if(curr_branch)2175delete_ref(NULL, curr_branch, NULL, REF_NODEREF);21762177free(curr_branch);2178am_destroy(state);2179}21802181/**2182 * parse_options() callback that validates and sets opt->value to the2183 * PATCH_FORMAT_* enum value corresponding to `arg`.2184 */2185static intparse_opt_patchformat(const struct option *opt,const char*arg,int unset)2186{2187int*opt_value = opt->value;21882189if(!strcmp(arg,"mbox"))2190*opt_value = PATCH_FORMAT_MBOX;2191else if(!strcmp(arg,"stgit"))2192*opt_value = PATCH_FORMAT_STGIT;2193else if(!strcmp(arg,"stgit-series"))2194*opt_value = PATCH_FORMAT_STGIT_SERIES;2195else if(!strcmp(arg,"hg"))2196*opt_value = PATCH_FORMAT_HG;2197else if(!strcmp(arg,"mboxrd"))2198*opt_value = PATCH_FORMAT_MBOXRD;2199else2200returnerror(_("Invalid value for --patch-format:%s"), arg);2201return0;2202}22032204enum resume_mode {2205 RESUME_FALSE =0,2206 RESUME_APPLY,2207 RESUME_RESOLVED,2208 RESUME_SKIP,2209 RESUME_ABORT2210};22112212static intgit_am_config(const char*k,const char*v,void*cb)2213{2214int status;22152216 status =git_gpg_config(k, v, NULL);2217if(status)2218return status;22192220returngit_default_config(k, v, NULL);2221}22222223intcmd_am(int argc,const char**argv,const char*prefix)2224{2225struct am_state state;2226int binary = -1;2227int keep_cr = -1;2228int patch_format = PATCH_FORMAT_UNKNOWN;2229enum resume_mode resume = RESUME_FALSE;2230int in_progress;22312232const char*const usage[] = {2233N_("git am [<options>] [(<mbox> | <Maildir>)...]"),2234N_("git am [<options>] (--continue | --skip | --abort)"),2235 NULL2236};22372238struct option options[] = {2239OPT_BOOL('i',"interactive", &state.interactive,2240N_("run interactively")),2241OPT_HIDDEN_BOOL('b',"binary", &binary,2242N_("historical option -- no-op")),2243OPT_BOOL('3',"3way", &state.threeway,2244N_("allow fall back on 3way merging if needed")),2245OPT__QUIET(&state.quiet,N_("be quiet")),2246OPT_SET_INT('s',"signoff", &state.signoff,2247N_("add a Signed-off-by line to the commit message"),2248 SIGNOFF_EXPLICIT),2249OPT_BOOL('u',"utf8", &state.utf8,2250N_("recode into utf8 (default)")),2251OPT_SET_INT('k',"keep", &state.keep,2252N_("pass -k flag to git-mailinfo"), KEEP_TRUE),2253OPT_SET_INT(0,"keep-non-patch", &state.keep,2254N_("pass -b flag to git-mailinfo"), KEEP_NON_PATCH),2255OPT_BOOL('m',"message-id", &state.message_id,2256N_("pass -m flag to git-mailinfo")),2257{ OPTION_SET_INT,0,"keep-cr", &keep_cr, NULL,2258N_("pass --keep-cr flag to git-mailsplit for mbox format"),2259 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL,1},2260{ OPTION_SET_INT,0,"no-keep-cr", &keep_cr, NULL,2261N_("do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"),2262 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL,0},2263OPT_BOOL('c',"scissors", &state.scissors,2264N_("strip everything before a scissors line")),2265OPT_PASSTHRU_ARGV(0,"whitespace", &state.git_apply_opts,N_("action"),2266N_("pass it through git-apply"),22670),2268OPT_PASSTHRU_ARGV(0,"ignore-space-change", &state.git_apply_opts, NULL,2269N_("pass it through git-apply"),2270 PARSE_OPT_NOARG),2271OPT_PASSTHRU_ARGV(0,"ignore-whitespace", &state.git_apply_opts, NULL,2272N_("pass it through git-apply"),2273 PARSE_OPT_NOARG),2274OPT_PASSTHRU_ARGV(0,"directory", &state.git_apply_opts,N_("root"),2275N_("pass it through git-apply"),22760),2277OPT_PASSTHRU_ARGV(0,"exclude", &state.git_apply_opts,N_("path"),2278N_("pass it through git-apply"),22790),2280OPT_PASSTHRU_ARGV(0,"include", &state.git_apply_opts,N_("path"),2281N_("pass it through git-apply"),22820),2283OPT_PASSTHRU_ARGV('C', NULL, &state.git_apply_opts,N_("n"),2284N_("pass it through git-apply"),22850),2286OPT_PASSTHRU_ARGV('p', NULL, &state.git_apply_opts,N_("num"),2287N_("pass it through git-apply"),22880),2289OPT_CALLBACK(0,"patch-format", &patch_format,N_("format"),2290N_("format the patch(es) are in"),2291 parse_opt_patchformat),2292OPT_PASSTHRU_ARGV(0,"reject", &state.git_apply_opts, NULL,2293N_("pass it through git-apply"),2294 PARSE_OPT_NOARG),2295OPT_STRING(0,"resolvemsg", &state.resolvemsg, NULL,2296N_("override error message when patch failure occurs")),2297OPT_CMDMODE(0,"continue", &resume,2298N_("continue applying patches after resolving a conflict"),2299 RESUME_RESOLVED),2300OPT_CMDMODE('r',"resolved", &resume,2301N_("synonyms for --continue"),2302 RESUME_RESOLVED),2303OPT_CMDMODE(0,"skip", &resume,2304N_("skip the current patch"),2305 RESUME_SKIP),2306OPT_CMDMODE(0,"abort", &resume,2307N_("restore the original branch and abort the patching operation."),2308 RESUME_ABORT),2309OPT_BOOL(0,"committer-date-is-author-date",2310&state.committer_date_is_author_date,2311N_("lie about committer date")),2312OPT_BOOL(0,"ignore-date", &state.ignore_date,2313N_("use current timestamp for author date")),2314OPT_RERERE_AUTOUPDATE(&state.allow_rerere_autoupdate),2315{ OPTION_STRING,'S',"gpg-sign", &state.sign_commit,N_("key-id"),2316N_("GPG-sign commits"),2317 PARSE_OPT_OPTARG, NULL, (intptr_t)""},2318OPT_HIDDEN_BOOL(0,"rebasing", &state.rebasing,2319N_("(internal use for git-rebase)")),2320OPT_END()2321};23222323git_config(git_am_config, NULL);23242325am_state_init(&state,git_path("rebase-apply"));23262327 in_progress =am_in_progress(&state);2328if(in_progress)2329am_load(&state);23302331 argc =parse_options(argc, argv, prefix, options, usage,0);23322333if(binary >=0)2334fprintf_ln(stderr,_("The -b/--binary option has been a no-op for long time, and\n"2335"it will be removed. Please do not use it anymore."));23362337/* Ensure a valid committer ident can be constructed */2338git_committer_info(IDENT_STRICT);23392340if(read_index_preload(&the_index, NULL) <0)2341die(_("failed to read the index"));23422343if(in_progress) {2344/*2345 * Catch user error to feed us patches when there is a session2346 * in progress:2347 *2348 * 1. mbox path(s) are provided on the command-line.2349 * 2. stdin is not a tty: the user is trying to feed us a patch2350 * from standard input. This is somewhat unreliable -- stdin2351 * could be /dev/null for example and the caller did not2352 * intend to feed us a patch but wanted to continue2353 * unattended.2354 */2355if(argc || (resume == RESUME_FALSE && !isatty(0)))2356die(_("previous rebase directory%sstill exists but mbox given."),2357 state.dir);23582359if(resume == RESUME_FALSE)2360 resume = RESUME_APPLY;23612362if(state.signoff == SIGNOFF_EXPLICIT)2363am_append_signoff(&state);2364}else{2365struct argv_array paths = ARGV_ARRAY_INIT;2366int i;23672368/*2369 * Handle stray state directory in the independent-run case. In2370 * the --rebasing case, it is up to the caller to take care of2371 * stray directories.2372 */2373if(file_exists(state.dir) && !state.rebasing) {2374if(resume == RESUME_ABORT) {2375am_destroy(&state);2376am_state_release(&state);2377return0;2378}23792380die(_("Stray%sdirectory found.\n"2381"Use\"git am --abort\"to remove it."),2382 state.dir);2383}23842385if(resume)2386die(_("Resolve operation not in progress, we are not resuming."));23872388for(i =0; i < argc; i++) {2389if(is_absolute_path(argv[i]) || !prefix)2390argv_array_push(&paths, argv[i]);2391else2392argv_array_push(&paths,mkpath("%s/%s", prefix, argv[i]));2393}23942395am_setup(&state, patch_format, paths.argv, keep_cr);23962397argv_array_clear(&paths);2398}23992400switch(resume) {2401case RESUME_FALSE:2402am_run(&state,0);2403break;2404case RESUME_APPLY:2405am_run(&state,1);2406break;2407case RESUME_RESOLVED:2408am_resolve(&state);2409break;2410case RESUME_SKIP:2411am_skip(&state);2412break;2413case RESUME_ABORT:2414am_abort(&state);2415break;2416default:2417die("BUG: invalid resume value");2418}24192420am_state_release(&state);24212422return0;2423}