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 32/** 33 * Returns 1 if the file is empty or does not exist, 0 otherwise. 34 */ 35static intis_empty_file(const char*filename) 36{ 37struct stat st; 38 39if(stat(filename, &st) <0) { 40if(errno == ENOENT) 41return1; 42die_errno(_("could not stat%s"), filename); 43} 44 45return!st.st_size; 46} 47 48/** 49 * Returns the length of the first line of msg. 50 */ 51static intlinelen(const char*msg) 52{ 53returnstrchrnul(msg,'\n') - msg; 54} 55 56/** 57 * Returns true if `str` consists of only whitespace, false otherwise. 58 */ 59static intstr_isspace(const char*str) 60{ 61for(; *str; str++) 62if(!isspace(*str)) 63return0; 64 65return1; 66} 67 68enum patch_format { 69 PATCH_FORMAT_UNKNOWN =0, 70 PATCH_FORMAT_MBOX, 71 PATCH_FORMAT_STGIT, 72 PATCH_FORMAT_STGIT_SERIES, 73 PATCH_FORMAT_HG 74}; 75 76enum keep_type { 77 KEEP_FALSE =0, 78 KEEP_TRUE,/* pass -k flag to git-mailinfo */ 79 KEEP_NON_PATCH /* pass -b flag to git-mailinfo */ 80}; 81 82enum scissors_type { 83 SCISSORS_UNSET = -1, 84 SCISSORS_FALSE =0,/* pass --no-scissors to git-mailinfo */ 85 SCISSORS_TRUE /* pass --scissors to git-mailinfo */ 86}; 87 88enum signoff_type { 89 SIGNOFF_FALSE =0, 90 SIGNOFF_TRUE =1, 91 SIGNOFF_EXPLICIT /* --signoff was set on the command-line */ 92}; 93 94struct am_state { 95/* state directory path */ 96char*dir; 97 98/* current and last patch numbers, 1-indexed */ 99int cur; 100int last; 101 102/* commit metadata and message */ 103char*author_name; 104char*author_email; 105char*author_date; 106char*msg; 107size_t msg_len; 108 109/* when --rebasing, records the original commit the patch came from */ 110unsigned char orig_commit[GIT_SHA1_RAWSZ]; 111 112/* number of digits in patch filename */ 113int prec; 114 115/* various operating modes and command line options */ 116int interactive; 117int threeway; 118int quiet; 119int signoff;/* enum signoff_type */ 120int utf8; 121int keep;/* enum keep_type */ 122int message_id; 123int scissors;/* enum scissors_type */ 124struct argv_array git_apply_opts; 125const char*resolvemsg; 126int committer_date_is_author_date; 127int ignore_date; 128int allow_rerere_autoupdate; 129const char*sign_commit; 130int rebasing; 131}; 132 133/** 134 * Initializes am_state with the default values. The state directory is set to 135 * dir. 136 */ 137static voidam_state_init(struct am_state *state,const char*dir) 138{ 139int gpgsign; 140 141memset(state,0,sizeof(*state)); 142 143assert(dir); 144 state->dir =xstrdup(dir); 145 146 state->prec =4; 147 148git_config_get_bool("am.threeway", &state->threeway); 149 150 state->utf8 =1; 151 152git_config_get_bool("am.messageid", &state->message_id); 153 154 state->scissors = SCISSORS_UNSET; 155 156argv_array_init(&state->git_apply_opts); 157 158if(!git_config_get_bool("commit.gpgsign", &gpgsign)) 159 state->sign_commit = gpgsign ?"": NULL; 160} 161 162/** 163 * Releases memory allocated by an am_state. 164 */ 165static voidam_state_release(struct am_state *state) 166{ 167free(state->dir); 168free(state->author_name); 169free(state->author_email); 170free(state->author_date); 171free(state->msg); 172argv_array_clear(&state->git_apply_opts); 173} 174 175/** 176 * Returns path relative to the am_state directory. 177 */ 178staticinlineconst char*am_path(const struct am_state *state,const char*path) 179{ 180returnmkpath("%s/%s", state->dir, path); 181} 182 183/** 184 * For convenience to call write_file() 185 */ 186static intwrite_state_text(const struct am_state *state, 187const char*name,const char*string) 188{ 189returnwrite_file(am_path(state, name),"%s", string); 190} 191 192static intwrite_state_count(const struct am_state *state, 193const char*name,int value) 194{ 195returnwrite_file(am_path(state, name),"%d", value); 196} 197 198static intwrite_state_bool(const struct am_state *state, 199const char*name,int value) 200{ 201returnwrite_state_text(state, name, value ?"t":"f"); 202} 203 204/** 205 * If state->quiet is false, calls fprintf(fp, fmt, ...), and appends a newline 206 * at the end. 207 */ 208static voidsay(const struct am_state *state,FILE*fp,const char*fmt, ...) 209{ 210va_list ap; 211 212va_start(ap, fmt); 213if(!state->quiet) { 214vfprintf(fp, fmt, ap); 215putc('\n', fp); 216} 217va_end(ap); 218} 219 220/** 221 * Returns 1 if there is an am session in progress, 0 otherwise. 222 */ 223static intam_in_progress(const struct am_state *state) 224{ 225struct stat st; 226 227if(lstat(state->dir, &st) <0|| !S_ISDIR(st.st_mode)) 228return0; 229if(lstat(am_path(state,"last"), &st) || !S_ISREG(st.st_mode)) 230return0; 231if(lstat(am_path(state,"next"), &st) || !S_ISREG(st.st_mode)) 232return0; 233return1; 234} 235 236/** 237 * Reads the contents of `file` in the `state` directory into `sb`. Returns the 238 * number of bytes read on success, -1 if the file does not exist. If `trim` is 239 * set, trailing whitespace will be removed. 240 */ 241static intread_state_file(struct strbuf *sb,const struct am_state *state, 242const char*file,int trim) 243{ 244strbuf_reset(sb); 245 246if(strbuf_read_file(sb,am_path(state, file),0) >=0) { 247if(trim) 248strbuf_trim(sb); 249 250return sb->len; 251} 252 253if(errno == ENOENT) 254return-1; 255 256die_errno(_("could not read '%s'"),am_path(state, file)); 257} 258 259/** 260 * Reads a KEY=VALUE shell variable assignment from `fp`, returning the VALUE 261 * as a newly-allocated string. VALUE must be a quoted string, and the KEY must 262 * match `key`. Returns NULL on failure. 263 * 264 * This is used by read_author_script() to read the GIT_AUTHOR_* variables from 265 * the author-script. 266 */ 267static char*read_shell_var(FILE*fp,const char*key) 268{ 269struct strbuf sb = STRBUF_INIT; 270const char*str; 271 272if(strbuf_getline_lf(&sb, fp)) 273goto fail; 274 275if(!skip_prefix(sb.buf, key, &str)) 276goto fail; 277 278if(!skip_prefix(str,"=", &str)) 279goto fail; 280 281strbuf_remove(&sb,0, str - sb.buf); 282 283 str =sq_dequote(sb.buf); 284if(!str) 285goto fail; 286 287returnstrbuf_detach(&sb, NULL); 288 289fail: 290strbuf_release(&sb); 291return NULL; 292} 293 294/** 295 * Reads and parses the state directory's "author-script" file, and sets 296 * state->author_name, state->author_email and state->author_date accordingly. 297 * Returns 0 on success, -1 if the file could not be parsed. 298 * 299 * The author script is of the format: 300 * 301 * GIT_AUTHOR_NAME='$author_name' 302 * GIT_AUTHOR_EMAIL='$author_email' 303 * GIT_AUTHOR_DATE='$author_date' 304 * 305 * where $author_name, $author_email and $author_date are quoted. We are strict 306 * with our parsing, as the file was meant to be eval'd in the old git-am.sh 307 * script, and thus if the file differs from what this function expects, it is 308 * better to bail out than to do something that the user does not expect. 309 */ 310static intread_author_script(struct am_state *state) 311{ 312const char*filename =am_path(state,"author-script"); 313FILE*fp; 314 315assert(!state->author_name); 316assert(!state->author_email); 317assert(!state->author_date); 318 319 fp =fopen(filename,"r"); 320if(!fp) { 321if(errno == ENOENT) 322return0; 323die_errno(_("could not open '%s' for reading"), filename); 324} 325 326 state->author_name =read_shell_var(fp,"GIT_AUTHOR_NAME"); 327if(!state->author_name) { 328fclose(fp); 329return-1; 330} 331 332 state->author_email =read_shell_var(fp,"GIT_AUTHOR_EMAIL"); 333if(!state->author_email) { 334fclose(fp); 335return-1; 336} 337 338 state->author_date =read_shell_var(fp,"GIT_AUTHOR_DATE"); 339if(!state->author_date) { 340fclose(fp); 341return-1; 342} 343 344if(fgetc(fp) != EOF) { 345fclose(fp); 346return-1; 347} 348 349fclose(fp); 350return0; 351} 352 353/** 354 * Saves state->author_name, state->author_email and state->author_date in the 355 * state directory's "author-script" file. 356 */ 357static voidwrite_author_script(const struct am_state *state) 358{ 359struct strbuf sb = STRBUF_INIT; 360 361strbuf_addstr(&sb,"GIT_AUTHOR_NAME="); 362sq_quote_buf(&sb, state->author_name); 363strbuf_addch(&sb,'\n'); 364 365strbuf_addstr(&sb,"GIT_AUTHOR_EMAIL="); 366sq_quote_buf(&sb, state->author_email); 367strbuf_addch(&sb,'\n'); 368 369strbuf_addstr(&sb,"GIT_AUTHOR_DATE="); 370sq_quote_buf(&sb, state->author_date); 371strbuf_addch(&sb,'\n'); 372 373write_state_text(state,"author-script", sb.buf); 374 375strbuf_release(&sb); 376} 377 378/** 379 * Reads the commit message from the state directory's "final-commit" file, 380 * setting state->msg to its contents and state->msg_len to the length of its 381 * contents in bytes. 382 * 383 * Returns 0 on success, -1 if the file does not exist. 384 */ 385static intread_commit_msg(struct am_state *state) 386{ 387struct strbuf sb = STRBUF_INIT; 388 389assert(!state->msg); 390 391if(read_state_file(&sb, state,"final-commit",0) <0) { 392strbuf_release(&sb); 393return-1; 394} 395 396 state->msg =strbuf_detach(&sb, &state->msg_len); 397return0; 398} 399 400/** 401 * Saves state->msg in the state directory's "final-commit" file. 402 */ 403static voidwrite_commit_msg(const struct am_state *state) 404{ 405int fd; 406const char*filename =am_path(state,"final-commit"); 407 408 fd =xopen(filename, O_WRONLY | O_CREAT,0666); 409if(write_in_full(fd, state->msg, state->msg_len) <0) 410die_errno(_("could not write to%s"), filename); 411close(fd); 412} 413 414/** 415 * Loads state from disk. 416 */ 417static voidam_load(struct am_state *state) 418{ 419struct strbuf sb = STRBUF_INIT; 420 421if(read_state_file(&sb, state,"next",1) <0) 422die("BUG: state file 'next' does not exist"); 423 state->cur =strtol(sb.buf, NULL,10); 424 425if(read_state_file(&sb, state,"last",1) <0) 426die("BUG: state file 'last' does not exist"); 427 state->last =strtol(sb.buf, NULL,10); 428 429if(read_author_script(state) <0) 430die(_("could not parse author script")); 431 432read_commit_msg(state); 433 434if(read_state_file(&sb, state,"original-commit",1) <0) 435hashclr(state->orig_commit); 436else if(get_sha1_hex(sb.buf, state->orig_commit) <0) 437die(_("could not parse%s"),am_path(state,"original-commit")); 438 439read_state_file(&sb, state,"threeway",1); 440 state->threeway = !strcmp(sb.buf,"t"); 441 442read_state_file(&sb, state,"quiet",1); 443 state->quiet = !strcmp(sb.buf,"t"); 444 445read_state_file(&sb, state,"sign",1); 446 state->signoff = !strcmp(sb.buf,"t"); 447 448read_state_file(&sb, state,"utf8",1); 449 state->utf8 = !strcmp(sb.buf,"t"); 450 451read_state_file(&sb, state,"keep",1); 452if(!strcmp(sb.buf,"t")) 453 state->keep = KEEP_TRUE; 454else if(!strcmp(sb.buf,"b")) 455 state->keep = KEEP_NON_PATCH; 456else 457 state->keep = KEEP_FALSE; 458 459read_state_file(&sb, state,"messageid",1); 460 state->message_id = !strcmp(sb.buf,"t"); 461 462read_state_file(&sb, state,"scissors",1); 463if(!strcmp(sb.buf,"t")) 464 state->scissors = SCISSORS_TRUE; 465else if(!strcmp(sb.buf,"f")) 466 state->scissors = SCISSORS_FALSE; 467else 468 state->scissors = SCISSORS_UNSET; 469 470read_state_file(&sb, state,"apply-opt",1); 471argv_array_clear(&state->git_apply_opts); 472if(sq_dequote_to_argv_array(sb.buf, &state->git_apply_opts) <0) 473die(_("could not parse%s"),am_path(state,"apply-opt")); 474 475 state->rebasing = !!file_exists(am_path(state,"rebasing")); 476 477strbuf_release(&sb); 478} 479 480/** 481 * Removes the am_state directory, forcefully terminating the current am 482 * session. 483 */ 484static voidam_destroy(const struct am_state *state) 485{ 486struct strbuf sb = STRBUF_INIT; 487 488strbuf_addstr(&sb, state->dir); 489remove_dir_recursively(&sb,0); 490strbuf_release(&sb); 491} 492 493/** 494 * Runs applypatch-msg hook. Returns its exit code. 495 */ 496static intrun_applypatch_msg_hook(struct am_state *state) 497{ 498int ret; 499 500assert(state->msg); 501 ret =run_hook_le(NULL,"applypatch-msg",am_path(state,"final-commit"), NULL); 502 503if(!ret) { 504free(state->msg); 505 state->msg = NULL; 506if(read_commit_msg(state) <0) 507die(_("'%s' was deleted by the applypatch-msg hook"), 508am_path(state,"final-commit")); 509} 510 511return ret; 512} 513 514/** 515 * Runs post-rewrite hook. Returns it exit code. 516 */ 517static intrun_post_rewrite_hook(const struct am_state *state) 518{ 519struct child_process cp = CHILD_PROCESS_INIT; 520const char*hook =find_hook("post-rewrite"); 521int ret; 522 523if(!hook) 524return0; 525 526argv_array_push(&cp.args, hook); 527argv_array_push(&cp.args,"rebase"); 528 529 cp.in =xopen(am_path(state,"rewritten"), O_RDONLY); 530 cp.stdout_to_stderr =1; 531 532 ret =run_command(&cp); 533 534close(cp.in); 535return ret; 536} 537 538/** 539 * Reads the state directory's "rewritten" file, and copies notes from the old 540 * commits listed in the file to their rewritten commits. 541 * 542 * Returns 0 on success, -1 on failure. 543 */ 544static intcopy_notes_for_rebase(const struct am_state *state) 545{ 546struct notes_rewrite_cfg *c; 547struct strbuf sb = STRBUF_INIT; 548const char*invalid_line =_("Malformed input line: '%s'."); 549const char*msg ="Notes added by 'git rebase'"; 550FILE*fp; 551int ret =0; 552 553assert(state->rebasing); 554 555 c =init_copy_notes_for_rewrite("rebase"); 556if(!c) 557return0; 558 559 fp =xfopen(am_path(state,"rewritten"),"r"); 560 561while(!strbuf_getline_lf(&sb, fp)) { 562unsigned char from_obj[GIT_SHA1_RAWSZ], to_obj[GIT_SHA1_RAWSZ]; 563 564if(sb.len != GIT_SHA1_HEXSZ *2+1) { 565 ret =error(invalid_line, sb.buf); 566goto finish; 567} 568 569if(get_sha1_hex(sb.buf, from_obj)) { 570 ret =error(invalid_line, sb.buf); 571goto finish; 572} 573 574if(sb.buf[GIT_SHA1_HEXSZ] !=' ') { 575 ret =error(invalid_line, sb.buf); 576goto finish; 577} 578 579if(get_sha1_hex(sb.buf + GIT_SHA1_HEXSZ +1, to_obj)) { 580 ret =error(invalid_line, sb.buf); 581goto finish; 582} 583 584if(copy_note_for_rewrite(c, from_obj, to_obj)) 585 ret =error(_("Failed to copy notes from '%s' to '%s'"), 586sha1_to_hex(from_obj),sha1_to_hex(to_obj)); 587} 588 589finish: 590finish_copy_notes_for_rewrite(c, msg); 591fclose(fp); 592strbuf_release(&sb); 593return ret; 594} 595 596/** 597 * Determines if the file looks like a piece of RFC2822 mail by grabbing all 598 * non-indented lines and checking if they look like they begin with valid 599 * header field names. 600 * 601 * Returns 1 if the file looks like a piece of mail, 0 otherwise. 602 */ 603static intis_mail(FILE*fp) 604{ 605const char*header_regex ="^[!-9;-~]+:"; 606struct strbuf sb = STRBUF_INIT; 607 regex_t regex; 608int ret =1; 609 610if(fseek(fp,0L, SEEK_SET)) 611die_errno(_("fseek failed")); 612 613if(regcomp(®ex, header_regex, REG_NOSUB | REG_EXTENDED)) 614die("invalid pattern:%s", header_regex); 615 616while(!strbuf_getline(&sb, fp)) { 617if(!sb.len) 618break;/* End of header */ 619 620/* Ignore indented folded lines */ 621if(*sb.buf =='\t'|| *sb.buf ==' ') 622continue; 623 624/* It's a header if it matches header_regex */ 625if(regexec(®ex, sb.buf,0, NULL,0)) { 626 ret =0; 627goto done; 628} 629} 630 631done: 632regfree(®ex); 633strbuf_release(&sb); 634return ret; 635} 636 637/** 638 * Attempts to detect the patch_format of the patches contained in `paths`, 639 * returning the PATCH_FORMAT_* enum value. Returns PATCH_FORMAT_UNKNOWN if 640 * detection fails. 641 */ 642static intdetect_patch_format(const char**paths) 643{ 644enum patch_format ret = PATCH_FORMAT_UNKNOWN; 645struct strbuf l1 = STRBUF_INIT; 646struct strbuf l2 = STRBUF_INIT; 647struct strbuf l3 = STRBUF_INIT; 648FILE*fp; 649 650/* 651 * We default to mbox format if input is from stdin and for directories 652 */ 653if(!*paths || !strcmp(*paths,"-") ||is_directory(*paths)) 654return PATCH_FORMAT_MBOX; 655 656/* 657 * Otherwise, check the first few lines of the first patch, starting 658 * from the first non-blank line, to try to detect its format. 659 */ 660 661 fp =xfopen(*paths,"r"); 662 663while(!strbuf_getline(&l1, fp)) { 664if(l1.len) 665break; 666} 667 668if(starts_with(l1.buf,"From ") ||starts_with(l1.buf,"From: ")) { 669 ret = PATCH_FORMAT_MBOX; 670goto done; 671} 672 673if(starts_with(l1.buf,"# This series applies on GIT commit")) { 674 ret = PATCH_FORMAT_STGIT_SERIES; 675goto done; 676} 677 678if(!strcmp(l1.buf,"# HG changeset patch")) { 679 ret = PATCH_FORMAT_HG; 680goto done; 681} 682 683strbuf_reset(&l2); 684strbuf_getline(&l2, fp); 685strbuf_reset(&l3); 686strbuf_getline(&l3, fp); 687 688/* 689 * If the second line is empty and the third is a From, Author or Date 690 * entry, this is likely an StGit patch. 691 */ 692if(l1.len && !l2.len && 693(starts_with(l3.buf,"From:") || 694starts_with(l3.buf,"Author:") || 695starts_with(l3.buf,"Date:"))) { 696 ret = PATCH_FORMAT_STGIT; 697goto done; 698} 699 700if(l1.len &&is_mail(fp)) { 701 ret = PATCH_FORMAT_MBOX; 702goto done; 703} 704 705done: 706fclose(fp); 707strbuf_release(&l1); 708return ret; 709} 710 711/** 712 * Splits out individual email patches from `paths`, where each path is either 713 * a mbox file or a Maildir. Returns 0 on success, -1 on failure. 714 */ 715static intsplit_mail_mbox(struct am_state *state,const char**paths,int keep_cr) 716{ 717struct child_process cp = CHILD_PROCESS_INIT; 718struct strbuf last = STRBUF_INIT; 719 720 cp.git_cmd =1; 721argv_array_push(&cp.args,"mailsplit"); 722argv_array_pushf(&cp.args,"-d%d", state->prec); 723argv_array_pushf(&cp.args,"-o%s", state->dir); 724argv_array_push(&cp.args,"-b"); 725if(keep_cr) 726argv_array_push(&cp.args,"--keep-cr"); 727argv_array_push(&cp.args,"--"); 728argv_array_pushv(&cp.args, paths); 729 730if(capture_command(&cp, &last,8)) 731return-1; 732 733 state->cur =1; 734 state->last =strtol(last.buf, NULL,10); 735 736return0; 737} 738 739/** 740 * Callback signature for split_mail_conv(). The foreign patch should be 741 * read from `in`, and the converted patch (in RFC2822 mail format) should be 742 * written to `out`. Return 0 on success, or -1 on failure. 743 */ 744typedefint(*mail_conv_fn)(FILE*out,FILE*in,int keep_cr); 745 746/** 747 * Calls `fn` for each file in `paths` to convert the foreign patch to the 748 * RFC2822 mail format suitable for parsing with git-mailinfo. 749 * 750 * Returns 0 on success, -1 on failure. 751 */ 752static intsplit_mail_conv(mail_conv_fn fn,struct am_state *state, 753const char**paths,int keep_cr) 754{ 755static const char*stdin_only[] = {"-", NULL}; 756int i; 757 758if(!*paths) 759 paths = stdin_only; 760 761for(i =0; *paths; paths++, i++) { 762FILE*in, *out; 763const char*mail; 764int ret; 765 766if(!strcmp(*paths,"-")) 767 in = stdin; 768else 769 in =fopen(*paths,"r"); 770 771if(!in) 772returnerror(_("could not open '%s' for reading:%s"), 773*paths,strerror(errno)); 774 775 mail =mkpath("%s/%0*d", state->dir, state->prec, i +1); 776 777 out =fopen(mail,"w"); 778if(!out) 779returnerror(_("could not open '%s' for writing:%s"), 780 mail,strerror(errno)); 781 782 ret =fn(out, in, keep_cr); 783 784fclose(out); 785fclose(in); 786 787if(ret) 788returnerror(_("could not parse patch '%s'"), *paths); 789} 790 791 state->cur =1; 792 state->last = i; 793return0; 794} 795 796/** 797 * A split_mail_conv() callback that converts an StGit patch to an RFC2822 798 * message suitable for parsing with git-mailinfo. 799 */ 800static intstgit_patch_to_mail(FILE*out,FILE*in,int keep_cr) 801{ 802struct strbuf sb = STRBUF_INIT; 803int subject_printed =0; 804 805while(!strbuf_getline_lf(&sb, in)) { 806const char*str; 807 808if(str_isspace(sb.buf)) 809continue; 810else if(skip_prefix(sb.buf,"Author:", &str)) 811fprintf(out,"From:%s\n", str); 812else if(starts_with(sb.buf,"From") ||starts_with(sb.buf,"Date")) 813fprintf(out,"%s\n", sb.buf); 814else if(!subject_printed) { 815fprintf(out,"Subject:%s\n", sb.buf); 816 subject_printed =1; 817}else{ 818fprintf(out,"\n%s\n", sb.buf); 819break; 820} 821} 822 823strbuf_reset(&sb); 824while(strbuf_fread(&sb,8192, in) >0) { 825fwrite(sb.buf,1, sb.len, out); 826strbuf_reset(&sb); 827} 828 829strbuf_release(&sb); 830return0; 831} 832 833/** 834 * This function only supports a single StGit series file in `paths`. 835 * 836 * Given an StGit series file, converts the StGit patches in the series into 837 * RFC2822 messages suitable for parsing with git-mailinfo, and queues them in 838 * the state directory. 839 * 840 * Returns 0 on success, -1 on failure. 841 */ 842static intsplit_mail_stgit_series(struct am_state *state,const char**paths, 843int keep_cr) 844{ 845const char*series_dir; 846char*series_dir_buf; 847FILE*fp; 848struct argv_array patches = ARGV_ARRAY_INIT; 849struct strbuf sb = STRBUF_INIT; 850int ret; 851 852if(!paths[0] || paths[1]) 853returnerror(_("Only one StGIT patch series can be applied at once")); 854 855 series_dir_buf =xstrdup(*paths); 856 series_dir =dirname(series_dir_buf); 857 858 fp =fopen(*paths,"r"); 859if(!fp) 860returnerror(_("could not open '%s' for reading:%s"), *paths, 861strerror(errno)); 862 863while(!strbuf_getline_lf(&sb, fp)) { 864if(*sb.buf =='#') 865continue;/* skip comment lines */ 866 867argv_array_push(&patches,mkpath("%s/%s", series_dir, sb.buf)); 868} 869 870fclose(fp); 871strbuf_release(&sb); 872free(series_dir_buf); 873 874 ret =split_mail_conv(stgit_patch_to_mail, state, patches.argv, keep_cr); 875 876argv_array_clear(&patches); 877return ret; 878} 879 880/** 881 * A split_patches_conv() callback that converts a mercurial patch to a RFC2822 882 * message suitable for parsing with git-mailinfo. 883 */ 884static inthg_patch_to_mail(FILE*out,FILE*in,int keep_cr) 885{ 886struct strbuf sb = STRBUF_INIT; 887 888while(!strbuf_getline_lf(&sb, in)) { 889const char*str; 890 891if(skip_prefix(sb.buf,"# User ", &str)) 892fprintf(out,"From:%s\n", str); 893else if(skip_prefix(sb.buf,"# Date ", &str)) { 894unsigned long timestamp; 895long tz, tz2; 896char*end; 897 898 errno =0; 899 timestamp =strtoul(str, &end,10); 900if(errno) 901returnerror(_("invalid timestamp")); 902 903if(!skip_prefix(end," ", &str)) 904returnerror(_("invalid Date line")); 905 906 errno =0; 907 tz =strtol(str, &end,10); 908if(errno) 909returnerror(_("invalid timezone offset")); 910 911if(*end) 912returnerror(_("invalid Date line")); 913 914/* 915 * mercurial's timezone is in seconds west of UTC, 916 * however git's timezone is in hours + minutes east of 917 * UTC. Convert it. 918 */ 919 tz2 =labs(tz) /3600*100+labs(tz) %3600/60; 920if(tz >0) 921 tz2 = -tz2; 922 923fprintf(out,"Date:%s\n",show_date(timestamp, tz2,DATE_MODE(RFC2822))); 924}else if(starts_with(sb.buf,"# ")) { 925continue; 926}else{ 927fprintf(out,"\n%s\n", sb.buf); 928break; 929} 930} 931 932strbuf_reset(&sb); 933while(strbuf_fread(&sb,8192, in) >0) { 934fwrite(sb.buf,1, sb.len, out); 935strbuf_reset(&sb); 936} 937 938strbuf_release(&sb); 939return0; 940} 941 942/** 943 * Splits a list of files/directories into individual email patches. Each path 944 * in `paths` must be a file/directory that is formatted according to 945 * `patch_format`. 946 * 947 * Once split out, the individual email patches will be stored in the state 948 * directory, with each patch's filename being its index, padded to state->prec 949 * digits. 950 * 951 * state->cur will be set to the index of the first mail, and state->last will 952 * be set to the index of the last mail. 953 * 954 * Set keep_cr to 0 to convert all lines ending with \r\n to end with \n, 1 955 * to disable this behavior, -1 to use the default configured setting. 956 * 957 * Returns 0 on success, -1 on failure. 958 */ 959static intsplit_mail(struct am_state *state,enum patch_format patch_format, 960const char**paths,int keep_cr) 961{ 962if(keep_cr <0) { 963 keep_cr =0; 964git_config_get_bool("am.keepcr", &keep_cr); 965} 966 967switch(patch_format) { 968case PATCH_FORMAT_MBOX: 969returnsplit_mail_mbox(state, paths, keep_cr); 970case PATCH_FORMAT_STGIT: 971returnsplit_mail_conv(stgit_patch_to_mail, state, paths, keep_cr); 972case PATCH_FORMAT_STGIT_SERIES: 973returnsplit_mail_stgit_series(state, paths, keep_cr); 974case PATCH_FORMAT_HG: 975returnsplit_mail_conv(hg_patch_to_mail, state, paths, keep_cr); 976default: 977die("BUG: invalid patch_format"); 978} 979return-1; 980} 981 982/** 983 * Setup a new am session for applying patches 984 */ 985static voidam_setup(struct am_state *state,enum patch_format patch_format, 986const char**paths,int keep_cr) 987{ 988unsigned char curr_head[GIT_SHA1_RAWSZ]; 989const char*str; 990struct strbuf sb = STRBUF_INIT; 991 992if(!patch_format) 993 patch_format =detect_patch_format(paths); 994 995if(!patch_format) { 996fprintf_ln(stderr,_("Patch format detection failed.")); 997exit(128); 998} 9991000if(mkdir(state->dir,0777) <0&& errno != EEXIST)1001die_errno(_("failed to create directory '%s'"), state->dir);10021003if(split_mail(state, patch_format, paths, keep_cr) <0) {1004am_destroy(state);1005die(_("Failed to split patches."));1006}10071008if(state->rebasing)1009 state->threeway =1;10101011write_state_bool(state,"threeway", state->threeway);1012write_state_bool(state,"quiet", state->quiet);1013write_state_bool(state,"sign", state->signoff);1014write_state_bool(state,"utf8", state->utf8);10151016switch(state->keep) {1017case KEEP_FALSE:1018 str ="f";1019break;1020case KEEP_TRUE:1021 str ="t";1022break;1023case KEEP_NON_PATCH:1024 str ="b";1025break;1026default:1027die("BUG: invalid value for state->keep");1028}10291030write_state_text(state,"keep", str);1031write_state_bool(state,"messageid", state->message_id);10321033switch(state->scissors) {1034case SCISSORS_UNSET:1035 str ="";1036break;1037case SCISSORS_FALSE:1038 str ="f";1039break;1040case SCISSORS_TRUE:1041 str ="t";1042break;1043default:1044die("BUG: invalid value for state->scissors");1045}1046write_state_text(state,"scissors", str);10471048sq_quote_argv(&sb, state->git_apply_opts.argv,0);1049write_state_text(state,"apply-opt", sb.buf);10501051if(state->rebasing)1052write_state_text(state,"rebasing","");1053else1054write_state_text(state,"applying","");10551056if(!get_sha1("HEAD", curr_head)) {1057write_state_text(state,"abort-safety",sha1_to_hex(curr_head));1058if(!state->rebasing)1059update_ref("am","ORIG_HEAD", curr_head, NULL,0,1060 UPDATE_REFS_DIE_ON_ERR);1061}else{1062write_state_text(state,"abort-safety","");1063if(!state->rebasing)1064delete_ref("ORIG_HEAD", NULL,0);1065}10661067/*1068 * NOTE: Since the "next" and "last" files determine if an am_state1069 * session is in progress, they should be written last.1070 */10711072write_state_count(state,"next", state->cur);1073write_state_count(state,"last", state->last);10741075strbuf_release(&sb);1076}10771078/**1079 * Increments the patch pointer, and cleans am_state for the application of the1080 * next patch.1081 */1082static voidam_next(struct am_state *state)1083{1084unsigned char head[GIT_SHA1_RAWSZ];10851086free(state->author_name);1087 state->author_name = NULL;10881089free(state->author_email);1090 state->author_email = NULL;10911092free(state->author_date);1093 state->author_date = NULL;10941095free(state->msg);1096 state->msg = NULL;1097 state->msg_len =0;10981099unlink(am_path(state,"author-script"));1100unlink(am_path(state,"final-commit"));11011102hashclr(state->orig_commit);1103unlink(am_path(state,"original-commit"));11041105if(!get_sha1("HEAD", head))1106write_state_text(state,"abort-safety",sha1_to_hex(head));1107else1108write_state_text(state,"abort-safety","");11091110 state->cur++;1111write_state_count(state,"next", state->cur);1112}11131114/**1115 * Returns the filename of the current patch email.1116 */1117static const char*msgnum(const struct am_state *state)1118{1119static struct strbuf sb = STRBUF_INIT;11201121strbuf_reset(&sb);1122strbuf_addf(&sb,"%0*d", state->prec, state->cur);11231124return sb.buf;1125}11261127/**1128 * Refresh and write index.1129 */1130static voidrefresh_and_write_cache(void)1131{1132struct lock_file *lock_file =xcalloc(1,sizeof(struct lock_file));11331134hold_locked_index(lock_file,1);1135refresh_cache(REFRESH_QUIET);1136if(write_locked_index(&the_index, lock_file, COMMIT_LOCK))1137die(_("unable to write index file"));1138}11391140/**1141 * Returns 1 if the index differs from HEAD, 0 otherwise. When on an unborn1142 * branch, returns 1 if there are entries in the index, 0 otherwise. If an1143 * strbuf is provided, the space-separated list of files that differ will be1144 * appended to it.1145 */1146static intindex_has_changes(struct strbuf *sb)1147{1148unsigned char head[GIT_SHA1_RAWSZ];1149int i;11501151if(!get_sha1_tree("HEAD", head)) {1152struct diff_options opt;11531154diff_setup(&opt);1155DIFF_OPT_SET(&opt, EXIT_WITH_STATUS);1156if(!sb)1157DIFF_OPT_SET(&opt, QUICK);1158do_diff_cache(head, &opt);1159diffcore_std(&opt);1160for(i =0; sb && i < diff_queued_diff.nr; i++) {1161if(i)1162strbuf_addch(sb,' ');1163strbuf_addstr(sb, diff_queued_diff.queue[i]->two->path);1164}1165diff_flush(&opt);1166returnDIFF_OPT_TST(&opt, HAS_CHANGES) !=0;1167}else{1168for(i =0; sb && i < active_nr; i++) {1169if(i)1170strbuf_addch(sb,' ');1171strbuf_addstr(sb, active_cache[i]->name);1172}1173return!!active_nr;1174}1175}11761177/**1178 * Dies with a user-friendly message on how to proceed after resolving the1179 * problem. This message can be overridden with state->resolvemsg.1180 */1181static void NORETURN die_user_resolve(const struct am_state *state)1182{1183if(state->resolvemsg) {1184printf_ln("%s", state->resolvemsg);1185}else{1186const char*cmdline = state->interactive ?"git am -i":"git am";11871188printf_ln(_("When you have resolved this problem, run\"%s--continue\"."), cmdline);1189printf_ln(_("If you prefer to skip this patch, run\"%s--skip\"instead."), cmdline);1190printf_ln(_("To restore the original branch and stop patching, run\"%s--abort\"."), cmdline);1191}11921193exit(128);1194}11951196static voidam_signoff(struct strbuf *sb)1197{1198char*cp;1199struct strbuf mine = STRBUF_INIT;12001201/* Does it end with our own sign-off? */1202strbuf_addf(&mine,"\n%s%s\n",1203 sign_off_header,1204fmt_name(getenv("GIT_COMMITTER_NAME"),1205getenv("GIT_COMMITTER_EMAIL")));1206if(mine.len < sb->len &&1207!strcmp(mine.buf, sb->buf + sb->len - mine.len))1208goto exit;/* no need to duplicate */12091210/* Does it have any Signed-off-by: in the text */1211for(cp = sb->buf;1212 cp && *cp && (cp =strstr(cp, sign_off_header)) != NULL;1213 cp =strchr(cp,'\n')) {1214if(sb->buf == cp || cp[-1] =='\n')1215break;1216}12171218strbuf_addstr(sb, mine.buf + !!cp);1219exit:1220strbuf_release(&mine);1221}12221223/**1224 * Appends signoff to the "msg" field of the am_state.1225 */1226static voidam_append_signoff(struct am_state *state)1227{1228struct strbuf sb = STRBUF_INIT;12291230strbuf_attach(&sb, state->msg, state->msg_len, state->msg_len);1231am_signoff(&sb);1232 state->msg =strbuf_detach(&sb, &state->msg_len);1233}12341235/**1236 * Parses `mail` using git-mailinfo, extracting its patch and authorship info.1237 * state->msg will be set to the patch message. state->author_name,1238 * state->author_email and state->author_date will be set to the patch author's1239 * name, email and date respectively. The patch body will be written to the1240 * state directory's "patch" file.1241 *1242 * Returns 1 if the patch should be skipped, 0 otherwise.1243 */1244static intparse_mail(struct am_state *state,const char*mail)1245{1246FILE*fp;1247struct strbuf sb = STRBUF_INIT;1248struct strbuf msg = STRBUF_INIT;1249struct strbuf author_name = STRBUF_INIT;1250struct strbuf author_date = STRBUF_INIT;1251struct strbuf author_email = STRBUF_INIT;1252int ret =0;1253struct mailinfo mi;12541255setup_mailinfo(&mi);12561257if(state->utf8)1258 mi.metainfo_charset =get_commit_output_encoding();1259else1260 mi.metainfo_charset = NULL;12611262switch(state->keep) {1263case KEEP_FALSE:1264break;1265case KEEP_TRUE:1266 mi.keep_subject =1;1267break;1268case KEEP_NON_PATCH:1269 mi.keep_non_patch_brackets_in_subject =1;1270break;1271default:1272die("BUG: invalid value for state->keep");1273}12741275if(state->message_id)1276 mi.add_message_id =1;12771278switch(state->scissors) {1279case SCISSORS_UNSET:1280break;1281case SCISSORS_FALSE:1282 mi.use_scissors =0;1283break;1284case SCISSORS_TRUE:1285 mi.use_scissors =1;1286break;1287default:1288die("BUG: invalid value for state->scissors");1289}12901291 mi.input =fopen(mail,"r");1292if(!mi.input)1293die("could not open input");1294 mi.output =fopen(am_path(state,"info"),"w");1295if(!mi.output)1296die("could not open output 'info'");1297if(mailinfo(&mi,am_path(state,"msg"),am_path(state,"patch")))1298die("could not parse patch");12991300fclose(mi.input);1301fclose(mi.output);13021303/* Extract message and author information */1304 fp =xfopen(am_path(state,"info"),"r");1305while(!strbuf_getline_lf(&sb, fp)) {1306const char*x;13071308if(skip_prefix(sb.buf,"Subject: ", &x)) {1309if(msg.len)1310strbuf_addch(&msg,'\n');1311strbuf_addstr(&msg, x);1312}else if(skip_prefix(sb.buf,"Author: ", &x))1313strbuf_addstr(&author_name, x);1314else if(skip_prefix(sb.buf,"Email: ", &x))1315strbuf_addstr(&author_email, x);1316else if(skip_prefix(sb.buf,"Date: ", &x))1317strbuf_addstr(&author_date, x);1318}1319fclose(fp);13201321/* Skip pine's internal folder data */1322if(!strcmp(author_name.buf,"Mail System Internal Data")) {1323 ret =1;1324goto finish;1325}13261327if(is_empty_file(am_path(state,"patch"))) {1328printf_ln(_("Patch is empty. Was it split wrong?"));1329die_user_resolve(state);1330}13311332strbuf_addstr(&msg,"\n\n");1333strbuf_addbuf(&msg, &mi.log_message);1334strbuf_stripspace(&msg,0);13351336if(state->signoff)1337am_signoff(&msg);13381339assert(!state->author_name);1340 state->author_name =strbuf_detach(&author_name, NULL);13411342assert(!state->author_email);1343 state->author_email =strbuf_detach(&author_email, NULL);13441345assert(!state->author_date);1346 state->author_date =strbuf_detach(&author_date, NULL);13471348assert(!state->msg);1349 state->msg =strbuf_detach(&msg, &state->msg_len);13501351finish:1352strbuf_release(&msg);1353strbuf_release(&author_date);1354strbuf_release(&author_email);1355strbuf_release(&author_name);1356strbuf_release(&sb);1357clear_mailinfo(&mi);1358return ret;1359}13601361/**1362 * Sets commit_id to the commit hash where the mail was generated from.1363 * Returns 0 on success, -1 on failure.1364 */1365static intget_mail_commit_sha1(unsigned char*commit_id,const char*mail)1366{1367struct strbuf sb = STRBUF_INIT;1368FILE*fp =xfopen(mail,"r");1369const char*x;13701371if(strbuf_getline_lf(&sb, fp))1372return-1;13731374if(!skip_prefix(sb.buf,"From ", &x))1375return-1;13761377if(get_sha1_hex(x, commit_id) <0)1378return-1;13791380strbuf_release(&sb);1381fclose(fp);1382return0;1383}13841385/**1386 * Sets state->msg, state->author_name, state->author_email, state->author_date1387 * to the commit's respective info.1388 */1389static voidget_commit_info(struct am_state *state,struct commit *commit)1390{1391const char*buffer, *ident_line, *author_date, *msg;1392size_t ident_len;1393struct ident_split ident_split;1394struct strbuf sb = STRBUF_INIT;13951396 buffer =logmsg_reencode(commit, NULL,get_commit_output_encoding());13971398 ident_line =find_commit_header(buffer,"author", &ident_len);13991400if(split_ident_line(&ident_split, ident_line, ident_len) <0) {1401strbuf_add(&sb, ident_line, ident_len);1402die(_("invalid ident line:%s"), sb.buf);1403}14041405assert(!state->author_name);1406if(ident_split.name_begin) {1407strbuf_add(&sb, ident_split.name_begin,1408 ident_split.name_end - ident_split.name_begin);1409 state->author_name =strbuf_detach(&sb, NULL);1410}else1411 state->author_name =xstrdup("");14121413assert(!state->author_email);1414if(ident_split.mail_begin) {1415strbuf_add(&sb, ident_split.mail_begin,1416 ident_split.mail_end - ident_split.mail_begin);1417 state->author_email =strbuf_detach(&sb, NULL);1418}else1419 state->author_email =xstrdup("");14201421 author_date =show_ident_date(&ident_split,DATE_MODE(NORMAL));1422strbuf_addstr(&sb, author_date);1423assert(!state->author_date);1424 state->author_date =strbuf_detach(&sb, NULL);14251426assert(!state->msg);1427 msg =strstr(buffer,"\n\n");1428if(!msg)1429die(_("unable to parse commit%s"),oid_to_hex(&commit->object.oid));1430 state->msg =xstrdup(msg +2);1431 state->msg_len =strlen(state->msg);1432}14331434/**1435 * Writes `commit` as a patch to the state directory's "patch" file.1436 */1437static voidwrite_commit_patch(const struct am_state *state,struct commit *commit)1438{1439struct rev_info rev_info;1440FILE*fp;14411442 fp =xfopen(am_path(state,"patch"),"w");1443init_revisions(&rev_info, NULL);1444 rev_info.diff =1;1445 rev_info.abbrev =0;1446 rev_info.disable_stdin =1;1447 rev_info.show_root_diff =1;1448 rev_info.diffopt.output_format = DIFF_FORMAT_PATCH;1449 rev_info.no_commit_id =1;1450DIFF_OPT_SET(&rev_info.diffopt, BINARY);1451DIFF_OPT_SET(&rev_info.diffopt, FULL_INDEX);1452 rev_info.diffopt.use_color =0;1453 rev_info.diffopt.file = fp;1454 rev_info.diffopt.close_file =1;1455add_pending_object(&rev_info, &commit->object,"");1456diff_setup_done(&rev_info.diffopt);1457log_tree_commit(&rev_info, commit);1458}14591460/**1461 * Writes the diff of the index against HEAD as a patch to the state1462 * directory's "patch" file.1463 */1464static voidwrite_index_patch(const struct am_state *state)1465{1466struct tree *tree;1467unsigned char head[GIT_SHA1_RAWSZ];1468struct rev_info rev_info;1469FILE*fp;14701471if(!get_sha1_tree("HEAD", head))1472 tree =lookup_tree(head);1473else1474 tree =lookup_tree(EMPTY_TREE_SHA1_BIN);14751476 fp =xfopen(am_path(state,"patch"),"w");1477init_revisions(&rev_info, NULL);1478 rev_info.diff =1;1479 rev_info.disable_stdin =1;1480 rev_info.no_commit_id =1;1481 rev_info.diffopt.output_format = DIFF_FORMAT_PATCH;1482 rev_info.diffopt.use_color =0;1483 rev_info.diffopt.file = fp;1484 rev_info.diffopt.close_file =1;1485add_pending_object(&rev_info, &tree->object,"");1486diff_setup_done(&rev_info.diffopt);1487run_diff_index(&rev_info,1);1488}14891490/**1491 * Like parse_mail(), but parses the mail by looking up its commit ID1492 * directly. This is used in --rebasing mode to bypass git-mailinfo's munging1493 * of patches.1494 *1495 * state->orig_commit will be set to the original commit ID.1496 *1497 * Will always return 0 as the patch should never be skipped.1498 */1499static intparse_mail_rebase(struct am_state *state,const char*mail)1500{1501struct commit *commit;1502unsigned char commit_sha1[GIT_SHA1_RAWSZ];15031504if(get_mail_commit_sha1(commit_sha1, mail) <0)1505die(_("could not parse%s"), mail);15061507 commit =lookup_commit_or_die(commit_sha1, mail);15081509get_commit_info(state, commit);15101511write_commit_patch(state, commit);15121513hashcpy(state->orig_commit, commit_sha1);1514write_state_text(state,"original-commit",sha1_to_hex(commit_sha1));15151516return0;1517}15181519/**1520 * Applies current patch with git-apply. Returns 0 on success, -1 otherwise. If1521 * `index_file` is not NULL, the patch will be applied to that index.1522 */1523static intrun_apply(const struct am_state *state,const char*index_file)1524{1525struct child_process cp = CHILD_PROCESS_INIT;15261527 cp.git_cmd =1;15281529if(index_file)1530argv_array_pushf(&cp.env_array,"GIT_INDEX_FILE=%s", index_file);15311532/*1533 * If we are allowed to fall back on 3-way merge, don't give false1534 * errors during the initial attempt.1535 */1536if(state->threeway && !index_file) {1537 cp.no_stdout =1;1538 cp.no_stderr =1;1539}15401541argv_array_push(&cp.args,"apply");15421543argv_array_pushv(&cp.args, state->git_apply_opts.argv);15441545if(index_file)1546argv_array_push(&cp.args,"--cached");1547else1548argv_array_push(&cp.args,"--index");15491550argv_array_push(&cp.args,am_path(state,"patch"));15511552if(run_command(&cp))1553return-1;15541555/* Reload index as git-apply will have modified it. */1556discard_cache();1557read_cache_from(index_file ? index_file :get_index_file());15581559return0;1560}15611562/**1563 * Builds an index that contains just the blobs needed for a 3way merge.1564 */1565static intbuild_fake_ancestor(const struct am_state *state,const char*index_file)1566{1567struct child_process cp = CHILD_PROCESS_INIT;15681569 cp.git_cmd =1;1570argv_array_push(&cp.args,"apply");1571argv_array_pushv(&cp.args, state->git_apply_opts.argv);1572argv_array_pushf(&cp.args,"--build-fake-ancestor=%s", index_file);1573argv_array_push(&cp.args,am_path(state,"patch"));15741575if(run_command(&cp))1576return-1;15771578return0;1579}15801581/**1582 * Do the three-way merge using fake ancestor, his tree constructed1583 * from the fake ancestor and the postimage of the patch, and our1584 * state.1585 */1586static intrun_fallback_merge_recursive(const struct am_state *state,1587unsigned char*orig_tree,1588unsigned char*our_tree,1589unsigned char*his_tree)1590{1591struct child_process cp = CHILD_PROCESS_INIT;1592int status;15931594 cp.git_cmd =1;15951596argv_array_pushf(&cp.env_array,"GITHEAD_%s=%.*s",1597sha1_to_hex(his_tree),linelen(state->msg), state->msg);1598if(state->quiet)1599argv_array_push(&cp.env_array,"GIT_MERGE_VERBOSITY=0");16001601argv_array_push(&cp.args,"merge-recursive");1602argv_array_push(&cp.args,sha1_to_hex(orig_tree));1603argv_array_push(&cp.args,"--");1604argv_array_push(&cp.args,sha1_to_hex(our_tree));1605argv_array_push(&cp.args,sha1_to_hex(his_tree));16061607 status =run_command(&cp) ? (-1) :0;1608discard_cache();1609read_cache();1610return status;1611}16121613/**1614 * Attempt a threeway merge, using index_path as the temporary index.1615 */1616static intfall_back_threeway(const struct am_state *state,const char*index_path)1617{1618unsigned char orig_tree[GIT_SHA1_RAWSZ], his_tree[GIT_SHA1_RAWSZ],1619 our_tree[GIT_SHA1_RAWSZ];16201621if(get_sha1("HEAD", our_tree) <0)1622hashcpy(our_tree, EMPTY_TREE_SHA1_BIN);16231624if(build_fake_ancestor(state, index_path))1625returnerror("could not build fake ancestor");16261627discard_cache();1628read_cache_from(index_path);16291630if(write_index_as_tree(orig_tree, &the_index, index_path,0, NULL))1631returnerror(_("Repository lacks necessary blobs to fall back on 3-way merge."));16321633say(state, stdout,_("Using index info to reconstruct a base tree..."));16341635if(!state->quiet) {1636/*1637 * List paths that needed 3-way fallback, so that the user can1638 * review them with extra care to spot mismerges.1639 */1640struct rev_info rev_info;1641const char*diff_filter_str ="--diff-filter=AM";16421643init_revisions(&rev_info, NULL);1644 rev_info.diffopt.output_format = DIFF_FORMAT_NAME_STATUS;1645diff_opt_parse(&rev_info.diffopt, &diff_filter_str,1, rev_info.prefix);1646add_pending_sha1(&rev_info,"HEAD", our_tree,0);1647diff_setup_done(&rev_info.diffopt);1648run_diff_index(&rev_info,1);1649}16501651if(run_apply(state, index_path))1652returnerror(_("Did you hand edit your patch?\n"1653"It does not apply to blobs recorded in its index."));16541655if(write_index_as_tree(his_tree, &the_index, index_path,0, NULL))1656returnerror("could not write tree");16571658say(state, stdout,_("Falling back to patching base and 3-way merge..."));16591660discard_cache();1661read_cache();16621663/*1664 * This is not so wrong. Depending on which base we picked, orig_tree1665 * may be wildly different from ours, but his_tree has the same set of1666 * wildly different changes in parts the patch did not touch, so1667 * recursive ends up canceling them, saying that we reverted all those1668 * changes.1669 */16701671if(run_fallback_merge_recursive(state, orig_tree, our_tree, his_tree)) {1672rerere(state->allow_rerere_autoupdate);1673returnerror(_("Failed to merge in the changes."));1674}16751676return0;1677}16781679/**1680 * Commits the current index with state->msg as the commit message and1681 * state->author_name, state->author_email and state->author_date as the author1682 * information.1683 */1684static voiddo_commit(const struct am_state *state)1685{1686unsigned char tree[GIT_SHA1_RAWSZ], parent[GIT_SHA1_RAWSZ],1687 commit[GIT_SHA1_RAWSZ];1688unsigned char*ptr;1689struct commit_list *parents = NULL;1690const char*reflog_msg, *author;1691struct strbuf sb = STRBUF_INIT;16921693if(run_hook_le(NULL,"pre-applypatch", NULL))1694exit(1);16951696if(write_cache_as_tree(tree,0, NULL))1697die(_("git write-tree failed to write a tree"));16981699if(!get_sha1_commit("HEAD", parent)) {1700 ptr = parent;1701commit_list_insert(lookup_commit(parent), &parents);1702}else{1703 ptr = NULL;1704say(state, stderr,_("applying to an empty history"));1705}17061707 author =fmt_ident(state->author_name, state->author_email,1708 state->ignore_date ? NULL : state->author_date,1709 IDENT_STRICT);17101711if(state->committer_date_is_author_date)1712setenv("GIT_COMMITTER_DATE",1713 state->ignore_date ?"": state->author_date,1);17141715if(commit_tree(state->msg, state->msg_len, tree, parents, commit,1716 author, state->sign_commit))1717die(_("failed to write commit object"));17181719 reflog_msg =getenv("GIT_REFLOG_ACTION");1720if(!reflog_msg)1721 reflog_msg ="am";17221723strbuf_addf(&sb,"%s: %.*s", reflog_msg,linelen(state->msg),1724 state->msg);17251726update_ref(sb.buf,"HEAD", commit, ptr,0, UPDATE_REFS_DIE_ON_ERR);17271728if(state->rebasing) {1729FILE*fp =xfopen(am_path(state,"rewritten"),"a");17301731assert(!is_null_sha1(state->orig_commit));1732fprintf(fp,"%s",sha1_to_hex(state->orig_commit));1733fprintf(fp,"%s\n",sha1_to_hex(commit));1734fclose(fp);1735}17361737run_hook_le(NULL,"post-applypatch", NULL);17381739strbuf_release(&sb);1740}17411742/**1743 * Validates the am_state for resuming -- the "msg" and authorship fields must1744 * be filled up.1745 */1746static voidvalidate_resume_state(const struct am_state *state)1747{1748if(!state->msg)1749die(_("cannot resume:%sdoes not exist."),1750am_path(state,"final-commit"));17511752if(!state->author_name || !state->author_email || !state->author_date)1753die(_("cannot resume:%sdoes not exist."),1754am_path(state,"author-script"));1755}17561757/**1758 * Interactively prompt the user on whether the current patch should be1759 * applied.1760 *1761 * Returns 0 if the user chooses to apply the patch, 1 if the user chooses to1762 * skip it.1763 */1764static intdo_interactive(struct am_state *state)1765{1766assert(state->msg);17671768if(!isatty(0))1769die(_("cannot be interactive without stdin connected to a terminal."));17701771for(;;) {1772const char*reply;17731774puts(_("Commit Body is:"));1775puts("--------------------------");1776printf("%s", state->msg);1777puts("--------------------------");17781779/*1780 * TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]1781 * in your translation. The program will only accept English1782 * input at this point.1783 */1784 reply =git_prompt(_("Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "), PROMPT_ECHO);17851786if(!reply) {1787continue;1788}else if(*reply =='y'|| *reply =='Y') {1789return0;1790}else if(*reply =='a'|| *reply =='A') {1791 state->interactive =0;1792return0;1793}else if(*reply =='n'|| *reply =='N') {1794return1;1795}else if(*reply =='e'|| *reply =='E') {1796struct strbuf msg = STRBUF_INIT;17971798if(!launch_editor(am_path(state,"final-commit"), &msg, NULL)) {1799free(state->msg);1800 state->msg =strbuf_detach(&msg, &state->msg_len);1801}1802strbuf_release(&msg);1803}else if(*reply =='v'|| *reply =='V') {1804const char*pager =git_pager(1);1805struct child_process cp = CHILD_PROCESS_INIT;18061807if(!pager)1808 pager ="cat";1809prepare_pager_args(&cp, pager);1810argv_array_push(&cp.args,am_path(state,"patch"));1811run_command(&cp);1812}1813}1814}18151816/**1817 * Applies all queued mail.1818 *1819 * If `resume` is true, we are "resuming". The "msg" and authorship fields, as1820 * well as the state directory's "patch" file is used as-is for applying the1821 * patch and committing it.1822 */1823static voidam_run(struct am_state *state,int resume)1824{1825const char*argv_gc_auto[] = {"gc","--auto", NULL};1826struct strbuf sb = STRBUF_INIT;18271828unlink(am_path(state,"dirtyindex"));18291830refresh_and_write_cache();18311832if(index_has_changes(&sb)) {1833write_state_bool(state,"dirtyindex",1);1834die(_("Dirty index: cannot apply patches (dirty:%s)"), sb.buf);1835}18361837strbuf_release(&sb);18381839while(state->cur <= state->last) {1840const char*mail =am_path(state,msgnum(state));1841int apply_status;18421843if(!file_exists(mail))1844goto next;18451846if(resume) {1847validate_resume_state(state);1848}else{1849int skip;18501851if(state->rebasing)1852 skip =parse_mail_rebase(state, mail);1853else1854 skip =parse_mail(state, mail);18551856if(skip)1857goto next;/* mail should be skipped */18581859write_author_script(state);1860write_commit_msg(state);1861}18621863if(state->interactive &&do_interactive(state))1864goto next;18651866if(run_applypatch_msg_hook(state))1867exit(1);18681869say(state, stdout,_("Applying: %.*s"),linelen(state->msg), state->msg);18701871 apply_status =run_apply(state, NULL);18721873if(apply_status && state->threeway) {1874struct strbuf sb = STRBUF_INIT;18751876strbuf_addstr(&sb,am_path(state,"patch-merge-index"));1877 apply_status =fall_back_threeway(state, sb.buf);1878strbuf_release(&sb);18791880/*1881 * Applying the patch to an earlier tree and merging1882 * the result may have produced the same tree as ours.1883 */1884if(!apply_status && !index_has_changes(NULL)) {1885say(state, stdout,_("No changes -- Patch already applied."));1886goto next;1887}1888}18891890if(apply_status) {1891int advice_amworkdir =1;18921893printf_ln(_("Patch failed at%s%.*s"),msgnum(state),1894linelen(state->msg), state->msg);18951896git_config_get_bool("advice.amworkdir", &advice_amworkdir);18971898if(advice_amworkdir)1899printf_ln(_("The copy of the patch that failed is found in:%s"),1900am_path(state,"patch"));19011902die_user_resolve(state);1903}19041905do_commit(state);19061907next:1908am_next(state);19091910if(resume)1911am_load(state);1912 resume =0;1913}19141915if(!is_empty_file(am_path(state,"rewritten"))) {1916assert(state->rebasing);1917copy_notes_for_rebase(state);1918run_post_rewrite_hook(state);1919}19201921/*1922 * In rebasing mode, it's up to the caller to take care of1923 * housekeeping.1924 */1925if(!state->rebasing) {1926am_destroy(state);1927close_all_packs();1928run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);1929}1930}19311932/**1933 * Resume the current am session after patch application failure. The user did1934 * all the hard work, and we do not have to do any patch application. Just1935 * trust and commit what the user has in the index and working tree.1936 */1937static voidam_resolve(struct am_state *state)1938{1939validate_resume_state(state);19401941say(state, stdout,_("Applying: %.*s"),linelen(state->msg), state->msg);19421943if(!index_has_changes(NULL)) {1944printf_ln(_("No changes - did you forget to use 'git add'?\n"1945"If there is nothing left to stage, chances are that something else\n"1946"already introduced the same changes; you might want to skip this patch."));1947die_user_resolve(state);1948}19491950if(unmerged_cache()) {1951printf_ln(_("You still have unmerged paths in your index.\n"1952"Did you forget to use 'git add'?"));1953die_user_resolve(state);1954}19551956if(state->interactive) {1957write_index_patch(state);1958if(do_interactive(state))1959goto next;1960}19611962rerere(0);19631964do_commit(state);19651966next:1967am_next(state);1968am_load(state);1969am_run(state,0);1970}19711972/**1973 * Performs a checkout fast-forward from `head` to `remote`. If `reset` is1974 * true, any unmerged entries will be discarded. Returns 0 on success, -1 on1975 * failure.1976 */1977static intfast_forward_to(struct tree *head,struct tree *remote,int reset)1978{1979struct lock_file *lock_file;1980struct unpack_trees_options opts;1981struct tree_desc t[2];19821983if(parse_tree(head) ||parse_tree(remote))1984return-1;19851986 lock_file =xcalloc(1,sizeof(struct lock_file));1987hold_locked_index(lock_file,1);19881989refresh_cache(REFRESH_QUIET);19901991memset(&opts,0,sizeof(opts));1992 opts.head_idx =1;1993 opts.src_index = &the_index;1994 opts.dst_index = &the_index;1995 opts.update =1;1996 opts.merge =1;1997 opts.reset = reset;1998 opts.fn = twoway_merge;1999init_tree_desc(&t[0], head->buffer, head->size);2000init_tree_desc(&t[1], remote->buffer, remote->size);20012002if(unpack_trees(2, t, &opts)) {2003rollback_lock_file(lock_file);2004return-1;2005}20062007if(write_locked_index(&the_index, lock_file, COMMIT_LOCK))2008die(_("unable to write new index file"));20092010return0;2011}20122013/**2014 * Merges a tree into the index. The index's stat info will take precedence2015 * over the merged tree's. Returns 0 on success, -1 on failure.2016 */2017static intmerge_tree(struct tree *tree)2018{2019struct lock_file *lock_file;2020struct unpack_trees_options opts;2021struct tree_desc t[1];20222023if(parse_tree(tree))2024return-1;20252026 lock_file =xcalloc(1,sizeof(struct lock_file));2027hold_locked_index(lock_file,1);20282029memset(&opts,0,sizeof(opts));2030 opts.head_idx =1;2031 opts.src_index = &the_index;2032 opts.dst_index = &the_index;2033 opts.merge =1;2034 opts.fn = oneway_merge;2035init_tree_desc(&t[0], tree->buffer, tree->size);20362037if(unpack_trees(1, t, &opts)) {2038rollback_lock_file(lock_file);2039return-1;2040}20412042if(write_locked_index(&the_index, lock_file, COMMIT_LOCK))2043die(_("unable to write new index file"));20442045return0;2046}20472048/**2049 * Clean the index without touching entries that are not modified between2050 * `head` and `remote`.2051 */2052static intclean_index(const unsigned char*head,const unsigned char*remote)2053{2054struct tree *head_tree, *remote_tree, *index_tree;2055unsigned char index[GIT_SHA1_RAWSZ];20562057 head_tree =parse_tree_indirect(head);2058if(!head_tree)2059returnerror(_("Could not parse object '%s'."),sha1_to_hex(head));20602061 remote_tree =parse_tree_indirect(remote);2062if(!remote_tree)2063returnerror(_("Could not parse object '%s'."),sha1_to_hex(remote));20642065read_cache_unmerged();20662067if(fast_forward_to(head_tree, head_tree,1))2068return-1;20692070if(write_cache_as_tree(index,0, NULL))2071return-1;20722073 index_tree =parse_tree_indirect(index);2074if(!index_tree)2075returnerror(_("Could not parse object '%s'."),sha1_to_hex(index));20762077if(fast_forward_to(index_tree, remote_tree,0))2078return-1;20792080if(merge_tree(remote_tree))2081return-1;20822083remove_branch_state();20842085return0;2086}20872088/**2089 * Resets rerere's merge resolution metadata.2090 */2091static voidam_rerere_clear(void)2092{2093struct string_list merge_rr = STRING_LIST_INIT_DUP;2094rerere_clear(&merge_rr);2095string_list_clear(&merge_rr,1);2096}20972098/**2099 * Resume the current am session by skipping the current patch.2100 */2101static voidam_skip(struct am_state *state)2102{2103unsigned char head[GIT_SHA1_RAWSZ];21042105am_rerere_clear();21062107if(get_sha1("HEAD", head))2108hashcpy(head, EMPTY_TREE_SHA1_BIN);21092110if(clean_index(head, head))2111die(_("failed to clean index"));21122113am_next(state);2114am_load(state);2115am_run(state,0);2116}21172118/**2119 * Returns true if it is safe to reset HEAD to the ORIG_HEAD, false otherwise.2120 *2121 * It is not safe to reset HEAD when:2122 * 1. git-am previously failed because the index was dirty.2123 * 2. HEAD has moved since git-am previously failed.2124 */2125static intsafe_to_abort(const struct am_state *state)2126{2127struct strbuf sb = STRBUF_INIT;2128unsigned char abort_safety[GIT_SHA1_RAWSZ], head[GIT_SHA1_RAWSZ];21292130if(file_exists(am_path(state,"dirtyindex")))2131return0;21322133if(read_state_file(&sb, state,"abort-safety",1) >0) {2134if(get_sha1_hex(sb.buf, abort_safety))2135die(_("could not parse%s"),am_path(state,"abort_safety"));2136}else2137hashclr(abort_safety);21382139if(get_sha1("HEAD", head))2140hashclr(head);21412142if(!hashcmp(head, abort_safety))2143return1;21442145error(_("You seem to have moved HEAD since the last 'am' failure.\n"2146"Not rewinding to ORIG_HEAD"));21472148return0;2149}21502151/**2152 * Aborts the current am session if it is safe to do so.2153 */2154static voidam_abort(struct am_state *state)2155{2156unsigned char curr_head[GIT_SHA1_RAWSZ], orig_head[GIT_SHA1_RAWSZ];2157int has_curr_head, has_orig_head;2158char*curr_branch;21592160if(!safe_to_abort(state)) {2161am_destroy(state);2162return;2163}21642165am_rerere_clear();21662167 curr_branch =resolve_refdup("HEAD",0, curr_head, NULL);2168 has_curr_head = !is_null_sha1(curr_head);2169if(!has_curr_head)2170hashcpy(curr_head, EMPTY_TREE_SHA1_BIN);21712172 has_orig_head = !get_sha1("ORIG_HEAD", orig_head);2173if(!has_orig_head)2174hashcpy(orig_head, EMPTY_TREE_SHA1_BIN);21752176clean_index(curr_head, orig_head);21772178if(has_orig_head)2179update_ref("am --abort","HEAD", orig_head,2180 has_curr_head ? curr_head : NULL,0,2181 UPDATE_REFS_DIE_ON_ERR);2182else if(curr_branch)2183delete_ref(curr_branch, NULL, REF_NODEREF);21842185free(curr_branch);2186am_destroy(state);2187}21882189/**2190 * parse_options() callback that validates and sets opt->value to the2191 * PATCH_FORMAT_* enum value corresponding to `arg`.2192 */2193static intparse_opt_patchformat(const struct option *opt,const char*arg,int unset)2194{2195int*opt_value = opt->value;21962197if(!strcmp(arg,"mbox"))2198*opt_value = PATCH_FORMAT_MBOX;2199else if(!strcmp(arg,"stgit"))2200*opt_value = PATCH_FORMAT_STGIT;2201else if(!strcmp(arg,"stgit-series"))2202*opt_value = PATCH_FORMAT_STGIT_SERIES;2203else if(!strcmp(arg,"hg"))2204*opt_value = PATCH_FORMAT_HG;2205else2206returnerror(_("Invalid value for --patch-format:%s"), arg);2207return0;2208}22092210enum resume_mode {2211 RESUME_FALSE =0,2212 RESUME_APPLY,2213 RESUME_RESOLVED,2214 RESUME_SKIP,2215 RESUME_ABORT2216};22172218static intgit_am_config(const char*k,const char*v,void*cb)2219{2220int status;22212222 status =git_gpg_config(k, v, NULL);2223if(status)2224return status;22252226returngit_default_config(k, v, NULL);2227}22282229intcmd_am(int argc,const char**argv,const char*prefix)2230{2231struct am_state state;2232int binary = -1;2233int keep_cr = -1;2234int patch_format = PATCH_FORMAT_UNKNOWN;2235enum resume_mode resume = RESUME_FALSE;2236int in_progress;22372238const char*const usage[] = {2239N_("git am [<options>] [(<mbox>|<Maildir>)...]"),2240N_("git am [<options>] (--continue | --skip | --abort)"),2241 NULL2242};22432244struct option options[] = {2245OPT_BOOL('i',"interactive", &state.interactive,2246N_("run interactively")),2247OPT_HIDDEN_BOOL('b',"binary", &binary,2248N_("historical option -- no-op")),2249OPT_BOOL('3',"3way", &state.threeway,2250N_("allow fall back on 3way merging if needed")),2251OPT__QUIET(&state.quiet,N_("be quiet")),2252OPT_SET_INT('s',"signoff", &state.signoff,2253N_("add a Signed-off-by line to the commit message"),2254 SIGNOFF_EXPLICIT),2255OPT_BOOL('u',"utf8", &state.utf8,2256N_("recode into utf8 (default)")),2257OPT_SET_INT('k',"keep", &state.keep,2258N_("pass -k flag to git-mailinfo"), KEEP_TRUE),2259OPT_SET_INT(0,"keep-non-patch", &state.keep,2260N_("pass -b flag to git-mailinfo"), KEEP_NON_PATCH),2261OPT_BOOL('m',"message-id", &state.message_id,2262N_("pass -m flag to git-mailinfo")),2263{ OPTION_SET_INT,0,"keep-cr", &keep_cr, NULL,2264N_("pass --keep-cr flag to git-mailsplit for mbox format"),2265 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL,1},2266{ OPTION_SET_INT,0,"no-keep-cr", &keep_cr, NULL,2267N_("do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"),2268 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL,0},2269OPT_BOOL('c',"scissors", &state.scissors,2270N_("strip everything before a scissors line")),2271OPT_PASSTHRU_ARGV(0,"whitespace", &state.git_apply_opts,N_("action"),2272N_("pass it through git-apply"),22730),2274OPT_PASSTHRU_ARGV(0,"ignore-space-change", &state.git_apply_opts, NULL,2275N_("pass it through git-apply"),2276 PARSE_OPT_NOARG),2277OPT_PASSTHRU_ARGV(0,"ignore-whitespace", &state.git_apply_opts, NULL,2278N_("pass it through git-apply"),2279 PARSE_OPT_NOARG),2280OPT_PASSTHRU_ARGV(0,"directory", &state.git_apply_opts,N_("root"),2281N_("pass it through git-apply"),22820),2283OPT_PASSTHRU_ARGV(0,"exclude", &state.git_apply_opts,N_("path"),2284N_("pass it through git-apply"),22850),2286OPT_PASSTHRU_ARGV(0,"include", &state.git_apply_opts,N_("path"),2287N_("pass it through git-apply"),22880),2289OPT_PASSTHRU_ARGV('C', NULL, &state.git_apply_opts,N_("n"),2290N_("pass it through git-apply"),22910),2292OPT_PASSTHRU_ARGV('p', NULL, &state.git_apply_opts,N_("num"),2293N_("pass it through git-apply"),22940),2295OPT_CALLBACK(0,"patch-format", &patch_format,N_("format"),2296N_("format the patch(es) are in"),2297 parse_opt_patchformat),2298OPT_PASSTHRU_ARGV(0,"reject", &state.git_apply_opts, NULL,2299N_("pass it through git-apply"),2300 PARSE_OPT_NOARG),2301OPT_STRING(0,"resolvemsg", &state.resolvemsg, NULL,2302N_("override error message when patch failure occurs")),2303OPT_CMDMODE(0,"continue", &resume,2304N_("continue applying patches after resolving a conflict"),2305 RESUME_RESOLVED),2306OPT_CMDMODE('r',"resolved", &resume,2307N_("synonyms for --continue"),2308 RESUME_RESOLVED),2309OPT_CMDMODE(0,"skip", &resume,2310N_("skip the current patch"),2311 RESUME_SKIP),2312OPT_CMDMODE(0,"abort", &resume,2313N_("restore the original branch and abort the patching operation."),2314 RESUME_ABORT),2315OPT_BOOL(0,"committer-date-is-author-date",2316&state.committer_date_is_author_date,2317N_("lie about committer date")),2318OPT_BOOL(0,"ignore-date", &state.ignore_date,2319N_("use current timestamp for author date")),2320OPT_RERERE_AUTOUPDATE(&state.allow_rerere_autoupdate),2321{ OPTION_STRING,'S',"gpg-sign", &state.sign_commit,N_("key-id"),2322N_("GPG-sign commits"),2323 PARSE_OPT_OPTARG, NULL, (intptr_t)""},2324OPT_HIDDEN_BOOL(0,"rebasing", &state.rebasing,2325N_("(internal use for git-rebase)")),2326OPT_END()2327};23282329git_config(git_am_config, NULL);23302331am_state_init(&state,git_path("rebase-apply"));23322333 in_progress =am_in_progress(&state);2334if(in_progress)2335am_load(&state);23362337 argc =parse_options(argc, argv, prefix, options, usage,0);23382339if(binary >=0)2340fprintf_ln(stderr,_("The -b/--binary option has been a no-op for long time, and\n"2341"it will be removed. Please do not use it anymore."));23422343/* Ensure a valid committer ident can be constructed */2344git_committer_info(IDENT_STRICT);23452346if(read_index_preload(&the_index, NULL) <0)2347die(_("failed to read the index"));23482349if(in_progress) {2350/*2351 * Catch user error to feed us patches when there is a session2352 * in progress:2353 *2354 * 1. mbox path(s) are provided on the command-line.2355 * 2. stdin is not a tty: the user is trying to feed us a patch2356 * from standard input. This is somewhat unreliable -- stdin2357 * could be /dev/null for example and the caller did not2358 * intend to feed us a patch but wanted to continue2359 * unattended.2360 */2361if(argc || (resume == RESUME_FALSE && !isatty(0)))2362die(_("previous rebase directory%sstill exists but mbox given."),2363 state.dir);23642365if(resume == RESUME_FALSE)2366 resume = RESUME_APPLY;23672368if(state.signoff == SIGNOFF_EXPLICIT)2369am_append_signoff(&state);2370}else{2371struct argv_array paths = ARGV_ARRAY_INIT;2372int i;23732374/*2375 * Handle stray state directory in the independent-run case. In2376 * the --rebasing case, it is up to the caller to take care of2377 * stray directories.2378 */2379if(file_exists(state.dir) && !state.rebasing) {2380if(resume == RESUME_ABORT) {2381am_destroy(&state);2382am_state_release(&state);2383return0;2384}23852386die(_("Stray%sdirectory found.\n"2387"Use\"git am --abort\"to remove it."),2388 state.dir);2389}23902391if(resume)2392die(_("Resolve operation not in progress, we are not resuming."));23932394for(i =0; i < argc; i++) {2395if(is_absolute_path(argv[i]) || !prefix)2396argv_array_push(&paths, argv[i]);2397else2398argv_array_push(&paths,mkpath("%s/%s", prefix, argv[i]));2399}24002401am_setup(&state, patch_format, paths.argv, keep_cr);24022403argv_array_clear(&paths);2404}24052406switch(resume) {2407case RESUME_FALSE:2408am_run(&state,0);2409break;2410case RESUME_APPLY:2411am_run(&state,1);2412break;2413case RESUME_RESOLVED:2414am_resolve(&state);2415break;2416case RESUME_SKIP:2417am_skip(&state);2418break;2419case RESUME_ABORT:2420am_abort(&state);2421break;2422default:2423die("BUG: invalid resume value");2424}24252426am_state_release(&state);24272428return0;2429}