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