builtin / am.con commit mailinfo: support format=flowed (3aa4d81)
   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 int is_empty_file(const char *filename)
  40{
  41        struct stat st;
  42
  43        if (stat(filename, &st) < 0) {
  44                if (errno == ENOENT)
  45                        return 1;
  46                die_errno(_("could not stat %s"), filename);
  47        }
  48
  49        return !st.st_size;
  50}
  51
  52/**
  53 * Returns the length of the first line of msg.
  54 */
  55static int linelen(const char *msg)
  56{
  57        return strchrnul(msg, '\n') - msg;
  58}
  59
  60/**
  61 * Returns true if `str` consists of only whitespace, false otherwise.
  62 */
  63static int str_isspace(const char *str)
  64{
  65        for (; *str; str++)
  66                if (!isspace(*str))
  67                        return 0;
  68
  69        return 1;
  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 */
 101        char *dir;
 102
 103        /* current and last patch numbers, 1-indexed */
 104        int cur;
 105        int last;
 106
 107        /* commit metadata and message */
 108        char *author_name;
 109        char *author_email;
 110        char *author_date;
 111        char *msg;
 112        size_t msg_len;
 113
 114        /* when --rebasing, records the original commit the patch came from */
 115        struct object_id orig_commit;
 116
 117        /* number of digits in patch filename */
 118        int prec;
 119
 120        /* various operating modes and command line options */
 121        int interactive;
 122        int threeway;
 123        int quiet;
 124        int signoff; /* enum signoff_type */
 125        int utf8;
 126        int keep; /* enum keep_type */
 127        int message_id;
 128        int scissors; /* enum scissors_type */
 129        struct argv_array git_apply_opts;
 130        const char *resolvemsg;
 131        int committer_date_is_author_date;
 132        int ignore_date;
 133        int allow_rerere_autoupdate;
 134        const char *sign_commit;
 135        int rebasing;
 136};
 137
 138/**
 139 * Initializes am_state with the default values.
 140 */
 141static void am_state_init(struct am_state *state)
 142{
 143        int gpgsign;
 144
 145        memset(state, 0, sizeof(*state));
 146
 147        state->dir = git_pathdup("rebase-apply");
 148
 149        state->prec = 4;
 150
 151        git_config_get_bool("am.threeway", &state->threeway);
 152
 153        state->utf8 = 1;
 154
 155        git_config_get_bool("am.messageid", &state->message_id);
 156
 157        state->scissors = SCISSORS_UNSET;
 158
 159        argv_array_init(&state->git_apply_opts);
 160
 161        if (!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 void am_state_release(struct am_state *state)
 169{
 170        free(state->dir);
 171        free(state->author_name);
 172        free(state->author_email);
 173        free(state->author_date);
 174        free(state->msg);
 175        argv_array_clear(&state->git_apply_opts);
 176}
 177
 178/**
 179 * Returns path relative to the am_state directory.
 180 */
 181static inline const char *am_path(const struct am_state *state, const char *path)
 182{
 183        return mkpath("%s/%s", state->dir, path);
 184}
 185
 186/**
 187 * For convenience to call write_file()
 188 */
 189static void write_state_text(const struct am_state *state,
 190                             const char *name, const char *string)
 191{
 192        write_file(am_path(state, name), "%s", string);
 193}
 194
 195static void write_state_count(const struct am_state *state,
 196                              const char *name, int value)
 197{
 198        write_file(am_path(state, name), "%d", value);
 199}
 200
 201static void write_state_bool(const struct am_state *state,
 202                             const char *name, int value)
 203{
 204        write_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 void say(const struct am_state *state, FILE *fp, const char *fmt, ...)
 212{
 213        va_list ap;
 214
 215        va_start(ap, fmt);
 216        if (!state->quiet) {
 217                vfprintf(fp, fmt, ap);
 218                putc('\n', fp);
 219        }
 220        va_end(ap);
 221}
 222
 223/**
 224 * Returns 1 if there is an am session in progress, 0 otherwise.
 225 */
 226static int am_in_progress(const struct am_state *state)
 227{
 228        struct stat st;
 229
 230        if (lstat(state->dir, &st) < 0 || !S_ISDIR(st.st_mode))
 231                return 0;
 232        if (lstat(am_path(state, "last"), &st) || !S_ISREG(st.st_mode))
 233                return 0;
 234        if (lstat(am_path(state, "next"), &st) || !S_ISREG(st.st_mode))
 235                return 0;
 236        return 1;
 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 int read_state_file(struct strbuf *sb, const struct am_state *state,
 245                        const char *file, int trim)
 246{
 247        strbuf_reset(sb);
 248
 249        if (strbuf_read_file(sb, am_path(state, file), 0) >= 0) {
 250                if (trim)
 251                        strbuf_trim(sb);
 252
 253                return sb->len;
 254        }
 255
 256        if (errno == ENOENT)
 257                return -1;
 258
 259        die_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 int parse_key_value_squoted(char *buf, struct string_list *list)
 267{
 268        while (*buf) {
 269                struct string_list_item *item;
 270                char *np;
 271                char *cp = strchr(buf, '=');
 272                if (!cp)
 273                        return -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);
 281                if (!cp)
 282                        return -1;
 283                item->util = xstrdup(cp);
 284        }
 285        return 0;
 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 int read_author_script(struct am_state *state)
 305{
 306        const char *filename = am_path(state, "author-script");
 307        struct strbuf buf = STRBUF_INIT;
 308        struct string_list kv = STRING_LIST_INIT_DUP;
 309        int retval = -1; /* assume failure */
 310        int fd;
 311
 312        assert(!state->author_name);
 313        assert(!state->author_email);
 314        assert(!state->author_date);
 315
 316        fd = open(filename, O_RDONLY);
 317        if (fd < 0) {
 318                if (errno == ENOENT)
 319                        return 0;
 320                die_errno(_("could not open '%s' for reading"), filename);
 321        }
 322        strbuf_read(&buf, fd, 0);
 323        close(fd);
 324        if (parse_key_value_squoted(buf.buf, &kv))
 325                goto finish;
 326
 327        if (kv.nr != 3 ||
 328            strcmp(kv.items[0].string, "GIT_AUTHOR_NAME") ||
 329            strcmp(kv.items[1].string, "GIT_AUTHOR_EMAIL") ||
 330            strcmp(kv.items[2].string, "GIT_AUTHOR_DATE"))
 331                goto 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:
 337        string_list_clear(&kv, !!retval);
 338        strbuf_release(&buf);
 339        return 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 void write_author_script(const struct am_state *state)
 347{
 348        struct strbuf sb = STRBUF_INIT;
 349
 350        strbuf_addstr(&sb, "GIT_AUTHOR_NAME=");
 351        sq_quote_buf(&sb, state->author_name);
 352        strbuf_addch(&sb, '\n');
 353
 354        strbuf_addstr(&sb, "GIT_AUTHOR_EMAIL=");
 355        sq_quote_buf(&sb, state->author_email);
 356        strbuf_addch(&sb, '\n');
 357
 358        strbuf_addstr(&sb, "GIT_AUTHOR_DATE=");
 359        sq_quote_buf(&sb, state->author_date);
 360        strbuf_addch(&sb, '\n');
 361
 362        write_state_text(state, "author-script", sb.buf);
 363
 364        strbuf_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 int read_commit_msg(struct am_state *state)
 375{
 376        struct strbuf sb = STRBUF_INIT;
 377
 378        assert(!state->msg);
 379
 380        if (read_state_file(&sb, state, "final-commit", 0) < 0) {
 381                strbuf_release(&sb);
 382                return -1;
 383        }
 384
 385        state->msg = strbuf_detach(&sb, &state->msg_len);
 386        return 0;
 387}
 388
 389/**
 390 * Saves state->msg in the state directory's "final-commit" file.
 391 */
 392static void write_commit_msg(const struct am_state *state)
 393{
 394        const char *filename = am_path(state, "final-commit");
 395        write_file_buf(filename, state->msg, state->msg_len);
 396}
 397
 398/**
 399 * Loads state from disk.
 400 */
 401static void am_load(struct am_state *state)
 402{
 403        struct strbuf sb = STRBUF_INIT;
 404
 405        if (read_state_file(&sb, state, "next", 1) < 0)
 406                BUG("state file 'next' does not exist");
 407        state->cur = strtol(sb.buf, NULL, 10);
 408
 409        if (read_state_file(&sb, state, "last", 1) < 0)
 410                BUG("state file 'last' does not exist");
 411        state->last = strtol(sb.buf, NULL, 10);
 412
 413        if (read_author_script(state) < 0)
 414                die(_("could not parse author script"));
 415
 416        read_commit_msg(state);
 417
 418        if (read_state_file(&sb, state, "original-commit", 1) < 0)
 419                oidclr(&state->orig_commit);
 420        else if (get_oid_hex(sb.buf, &state->orig_commit) < 0)
 421                die(_("could not parse %s"), am_path(state, "original-commit"));
 422
 423        read_state_file(&sb, state, "threeway", 1);
 424        state->threeway = !strcmp(sb.buf, "t");
 425
 426        read_state_file(&sb, state, "quiet", 1);
 427        state->quiet = !strcmp(sb.buf, "t");
 428
 429        read_state_file(&sb, state, "sign", 1);
 430        state->signoff = !strcmp(sb.buf, "t");
 431
 432        read_state_file(&sb, state, "utf8", 1);
 433        state->utf8 = !strcmp(sb.buf, "t");
 434
 435        if (file_exists(am_path(state, "rerere-autoupdate"))) {
 436                read_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
 443        read_state_file(&sb, state, "keep", 1);
 444        if (!strcmp(sb.buf, "t"))
 445                state->keep = KEEP_TRUE;
 446        else if (!strcmp(sb.buf, "b"))
 447                state->keep = KEEP_NON_PATCH;
 448        else
 449                state->keep = KEEP_FALSE;
 450
 451        read_state_file(&sb, state, "messageid", 1);
 452        state->message_id = !strcmp(sb.buf, "t");
 453
 454        read_state_file(&sb, state, "scissors", 1);
 455        if (!strcmp(sb.buf, "t"))
 456                state->scissors = SCISSORS_TRUE;
 457        else if (!strcmp(sb.buf, "f"))
 458                state->scissors = SCISSORS_FALSE;
 459        else
 460                state->scissors = SCISSORS_UNSET;
 461
 462        read_state_file(&sb, state, "apply-opt", 1);
 463        argv_array_clear(&state->git_apply_opts);
 464        if (sq_dequote_to_argv_array(sb.buf, &state->git_apply_opts) < 0)
 465                die(_("could not parse %s"), am_path(state, "apply-opt"));
 466
 467        state->rebasing = !!file_exists(am_path(state, "rebasing"));
 468
 469        strbuf_release(&sb);
 470}
 471
 472/**
 473 * Removes the am_state directory, forcefully terminating the current am
 474 * session.
 475 */
 476static void am_destroy(const struct am_state *state)
 477{
 478        struct strbuf sb = STRBUF_INIT;
 479
 480        strbuf_addstr(&sb, state->dir);
 481        remove_dir_recursively(&sb, 0);
 482        strbuf_release(&sb);
 483}
 484
 485/**
 486 * Runs applypatch-msg hook. Returns its exit code.
 487 */
 488static int run_applypatch_msg_hook(struct am_state *state)
 489{
 490        int ret;
 491
 492        assert(state->msg);
 493        ret = run_hook_le(NULL, "applypatch-msg", am_path(state, "final-commit"), NULL);
 494
 495        if (!ret) {
 496                FREE_AND_NULL(state->msg);
 497                if (read_commit_msg(state) < 0)
 498                        die(_("'%s' was deleted by the applypatch-msg hook"),
 499                                am_path(state, "final-commit"));
 500        }
 501
 502        return ret;
 503}
 504
 505/**
 506 * Runs post-rewrite hook. Returns it exit code.
 507 */
 508static int run_post_rewrite_hook(const struct am_state *state)
 509{
 510        struct child_process cp = CHILD_PROCESS_INIT;
 511        const char *hook = find_hook("post-rewrite");
 512        int ret;
 513
 514        if (!hook)
 515                return 0;
 516
 517        argv_array_push(&cp.args, hook);
 518        argv_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
 525        close(cp.in);
 526        return 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 int copy_notes_for_rebase(const struct am_state *state)
 536{
 537        struct notes_rewrite_cfg *c;
 538        struct strbuf sb = STRBUF_INIT;
 539        const char *invalid_line = _("Malformed input line: '%s'.");
 540        const char *msg = "Notes added by 'git rebase'";
 541        FILE *fp;
 542        int ret = 0;
 543
 544        assert(state->rebasing);
 545
 546        c = init_copy_notes_for_rewrite("rebase");
 547        if (!c)
 548                return 0;
 549
 550        fp = xfopen(am_path(state, "rewritten"), "r");
 551
 552        while (!strbuf_getline_lf(&sb, fp)) {
 553                struct object_id from_obj, to_obj;
 554
 555                if (sb.len != GIT_SHA1_HEXSZ * 2 + 1) {
 556                        ret = error(invalid_line, sb.buf);
 557                        goto finish;
 558                }
 559
 560                if (get_oid_hex(sb.buf, &from_obj)) {
 561                        ret = error(invalid_line, sb.buf);
 562                        goto finish;
 563                }
 564
 565                if (sb.buf[GIT_SHA1_HEXSZ] != ' ') {
 566                        ret = error(invalid_line, sb.buf);
 567                        goto finish;
 568                }
 569
 570                if (get_oid_hex(sb.buf + GIT_SHA1_HEXSZ + 1, &to_obj)) {
 571                        ret = error(invalid_line, sb.buf);
 572                        goto finish;
 573                }
 574
 575                if (copy_note_for_rewrite(c, &from_obj, &to_obj))
 576                        ret = error(_("Failed to copy notes from '%s' to '%s'"),
 577                                        oid_to_hex(&from_obj), oid_to_hex(&to_obj));
 578        }
 579
 580finish:
 581        finish_copy_notes_for_rewrite(c, msg);
 582        fclose(fp);
 583        strbuf_release(&sb);
 584        return 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 int is_mail(FILE *fp)
 595{
 596        const char *header_regex = "^[!-9;-~]+:";
 597        struct strbuf sb = STRBUF_INIT;
 598        regex_t regex;
 599        int ret = 1;
 600
 601        if (fseek(fp, 0L, SEEK_SET))
 602                die_errno(_("fseek failed"));
 603
 604        if (regcomp(&regex, header_regex, REG_NOSUB | REG_EXTENDED))
 605                die("invalid pattern: %s", header_regex);
 606
 607        while (!strbuf_getline(&sb, fp)) {
 608                if (!sb.len)
 609                        break; /* End of header */
 610
 611                /* Ignore indented folded lines */
 612                if (*sb.buf == '\t' || *sb.buf == ' ')
 613                        continue;
 614
 615                /* It's a header if it matches header_regex */
 616                if (regexec(&regex, sb.buf, 0, NULL, 0)) {
 617                        ret = 0;
 618                        goto done;
 619                }
 620        }
 621
 622done:
 623        regfree(&regex);
 624        strbuf_release(&sb);
 625        return 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 int detect_patch_format(const char **paths)
 634{
 635        enum patch_format ret = PATCH_FORMAT_UNKNOWN;
 636        struct strbuf l1 = STRBUF_INIT;
 637        struct strbuf l2 = STRBUF_INIT;
 638        struct strbuf l3 = STRBUF_INIT;
 639        FILE *fp;
 640
 641        /*
 642         * We default to mbox format if input is from stdin and for directories
 643         */
 644        if (!*paths || !strcmp(*paths, "-") || is_directory(*paths))
 645                return 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
 654        while (!strbuf_getline(&l1, fp)) {
 655                if (l1.len)
 656                        break;
 657        }
 658
 659        if (starts_with(l1.buf, "From ") || starts_with(l1.buf, "From: ")) {
 660                ret = PATCH_FORMAT_MBOX;
 661                goto done;
 662        }
 663
 664        if (starts_with(l1.buf, "# This series applies on GIT commit")) {
 665                ret = PATCH_FORMAT_STGIT_SERIES;
 666                goto done;
 667        }
 668
 669        if (!strcmp(l1.buf, "# HG changeset patch")) {
 670                ret = PATCH_FORMAT_HG;
 671                goto done;
 672        }
 673
 674        strbuf_getline(&l2, fp);
 675        strbuf_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         */
 681        if (l1.len && !l2.len &&
 682                (starts_with(l3.buf, "From:") ||
 683                 starts_with(l3.buf, "Author:") ||
 684                 starts_with(l3.buf, "Date:"))) {
 685                ret = PATCH_FORMAT_STGIT;
 686                goto done;
 687        }
 688
 689        if (l1.len && is_mail(fp)) {
 690                ret = PATCH_FORMAT_MBOX;
 691                goto done;
 692        }
 693
 694done:
 695        fclose(fp);
 696        strbuf_release(&l1);
 697        strbuf_release(&l2);
 698        strbuf_release(&l3);
 699        return 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 int split_mail_mbox(struct am_state *state, const char **paths,
 707                                int keep_cr, int mboxrd)
 708{
 709        struct child_process cp = CHILD_PROCESS_INIT;
 710        struct strbuf last = STRBUF_INIT;
 711        int ret;
 712
 713        cp.git_cmd = 1;
 714        argv_array_push(&cp.args, "mailsplit");
 715        argv_array_pushf(&cp.args, "-d%d", state->prec);
 716        argv_array_pushf(&cp.args, "-o%s", state->dir);
 717        argv_array_push(&cp.args, "-b");
 718        if (keep_cr)
 719                argv_array_push(&cp.args, "--keep-cr");
 720        if (mboxrd)
 721                argv_array_push(&cp.args, "--mboxrd");
 722        argv_array_push(&cp.args, "--");
 723        argv_array_pushv(&cp.args, paths);
 724
 725        ret = capture_command(&cp, &last, 8);
 726        if (ret)
 727                goto exit;
 728
 729        state->cur = 1;
 730        state->last = strtol(last.buf, NULL, 10);
 731
 732exit:
 733        strbuf_release(&last);
 734        return 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 */
 742typedef int (*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 int split_mail_conv(mail_conv_fn fn, struct am_state *state,
 751                        const char **paths, int keep_cr)
 752{
 753        static const char *stdin_only[] = {"-", NULL};
 754        int i;
 755
 756        if (!*paths)
 757                paths = stdin_only;
 758
 759        for (i = 0; *paths; paths++, i++) {
 760                FILE *in, *out;
 761                const char *mail;
 762                int ret;
 763
 764                if (!strcmp(*paths, "-"))
 765                        in = stdin;
 766                else
 767                        in = fopen(*paths, "r");
 768
 769                if (!in)
 770                        return error_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");
 776                if (!out) {
 777                        if (in != stdin)
 778                                fclose(in);
 779                        return error_errno(_("could not open '%s' for writing"),
 780                                           mail);
 781                }
 782
 783                ret = fn(out, in, keep_cr);
 784
 785                fclose(out);
 786                if (in != stdin)
 787                        fclose(in);
 788
 789                if (ret)
 790                        return error(_("could not parse patch '%s'"), *paths);
 791        }
 792
 793        state->cur = 1;
 794        state->last = i;
 795        return 0;
 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 int stgit_patch_to_mail(FILE *out, FILE *in, int keep_cr)
 803{
 804        struct strbuf sb = STRBUF_INIT;
 805        int subject_printed = 0;
 806
 807        while (!strbuf_getline_lf(&sb, in)) {
 808                const char *str;
 809
 810                if (str_isspace(sb.buf))
 811                        continue;
 812                else if (skip_prefix(sb.buf, "Author:", &str))
 813                        fprintf(out, "From:%s\n", str);
 814                else if (starts_with(sb.buf, "From") || starts_with(sb.buf, "Date"))
 815                        fprintf(out, "%s\n", sb.buf);
 816                else if (!subject_printed) {
 817                        fprintf(out, "Subject: %s\n", sb.buf);
 818                        subject_printed = 1;
 819                } else {
 820                        fprintf(out, "\n%s\n", sb.buf);
 821                        break;
 822                }
 823        }
 824
 825        strbuf_reset(&sb);
 826        while (strbuf_fread(&sb, 8192, in) > 0) {
 827                fwrite(sb.buf, 1, sb.len, out);
 828                strbuf_reset(&sb);
 829        }
 830
 831        strbuf_release(&sb);
 832        return 0;
 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 int split_mail_stgit_series(struct am_state *state, const char **paths,
 845                                        int keep_cr)
 846{
 847        const char *series_dir;
 848        char *series_dir_buf;
 849        FILE *fp;
 850        struct argv_array patches = ARGV_ARRAY_INIT;
 851        struct strbuf sb = STRBUF_INIT;
 852        int ret;
 853
 854        if (!paths[0] || paths[1])
 855                return error(_("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");
 861        if (!fp)
 862                return error_errno(_("could not open '%s' for reading"), *paths);
 863
 864        while (!strbuf_getline_lf(&sb, fp)) {
 865                if (*sb.buf == '#')
 866                        continue; /* skip comment lines */
 867
 868                argv_array_push(&patches, mkpath("%s/%s", series_dir, sb.buf));
 869        }
 870
 871        fclose(fp);
 872        strbuf_release(&sb);
 873        free(series_dir_buf);
 874
 875        ret = split_mail_conv(stgit_patch_to_mail, state, patches.argv, keep_cr);
 876
 877        argv_array_clear(&patches);
 878        return 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 int hg_patch_to_mail(FILE *out, FILE *in, int keep_cr)
 886{
 887        struct strbuf sb = STRBUF_INIT;
 888        int rc = 0;
 889
 890        while (!strbuf_getline_lf(&sb, in)) {
 891                const char *str;
 892
 893                if (skip_prefix(sb.buf, "# User ", &str))
 894                        fprintf(out, "From: %s\n", str);
 895                else if (skip_prefix(sb.buf, "# Date ", &str)) {
 896                        timestamp_t timestamp;
 897                        long tz, tz2;
 898                        char *end;
 899
 900                        errno = 0;
 901                        timestamp = parse_timestamp(str, &end, 10);
 902                        if (errno) {
 903                                rc = error(_("invalid timestamp"));
 904                                goto exit;
 905                        }
 906
 907                        if (!skip_prefix(end, " ", &str)) {
 908                                rc = error(_("invalid Date line"));
 909                                goto exit;
 910                        }
 911
 912                        errno = 0;
 913                        tz = strtol(str, &end, 10);
 914                        if (errno) {
 915                                rc = error(_("invalid timezone offset"));
 916                                goto exit;
 917                        }
 918
 919                        if (*end) {
 920                                rc = error(_("invalid Date line"));
 921                                goto 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;
 930                        if (tz > 0)
 931                                tz2 = -tz2;
 932
 933                        fprintf(out, "Date: %s\n", show_date(timestamp, tz2, DATE_MODE(RFC2822)));
 934                } else if (starts_with(sb.buf, "# ")) {
 935                        continue;
 936                } else {
 937                        fprintf(out, "\n%s\n", sb.buf);
 938                        break;
 939                }
 940        }
 941
 942        strbuf_reset(&sb);
 943        while (strbuf_fread(&sb, 8192, in) > 0) {
 944                fwrite(sb.buf, 1, sb.len, out);
 945                strbuf_reset(&sb);
 946        }
 947exit:
 948        strbuf_release(&sb);
 949        return 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 int split_mail(struct am_state *state, enum patch_format patch_format,
 970                        const char **paths, int keep_cr)
 971{
 972        if (keep_cr < 0) {
 973                keep_cr = 0;
 974                git_config_get_bool("am.keepcr", &keep_cr);
 975        }
 976
 977        switch (patch_format) {
 978        case PATCH_FORMAT_MBOX:
 979                return split_mail_mbox(state, paths, keep_cr, 0);
 980        case PATCH_FORMAT_STGIT:
 981                return split_mail_conv(stgit_patch_to_mail, state, paths, keep_cr);
 982        case PATCH_FORMAT_STGIT_SERIES:
 983                return split_mail_stgit_series(state, paths, keep_cr);
 984        case PATCH_FORMAT_HG:
 985                return split_mail_conv(hg_patch_to_mail, state, paths, keep_cr);
 986        case PATCH_FORMAT_MBOXRD:
 987                return split_mail_mbox(state, paths, keep_cr, 1);
 988        default:
 989                BUG("invalid patch_format");
 990        }
 991        return -1;
 992}
 993
 994/**
 995 * Setup a new am session for applying patches
 996 */
 997static void am_setup(struct am_state *state, enum patch_format patch_format,
 998                        const char **paths, int keep_cr)
 999{
1000        struct object_id curr_head;
1001        const char *str;
1002        struct strbuf sb = STRBUF_INIT;
1003
1004        if (!patch_format)
1005                patch_format = detect_patch_format(paths);
1006
1007        if (!patch_format) {
1008                fprintf_ln(stderr, _("Patch format detection failed."));
1009                exit(128);
1010        }
1011
1012        if (mkdir(state->dir, 0777) < 0 && errno != EEXIST)
1013                die_errno(_("failed to create directory '%s'"), state->dir);
1014        delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF);
1015
1016        if (split_mail(state, patch_format, paths, keep_cr) < 0) {
1017                am_destroy(state);
1018                die(_("Failed to split patches."));
1019        }
1020
1021        if (state->rebasing)
1022                state->threeway = 1;
1023
1024        write_state_bool(state, "threeway", state->threeway);
1025        write_state_bool(state, "quiet", state->quiet);
1026        write_state_bool(state, "sign", state->signoff);
1027        write_state_bool(state, "utf8", state->utf8);
1028
1029        if (state->allow_rerere_autoupdate)
1030                write_state_bool(state, "rerere-autoupdate",
1031                         state->allow_rerere_autoupdate == RERERE_AUTOUPDATE);
1032
1033        switch (state->keep) {
1034        case KEEP_FALSE:
1035                str = "f";
1036                break;
1037        case KEEP_TRUE:
1038                str = "t";
1039                break;
1040        case KEEP_NON_PATCH:
1041                str = "b";
1042                break;
1043        default:
1044                BUG("invalid value for state->keep");
1045        }
1046
1047        write_state_text(state, "keep", str);
1048        write_state_bool(state, "messageid", state->message_id);
1049
1050        switch (state->scissors) {
1051        case SCISSORS_UNSET:
1052                str = "";
1053                break;
1054        case SCISSORS_FALSE:
1055                str = "f";
1056                break;
1057        case SCISSORS_TRUE:
1058                str = "t";
1059                break;
1060        default:
1061                BUG("invalid value for state->scissors");
1062        }
1063        write_state_text(state, "scissors", str);
1064
1065        sq_quote_argv(&sb, state->git_apply_opts.argv);
1066        write_state_text(state, "apply-opt", sb.buf);
1067
1068        if (state->rebasing)
1069                write_state_text(state, "rebasing", "");
1070        else
1071                write_state_text(state, "applying", "");
1072
1073        if (!get_oid("HEAD", &curr_head)) {
1074                write_state_text(state, "abort-safety", oid_to_hex(&curr_head));
1075                if (!state->rebasing)
1076                        update_ref("am", "ORIG_HEAD", &curr_head, NULL, 0,
1077                                   UPDATE_REFS_DIE_ON_ERR);
1078        } else {
1079                write_state_text(state, "abort-safety", "");
1080                if (!state->rebasing)
1081                        delete_ref(NULL, "ORIG_HEAD", NULL, 0);
1082        }
1083
1084        /*
1085         * NOTE: Since the "next" and "last" files determine if an am_state
1086         * session is in progress, they should be written last.
1087         */
1088
1089        write_state_count(state, "next", state->cur);
1090        write_state_count(state, "last", state->last);
1091
1092        strbuf_release(&sb);
1093}
1094
1095/**
1096 * Increments the patch pointer, and cleans am_state for the application of the
1097 * next patch.
1098 */
1099static void am_next(struct am_state *state)
1100{
1101        struct object_id head;
1102
1103        FREE_AND_NULL(state->author_name);
1104        FREE_AND_NULL(state->author_email);
1105        FREE_AND_NULL(state->author_date);
1106        FREE_AND_NULL(state->msg);
1107        state->msg_len = 0;
1108
1109        unlink(am_path(state, "author-script"));
1110        unlink(am_path(state, "final-commit"));
1111
1112        oidclr(&state->orig_commit);
1113        unlink(am_path(state, "original-commit"));
1114        delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF);
1115
1116        if (!get_oid("HEAD", &head))
1117                write_state_text(state, "abort-safety", oid_to_hex(&head));
1118        else
1119                write_state_text(state, "abort-safety", "");
1120
1121        state->cur++;
1122        write_state_count(state, "next", state->cur);
1123}
1124
1125/**
1126 * Returns the filename of the current patch email.
1127 */
1128static const char *msgnum(const struct am_state *state)
1129{
1130        static struct strbuf sb = STRBUF_INIT;
1131
1132        strbuf_reset(&sb);
1133        strbuf_addf(&sb, "%0*d", state->prec, state->cur);
1134
1135        return sb.buf;
1136}
1137
1138/**
1139 * Refresh and write index.
1140 */
1141static void refresh_and_write_cache(void)
1142{
1143        struct lock_file lock_file = LOCK_INIT;
1144
1145        hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
1146        refresh_cache(REFRESH_QUIET);
1147        if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
1148                die(_("unable to write index file"));
1149}
1150
1151/**
1152 * Dies with a user-friendly message on how to proceed after resolving the
1153 * problem. This message can be overridden with state->resolvemsg.
1154 */
1155static void NORETURN die_user_resolve(const struct am_state *state)
1156{
1157        if (state->resolvemsg) {
1158                printf_ln("%s", state->resolvemsg);
1159        } else {
1160                const char *cmdline = state->interactive ? "git am -i" : "git am";
1161
1162                printf_ln(_("When you have resolved this problem, run \"%s --continue\"."), cmdline);
1163                printf_ln(_("If you prefer to skip this patch, run \"%s --skip\" instead."), cmdline);
1164                printf_ln(_("To restore the original branch and stop patching, run \"%s --abort\"."), cmdline);
1165        }
1166
1167        exit(128);
1168}
1169
1170/**
1171 * Appends signoff to the "msg" field of the am_state.
1172 */
1173static void am_append_signoff(struct am_state *state)
1174{
1175        struct strbuf sb = STRBUF_INIT;
1176
1177        strbuf_attach(&sb, state->msg, state->msg_len, state->msg_len);
1178        append_signoff(&sb, 0, 0);
1179        state->msg = strbuf_detach(&sb, &state->msg_len);
1180}
1181
1182/**
1183 * Parses `mail` using git-mailinfo, extracting its patch and authorship info.
1184 * state->msg will be set to the patch message. state->author_name,
1185 * state->author_email and state->author_date will be set to the patch author's
1186 * name, email and date respectively. The patch body will be written to the
1187 * state directory's "patch" file.
1188 *
1189 * Returns 1 if the patch should be skipped, 0 otherwise.
1190 */
1191static int parse_mail(struct am_state *state, const char *mail)
1192{
1193        FILE *fp;
1194        struct strbuf sb = STRBUF_INIT;
1195        struct strbuf msg = STRBUF_INIT;
1196        struct strbuf author_name = STRBUF_INIT;
1197        struct strbuf author_date = STRBUF_INIT;
1198        struct strbuf author_email = STRBUF_INIT;
1199        int ret = 0;
1200        struct mailinfo mi;
1201
1202        setup_mailinfo(&mi);
1203
1204        if (state->utf8)
1205                mi.metainfo_charset = get_commit_output_encoding();
1206        else
1207                mi.metainfo_charset = NULL;
1208
1209        switch (state->keep) {
1210        case KEEP_FALSE:
1211                break;
1212        case KEEP_TRUE:
1213                mi.keep_subject = 1;
1214                break;
1215        case KEEP_NON_PATCH:
1216                mi.keep_non_patch_brackets_in_subject = 1;
1217                break;
1218        default:
1219                BUG("invalid value for state->keep");
1220        }
1221
1222        if (state->message_id)
1223                mi.add_message_id = 1;
1224
1225        switch (state->scissors) {
1226        case SCISSORS_UNSET:
1227                break;
1228        case SCISSORS_FALSE:
1229                mi.use_scissors = 0;
1230                break;
1231        case SCISSORS_TRUE:
1232                mi.use_scissors = 1;
1233                break;
1234        default:
1235                BUG("invalid value for state->scissors");
1236        }
1237
1238        mi.input = xfopen(mail, "r");
1239        mi.output = xfopen(am_path(state, "info"), "w");
1240        if (mailinfo(&mi, am_path(state, "msg"), am_path(state, "patch")))
1241                die("could not parse patch");
1242
1243        fclose(mi.input);
1244        fclose(mi.output);
1245
1246        if (mi.format_flowed)
1247                warning(_("Patch sent with format=flowed; "
1248                          "space at the end of lines might be lost."));
1249
1250        /* Extract message and author information */
1251        fp = xfopen(am_path(state, "info"), "r");
1252        while (!strbuf_getline_lf(&sb, fp)) {
1253                const char *x;
1254
1255                if (skip_prefix(sb.buf, "Subject: ", &x)) {
1256                        if (msg.len)
1257                                strbuf_addch(&msg, '\n');
1258                        strbuf_addstr(&msg, x);
1259                } else if (skip_prefix(sb.buf, "Author: ", &x))
1260                        strbuf_addstr(&author_name, x);
1261                else if (skip_prefix(sb.buf, "Email: ", &x))
1262                        strbuf_addstr(&author_email, x);
1263                else if (skip_prefix(sb.buf, "Date: ", &x))
1264                        strbuf_addstr(&author_date, x);
1265        }
1266        fclose(fp);
1267
1268        /* Skip pine's internal folder data */
1269        if (!strcmp(author_name.buf, "Mail System Internal Data")) {
1270                ret = 1;
1271                goto finish;
1272        }
1273
1274        if (is_empty_file(am_path(state, "patch"))) {
1275                printf_ln(_("Patch is empty."));
1276                die_user_resolve(state);
1277        }
1278
1279        strbuf_addstr(&msg, "\n\n");
1280        strbuf_addbuf(&msg, &mi.log_message);
1281        strbuf_stripspace(&msg, 0);
1282
1283        assert(!state->author_name);
1284        state->author_name = strbuf_detach(&author_name, NULL);
1285
1286        assert(!state->author_email);
1287        state->author_email = strbuf_detach(&author_email, NULL);
1288
1289        assert(!state->author_date);
1290        state->author_date = strbuf_detach(&author_date, NULL);
1291
1292        assert(!state->msg);
1293        state->msg = strbuf_detach(&msg, &state->msg_len);
1294
1295finish:
1296        strbuf_release(&msg);
1297        strbuf_release(&author_date);
1298        strbuf_release(&author_email);
1299        strbuf_release(&author_name);
1300        strbuf_release(&sb);
1301        clear_mailinfo(&mi);
1302        return ret;
1303}
1304
1305/**
1306 * Sets commit_id to the commit hash where the mail was generated from.
1307 * Returns 0 on success, -1 on failure.
1308 */
1309static int get_mail_commit_oid(struct object_id *commit_id, const char *mail)
1310{
1311        struct strbuf sb = STRBUF_INIT;
1312        FILE *fp = xfopen(mail, "r");
1313        const char *x;
1314        int ret = 0;
1315
1316        if (strbuf_getline_lf(&sb, fp) ||
1317            !skip_prefix(sb.buf, "From ", &x) ||
1318            get_oid_hex(x, commit_id) < 0)
1319                ret = -1;
1320
1321        strbuf_release(&sb);
1322        fclose(fp);
1323        return ret;
1324}
1325
1326/**
1327 * Sets state->msg, state->author_name, state->author_email, state->author_date
1328 * to the commit's respective info.
1329 */
1330static void get_commit_info(struct am_state *state, struct commit *commit)
1331{
1332        const char *buffer, *ident_line, *msg;
1333        size_t ident_len;
1334        struct ident_split id;
1335
1336        buffer = logmsg_reencode(commit, NULL, get_commit_output_encoding());
1337
1338        ident_line = find_commit_header(buffer, "author", &ident_len);
1339
1340        if (split_ident_line(&id, ident_line, ident_len) < 0)
1341                die(_("invalid ident line: %.*s"), (int)ident_len, ident_line);
1342
1343        assert(!state->author_name);
1344        if (id.name_begin)
1345                state->author_name =
1346                        xmemdupz(id.name_begin, id.name_end - id.name_begin);
1347        else
1348                state->author_name = xstrdup("");
1349
1350        assert(!state->author_email);
1351        if (id.mail_begin)
1352                state->author_email =
1353                        xmemdupz(id.mail_begin, id.mail_end - id.mail_begin);
1354        else
1355                state->author_email = xstrdup("");
1356
1357        assert(!state->author_date);
1358        state->author_date = xstrdup(show_ident_date(&id, DATE_MODE(NORMAL)));
1359
1360        assert(!state->msg);
1361        msg = strstr(buffer, "\n\n");
1362        if (!msg)
1363                die(_("unable to parse commit %s"), oid_to_hex(&commit->object.oid));
1364        state->msg = xstrdup(msg + 2);
1365        state->msg_len = strlen(state->msg);
1366        unuse_commit_buffer(commit, buffer);
1367}
1368
1369/**
1370 * Writes `commit` as a patch to the state directory's "patch" file.
1371 */
1372static void write_commit_patch(const struct am_state *state, struct commit *commit)
1373{
1374        struct rev_info rev_info;
1375        FILE *fp;
1376
1377        fp = xfopen(am_path(state, "patch"), "w");
1378        init_revisions(&rev_info, NULL);
1379        rev_info.diff = 1;
1380        rev_info.abbrev = 0;
1381        rev_info.disable_stdin = 1;
1382        rev_info.show_root_diff = 1;
1383        rev_info.diffopt.output_format = DIFF_FORMAT_PATCH;
1384        rev_info.no_commit_id = 1;
1385        rev_info.diffopt.flags.binary = 1;
1386        rev_info.diffopt.flags.full_index = 1;
1387        rev_info.diffopt.use_color = 0;
1388        rev_info.diffopt.file = fp;
1389        rev_info.diffopt.close_file = 1;
1390        add_pending_object(&rev_info, &commit->object, "");
1391        diff_setup_done(&rev_info.diffopt);
1392        log_tree_commit(&rev_info, commit);
1393}
1394
1395/**
1396 * Writes the diff of the index against HEAD as a patch to the state
1397 * directory's "patch" file.
1398 */
1399static void write_index_patch(const struct am_state *state)
1400{
1401        struct tree *tree;
1402        struct object_id head;
1403        struct rev_info rev_info;
1404        FILE *fp;
1405
1406        if (!get_oid_tree("HEAD", &head))
1407                tree = lookup_tree(&head);
1408        else
1409                tree = lookup_tree(the_hash_algo->empty_tree);
1410
1411        fp = xfopen(am_path(state, "patch"), "w");
1412        init_revisions(&rev_info, NULL);
1413        rev_info.diff = 1;
1414        rev_info.disable_stdin = 1;
1415        rev_info.no_commit_id = 1;
1416        rev_info.diffopt.output_format = DIFF_FORMAT_PATCH;
1417        rev_info.diffopt.use_color = 0;
1418        rev_info.diffopt.file = fp;
1419        rev_info.diffopt.close_file = 1;
1420        add_pending_object(&rev_info, &tree->object, "");
1421        diff_setup_done(&rev_info.diffopt);
1422        run_diff_index(&rev_info, 1);
1423}
1424
1425/**
1426 * Like parse_mail(), but parses the mail by looking up its commit ID
1427 * directly. This is used in --rebasing mode to bypass git-mailinfo's munging
1428 * of patches.
1429 *
1430 * state->orig_commit will be set to the original commit ID.
1431 *
1432 * Will always return 0 as the patch should never be skipped.
1433 */
1434static int parse_mail_rebase(struct am_state *state, const char *mail)
1435{
1436        struct commit *commit;
1437        struct object_id commit_oid;
1438
1439        if (get_mail_commit_oid(&commit_oid, mail) < 0)
1440                die(_("could not parse %s"), mail);
1441
1442        commit = lookup_commit_or_die(&commit_oid, mail);
1443
1444        get_commit_info(state, commit);
1445
1446        write_commit_patch(state, commit);
1447
1448        oidcpy(&state->orig_commit, &commit_oid);
1449        write_state_text(state, "original-commit", oid_to_hex(&commit_oid));
1450        update_ref("am", "REBASE_HEAD", &commit_oid,
1451                   NULL, REF_NO_DEREF, UPDATE_REFS_DIE_ON_ERR);
1452
1453        return 0;
1454}
1455
1456/**
1457 * Applies current patch with git-apply. Returns 0 on success, -1 otherwise. If
1458 * `index_file` is not NULL, the patch will be applied to that index.
1459 */
1460static int run_apply(const struct am_state *state, const char *index_file)
1461{
1462        struct argv_array apply_paths = ARGV_ARRAY_INIT;
1463        struct argv_array apply_opts = ARGV_ARRAY_INIT;
1464        struct apply_state apply_state;
1465        int res, opts_left;
1466        int force_apply = 0;
1467        int options = 0;
1468
1469        if (init_apply_state(&apply_state, NULL))
1470                BUG("init_apply_state() failed");
1471
1472        argv_array_push(&apply_opts, "apply");
1473        argv_array_pushv(&apply_opts, state->git_apply_opts.argv);
1474
1475        opts_left = apply_parse_options(apply_opts.argc, apply_opts.argv,
1476                                        &apply_state, &force_apply, &options,
1477                                        NULL);
1478
1479        if (opts_left != 0)
1480                die("unknown option passed through to git apply");
1481
1482        if (index_file) {
1483                apply_state.index_file = index_file;
1484                apply_state.cached = 1;
1485        } else
1486                apply_state.check_index = 1;
1487
1488        /*
1489         * If we are allowed to fall back on 3-way merge, don't give false
1490         * errors during the initial attempt.
1491         */
1492        if (state->threeway && !index_file)
1493                apply_state.apply_verbosity = verbosity_silent;
1494
1495        if (check_apply_state(&apply_state, force_apply))
1496                BUG("check_apply_state() failed");
1497
1498        argv_array_push(&apply_paths, am_path(state, "patch"));
1499
1500        res = apply_all_patches(&apply_state, apply_paths.argc, apply_paths.argv, options);
1501
1502        argv_array_clear(&apply_paths);
1503        argv_array_clear(&apply_opts);
1504        clear_apply_state(&apply_state);
1505
1506        if (res)
1507                return res;
1508
1509        if (index_file) {
1510                /* Reload index as apply_all_patches() will have modified it. */
1511                discard_cache();
1512                read_cache_from(index_file);
1513        }
1514
1515        return 0;
1516}
1517
1518/**
1519 * Builds an index that contains just the blobs needed for a 3way merge.
1520 */
1521static int build_fake_ancestor(const struct am_state *state, const char *index_file)
1522{
1523        struct child_process cp = CHILD_PROCESS_INIT;
1524
1525        cp.git_cmd = 1;
1526        argv_array_push(&cp.args, "apply");
1527        argv_array_pushv(&cp.args, state->git_apply_opts.argv);
1528        argv_array_pushf(&cp.args, "--build-fake-ancestor=%s", index_file);
1529        argv_array_push(&cp.args, am_path(state, "patch"));
1530
1531        if (run_command(&cp))
1532                return -1;
1533
1534        return 0;
1535}
1536
1537/**
1538 * Attempt a threeway merge, using index_path as the temporary index.
1539 */
1540static int fall_back_threeway(const struct am_state *state, const char *index_path)
1541{
1542        struct object_id orig_tree, their_tree, our_tree;
1543        const struct object_id *bases[1] = { &orig_tree };
1544        struct merge_options o;
1545        struct commit *result;
1546        char *their_tree_name;
1547
1548        if (get_oid("HEAD", &our_tree) < 0)
1549                oidcpy(&our_tree, the_hash_algo->empty_tree);
1550
1551        if (build_fake_ancestor(state, index_path))
1552                return error("could not build fake ancestor");
1553
1554        discard_cache();
1555        read_cache_from(index_path);
1556
1557        if (write_index_as_tree(&orig_tree, &the_index, index_path, 0, NULL))
1558                return error(_("Repository lacks necessary blobs to fall back on 3-way merge."));
1559
1560        say(state, stdout, _("Using index info to reconstruct a base tree..."));
1561
1562        if (!state->quiet) {
1563                /*
1564                 * List paths that needed 3-way fallback, so that the user can
1565                 * review them with extra care to spot mismerges.
1566                 */
1567                struct rev_info rev_info;
1568                const char *diff_filter_str = "--diff-filter=AM";
1569
1570                init_revisions(&rev_info, NULL);
1571                rev_info.diffopt.output_format = DIFF_FORMAT_NAME_STATUS;
1572                diff_opt_parse(&rev_info.diffopt, &diff_filter_str, 1, rev_info.prefix);
1573                add_pending_oid(&rev_info, "HEAD", &our_tree, 0);
1574                diff_setup_done(&rev_info.diffopt);
1575                run_diff_index(&rev_info, 1);
1576        }
1577
1578        if (run_apply(state, index_path))
1579                return error(_("Did you hand edit your patch?\n"
1580                                "It does not apply to blobs recorded in its index."));
1581
1582        if (write_index_as_tree(&their_tree, &the_index, index_path, 0, NULL))
1583                return error("could not write tree");
1584
1585        say(state, stdout, _("Falling back to patching base and 3-way merge..."));
1586
1587        discard_cache();
1588        read_cache();
1589
1590        /*
1591         * This is not so wrong. Depending on which base we picked, orig_tree
1592         * may be wildly different from ours, but their_tree has the same set of
1593         * wildly different changes in parts the patch did not touch, so
1594         * recursive ends up canceling them, saying that we reverted all those
1595         * changes.
1596         */
1597
1598        init_merge_options(&o);
1599
1600        o.branch1 = "HEAD";
1601        their_tree_name = xstrfmt("%.*s", linelen(state->msg), state->msg);
1602        o.branch2 = their_tree_name;
1603
1604        if (state->quiet)
1605                o.verbosity = 0;
1606
1607        if (merge_recursive_generic(&o, &our_tree, &their_tree, 1, bases, &result)) {
1608                rerere(state->allow_rerere_autoupdate);
1609                free(their_tree_name);
1610                return error(_("Failed to merge in the changes."));
1611        }
1612
1613        free(their_tree_name);
1614        return 0;
1615}
1616
1617/**
1618 * Commits the current index with state->msg as the commit message and
1619 * state->author_name, state->author_email and state->author_date as the author
1620 * information.
1621 */
1622static void do_commit(const struct am_state *state)
1623{
1624        struct object_id tree, parent, commit;
1625        const struct object_id *old_oid;
1626        struct commit_list *parents = NULL;
1627        const char *reflog_msg, *author;
1628        struct strbuf sb = STRBUF_INIT;
1629
1630        if (run_hook_le(NULL, "pre-applypatch", NULL))
1631                exit(1);
1632
1633        if (write_cache_as_tree(&tree, 0, NULL))
1634                die(_("git write-tree failed to write a tree"));
1635
1636        if (!get_oid_commit("HEAD", &parent)) {
1637                old_oid = &parent;
1638                commit_list_insert(lookup_commit(&parent), &parents);
1639        } else {
1640                old_oid = NULL;
1641                say(state, stderr, _("applying to an empty history"));
1642        }
1643
1644        author = fmt_ident(state->author_name, state->author_email,
1645                        state->ignore_date ? NULL : state->author_date,
1646                        IDENT_STRICT);
1647
1648        if (state->committer_date_is_author_date)
1649                setenv("GIT_COMMITTER_DATE",
1650                        state->ignore_date ? "" : state->author_date, 1);
1651
1652        if (commit_tree(state->msg, state->msg_len, &tree, parents, &commit,
1653                        author, state->sign_commit))
1654                die(_("failed to write commit object"));
1655
1656        reflog_msg = getenv("GIT_REFLOG_ACTION");
1657        if (!reflog_msg)
1658                reflog_msg = "am";
1659
1660        strbuf_addf(&sb, "%s: %.*s", reflog_msg, linelen(state->msg),
1661                        state->msg);
1662
1663        update_ref(sb.buf, "HEAD", &commit, old_oid, 0,
1664                   UPDATE_REFS_DIE_ON_ERR);
1665
1666        if (state->rebasing) {
1667                FILE *fp = xfopen(am_path(state, "rewritten"), "a");
1668
1669                assert(!is_null_oid(&state->orig_commit));
1670                fprintf(fp, "%s ", oid_to_hex(&state->orig_commit));
1671                fprintf(fp, "%s\n", oid_to_hex(&commit));
1672                fclose(fp);
1673        }
1674
1675        run_hook_le(NULL, "post-applypatch", NULL);
1676
1677        strbuf_release(&sb);
1678}
1679
1680/**
1681 * Validates the am_state for resuming -- the "msg" and authorship fields must
1682 * be filled up.
1683 */
1684static void validate_resume_state(const struct am_state *state)
1685{
1686        if (!state->msg)
1687                die(_("cannot resume: %s does not exist."),
1688                        am_path(state, "final-commit"));
1689
1690        if (!state->author_name || !state->author_email || !state->author_date)
1691                die(_("cannot resume: %s does not exist."),
1692                        am_path(state, "author-script"));
1693}
1694
1695/**
1696 * Interactively prompt the user on whether the current patch should be
1697 * applied.
1698 *
1699 * Returns 0 if the user chooses to apply the patch, 1 if the user chooses to
1700 * skip it.
1701 */
1702static int do_interactive(struct am_state *state)
1703{
1704        assert(state->msg);
1705
1706        if (!isatty(0))
1707                die(_("cannot be interactive without stdin connected to a terminal."));
1708
1709        for (;;) {
1710                const char *reply;
1711
1712                puts(_("Commit Body is:"));
1713                puts("--------------------------");
1714                printf("%s", state->msg);
1715                puts("--------------------------");
1716
1717                /*
1718                 * TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
1719                 * in your translation. The program will only accept English
1720                 * input at this point.
1721                 */
1722                reply = git_prompt(_("Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "), PROMPT_ECHO);
1723
1724                if (!reply) {
1725                        continue;
1726                } else if (*reply == 'y' || *reply == 'Y') {
1727                        return 0;
1728                } else if (*reply == 'a' || *reply == 'A') {
1729                        state->interactive = 0;
1730                        return 0;
1731                } else if (*reply == 'n' || *reply == 'N') {
1732                        return 1;
1733                } else if (*reply == 'e' || *reply == 'E') {
1734                        struct strbuf msg = STRBUF_INIT;
1735
1736                        if (!launch_editor(am_path(state, "final-commit"), &msg, NULL)) {
1737                                free(state->msg);
1738                                state->msg = strbuf_detach(&msg, &state->msg_len);
1739                        }
1740                        strbuf_release(&msg);
1741                } else if (*reply == 'v' || *reply == 'V') {
1742                        const char *pager = git_pager(1);
1743                        struct child_process cp = CHILD_PROCESS_INIT;
1744
1745                        if (!pager)
1746                                pager = "cat";
1747                        prepare_pager_args(&cp, pager);
1748                        argv_array_push(&cp.args, am_path(state, "patch"));
1749                        run_command(&cp);
1750                }
1751        }
1752}
1753
1754/**
1755 * Applies all queued mail.
1756 *
1757 * If `resume` is true, we are "resuming". The "msg" and authorship fields, as
1758 * well as the state directory's "patch" file is used as-is for applying the
1759 * patch and committing it.
1760 */
1761static void am_run(struct am_state *state, int resume)
1762{
1763        const char *argv_gc_auto[] = {"gc", "--auto", NULL};
1764        struct strbuf sb = STRBUF_INIT;
1765
1766        unlink(am_path(state, "dirtyindex"));
1767
1768        refresh_and_write_cache();
1769
1770        if (index_has_changes(&sb)) {
1771                write_state_bool(state, "dirtyindex", 1);
1772                die(_("Dirty index: cannot apply patches (dirty: %s)"), sb.buf);
1773        }
1774
1775        strbuf_release(&sb);
1776
1777        while (state->cur <= state->last) {
1778                const char *mail = am_path(state, msgnum(state));
1779                int apply_status;
1780
1781                reset_ident_date();
1782
1783                if (!file_exists(mail))
1784                        goto next;
1785
1786                if (resume) {
1787                        validate_resume_state(state);
1788                } else {
1789                        int skip;
1790
1791                        if (state->rebasing)
1792                                skip = parse_mail_rebase(state, mail);
1793                        else
1794                                skip = parse_mail(state, mail);
1795
1796                        if (skip)
1797                                goto next; /* mail should be skipped */
1798
1799                        if (state->signoff)
1800                                am_append_signoff(state);
1801
1802                        write_author_script(state);
1803                        write_commit_msg(state);
1804                }
1805
1806                if (state->interactive && do_interactive(state))
1807                        goto next;
1808
1809                if (run_applypatch_msg_hook(state))
1810                        exit(1);
1811
1812                say(state, stdout, _("Applying: %.*s"), linelen(state->msg), state->msg);
1813
1814                apply_status = run_apply(state, NULL);
1815
1816                if (apply_status && state->threeway) {
1817                        struct strbuf sb = STRBUF_INIT;
1818
1819                        strbuf_addstr(&sb, am_path(state, "patch-merge-index"));
1820                        apply_status = fall_back_threeway(state, sb.buf);
1821                        strbuf_release(&sb);
1822
1823                        /*
1824                         * Applying the patch to an earlier tree and merging
1825                         * the result may have produced the same tree as ours.
1826                         */
1827                        if (!apply_status && !index_has_changes(NULL)) {
1828                                say(state, stdout, _("No changes -- Patch already applied."));
1829                                goto next;
1830                        }
1831                }
1832
1833                if (apply_status) {
1834                        int advice_amworkdir = 1;
1835
1836                        printf_ln(_("Patch failed at %s %.*s"), msgnum(state),
1837                                linelen(state->msg), state->msg);
1838
1839                        git_config_get_bool("advice.amworkdir", &advice_amworkdir);
1840
1841                        if (advice_amworkdir)
1842                                printf_ln(_("Use 'git am --show-current-patch' to see the failed patch"));
1843
1844                        die_user_resolve(state);
1845                }
1846
1847                do_commit(state);
1848
1849next:
1850                am_next(state);
1851
1852                if (resume)
1853                        am_load(state);
1854                resume = 0;
1855        }
1856
1857        if (!is_empty_file(am_path(state, "rewritten"))) {
1858                assert(state->rebasing);
1859                copy_notes_for_rebase(state);
1860                run_post_rewrite_hook(state);
1861        }
1862
1863        /*
1864         * In rebasing mode, it's up to the caller to take care of
1865         * housekeeping.
1866         */
1867        if (!state->rebasing) {
1868                am_destroy(state);
1869                close_all_packs(the_repository->objects);
1870                run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
1871        }
1872}
1873
1874/**
1875 * Resume the current am session after patch application failure. The user did
1876 * all the hard work, and we do not have to do any patch application. Just
1877 * trust and commit what the user has in the index and working tree.
1878 */
1879static void am_resolve(struct am_state *state)
1880{
1881        validate_resume_state(state);
1882
1883        say(state, stdout, _("Applying: %.*s"), linelen(state->msg), state->msg);
1884
1885        if (!index_has_changes(NULL)) {
1886                printf_ln(_("No changes - did you forget to use 'git add'?\n"
1887                        "If there is nothing left to stage, chances are that something else\n"
1888                        "already introduced the same changes; you might want to skip this patch."));
1889                die_user_resolve(state);
1890        }
1891
1892        if (unmerged_cache()) {
1893                printf_ln(_("You still have unmerged paths in your index.\n"
1894                        "You should 'git add' each file with resolved conflicts to mark them as such.\n"
1895                        "You might run `git rm` on a file to accept \"deleted by them\" for it."));
1896                die_user_resolve(state);
1897        }
1898
1899        if (state->interactive) {
1900                write_index_patch(state);
1901                if (do_interactive(state))
1902                        goto next;
1903        }
1904
1905        rerere(0);
1906
1907        do_commit(state);
1908
1909next:
1910        am_next(state);
1911        am_load(state);
1912        am_run(state, 0);
1913}
1914
1915/**
1916 * Performs a checkout fast-forward from `head` to `remote`. If `reset` is
1917 * true, any unmerged entries will be discarded. Returns 0 on success, -1 on
1918 * failure.
1919 */
1920static int fast_forward_to(struct tree *head, struct tree *remote, int reset)
1921{
1922        struct lock_file lock_file = LOCK_INIT;
1923        struct unpack_trees_options opts;
1924        struct tree_desc t[2];
1925
1926        if (parse_tree(head) || parse_tree(remote))
1927                return -1;
1928
1929        hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
1930
1931        refresh_cache(REFRESH_QUIET);
1932
1933        memset(&opts, 0, sizeof(opts));
1934        opts.head_idx = 1;
1935        opts.src_index = &the_index;
1936        opts.dst_index = &the_index;
1937        opts.update = 1;
1938        opts.merge = 1;
1939        opts.reset = reset;
1940        opts.fn = twoway_merge;
1941        init_tree_desc(&t[0], head->buffer, head->size);
1942        init_tree_desc(&t[1], remote->buffer, remote->size);
1943
1944        if (unpack_trees(2, t, &opts)) {
1945                rollback_lock_file(&lock_file);
1946                return -1;
1947        }
1948
1949        if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
1950                die(_("unable to write new index file"));
1951
1952        return 0;
1953}
1954
1955/**
1956 * Merges a tree into the index. The index's stat info will take precedence
1957 * over the merged tree's. Returns 0 on success, -1 on failure.
1958 */
1959static int merge_tree(struct tree *tree)
1960{
1961        struct lock_file lock_file = LOCK_INIT;
1962        struct unpack_trees_options opts;
1963        struct tree_desc t[1];
1964
1965        if (parse_tree(tree))
1966                return -1;
1967
1968        hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
1969
1970        memset(&opts, 0, sizeof(opts));
1971        opts.head_idx = 1;
1972        opts.src_index = &the_index;
1973        opts.dst_index = &the_index;
1974        opts.merge = 1;
1975        opts.fn = oneway_merge;
1976        init_tree_desc(&t[0], tree->buffer, tree->size);
1977
1978        if (unpack_trees(1, t, &opts)) {
1979                rollback_lock_file(&lock_file);
1980                return -1;
1981        }
1982
1983        if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
1984                die(_("unable to write new index file"));
1985
1986        return 0;
1987}
1988
1989/**
1990 * Clean the index without touching entries that are not modified between
1991 * `head` and `remote`.
1992 */
1993static int clean_index(const struct object_id *head, const struct object_id *remote)
1994{
1995        struct tree *head_tree, *remote_tree, *index_tree;
1996        struct object_id index;
1997
1998        head_tree = parse_tree_indirect(head);
1999        if (!head_tree)
2000                return error(_("Could not parse object '%s'."), oid_to_hex(head));
2001
2002        remote_tree = parse_tree_indirect(remote);
2003        if (!remote_tree)
2004                return error(_("Could not parse object '%s'."), oid_to_hex(remote));
2005
2006        read_cache_unmerged();
2007
2008        if (fast_forward_to(head_tree, head_tree, 1))
2009                return -1;
2010
2011        if (write_cache_as_tree(&index, 0, NULL))
2012                return -1;
2013
2014        index_tree = parse_tree_indirect(&index);
2015        if (!index_tree)
2016                return error(_("Could not parse object '%s'."), oid_to_hex(&index));
2017
2018        if (fast_forward_to(index_tree, remote_tree, 0))
2019                return -1;
2020
2021        if (merge_tree(remote_tree))
2022                return -1;
2023
2024        remove_branch_state();
2025
2026        return 0;
2027}
2028
2029/**
2030 * Resets rerere's merge resolution metadata.
2031 */
2032static void am_rerere_clear(void)
2033{
2034        struct string_list merge_rr = STRING_LIST_INIT_DUP;
2035        rerere_clear(&merge_rr);
2036        string_list_clear(&merge_rr, 1);
2037}
2038
2039/**
2040 * Resume the current am session by skipping the current patch.
2041 */
2042static void am_skip(struct am_state *state)
2043{
2044        struct object_id head;
2045
2046        am_rerere_clear();
2047
2048        if (get_oid("HEAD", &head))
2049                oidcpy(&head, the_hash_algo->empty_tree);
2050
2051        if (clean_index(&head, &head))
2052                die(_("failed to clean index"));
2053
2054        am_next(state);
2055        am_load(state);
2056        am_run(state, 0);
2057}
2058
2059/**
2060 * Returns true if it is safe to reset HEAD to the ORIG_HEAD, false otherwise.
2061 *
2062 * It is not safe to reset HEAD when:
2063 * 1. git-am previously failed because the index was dirty.
2064 * 2. HEAD has moved since git-am previously failed.
2065 */
2066static int safe_to_abort(const struct am_state *state)
2067{
2068        struct strbuf sb = STRBUF_INIT;
2069        struct object_id abort_safety, head;
2070
2071        if (file_exists(am_path(state, "dirtyindex")))
2072                return 0;
2073
2074        if (read_state_file(&sb, state, "abort-safety", 1) > 0) {
2075                if (get_oid_hex(sb.buf, &abort_safety))
2076                        die(_("could not parse %s"), am_path(state, "abort-safety"));
2077        } else
2078                oidclr(&abort_safety);
2079        strbuf_release(&sb);
2080
2081        if (get_oid("HEAD", &head))
2082                oidclr(&head);
2083
2084        if (!oidcmp(&head, &abort_safety))
2085                return 1;
2086
2087        warning(_("You seem to have moved HEAD since the last 'am' failure.\n"
2088                "Not rewinding to ORIG_HEAD"));
2089
2090        return 0;
2091}
2092
2093/**
2094 * Aborts the current am session if it is safe to do so.
2095 */
2096static void am_abort(struct am_state *state)
2097{
2098        struct object_id curr_head, orig_head;
2099        int has_curr_head, has_orig_head;
2100        char *curr_branch;
2101
2102        if (!safe_to_abort(state)) {
2103                am_destroy(state);
2104                return;
2105        }
2106
2107        am_rerere_clear();
2108
2109        curr_branch = resolve_refdup("HEAD", 0, &curr_head, NULL);
2110        has_curr_head = curr_branch && !is_null_oid(&curr_head);
2111        if (!has_curr_head)
2112                oidcpy(&curr_head, the_hash_algo->empty_tree);
2113
2114        has_orig_head = !get_oid("ORIG_HEAD", &orig_head);
2115        if (!has_orig_head)
2116                oidcpy(&orig_head, the_hash_algo->empty_tree);
2117
2118        clean_index(&curr_head, &orig_head);
2119
2120        if (has_orig_head)
2121                update_ref("am --abort", "HEAD", &orig_head,
2122                           has_curr_head ? &curr_head : NULL, 0,
2123                           UPDATE_REFS_DIE_ON_ERR);
2124        else if (curr_branch)
2125                delete_ref(NULL, curr_branch, NULL, REF_NO_DEREF);
2126
2127        free(curr_branch);
2128        am_destroy(state);
2129}
2130
2131static int show_patch(struct am_state *state)
2132{
2133        struct strbuf sb = STRBUF_INIT;
2134        const char *patch_path;
2135        int len;
2136
2137        if (!is_null_oid(&state->orig_commit)) {
2138                const char *av[4] = { "show", NULL, "--", NULL };
2139                char *new_oid_str;
2140                int ret;
2141
2142                av[1] = new_oid_str = xstrdup(oid_to_hex(&state->orig_commit));
2143                ret = run_command_v_opt(av, RUN_GIT_CMD);
2144                free(new_oid_str);
2145                return ret;
2146        }
2147
2148        patch_path = am_path(state, msgnum(state));
2149        len = strbuf_read_file(&sb, patch_path, 0);
2150        if (len < 0)
2151                die_errno(_("failed to read '%s'"), patch_path);
2152
2153        setup_pager();
2154        write_in_full(1, sb.buf, sb.len);
2155        strbuf_release(&sb);
2156        return 0;
2157}
2158
2159/**
2160 * parse_options() callback that validates and sets opt->value to the
2161 * PATCH_FORMAT_* enum value corresponding to `arg`.
2162 */
2163static int parse_opt_patchformat(const struct option *opt, const char *arg, int unset)
2164{
2165        int *opt_value = opt->value;
2166
2167        if (!strcmp(arg, "mbox"))
2168                *opt_value = PATCH_FORMAT_MBOX;
2169        else if (!strcmp(arg, "stgit"))
2170                *opt_value = PATCH_FORMAT_STGIT;
2171        else if (!strcmp(arg, "stgit-series"))
2172                *opt_value = PATCH_FORMAT_STGIT_SERIES;
2173        else if (!strcmp(arg, "hg"))
2174                *opt_value = PATCH_FORMAT_HG;
2175        else if (!strcmp(arg, "mboxrd"))
2176                *opt_value = PATCH_FORMAT_MBOXRD;
2177        else
2178                return error(_("Invalid value for --patch-format: %s"), arg);
2179        return 0;
2180}
2181
2182enum resume_mode {
2183        RESUME_FALSE = 0,
2184        RESUME_APPLY,
2185        RESUME_RESOLVED,
2186        RESUME_SKIP,
2187        RESUME_ABORT,
2188        RESUME_QUIT,
2189        RESUME_SHOW_PATCH
2190};
2191
2192static int git_am_config(const char *k, const char *v, void *cb)
2193{
2194        int status;
2195
2196        status = git_gpg_config(k, v, NULL);
2197        if (status)
2198                return status;
2199
2200        return git_default_config(k, v, NULL);
2201}
2202
2203int cmd_am(int argc, const char **argv, const char *prefix)
2204{
2205        struct am_state state;
2206        int binary = -1;
2207        int keep_cr = -1;
2208        int patch_format = PATCH_FORMAT_UNKNOWN;
2209        enum resume_mode resume = RESUME_FALSE;
2210        int in_progress;
2211        int ret = 0;
2212
2213        const char * const usage[] = {
2214                N_("git am [<options>] [(<mbox> | <Maildir>)...]"),
2215                N_("git am [<options>] (--continue | --skip | --abort)"),
2216                NULL
2217        };
2218
2219        struct option options[] = {
2220                OPT_BOOL('i', "interactive", &state.interactive,
2221                        N_("run interactively")),
2222                OPT_HIDDEN_BOOL('b', "binary", &binary,
2223                        N_("historical option -- no-op")),
2224                OPT_BOOL('3', "3way", &state.threeway,
2225                        N_("allow fall back on 3way merging if needed")),
2226                OPT__QUIET(&state.quiet, N_("be quiet")),
2227                OPT_SET_INT('s', "signoff", &state.signoff,
2228                        N_("add a Signed-off-by line to the commit message"),
2229                        SIGNOFF_EXPLICIT),
2230                OPT_BOOL('u', "utf8", &state.utf8,
2231                        N_("recode into utf8 (default)")),
2232                OPT_SET_INT('k', "keep", &state.keep,
2233                        N_("pass -k flag to git-mailinfo"), KEEP_TRUE),
2234                OPT_SET_INT(0, "keep-non-patch", &state.keep,
2235                        N_("pass -b flag to git-mailinfo"), KEEP_NON_PATCH),
2236                OPT_BOOL('m', "message-id", &state.message_id,
2237                        N_("pass -m flag to git-mailinfo")),
2238                OPT_SET_INT_F(0, "keep-cr", &keep_cr,
2239                        N_("pass --keep-cr flag to git-mailsplit for mbox format"),
2240                        1, PARSE_OPT_NONEG),
2241                OPT_SET_INT_F(0, "no-keep-cr", &keep_cr,
2242                        N_("do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"),
2243                        0, PARSE_OPT_NONEG),
2244                OPT_BOOL('c', "scissors", &state.scissors,
2245                        N_("strip everything before a scissors line")),
2246                OPT_PASSTHRU_ARGV(0, "whitespace", &state.git_apply_opts, N_("action"),
2247                        N_("pass it through git-apply"),
2248                        0),
2249                OPT_PASSTHRU_ARGV(0, "ignore-space-change", &state.git_apply_opts, NULL,
2250                        N_("pass it through git-apply"),
2251                        PARSE_OPT_NOARG),
2252                OPT_PASSTHRU_ARGV(0, "ignore-whitespace", &state.git_apply_opts, NULL,
2253                        N_("pass it through git-apply"),
2254                        PARSE_OPT_NOARG),
2255                OPT_PASSTHRU_ARGV(0, "directory", &state.git_apply_opts, N_("root"),
2256                        N_("pass it through git-apply"),
2257                        0),
2258                OPT_PASSTHRU_ARGV(0, "exclude", &state.git_apply_opts, N_("path"),
2259                        N_("pass it through git-apply"),
2260                        0),
2261                OPT_PASSTHRU_ARGV(0, "include", &state.git_apply_opts, N_("path"),
2262                        N_("pass it through git-apply"),
2263                        0),
2264                OPT_PASSTHRU_ARGV('C', NULL, &state.git_apply_opts, N_("n"),
2265                        N_("pass it through git-apply"),
2266                        0),
2267                OPT_PASSTHRU_ARGV('p', NULL, &state.git_apply_opts, N_("num"),
2268                        N_("pass it through git-apply"),
2269                        0),
2270                OPT_CALLBACK(0, "patch-format", &patch_format, N_("format"),
2271                        N_("format the patch(es) are in"),
2272                        parse_opt_patchformat),
2273                OPT_PASSTHRU_ARGV(0, "reject", &state.git_apply_opts, NULL,
2274                        N_("pass it through git-apply"),
2275                        PARSE_OPT_NOARG),
2276                OPT_STRING(0, "resolvemsg", &state.resolvemsg, NULL,
2277                        N_("override error message when patch failure occurs")),
2278                OPT_CMDMODE(0, "continue", &resume,
2279                        N_("continue applying patches after resolving a conflict"),
2280                        RESUME_RESOLVED),
2281                OPT_CMDMODE('r', "resolved", &resume,
2282                        N_("synonyms for --continue"),
2283                        RESUME_RESOLVED),
2284                OPT_CMDMODE(0, "skip", &resume,
2285                        N_("skip the current patch"),
2286                        RESUME_SKIP),
2287                OPT_CMDMODE(0, "abort", &resume,
2288                        N_("restore the original branch and abort the patching operation."),
2289                        RESUME_ABORT),
2290                OPT_CMDMODE(0, "quit", &resume,
2291                        N_("abort the patching operation but keep HEAD where it is."),
2292                        RESUME_QUIT),
2293                OPT_CMDMODE(0, "show-current-patch", &resume,
2294                        N_("show the patch being applied."),
2295                        RESUME_SHOW_PATCH),
2296                OPT_BOOL(0, "committer-date-is-author-date",
2297                        &state.committer_date_is_author_date,
2298                        N_("lie about committer date")),
2299                OPT_BOOL(0, "ignore-date", &state.ignore_date,
2300                        N_("use current timestamp for author date")),
2301                OPT_RERERE_AUTOUPDATE(&state.allow_rerere_autoupdate),
2302                { OPTION_STRING, 'S', "gpg-sign", &state.sign_commit, N_("key-id"),
2303                  N_("GPG-sign commits"),
2304                  PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
2305                OPT_HIDDEN_BOOL(0, "rebasing", &state.rebasing,
2306                        N_("(internal use for git-rebase)")),
2307                OPT_END()
2308        };
2309
2310        if (argc == 2 && !strcmp(argv[1], "-h"))
2311                usage_with_options(usage, options);
2312
2313        git_config(git_am_config, NULL);
2314
2315        am_state_init(&state);
2316
2317        in_progress = am_in_progress(&state);
2318        if (in_progress)
2319                am_load(&state);
2320
2321        argc = parse_options(argc, argv, prefix, options, usage, 0);
2322
2323        if (binary >= 0)
2324                fprintf_ln(stderr, _("The -b/--binary option has been a no-op for long time, and\n"
2325                                "it will be removed. Please do not use it anymore."));
2326
2327        /* Ensure a valid committer ident can be constructed */
2328        git_committer_info(IDENT_STRICT);
2329
2330        if (read_index_preload(&the_index, NULL) < 0)
2331                die(_("failed to read the index"));
2332
2333        if (in_progress) {
2334                /*
2335                 * Catch user error to feed us patches when there is a session
2336                 * in progress:
2337                 *
2338                 * 1. mbox path(s) are provided on the command-line.
2339                 * 2. stdin is not a tty: the user is trying to feed us a patch
2340                 *    from standard input. This is somewhat unreliable -- stdin
2341                 *    could be /dev/null for example and the caller did not
2342                 *    intend to feed us a patch but wanted to continue
2343                 *    unattended.
2344                 */
2345                if (argc || (resume == RESUME_FALSE && !isatty(0)))
2346                        die(_("previous rebase directory %s still exists but mbox given."),
2347                                state.dir);
2348
2349                if (resume == RESUME_FALSE)
2350                        resume = RESUME_APPLY;
2351
2352                if (state.signoff == SIGNOFF_EXPLICIT)
2353                        am_append_signoff(&state);
2354        } else {
2355                struct argv_array paths = ARGV_ARRAY_INIT;
2356                int i;
2357
2358                /*
2359                 * Handle stray state directory in the independent-run case. In
2360                 * the --rebasing case, it is up to the caller to take care of
2361                 * stray directories.
2362                 */
2363                if (file_exists(state.dir) && !state.rebasing) {
2364                        if (resume == RESUME_ABORT || resume == RESUME_QUIT) {
2365                                am_destroy(&state);
2366                                am_state_release(&state);
2367                                return 0;
2368                        }
2369
2370                        die(_("Stray %s directory found.\n"
2371                                "Use \"git am --abort\" to remove it."),
2372                                state.dir);
2373                }
2374
2375                if (resume)
2376                        die(_("Resolve operation not in progress, we are not resuming."));
2377
2378                for (i = 0; i < argc; i++) {
2379                        if (is_absolute_path(argv[i]) || !prefix)
2380                                argv_array_push(&paths, argv[i]);
2381                        else
2382                                argv_array_push(&paths, mkpath("%s/%s", prefix, argv[i]));
2383                }
2384
2385                am_setup(&state, patch_format, paths.argv, keep_cr);
2386
2387                argv_array_clear(&paths);
2388        }
2389
2390        switch (resume) {
2391        case RESUME_FALSE:
2392                am_run(&state, 0);
2393                break;
2394        case RESUME_APPLY:
2395                am_run(&state, 1);
2396                break;
2397        case RESUME_RESOLVED:
2398                am_resolve(&state);
2399                break;
2400        case RESUME_SKIP:
2401                am_skip(&state);
2402                break;
2403        case RESUME_ABORT:
2404                am_abort(&state);
2405                break;
2406        case RESUME_QUIT:
2407                am_rerere_clear();
2408                am_destroy(&state);
2409                break;
2410        case RESUME_SHOW_PATCH:
2411                ret = show_patch(&state);
2412                break;
2413        default:
2414                BUG("invalid resume value");
2415        }
2416
2417        am_state_release(&state);
2418
2419        return ret;
2420}