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