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