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