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