builtin / am.con commit move index_has_changes() from builtin/am.c to merge.c for reuse (b101793)
   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                die("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                die("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
 712        cp.git_cmd = 1;
 713        argv_array_push(&cp.args, "mailsplit");
 714        argv_array_pushf(&cp.args, "-d%d", state->prec);
 715        argv_array_pushf(&cp.args, "-o%s", state->dir);
 716        argv_array_push(&cp.args, "-b");
 717        if (keep_cr)
 718                argv_array_push(&cp.args, "--keep-cr");
 719        if (mboxrd)
 720                argv_array_push(&cp.args, "--mboxrd");
 721        argv_array_push(&cp.args, "--");
 722        argv_array_pushv(&cp.args, paths);
 723
 724        if (capture_command(&cp, &last, 8))
 725                return -1;
 726
 727        state->cur = 1;
 728        state->last = strtol(last.buf, NULL, 10);
 729
 730        return 0;
 731}
 732
 733/**
 734 * Callback signature for split_mail_conv(). The foreign patch should be
 735 * read from `in`, and the converted patch (in RFC2822 mail format) should be
 736 * written to `out`. Return 0 on success, or -1 on failure.
 737 */
 738typedef int (*mail_conv_fn)(FILE *out, FILE *in, int keep_cr);
 739
 740/**
 741 * Calls `fn` for each file in `paths` to convert the foreign patch to the
 742 * RFC2822 mail format suitable for parsing with git-mailinfo.
 743 *
 744 * Returns 0 on success, -1 on failure.
 745 */
 746static int split_mail_conv(mail_conv_fn fn, struct am_state *state,
 747                        const char **paths, int keep_cr)
 748{
 749        static const char *stdin_only[] = {"-", NULL};
 750        int i;
 751
 752        if (!*paths)
 753                paths = stdin_only;
 754
 755        for (i = 0; *paths; paths++, i++) {
 756                FILE *in, *out;
 757                const char *mail;
 758                int ret;
 759
 760                if (!strcmp(*paths, "-"))
 761                        in = stdin;
 762                else
 763                        in = fopen(*paths, "r");
 764
 765                if (!in)
 766                        return error_errno(_("could not open '%s' for reading"),
 767                                           *paths);
 768
 769                mail = mkpath("%s/%0*d", state->dir, state->prec, i + 1);
 770
 771                out = fopen(mail, "w");
 772                if (!out) {
 773                        if (in != stdin)
 774                                fclose(in);
 775                        return error_errno(_("could not open '%s' for writing"),
 776                                           mail);
 777                }
 778
 779                ret = fn(out, in, keep_cr);
 780
 781                fclose(out);
 782                if (in != stdin)
 783                        fclose(in);
 784
 785                if (ret)
 786                        return error(_("could not parse patch '%s'"), *paths);
 787        }
 788
 789        state->cur = 1;
 790        state->last = i;
 791        return 0;
 792}
 793
 794/**
 795 * A split_mail_conv() callback that converts an StGit patch to an RFC2822
 796 * message suitable for parsing with git-mailinfo.
 797 */
 798static int stgit_patch_to_mail(FILE *out, FILE *in, int keep_cr)
 799{
 800        struct strbuf sb = STRBUF_INIT;
 801        int subject_printed = 0;
 802
 803        while (!strbuf_getline_lf(&sb, in)) {
 804                const char *str;
 805
 806                if (str_isspace(sb.buf))
 807                        continue;
 808                else if (skip_prefix(sb.buf, "Author:", &str))
 809                        fprintf(out, "From:%s\n", str);
 810                else if (starts_with(sb.buf, "From") || starts_with(sb.buf, "Date"))
 811                        fprintf(out, "%s\n", sb.buf);
 812                else if (!subject_printed) {
 813                        fprintf(out, "Subject: %s\n", sb.buf);
 814                        subject_printed = 1;
 815                } else {
 816                        fprintf(out, "\n%s\n", sb.buf);
 817                        break;
 818                }
 819        }
 820
 821        strbuf_reset(&sb);
 822        while (strbuf_fread(&sb, 8192, in) > 0) {
 823                fwrite(sb.buf, 1, sb.len, out);
 824                strbuf_reset(&sb);
 825        }
 826
 827        strbuf_release(&sb);
 828        return 0;
 829}
 830
 831/**
 832 * This function only supports a single StGit series file in `paths`.
 833 *
 834 * Given an StGit series file, converts the StGit patches in the series into
 835 * RFC2822 messages suitable for parsing with git-mailinfo, and queues them in
 836 * the state directory.
 837 *
 838 * Returns 0 on success, -1 on failure.
 839 */
 840static int split_mail_stgit_series(struct am_state *state, const char **paths,
 841                                        int keep_cr)
 842{
 843        const char *series_dir;
 844        char *series_dir_buf;
 845        FILE *fp;
 846        struct argv_array patches = ARGV_ARRAY_INIT;
 847        struct strbuf sb = STRBUF_INIT;
 848        int ret;
 849
 850        if (!paths[0] || paths[1])
 851                return error(_("Only one StGIT patch series can be applied at once"));
 852
 853        series_dir_buf = xstrdup(*paths);
 854        series_dir = dirname(series_dir_buf);
 855
 856        fp = fopen(*paths, "r");
 857        if (!fp)
 858                return error_errno(_("could not open '%s' for reading"), *paths);
 859
 860        while (!strbuf_getline_lf(&sb, fp)) {
 861                if (*sb.buf == '#')
 862                        continue; /* skip comment lines */
 863
 864                argv_array_push(&patches, mkpath("%s/%s", series_dir, sb.buf));
 865        }
 866
 867        fclose(fp);
 868        strbuf_release(&sb);
 869        free(series_dir_buf);
 870
 871        ret = split_mail_conv(stgit_patch_to_mail, state, patches.argv, keep_cr);
 872
 873        argv_array_clear(&patches);
 874        return ret;
 875}
 876
 877/**
 878 * A split_patches_conv() callback that converts a mercurial patch to a RFC2822
 879 * message suitable for parsing with git-mailinfo.
 880 */
 881static int hg_patch_to_mail(FILE *out, FILE *in, int keep_cr)
 882{
 883        struct strbuf sb = STRBUF_INIT;
 884        int rc = 0;
 885
 886        while (!strbuf_getline_lf(&sb, in)) {
 887                const char *str;
 888
 889                if (skip_prefix(sb.buf, "# User ", &str))
 890                        fprintf(out, "From: %s\n", str);
 891                else if (skip_prefix(sb.buf, "# Date ", &str)) {
 892                        timestamp_t timestamp;
 893                        long tz, tz2;
 894                        char *end;
 895
 896                        errno = 0;
 897                        timestamp = parse_timestamp(str, &end, 10);
 898                        if (errno) {
 899                                rc = error(_("invalid timestamp"));
 900                                goto exit;
 901                        }
 902
 903                        if (!skip_prefix(end, " ", &str)) {
 904                                rc = error(_("invalid Date line"));
 905                                goto exit;
 906                        }
 907
 908                        errno = 0;
 909                        tz = strtol(str, &end, 10);
 910                        if (errno) {
 911                                rc = error(_("invalid timezone offset"));
 912                                goto exit;
 913                        }
 914
 915                        if (*end) {
 916                                rc = error(_("invalid Date line"));
 917                                goto exit;
 918                        }
 919
 920                        /*
 921                         * mercurial's timezone is in seconds west of UTC,
 922                         * however git's timezone is in hours + minutes east of
 923                         * UTC. Convert it.
 924                         */
 925                        tz2 = labs(tz) / 3600 * 100 + labs(tz) % 3600 / 60;
 926                        if (tz > 0)
 927                                tz2 = -tz2;
 928
 929                        fprintf(out, "Date: %s\n", show_date(timestamp, tz2, DATE_MODE(RFC2822)));
 930                } else if (starts_with(sb.buf, "# ")) {
 931                        continue;
 932                } else {
 933                        fprintf(out, "\n%s\n", sb.buf);
 934                        break;
 935                }
 936        }
 937
 938        strbuf_reset(&sb);
 939        while (strbuf_fread(&sb, 8192, in) > 0) {
 940                fwrite(sb.buf, 1, sb.len, out);
 941                strbuf_reset(&sb);
 942        }
 943exit:
 944        strbuf_release(&sb);
 945        return rc;
 946}
 947
 948/**
 949 * Splits a list of files/directories into individual email patches. Each path
 950 * in `paths` must be a file/directory that is formatted according to
 951 * `patch_format`.
 952 *
 953 * Once split out, the individual email patches will be stored in the state
 954 * directory, with each patch's filename being its index, padded to state->prec
 955 * digits.
 956 *
 957 * state->cur will be set to the index of the first mail, and state->last will
 958 * be set to the index of the last mail.
 959 *
 960 * Set keep_cr to 0 to convert all lines ending with \r\n to end with \n, 1
 961 * to disable this behavior, -1 to use the default configured setting.
 962 *
 963 * Returns 0 on success, -1 on failure.
 964 */
 965static int split_mail(struct am_state *state, enum patch_format patch_format,
 966                        const char **paths, int keep_cr)
 967{
 968        if (keep_cr < 0) {
 969                keep_cr = 0;
 970                git_config_get_bool("am.keepcr", &keep_cr);
 971        }
 972
 973        switch (patch_format) {
 974        case PATCH_FORMAT_MBOX:
 975                return split_mail_mbox(state, paths, keep_cr, 0);
 976        case PATCH_FORMAT_STGIT:
 977                return split_mail_conv(stgit_patch_to_mail, state, paths, keep_cr);
 978        case PATCH_FORMAT_STGIT_SERIES:
 979                return split_mail_stgit_series(state, paths, keep_cr);
 980        case PATCH_FORMAT_HG:
 981                return split_mail_conv(hg_patch_to_mail, state, paths, keep_cr);
 982        case PATCH_FORMAT_MBOXRD:
 983                return split_mail_mbox(state, paths, keep_cr, 1);
 984        default:
 985                die("BUG: invalid patch_format");
 986        }
 987        return -1;
 988}
 989
 990/**
 991 * Setup a new am session for applying patches
 992 */
 993static void am_setup(struct am_state *state, enum patch_format patch_format,
 994                        const char **paths, int keep_cr)
 995{
 996        struct object_id curr_head;
 997        const char *str;
 998        struct strbuf sb = STRBUF_INIT;
 999
1000        if (!patch_format)
1001                patch_format = detect_patch_format(paths);
1002
1003        if (!patch_format) {
1004                fprintf_ln(stderr, _("Patch format detection failed."));
1005                exit(128);
1006        }
1007
1008        if (mkdir(state->dir, 0777) < 0 && errno != EEXIST)
1009                die_errno(_("failed to create directory '%s'"), state->dir);
1010
1011        if (split_mail(state, patch_format, paths, keep_cr) < 0) {
1012                am_destroy(state);
1013                die(_("Failed to split patches."));
1014        }
1015
1016        if (state->rebasing)
1017                state->threeway = 1;
1018
1019        write_state_bool(state, "threeway", state->threeway);
1020        write_state_bool(state, "quiet", state->quiet);
1021        write_state_bool(state, "sign", state->signoff);
1022        write_state_bool(state, "utf8", state->utf8);
1023
1024        if (state->allow_rerere_autoupdate)
1025                write_state_bool(state, "rerere-autoupdate",
1026                         state->allow_rerere_autoupdate == RERERE_AUTOUPDATE);
1027
1028        switch (state->keep) {
1029        case KEEP_FALSE:
1030                str = "f";
1031                break;
1032        case KEEP_TRUE:
1033                str = "t";
1034                break;
1035        case KEEP_NON_PATCH:
1036                str = "b";
1037                break;
1038        default:
1039                die("BUG: invalid value for state->keep");
1040        }
1041
1042        write_state_text(state, "keep", str);
1043        write_state_bool(state, "messageid", state->message_id);
1044
1045        switch (state->scissors) {
1046        case SCISSORS_UNSET:
1047                str = "";
1048                break;
1049        case SCISSORS_FALSE:
1050                str = "f";
1051                break;
1052        case SCISSORS_TRUE:
1053                str = "t";
1054                break;
1055        default:
1056                die("BUG: invalid value for state->scissors");
1057        }
1058        write_state_text(state, "scissors", str);
1059
1060        sq_quote_argv(&sb, state->git_apply_opts.argv, 0);
1061        write_state_text(state, "apply-opt", sb.buf);
1062
1063        if (state->rebasing)
1064                write_state_text(state, "rebasing", "");
1065        else
1066                write_state_text(state, "applying", "");
1067
1068        if (!get_oid("HEAD", &curr_head)) {
1069                write_state_text(state, "abort-safety", oid_to_hex(&curr_head));
1070                if (!state->rebasing)
1071                        update_ref_oid("am", "ORIG_HEAD", &curr_head, NULL, 0,
1072                                        UPDATE_REFS_DIE_ON_ERR);
1073        } else {
1074                write_state_text(state, "abort-safety", "");
1075                if (!state->rebasing)
1076                        delete_ref(NULL, "ORIG_HEAD", NULL, 0);
1077        }
1078
1079        /*
1080         * NOTE: Since the "next" and "last" files determine if an am_state
1081         * session is in progress, they should be written last.
1082         */
1083
1084        write_state_count(state, "next", state->cur);
1085        write_state_count(state, "last", state->last);
1086
1087        strbuf_release(&sb);
1088}
1089
1090/**
1091 * Increments the patch pointer, and cleans am_state for the application of the
1092 * next patch.
1093 */
1094static void am_next(struct am_state *state)
1095{
1096        struct object_id head;
1097
1098        FREE_AND_NULL(state->author_name);
1099        FREE_AND_NULL(state->author_email);
1100        FREE_AND_NULL(state->author_date);
1101        FREE_AND_NULL(state->msg);
1102        state->msg_len = 0;
1103
1104        unlink(am_path(state, "author-script"));
1105        unlink(am_path(state, "final-commit"));
1106
1107        oidclr(&state->orig_commit);
1108        unlink(am_path(state, "original-commit"));
1109
1110        if (!get_oid("HEAD", &head))
1111                write_state_text(state, "abort-safety", oid_to_hex(&head));
1112        else
1113                write_state_text(state, "abort-safety", "");
1114
1115        state->cur++;
1116        write_state_count(state, "next", state->cur);
1117}
1118
1119/**
1120 * Returns the filename of the current patch email.
1121 */
1122static const char *msgnum(const struct am_state *state)
1123{
1124        static struct strbuf sb = STRBUF_INIT;
1125
1126        strbuf_reset(&sb);
1127        strbuf_addf(&sb, "%0*d", state->prec, state->cur);
1128
1129        return sb.buf;
1130}
1131
1132/**
1133 * Refresh and write index.
1134 */
1135static void refresh_and_write_cache(void)
1136{
1137        struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));
1138
1139        hold_locked_index(lock_file, LOCK_DIE_ON_ERROR);
1140        refresh_cache(REFRESH_QUIET);
1141        if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
1142                die(_("unable to write index file"));
1143}
1144
1145/**
1146 * Dies with a user-friendly message on how to proceed after resolving the
1147 * problem. This message can be overridden with state->resolvemsg.
1148 */
1149static void NORETURN die_user_resolve(const struct am_state *state)
1150{
1151        if (state->resolvemsg) {
1152                printf_ln("%s", state->resolvemsg);
1153        } else {
1154                const char *cmdline = state->interactive ? "git am -i" : "git am";
1155
1156                printf_ln(_("When you have resolved this problem, run \"%s --continue\"."), cmdline);
1157                printf_ln(_("If you prefer to skip this patch, run \"%s --skip\" instead."), cmdline);
1158                printf_ln(_("To restore the original branch and stop patching, run \"%s --abort\"."), cmdline);
1159        }
1160
1161        exit(128);
1162}
1163
1164/**
1165 * Appends signoff to the "msg" field of the am_state.
1166 */
1167static void am_append_signoff(struct am_state *state)
1168{
1169        struct strbuf sb = STRBUF_INIT;
1170
1171        strbuf_attach(&sb, state->msg, state->msg_len, state->msg_len);
1172        append_signoff(&sb, 0, 0);
1173        state->msg = strbuf_detach(&sb, &state->msg_len);
1174}
1175
1176/**
1177 * Parses `mail` using git-mailinfo, extracting its patch and authorship info.
1178 * state->msg will be set to the patch message. state->author_name,
1179 * state->author_email and state->author_date will be set to the patch author's
1180 * name, email and date respectively. The patch body will be written to the
1181 * state directory's "patch" file.
1182 *
1183 * Returns 1 if the patch should be skipped, 0 otherwise.
1184 */
1185static int parse_mail(struct am_state *state, const char *mail)
1186{
1187        FILE *fp;
1188        struct strbuf sb = STRBUF_INIT;
1189        struct strbuf msg = STRBUF_INIT;
1190        struct strbuf author_name = STRBUF_INIT;
1191        struct strbuf author_date = STRBUF_INIT;
1192        struct strbuf author_email = STRBUF_INIT;
1193        int ret = 0;
1194        struct mailinfo mi;
1195
1196        setup_mailinfo(&mi);
1197
1198        if (state->utf8)
1199                mi.metainfo_charset = get_commit_output_encoding();
1200        else
1201                mi.metainfo_charset = NULL;
1202
1203        switch (state->keep) {
1204        case KEEP_FALSE:
1205                break;
1206        case KEEP_TRUE:
1207                mi.keep_subject = 1;
1208                break;
1209        case KEEP_NON_PATCH:
1210                mi.keep_non_patch_brackets_in_subject = 1;
1211                break;
1212        default:
1213                die("BUG: invalid value for state->keep");
1214        }
1215
1216        if (state->message_id)
1217                mi.add_message_id = 1;
1218
1219        switch (state->scissors) {
1220        case SCISSORS_UNSET:
1221                break;
1222        case SCISSORS_FALSE:
1223                mi.use_scissors = 0;
1224                break;
1225        case SCISSORS_TRUE:
1226                mi.use_scissors = 1;
1227                break;
1228        default:
1229                die("BUG: invalid value for state->scissors");
1230        }
1231
1232        mi.input = xfopen(mail, "r");
1233        mi.output = xfopen(am_path(state, "info"), "w");
1234        if (mailinfo(&mi, am_path(state, "msg"), am_path(state, "patch")))
1235                die("could not parse patch");
1236
1237        fclose(mi.input);
1238        fclose(mi.output);
1239
1240        /* Extract message and author information */
1241        fp = xfopen(am_path(state, "info"), "r");
1242        while (!strbuf_getline_lf(&sb, fp)) {
1243                const char *x;
1244
1245                if (skip_prefix(sb.buf, "Subject: ", &x)) {
1246                        if (msg.len)
1247                                strbuf_addch(&msg, '\n');
1248                        strbuf_addstr(&msg, x);
1249                } else if (skip_prefix(sb.buf, "Author: ", &x))
1250                        strbuf_addstr(&author_name, x);
1251                else if (skip_prefix(sb.buf, "Email: ", &x))
1252                        strbuf_addstr(&author_email, x);
1253                else if (skip_prefix(sb.buf, "Date: ", &x))
1254                        strbuf_addstr(&author_date, x);
1255        }
1256        fclose(fp);
1257
1258        /* Skip pine's internal folder data */
1259        if (!strcmp(author_name.buf, "Mail System Internal Data")) {
1260                ret = 1;
1261                goto finish;
1262        }
1263
1264        if (is_empty_file(am_path(state, "patch"))) {
1265                printf_ln(_("Patch is empty."));
1266                die_user_resolve(state);
1267        }
1268
1269        strbuf_addstr(&msg, "\n\n");
1270        strbuf_addbuf(&msg, &mi.log_message);
1271        strbuf_stripspace(&msg, 0);
1272
1273        assert(!state->author_name);
1274        state->author_name = strbuf_detach(&author_name, NULL);
1275
1276        assert(!state->author_email);
1277        state->author_email = strbuf_detach(&author_email, NULL);
1278
1279        assert(!state->author_date);
1280        state->author_date = strbuf_detach(&author_date, NULL);
1281
1282        assert(!state->msg);
1283        state->msg = strbuf_detach(&msg, &state->msg_len);
1284
1285finish:
1286        strbuf_release(&msg);
1287        strbuf_release(&author_date);
1288        strbuf_release(&author_email);
1289        strbuf_release(&author_name);
1290        strbuf_release(&sb);
1291        clear_mailinfo(&mi);
1292        return ret;
1293}
1294
1295/**
1296 * Sets commit_id to the commit hash where the mail was generated from.
1297 * Returns 0 on success, -1 on failure.
1298 */
1299static int get_mail_commit_oid(struct object_id *commit_id, const char *mail)
1300{
1301        struct strbuf sb = STRBUF_INIT;
1302        FILE *fp = xfopen(mail, "r");
1303        const char *x;
1304        int ret = 0;
1305
1306        if (strbuf_getline_lf(&sb, fp) ||
1307            !skip_prefix(sb.buf, "From ", &x) ||
1308            get_oid_hex(x, commit_id) < 0)
1309                ret = -1;
1310
1311        strbuf_release(&sb);
1312        fclose(fp);
1313        return ret;
1314}
1315
1316/**
1317 * Sets state->msg, state->author_name, state->author_email, state->author_date
1318 * to the commit's respective info.
1319 */
1320static void get_commit_info(struct am_state *state, struct commit *commit)
1321{
1322        const char *buffer, *ident_line, *msg;
1323        size_t ident_len;
1324        struct ident_split id;
1325
1326        buffer = logmsg_reencode(commit, NULL, get_commit_output_encoding());
1327
1328        ident_line = find_commit_header(buffer, "author", &ident_len);
1329
1330        if (split_ident_line(&id, ident_line, ident_len) < 0)
1331                die(_("invalid ident line: %.*s"), (int)ident_len, ident_line);
1332
1333        assert(!state->author_name);
1334        if (id.name_begin)
1335                state->author_name =
1336                        xmemdupz(id.name_begin, id.name_end - id.name_begin);
1337        else
1338                state->author_name = xstrdup("");
1339
1340        assert(!state->author_email);
1341        if (id.mail_begin)
1342                state->author_email =
1343                        xmemdupz(id.mail_begin, id.mail_end - id.mail_begin);
1344        else
1345                state->author_email = xstrdup("");
1346
1347        assert(!state->author_date);
1348        state->author_date = xstrdup(show_ident_date(&id, DATE_MODE(NORMAL)));
1349
1350        assert(!state->msg);
1351        msg = strstr(buffer, "\n\n");
1352        if (!msg)
1353                die(_("unable to parse commit %s"), oid_to_hex(&commit->object.oid));
1354        state->msg = xstrdup(msg + 2);
1355        state->msg_len = strlen(state->msg);
1356        unuse_commit_buffer(commit, buffer);
1357}
1358
1359/**
1360 * Writes `commit` as a patch to the state directory's "patch" file.
1361 */
1362static void write_commit_patch(const struct am_state *state, struct commit *commit)
1363{
1364        struct rev_info rev_info;
1365        FILE *fp;
1366
1367        fp = xfopen(am_path(state, "patch"), "w");
1368        init_revisions(&rev_info, NULL);
1369        rev_info.diff = 1;
1370        rev_info.abbrev = 0;
1371        rev_info.disable_stdin = 1;
1372        rev_info.show_root_diff = 1;
1373        rev_info.diffopt.output_format = DIFF_FORMAT_PATCH;
1374        rev_info.no_commit_id = 1;
1375        DIFF_OPT_SET(&rev_info.diffopt, BINARY);
1376        DIFF_OPT_SET(&rev_info.diffopt, FULL_INDEX);
1377        rev_info.diffopt.use_color = 0;
1378        rev_info.diffopt.file = fp;
1379        rev_info.diffopt.close_file = 1;
1380        add_pending_object(&rev_info, &commit->object, "");
1381        diff_setup_done(&rev_info.diffopt);
1382        log_tree_commit(&rev_info, commit);
1383}
1384
1385/**
1386 * Writes the diff of the index against HEAD as a patch to the state
1387 * directory's "patch" file.
1388 */
1389static void write_index_patch(const struct am_state *state)
1390{
1391        struct tree *tree;
1392        struct object_id head;
1393        struct rev_info rev_info;
1394        FILE *fp;
1395
1396        if (!get_oid_tree("HEAD", &head))
1397                tree = lookup_tree(&head);
1398        else
1399                tree = lookup_tree(&empty_tree_oid);
1400
1401        fp = xfopen(am_path(state, "patch"), "w");
1402        init_revisions(&rev_info, NULL);
1403        rev_info.diff = 1;
1404        rev_info.disable_stdin = 1;
1405        rev_info.no_commit_id = 1;
1406        rev_info.diffopt.output_format = DIFF_FORMAT_PATCH;
1407        rev_info.diffopt.use_color = 0;
1408        rev_info.diffopt.file = fp;
1409        rev_info.diffopt.close_file = 1;
1410        add_pending_object(&rev_info, &tree->object, "");
1411        diff_setup_done(&rev_info.diffopt);
1412        run_diff_index(&rev_info, 1);
1413}
1414
1415/**
1416 * Like parse_mail(), but parses the mail by looking up its commit ID
1417 * directly. This is used in --rebasing mode to bypass git-mailinfo's munging
1418 * of patches.
1419 *
1420 * state->orig_commit will be set to the original commit ID.
1421 *
1422 * Will always return 0 as the patch should never be skipped.
1423 */
1424static int parse_mail_rebase(struct am_state *state, const char *mail)
1425{
1426        struct commit *commit;
1427        struct object_id commit_oid;
1428
1429        if (get_mail_commit_oid(&commit_oid, mail) < 0)
1430                die(_("could not parse %s"), mail);
1431
1432        commit = lookup_commit_or_die(&commit_oid, mail);
1433
1434        get_commit_info(state, commit);
1435
1436        write_commit_patch(state, commit);
1437
1438        oidcpy(&state->orig_commit, &commit_oid);
1439        write_state_text(state, "original-commit", oid_to_hex(&commit_oid));
1440
1441        return 0;
1442}
1443
1444/**
1445 * Applies current patch with git-apply. Returns 0 on success, -1 otherwise. If
1446 * `index_file` is not NULL, the patch will be applied to that index.
1447 */
1448static int run_apply(const struct am_state *state, const char *index_file)
1449{
1450        struct argv_array apply_paths = ARGV_ARRAY_INIT;
1451        struct argv_array apply_opts = ARGV_ARRAY_INIT;
1452        struct apply_state apply_state;
1453        int res, opts_left;
1454        static struct lock_file lock_file;
1455        int force_apply = 0;
1456        int options = 0;
1457
1458        if (init_apply_state(&apply_state, NULL, &lock_file))
1459                die("BUG: init_apply_state() failed");
1460
1461        argv_array_push(&apply_opts, "apply");
1462        argv_array_pushv(&apply_opts, state->git_apply_opts.argv);
1463
1464        opts_left = apply_parse_options(apply_opts.argc, apply_opts.argv,
1465                                        &apply_state, &force_apply, &options,
1466                                        NULL);
1467
1468        if (opts_left != 0)
1469                die("unknown option passed through to git apply");
1470
1471        if (index_file) {
1472                apply_state.index_file = index_file;
1473                apply_state.cached = 1;
1474        } else
1475                apply_state.check_index = 1;
1476
1477        /*
1478         * If we are allowed to fall back on 3-way merge, don't give false
1479         * errors during the initial attempt.
1480         */
1481        if (state->threeway && !index_file)
1482                apply_state.apply_verbosity = verbosity_silent;
1483
1484        if (check_apply_state(&apply_state, force_apply))
1485                die("BUG: check_apply_state() failed");
1486
1487        argv_array_push(&apply_paths, am_path(state, "patch"));
1488
1489        res = apply_all_patches(&apply_state, apply_paths.argc, apply_paths.argv, options);
1490
1491        argv_array_clear(&apply_paths);
1492        argv_array_clear(&apply_opts);
1493        clear_apply_state(&apply_state);
1494
1495        if (res)
1496                return res;
1497
1498        if (index_file) {
1499                /* Reload index as apply_all_patches() will have modified it. */
1500                discard_cache();
1501                read_cache_from(index_file);
1502        }
1503
1504        return 0;
1505}
1506
1507/**
1508 * Builds an index that contains just the blobs needed for a 3way merge.
1509 */
1510static int build_fake_ancestor(const struct am_state *state, const char *index_file)
1511{
1512        struct child_process cp = CHILD_PROCESS_INIT;
1513
1514        cp.git_cmd = 1;
1515        argv_array_push(&cp.args, "apply");
1516        argv_array_pushv(&cp.args, state->git_apply_opts.argv);
1517        argv_array_pushf(&cp.args, "--build-fake-ancestor=%s", index_file);
1518        argv_array_push(&cp.args, am_path(state, "patch"));
1519
1520        if (run_command(&cp))
1521                return -1;
1522
1523        return 0;
1524}
1525
1526/**
1527 * Attempt a threeway merge, using index_path as the temporary index.
1528 */
1529static int fall_back_threeway(const struct am_state *state, const char *index_path)
1530{
1531        struct object_id orig_tree, their_tree, our_tree;
1532        const struct object_id *bases[1] = { &orig_tree };
1533        struct merge_options o;
1534        struct commit *result;
1535        char *their_tree_name;
1536
1537        if (get_oid("HEAD", &our_tree) < 0)
1538                hashcpy(our_tree.hash, EMPTY_TREE_SHA1_BIN);
1539
1540        if (build_fake_ancestor(state, index_path))
1541                return error("could not build fake ancestor");
1542
1543        discard_cache();
1544        read_cache_from(index_path);
1545
1546        if (write_index_as_tree(orig_tree.hash, &the_index, index_path, 0, NULL))
1547                return error(_("Repository lacks necessary blobs to fall back on 3-way merge."));
1548
1549        say(state, stdout, _("Using index info to reconstruct a base tree..."));
1550
1551        if (!state->quiet) {
1552                /*
1553                 * List paths that needed 3-way fallback, so that the user can
1554                 * review them with extra care to spot mismerges.
1555                 */
1556                struct rev_info rev_info;
1557                const char *diff_filter_str = "--diff-filter=AM";
1558
1559                init_revisions(&rev_info, NULL);
1560                rev_info.diffopt.output_format = DIFF_FORMAT_NAME_STATUS;
1561                diff_opt_parse(&rev_info.diffopt, &diff_filter_str, 1, rev_info.prefix);
1562                add_pending_oid(&rev_info, "HEAD", &our_tree, 0);
1563                diff_setup_done(&rev_info.diffopt);
1564                run_diff_index(&rev_info, 1);
1565        }
1566
1567        if (run_apply(state, index_path))
1568                return error(_("Did you hand edit your patch?\n"
1569                                "It does not apply to blobs recorded in its index."));
1570
1571        if (write_index_as_tree(their_tree.hash, &the_index, index_path, 0, NULL))
1572                return error("could not write tree");
1573
1574        say(state, stdout, _("Falling back to patching base and 3-way merge..."));
1575
1576        discard_cache();
1577        read_cache();
1578
1579        /*
1580         * This is not so wrong. Depending on which base we picked, orig_tree
1581         * may be wildly different from ours, but their_tree has the same set of
1582         * wildly different changes in parts the patch did not touch, so
1583         * recursive ends up canceling them, saying that we reverted all those
1584         * changes.
1585         */
1586
1587        init_merge_options(&o);
1588
1589        o.branch1 = "HEAD";
1590        their_tree_name = xstrfmt("%.*s", linelen(state->msg), state->msg);
1591        o.branch2 = their_tree_name;
1592
1593        if (state->quiet)
1594                o.verbosity = 0;
1595
1596        if (merge_recursive_generic(&o, &our_tree, &their_tree, 1, bases, &result)) {
1597                rerere(state->allow_rerere_autoupdate);
1598                free(their_tree_name);
1599                return error(_("Failed to merge in the changes."));
1600        }
1601
1602        free(their_tree_name);
1603        return 0;
1604}
1605
1606/**
1607 * Commits the current index with state->msg as the commit message and
1608 * state->author_name, state->author_email and state->author_date as the author
1609 * information.
1610 */
1611static void do_commit(const struct am_state *state)
1612{
1613        struct object_id tree, parent, commit;
1614        const struct object_id *old_oid;
1615        struct commit_list *parents = NULL;
1616        const char *reflog_msg, *author;
1617        struct strbuf sb = STRBUF_INIT;
1618
1619        if (run_hook_le(NULL, "pre-applypatch", NULL))
1620                exit(1);
1621
1622        if (write_cache_as_tree(tree.hash, 0, NULL))
1623                die(_("git write-tree failed to write a tree"));
1624
1625        if (!get_oid_commit("HEAD", &parent)) {
1626                old_oid = &parent;
1627                commit_list_insert(lookup_commit(&parent), &parents);
1628        } else {
1629                old_oid = NULL;
1630                say(state, stderr, _("applying to an empty history"));
1631        }
1632
1633        author = fmt_ident(state->author_name, state->author_email,
1634                        state->ignore_date ? NULL : state->author_date,
1635                        IDENT_STRICT);
1636
1637        if (state->committer_date_is_author_date)
1638                setenv("GIT_COMMITTER_DATE",
1639                        state->ignore_date ? "" : state->author_date, 1);
1640
1641        if (commit_tree(state->msg, state->msg_len, tree.hash, parents, commit.hash,
1642                                author, state->sign_commit))
1643                die(_("failed to write commit object"));
1644
1645        reflog_msg = getenv("GIT_REFLOG_ACTION");
1646        if (!reflog_msg)
1647                reflog_msg = "am";
1648
1649        strbuf_addf(&sb, "%s: %.*s", reflog_msg, linelen(state->msg),
1650                        state->msg);
1651
1652        update_ref_oid(sb.buf, "HEAD", &commit, old_oid, 0,
1653                        UPDATE_REFS_DIE_ON_ERR);
1654
1655        if (state->rebasing) {
1656                FILE *fp = xfopen(am_path(state, "rewritten"), "a");
1657
1658                assert(!is_null_oid(&state->orig_commit));
1659                fprintf(fp, "%s ", oid_to_hex(&state->orig_commit));
1660                fprintf(fp, "%s\n", oid_to_hex(&commit));
1661                fclose(fp);
1662        }
1663
1664        run_hook_le(NULL, "post-applypatch", NULL);
1665
1666        strbuf_release(&sb);
1667}
1668
1669/**
1670 * Validates the am_state for resuming -- the "msg" and authorship fields must
1671 * be filled up.
1672 */
1673static void validate_resume_state(const struct am_state *state)
1674{
1675        if (!state->msg)
1676                die(_("cannot resume: %s does not exist."),
1677                        am_path(state, "final-commit"));
1678
1679        if (!state->author_name || !state->author_email || !state->author_date)
1680                die(_("cannot resume: %s does not exist."),
1681                        am_path(state, "author-script"));
1682}
1683
1684/**
1685 * Interactively prompt the user on whether the current patch should be
1686 * applied.
1687 *
1688 * Returns 0 if the user chooses to apply the patch, 1 if the user chooses to
1689 * skip it.
1690 */
1691static int do_interactive(struct am_state *state)
1692{
1693        assert(state->msg);
1694
1695        if (!isatty(0))
1696                die(_("cannot be interactive without stdin connected to a terminal."));
1697
1698        for (;;) {
1699                const char *reply;
1700
1701                puts(_("Commit Body is:"));
1702                puts("--------------------------");
1703                printf("%s", state->msg);
1704                puts("--------------------------");
1705
1706                /*
1707                 * TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
1708                 * in your translation. The program will only accept English
1709                 * input at this point.
1710                 */
1711                reply = git_prompt(_("Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "), PROMPT_ECHO);
1712
1713                if (!reply) {
1714                        continue;
1715                } else if (*reply == 'y' || *reply == 'Y') {
1716                        return 0;
1717                } else if (*reply == 'a' || *reply == 'A') {
1718                        state->interactive = 0;
1719                        return 0;
1720                } else if (*reply == 'n' || *reply == 'N') {
1721                        return 1;
1722                } else if (*reply == 'e' || *reply == 'E') {
1723                        struct strbuf msg = STRBUF_INIT;
1724
1725                        if (!launch_editor(am_path(state, "final-commit"), &msg, NULL)) {
1726                                free(state->msg);
1727                                state->msg = strbuf_detach(&msg, &state->msg_len);
1728                        }
1729                        strbuf_release(&msg);
1730                } else if (*reply == 'v' || *reply == 'V') {
1731                        const char *pager = git_pager(1);
1732                        struct child_process cp = CHILD_PROCESS_INIT;
1733
1734                        if (!pager)
1735                                pager = "cat";
1736                        prepare_pager_args(&cp, pager);
1737                        argv_array_push(&cp.args, am_path(state, "patch"));
1738                        run_command(&cp);
1739                }
1740        }
1741}
1742
1743/**
1744 * Applies all queued mail.
1745 *
1746 * If `resume` is true, we are "resuming". The "msg" and authorship fields, as
1747 * well as the state directory's "patch" file is used as-is for applying the
1748 * patch and committing it.
1749 */
1750static void am_run(struct am_state *state, int resume)
1751{
1752        const char *argv_gc_auto[] = {"gc", "--auto", NULL};
1753        struct strbuf sb = STRBUF_INIT;
1754
1755        unlink(am_path(state, "dirtyindex"));
1756
1757        refresh_and_write_cache();
1758
1759        if (index_has_changes(&sb)) {
1760                write_state_bool(state, "dirtyindex", 1);
1761                die(_("Dirty index: cannot apply patches (dirty: %s)"), sb.buf);
1762        }
1763
1764        strbuf_release(&sb);
1765
1766        while (state->cur <= state->last) {
1767                const char *mail = am_path(state, msgnum(state));
1768                int apply_status;
1769
1770                reset_ident_date();
1771
1772                if (!file_exists(mail))
1773                        goto next;
1774
1775                if (resume) {
1776                        validate_resume_state(state);
1777                } else {
1778                        int skip;
1779
1780                        if (state->rebasing)
1781                                skip = parse_mail_rebase(state, mail);
1782                        else
1783                                skip = parse_mail(state, mail);
1784
1785                        if (skip)
1786                                goto next; /* mail should be skipped */
1787
1788                        if (state->signoff)
1789                                am_append_signoff(state);
1790
1791                        write_author_script(state);
1792                        write_commit_msg(state);
1793                }
1794
1795                if (state->interactive && do_interactive(state))
1796                        goto next;
1797
1798                if (run_applypatch_msg_hook(state))
1799                        exit(1);
1800
1801                say(state, stdout, _("Applying: %.*s"), linelen(state->msg), state->msg);
1802
1803                apply_status = run_apply(state, NULL);
1804
1805                if (apply_status && state->threeway) {
1806                        struct strbuf sb = STRBUF_INIT;
1807
1808                        strbuf_addstr(&sb, am_path(state, "patch-merge-index"));
1809                        apply_status = fall_back_threeway(state, sb.buf);
1810                        strbuf_release(&sb);
1811
1812                        /*
1813                         * Applying the patch to an earlier tree and merging
1814                         * the result may have produced the same tree as ours.
1815                         */
1816                        if (!apply_status && !index_has_changes(NULL)) {
1817                                say(state, stdout, _("No changes -- Patch already applied."));
1818                                goto next;
1819                        }
1820                }
1821
1822                if (apply_status) {
1823                        int advice_amworkdir = 1;
1824
1825                        printf_ln(_("Patch failed at %s %.*s"), msgnum(state),
1826                                linelen(state->msg), state->msg);
1827
1828                        git_config_get_bool("advice.amworkdir", &advice_amworkdir);
1829
1830                        if (advice_amworkdir)
1831                                printf_ln(_("The copy of the patch that failed is found in: %s"),
1832                                                am_path(state, "patch"));
1833
1834                        die_user_resolve(state);
1835                }
1836
1837                do_commit(state);
1838
1839next:
1840                am_next(state);
1841
1842                if (resume)
1843                        am_load(state);
1844                resume = 0;
1845        }
1846
1847        if (!is_empty_file(am_path(state, "rewritten"))) {
1848                assert(state->rebasing);
1849                copy_notes_for_rebase(state);
1850                run_post_rewrite_hook(state);
1851        }
1852
1853        /*
1854         * In rebasing mode, it's up to the caller to take care of
1855         * housekeeping.
1856         */
1857        if (!state->rebasing) {
1858                am_destroy(state);
1859                close_all_packs();
1860                run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
1861        }
1862}
1863
1864/**
1865 * Resume the current am session after patch application failure. The user did
1866 * all the hard work, and we do not have to do any patch application. Just
1867 * trust and commit what the user has in the index and working tree.
1868 */
1869static void am_resolve(struct am_state *state)
1870{
1871        validate_resume_state(state);
1872
1873        say(state, stdout, _("Applying: %.*s"), linelen(state->msg), state->msg);
1874
1875        if (!index_has_changes(NULL)) {
1876                printf_ln(_("No changes - did you forget to use 'git add'?\n"
1877                        "If there is nothing left to stage, chances are that something else\n"
1878                        "already introduced the same changes; you might want to skip this patch."));
1879                die_user_resolve(state);
1880        }
1881
1882        if (unmerged_cache()) {
1883                printf_ln(_("You still have unmerged paths in your index.\n"
1884                        "You should 'git add' each file with resolved conflicts to mark them as such.\n"
1885                        "You might run `git rm` on a file to accept \"deleted by them\" for it."));
1886                die_user_resolve(state);
1887        }
1888
1889        if (state->interactive) {
1890                write_index_patch(state);
1891                if (do_interactive(state))
1892                        goto next;
1893        }
1894
1895        rerere(0);
1896
1897        do_commit(state);
1898
1899next:
1900        am_next(state);
1901        am_load(state);
1902        am_run(state, 0);
1903}
1904
1905/**
1906 * Performs a checkout fast-forward from `head` to `remote`. If `reset` is
1907 * true, any unmerged entries will be discarded. Returns 0 on success, -1 on
1908 * failure.
1909 */
1910static int fast_forward_to(struct tree *head, struct tree *remote, int reset)
1911{
1912        struct lock_file *lock_file;
1913        struct unpack_trees_options opts;
1914        struct tree_desc t[2];
1915
1916        if (parse_tree(head) || parse_tree(remote))
1917                return -1;
1918
1919        lock_file = xcalloc(1, sizeof(struct lock_file));
1920        hold_locked_index(lock_file, LOCK_DIE_ON_ERROR);
1921
1922        refresh_cache(REFRESH_QUIET);
1923
1924        memset(&opts, 0, sizeof(opts));
1925        opts.head_idx = 1;
1926        opts.src_index = &the_index;
1927        opts.dst_index = &the_index;
1928        opts.update = 1;
1929        opts.merge = 1;
1930        opts.reset = reset;
1931        opts.fn = twoway_merge;
1932        init_tree_desc(&t[0], head->buffer, head->size);
1933        init_tree_desc(&t[1], remote->buffer, remote->size);
1934
1935        if (unpack_trees(2, t, &opts)) {
1936                rollback_lock_file(lock_file);
1937                return -1;
1938        }
1939
1940        if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
1941                die(_("unable to write new index file"));
1942
1943        return 0;
1944}
1945
1946/**
1947 * Merges a tree into the index. The index's stat info will take precedence
1948 * over the merged tree's. Returns 0 on success, -1 on failure.
1949 */
1950static int merge_tree(struct tree *tree)
1951{
1952        struct lock_file *lock_file;
1953        struct unpack_trees_options opts;
1954        struct tree_desc t[1];
1955
1956        if (parse_tree(tree))
1957                return -1;
1958
1959        lock_file = xcalloc(1, sizeof(struct lock_file));
1960        hold_locked_index(lock_file, LOCK_DIE_ON_ERROR);
1961
1962        memset(&opts, 0, sizeof(opts));
1963        opts.head_idx = 1;
1964        opts.src_index = &the_index;
1965        opts.dst_index = &the_index;
1966        opts.merge = 1;
1967        opts.fn = oneway_merge;
1968        init_tree_desc(&t[0], tree->buffer, tree->size);
1969
1970        if (unpack_trees(1, t, &opts)) {
1971                rollback_lock_file(lock_file);
1972                return -1;
1973        }
1974
1975        if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
1976                die(_("unable to write new index file"));
1977
1978        return 0;
1979}
1980
1981/**
1982 * Clean the index without touching entries that are not modified between
1983 * `head` and `remote`.
1984 */
1985static int clean_index(const struct object_id *head, const struct object_id *remote)
1986{
1987        struct tree *head_tree, *remote_tree, *index_tree;
1988        struct object_id index;
1989
1990        head_tree = parse_tree_indirect(head);
1991        if (!head_tree)
1992                return error(_("Could not parse object '%s'."), oid_to_hex(head));
1993
1994        remote_tree = parse_tree_indirect(remote);
1995        if (!remote_tree)
1996                return error(_("Could not parse object '%s'."), oid_to_hex(remote));
1997
1998        read_cache_unmerged();
1999
2000        if (fast_forward_to(head_tree, head_tree, 1))
2001                return -1;
2002
2003        if (write_cache_as_tree(index.hash, 0, NULL))
2004                return -1;
2005
2006        index_tree = parse_tree_indirect(&index);
2007        if (!index_tree)
2008                return error(_("Could not parse object '%s'."), oid_to_hex(&index));
2009
2010        if (fast_forward_to(index_tree, remote_tree, 0))
2011                return -1;
2012
2013        if (merge_tree(remote_tree))
2014                return -1;
2015
2016        remove_branch_state();
2017
2018        return 0;
2019}
2020
2021/**
2022 * Resets rerere's merge resolution metadata.
2023 */
2024static void am_rerere_clear(void)
2025{
2026        struct string_list merge_rr = STRING_LIST_INIT_DUP;
2027        rerere_clear(&merge_rr);
2028        string_list_clear(&merge_rr, 1);
2029}
2030
2031/**
2032 * Resume the current am session by skipping the current patch.
2033 */
2034static void am_skip(struct am_state *state)
2035{
2036        struct object_id head;
2037
2038        am_rerere_clear();
2039
2040        if (get_oid("HEAD", &head))
2041                hashcpy(head.hash, EMPTY_TREE_SHA1_BIN);
2042
2043        if (clean_index(&head, &head))
2044                die(_("failed to clean index"));
2045
2046        am_next(state);
2047        am_load(state);
2048        am_run(state, 0);
2049}
2050
2051/**
2052 * Returns true if it is safe to reset HEAD to the ORIG_HEAD, false otherwise.
2053 *
2054 * It is not safe to reset HEAD when:
2055 * 1. git-am previously failed because the index was dirty.
2056 * 2. HEAD has moved since git-am previously failed.
2057 */
2058static int safe_to_abort(const struct am_state *state)
2059{
2060        struct strbuf sb = STRBUF_INIT;
2061        struct object_id abort_safety, head;
2062
2063        if (file_exists(am_path(state, "dirtyindex")))
2064                return 0;
2065
2066        if (read_state_file(&sb, state, "abort-safety", 1) > 0) {
2067                if (get_oid_hex(sb.buf, &abort_safety))
2068                        die(_("could not parse %s"), am_path(state, "abort-safety"));
2069        } else
2070                oidclr(&abort_safety);
2071        strbuf_release(&sb);
2072
2073        if (get_oid("HEAD", &head))
2074                oidclr(&head);
2075
2076        if (!oidcmp(&head, &abort_safety))
2077                return 1;
2078
2079        warning(_("You seem to have moved HEAD since the last 'am' failure.\n"
2080                "Not rewinding to ORIG_HEAD"));
2081
2082        return 0;
2083}
2084
2085/**
2086 * Aborts the current am session if it is safe to do so.
2087 */
2088static void am_abort(struct am_state *state)
2089{
2090        struct object_id curr_head, orig_head;
2091        int has_curr_head, has_orig_head;
2092        char *curr_branch;
2093
2094        if (!safe_to_abort(state)) {
2095                am_destroy(state);
2096                return;
2097        }
2098
2099        am_rerere_clear();
2100
2101        curr_branch = resolve_refdup("HEAD", 0, curr_head.hash, NULL);
2102        has_curr_head = curr_branch && !is_null_oid(&curr_head);
2103        if (!has_curr_head)
2104                hashcpy(curr_head.hash, EMPTY_TREE_SHA1_BIN);
2105
2106        has_orig_head = !get_oid("ORIG_HEAD", &orig_head);
2107        if (!has_orig_head)
2108                hashcpy(orig_head.hash, EMPTY_TREE_SHA1_BIN);
2109
2110        clean_index(&curr_head, &orig_head);
2111
2112        if (has_orig_head)
2113                update_ref_oid("am --abort", "HEAD", &orig_head,
2114                                has_curr_head ? &curr_head : NULL, 0,
2115                                UPDATE_REFS_DIE_ON_ERR);
2116        else if (curr_branch)
2117                delete_ref(NULL, curr_branch, NULL, REF_NODEREF);
2118
2119        free(curr_branch);
2120        am_destroy(state);
2121}
2122
2123/**
2124 * parse_options() callback that validates and sets opt->value to the
2125 * PATCH_FORMAT_* enum value corresponding to `arg`.
2126 */
2127static int parse_opt_patchformat(const struct option *opt, const char *arg, int unset)
2128{
2129        int *opt_value = opt->value;
2130
2131        if (!strcmp(arg, "mbox"))
2132                *opt_value = PATCH_FORMAT_MBOX;
2133        else if (!strcmp(arg, "stgit"))
2134                *opt_value = PATCH_FORMAT_STGIT;
2135        else if (!strcmp(arg, "stgit-series"))
2136                *opt_value = PATCH_FORMAT_STGIT_SERIES;
2137        else if (!strcmp(arg, "hg"))
2138                *opt_value = PATCH_FORMAT_HG;
2139        else if (!strcmp(arg, "mboxrd"))
2140                *opt_value = PATCH_FORMAT_MBOXRD;
2141        else
2142                return error(_("Invalid value for --patch-format: %s"), arg);
2143        return 0;
2144}
2145
2146enum resume_mode {
2147        RESUME_FALSE = 0,
2148        RESUME_APPLY,
2149        RESUME_RESOLVED,
2150        RESUME_SKIP,
2151        RESUME_ABORT
2152};
2153
2154static int git_am_config(const char *k, const char *v, void *cb)
2155{
2156        int status;
2157
2158        status = git_gpg_config(k, v, NULL);
2159        if (status)
2160                return status;
2161
2162        return git_default_config(k, v, NULL);
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        if (argc == 2 && !strcmp(argv[1], "-h"))
2266                usage_with_options(usage, options);
2267
2268        git_config(git_am_config, NULL);
2269
2270        am_state_init(&state);
2271
2272        in_progress = am_in_progress(&state);
2273        if (in_progress)
2274                am_load(&state);
2275
2276        argc = parse_options(argc, argv, prefix, options, usage, 0);
2277
2278        if (binary >= 0)
2279                fprintf_ln(stderr, _("The -b/--binary option has been a no-op for long time, and\n"
2280                                "it will be removed. Please do not use it anymore."));
2281
2282        /* Ensure a valid committer ident can be constructed */
2283        git_committer_info(IDENT_STRICT);
2284
2285        if (read_index_preload(&the_index, NULL) < 0)
2286                die(_("failed to read the index"));
2287
2288        if (in_progress) {
2289                /*
2290                 * Catch user error to feed us patches when there is a session
2291                 * in progress:
2292                 *
2293                 * 1. mbox path(s) are provided on the command-line.
2294                 * 2. stdin is not a tty: the user is trying to feed us a patch
2295                 *    from standard input. This is somewhat unreliable -- stdin
2296                 *    could be /dev/null for example and the caller did not
2297                 *    intend to feed us a patch but wanted to continue
2298                 *    unattended.
2299                 */
2300                if (argc || (resume == RESUME_FALSE && !isatty(0)))
2301                        die(_("previous rebase directory %s still exists but mbox given."),
2302                                state.dir);
2303
2304                if (resume == RESUME_FALSE)
2305                        resume = RESUME_APPLY;
2306
2307                if (state.signoff == SIGNOFF_EXPLICIT)
2308                        am_append_signoff(&state);
2309        } else {
2310                struct argv_array paths = ARGV_ARRAY_INIT;
2311                int i;
2312
2313                /*
2314                 * Handle stray state directory in the independent-run case. In
2315                 * the --rebasing case, it is up to the caller to take care of
2316                 * stray directories.
2317                 */
2318                if (file_exists(state.dir) && !state.rebasing) {
2319                        if (resume == RESUME_ABORT) {
2320                                am_destroy(&state);
2321                                am_state_release(&state);
2322                                return 0;
2323                        }
2324
2325                        die(_("Stray %s directory found.\n"
2326                                "Use \"git am --abort\" to remove it."),
2327                                state.dir);
2328                }
2329
2330                if (resume)
2331                        die(_("Resolve operation not in progress, we are not resuming."));
2332
2333                for (i = 0; i < argc; i++) {
2334                        if (is_absolute_path(argv[i]) || !prefix)
2335                                argv_array_push(&paths, argv[i]);
2336                        else
2337                                argv_array_push(&paths, mkpath("%s/%s", prefix, argv[i]));
2338                }
2339
2340                am_setup(&state, patch_format, paths.argv, keep_cr);
2341
2342                argv_array_clear(&paths);
2343        }
2344
2345        switch (resume) {
2346        case RESUME_FALSE:
2347                am_run(&state, 0);
2348                break;
2349        case RESUME_APPLY:
2350                am_run(&state, 1);
2351                break;
2352        case RESUME_RESOLVED:
2353                am_resolve(&state);
2354                break;
2355        case RESUME_SKIP:
2356                am_skip(&state);
2357                break;
2358        case RESUME_ABORT:
2359                am_abort(&state);
2360                break;
2361        default:
2362                die("BUG: invalid resume value");
2363        }
2364
2365        am_state_release(&state);
2366
2367        return 0;
2368}