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. 138 */ 139static voidam_state_init(struct am_state *state) 140{ 141int gpgsign; 142 143memset(state,0,sizeof(*state)); 144 145 state->dir =git_pathdup("rebase-apply"); 146 147 state->prec =4; 148 149git_config_get_bool("am.threeway", &state->threeway); 150 151 state->utf8 =1; 152 153git_config_get_bool("am.messageid", &state->message_id); 154 155 state->scissors = SCISSORS_UNSET; 156 157argv_array_init(&state->git_apply_opts); 158 159if(!git_config_get_bool("commit.gpgsign", &gpgsign)) 160 state->sign_commit = gpgsign ?"": NULL; 161} 162 163/** 164 * Releases memory allocated by an am_state. 165 */ 166static voidam_state_release(struct am_state *state) 167{ 168free(state->dir); 169free(state->author_name); 170free(state->author_email); 171free(state->author_date); 172free(state->msg); 173argv_array_clear(&state->git_apply_opts); 174} 175 176/** 177 * Returns path relative to the am_state directory. 178 */ 179staticinlineconst char*am_path(const struct am_state *state,const char*path) 180{ 181returnmkpath("%s/%s", state->dir, path); 182} 183 184/** 185 * For convenience to call write_file() 186 */ 187static voidwrite_state_text(const struct am_state *state, 188const char*name,const char*string) 189{ 190write_file(am_path(state, name),"%s", string); 191} 192 193static voidwrite_state_count(const struct am_state *state, 194const char*name,int value) 195{ 196write_file(am_path(state, name),"%d", value); 197} 198 199static voidwrite_state_bool(const struct am_state *state, 200const char*name,int value) 201{ 202write_state_text(state, name, value ?"t":"f"); 203} 204 205/** 206 * If state->quiet is false, calls fprintf(fp, fmt, ...), and appends a newline 207 * at the end. 208 */ 209static voidsay(const struct am_state *state,FILE*fp,const char*fmt, ...) 210{ 211va_list ap; 212 213va_start(ap, fmt); 214if(!state->quiet) { 215vfprintf(fp, fmt, ap); 216putc('\n', fp); 217} 218va_end(ap); 219} 220 221/** 222 * Returns 1 if there is an am session in progress, 0 otherwise. 223 */ 224static intam_in_progress(const struct am_state *state) 225{ 226struct stat st; 227 228if(lstat(state->dir, &st) <0|| !S_ISDIR(st.st_mode)) 229return0; 230if(lstat(am_path(state,"last"), &st) || !S_ISREG(st.st_mode)) 231return0; 232if(lstat(am_path(state,"next"), &st) || !S_ISREG(st.st_mode)) 233return0; 234return1; 235} 236 237/** 238 * Reads the contents of `file` in the `state` directory into `sb`. Returns the 239 * number of bytes read on success, -1 if the file does not exist. If `trim` is 240 * set, trailing whitespace will be removed. 241 */ 242static intread_state_file(struct strbuf *sb,const struct am_state *state, 243const char*file,int trim) 244{ 245strbuf_reset(sb); 246 247if(strbuf_read_file(sb,am_path(state, file),0) >=0) { 248if(trim) 249strbuf_trim(sb); 250 251return sb->len; 252} 253 254if(errno == ENOENT) 255return-1; 256 257die_errno(_("could not read '%s'"),am_path(state, file)); 258} 259 260/** 261 * Take a series of KEY='VALUE' lines where VALUE part is 262 * sq-quoted, and append <KEY, VALUE> at the end of the string list 263 */ 264static intparse_key_value_squoted(char*buf,struct string_list *list) 265{ 266while(*buf) { 267struct string_list_item *item; 268char*np; 269char*cp =strchr(buf,'='); 270if(!cp) 271return-1; 272 np =strchrnul(cp,'\n'); 273*cp++ ='\0'; 274 item =string_list_append(list, buf); 275 276 buf = np + (*np =='\n'); 277*np ='\0'; 278 cp =sq_dequote(cp); 279if(!cp) 280return-1; 281 item->util =xstrdup(cp); 282} 283return0; 284} 285 286/** 287 * Reads and parses the state directory's "author-script" file, and sets 288 * state->author_name, state->author_email and state->author_date accordingly. 289 * Returns 0 on success, -1 if the file could not be parsed. 290 * 291 * The author script is of the format: 292 * 293 * GIT_AUTHOR_NAME='$author_name' 294 * GIT_AUTHOR_EMAIL='$author_email' 295 * GIT_AUTHOR_DATE='$author_date' 296 * 297 * where $author_name, $author_email and $author_date are quoted. We are strict 298 * with our parsing, as the file was meant to be eval'd in the old git-am.sh 299 * script, and thus if the file differs from what this function expects, it is 300 * better to bail out than to do something that the user does not expect. 301 */ 302static intread_author_script(struct am_state *state) 303{ 304const char*filename =am_path(state,"author-script"); 305struct strbuf buf = STRBUF_INIT; 306struct string_list kv = STRING_LIST_INIT_DUP; 307int retval = -1;/* assume failure */ 308int fd; 309 310assert(!state->author_name); 311assert(!state->author_email); 312assert(!state->author_date); 313 314 fd =open(filename, O_RDONLY); 315if(fd <0) { 316if(errno == ENOENT) 317return0; 318die_errno(_("could not open '%s' for reading"), filename); 319} 320strbuf_read(&buf, fd,0); 321close(fd); 322if(parse_key_value_squoted(buf.buf, &kv)) 323goto finish; 324 325if(kv.nr !=3|| 326strcmp(kv.items[0].string,"GIT_AUTHOR_NAME") || 327strcmp(kv.items[1].string,"GIT_AUTHOR_EMAIL") || 328strcmp(kv.items[2].string,"GIT_AUTHOR_DATE")) 329goto finish; 330 state->author_name = kv.items[0].util; 331 state->author_email = kv.items[1].util; 332 state->author_date = kv.items[2].util; 333 retval =0; 334finish: 335string_list_clear(&kv, !!retval); 336strbuf_release(&buf); 337return retval; 338} 339 340/** 341 * Saves state->author_name, state->author_email and state->author_date in the 342 * state directory's "author-script" file. 343 */ 344static voidwrite_author_script(const struct am_state *state) 345{ 346struct strbuf sb = STRBUF_INIT; 347 348strbuf_addstr(&sb,"GIT_AUTHOR_NAME="); 349sq_quote_buf(&sb, state->author_name); 350strbuf_addch(&sb,'\n'); 351 352strbuf_addstr(&sb,"GIT_AUTHOR_EMAIL="); 353sq_quote_buf(&sb, state->author_email); 354strbuf_addch(&sb,'\n'); 355 356strbuf_addstr(&sb,"GIT_AUTHOR_DATE="); 357sq_quote_buf(&sb, state->author_date); 358strbuf_addch(&sb,'\n'); 359 360write_state_text(state,"author-script", sb.buf); 361 362strbuf_release(&sb); 363} 364 365/** 366 * Reads the commit message from the state directory's "final-commit" file, 367 * setting state->msg to its contents and state->msg_len to the length of its 368 * contents in bytes. 369 * 370 * Returns 0 on success, -1 if the file does not exist. 371 */ 372static intread_commit_msg(struct am_state *state) 373{ 374struct strbuf sb = STRBUF_INIT; 375 376assert(!state->msg); 377 378if(read_state_file(&sb, state,"final-commit",0) <0) { 379strbuf_release(&sb); 380return-1; 381} 382 383 state->msg =strbuf_detach(&sb, &state->msg_len); 384return0; 385} 386 387/** 388 * Saves state->msg in the state directory's "final-commit" file. 389 */ 390static voidwrite_commit_msg(const struct am_state *state) 391{ 392const char*filename =am_path(state,"final-commit"); 393write_file_buf(filename, state->msg, state->msg_len); 394} 395 396/** 397 * Loads state from disk. 398 */ 399static voidam_load(struct am_state *state) 400{ 401struct strbuf sb = STRBUF_INIT; 402 403if(read_state_file(&sb, state,"next",1) <0) 404die("BUG: state file 'next' does not exist"); 405 state->cur =strtol(sb.buf, NULL,10); 406 407if(read_state_file(&sb, state,"last",1) <0) 408die("BUG: state file 'last' does not exist"); 409 state->last =strtol(sb.buf, NULL,10); 410 411if(read_author_script(state) <0) 412die(_("could not parse author script")); 413 414read_commit_msg(state); 415 416if(read_state_file(&sb, state,"original-commit",1) <0) 417oidclr(&state->orig_commit); 418else if(get_oid_hex(sb.buf, &state->orig_commit) <0) 419die(_("could not parse%s"),am_path(state,"original-commit")); 420 421read_state_file(&sb, state,"threeway",1); 422 state->threeway = !strcmp(sb.buf,"t"); 423 424read_state_file(&sb, state,"quiet",1); 425 state->quiet = !strcmp(sb.buf,"t"); 426 427read_state_file(&sb, state,"sign",1); 428 state->signoff = !strcmp(sb.buf,"t"); 429 430read_state_file(&sb, state,"utf8",1); 431 state->utf8 = !strcmp(sb.buf,"t"); 432 433read_state_file(&sb, state,"keep",1); 434if(!strcmp(sb.buf,"t")) 435 state->keep = KEEP_TRUE; 436else if(!strcmp(sb.buf,"b")) 437 state->keep = KEEP_NON_PATCH; 438else 439 state->keep = KEEP_FALSE; 440 441read_state_file(&sb, state,"messageid",1); 442 state->message_id = !strcmp(sb.buf,"t"); 443 444read_state_file(&sb, state,"scissors",1); 445if(!strcmp(sb.buf,"t")) 446 state->scissors = SCISSORS_TRUE; 447else if(!strcmp(sb.buf,"f")) 448 state->scissors = SCISSORS_FALSE; 449else 450 state->scissors = SCISSORS_UNSET; 451 452read_state_file(&sb, state,"apply-opt",1); 453argv_array_clear(&state->git_apply_opts); 454if(sq_dequote_to_argv_array(sb.buf, &state->git_apply_opts) <0) 455die(_("could not parse%s"),am_path(state,"apply-opt")); 456 457 state->rebasing = !!file_exists(am_path(state,"rebasing")); 458 459strbuf_release(&sb); 460} 461 462/** 463 * Removes the am_state directory, forcefully terminating the current am 464 * session. 465 */ 466static voidam_destroy(const struct am_state *state) 467{ 468struct strbuf sb = STRBUF_INIT; 469 470strbuf_addstr(&sb, state->dir); 471remove_dir_recursively(&sb,0); 472strbuf_release(&sb); 473} 474 475/** 476 * Runs applypatch-msg hook. Returns its exit code. 477 */ 478static intrun_applypatch_msg_hook(struct am_state *state) 479{ 480int ret; 481 482assert(state->msg); 483 ret =run_hook_le(NULL,"applypatch-msg",am_path(state,"final-commit"), NULL); 484 485if(!ret) { 486free(state->msg); 487 state->msg = NULL; 488if(read_commit_msg(state) <0) 489die(_("'%s' was deleted by the applypatch-msg hook"), 490am_path(state,"final-commit")); 491} 492 493return ret; 494} 495 496/** 497 * Runs post-rewrite hook. Returns it exit code. 498 */ 499static intrun_post_rewrite_hook(const struct am_state *state) 500{ 501struct child_process cp = CHILD_PROCESS_INIT; 502const char*hook =find_hook("post-rewrite"); 503int ret; 504 505if(!hook) 506return0; 507 508argv_array_push(&cp.args, hook); 509argv_array_push(&cp.args,"rebase"); 510 511 cp.in =xopen(am_path(state,"rewritten"), O_RDONLY); 512 cp.stdout_to_stderr =1; 513 514 ret =run_command(&cp); 515 516close(cp.in); 517return ret; 518} 519 520/** 521 * Reads the state directory's "rewritten" file, and copies notes from the old 522 * commits listed in the file to their rewritten commits. 523 * 524 * Returns 0 on success, -1 on failure. 525 */ 526static intcopy_notes_for_rebase(const struct am_state *state) 527{ 528struct notes_rewrite_cfg *c; 529struct strbuf sb = STRBUF_INIT; 530const char*invalid_line =_("Malformed input line: '%s'."); 531const char*msg ="Notes added by 'git rebase'"; 532FILE*fp; 533int ret =0; 534 535assert(state->rebasing); 536 537 c =init_copy_notes_for_rewrite("rebase"); 538if(!c) 539return0; 540 541 fp =xfopen(am_path(state,"rewritten"),"r"); 542 543while(!strbuf_getline_lf(&sb, fp)) { 544struct object_id from_obj, to_obj; 545 546if(sb.len != GIT_SHA1_HEXSZ *2+1) { 547 ret =error(invalid_line, sb.buf); 548goto finish; 549} 550 551if(get_oid_hex(sb.buf, &from_obj)) { 552 ret =error(invalid_line, sb.buf); 553goto finish; 554} 555 556if(sb.buf[GIT_SHA1_HEXSZ] !=' ') { 557 ret =error(invalid_line, sb.buf); 558goto finish; 559} 560 561if(get_oid_hex(sb.buf + GIT_SHA1_HEXSZ +1, &to_obj)) { 562 ret =error(invalid_line, sb.buf); 563goto finish; 564} 565 566if(copy_note_for_rewrite(c, from_obj.hash, to_obj.hash)) 567 ret =error(_("Failed to copy notes from '%s' to '%s'"), 568oid_to_hex(&from_obj),oid_to_hex(&to_obj)); 569} 570 571finish: 572finish_copy_notes_for_rewrite(c, msg); 573fclose(fp); 574strbuf_release(&sb); 575return ret; 576} 577 578/** 579 * Determines if the file looks like a piece of RFC2822 mail by grabbing all 580 * non-indented lines and checking if they look like they begin with valid 581 * header field names. 582 * 583 * Returns 1 if the file looks like a piece of mail, 0 otherwise. 584 */ 585static intis_mail(FILE*fp) 586{ 587const char*header_regex ="^[!-9;-~]+:"; 588struct strbuf sb = STRBUF_INIT; 589 regex_t regex; 590int ret =1; 591 592if(fseek(fp,0L, SEEK_SET)) 593die_errno(_("fseek failed")); 594 595if(regcomp(®ex, header_regex, REG_NOSUB | REG_EXTENDED)) 596die("invalid pattern:%s", header_regex); 597 598while(!strbuf_getline(&sb, fp)) { 599if(!sb.len) 600break;/* End of header */ 601 602/* Ignore indented folded lines */ 603if(*sb.buf =='\t'|| *sb.buf ==' ') 604continue; 605 606/* It's a header if it matches header_regex */ 607if(regexec(®ex, sb.buf,0, NULL,0)) { 608 ret =0; 609goto done; 610} 611} 612 613done: 614regfree(®ex); 615strbuf_release(&sb); 616return ret; 617} 618 619/** 620 * Attempts to detect the patch_format of the patches contained in `paths`, 621 * returning the PATCH_FORMAT_* enum value. Returns PATCH_FORMAT_UNKNOWN if 622 * detection fails. 623 */ 624static intdetect_patch_format(const char**paths) 625{ 626enum patch_format ret = PATCH_FORMAT_UNKNOWN; 627struct strbuf l1 = STRBUF_INIT; 628struct strbuf l2 = STRBUF_INIT; 629struct strbuf l3 = STRBUF_INIT; 630FILE*fp; 631 632/* 633 * We default to mbox format if input is from stdin and for directories 634 */ 635if(!*paths || !strcmp(*paths,"-") ||is_directory(*paths)) 636return PATCH_FORMAT_MBOX; 637 638/* 639 * Otherwise, check the first few lines of the first patch, starting 640 * from the first non-blank line, to try to detect its format. 641 */ 642 643 fp =xfopen(*paths,"r"); 644 645while(!strbuf_getline(&l1, fp)) { 646if(l1.len) 647break; 648} 649 650if(starts_with(l1.buf,"From ") ||starts_with(l1.buf,"From: ")) { 651 ret = PATCH_FORMAT_MBOX; 652goto done; 653} 654 655if(starts_with(l1.buf,"# This series applies on GIT commit")) { 656 ret = PATCH_FORMAT_STGIT_SERIES; 657goto done; 658} 659 660if(!strcmp(l1.buf,"# HG changeset patch")) { 661 ret = PATCH_FORMAT_HG; 662goto done; 663} 664 665strbuf_reset(&l2); 666strbuf_getline(&l2, fp); 667strbuf_reset(&l3); 668strbuf_getline(&l3, fp); 669 670/* 671 * If the second line is empty and the third is a From, Author or Date 672 * entry, this is likely an StGit patch. 673 */ 674if(l1.len && !l2.len && 675(starts_with(l3.buf,"From:") || 676starts_with(l3.buf,"Author:") || 677starts_with(l3.buf,"Date:"))) { 678 ret = PATCH_FORMAT_STGIT; 679goto done; 680} 681 682if(l1.len &&is_mail(fp)) { 683 ret = PATCH_FORMAT_MBOX; 684goto done; 685} 686 687done: 688fclose(fp); 689strbuf_release(&l1); 690return ret; 691} 692 693/** 694 * Splits out individual email patches from `paths`, where each path is either 695 * a mbox file or a Maildir. Returns 0 on success, -1 on failure. 696 */ 697static intsplit_mail_mbox(struct am_state *state,const char**paths, 698int keep_cr,int mboxrd) 699{ 700struct child_process cp = CHILD_PROCESS_INIT; 701struct strbuf last = STRBUF_INIT; 702 703 cp.git_cmd =1; 704argv_array_push(&cp.args,"mailsplit"); 705argv_array_pushf(&cp.args,"-d%d", state->prec); 706argv_array_pushf(&cp.args,"-o%s", state->dir); 707argv_array_push(&cp.args,"-b"); 708if(keep_cr) 709argv_array_push(&cp.args,"--keep-cr"); 710if(mboxrd) 711argv_array_push(&cp.args,"--mboxrd"); 712argv_array_push(&cp.args,"--"); 713argv_array_pushv(&cp.args, paths); 714 715if(capture_command(&cp, &last,8)) 716return-1; 717 718 state->cur =1; 719 state->last =strtol(last.buf, NULL,10); 720 721return0; 722} 723 724/** 725 * Callback signature for split_mail_conv(). The foreign patch should be 726 * read from `in`, and the converted patch (in RFC2822 mail format) should be 727 * written to `out`. Return 0 on success, or -1 on failure. 728 */ 729typedefint(*mail_conv_fn)(FILE*out,FILE*in,int keep_cr); 730 731/** 732 * Calls `fn` for each file in `paths` to convert the foreign patch to the 733 * RFC2822 mail format suitable for parsing with git-mailinfo. 734 * 735 * Returns 0 on success, -1 on failure. 736 */ 737static intsplit_mail_conv(mail_conv_fn fn,struct am_state *state, 738const char**paths,int keep_cr) 739{ 740static const char*stdin_only[] = {"-", NULL}; 741int i; 742 743if(!*paths) 744 paths = stdin_only; 745 746for(i =0; *paths; paths++, i++) { 747FILE*in, *out; 748const char*mail; 749int ret; 750 751if(!strcmp(*paths,"-")) 752 in = stdin; 753else 754 in =fopen(*paths,"r"); 755 756if(!in) 757returnerror_errno(_("could not open '%s' for reading"), 758*paths); 759 760 mail =mkpath("%s/%0*d", state->dir, state->prec, i +1); 761 762 out =fopen(mail,"w"); 763if(!out) { 764if(in != stdin) 765fclose(in); 766returnerror_errno(_("could not open '%s' for writing"), 767 mail); 768} 769 770 ret =fn(out, in, keep_cr); 771 772fclose(out); 773if(in != stdin) 774fclose(in); 775 776if(ret) 777returnerror(_("could not parse patch '%s'"), *paths); 778} 779 780 state->cur =1; 781 state->last = i; 782return0; 783} 784 785/** 786 * A split_mail_conv() callback that converts an StGit patch to an RFC2822 787 * message suitable for parsing with git-mailinfo. 788 */ 789static intstgit_patch_to_mail(FILE*out,FILE*in,int keep_cr) 790{ 791struct strbuf sb = STRBUF_INIT; 792int subject_printed =0; 793 794while(!strbuf_getline_lf(&sb, in)) { 795const char*str; 796 797if(str_isspace(sb.buf)) 798continue; 799else if(skip_prefix(sb.buf,"Author:", &str)) 800fprintf(out,"From:%s\n", str); 801else if(starts_with(sb.buf,"From") ||starts_with(sb.buf,"Date")) 802fprintf(out,"%s\n", sb.buf); 803else if(!subject_printed) { 804fprintf(out,"Subject:%s\n", sb.buf); 805 subject_printed =1; 806}else{ 807fprintf(out,"\n%s\n", sb.buf); 808break; 809} 810} 811 812strbuf_reset(&sb); 813while(strbuf_fread(&sb,8192, in) >0) { 814fwrite(sb.buf,1, sb.len, out); 815strbuf_reset(&sb); 816} 817 818strbuf_release(&sb); 819return0; 820} 821 822/** 823 * This function only supports a single StGit series file in `paths`. 824 * 825 * Given an StGit series file, converts the StGit patches in the series into 826 * RFC2822 messages suitable for parsing with git-mailinfo, and queues them in 827 * the state directory. 828 * 829 * Returns 0 on success, -1 on failure. 830 */ 831static intsplit_mail_stgit_series(struct am_state *state,const char**paths, 832int keep_cr) 833{ 834const char*series_dir; 835char*series_dir_buf; 836FILE*fp; 837struct argv_array patches = ARGV_ARRAY_INIT; 838struct strbuf sb = STRBUF_INIT; 839int ret; 840 841if(!paths[0] || paths[1]) 842returnerror(_("Only one StGIT patch series can be applied at once")); 843 844 series_dir_buf =xstrdup(*paths); 845 series_dir =dirname(series_dir_buf); 846 847 fp =fopen(*paths,"r"); 848if(!fp) 849returnerror_errno(_("could not open '%s' for reading"), *paths); 850 851while(!strbuf_getline_lf(&sb, fp)) { 852if(*sb.buf =='#') 853continue;/* skip comment lines */ 854 855argv_array_push(&patches,mkpath("%s/%s", series_dir, sb.buf)); 856} 857 858fclose(fp); 859strbuf_release(&sb); 860free(series_dir_buf); 861 862 ret =split_mail_conv(stgit_patch_to_mail, state, patches.argv, keep_cr); 863 864argv_array_clear(&patches); 865return ret; 866} 867 868/** 869 * A split_patches_conv() callback that converts a mercurial patch to a RFC2822 870 * message suitable for parsing with git-mailinfo. 871 */ 872static inthg_patch_to_mail(FILE*out,FILE*in,int keep_cr) 873{ 874struct strbuf sb = STRBUF_INIT; 875 876while(!strbuf_getline_lf(&sb, in)) { 877const char*str; 878 879if(skip_prefix(sb.buf,"# User ", &str)) 880fprintf(out,"From:%s\n", str); 881else if(skip_prefix(sb.buf,"# Date ", &str)) { 882unsigned long timestamp; 883long tz, tz2; 884char*end; 885 886 errno =0; 887 timestamp =strtoul(str, &end,10); 888if(errno) 889returnerror(_("invalid timestamp")); 890 891if(!skip_prefix(end," ", &str)) 892returnerror(_("invalid Date line")); 893 894 errno =0; 895 tz =strtol(str, &end,10); 896if(errno) 897returnerror(_("invalid timezone offset")); 898 899if(*end) 900returnerror(_("invalid Date line")); 901 902/* 903 * mercurial's timezone is in seconds west of UTC, 904 * however git's timezone is in hours + minutes east of 905 * UTC. Convert it. 906 */ 907 tz2 =labs(tz) /3600*100+labs(tz) %3600/60; 908if(tz >0) 909 tz2 = -tz2; 910 911fprintf(out,"Date:%s\n",show_date(timestamp, tz2,DATE_MODE(RFC2822))); 912}else if(starts_with(sb.buf,"# ")) { 913continue; 914}else{ 915fprintf(out,"\n%s\n", sb.buf); 916break; 917} 918} 919 920strbuf_reset(&sb); 921while(strbuf_fread(&sb,8192, in) >0) { 922fwrite(sb.buf,1, sb.len, out); 923strbuf_reset(&sb); 924} 925 926strbuf_release(&sb); 927return0; 928} 929 930/** 931 * Splits a list of files/directories into individual email patches. Each path 932 * in `paths` must be a file/directory that is formatted according to 933 * `patch_format`. 934 * 935 * Once split out, the individual email patches will be stored in the state 936 * directory, with each patch's filename being its index, padded to state->prec 937 * digits. 938 * 939 * state->cur will be set to the index of the first mail, and state->last will 940 * be set to the index of the last mail. 941 * 942 * Set keep_cr to 0 to convert all lines ending with \r\n to end with \n, 1 943 * to disable this behavior, -1 to use the default configured setting. 944 * 945 * Returns 0 on success, -1 on failure. 946 */ 947static intsplit_mail(struct am_state *state,enum patch_format patch_format, 948const char**paths,int keep_cr) 949{ 950if(keep_cr <0) { 951 keep_cr =0; 952git_config_get_bool("am.keepcr", &keep_cr); 953} 954 955switch(patch_format) { 956case PATCH_FORMAT_MBOX: 957returnsplit_mail_mbox(state, paths, keep_cr,0); 958case PATCH_FORMAT_STGIT: 959returnsplit_mail_conv(stgit_patch_to_mail, state, paths, keep_cr); 960case PATCH_FORMAT_STGIT_SERIES: 961returnsplit_mail_stgit_series(state, paths, keep_cr); 962case PATCH_FORMAT_HG: 963returnsplit_mail_conv(hg_patch_to_mail, state, paths, keep_cr); 964case PATCH_FORMAT_MBOXRD: 965returnsplit_mail_mbox(state, paths, keep_cr,1); 966default: 967die("BUG: invalid patch_format"); 968} 969return-1; 970} 971 972/** 973 * Setup a new am session for applying patches 974 */ 975static voidam_setup(struct am_state *state,enum patch_format patch_format, 976const char**paths,int keep_cr) 977{ 978struct object_id curr_head; 979const char*str; 980struct strbuf sb = STRBUF_INIT; 981 982if(!patch_format) 983 patch_format =detect_patch_format(paths); 984 985if(!patch_format) { 986fprintf_ln(stderr,_("Patch format detection failed.")); 987exit(128); 988} 989 990if(mkdir(state->dir,0777) <0&& errno != EEXIST) 991die_errno(_("failed to create directory '%s'"), state->dir); 992 993if(split_mail(state, patch_format, paths, keep_cr) <0) { 994am_destroy(state); 995die(_("Failed to split patches.")); 996} 997 998if(state->rebasing) 999 state->threeway =1;10001001write_state_bool(state,"threeway", state->threeway);1002write_state_bool(state,"quiet", state->quiet);1003write_state_bool(state,"sign", state->signoff);1004write_state_bool(state,"utf8", state->utf8);10051006switch(state->keep) {1007case KEEP_FALSE:1008 str ="f";1009break;1010case KEEP_TRUE:1011 str ="t";1012break;1013case KEEP_NON_PATCH:1014 str ="b";1015break;1016default:1017die("BUG: invalid value for state->keep");1018}10191020write_state_text(state,"keep", str);1021write_state_bool(state,"messageid", state->message_id);10221023switch(state->scissors) {1024case SCISSORS_UNSET:1025 str ="";1026break;1027case SCISSORS_FALSE:1028 str ="f";1029break;1030case SCISSORS_TRUE:1031 str ="t";1032break;1033default:1034die("BUG: invalid value for state->scissors");1035}1036write_state_text(state,"scissors", str);10371038sq_quote_argv(&sb, state->git_apply_opts.argv,0);1039write_state_text(state,"apply-opt", sb.buf);10401041if(state->rebasing)1042write_state_text(state,"rebasing","");1043else1044write_state_text(state,"applying","");10451046if(!get_oid("HEAD", &curr_head)) {1047write_state_text(state,"abort-safety",oid_to_hex(&curr_head));1048if(!state->rebasing)1049update_ref_oid("am","ORIG_HEAD", &curr_head, NULL,0,1050 UPDATE_REFS_DIE_ON_ERR);1051}else{1052write_state_text(state,"abort-safety","");1053if(!state->rebasing)1054delete_ref(NULL,"ORIG_HEAD", NULL,0);1055}10561057/*1058 * NOTE: Since the "next" and "last" files determine if an am_state1059 * session is in progress, they should be written last.1060 */10611062write_state_count(state,"next", state->cur);1063write_state_count(state,"last", state->last);10641065strbuf_release(&sb);1066}10671068/**1069 * Increments the patch pointer, and cleans am_state for the application of the1070 * next patch.1071 */1072static voidam_next(struct am_state *state)1073{1074struct object_id head;10751076free(state->author_name);1077 state->author_name = NULL;10781079free(state->author_email);1080 state->author_email = NULL;10811082free(state->author_date);1083 state->author_date = NULL;10841085free(state->msg);1086 state->msg = NULL;1087 state->msg_len =0;10881089unlink(am_path(state,"author-script"));1090unlink(am_path(state,"final-commit"));10911092oidclr(&state->orig_commit);1093unlink(am_path(state,"original-commit"));10941095if(!get_oid("HEAD", &head))1096write_state_text(state,"abort-safety",oid_to_hex(&head));1097else1098write_state_text(state,"abort-safety","");10991100 state->cur++;1101write_state_count(state,"next", state->cur);1102}11031104/**1105 * Returns the filename of the current patch email.1106 */1107static const char*msgnum(const struct am_state *state)1108{1109static struct strbuf sb = STRBUF_INIT;11101111strbuf_reset(&sb);1112strbuf_addf(&sb,"%0*d", state->prec, state->cur);11131114return sb.buf;1115}11161117/**1118 * Refresh and write index.1119 */1120static voidrefresh_and_write_cache(void)1121{1122struct lock_file *lock_file =xcalloc(1,sizeof(struct lock_file));11231124hold_locked_index(lock_file, LOCK_DIE_ON_ERROR);1125refresh_cache(REFRESH_QUIET);1126if(write_locked_index(&the_index, lock_file, COMMIT_LOCK))1127die(_("unable to write index file"));1128}11291130/**1131 * Returns 1 if the index differs from HEAD, 0 otherwise. When on an unborn1132 * branch, returns 1 if there are entries in the index, 0 otherwise. If an1133 * strbuf is provided, the space-separated list of files that differ will be1134 * appended to it.1135 */1136static intindex_has_changes(struct strbuf *sb)1137{1138struct object_id head;1139int i;11401141if(!get_sha1_tree("HEAD", head.hash)) {1142struct diff_options opt;11431144diff_setup(&opt);1145DIFF_OPT_SET(&opt, EXIT_WITH_STATUS);1146if(!sb)1147DIFF_OPT_SET(&opt, QUICK);1148do_diff_cache(head.hash, &opt);1149diffcore_std(&opt);1150for(i =0; sb && i < diff_queued_diff.nr; i++) {1151if(i)1152strbuf_addch(sb,' ');1153strbuf_addstr(sb, diff_queued_diff.queue[i]->two->path);1154}1155diff_flush(&opt);1156returnDIFF_OPT_TST(&opt, HAS_CHANGES) !=0;1157}else{1158for(i =0; sb && i < active_nr; i++) {1159if(i)1160strbuf_addch(sb,' ');1161strbuf_addstr(sb, active_cache[i]->name);1162}1163return!!active_nr;1164}1165}11661167/**1168 * Dies with a user-friendly message on how to proceed after resolving the1169 * problem. This message can be overridden with state->resolvemsg.1170 */1171static void NORETURN die_user_resolve(const struct am_state *state)1172{1173if(state->resolvemsg) {1174printf_ln("%s", state->resolvemsg);1175}else{1176const char*cmdline = state->interactive ?"git am -i":"git am";11771178printf_ln(_("When you have resolved this problem, run\"%s--continue\"."), cmdline);1179printf_ln(_("If you prefer to skip this patch, run\"%s--skip\"instead."), cmdline);1180printf_ln(_("To restore the original branch and stop patching, run\"%s--abort\"."), cmdline);1181}11821183exit(128);1184}11851186/**1187 * Appends signoff to the "msg" field of the am_state.1188 */1189static voidam_append_signoff(struct am_state *state)1190{1191struct strbuf sb = STRBUF_INIT;11921193strbuf_attach(&sb, state->msg, state->msg_len, state->msg_len);1194append_signoff(&sb,0,0);1195 state->msg =strbuf_detach(&sb, &state->msg_len);1196}11971198/**1199 * Parses `mail` using git-mailinfo, extracting its patch and authorship info.1200 * state->msg will be set to the patch message. state->author_name,1201 * state->author_email and state->author_date will be set to the patch author's1202 * name, email and date respectively. The patch body will be written to the1203 * state directory's "patch" file.1204 *1205 * Returns 1 if the patch should be skipped, 0 otherwise.1206 */1207static intparse_mail(struct am_state *state,const char*mail)1208{1209FILE*fp;1210struct strbuf sb = STRBUF_INIT;1211struct strbuf msg = STRBUF_INIT;1212struct strbuf author_name = STRBUF_INIT;1213struct strbuf author_date = STRBUF_INIT;1214struct strbuf author_email = STRBUF_INIT;1215int ret =0;1216struct mailinfo mi;12171218setup_mailinfo(&mi);12191220if(state->utf8)1221 mi.metainfo_charset =get_commit_output_encoding();1222else1223 mi.metainfo_charset = NULL;12241225switch(state->keep) {1226case KEEP_FALSE:1227break;1228case KEEP_TRUE:1229 mi.keep_subject =1;1230break;1231case KEEP_NON_PATCH:1232 mi.keep_non_patch_brackets_in_subject =1;1233break;1234default:1235die("BUG: invalid value for state->keep");1236}12371238if(state->message_id)1239 mi.add_message_id =1;12401241switch(state->scissors) {1242case SCISSORS_UNSET:1243break;1244case SCISSORS_FALSE:1245 mi.use_scissors =0;1246break;1247case SCISSORS_TRUE:1248 mi.use_scissors =1;1249break;1250default:1251die("BUG: invalid value for state->scissors");1252}12531254 mi.input =fopen(mail,"r");1255if(!mi.input)1256die("could not open input");1257 mi.output =fopen(am_path(state,"info"),"w");1258if(!mi.output)1259die("could not open output 'info'");1260if(mailinfo(&mi,am_path(state,"msg"),am_path(state,"patch")))1261die("could not parse patch");12621263fclose(mi.input);1264fclose(mi.output);12651266/* Extract message and author information */1267 fp =xfopen(am_path(state,"info"),"r");1268while(!strbuf_getline_lf(&sb, fp)) {1269const char*x;12701271if(skip_prefix(sb.buf,"Subject: ", &x)) {1272if(msg.len)1273strbuf_addch(&msg,'\n');1274strbuf_addstr(&msg, x);1275}else if(skip_prefix(sb.buf,"Author: ", &x))1276strbuf_addstr(&author_name, x);1277else if(skip_prefix(sb.buf,"Email: ", &x))1278strbuf_addstr(&author_email, x);1279else if(skip_prefix(sb.buf,"Date: ", &x))1280strbuf_addstr(&author_date, x);1281}1282fclose(fp);12831284/* Skip pine's internal folder data */1285if(!strcmp(author_name.buf,"Mail System Internal Data")) {1286 ret =1;1287goto finish;1288}12891290if(is_empty_file(am_path(state,"patch"))) {1291printf_ln(_("Patch is empty."));1292die_user_resolve(state);1293}12941295strbuf_addstr(&msg,"\n\n");1296strbuf_addbuf(&msg, &mi.log_message);1297strbuf_stripspace(&msg,0);12981299assert(!state->author_name);1300 state->author_name =strbuf_detach(&author_name, NULL);13011302assert(!state->author_email);1303 state->author_email =strbuf_detach(&author_email, NULL);13041305assert(!state->author_date);1306 state->author_date =strbuf_detach(&author_date, NULL);13071308assert(!state->msg);1309 state->msg =strbuf_detach(&msg, &state->msg_len);13101311finish:1312strbuf_release(&msg);1313strbuf_release(&author_date);1314strbuf_release(&author_email);1315strbuf_release(&author_name);1316strbuf_release(&sb);1317clear_mailinfo(&mi);1318return ret;1319}13201321/**1322 * Sets commit_id to the commit hash where the mail was generated from.1323 * Returns 0 on success, -1 on failure.1324 */1325static intget_mail_commit_oid(struct object_id *commit_id,const char*mail)1326{1327struct strbuf sb = STRBUF_INIT;1328FILE*fp =xfopen(mail,"r");1329const char*x;1330int ret =0;13311332if(strbuf_getline_lf(&sb, fp) ||1333!skip_prefix(sb.buf,"From ", &x) ||1334get_oid_hex(x, commit_id) <0)1335 ret = -1;13361337strbuf_release(&sb);1338fclose(fp);1339return ret;1340}13411342/**1343 * Sets state->msg, state->author_name, state->author_email, state->author_date1344 * to the commit's respective info.1345 */1346static voidget_commit_info(struct am_state *state,struct commit *commit)1347{1348const char*buffer, *ident_line, *msg;1349size_t ident_len;1350struct ident_split id;13511352 buffer =logmsg_reencode(commit, NULL,get_commit_output_encoding());13531354 ident_line =find_commit_header(buffer,"author", &ident_len);13551356if(split_ident_line(&id, ident_line, ident_len) <0)1357die(_("invalid ident line: %.*s"), (int)ident_len, ident_line);13581359assert(!state->author_name);1360if(id.name_begin)1361 state->author_name =1362xmemdupz(id.name_begin, id.name_end - id.name_begin);1363else1364 state->author_name =xstrdup("");13651366assert(!state->author_email);1367if(id.mail_begin)1368 state->author_email =1369xmemdupz(id.mail_begin, id.mail_end - id.mail_begin);1370else1371 state->author_email =xstrdup("");13721373assert(!state->author_date);1374 state->author_date =xstrdup(show_ident_date(&id,DATE_MODE(NORMAL)));13751376assert(!state->msg);1377 msg =strstr(buffer,"\n\n");1378if(!msg)1379die(_("unable to parse commit%s"),oid_to_hex(&commit->object.oid));1380 state->msg =xstrdup(msg +2);1381 state->msg_len =strlen(state->msg);1382unuse_commit_buffer(commit, buffer);1383}13841385/**1386 * Writes `commit` as a patch to the state directory's "patch" file.1387 */1388static voidwrite_commit_patch(const struct am_state *state,struct commit *commit)1389{1390struct rev_info rev_info;1391FILE*fp;13921393 fp =xfopen(am_path(state,"patch"),"w");1394init_revisions(&rev_info, NULL);1395 rev_info.diff =1;1396 rev_info.abbrev =0;1397 rev_info.disable_stdin =1;1398 rev_info.show_root_diff =1;1399 rev_info.diffopt.output_format = DIFF_FORMAT_PATCH;1400 rev_info.no_commit_id =1;1401DIFF_OPT_SET(&rev_info.diffopt, BINARY);1402DIFF_OPT_SET(&rev_info.diffopt, FULL_INDEX);1403 rev_info.diffopt.use_color =0;1404 rev_info.diffopt.file = fp;1405 rev_info.diffopt.close_file =1;1406add_pending_object(&rev_info, &commit->object,"");1407diff_setup_done(&rev_info.diffopt);1408log_tree_commit(&rev_info, commit);1409}14101411/**1412 * Writes the diff of the index against HEAD as a patch to the state1413 * directory's "patch" file.1414 */1415static voidwrite_index_patch(const struct am_state *state)1416{1417struct tree *tree;1418struct object_id head;1419struct rev_info rev_info;1420FILE*fp;14211422if(!get_sha1_tree("HEAD", head.hash))1423 tree =lookup_tree(head.hash);1424else1425 tree =lookup_tree(EMPTY_TREE_SHA1_BIN);14261427 fp =xfopen(am_path(state,"patch"),"w");1428init_revisions(&rev_info, NULL);1429 rev_info.diff =1;1430 rev_info.disable_stdin =1;1431 rev_info.no_commit_id =1;1432 rev_info.diffopt.output_format = DIFF_FORMAT_PATCH;1433 rev_info.diffopt.use_color =0;1434 rev_info.diffopt.file = fp;1435 rev_info.diffopt.close_file =1;1436add_pending_object(&rev_info, &tree->object,"");1437diff_setup_done(&rev_info.diffopt);1438run_diff_index(&rev_info,1);1439}14401441/**1442 * Like parse_mail(), but parses the mail by looking up its commit ID1443 * directly. This is used in --rebasing mode to bypass git-mailinfo's munging1444 * of patches.1445 *1446 * state->orig_commit will be set to the original commit ID.1447 *1448 * Will always return 0 as the patch should never be skipped.1449 */1450static intparse_mail_rebase(struct am_state *state,const char*mail)1451{1452struct commit *commit;1453struct object_id commit_oid;14541455if(get_mail_commit_oid(&commit_oid, mail) <0)1456die(_("could not parse%s"), mail);14571458 commit =lookup_commit_or_die(commit_oid.hash, mail);14591460get_commit_info(state, commit);14611462write_commit_patch(state, commit);14631464oidcpy(&state->orig_commit, &commit_oid);1465write_state_text(state,"original-commit",oid_to_hex(&commit_oid));14661467return0;1468}14691470/**1471 * Applies current patch with git-apply. Returns 0 on success, -1 otherwise. If1472 * `index_file` is not NULL, the patch will be applied to that index.1473 */1474static intrun_apply(const struct am_state *state,const char*index_file)1475{1476struct argv_array apply_paths = ARGV_ARRAY_INIT;1477struct argv_array apply_opts = ARGV_ARRAY_INIT;1478struct apply_state apply_state;1479int res, opts_left;1480static struct lock_file lock_file;1481int force_apply =0;1482int options =0;14831484if(init_apply_state(&apply_state, NULL, &lock_file))1485die("BUG: init_apply_state() failed");14861487argv_array_push(&apply_opts,"apply");1488argv_array_pushv(&apply_opts, state->git_apply_opts.argv);14891490 opts_left =apply_parse_options(apply_opts.argc, apply_opts.argv,1491&apply_state, &force_apply, &options,1492 NULL);14931494if(opts_left !=0)1495die("unknown option passed through to git apply");14961497if(index_file) {1498 apply_state.index_file = index_file;1499 apply_state.cached =1;1500}else1501 apply_state.check_index =1;15021503/*1504 * If we are allowed to fall back on 3-way merge, don't give false1505 * errors during the initial attempt.1506 */1507if(state->threeway && !index_file)1508 apply_state.apply_verbosity = verbosity_silent;15091510if(check_apply_state(&apply_state, force_apply))1511die("BUG: check_apply_state() failed");15121513argv_array_push(&apply_paths,am_path(state,"patch"));15141515 res =apply_all_patches(&apply_state, apply_paths.argc, apply_paths.argv, options);15161517argv_array_clear(&apply_paths);1518argv_array_clear(&apply_opts);1519clear_apply_state(&apply_state);15201521if(res)1522return res;15231524if(index_file) {1525/* Reload index as apply_all_patches() will have modified it. */1526discard_cache();1527read_cache_from(index_file);1528}15291530return0;1531}15321533/**1534 * Builds an index that contains just the blobs needed for a 3way merge.1535 */1536static intbuild_fake_ancestor(const struct am_state *state,const char*index_file)1537{1538struct child_process cp = CHILD_PROCESS_INIT;15391540 cp.git_cmd =1;1541argv_array_push(&cp.args,"apply");1542argv_array_pushv(&cp.args, state->git_apply_opts.argv);1543argv_array_pushf(&cp.args,"--build-fake-ancestor=%s", index_file);1544argv_array_push(&cp.args,am_path(state,"patch"));15451546if(run_command(&cp))1547return-1;15481549return0;1550}15511552/**1553 * Attempt a threeway merge, using index_path as the temporary index.1554 */1555static intfall_back_threeway(const struct am_state *state,const char*index_path)1556{1557struct object_id orig_tree, their_tree, our_tree;1558const struct object_id *bases[1] = { &orig_tree };1559struct merge_options o;1560struct commit *result;1561char*their_tree_name;15621563if(get_oid("HEAD", &our_tree) <0)1564hashcpy(our_tree.hash, EMPTY_TREE_SHA1_BIN);15651566if(build_fake_ancestor(state, index_path))1567returnerror("could not build fake ancestor");15681569discard_cache();1570read_cache_from(index_path);15711572if(write_index_as_tree(orig_tree.hash, &the_index, index_path,0, NULL))1573returnerror(_("Repository lacks necessary blobs to fall back on 3-way merge."));15741575say(state, stdout,_("Using index info to reconstruct a base tree..."));15761577if(!state->quiet) {1578/*1579 * List paths that needed 3-way fallback, so that the user can1580 * review them with extra care to spot mismerges.1581 */1582struct rev_info rev_info;1583const char*diff_filter_str ="--diff-filter=AM";15841585init_revisions(&rev_info, NULL);1586 rev_info.diffopt.output_format = DIFF_FORMAT_NAME_STATUS;1587diff_opt_parse(&rev_info.diffopt, &diff_filter_str,1, rev_info.prefix);1588add_pending_sha1(&rev_info,"HEAD", our_tree.hash,0);1589diff_setup_done(&rev_info.diffopt);1590run_diff_index(&rev_info,1);1591}15921593if(run_apply(state, index_path))1594returnerror(_("Did you hand edit your patch?\n"1595"It does not apply to blobs recorded in its index."));15961597if(write_index_as_tree(their_tree.hash, &the_index, index_path,0, NULL))1598returnerror("could not write tree");15991600say(state, stdout,_("Falling back to patching base and 3-way merge..."));16011602discard_cache();1603read_cache();16041605/*1606 * This is not so wrong. Depending on which base we picked, orig_tree1607 * may be wildly different from ours, but their_tree has the same set of1608 * wildly different changes in parts the patch did not touch, so1609 * recursive ends up canceling them, saying that we reverted all those1610 * changes.1611 */16121613init_merge_options(&o);16141615 o.branch1 ="HEAD";1616 their_tree_name =xstrfmt("%.*s",linelen(state->msg), state->msg);1617 o.branch2 = their_tree_name;16181619if(state->quiet)1620 o.verbosity =0;16211622if(merge_recursive_generic(&o, &our_tree, &their_tree,1, bases, &result)) {1623rerere(state->allow_rerere_autoupdate);1624free(their_tree_name);1625returnerror(_("Failed to merge in the changes."));1626}16271628free(their_tree_name);1629return0;1630}16311632/**1633 * Commits the current index with state->msg as the commit message and1634 * state->author_name, state->author_email and state->author_date as the author1635 * information.1636 */1637static voiddo_commit(const struct am_state *state)1638{1639struct object_id tree, parent, commit;1640const struct object_id *old_oid;1641struct commit_list *parents = NULL;1642const char*reflog_msg, *author;1643struct strbuf sb = STRBUF_INIT;16441645if(run_hook_le(NULL,"pre-applypatch", NULL))1646exit(1);16471648if(write_cache_as_tree(tree.hash,0, NULL))1649die(_("git write-tree failed to write a tree"));16501651if(!get_sha1_commit("HEAD", parent.hash)) {1652 old_oid = &parent;1653commit_list_insert(lookup_commit(parent.hash), &parents);1654}else{1655 old_oid = NULL;1656say(state, stderr,_("applying to an empty history"));1657}16581659 author =fmt_ident(state->author_name, state->author_email,1660 state->ignore_date ? NULL : state->author_date,1661 IDENT_STRICT);16621663if(state->committer_date_is_author_date)1664setenv("GIT_COMMITTER_DATE",1665 state->ignore_date ?"": state->author_date,1);16661667if(commit_tree(state->msg, state->msg_len, tree.hash, parents, commit.hash,1668 author, state->sign_commit))1669die(_("failed to write commit object"));16701671 reflog_msg =getenv("GIT_REFLOG_ACTION");1672if(!reflog_msg)1673 reflog_msg ="am";16741675strbuf_addf(&sb,"%s: %.*s", reflog_msg,linelen(state->msg),1676 state->msg);16771678update_ref_oid(sb.buf,"HEAD", &commit, old_oid,0,1679 UPDATE_REFS_DIE_ON_ERR);16801681if(state->rebasing) {1682FILE*fp =xfopen(am_path(state,"rewritten"),"a");16831684assert(!is_null_oid(&state->orig_commit));1685fprintf(fp,"%s",oid_to_hex(&state->orig_commit));1686fprintf(fp,"%s\n",oid_to_hex(&commit));1687fclose(fp);1688}16891690run_hook_le(NULL,"post-applypatch", NULL);16911692strbuf_release(&sb);1693}16941695/**1696 * Validates the am_state for resuming -- the "msg" and authorship fields must1697 * be filled up.1698 */1699static voidvalidate_resume_state(const struct am_state *state)1700{1701if(!state->msg)1702die(_("cannot resume:%sdoes not exist."),1703am_path(state,"final-commit"));17041705if(!state->author_name || !state->author_email || !state->author_date)1706die(_("cannot resume:%sdoes not exist."),1707am_path(state,"author-script"));1708}17091710/**1711 * Interactively prompt the user on whether the current patch should be1712 * applied.1713 *1714 * Returns 0 if the user chooses to apply the patch, 1 if the user chooses to1715 * skip it.1716 */1717static intdo_interactive(struct am_state *state)1718{1719assert(state->msg);17201721if(!isatty(0))1722die(_("cannot be interactive without stdin connected to a terminal."));17231724for(;;) {1725const char*reply;17261727puts(_("Commit Body is:"));1728puts("--------------------------");1729printf("%s", state->msg);1730puts("--------------------------");17311732/*1733 * TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]1734 * in your translation. The program will only accept English1735 * input at this point.1736 */1737 reply =git_prompt(_("Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "), PROMPT_ECHO);17381739if(!reply) {1740continue;1741}else if(*reply =='y'|| *reply =='Y') {1742return0;1743}else if(*reply =='a'|| *reply =='A') {1744 state->interactive =0;1745return0;1746}else if(*reply =='n'|| *reply =='N') {1747return1;1748}else if(*reply =='e'|| *reply =='E') {1749struct strbuf msg = STRBUF_INIT;17501751if(!launch_editor(am_path(state,"final-commit"), &msg, NULL)) {1752free(state->msg);1753 state->msg =strbuf_detach(&msg, &state->msg_len);1754}1755strbuf_release(&msg);1756}else if(*reply =='v'|| *reply =='V') {1757const char*pager =git_pager(1);1758struct child_process cp = CHILD_PROCESS_INIT;17591760if(!pager)1761 pager ="cat";1762prepare_pager_args(&cp, pager);1763argv_array_push(&cp.args,am_path(state,"patch"));1764run_command(&cp);1765}1766}1767}17681769/**1770 * Applies all queued mail.1771 *1772 * If `resume` is true, we are "resuming". The "msg" and authorship fields, as1773 * well as the state directory's "patch" file is used as-is for applying the1774 * patch and committing it.1775 */1776static voidam_run(struct am_state *state,int resume)1777{1778const char*argv_gc_auto[] = {"gc","--auto", NULL};1779struct strbuf sb = STRBUF_INIT;17801781unlink(am_path(state,"dirtyindex"));17821783refresh_and_write_cache();17841785if(index_has_changes(&sb)) {1786write_state_bool(state,"dirtyindex",1);1787die(_("Dirty index: cannot apply patches (dirty:%s)"), sb.buf);1788}17891790strbuf_release(&sb);17911792while(state->cur <= state->last) {1793const char*mail =am_path(state,msgnum(state));1794int apply_status;17951796reset_ident_date();17971798if(!file_exists(mail))1799goto next;18001801if(resume) {1802validate_resume_state(state);1803}else{1804int skip;18051806if(state->rebasing)1807 skip =parse_mail_rebase(state, mail);1808else1809 skip =parse_mail(state, mail);18101811if(skip)1812goto next;/* mail should be skipped */18131814if(state->signoff)1815am_append_signoff(state);18161817write_author_script(state);1818write_commit_msg(state);1819}18201821if(state->interactive &&do_interactive(state))1822goto next;18231824if(run_applypatch_msg_hook(state))1825exit(1);18261827say(state, stdout,_("Applying: %.*s"),linelen(state->msg), state->msg);18281829 apply_status =run_apply(state, NULL);18301831if(apply_status && state->threeway) {1832struct strbuf sb = STRBUF_INIT;18331834strbuf_addstr(&sb,am_path(state,"patch-merge-index"));1835 apply_status =fall_back_threeway(state, sb.buf);1836strbuf_release(&sb);18371838/*1839 * Applying the patch to an earlier tree and merging1840 * the result may have produced the same tree as ours.1841 */1842if(!apply_status && !index_has_changes(NULL)) {1843say(state, stdout,_("No changes -- Patch already applied."));1844goto next;1845}1846}18471848if(apply_status) {1849int advice_amworkdir =1;18501851printf_ln(_("Patch failed at%s%.*s"),msgnum(state),1852linelen(state->msg), state->msg);18531854git_config_get_bool("advice.amworkdir", &advice_amworkdir);18551856if(advice_amworkdir)1857printf_ln(_("The copy of the patch that failed is found in:%s"),1858am_path(state,"patch"));18591860die_user_resolve(state);1861}18621863do_commit(state);18641865next:1866am_next(state);18671868if(resume)1869am_load(state);1870 resume =0;1871}18721873if(!is_empty_file(am_path(state,"rewritten"))) {1874assert(state->rebasing);1875copy_notes_for_rebase(state);1876run_post_rewrite_hook(state);1877}18781879/*1880 * In rebasing mode, it's up to the caller to take care of1881 * housekeeping.1882 */1883if(!state->rebasing) {1884am_destroy(state);1885close_all_packs();1886run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);1887}1888}18891890/**1891 * Resume the current am session after patch application failure. The user did1892 * all the hard work, and we do not have to do any patch application. Just1893 * trust and commit what the user has in the index and working tree.1894 */1895static voidam_resolve(struct am_state *state)1896{1897validate_resume_state(state);18981899say(state, stdout,_("Applying: %.*s"),linelen(state->msg), state->msg);19001901if(!index_has_changes(NULL)) {1902printf_ln(_("No changes - did you forget to use 'git add'?\n"1903"If there is nothing left to stage, chances are that something else\n"1904"already introduced the same changes; you might want to skip this patch."));1905die_user_resolve(state);1906}19071908if(unmerged_cache()) {1909printf_ln(_("You still have unmerged paths in your index.\n"1910"You should 'git add' each file with resolved conflicts to mark them as such.\n"1911"You might run `git rm` on a file to accept\"deleted by them\"for it."));1912die_user_resolve(state);1913}19141915if(state->interactive) {1916write_index_patch(state);1917if(do_interactive(state))1918goto next;1919}19201921rerere(0);19221923do_commit(state);19241925next:1926am_next(state);1927am_load(state);1928am_run(state,0);1929}19301931/**1932 * Performs a checkout fast-forward from `head` to `remote`. If `reset` is1933 * true, any unmerged entries will be discarded. Returns 0 on success, -1 on1934 * failure.1935 */1936static intfast_forward_to(struct tree *head,struct tree *remote,int reset)1937{1938struct lock_file *lock_file;1939struct unpack_trees_options opts;1940struct tree_desc t[2];19411942if(parse_tree(head) ||parse_tree(remote))1943return-1;19441945 lock_file =xcalloc(1,sizeof(struct lock_file));1946hold_locked_index(lock_file, LOCK_DIE_ON_ERROR);19471948refresh_cache(REFRESH_QUIET);19491950memset(&opts,0,sizeof(opts));1951 opts.head_idx =1;1952 opts.src_index = &the_index;1953 opts.dst_index = &the_index;1954 opts.update =1;1955 opts.merge =1;1956 opts.reset = reset;1957 opts.fn = twoway_merge;1958init_tree_desc(&t[0], head->buffer, head->size);1959init_tree_desc(&t[1], remote->buffer, remote->size);19601961if(unpack_trees(2, t, &opts)) {1962rollback_lock_file(lock_file);1963return-1;1964}19651966if(write_locked_index(&the_index, lock_file, COMMIT_LOCK))1967die(_("unable to write new index file"));19681969return0;1970}19711972/**1973 * Merges a tree into the index. The index's stat info will take precedence1974 * over the merged tree's. Returns 0 on success, -1 on failure.1975 */1976static intmerge_tree(struct tree *tree)1977{1978struct lock_file *lock_file;1979struct unpack_trees_options opts;1980struct tree_desc t[1];19811982if(parse_tree(tree))1983return-1;19841985 lock_file =xcalloc(1,sizeof(struct lock_file));1986hold_locked_index(lock_file, LOCK_DIE_ON_ERROR);19871988memset(&opts,0,sizeof(opts));1989 opts.head_idx =1;1990 opts.src_index = &the_index;1991 opts.dst_index = &the_index;1992 opts.merge =1;1993 opts.fn = oneway_merge;1994init_tree_desc(&t[0], tree->buffer, tree->size);19951996if(unpack_trees(1, t, &opts)) {1997rollback_lock_file(lock_file);1998return-1;1999}20002001if(write_locked_index(&the_index, lock_file, COMMIT_LOCK))2002die(_("unable to write new index file"));20032004return0;2005}20062007/**2008 * Clean the index without touching entries that are not modified between2009 * `head` and `remote`.2010 */2011static intclean_index(const struct object_id *head,const struct object_id *remote)2012{2013struct tree *head_tree, *remote_tree, *index_tree;2014struct object_id index;20152016 head_tree =parse_tree_indirect(head->hash);2017if(!head_tree)2018returnerror(_("Could not parse object '%s'."),oid_to_hex(head));20192020 remote_tree =parse_tree_indirect(remote->hash);2021if(!remote_tree)2022returnerror(_("Could not parse object '%s'."),oid_to_hex(remote));20232024read_cache_unmerged();20252026if(fast_forward_to(head_tree, head_tree,1))2027return-1;20282029if(write_cache_as_tree(index.hash,0, NULL))2030return-1;20312032 index_tree =parse_tree_indirect(index.hash);2033if(!index_tree)2034returnerror(_("Could not parse object '%s'."),oid_to_hex(&index));20352036if(fast_forward_to(index_tree, remote_tree,0))2037return-1;20382039if(merge_tree(remote_tree))2040return-1;20412042remove_branch_state();20432044return0;2045}20462047/**2048 * Resets rerere's merge resolution metadata.2049 */2050static voidam_rerere_clear(void)2051{2052struct string_list merge_rr = STRING_LIST_INIT_DUP;2053rerere_clear(&merge_rr);2054string_list_clear(&merge_rr,1);2055}20562057/**2058 * Resume the current am session by skipping the current patch.2059 */2060static voidam_skip(struct am_state *state)2061{2062struct object_id head;20632064am_rerere_clear();20652066if(get_oid("HEAD", &head))2067hashcpy(head.hash, EMPTY_TREE_SHA1_BIN);20682069if(clean_index(&head, &head))2070die(_("failed to clean index"));20712072am_next(state);2073am_load(state);2074am_run(state,0);2075}20762077/**2078 * Returns true if it is safe to reset HEAD to the ORIG_HEAD, false otherwise.2079 *2080 * It is not safe to reset HEAD when:2081 * 1. git-am previously failed because the index was dirty.2082 * 2. HEAD has moved since git-am previously failed.2083 */2084static intsafe_to_abort(const struct am_state *state)2085{2086struct strbuf sb = STRBUF_INIT;2087struct object_id abort_safety, head;20882089if(file_exists(am_path(state,"dirtyindex")))2090return0;20912092if(read_state_file(&sb, state,"abort-safety",1) >0) {2093if(get_oid_hex(sb.buf, &abort_safety))2094die(_("could not parse%s"),am_path(state,"abort-safety"));2095}else2096oidclr(&abort_safety);20972098if(get_oid("HEAD", &head))2099oidclr(&head);21002101if(!oidcmp(&head, &abort_safety))2102return1;21032104warning(_("You seem to have moved HEAD since the last 'am' failure.\n"2105"Not rewinding to ORIG_HEAD"));21062107return0;2108}21092110/**2111 * Aborts the current am session if it is safe to do so.2112 */2113static voidam_abort(struct am_state *state)2114{2115struct object_id curr_head, orig_head;2116int has_curr_head, has_orig_head;2117char*curr_branch;21182119if(!safe_to_abort(state)) {2120am_destroy(state);2121return;2122}21232124am_rerere_clear();21252126 curr_branch =resolve_refdup("HEAD",0, curr_head.hash, NULL);2127 has_curr_head = curr_branch && !is_null_oid(&curr_head);2128if(!has_curr_head)2129hashcpy(curr_head.hash, EMPTY_TREE_SHA1_BIN);21302131 has_orig_head = !get_oid("ORIG_HEAD", &orig_head);2132if(!has_orig_head)2133hashcpy(orig_head.hash, EMPTY_TREE_SHA1_BIN);21342135clean_index(&curr_head, &orig_head);21362137if(has_orig_head)2138update_ref_oid("am --abort","HEAD", &orig_head,2139 has_curr_head ? &curr_head : NULL,0,2140 UPDATE_REFS_DIE_ON_ERR);2141else if(curr_branch)2142delete_ref(NULL, curr_branch, NULL, REF_NODEREF);21432144free(curr_branch);2145am_destroy(state);2146}21472148/**2149 * parse_options() callback that validates and sets opt->value to the2150 * PATCH_FORMAT_* enum value corresponding to `arg`.2151 */2152static intparse_opt_patchformat(const struct option *opt,const char*arg,int unset)2153{2154int*opt_value = opt->value;21552156if(!strcmp(arg,"mbox"))2157*opt_value = PATCH_FORMAT_MBOX;2158else if(!strcmp(arg,"stgit"))2159*opt_value = PATCH_FORMAT_STGIT;2160else if(!strcmp(arg,"stgit-series"))2161*opt_value = PATCH_FORMAT_STGIT_SERIES;2162else if(!strcmp(arg,"hg"))2163*opt_value = PATCH_FORMAT_HG;2164else if(!strcmp(arg,"mboxrd"))2165*opt_value = PATCH_FORMAT_MBOXRD;2166else2167returnerror(_("Invalid value for --patch-format:%s"), arg);2168return0;2169}21702171enum resume_mode {2172 RESUME_FALSE =0,2173 RESUME_APPLY,2174 RESUME_RESOLVED,2175 RESUME_SKIP,2176 RESUME_ABORT2177};21782179static intgit_am_config(const char*k,const char*v,void*cb)2180{2181int status;21822183 status =git_gpg_config(k, v, NULL);2184if(status)2185return status;21862187returngit_default_config(k, v, NULL);2188}21892190intcmd_am(int argc,const char**argv,const char*prefix)2191{2192struct am_state state;2193int binary = -1;2194int keep_cr = -1;2195int patch_format = PATCH_FORMAT_UNKNOWN;2196enum resume_mode resume = RESUME_FALSE;2197int in_progress;21982199const char*const usage[] = {2200N_("git am [<options>] [(<mbox> | <Maildir>)...]"),2201N_("git am [<options>] (--continue | --skip | --abort)"),2202 NULL2203};22042205struct option options[] = {2206OPT_BOOL('i',"interactive", &state.interactive,2207N_("run interactively")),2208OPT_HIDDEN_BOOL('b',"binary", &binary,2209N_("historical option -- no-op")),2210OPT_BOOL('3',"3way", &state.threeway,2211N_("allow fall back on 3way merging if needed")),2212OPT__QUIET(&state.quiet,N_("be quiet")),2213OPT_SET_INT('s',"signoff", &state.signoff,2214N_("add a Signed-off-by line to the commit message"),2215 SIGNOFF_EXPLICIT),2216OPT_BOOL('u',"utf8", &state.utf8,2217N_("recode into utf8 (default)")),2218OPT_SET_INT('k',"keep", &state.keep,2219N_("pass -k flag to git-mailinfo"), KEEP_TRUE),2220OPT_SET_INT(0,"keep-non-patch", &state.keep,2221N_("pass -b flag to git-mailinfo"), KEEP_NON_PATCH),2222OPT_BOOL('m',"message-id", &state.message_id,2223N_("pass -m flag to git-mailinfo")),2224{ OPTION_SET_INT,0,"keep-cr", &keep_cr, NULL,2225N_("pass --keep-cr flag to git-mailsplit for mbox format"),2226 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL,1},2227{ OPTION_SET_INT,0,"no-keep-cr", &keep_cr, NULL,2228N_("do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"),2229 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL,0},2230OPT_BOOL('c',"scissors", &state.scissors,2231N_("strip everything before a scissors line")),2232OPT_PASSTHRU_ARGV(0,"whitespace", &state.git_apply_opts,N_("action"),2233N_("pass it through git-apply"),22340),2235OPT_PASSTHRU_ARGV(0,"ignore-space-change", &state.git_apply_opts, NULL,2236N_("pass it through git-apply"),2237 PARSE_OPT_NOARG),2238OPT_PASSTHRU_ARGV(0,"ignore-whitespace", &state.git_apply_opts, NULL,2239N_("pass it through git-apply"),2240 PARSE_OPT_NOARG),2241OPT_PASSTHRU_ARGV(0,"directory", &state.git_apply_opts,N_("root"),2242N_("pass it through git-apply"),22430),2244OPT_PASSTHRU_ARGV(0,"exclude", &state.git_apply_opts,N_("path"),2245N_("pass it through git-apply"),22460),2247OPT_PASSTHRU_ARGV(0,"include", &state.git_apply_opts,N_("path"),2248N_("pass it through git-apply"),22490),2250OPT_PASSTHRU_ARGV('C', NULL, &state.git_apply_opts,N_("n"),2251N_("pass it through git-apply"),22520),2253OPT_PASSTHRU_ARGV('p', NULL, &state.git_apply_opts,N_("num"),2254N_("pass it through git-apply"),22550),2256OPT_CALLBACK(0,"patch-format", &patch_format,N_("format"),2257N_("format the patch(es) are in"),2258 parse_opt_patchformat),2259OPT_PASSTHRU_ARGV(0,"reject", &state.git_apply_opts, NULL,2260N_("pass it through git-apply"),2261 PARSE_OPT_NOARG),2262OPT_STRING(0,"resolvemsg", &state.resolvemsg, NULL,2263N_("override error message when patch failure occurs")),2264OPT_CMDMODE(0,"continue", &resume,2265N_("continue applying patches after resolving a conflict"),2266 RESUME_RESOLVED),2267OPT_CMDMODE('r',"resolved", &resume,2268N_("synonyms for --continue"),2269 RESUME_RESOLVED),2270OPT_CMDMODE(0,"skip", &resume,2271N_("skip the current patch"),2272 RESUME_SKIP),2273OPT_CMDMODE(0,"abort", &resume,2274N_("restore the original branch and abort the patching operation."),2275 RESUME_ABORT),2276OPT_BOOL(0,"committer-date-is-author-date",2277&state.committer_date_is_author_date,2278N_("lie about committer date")),2279OPT_BOOL(0,"ignore-date", &state.ignore_date,2280N_("use current timestamp for author date")),2281OPT_RERERE_AUTOUPDATE(&state.allow_rerere_autoupdate),2282{ OPTION_STRING,'S',"gpg-sign", &state.sign_commit,N_("key-id"),2283N_("GPG-sign commits"),2284 PARSE_OPT_OPTARG, NULL, (intptr_t)""},2285OPT_HIDDEN_BOOL(0,"rebasing", &state.rebasing,2286N_("(internal use for git-rebase)")),2287OPT_END()2288};22892290if(argc ==2&& !strcmp(argv[1],"-h"))2291usage_with_options(usage, options);22922293git_config(git_am_config, NULL);22942295am_state_init(&state);22962297 in_progress =am_in_progress(&state);2298if(in_progress)2299am_load(&state);23002301 argc =parse_options(argc, argv, prefix, options, usage,0);23022303if(binary >=0)2304fprintf_ln(stderr,_("The -b/--binary option has been a no-op for long time, and\n"2305"it will be removed. Please do not use it anymore."));23062307/* Ensure a valid committer ident can be constructed */2308git_committer_info(IDENT_STRICT);23092310if(read_index_preload(&the_index, NULL) <0)2311die(_("failed to read the index"));23122313if(in_progress) {2314/*2315 * Catch user error to feed us patches when there is a session2316 * in progress:2317 *2318 * 1. mbox path(s) are provided on the command-line.2319 * 2. stdin is not a tty: the user is trying to feed us a patch2320 * from standard input. This is somewhat unreliable -- stdin2321 * could be /dev/null for example and the caller did not2322 * intend to feed us a patch but wanted to continue2323 * unattended.2324 */2325if(argc || (resume == RESUME_FALSE && !isatty(0)))2326die(_("previous rebase directory%sstill exists but mbox given."),2327 state.dir);23282329if(resume == RESUME_FALSE)2330 resume = RESUME_APPLY;23312332if(state.signoff == SIGNOFF_EXPLICIT)2333am_append_signoff(&state);2334}else{2335struct argv_array paths = ARGV_ARRAY_INIT;2336int i;23372338/*2339 * Handle stray state directory in the independent-run case. In2340 * the --rebasing case, it is up to the caller to take care of2341 * stray directories.2342 */2343if(file_exists(state.dir) && !state.rebasing) {2344if(resume == RESUME_ABORT) {2345am_destroy(&state);2346am_state_release(&state);2347return0;2348}23492350die(_("Stray%sdirectory found.\n"2351"Use\"git am --abort\"to remove it."),2352 state.dir);2353}23542355if(resume)2356die(_("Resolve operation not in progress, we are not resuming."));23572358for(i =0; i < argc; i++) {2359if(is_absolute_path(argv[i]) || !prefix)2360argv_array_push(&paths, argv[i]);2361else2362argv_array_push(&paths,mkpath("%s/%s", prefix, argv[i]));2363}23642365am_setup(&state, patch_format, paths.argv, keep_cr);23662367argv_array_clear(&paths);2368}23692370switch(resume) {2371case RESUME_FALSE:2372am_run(&state,0);2373break;2374case RESUME_APPLY:2375am_run(&state,1);2376break;2377case RESUME_RESOLVED:2378am_resolve(&state);2379break;2380case RESUME_SKIP:2381am_skip(&state);2382break;2383case RESUME_ABORT:2384am_abort(&state);2385break;2386default:2387die("BUG: invalid resume value");2388}23892390am_state_release(&state);23912392return0;2393}