1/* 2 * Builtin "git am" 3 * 4 * Based on git-am.sh by Junio C Hamano. 5 */ 6#include"cache.h" 7#include"config.h" 8#include"builtin.h" 9#include"exec_cmd.h" 10#include"parse-options.h" 11#include"dir.h" 12#include"run-command.h" 13#include"quote.h" 14#include"tempfile.h" 15#include"lockfile.h" 16#include"cache-tree.h" 17#include"refs.h" 18#include"commit.h" 19#include"diff.h" 20#include"diffcore.h" 21#include"unpack-trees.h" 22#include"branch.h" 23#include"sequencer.h" 24#include"revision.h" 25#include"merge-recursive.h" 26#include"revision.h" 27#include"log-tree.h" 28#include"notes-utils.h" 29#include"rerere.h" 30#include"prompt.h" 31#include"mailinfo.h" 32#include"apply.h" 33#include"string-list.h" 34#include"packfile.h" 35 36/** 37 * Returns 1 if the file is empty or does not exist, 0 otherwise. 38 */ 39static intis_empty_file(const char*filename) 40{ 41struct stat st; 42 43if(stat(filename, &st) <0) { 44if(errno == ENOENT) 45return1; 46die_errno(_("could not stat%s"), filename); 47} 48 49return!st.st_size; 50} 51 52/** 53 * Returns the length of the first line of msg. 54 */ 55static intlinelen(const char*msg) 56{ 57returnstrchrnul(msg,'\n') - msg; 58} 59 60/** 61 * Returns true if `str` consists of only whitespace, false otherwise. 62 */ 63static intstr_isspace(const char*str) 64{ 65for(; *str; str++) 66if(!isspace(*str)) 67return0; 68 69return1; 70} 71 72enum patch_format { 73 PATCH_FORMAT_UNKNOWN =0, 74 PATCH_FORMAT_MBOX, 75 PATCH_FORMAT_STGIT, 76 PATCH_FORMAT_STGIT_SERIES, 77 PATCH_FORMAT_HG, 78 PATCH_FORMAT_MBOXRD 79}; 80 81enum keep_type { 82 KEEP_FALSE =0, 83 KEEP_TRUE,/* pass -k flag to git-mailinfo */ 84 KEEP_NON_PATCH /* pass -b flag to git-mailinfo */ 85}; 86 87enum scissors_type { 88 SCISSORS_UNSET = -1, 89 SCISSORS_FALSE =0,/* pass --no-scissors to git-mailinfo */ 90 SCISSORS_TRUE /* pass --scissors to git-mailinfo */ 91}; 92 93enum signoff_type { 94 SIGNOFF_FALSE =0, 95 SIGNOFF_TRUE =1, 96 SIGNOFF_EXPLICIT /* --signoff was set on the command-line */ 97}; 98 99struct am_state { 100/* state directory path */ 101char*dir; 102 103/* current and last patch numbers, 1-indexed */ 104int cur; 105int last; 106 107/* commit metadata and message */ 108char*author_name; 109char*author_email; 110char*author_date; 111char*msg; 112size_t msg_len; 113 114/* when --rebasing, records the original commit the patch came from */ 115struct object_id orig_commit; 116 117/* number of digits in patch filename */ 118int prec; 119 120/* various operating modes and command line options */ 121int interactive; 122int threeway; 123int quiet; 124int signoff;/* enum signoff_type */ 125int utf8; 126int keep;/* enum keep_type */ 127int message_id; 128int scissors;/* enum scissors_type */ 129struct argv_array git_apply_opts; 130const char*resolvemsg; 131int committer_date_is_author_date; 132int ignore_date; 133int allow_rerere_autoupdate; 134const char*sign_commit; 135int rebasing; 136}; 137 138/** 139 * Initializes am_state with the default values. 140 */ 141static voidam_state_init(struct am_state *state) 142{ 143int gpgsign; 144 145memset(state,0,sizeof(*state)); 146 147 state->dir =git_pathdup("rebase-apply"); 148 149 state->prec =4; 150 151git_config_get_bool("am.threeway", &state->threeway); 152 153 state->utf8 =1; 154 155git_config_get_bool("am.messageid", &state->message_id); 156 157 state->scissors = SCISSORS_UNSET; 158 159argv_array_init(&state->git_apply_opts); 160 161if(!git_config_get_bool("commit.gpgsign", &gpgsign)) 162 state->sign_commit = gpgsign ?"": NULL; 163} 164 165/** 166 * Releases memory allocated by an am_state. 167 */ 168static voidam_state_release(struct am_state *state) 169{ 170free(state->dir); 171free(state->author_name); 172free(state->author_email); 173free(state->author_date); 174free(state->msg); 175argv_array_clear(&state->git_apply_opts); 176} 177 178/** 179 * Returns path relative to the am_state directory. 180 */ 181staticinlineconst char*am_path(const struct am_state *state,const char*path) 182{ 183returnmkpath("%s/%s", state->dir, path); 184} 185 186/** 187 * For convenience to call write_file() 188 */ 189static voidwrite_state_text(const struct am_state *state, 190const char*name,const char*string) 191{ 192write_file(am_path(state, name),"%s", string); 193} 194 195static voidwrite_state_count(const struct am_state *state, 196const char*name,int value) 197{ 198write_file(am_path(state, name),"%d", value); 199} 200 201static voidwrite_state_bool(const struct am_state *state, 202const char*name,int value) 203{ 204write_state_text(state, name, value ?"t":"f"); 205} 206 207/** 208 * If state->quiet is false, calls fprintf(fp, fmt, ...), and appends a newline 209 * at the end. 210 */ 211static voidsay(const struct am_state *state,FILE*fp,const char*fmt, ...) 212{ 213va_list ap; 214 215va_start(ap, fmt); 216if(!state->quiet) { 217vfprintf(fp, fmt, ap); 218putc('\n', fp); 219} 220va_end(ap); 221} 222 223/** 224 * Returns 1 if there is an am session in progress, 0 otherwise. 225 */ 226static intam_in_progress(const struct am_state *state) 227{ 228struct stat st; 229 230if(lstat(state->dir, &st) <0|| !S_ISDIR(st.st_mode)) 231return0; 232if(lstat(am_path(state,"last"), &st) || !S_ISREG(st.st_mode)) 233return0; 234if(lstat(am_path(state,"next"), &st) || !S_ISREG(st.st_mode)) 235return0; 236return1; 237} 238 239/** 240 * Reads the contents of `file` in the `state` directory into `sb`. Returns the 241 * number of bytes read on success, -1 if the file does not exist. If `trim` is 242 * set, trailing whitespace will be removed. 243 */ 244static intread_state_file(struct strbuf *sb,const struct am_state *state, 245const char*file,int trim) 246{ 247strbuf_reset(sb); 248 249if(strbuf_read_file(sb,am_path(state, file),0) >=0) { 250if(trim) 251strbuf_trim(sb); 252 253return sb->len; 254} 255 256if(errno == ENOENT) 257return-1; 258 259die_errno(_("could not read '%s'"),am_path(state, file)); 260} 261 262/** 263 * Take a series of KEY='VALUE' lines where VALUE part is 264 * sq-quoted, and append <KEY, VALUE> at the end of the string list 265 */ 266static intparse_key_value_squoted(char*buf,struct string_list *list) 267{ 268while(*buf) { 269struct string_list_item *item; 270char*np; 271char*cp =strchr(buf,'='); 272if(!cp) 273return-1; 274 np =strchrnul(cp,'\n'); 275*cp++ ='\0'; 276 item =string_list_append(list, buf); 277 278 buf = np + (*np =='\n'); 279*np ='\0'; 280 cp =sq_dequote(cp); 281if(!cp) 282return-1; 283 item->util =xstrdup(cp); 284} 285return0; 286} 287 288/** 289 * Reads and parses the state directory's "author-script" file, and sets 290 * state->author_name, state->author_email and state->author_date accordingly. 291 * Returns 0 on success, -1 if the file could not be parsed. 292 * 293 * The author script is of the format: 294 * 295 * GIT_AUTHOR_NAME='$author_name' 296 * GIT_AUTHOR_EMAIL='$author_email' 297 * GIT_AUTHOR_DATE='$author_date' 298 * 299 * where $author_name, $author_email and $author_date are quoted. We are strict 300 * with our parsing, as the file was meant to be eval'd in the old git-am.sh 301 * script, and thus if the file differs from what this function expects, it is 302 * better to bail out than to do something that the user does not expect. 303 */ 304static intread_author_script(struct am_state *state) 305{ 306const char*filename =am_path(state,"author-script"); 307struct strbuf buf = STRBUF_INIT; 308struct string_list kv = STRING_LIST_INIT_DUP; 309int retval = -1;/* assume failure */ 310int fd; 311 312assert(!state->author_name); 313assert(!state->author_email); 314assert(!state->author_date); 315 316 fd =open(filename, O_RDONLY); 317if(fd <0) { 318if(errno == ENOENT) 319return0; 320die_errno(_("could not open '%s' for reading"), filename); 321} 322strbuf_read(&buf, fd,0); 323close(fd); 324if(parse_key_value_squoted(buf.buf, &kv)) 325goto finish; 326 327if(kv.nr !=3|| 328strcmp(kv.items[0].string,"GIT_AUTHOR_NAME") || 329strcmp(kv.items[1].string,"GIT_AUTHOR_EMAIL") || 330strcmp(kv.items[2].string,"GIT_AUTHOR_DATE")) 331goto finish; 332 state->author_name = kv.items[0].util; 333 state->author_email = kv.items[1].util; 334 state->author_date = kv.items[2].util; 335 retval =0; 336finish: 337string_list_clear(&kv, !!retval); 338strbuf_release(&buf); 339return retval; 340} 341 342/** 343 * Saves state->author_name, state->author_email and state->author_date in the 344 * state directory's "author-script" file. 345 */ 346static voidwrite_author_script(const struct am_state *state) 347{ 348struct strbuf sb = STRBUF_INIT; 349 350strbuf_addstr(&sb,"GIT_AUTHOR_NAME="); 351sq_quote_buf(&sb, state->author_name); 352strbuf_addch(&sb,'\n'); 353 354strbuf_addstr(&sb,"GIT_AUTHOR_EMAIL="); 355sq_quote_buf(&sb, state->author_email); 356strbuf_addch(&sb,'\n'); 357 358strbuf_addstr(&sb,"GIT_AUTHOR_DATE="); 359sq_quote_buf(&sb, state->author_date); 360strbuf_addch(&sb,'\n'); 361 362write_state_text(state,"author-script", sb.buf); 363 364strbuf_release(&sb); 365} 366 367/** 368 * Reads the commit message from the state directory's "final-commit" file, 369 * setting state->msg to its contents and state->msg_len to the length of its 370 * contents in bytes. 371 * 372 * Returns 0 on success, -1 if the file does not exist. 373 */ 374static intread_commit_msg(struct am_state *state) 375{ 376struct strbuf sb = STRBUF_INIT; 377 378assert(!state->msg); 379 380if(read_state_file(&sb, state,"final-commit",0) <0) { 381strbuf_release(&sb); 382return-1; 383} 384 385 state->msg =strbuf_detach(&sb, &state->msg_len); 386return0; 387} 388 389/** 390 * Saves state->msg in the state directory's "final-commit" file. 391 */ 392static voidwrite_commit_msg(const struct am_state *state) 393{ 394const char*filename =am_path(state,"final-commit"); 395write_file_buf(filename, state->msg, state->msg_len); 396} 397 398/** 399 * Loads state from disk. 400 */ 401static voidam_load(struct am_state *state) 402{ 403struct strbuf sb = STRBUF_INIT; 404 405if(read_state_file(&sb, state,"next",1) <0) 406die("BUG: state file 'next' does not exist"); 407 state->cur =strtol(sb.buf, NULL,10); 408 409if(read_state_file(&sb, state,"last",1) <0) 410die("BUG: state file 'last' does not exist"); 411 state->last =strtol(sb.buf, NULL,10); 412 413if(read_author_script(state) <0) 414die(_("could not parse author script")); 415 416read_commit_msg(state); 417 418if(read_state_file(&sb, state,"original-commit",1) <0) 419oidclr(&state->orig_commit); 420else if(get_oid_hex(sb.buf, &state->orig_commit) <0) 421die(_("could not parse%s"),am_path(state,"original-commit")); 422 423read_state_file(&sb, state,"threeway",1); 424 state->threeway = !strcmp(sb.buf,"t"); 425 426read_state_file(&sb, state,"quiet",1); 427 state->quiet = !strcmp(sb.buf,"t"); 428 429read_state_file(&sb, state,"sign",1); 430 state->signoff = !strcmp(sb.buf,"t"); 431 432read_state_file(&sb, state,"utf8",1); 433 state->utf8 = !strcmp(sb.buf,"t"); 434 435if(file_exists(am_path(state,"rerere-autoupdate"))) { 436read_state_file(&sb, state,"rerere-autoupdate",1); 437 state->allow_rerere_autoupdate =strcmp(sb.buf,"t") ? 438 RERERE_NOAUTOUPDATE : RERERE_AUTOUPDATE; 439}else{ 440 state->allow_rerere_autoupdate =0; 441} 442 443read_state_file(&sb, state,"keep",1); 444if(!strcmp(sb.buf,"t")) 445 state->keep = KEEP_TRUE; 446else if(!strcmp(sb.buf,"b")) 447 state->keep = KEEP_NON_PATCH; 448else 449 state->keep = KEEP_FALSE; 450 451read_state_file(&sb, state,"messageid",1); 452 state->message_id = !strcmp(sb.buf,"t"); 453 454read_state_file(&sb, state,"scissors",1); 455if(!strcmp(sb.buf,"t")) 456 state->scissors = SCISSORS_TRUE; 457else if(!strcmp(sb.buf,"f")) 458 state->scissors = SCISSORS_FALSE; 459else 460 state->scissors = SCISSORS_UNSET; 461 462read_state_file(&sb, state,"apply-opt",1); 463argv_array_clear(&state->git_apply_opts); 464if(sq_dequote_to_argv_array(sb.buf, &state->git_apply_opts) <0) 465die(_("could not parse%s"),am_path(state,"apply-opt")); 466 467 state->rebasing = !!file_exists(am_path(state,"rebasing")); 468 469strbuf_release(&sb); 470} 471 472/** 473 * Removes the am_state directory, forcefully terminating the current am 474 * session. 475 */ 476static voidam_destroy(const struct am_state *state) 477{ 478struct strbuf sb = STRBUF_INIT; 479 480strbuf_addstr(&sb, state->dir); 481remove_dir_recursively(&sb,0); 482strbuf_release(&sb); 483} 484 485/** 486 * Runs applypatch-msg hook. Returns its exit code. 487 */ 488static intrun_applypatch_msg_hook(struct am_state *state) 489{ 490int ret; 491 492assert(state->msg); 493 ret =run_hook_le(NULL,"applypatch-msg",am_path(state,"final-commit"), NULL); 494 495if(!ret) { 496FREE_AND_NULL(state->msg); 497if(read_commit_msg(state) <0) 498die(_("'%s' was deleted by the applypatch-msg hook"), 499am_path(state,"final-commit")); 500} 501 502return ret; 503} 504 505/** 506 * Runs post-rewrite hook. Returns it exit code. 507 */ 508static intrun_post_rewrite_hook(const struct am_state *state) 509{ 510struct child_process cp = CHILD_PROCESS_INIT; 511const char*hook =find_hook("post-rewrite"); 512int ret; 513 514if(!hook) 515return0; 516 517argv_array_push(&cp.args, hook); 518argv_array_push(&cp.args,"rebase"); 519 520 cp.in =xopen(am_path(state,"rewritten"), O_RDONLY); 521 cp.stdout_to_stderr =1; 522 523 ret =run_command(&cp); 524 525close(cp.in); 526return ret; 527} 528 529/** 530 * Reads the state directory's "rewritten" file, and copies notes from the old 531 * commits listed in the file to their rewritten commits. 532 * 533 * Returns 0 on success, -1 on failure. 534 */ 535static intcopy_notes_for_rebase(const struct am_state *state) 536{ 537struct notes_rewrite_cfg *c; 538struct strbuf sb = STRBUF_INIT; 539const char*invalid_line =_("Malformed input line: '%s'."); 540const char*msg ="Notes added by 'git rebase'"; 541FILE*fp; 542int ret =0; 543 544assert(state->rebasing); 545 546 c =init_copy_notes_for_rewrite("rebase"); 547if(!c) 548return0; 549 550 fp =xfopen(am_path(state,"rewritten"),"r"); 551 552while(!strbuf_getline_lf(&sb, fp)) { 553struct object_id from_obj, to_obj; 554 555if(sb.len != GIT_SHA1_HEXSZ *2+1) { 556 ret =error(invalid_line, sb.buf); 557goto finish; 558} 559 560if(get_oid_hex(sb.buf, &from_obj)) { 561 ret =error(invalid_line, sb.buf); 562goto finish; 563} 564 565if(sb.buf[GIT_SHA1_HEXSZ] !=' ') { 566 ret =error(invalid_line, sb.buf); 567goto finish; 568} 569 570if(get_oid_hex(sb.buf + GIT_SHA1_HEXSZ +1, &to_obj)) { 571 ret =error(invalid_line, sb.buf); 572goto finish; 573} 574 575if(copy_note_for_rewrite(c, &from_obj, &to_obj)) 576 ret =error(_("Failed to copy notes from '%s' to '%s'"), 577oid_to_hex(&from_obj),oid_to_hex(&to_obj)); 578} 579 580finish: 581finish_copy_notes_for_rewrite(c, msg); 582fclose(fp); 583strbuf_release(&sb); 584return ret; 585} 586 587/** 588 * Determines if the file looks like a piece of RFC2822 mail by grabbing all 589 * non-indented lines and checking if they look like they begin with valid 590 * header field names. 591 * 592 * Returns 1 if the file looks like a piece of mail, 0 otherwise. 593 */ 594static intis_mail(FILE*fp) 595{ 596const char*header_regex ="^[!-9;-~]+:"; 597struct strbuf sb = STRBUF_INIT; 598 regex_t regex; 599int ret =1; 600 601if(fseek(fp,0L, SEEK_SET)) 602die_errno(_("fseek failed")); 603 604if(regcomp(®ex, header_regex, REG_NOSUB | REG_EXTENDED)) 605die("invalid pattern:%s", header_regex); 606 607while(!strbuf_getline(&sb, fp)) { 608if(!sb.len) 609break;/* End of header */ 610 611/* Ignore indented folded lines */ 612if(*sb.buf =='\t'|| *sb.buf ==' ') 613continue; 614 615/* It's a header if it matches header_regex */ 616if(regexec(®ex, sb.buf,0, NULL,0)) { 617 ret =0; 618goto done; 619} 620} 621 622done: 623regfree(®ex); 624strbuf_release(&sb); 625return ret; 626} 627 628/** 629 * Attempts to detect the patch_format of the patches contained in `paths`, 630 * returning the PATCH_FORMAT_* enum value. Returns PATCH_FORMAT_UNKNOWN if 631 * detection fails. 632 */ 633static intdetect_patch_format(const char**paths) 634{ 635enum patch_format ret = PATCH_FORMAT_UNKNOWN; 636struct strbuf l1 = STRBUF_INIT; 637struct strbuf l2 = STRBUF_INIT; 638struct strbuf l3 = STRBUF_INIT; 639FILE*fp; 640 641/* 642 * We default to mbox format if input is from stdin and for directories 643 */ 644if(!*paths || !strcmp(*paths,"-") ||is_directory(*paths)) 645return PATCH_FORMAT_MBOX; 646 647/* 648 * Otherwise, check the first few lines of the first patch, starting 649 * from the first non-blank line, to try to detect its format. 650 */ 651 652 fp =xfopen(*paths,"r"); 653 654while(!strbuf_getline(&l1, fp)) { 655if(l1.len) 656break; 657} 658 659if(starts_with(l1.buf,"From ") ||starts_with(l1.buf,"From: ")) { 660 ret = PATCH_FORMAT_MBOX; 661goto done; 662} 663 664if(starts_with(l1.buf,"# This series applies on GIT commit")) { 665 ret = PATCH_FORMAT_STGIT_SERIES; 666goto done; 667} 668 669if(!strcmp(l1.buf,"# HG changeset patch")) { 670 ret = PATCH_FORMAT_HG; 671goto done; 672} 673 674strbuf_getline(&l2, fp); 675strbuf_getline(&l3, fp); 676 677/* 678 * If the second line is empty and the third is a From, Author or Date 679 * entry, this is likely an StGit patch. 680 */ 681if(l1.len && !l2.len && 682(starts_with(l3.buf,"From:") || 683starts_with(l3.buf,"Author:") || 684starts_with(l3.buf,"Date:"))) { 685 ret = PATCH_FORMAT_STGIT; 686goto done; 687} 688 689if(l1.len &&is_mail(fp)) { 690 ret = PATCH_FORMAT_MBOX; 691goto done; 692} 693 694done: 695fclose(fp); 696strbuf_release(&l1); 697strbuf_release(&l2); 698strbuf_release(&l3); 699return ret; 700} 701 702/** 703 * Splits out individual email patches from `paths`, where each path is either 704 * a mbox file or a Maildir. Returns 0 on success, -1 on failure. 705 */ 706static intsplit_mail_mbox(struct am_state *state,const char**paths, 707int keep_cr,int mboxrd) 708{ 709struct child_process cp = CHILD_PROCESS_INIT; 710struct strbuf last = STRBUF_INIT; 711int ret; 712 713 cp.git_cmd =1; 714argv_array_push(&cp.args,"mailsplit"); 715argv_array_pushf(&cp.args,"-d%d", state->prec); 716argv_array_pushf(&cp.args,"-o%s", state->dir); 717argv_array_push(&cp.args,"-b"); 718if(keep_cr) 719argv_array_push(&cp.args,"--keep-cr"); 720if(mboxrd) 721argv_array_push(&cp.args,"--mboxrd"); 722argv_array_push(&cp.args,"--"); 723argv_array_pushv(&cp.args, paths); 724 725 ret =capture_command(&cp, &last,8); 726if(ret) 727goto exit; 728 729 state->cur =1; 730 state->last =strtol(last.buf, NULL,10); 731 732exit: 733strbuf_release(&last); 734return ret ? -1:0; 735} 736 737/** 738 * Callback signature for split_mail_conv(). The foreign patch should be 739 * read from `in`, and the converted patch (in RFC2822 mail format) should be 740 * written to `out`. Return 0 on success, or -1 on failure. 741 */ 742typedefint(*mail_conv_fn)(FILE*out,FILE*in,int keep_cr); 743 744/** 745 * Calls `fn` for each file in `paths` to convert the foreign patch to the 746 * RFC2822 mail format suitable for parsing with git-mailinfo. 747 * 748 * Returns 0 on success, -1 on failure. 749 */ 750static intsplit_mail_conv(mail_conv_fn fn,struct am_state *state, 751const char**paths,int keep_cr) 752{ 753static const char*stdin_only[] = {"-", NULL}; 754int i; 755 756if(!*paths) 757 paths = stdin_only; 758 759for(i =0; *paths; paths++, i++) { 760FILE*in, *out; 761const char*mail; 762int ret; 763 764if(!strcmp(*paths,"-")) 765 in = stdin; 766else 767 in =fopen(*paths,"r"); 768 769if(!in) 770returnerror_errno(_("could not open '%s' for reading"), 771*paths); 772 773 mail =mkpath("%s/%0*d", state->dir, state->prec, i +1); 774 775 out =fopen(mail,"w"); 776if(!out) { 777if(in != stdin) 778fclose(in); 779returnerror_errno(_("could not open '%s' for writing"), 780 mail); 781} 782 783 ret =fn(out, in, keep_cr); 784 785fclose(out); 786if(in != stdin) 787fclose(in); 788 789if(ret) 790returnerror(_("could not parse patch '%s'"), *paths); 791} 792 793 state->cur =1; 794 state->last = i; 795return0; 796} 797 798/** 799 * A split_mail_conv() callback that converts an StGit patch to an RFC2822 800 * message suitable for parsing with git-mailinfo. 801 */ 802static intstgit_patch_to_mail(FILE*out,FILE*in,int keep_cr) 803{ 804struct strbuf sb = STRBUF_INIT; 805int subject_printed =0; 806 807while(!strbuf_getline_lf(&sb, in)) { 808const char*str; 809 810if(str_isspace(sb.buf)) 811continue; 812else if(skip_prefix(sb.buf,"Author:", &str)) 813fprintf(out,"From:%s\n", str); 814else if(starts_with(sb.buf,"From") ||starts_with(sb.buf,"Date")) 815fprintf(out,"%s\n", sb.buf); 816else if(!subject_printed) { 817fprintf(out,"Subject:%s\n", sb.buf); 818 subject_printed =1; 819}else{ 820fprintf(out,"\n%s\n", sb.buf); 821break; 822} 823} 824 825strbuf_reset(&sb); 826while(strbuf_fread(&sb,8192, in) >0) { 827fwrite(sb.buf,1, sb.len, out); 828strbuf_reset(&sb); 829} 830 831strbuf_release(&sb); 832return0; 833} 834 835/** 836 * This function only supports a single StGit series file in `paths`. 837 * 838 * Given an StGit series file, converts the StGit patches in the series into 839 * RFC2822 messages suitable for parsing with git-mailinfo, and queues them in 840 * the state directory. 841 * 842 * Returns 0 on success, -1 on failure. 843 */ 844static intsplit_mail_stgit_series(struct am_state *state,const char**paths, 845int keep_cr) 846{ 847const char*series_dir; 848char*series_dir_buf; 849FILE*fp; 850struct argv_array patches = ARGV_ARRAY_INIT; 851struct strbuf sb = STRBUF_INIT; 852int ret; 853 854if(!paths[0] || paths[1]) 855returnerror(_("Only one StGIT patch series can be applied at once")); 856 857 series_dir_buf =xstrdup(*paths); 858 series_dir =dirname(series_dir_buf); 859 860 fp =fopen(*paths,"r"); 861if(!fp) 862returnerror_errno(_("could not open '%s' for reading"), *paths); 863 864while(!strbuf_getline_lf(&sb, fp)) { 865if(*sb.buf =='#') 866continue;/* skip comment lines */ 867 868argv_array_push(&patches,mkpath("%s/%s", series_dir, sb.buf)); 869} 870 871fclose(fp); 872strbuf_release(&sb); 873free(series_dir_buf); 874 875 ret =split_mail_conv(stgit_patch_to_mail, state, patches.argv, keep_cr); 876 877argv_array_clear(&patches); 878return ret; 879} 880 881/** 882 * A split_patches_conv() callback that converts a mercurial patch to a RFC2822 883 * message suitable for parsing with git-mailinfo. 884 */ 885static inthg_patch_to_mail(FILE*out,FILE*in,int keep_cr) 886{ 887struct strbuf sb = STRBUF_INIT; 888int rc =0; 889 890while(!strbuf_getline_lf(&sb, in)) { 891const char*str; 892 893if(skip_prefix(sb.buf,"# User ", &str)) 894fprintf(out,"From:%s\n", str); 895else if(skip_prefix(sb.buf,"# Date ", &str)) { 896 timestamp_t timestamp; 897long tz, tz2; 898char*end; 899 900 errno =0; 901 timestamp =parse_timestamp(str, &end,10); 902if(errno) { 903 rc =error(_("invalid timestamp")); 904goto exit; 905} 906 907if(!skip_prefix(end," ", &str)) { 908 rc =error(_("invalid Date line")); 909goto exit; 910} 911 912 errno =0; 913 tz =strtol(str, &end,10); 914if(errno) { 915 rc =error(_("invalid timezone offset")); 916goto exit; 917} 918 919if(*end) { 920 rc =error(_("invalid Date line")); 921goto exit; 922} 923 924/* 925 * mercurial's timezone is in seconds west of UTC, 926 * however git's timezone is in hours + minutes east of 927 * UTC. Convert it. 928 */ 929 tz2 =labs(tz) /3600*100+labs(tz) %3600/60; 930if(tz >0) 931 tz2 = -tz2; 932 933fprintf(out,"Date:%s\n",show_date(timestamp, tz2,DATE_MODE(RFC2822))); 934}else if(starts_with(sb.buf,"# ")) { 935continue; 936}else{ 937fprintf(out,"\n%s\n", sb.buf); 938break; 939} 940} 941 942strbuf_reset(&sb); 943while(strbuf_fread(&sb,8192, in) >0) { 944fwrite(sb.buf,1, sb.len, out); 945strbuf_reset(&sb); 946} 947exit: 948strbuf_release(&sb); 949return rc; 950} 951 952/** 953 * Splits a list of files/directories into individual email patches. Each path 954 * in `paths` must be a file/directory that is formatted according to 955 * `patch_format`. 956 * 957 * Once split out, the individual email patches will be stored in the state 958 * directory, with each patch's filename being its index, padded to state->prec 959 * digits. 960 * 961 * state->cur will be set to the index of the first mail, and state->last will 962 * be set to the index of the last mail. 963 * 964 * Set keep_cr to 0 to convert all lines ending with \r\n to end with \n, 1 965 * to disable this behavior, -1 to use the default configured setting. 966 * 967 * Returns 0 on success, -1 on failure. 968 */ 969static intsplit_mail(struct am_state *state,enum patch_format patch_format, 970const char**paths,int keep_cr) 971{ 972if(keep_cr <0) { 973 keep_cr =0; 974git_config_get_bool("am.keepcr", &keep_cr); 975} 976 977switch(patch_format) { 978case PATCH_FORMAT_MBOX: 979returnsplit_mail_mbox(state, paths, keep_cr,0); 980case PATCH_FORMAT_STGIT: 981returnsplit_mail_conv(stgit_patch_to_mail, state, paths, keep_cr); 982case PATCH_FORMAT_STGIT_SERIES: 983returnsplit_mail_stgit_series(state, paths, keep_cr); 984case PATCH_FORMAT_HG: 985returnsplit_mail_conv(hg_patch_to_mail, state, paths, keep_cr); 986case PATCH_FORMAT_MBOXRD: 987returnsplit_mail_mbox(state, paths, keep_cr,1); 988default: 989die("BUG: invalid patch_format"); 990} 991return-1; 992} 993 994/** 995 * Setup a new am session for applying patches 996 */ 997static voidam_setup(struct am_state *state,enum patch_format patch_format, 998const char**paths,int keep_cr) 999{1000struct object_id curr_head;1001const char*str;1002struct strbuf sb = STRBUF_INIT;10031004if(!patch_format)1005 patch_format =detect_patch_format(paths);10061007if(!patch_format) {1008fprintf_ln(stderr,_("Patch format detection failed."));1009exit(128);1010}10111012if(mkdir(state->dir,0777) <0&& errno != EEXIST)1013die_errno(_("failed to create directory '%s'"), state->dir);10141015if(split_mail(state, patch_format, paths, keep_cr) <0) {1016am_destroy(state);1017die(_("Failed to split patches."));1018}10191020if(state->rebasing)1021 state->threeway =1;10221023write_state_bool(state,"threeway", state->threeway);1024write_state_bool(state,"quiet", state->quiet);1025write_state_bool(state,"sign", state->signoff);1026write_state_bool(state,"utf8", state->utf8);10271028if(state->allow_rerere_autoupdate)1029write_state_bool(state,"rerere-autoupdate",1030 state->allow_rerere_autoupdate == RERERE_AUTOUPDATE);10311032switch(state->keep) {1033case KEEP_FALSE:1034 str ="f";1035break;1036case KEEP_TRUE:1037 str ="t";1038break;1039case KEEP_NON_PATCH:1040 str ="b";1041break;1042default:1043die("BUG: invalid value for state->keep");1044}10451046write_state_text(state,"keep", str);1047write_state_bool(state,"messageid", state->message_id);10481049switch(state->scissors) {1050case SCISSORS_UNSET:1051 str ="";1052break;1053case SCISSORS_FALSE:1054 str ="f";1055break;1056case SCISSORS_TRUE:1057 str ="t";1058break;1059default:1060die("BUG: invalid value for state->scissors");1061}1062write_state_text(state,"scissors", str);10631064sq_quote_argv(&sb, state->git_apply_opts.argv);1065write_state_text(state,"apply-opt", sb.buf);10661067if(state->rebasing)1068write_state_text(state,"rebasing","");1069else1070write_state_text(state,"applying","");10711072if(!get_oid("HEAD", &curr_head)) {1073write_state_text(state,"abort-safety",oid_to_hex(&curr_head));1074if(!state->rebasing)1075update_ref("am","ORIG_HEAD", &curr_head, NULL,0,1076 UPDATE_REFS_DIE_ON_ERR);1077}else{1078write_state_text(state,"abort-safety","");1079if(!state->rebasing)1080delete_ref(NULL,"ORIG_HEAD", NULL,0);1081}10821083/*1084 * NOTE: Since the "next" and "last" files determine if an am_state1085 * session is in progress, they should be written last.1086 */10871088write_state_count(state,"next", state->cur);1089write_state_count(state,"last", state->last);10901091strbuf_release(&sb);1092}10931094/**1095 * Increments the patch pointer, and cleans am_state for the application of the1096 * next patch.1097 */1098static voidam_next(struct am_state *state)1099{1100struct object_id head;11011102FREE_AND_NULL(state->author_name);1103FREE_AND_NULL(state->author_email);1104FREE_AND_NULL(state->author_date);1105FREE_AND_NULL(state->msg);1106 state->msg_len =0;11071108unlink(am_path(state,"author-script"));1109unlink(am_path(state,"final-commit"));11101111oidclr(&state->orig_commit);1112unlink(am_path(state,"original-commit"));11131114if(!get_oid("HEAD", &head))1115write_state_text(state,"abort-safety",oid_to_hex(&head));1116else1117write_state_text(state,"abort-safety","");11181119 state->cur++;1120write_state_count(state,"next", state->cur);1121}11221123/**1124 * Returns the filename of the current patch email.1125 */1126static const char*msgnum(const struct am_state *state)1127{1128static struct strbuf sb = STRBUF_INIT;11291130strbuf_reset(&sb);1131strbuf_addf(&sb,"%0*d", state->prec, state->cur);11321133return sb.buf;1134}11351136/**1137 * Refresh and write index.1138 */1139static voidrefresh_and_write_cache(void)1140{1141struct lock_file lock_file = LOCK_INIT;11421143hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);1144refresh_cache(REFRESH_QUIET);1145if(write_locked_index(&the_index, &lock_file, COMMIT_LOCK))1146die(_("unable to write index file"));1147}11481149/**1150 * Dies with a user-friendly message on how to proceed after resolving the1151 * problem. This message can be overridden with state->resolvemsg.1152 */1153static void NORETURN die_user_resolve(const struct am_state *state)1154{1155if(state->resolvemsg) {1156printf_ln("%s", state->resolvemsg);1157}else{1158const char*cmdline = state->interactive ?"git am -i":"git am";11591160printf_ln(_("When you have resolved this problem, run\"%s--continue\"."), cmdline);1161printf_ln(_("If you prefer to skip this patch, run\"%s--skip\"instead."), cmdline);1162printf_ln(_("To restore the original branch and stop patching, run\"%s--abort\"."), cmdline);1163}11641165exit(128);1166}11671168/**1169 * Appends signoff to the "msg" field of the am_state.1170 */1171static voidam_append_signoff(struct am_state *state)1172{1173struct strbuf sb = STRBUF_INIT;11741175strbuf_attach(&sb, state->msg, state->msg_len, state->msg_len);1176append_signoff(&sb,0,0);1177 state->msg =strbuf_detach(&sb, &state->msg_len);1178}11791180/**1181 * Parses `mail` using git-mailinfo, extracting its patch and authorship info.1182 * state->msg will be set to the patch message. state->author_name,1183 * state->author_email and state->author_date will be set to the patch author's1184 * name, email and date respectively. The patch body will be written to the1185 * state directory's "patch" file.1186 *1187 * Returns 1 if the patch should be skipped, 0 otherwise.1188 */1189static intparse_mail(struct am_state *state,const char*mail)1190{1191FILE*fp;1192struct strbuf sb = STRBUF_INIT;1193struct strbuf msg = STRBUF_INIT;1194struct strbuf author_name = STRBUF_INIT;1195struct strbuf author_date = STRBUF_INIT;1196struct strbuf author_email = STRBUF_INIT;1197int ret =0;1198struct mailinfo mi;11991200setup_mailinfo(&mi);12011202if(state->utf8)1203 mi.metainfo_charset =get_commit_output_encoding();1204else1205 mi.metainfo_charset = NULL;12061207switch(state->keep) {1208case KEEP_FALSE:1209break;1210case KEEP_TRUE:1211 mi.keep_subject =1;1212break;1213case KEEP_NON_PATCH:1214 mi.keep_non_patch_brackets_in_subject =1;1215break;1216default:1217die("BUG: invalid value for state->keep");1218}12191220if(state->message_id)1221 mi.add_message_id =1;12221223switch(state->scissors) {1224case SCISSORS_UNSET:1225break;1226case SCISSORS_FALSE:1227 mi.use_scissors =0;1228break;1229case SCISSORS_TRUE:1230 mi.use_scissors =1;1231break;1232default:1233die("BUG: invalid value for state->scissors");1234}12351236 mi.input =xfopen(mail,"r");1237 mi.output =xfopen(am_path(state,"info"),"w");1238if(mailinfo(&mi,am_path(state,"msg"),am_path(state,"patch")))1239die("could not parse patch");12401241fclose(mi.input);1242fclose(mi.output);12431244/* Extract message and author information */1245 fp =xfopen(am_path(state,"info"),"r");1246while(!strbuf_getline_lf(&sb, fp)) {1247const char*x;12481249if(skip_prefix(sb.buf,"Subject: ", &x)) {1250if(msg.len)1251strbuf_addch(&msg,'\n');1252strbuf_addstr(&msg, x);1253}else if(skip_prefix(sb.buf,"Author: ", &x))1254strbuf_addstr(&author_name, x);1255else if(skip_prefix(sb.buf,"Email: ", &x))1256strbuf_addstr(&author_email, x);1257else if(skip_prefix(sb.buf,"Date: ", &x))1258strbuf_addstr(&author_date, x);1259}1260fclose(fp);12611262/* Skip pine's internal folder data */1263if(!strcmp(author_name.buf,"Mail System Internal Data")) {1264 ret =1;1265goto finish;1266}12671268if(is_empty_file(am_path(state,"patch"))) {1269printf_ln(_("Patch is empty."));1270die_user_resolve(state);1271}12721273strbuf_addstr(&msg,"\n\n");1274strbuf_addbuf(&msg, &mi.log_message);1275strbuf_stripspace(&msg,0);12761277assert(!state->author_name);1278 state->author_name =strbuf_detach(&author_name, NULL);12791280assert(!state->author_email);1281 state->author_email =strbuf_detach(&author_email, NULL);12821283assert(!state->author_date);1284 state->author_date =strbuf_detach(&author_date, NULL);12851286assert(!state->msg);1287 state->msg =strbuf_detach(&msg, &state->msg_len);12881289finish:1290strbuf_release(&msg);1291strbuf_release(&author_date);1292strbuf_release(&author_email);1293strbuf_release(&author_name);1294strbuf_release(&sb);1295clear_mailinfo(&mi);1296return ret;1297}12981299/**1300 * Sets commit_id to the commit hash where the mail was generated from.1301 * Returns 0 on success, -1 on failure.1302 */1303static intget_mail_commit_oid(struct object_id *commit_id,const char*mail)1304{1305struct strbuf sb = STRBUF_INIT;1306FILE*fp =xfopen(mail,"r");1307const char*x;1308int ret =0;13091310if(strbuf_getline_lf(&sb, fp) ||1311!skip_prefix(sb.buf,"From ", &x) ||1312get_oid_hex(x, commit_id) <0)1313 ret = -1;13141315strbuf_release(&sb);1316fclose(fp);1317return ret;1318}13191320/**1321 * Sets state->msg, state->author_name, state->author_email, state->author_date1322 * to the commit's respective info.1323 */1324static voidget_commit_info(struct am_state *state,struct commit *commit)1325{1326const char*buffer, *ident_line, *msg;1327size_t ident_len;1328struct ident_split id;13291330 buffer =logmsg_reencode(commit, NULL,get_commit_output_encoding());13311332 ident_line =find_commit_header(buffer,"author", &ident_len);13331334if(split_ident_line(&id, ident_line, ident_len) <0)1335die(_("invalid ident line: %.*s"), (int)ident_len, ident_line);13361337assert(!state->author_name);1338if(id.name_begin)1339 state->author_name =1340xmemdupz(id.name_begin, id.name_end - id.name_begin);1341else1342 state->author_name =xstrdup("");13431344assert(!state->author_email);1345if(id.mail_begin)1346 state->author_email =1347xmemdupz(id.mail_begin, id.mail_end - id.mail_begin);1348else1349 state->author_email =xstrdup("");13501351assert(!state->author_date);1352 state->author_date =xstrdup(show_ident_date(&id,DATE_MODE(NORMAL)));13531354assert(!state->msg);1355 msg =strstr(buffer,"\n\n");1356if(!msg)1357die(_("unable to parse commit%s"),oid_to_hex(&commit->object.oid));1358 state->msg =xstrdup(msg +2);1359 state->msg_len =strlen(state->msg);1360unuse_commit_buffer(commit, buffer);1361}13621363/**1364 * Writes `commit` as a patch to the state directory's "patch" file.1365 */1366static voidwrite_commit_patch(const struct am_state *state,struct commit *commit)1367{1368struct rev_info rev_info;1369FILE*fp;13701371 fp =xfopen(am_path(state,"patch"),"w");1372init_revisions(&rev_info, NULL);1373 rev_info.diff =1;1374 rev_info.abbrev =0;1375 rev_info.disable_stdin =1;1376 rev_info.show_root_diff =1;1377 rev_info.diffopt.output_format = DIFF_FORMAT_PATCH;1378 rev_info.no_commit_id =1;1379 rev_info.diffopt.flags.binary =1;1380 rev_info.diffopt.flags.full_index =1;1381 rev_info.diffopt.use_color =0;1382 rev_info.diffopt.file = fp;1383 rev_info.diffopt.close_file =1;1384add_pending_object(&rev_info, &commit->object,"");1385diff_setup_done(&rev_info.diffopt);1386log_tree_commit(&rev_info, commit);1387}13881389/**1390 * Writes the diff of the index against HEAD as a patch to the state1391 * directory's "patch" file.1392 */1393static voidwrite_index_patch(const struct am_state *state)1394{1395struct tree *tree;1396struct object_id head;1397struct rev_info rev_info;1398FILE*fp;13991400if(!get_oid_tree("HEAD", &head))1401 tree =lookup_tree(&head);1402else1403 tree =lookup_tree(the_hash_algo->empty_tree);14041405 fp =xfopen(am_path(state,"patch"),"w");1406init_revisions(&rev_info, NULL);1407 rev_info.diff =1;1408 rev_info.disable_stdin =1;1409 rev_info.no_commit_id =1;1410 rev_info.diffopt.output_format = DIFF_FORMAT_PATCH;1411 rev_info.diffopt.use_color =0;1412 rev_info.diffopt.file = fp;1413 rev_info.diffopt.close_file =1;1414add_pending_object(&rev_info, &tree->object,"");1415diff_setup_done(&rev_info.diffopt);1416run_diff_index(&rev_info,1);1417}14181419/**1420 * Like parse_mail(), but parses the mail by looking up its commit ID1421 * directly. This is used in --rebasing mode to bypass git-mailinfo's munging1422 * of patches.1423 *1424 * state->orig_commit will be set to the original commit ID.1425 *1426 * Will always return 0 as the patch should never be skipped.1427 */1428static intparse_mail_rebase(struct am_state *state,const char*mail)1429{1430struct commit *commit;1431struct object_id commit_oid;14321433if(get_mail_commit_oid(&commit_oid, mail) <0)1434die(_("could not parse%s"), mail);14351436 commit =lookup_commit_or_die(&commit_oid, mail);14371438get_commit_info(state, commit);14391440write_commit_patch(state, commit);14411442oidcpy(&state->orig_commit, &commit_oid);1443write_state_text(state,"original-commit",oid_to_hex(&commit_oid));14441445return0;1446}14471448/**1449 * Applies current patch with git-apply. Returns 0 on success, -1 otherwise. If1450 * `index_file` is not NULL, the patch will be applied to that index.1451 */1452static intrun_apply(const struct am_state *state,const char*index_file)1453{1454struct argv_array apply_paths = ARGV_ARRAY_INIT;1455struct argv_array apply_opts = ARGV_ARRAY_INIT;1456struct apply_state apply_state;1457int res, opts_left;1458int force_apply =0;1459int options =0;14601461if(init_apply_state(&apply_state, NULL))1462die("BUG: init_apply_state() failed");14631464argv_array_push(&apply_opts,"apply");1465argv_array_pushv(&apply_opts, state->git_apply_opts.argv);14661467 opts_left =apply_parse_options(apply_opts.argc, apply_opts.argv,1468&apply_state, &force_apply, &options,1469 NULL);14701471if(opts_left !=0)1472die("unknown option passed through to git apply");14731474if(index_file) {1475 apply_state.index_file = index_file;1476 apply_state.cached =1;1477}else1478 apply_state.check_index =1;14791480/*1481 * If we are allowed to fall back on 3-way merge, don't give false1482 * errors during the initial attempt.1483 */1484if(state->threeway && !index_file)1485 apply_state.apply_verbosity = verbosity_silent;14861487if(check_apply_state(&apply_state, force_apply))1488die("BUG: check_apply_state() failed");14891490argv_array_push(&apply_paths,am_path(state,"patch"));14911492 res =apply_all_patches(&apply_state, apply_paths.argc, apply_paths.argv, options);14931494argv_array_clear(&apply_paths);1495argv_array_clear(&apply_opts);1496clear_apply_state(&apply_state);14971498if(res)1499return res;15001501if(index_file) {1502/* Reload index as apply_all_patches() will have modified it. */1503discard_cache();1504read_cache_from(index_file);1505}15061507return0;1508}15091510/**1511 * Builds an index that contains just the blobs needed for a 3way merge.1512 */1513static intbuild_fake_ancestor(const struct am_state *state,const char*index_file)1514{1515struct child_process cp = CHILD_PROCESS_INIT;15161517 cp.git_cmd =1;1518argv_array_push(&cp.args,"apply");1519argv_array_pushv(&cp.args, state->git_apply_opts.argv);1520argv_array_pushf(&cp.args,"--build-fake-ancestor=%s", index_file);1521argv_array_push(&cp.args,am_path(state,"patch"));15221523if(run_command(&cp))1524return-1;15251526return0;1527}15281529/**1530 * Attempt a threeway merge, using index_path as the temporary index.1531 */1532static intfall_back_threeway(const struct am_state *state,const char*index_path)1533{1534struct object_id orig_tree, their_tree, our_tree;1535const struct object_id *bases[1] = { &orig_tree };1536struct merge_options o;1537struct commit *result;1538char*their_tree_name;15391540if(get_oid("HEAD", &our_tree) <0)1541hashcpy(our_tree.hash, EMPTY_TREE_SHA1_BIN);15421543if(build_fake_ancestor(state, index_path))1544returnerror("could not build fake ancestor");15451546discard_cache();1547read_cache_from(index_path);15481549if(write_index_as_tree(orig_tree.hash, &the_index, index_path,0, NULL))1550returnerror(_("Repository lacks necessary blobs to fall back on 3-way merge."));15511552say(state, stdout,_("Using index info to reconstruct a base tree..."));15531554if(!state->quiet) {1555/*1556 * List paths that needed 3-way fallback, so that the user can1557 * review them with extra care to spot mismerges.1558 */1559struct rev_info rev_info;1560const char*diff_filter_str ="--diff-filter=AM";15611562init_revisions(&rev_info, NULL);1563 rev_info.diffopt.output_format = DIFF_FORMAT_NAME_STATUS;1564diff_opt_parse(&rev_info.diffopt, &diff_filter_str,1, rev_info.prefix);1565add_pending_oid(&rev_info,"HEAD", &our_tree,0);1566diff_setup_done(&rev_info.diffopt);1567run_diff_index(&rev_info,1);1568}15691570if(run_apply(state, index_path))1571returnerror(_("Did you hand edit your patch?\n"1572"It does not apply to blobs recorded in its index."));15731574if(write_index_as_tree(their_tree.hash, &the_index, index_path,0, NULL))1575returnerror("could not write tree");15761577say(state, stdout,_("Falling back to patching base and 3-way merge..."));15781579discard_cache();1580read_cache();15811582/*1583 * This is not so wrong. Depending on which base we picked, orig_tree1584 * may be wildly different from ours, but their_tree has the same set of1585 * wildly different changes in parts the patch did not touch, so1586 * recursive ends up canceling them, saying that we reverted all those1587 * changes.1588 */15891590init_merge_options(&o);15911592 o.branch1 ="HEAD";1593 their_tree_name =xstrfmt("%.*s",linelen(state->msg), state->msg);1594 o.branch2 = their_tree_name;15951596if(state->quiet)1597 o.verbosity =0;15981599if(merge_recursive_generic(&o, &our_tree, &their_tree,1, bases, &result)) {1600rerere(state->allow_rerere_autoupdate);1601free(their_tree_name);1602returnerror(_("Failed to merge in the changes."));1603}16041605free(their_tree_name);1606return0;1607}16081609/**1610 * Commits the current index with state->msg as the commit message and1611 * state->author_name, state->author_email and state->author_date as the author1612 * information.1613 */1614static voiddo_commit(const struct am_state *state)1615{1616struct object_id tree, parent, commit;1617const struct object_id *old_oid;1618struct commit_list *parents = NULL;1619const char*reflog_msg, *author;1620struct strbuf sb = STRBUF_INIT;16211622if(run_hook_le(NULL,"pre-applypatch", NULL))1623exit(1);16241625if(write_cache_as_tree(tree.hash,0, NULL))1626die(_("git write-tree failed to write a tree"));16271628if(!get_oid_commit("HEAD", &parent)) {1629 old_oid = &parent;1630commit_list_insert(lookup_commit(&parent), &parents);1631}else{1632 old_oid = NULL;1633say(state, stderr,_("applying to an empty history"));1634}16351636 author =fmt_ident(state->author_name, state->author_email,1637 state->ignore_date ? NULL : state->author_date,1638 IDENT_STRICT);16391640if(state->committer_date_is_author_date)1641setenv("GIT_COMMITTER_DATE",1642 state->ignore_date ?"": state->author_date,1);16431644if(commit_tree(state->msg, state->msg_len, &tree, parents, &commit,1645 author, state->sign_commit))1646die(_("failed to write commit object"));16471648 reflog_msg =getenv("GIT_REFLOG_ACTION");1649if(!reflog_msg)1650 reflog_msg ="am";16511652strbuf_addf(&sb,"%s: %.*s", reflog_msg,linelen(state->msg),1653 state->msg);16541655update_ref(sb.buf,"HEAD", &commit, old_oid,0,1656 UPDATE_REFS_DIE_ON_ERR);16571658if(state->rebasing) {1659FILE*fp =xfopen(am_path(state,"rewritten"),"a");16601661assert(!is_null_oid(&state->orig_commit));1662fprintf(fp,"%s",oid_to_hex(&state->orig_commit));1663fprintf(fp,"%s\n",oid_to_hex(&commit));1664fclose(fp);1665}16661667run_hook_le(NULL,"post-applypatch", NULL);16681669strbuf_release(&sb);1670}16711672/**1673 * Validates the am_state for resuming -- the "msg" and authorship fields must1674 * be filled up.1675 */1676static voidvalidate_resume_state(const struct am_state *state)1677{1678if(!state->msg)1679die(_("cannot resume:%sdoes not exist."),1680am_path(state,"final-commit"));16811682if(!state->author_name || !state->author_email || !state->author_date)1683die(_("cannot resume:%sdoes not exist."),1684am_path(state,"author-script"));1685}16861687/**1688 * Interactively prompt the user on whether the current patch should be1689 * applied.1690 *1691 * Returns 0 if the user chooses to apply the patch, 1 if the user chooses to1692 * skip it.1693 */1694static intdo_interactive(struct am_state *state)1695{1696assert(state->msg);16971698if(!isatty(0))1699die(_("cannot be interactive without stdin connected to a terminal."));17001701for(;;) {1702const char*reply;17031704puts(_("Commit Body is:"));1705puts("--------------------------");1706printf("%s", state->msg);1707puts("--------------------------");17081709/*1710 * TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]1711 * in your translation. The program will only accept English1712 * input at this point.1713 */1714 reply =git_prompt(_("Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "), PROMPT_ECHO);17151716if(!reply) {1717continue;1718}else if(*reply =='y'|| *reply =='Y') {1719return0;1720}else if(*reply =='a'|| *reply =='A') {1721 state->interactive =0;1722return0;1723}else if(*reply =='n'|| *reply =='N') {1724return1;1725}else if(*reply =='e'|| *reply =='E') {1726struct strbuf msg = STRBUF_INIT;17271728if(!launch_editor(am_path(state,"final-commit"), &msg, NULL)) {1729free(state->msg);1730 state->msg =strbuf_detach(&msg, &state->msg_len);1731}1732strbuf_release(&msg);1733}else if(*reply =='v'|| *reply =='V') {1734const char*pager =git_pager(1);1735struct child_process cp = CHILD_PROCESS_INIT;17361737if(!pager)1738 pager ="cat";1739prepare_pager_args(&cp, pager);1740argv_array_push(&cp.args,am_path(state,"patch"));1741run_command(&cp);1742}1743}1744}17451746/**1747 * Applies all queued mail.1748 *1749 * If `resume` is true, we are "resuming". The "msg" and authorship fields, as1750 * well as the state directory's "patch" file is used as-is for applying the1751 * patch and committing it.1752 */1753static voidam_run(struct am_state *state,int resume)1754{1755const char*argv_gc_auto[] = {"gc","--auto", NULL};1756struct strbuf sb = STRBUF_INIT;17571758unlink(am_path(state,"dirtyindex"));17591760refresh_and_write_cache();17611762if(index_has_changes(&sb)) {1763write_state_bool(state,"dirtyindex",1);1764die(_("Dirty index: cannot apply patches (dirty:%s)"), sb.buf);1765}17661767strbuf_release(&sb);17681769while(state->cur <= state->last) {1770const char*mail =am_path(state,msgnum(state));1771int apply_status;17721773reset_ident_date();17741775if(!file_exists(mail))1776goto next;17771778if(resume) {1779validate_resume_state(state);1780}else{1781int skip;17821783if(state->rebasing)1784 skip =parse_mail_rebase(state, mail);1785else1786 skip =parse_mail(state, mail);17871788if(skip)1789goto next;/* mail should be skipped */17901791if(state->signoff)1792am_append_signoff(state);17931794write_author_script(state);1795write_commit_msg(state);1796}17971798if(state->interactive &&do_interactive(state))1799goto next;18001801if(run_applypatch_msg_hook(state))1802exit(1);18031804say(state, stdout,_("Applying: %.*s"),linelen(state->msg), state->msg);18051806 apply_status =run_apply(state, NULL);18071808if(apply_status && state->threeway) {1809struct strbuf sb = STRBUF_INIT;18101811strbuf_addstr(&sb,am_path(state,"patch-merge-index"));1812 apply_status =fall_back_threeway(state, sb.buf);1813strbuf_release(&sb);18141815/*1816 * Applying the patch to an earlier tree and merging1817 * the result may have produced the same tree as ours.1818 */1819if(!apply_status && !index_has_changes(NULL)) {1820say(state, stdout,_("No changes -- Patch already applied."));1821goto next;1822}1823}18241825if(apply_status) {1826int advice_amworkdir =1;18271828printf_ln(_("Patch failed at%s%.*s"),msgnum(state),1829linelen(state->msg), state->msg);18301831git_config_get_bool("advice.amworkdir", &advice_amworkdir);18321833if(advice_amworkdir)1834printf_ln(_("The copy of the patch that failed is found in:%s"),1835am_path(state,"patch"));18361837die_user_resolve(state);1838}18391840do_commit(state);18411842next:1843am_next(state);18441845if(resume)1846am_load(state);1847 resume =0;1848}18491850if(!is_empty_file(am_path(state,"rewritten"))) {1851assert(state->rebasing);1852copy_notes_for_rebase(state);1853run_post_rewrite_hook(state);1854}18551856/*1857 * In rebasing mode, it's up to the caller to take care of1858 * housekeeping.1859 */1860if(!state->rebasing) {1861am_destroy(state);1862close_all_packs();1863run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);1864}1865}18661867/**1868 * Resume the current am session after patch application failure. The user did1869 * all the hard work, and we do not have to do any patch application. Just1870 * trust and commit what the user has in the index and working tree.1871 */1872static voidam_resolve(struct am_state *state)1873{1874validate_resume_state(state);18751876say(state, stdout,_("Applying: %.*s"),linelen(state->msg), state->msg);18771878if(!index_has_changes(NULL)) {1879printf_ln(_("No changes - did you forget to use 'git add'?\n"1880"If there is nothing left to stage, chances are that something else\n"1881"already introduced the same changes; you might want to skip this patch."));1882die_user_resolve(state);1883}18841885if(unmerged_cache()) {1886printf_ln(_("You still have unmerged paths in your index.\n"1887"You should 'git add' each file with resolved conflicts to mark them as such.\n"1888"You might run `git rm` on a file to accept\"deleted by them\"for it."));1889die_user_resolve(state);1890}18911892if(state->interactive) {1893write_index_patch(state);1894if(do_interactive(state))1895goto next;1896}18971898rerere(0);18991900do_commit(state);19011902next:1903am_next(state);1904am_load(state);1905am_run(state,0);1906}19071908/**1909 * Performs a checkout fast-forward from `head` to `remote`. If `reset` is1910 * true, any unmerged entries will be discarded. Returns 0 on success, -1 on1911 * failure.1912 */1913static intfast_forward_to(struct tree *head,struct tree *remote,int reset)1914{1915struct lock_file lock_file = LOCK_INIT;1916struct unpack_trees_options opts;1917struct tree_desc t[2];19181919if(parse_tree(head) ||parse_tree(remote))1920return-1;19211922hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);19231924refresh_cache(REFRESH_QUIET);19251926memset(&opts,0,sizeof(opts));1927 opts.head_idx =1;1928 opts.src_index = &the_index;1929 opts.dst_index = &the_index;1930 opts.update =1;1931 opts.merge =1;1932 opts.reset = reset;1933 opts.fn = twoway_merge;1934init_tree_desc(&t[0], head->buffer, head->size);1935init_tree_desc(&t[1], remote->buffer, remote->size);19361937if(unpack_trees(2, t, &opts)) {1938rollback_lock_file(&lock_file);1939return-1;1940}19411942if(write_locked_index(&the_index, &lock_file, COMMIT_LOCK))1943die(_("unable to write new index file"));19441945return0;1946}19471948/**1949 * Merges a tree into the index. The index's stat info will take precedence1950 * over the merged tree's. Returns 0 on success, -1 on failure.1951 */1952static intmerge_tree(struct tree *tree)1953{1954struct lock_file lock_file = LOCK_INIT;1955struct unpack_trees_options opts;1956struct tree_desc t[1];19571958if(parse_tree(tree))1959return-1;19601961hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);19621963memset(&opts,0,sizeof(opts));1964 opts.head_idx =1;1965 opts.src_index = &the_index;1966 opts.dst_index = &the_index;1967 opts.merge =1;1968 opts.fn = oneway_merge;1969init_tree_desc(&t[0], tree->buffer, tree->size);19701971if(unpack_trees(1, t, &opts)) {1972rollback_lock_file(&lock_file);1973return-1;1974}19751976if(write_locked_index(&the_index, &lock_file, COMMIT_LOCK))1977die(_("unable to write new index file"));19781979return0;1980}19811982/**1983 * Clean the index without touching entries that are not modified between1984 * `head` and `remote`.1985 */1986static intclean_index(const struct object_id *head,const struct object_id *remote)1987{1988struct tree *head_tree, *remote_tree, *index_tree;1989struct object_id index;19901991 head_tree =parse_tree_indirect(head);1992if(!head_tree)1993returnerror(_("Could not parse object '%s'."),oid_to_hex(head));19941995 remote_tree =parse_tree_indirect(remote);1996if(!remote_tree)1997returnerror(_("Could not parse object '%s'."),oid_to_hex(remote));19981999read_cache_unmerged();20002001if(fast_forward_to(head_tree, head_tree,1))2002return-1;20032004if(write_cache_as_tree(index.hash,0, NULL))2005return-1;20062007 index_tree =parse_tree_indirect(&index);2008if(!index_tree)2009returnerror(_("Could not parse object '%s'."),oid_to_hex(&index));20102011if(fast_forward_to(index_tree, remote_tree,0))2012return-1;20132014if(merge_tree(remote_tree))2015return-1;20162017remove_branch_state();20182019return0;2020}20212022/**2023 * Resets rerere's merge resolution metadata.2024 */2025static voidam_rerere_clear(void)2026{2027struct string_list merge_rr = STRING_LIST_INIT_DUP;2028rerere_clear(&merge_rr);2029string_list_clear(&merge_rr,1);2030}20312032/**2033 * Resume the current am session by skipping the current patch.2034 */2035static voidam_skip(struct am_state *state)2036{2037struct object_id head;20382039am_rerere_clear();20402041if(get_oid("HEAD", &head))2042hashcpy(head.hash, EMPTY_TREE_SHA1_BIN);20432044if(clean_index(&head, &head))2045die(_("failed to clean index"));20462047am_next(state);2048am_load(state);2049am_run(state,0);2050}20512052/**2053 * Returns true if it is safe to reset HEAD to the ORIG_HEAD, false otherwise.2054 *2055 * It is not safe to reset HEAD when:2056 * 1. git-am previously failed because the index was dirty.2057 * 2. HEAD has moved since git-am previously failed.2058 */2059static intsafe_to_abort(const struct am_state *state)2060{2061struct strbuf sb = STRBUF_INIT;2062struct object_id abort_safety, head;20632064if(file_exists(am_path(state,"dirtyindex")))2065return0;20662067if(read_state_file(&sb, state,"abort-safety",1) >0) {2068if(get_oid_hex(sb.buf, &abort_safety))2069die(_("could not parse%s"),am_path(state,"abort-safety"));2070}else2071oidclr(&abort_safety);2072strbuf_release(&sb);20732074if(get_oid("HEAD", &head))2075oidclr(&head);20762077if(!oidcmp(&head, &abort_safety))2078return1;20792080warning(_("You seem to have moved HEAD since the last 'am' failure.\n"2081"Not rewinding to ORIG_HEAD"));20822083return0;2084}20852086/**2087 * Aborts the current am session if it is safe to do so.2088 */2089static voidam_abort(struct am_state *state)2090{2091struct object_id curr_head, orig_head;2092int has_curr_head, has_orig_head;2093char*curr_branch;20942095if(!safe_to_abort(state)) {2096am_destroy(state);2097return;2098}20992100am_rerere_clear();21012102 curr_branch =resolve_refdup("HEAD",0, &curr_head, NULL);2103 has_curr_head = curr_branch && !is_null_oid(&curr_head);2104if(!has_curr_head)2105hashcpy(curr_head.hash, EMPTY_TREE_SHA1_BIN);21062107 has_orig_head = !get_oid("ORIG_HEAD", &orig_head);2108if(!has_orig_head)2109hashcpy(orig_head.hash, EMPTY_TREE_SHA1_BIN);21102111clean_index(&curr_head, &orig_head);21122113if(has_orig_head)2114update_ref("am --abort","HEAD", &orig_head,2115 has_curr_head ? &curr_head : NULL,0,2116 UPDATE_REFS_DIE_ON_ERR);2117else if(curr_branch)2118delete_ref(NULL, curr_branch, NULL, REF_NO_DEREF);21192120free(curr_branch);2121am_destroy(state);2122}21232124/**2125 * parse_options() callback that validates and sets opt->value to the2126 * PATCH_FORMAT_* enum value corresponding to `arg`.2127 */2128static intparse_opt_patchformat(const struct option *opt,const char*arg,int unset)2129{2130int*opt_value = opt->value;21312132if(!strcmp(arg,"mbox"))2133*opt_value = PATCH_FORMAT_MBOX;2134else if(!strcmp(arg,"stgit"))2135*opt_value = PATCH_FORMAT_STGIT;2136else if(!strcmp(arg,"stgit-series"))2137*opt_value = PATCH_FORMAT_STGIT_SERIES;2138else if(!strcmp(arg,"hg"))2139*opt_value = PATCH_FORMAT_HG;2140else if(!strcmp(arg,"mboxrd"))2141*opt_value = PATCH_FORMAT_MBOXRD;2142else2143returnerror(_("Invalid value for --patch-format:%s"), arg);2144return0;2145}21462147enum resume_mode {2148 RESUME_FALSE =0,2149 RESUME_APPLY,2150 RESUME_RESOLVED,2151 RESUME_SKIP,2152 RESUME_ABORT2153};21542155static intgit_am_config(const char*k,const char*v,void*cb)2156{2157int status;21582159 status =git_gpg_config(k, v, NULL);2160if(status)2161return status;21622163returngit_default_config(k, v, NULL);2164}21652166intcmd_am(int argc,const char**argv,const char*prefix)2167{2168struct am_state state;2169int binary = -1;2170int keep_cr = -1;2171int patch_format = PATCH_FORMAT_UNKNOWN;2172enum resume_mode resume = RESUME_FALSE;2173int in_progress;21742175const char*const usage[] = {2176N_("git am [<options>] [(<mbox> | <Maildir>)...]"),2177N_("git am [<options>] (--continue | --skip | --abort)"),2178 NULL2179};21802181struct option options[] = {2182OPT_BOOL('i',"interactive", &state.interactive,2183N_("run interactively")),2184OPT_HIDDEN_BOOL('b',"binary", &binary,2185N_("historical option -- no-op")),2186OPT_BOOL('3',"3way", &state.threeway,2187N_("allow fall back on 3way merging if needed")),2188OPT__QUIET(&state.quiet,N_("be quiet")),2189OPT_SET_INT('s',"signoff", &state.signoff,2190N_("add a Signed-off-by line to the commit message"),2191 SIGNOFF_EXPLICIT),2192OPT_BOOL('u',"utf8", &state.utf8,2193N_("recode into utf8 (default)")),2194OPT_SET_INT('k',"keep", &state.keep,2195N_("pass -k flag to git-mailinfo"), KEEP_TRUE),2196OPT_SET_INT(0,"keep-non-patch", &state.keep,2197N_("pass -b flag to git-mailinfo"), KEEP_NON_PATCH),2198OPT_BOOL('m',"message-id", &state.message_id,2199N_("pass -m flag to git-mailinfo")),2200{ OPTION_SET_INT,0,"keep-cr", &keep_cr, NULL,2201N_("pass --keep-cr flag to git-mailsplit for mbox format"),2202 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL,1},2203{ OPTION_SET_INT,0,"no-keep-cr", &keep_cr, NULL,2204N_("do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"),2205 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL,0},2206OPT_BOOL('c',"scissors", &state.scissors,2207N_("strip everything before a scissors line")),2208OPT_PASSTHRU_ARGV(0,"whitespace", &state.git_apply_opts,N_("action"),2209N_("pass it through git-apply"),22100),2211OPT_PASSTHRU_ARGV(0,"ignore-space-change", &state.git_apply_opts, NULL,2212N_("pass it through git-apply"),2213 PARSE_OPT_NOARG),2214OPT_PASSTHRU_ARGV(0,"ignore-whitespace", &state.git_apply_opts, NULL,2215N_("pass it through git-apply"),2216 PARSE_OPT_NOARG),2217OPT_PASSTHRU_ARGV(0,"directory", &state.git_apply_opts,N_("root"),2218N_("pass it through git-apply"),22190),2220OPT_PASSTHRU_ARGV(0,"exclude", &state.git_apply_opts,N_("path"),2221N_("pass it through git-apply"),22220),2223OPT_PASSTHRU_ARGV(0,"include", &state.git_apply_opts,N_("path"),2224N_("pass it through git-apply"),22250),2226OPT_PASSTHRU_ARGV('C', NULL, &state.git_apply_opts,N_("n"),2227N_("pass it through git-apply"),22280),2229OPT_PASSTHRU_ARGV('p', NULL, &state.git_apply_opts,N_("num"),2230N_("pass it through git-apply"),22310),2232OPT_CALLBACK(0,"patch-format", &patch_format,N_("format"),2233N_("format the patch(es) are in"),2234 parse_opt_patchformat),2235OPT_PASSTHRU_ARGV(0,"reject", &state.git_apply_opts, NULL,2236N_("pass it through git-apply"),2237 PARSE_OPT_NOARG),2238OPT_STRING(0,"resolvemsg", &state.resolvemsg, NULL,2239N_("override error message when patch failure occurs")),2240OPT_CMDMODE(0,"continue", &resume,2241N_("continue applying patches after resolving a conflict"),2242 RESUME_RESOLVED),2243OPT_CMDMODE('r',"resolved", &resume,2244N_("synonyms for --continue"),2245 RESUME_RESOLVED),2246OPT_CMDMODE(0,"skip", &resume,2247N_("skip the current patch"),2248 RESUME_SKIP),2249OPT_CMDMODE(0,"abort", &resume,2250N_("restore the original branch and abort the patching operation."),2251 RESUME_ABORT),2252OPT_BOOL(0,"committer-date-is-author-date",2253&state.committer_date_is_author_date,2254N_("lie about committer date")),2255OPT_BOOL(0,"ignore-date", &state.ignore_date,2256N_("use current timestamp for author date")),2257OPT_RERERE_AUTOUPDATE(&state.allow_rerere_autoupdate),2258{ OPTION_STRING,'S',"gpg-sign", &state.sign_commit,N_("key-id"),2259N_("GPG-sign commits"),2260 PARSE_OPT_OPTARG, NULL, (intptr_t)""},2261OPT_HIDDEN_BOOL(0,"rebasing", &state.rebasing,2262N_("(internal use for git-rebase)")),2263OPT_END()2264};22652266if(argc ==2&& !strcmp(argv[1],"-h"))2267usage_with_options(usage, options);22682269git_config(git_am_config, NULL);22702271am_state_init(&state);22722273 in_progress =am_in_progress(&state);2274if(in_progress)2275am_load(&state);22762277 argc =parse_options(argc, argv, prefix, options, usage,0);22782279if(binary >=0)2280fprintf_ln(stderr,_("The -b/--binary option has been a no-op for long time, and\n"2281"it will be removed. Please do not use it anymore."));22822283/* Ensure a valid committer ident can be constructed */2284git_committer_info(IDENT_STRICT);22852286if(read_index_preload(&the_index, NULL) <0)2287die(_("failed to read the index"));22882289if(in_progress) {2290/*2291 * Catch user error to feed us patches when there is a session2292 * in progress:2293 *2294 * 1. mbox path(s) are provided on the command-line.2295 * 2. stdin is not a tty: the user is trying to feed us a patch2296 * from standard input. This is somewhat unreliable -- stdin2297 * could be /dev/null for example and the caller did not2298 * intend to feed us a patch but wanted to continue2299 * unattended.2300 */2301if(argc || (resume == RESUME_FALSE && !isatty(0)))2302die(_("previous rebase directory%sstill exists but mbox given."),2303 state.dir);23042305if(resume == RESUME_FALSE)2306 resume = RESUME_APPLY;23072308if(state.signoff == SIGNOFF_EXPLICIT)2309am_append_signoff(&state);2310}else{2311struct argv_array paths = ARGV_ARRAY_INIT;2312int i;23132314/*2315 * Handle stray state directory in the independent-run case. In2316 * the --rebasing case, it is up to the caller to take care of2317 * stray directories.2318 */2319if(file_exists(state.dir) && !state.rebasing) {2320if(resume == RESUME_ABORT) {2321am_destroy(&state);2322am_state_release(&state);2323return0;2324}23252326die(_("Stray%sdirectory found.\n"2327"Use\"git am --abort\"to remove it."),2328 state.dir);2329}23302331if(resume)2332die(_("Resolve operation not in progress, we are not resuming."));23332334for(i =0; i < argc; i++) {2335if(is_absolute_path(argv[i]) || !prefix)2336argv_array_push(&paths, argv[i]);2337else2338argv_array_push(&paths,mkpath("%s/%s", prefix, argv[i]));2339}23402341am_setup(&state, patch_format, paths.argv, keep_cr);23422343argv_array_clear(&paths);2344}23452346switch(resume) {2347case RESUME_FALSE:2348am_run(&state,0);2349break;2350case RESUME_APPLY:2351am_run(&state,1);2352break;2353case RESUME_RESOLVED:2354am_resolve(&state);2355break;2356case RESUME_SKIP:2357am_skip(&state);2358break;2359case RESUME_ABORT:2360am_abort(&state);2361break;2362default:2363die("BUG: invalid resume value");2364}23652366am_state_release(&state);23672368return0;2369}