2 #include "add-interactive.h"
4 #include "run-command.h"
5 #include "argv-array.h"
9 #include "compat/terminal.h"
12 enum prompt_mode_type {
13 PROMPT_MODE_CHANGE = 0, PROMPT_DELETION, PROMPT_ADDITION, PROMPT_HUNK,
14 PROMPT_MODE_MAX, /* must be last */
19 * The magic constant 4 is chosen such that all patch modes
20 * provide enough space for three command-line arguments followed by a
23 const char *diff_cmd[4], *apply_args[4], *apply_check_args[4];
24 unsigned is_reverse:1, index_only:1, apply_for_checkout:1;
25 const char *prompt_mode[PROMPT_MODE_MAX];
26 const char *edit_hunk_hint, *help_patch_text;
29 static struct patch_mode patch_mode_add = {
30 .diff_cmd = { "diff-files", NULL },
31 .apply_args = { "--cached", NULL },
32 .apply_check_args = { "--cached", NULL },
34 N_("Stage mode change [y,n,q,a,d%s,?]? "),
35 N_("Stage deletion [y,n,q,a,d%s,?]? "),
36 N_("Stage addition [y,n,q,a,d%s,?]? "),
37 N_("Stage this hunk [y,n,q,a,d%s,?]? ")
39 .edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
40 "will immediately be marked for staging."),
42 N_("y - stage this hunk\n"
43 "n - do not stage this hunk\n"
44 "q - quit; do not stage this hunk or any of the remaining "
46 "a - stage this hunk and all later hunks in the file\n"
47 "d - do not stage this hunk or any of the later hunks in "
51 static struct patch_mode patch_mode_stash = {
52 .diff_cmd = { "diff-index", "HEAD", NULL },
53 .apply_args = { "--cached", NULL },
54 .apply_check_args = { "--cached", NULL },
56 N_("Stash mode change [y,n,q,a,d%s,?]? "),
57 N_("Stash deletion [y,n,q,a,d%s,?]? "),
58 N_("Stash addition [y,n,q,a,d%s,?]? "),
59 N_("Stash this hunk [y,n,q,a,d%s,?]? "),
61 .edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
62 "will immediately be marked for stashing."),
64 N_("y - stash this hunk\n"
65 "n - do not stash this hunk\n"
66 "q - quit; do not stash this hunk or any of the remaining "
68 "a - stash this hunk and all later hunks in the file\n"
69 "d - do not stash this hunk or any of the later hunks in "
73 static struct patch_mode patch_mode_reset_head = {
74 .diff_cmd = { "diff-index", "--cached", NULL },
75 .apply_args = { "-R", "--cached", NULL },
76 .apply_check_args = { "-R", "--cached", NULL },
80 N_("Unstage mode change [y,n,q,a,d%s,?]? "),
81 N_("Unstage deletion [y,n,q,a,d%s,?]? "),
82 N_("Unstage addition [y,n,q,a,d%s,?]? "),
83 N_("Unstage this hunk [y,n,q,a,d%s,?]? "),
85 .edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
86 "will immediately be marked for unstaging."),
88 N_("y - unstage this hunk\n"
89 "n - do not unstage this hunk\n"
90 "q - quit; do not unstage this hunk or any of the remaining "
92 "a - unstage this hunk and all later hunks in the file\n"
93 "d - do not unstage this hunk or any of the later hunks in "
97 static struct patch_mode patch_mode_reset_nothead = {
98 .diff_cmd = { "diff-index", "-R", "--cached", NULL },
99 .apply_args = { "--cached", NULL },
100 .apply_check_args = { "--cached", NULL },
103 N_("Apply mode change to index [y,n,q,a,d%s,?]? "),
104 N_("Apply deletion to index [y,n,q,a,d%s,?]? "),
105 N_("Apply addition to index [y,n,q,a,d%s,?]? "),
106 N_("Apply this hunk to index [y,n,q,a,d%s,?]? "),
108 .edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
109 "will immediately be marked for applying."),
111 N_("y - apply this hunk to index\n"
112 "n - do not apply this hunk to index\n"
113 "q - quit; do not apply this hunk or any of the remaining "
115 "a - apply this hunk and all later hunks in the file\n"
116 "d - do not apply this hunk or any of the later hunks in "
120 static struct patch_mode patch_mode_checkout_index = {
121 .diff_cmd = { "diff-files", NULL },
122 .apply_args = { "-R", NULL },
123 .apply_check_args = { "-R", NULL },
126 N_("Discard mode change from worktree [y,n,q,a,d%s,?]? "),
127 N_("Discard deletion from worktree [y,n,q,a,d%s,?]? "),
128 N_("Discard addition from worktree [y,n,q,a,d%s,?]? "),
129 N_("Discard this hunk from worktree [y,n,q,a,d%s,?]? "),
131 .edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
132 "will immediately be marked for discarding."),
134 N_("y - discard this hunk from worktree\n"
135 "n - do not discard this hunk from worktree\n"
136 "q - quit; do not discard this hunk or any of the remaining "
138 "a - discard this hunk and all later hunks in the file\n"
139 "d - do not discard this hunk or any of the later hunks in "
143 static struct patch_mode patch_mode_checkout_head = {
144 .diff_cmd = { "diff-index", NULL },
145 .apply_for_checkout = 1,
146 .apply_check_args = { "-R", NULL },
149 N_("Discard mode change from index and worktree [y,n,q,a,d%s,?]? "),
150 N_("Discard deletion from index and worktree [y,n,q,a,d%s,?]? "),
151 N_("Discard addition from index and worktree [y,n,q,a,d%s,?]? "),
152 N_("Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "),
154 .edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
155 "will immediately be marked for discarding."),
157 N_("y - discard this hunk from index and worktree\n"
158 "n - do not discard this hunk from index and worktree\n"
159 "q - quit; do not discard this hunk or any of the remaining "
161 "a - discard this hunk and all later hunks in the file\n"
162 "d - do not discard this hunk or any of the later hunks in "
166 static struct patch_mode patch_mode_checkout_nothead = {
167 .diff_cmd = { "diff-index", "-R", NULL },
168 .apply_for_checkout = 1,
169 .apply_check_args = { NULL },
171 N_("Apply mode change to index and worktree [y,n,q,a,d%s,?]? "),
172 N_("Apply deletion to index and worktree [y,n,q,a,d%s,?]? "),
173 N_("Apply addition to index and worktree [y,n,q,a,d%s,?]? "),
174 N_("Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "),
176 .edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
177 "will immediately be marked for applying."),
179 N_("y - apply this hunk to index and worktree\n"
180 "n - do not apply this hunk to index and worktree\n"
181 "q - quit; do not apply this hunk or any of the remaining "
183 "a - apply this hunk and all later hunks in the file\n"
184 "d - do not apply this hunk or any of the later hunks in "
188 static struct patch_mode patch_mode_worktree_head = {
189 .diff_cmd = { "diff-index", NULL },
190 .apply_args = { "-R", NULL },
191 .apply_check_args = { "-R", NULL },
194 N_("Discard mode change from index and worktree [y,n,q,a,d%s,?]? "),
195 N_("Discard deletion from index and worktree [y,n,q,a,d%s,?]? "),
196 N_("Discard addition from index and worktree [y,n,q,a,d%s,?]? "),
197 N_("Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "),
199 .edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
200 "will immediately be marked for discarding."),
202 N_("y - discard this hunk from worktree\n"
203 "n - do not discard this hunk from worktree\n"
204 "q - quit; do not discard this hunk or any of the remaining "
206 "a - discard this hunk and all later hunks in the file\n"
207 "d - do not discard this hunk or any of the later hunks in "
211 static struct patch_mode patch_mode_worktree_nothead = {
212 .diff_cmd = { "diff-index", "-R", NULL },
213 .apply_args = { NULL },
214 .apply_check_args = { NULL },
216 N_("Apply mode change to index and worktree [y,n,q,a,d%s,?]? "),
217 N_("Apply deletion to index and worktree [y,n,q,a,d%s,?]? "),
218 N_("Apply addition to index and worktree [y,n,q,a,d%s,?]? "),
219 N_("Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "),
221 .edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
222 "will immediately be marked for applying."),
224 N_("y - apply this hunk to worktree\n"
225 "n - do not apply this hunk to worktree\n"
226 "q - quit; do not apply this hunk or any of the remaining "
228 "a - apply this hunk and all later hunks in the file\n"
229 "d - do not apply this hunk or any of the later hunks in "
234 unsigned long old_offset, old_count, new_offset, new_count;
236 * Start/end offsets to the extra text after the second `@@` in the
237 * hunk header, e.g. the function signature. This is expected to
238 * include the newline.
240 size_t extra_start, extra_end, colored_extra_start, colored_extra_end;
244 size_t start, end, colored_start, colored_end, splittable_into;
246 enum { UNDECIDED_HUNK = 0, SKIP_HUNK, USE_HUNK } use;
247 struct hunk_header header;
251 struct add_i_state s;
252 struct strbuf answer, buf;
255 struct strbuf plain, colored;
259 size_t hunk_nr, hunk_alloc;
260 unsigned deleted:1, added:1, mode_change:1,binary:1;
265 struct patch_mode *mode;
266 const char *revision;
269 static void err(struct add_p_state *s, const char *fmt, ...)
274 fputs(s->s.error_color, stderr);
275 vfprintf(stderr, fmt, args);
276 fputs(s->s.reset_color, stderr);
281 static void setup_child_process(struct add_p_state *s,
282 struct child_process *cp, ...)
288 while ((arg = va_arg(ap, const char *)))
289 argv_array_push(&cp->args, arg);
293 argv_array_pushf(&cp->env_array,
294 INDEX_ENVIRONMENT "=%s", s->s.r->index_file);
297 static int parse_range(const char **p,
298 unsigned long *offset, unsigned long *count)
302 *offset = strtoul(*p, &pend, 10);
310 *count = strtoul(pend + 1, (char **)p, 10);
311 return *p == pend + 1 ? -1 : 0;
314 static int parse_hunk_header(struct add_p_state *s, struct hunk *hunk)
316 struct hunk_header *header = &hunk->header;
317 const char *line = s->plain.buf + hunk->start, *p = line;
318 char *eol = memchr(p, '\n', s->plain.len - hunk->start);
321 eol = s->plain.buf + s->plain.len;
323 if (!skip_prefix(p, "@@ -", &p) ||
324 parse_range(&p, &header->old_offset, &header->old_count) < 0 ||
325 !skip_prefix(p, " +", &p) ||
326 parse_range(&p, &header->new_offset, &header->new_count) < 0 ||
327 !skip_prefix(p, " @@", &p))
328 return error(_("could not parse hunk header '%.*s'"),
329 (int)(eol - line), line);
331 hunk->start = eol - s->plain.buf + (*eol == '\n');
332 header->extra_start = p - s->plain.buf;
333 header->extra_end = hunk->start;
335 if (!s->colored.len) {
336 header->colored_extra_start = header->colored_extra_end = 0;
340 /* Now find the extra text in the colored diff */
341 line = s->colored.buf + hunk->colored_start;
342 eol = memchr(line, '\n', s->colored.len - hunk->colored_start);
344 eol = s->colored.buf + s->colored.len;
345 p = memmem(line, eol - line, "@@ -", 4);
347 return error(_("could not parse colored hunk header '%.*s'"),
348 (int)(eol - line), line);
349 p = memmem(p + 4, eol - p - 4, " @@", 3);
351 return error(_("could not parse colored hunk header '%.*s'"),
352 (int)(eol - line), line);
353 hunk->colored_start = eol - s->colored.buf + (*eol == '\n');
354 header->colored_extra_start = p + 3 - s->colored.buf;
355 header->colored_extra_end = hunk->colored_start;
360 static int is_octal(const char *p, size_t len)
366 if (*p < '0' || *(p++) > '7')
371 static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
373 struct argv_array args = ARGV_ARRAY_INIT;
374 const char *diff_algorithm = s->s.interactive_diff_algorithm;
375 struct strbuf *plain = &s->plain, *colored = NULL;
376 struct child_process cp = CHILD_PROCESS_INIT;
377 char *p, *pend, *colored_p = NULL, *colored_pend = NULL, marker = '\0';
378 size_t file_diff_alloc = 0, i, color_arg_index;
379 struct file_diff *file_diff = NULL;
380 struct hunk *hunk = NULL;
383 argv_array_pushv(&args, s->mode->diff_cmd);
385 argv_array_pushf(&args, "--diff-algorithm=%s", diff_algorithm);
387 struct object_id oid;
388 argv_array_push(&args,
389 /* could be on an unborn branch */
390 !strcmp("HEAD", s->revision) &&
391 get_oid("HEAD", &oid) ?
392 empty_tree_oid_hex() : s->revision);
394 color_arg_index = args.argc;
395 /* Use `--no-color` explicitly, just in case `diff.color = always`. */
396 argv_array_pushl(&args, "--no-color", "-p", "--", NULL);
397 for (i = 0; i < ps->nr; i++)
398 argv_array_push(&args, ps->items[i].original);
400 setup_child_process(s, &cp, NULL);
402 res = capture_command(&cp, plain, 0);
404 argv_array_clear(&args);
405 return error(_("could not parse diff"));
408 argv_array_clear(&args);
411 strbuf_complete_line(plain);
413 if (want_color_fd(1, -1)) {
414 struct child_process colored_cp = CHILD_PROCESS_INIT;
415 const char *diff_filter = s->s.interactive_diff_filter;
417 setup_child_process(s, &colored_cp, NULL);
418 xsnprintf((char *)args.argv[color_arg_index], 8, "--color");
419 colored_cp.argv = args.argv;
420 colored = &s->colored;
421 res = capture_command(&colored_cp, colored, 0);
422 argv_array_clear(&args);
424 return error(_("could not parse colored diff"));
427 struct child_process filter_cp = CHILD_PROCESS_INIT;
429 setup_child_process(s, &filter_cp,
431 filter_cp.git_cmd = 0;
432 filter_cp.use_shell = 1;
433 strbuf_reset(&s->buf);
434 if (pipe_command(&filter_cp,
435 colored->buf, colored->len,
436 &s->buf, colored->len,
438 return error(_("failed to run '%s'"),
440 strbuf_swap(colored, &s->buf);
443 strbuf_complete_line(colored);
444 colored_p = colored->buf;
445 colored_pend = colored_p + colored->len;
447 argv_array_clear(&args);
449 /* parse files and hunks */
451 pend = p + plain->len;
453 char *eol = memchr(p, '\n', pend - p);
454 const char *deleted = NULL, *added = NULL, *mode_change = NULL;
459 if (starts_with(p, "diff ")) {
460 ALLOC_GROW_BY(s->file_diff, s->file_diff_nr, 1,
462 file_diff = s->file_diff + s->file_diff_nr - 1;
463 hunk = &file_diff->head;
464 hunk->start = p - plain->buf;
466 hunk->colored_start = colored_p - colored->buf;
468 } else if (p == plain->buf)
469 BUG("diff starts with unexpected line:\n"
470 "%.*s\n", (int)(eol - p), p);
471 else if (file_diff->deleted || file_diff->added)
472 ; /* keep the rest of the file in a single "hunk" */
473 else if (starts_with(p, "@@ ") ||
474 (hunk == &file_diff->head &&
475 (skip_prefix(p, "deleted file", &deleted) ||
476 skip_prefix(p, "new file", &added)))) {
477 if (marker == '-' || marker == '+')
479 * Should not happen; previous hunk did not end
480 * in a context line? Handle it anyway.
482 hunk->splittable_into++;
484 ALLOC_GROW_BY(file_diff->hunk, file_diff->hunk_nr, 1,
485 file_diff->hunk_alloc);
486 hunk = file_diff->hunk + file_diff->hunk_nr - 1;
488 hunk->start = p - plain->buf;
490 hunk->colored_start = colored_p - colored->buf;
493 file_diff->deleted = 1;
495 file_diff->added = 1;
496 else if (parse_hunk_header(s, hunk) < 0)
500 * Start counting into how many hunks this one can be
504 } else if (hunk == &file_diff->head &&
505 skip_prefix(p, "old mode ", &mode_change) &&
506 is_octal(mode_change, eol - mode_change)) {
507 if (file_diff->mode_change)
508 BUG("double mode change?\n\n%.*s",
509 (int)(eol - plain->buf), plain->buf);
510 if (file_diff->hunk_nr)
511 BUG("mode change in the middle?\n\n%.*s",
512 (int)(eol - plain->buf), plain->buf);
515 * Do *not* change `hunk`: the mode change pseudo-hunk
516 * is _part of_ the header "hunk".
518 file_diff->mode_change = 1;
519 ALLOC_GROW_BY(file_diff->hunk, file_diff->hunk_nr, 1,
520 file_diff->hunk_alloc);
521 file_diff->hunk->start = p - plain->buf;
523 file_diff->hunk->colored_start =
524 colored_p - colored->buf;
525 } else if (hunk == &file_diff->head &&
526 skip_prefix(p, "new mode ", &mode_change) &&
527 is_octal(mode_change, eol - mode_change)) {
530 * Extend the "mode change" pseudo-hunk to include also
531 * the "new mode" line.
533 if (!file_diff->mode_change)
534 BUG("'new mode' without 'old mode'?\n\n%.*s",
535 (int)(eol - plain->buf), plain->buf);
536 if (file_diff->hunk_nr != 1)
537 BUG("mode change in the middle?\n\n%.*s",
538 (int)(eol - plain->buf), plain->buf);
539 if (p - plain->buf != file_diff->hunk->end)
540 BUG("'new mode' does not immediately follow "
541 "'old mode'?\n\n%.*s",
542 (int)(eol - plain->buf), plain->buf);
543 } else if (hunk == &file_diff->head &&
544 starts_with(p, "Binary files "))
545 file_diff->binary = 1;
547 if (!!file_diff->deleted + !!file_diff->added +
548 !!file_diff->mode_change > 1)
549 BUG("diff can only contain delete *or* add *or* a "
550 "mode change?!?\n%.*s",
551 (int)(eol - (plain->buf + file_diff->head.start)),
552 plain->buf + file_diff->head.start);
554 if ((marker == '-' || marker == '+') && *p == ' ')
555 hunk->splittable_into++;
556 if (marker && *p != '\\')
559 p = eol == pend ? pend : eol + 1;
560 hunk->end = p - plain->buf;
563 char *colored_eol = memchr(colored_p, '\n',
564 colored_pend - colored_p);
566 colored_p = colored_eol + 1;
568 /* colored shorter than non-colored? */
569 goto mismatched_output;
571 colored_p = colored_pend;
573 hunk->colored_end = colored_p - colored->buf;
577 if (file_diff->hunk_nr != 1)
578 BUG("mode change in hunk #%d???",
579 (int)file_diff->hunk_nr);
580 /* Adjust the end of the "mode change" pseudo-hunk */
581 file_diff->hunk->end = hunk->end;
583 file_diff->hunk->colored_end = hunk->colored_end;
587 if (marker == '-' || marker == '+')
589 * Last hunk ended in non-context line (i.e. it appended lines
590 * to the file, so there are no trailing context lines).
592 hunk->splittable_into++;
594 /* non-colored shorter than colored? */
595 if (colored_p != colored_pend) {
597 error(_("mismatched output from interactive.diffFilter"));
598 advise(_("Your filter must maintain a one-to-one correspondence\n"
599 "between its input and output lines."));
606 static size_t find_next_line(struct strbuf *sb, size_t offset)
610 if (offset >= sb->len)
611 BUG("looking for next line beyond buffer (%d >= %d)\n%s",
612 (int)offset, (int)sb->len, sb->buf);
614 eol = memchr(sb->buf + offset, '\n', sb->len - offset);
617 return eol - sb->buf + 1;
620 static void render_hunk(struct add_p_state *s, struct hunk *hunk,
621 ssize_t delta, int colored, struct strbuf *out)
623 struct hunk_header *header = &hunk->header;
625 if (hunk->header.old_offset != 0 || hunk->header.new_offset != 0) {
627 * Generate the hunk header dynamically, except for special
628 * hunks (such as the diff header).
632 unsigned long old_offset = header->old_offset;
633 unsigned long new_offset = header->new_offset;
636 p = s->plain.buf + header->extra_start;
637 len = header->extra_end - header->extra_start;
639 strbuf_addstr(out, s->s.fraginfo_color);
640 p = s->colored.buf + header->colored_extra_start;
641 len = header->colored_extra_end
642 - header->colored_extra_start;
645 if (s->mode->is_reverse)
650 strbuf_addf(out, "@@ -%lu,%lu +%lu,%lu @@",
651 old_offset, header->old_count,
652 new_offset, header->new_count);
654 strbuf_add(out, p, len);
656 strbuf_addf(out, "%s\n", GIT_COLOR_RESET);
658 strbuf_addch(out, '\n');
662 strbuf_add(out, s->colored.buf + hunk->colored_start,
663 hunk->colored_end - hunk->colored_start);
665 strbuf_add(out, s->plain.buf + hunk->start,
666 hunk->end - hunk->start);
669 static void render_diff_header(struct add_p_state *s,
670 struct file_diff *file_diff, int colored,
674 * If there was a mode change, the first hunk is a pseudo hunk that
675 * corresponds to the mode line in the header. If the user did not want
676 * to stage that "hunk", we actually have to cut it out from the header.
678 int skip_mode_change =
679 file_diff->mode_change && file_diff->hunk->use != USE_HUNK;
680 struct hunk *head = &file_diff->head, *first = file_diff->hunk;
682 if (!skip_mode_change) {
683 render_hunk(s, head, 0, colored, out);
688 const char *p = s->colored.buf;
690 strbuf_add(out, p + head->colored_start,
691 first->colored_start - head->colored_start);
692 strbuf_add(out, p + first->colored_end,
693 head->colored_end - first->colored_end);
695 const char *p = s->plain.buf;
697 strbuf_add(out, p + head->start, first->start - head->start);
698 strbuf_add(out, p + first->end, head->end - first->end);
702 /* Coalesce hunks again that were split */
703 static int merge_hunks(struct add_p_state *s, struct file_diff *file_diff,
704 size_t *hunk_index, int use_all, struct hunk *merged)
706 size_t i = *hunk_index, delta;
707 struct hunk *hunk = file_diff->hunk + i;
708 /* `header` corresponds to the merged hunk */
709 struct hunk_header *header = &merged->header, *next;
711 if (!use_all && hunk->use != USE_HUNK)
715 /* We simply skip the colored part (if any) when merging hunks */
716 merged->colored_start = merged->colored_end = 0;
718 for (; i + 1 < file_diff->hunk_nr; i++) {
720 next = &hunk->header;
723 * Stop merging hunks when:
725 * - the hunk is not selected for use, or
726 * - the hunk does not overlap with the already-merged hunk(s)
728 if ((!use_all && hunk->use != USE_HUNK) ||
729 header->new_offset >= next->new_offset + merged->delta ||
730 header->new_offset + header->new_count
731 < next->new_offset + merged->delta)
735 * If the hunks were not edited, and overlap, we can simply
736 * extend the line range.
738 if (merged->start < hunk->start && merged->end > hunk->start) {
739 merged->end = hunk->end;
740 merged->colored_end = hunk->colored_end;
743 const char *plain = s->plain.buf;
744 size_t overlapping_line_count = header->new_offset
745 + header->new_count - merged->delta
747 size_t overlap_end = hunk->start;
748 size_t overlap_start = overlap_end;
749 size_t overlap_next, len, j;
752 * One of the hunks was edited: the modified hunk was
753 * appended to the strbuf `s->plain`.
755 * Let's ensure that at least the last context line of
756 * the first hunk overlaps with the corresponding line
757 * of the second hunk, and then merge.
759 for (j = 0; j < overlapping_line_count; j++) {
760 overlap_next = find_next_line(&s->plain,
763 if (overlap_next > hunk->end)
764 BUG("failed to find %d context lines "
766 (int)overlapping_line_count,
767 (int)(hunk->end - hunk->start),
768 plain + hunk->start);
770 if (plain[overlap_end] != ' ')
771 return error(_("expected context line "
776 plain + hunk->start);
778 overlap_start = overlap_end;
779 overlap_end = overlap_next;
781 len = overlap_end - overlap_start;
783 if (len > merged->end - merged->start ||
784 memcmp(plain + merged->end - len,
785 plain + overlap_start, len))
786 return error(_("hunks do not overlap:\n%.*s\n"
787 "\tdoes not end with:\n%.*s"),
788 (int)(merged->end - merged->start),
789 plain + merged->start,
790 (int)len, plain + overlap_start);
793 * Since the start-end ranges are not adjacent, we
794 * cannot simply take the union of the ranges. To
795 * address that, we temporarily append the union of the
796 * lines to the `plain` strbuf.
798 if (merged->end != s->plain.len) {
799 size_t start = s->plain.len;
801 strbuf_add(&s->plain, plain + merged->start,
802 merged->end - merged->start);
803 plain = s->plain.buf;
804 merged->start = start;
805 merged->end = s->plain.len;
808 strbuf_add(&s->plain,
810 hunk->end - overlap_end);
811 merged->end = s->plain.len;
812 merged->splittable_into += hunk->splittable_into;
813 delta = merged->delta;
814 merged->delta += hunk->delta;
817 header->old_count = next->old_offset + next->old_count
818 - header->old_offset;
819 header->new_count = next->new_offset + delta
820 + next->new_count - header->new_offset;
823 if (i == *hunk_index)
830 static void reassemble_patch(struct add_p_state *s,
831 struct file_diff *file_diff, int use_all,
835 size_t save_len = s->plain.len, i;
838 render_diff_header(s, file_diff, 0, out);
840 for (i = file_diff->mode_change; i < file_diff->hunk_nr; i++) {
841 struct hunk merged = { 0 };
843 hunk = file_diff->hunk + i;
844 if (!use_all && hunk->use != USE_HUNK)
845 delta += hunk->header.old_count
846 - hunk->header.new_count;
848 /* merge overlapping hunks into a temporary hunk */
849 if (merge_hunks(s, file_diff, &i, use_all, &merged))
852 render_hunk(s, hunk, delta, 0, out);
855 * In case `merge_hunks()` used `plain` as a scratch
856 * pad (this happens when an edited hunk had to be
857 * coalesced with another hunk).
859 strbuf_setlen(&s->plain, save_len);
861 delta += hunk->delta;
866 static int split_hunk(struct add_p_state *s, struct file_diff *file_diff,
869 int colored = !!s->colored.len, first = 1;
870 struct hunk *hunk = file_diff->hunk + hunk_index;
871 size_t splittable_into;
872 size_t end, colored_end, current, colored_current = 0, context_line_count;
873 struct hunk_header remaining, *header;
876 if (hunk_index >= file_diff->hunk_nr)
877 BUG("invalid hunk index: %d (must be >= 0 and < %d)",
878 (int)hunk_index, (int)file_diff->hunk_nr);
880 if (hunk->splittable_into < 2)
882 splittable_into = hunk->splittable_into;
885 colored_end = hunk->colored_end;
887 remaining = hunk->header;
889 file_diff->hunk_nr += splittable_into - 1;
890 ALLOC_GROW(file_diff->hunk, file_diff->hunk_nr, file_diff->hunk_alloc);
891 if (hunk_index + splittable_into < file_diff->hunk_nr)
892 memmove(file_diff->hunk + hunk_index + splittable_into,
893 file_diff->hunk + hunk_index + 1,
894 (file_diff->hunk_nr - hunk_index - splittable_into)
896 hunk = file_diff->hunk + hunk_index;
897 hunk->splittable_into = 1;
898 memset(hunk + 1, 0, (splittable_into - 1) * sizeof(*hunk));
900 header = &hunk->header;
901 header->old_count = header->new_count = 0;
903 current = hunk->start;
905 colored_current = hunk->colored_start;
907 context_line_count = 0;
909 while (splittable_into > 1) {
910 ch = s->plain.buf[current];
913 BUG("buffer overrun while splitting hunks");
916 * Is this the first context line after a chain of +/- lines?
917 * Then record the start of the next split hunk.
919 if ((marker == '-' || marker == '+') && ch == ' ') {
921 hunk[1].start = current;
923 hunk[1].colored_start = colored_current;
924 context_line_count = 0;
928 * Was the previous line a +/- one? Alternatively, is this the
929 * first line (and not a +/- one)?
931 * Then just increment the appropriate counter and continue
932 * with the next line.
934 if (marker != ' ' || (ch != '-' && ch != '+')) {
936 /* Comment lines are attached to the previous line */
938 ch = marker ? marker : ' ';
940 /* current hunk not done yet */
942 context_line_count++;
948 BUG("unhandled diff marker: '%c'", ch);
950 current = find_next_line(&s->plain, current);
953 find_next_line(&s->colored,
959 * We got us the start of a new hunk!
961 * This is a context line, so it is shared with the previous
966 if (header->old_count || header->new_count)
967 BUG("counts are off: %d/%d",
968 (int)header->old_count,
969 (int)header->new_count);
971 header->old_count = context_line_count;
972 header->new_count = context_line_count;
973 context_line_count = 0;
978 remaining.old_offset += header->old_count;
979 remaining.old_count -= header->old_count;
980 remaining.new_offset += header->new_count;
981 remaining.new_count -= header->new_count;
983 /* initialize next hunk header's offsets */
984 hunk[1].header.old_offset =
985 header->old_offset + header->old_count;
986 hunk[1].header.new_offset =
987 header->new_offset + header->new_count;
989 /* add one split hunk */
990 header->old_count += context_line_count;
991 header->new_count += context_line_count;
995 hunk->colored_end = colored_current;
998 hunk->splittable_into = 1;
999 hunk->use = hunk[-1].use;
1000 header = &hunk->header;
1002 header->old_count = header->new_count = context_line_count;
1003 context_line_count = 0;
1009 /* last hunk simply gets the rest */
1010 if (header->old_offset != remaining.old_offset)
1011 BUG("miscounted old_offset: %lu != %lu",
1012 header->old_offset, remaining.old_offset);
1013 if (header->new_offset != remaining.new_offset)
1014 BUG("miscounted new_offset: %lu != %lu",
1015 header->new_offset, remaining.new_offset);
1016 header->old_count = remaining.old_count;
1017 header->new_count = remaining.new_count;
1020 hunk->colored_end = colored_end;
1025 static void recolor_hunk(struct add_p_state *s, struct hunk *hunk)
1027 const char *plain = s->plain.buf;
1028 size_t current, eol, next;
1030 if (!s->colored.len)
1033 hunk->colored_start = s->colored.len;
1034 for (current = hunk->start; current < hunk->end; ) {
1035 for (eol = current; eol < hunk->end; eol++)
1036 if (plain[eol] == '\n')
1038 next = eol + (eol < hunk->end);
1039 if (eol > current && plain[eol - 1] == '\r')
1042 strbuf_addstr(&s->colored,
1043 plain[current] == '-' ?
1044 s->s.file_old_color :
1045 plain[current] == '+' ?
1046 s->s.file_new_color :
1047 s->s.context_color);
1048 strbuf_add(&s->colored, plain + current, eol - current);
1049 strbuf_addstr(&s->colored, GIT_COLOR_RESET);
1051 strbuf_add(&s->colored, plain + eol, next - eol);
1054 hunk->colored_end = s->colored.len;
1057 static int edit_hunk_manually(struct add_p_state *s, struct hunk *hunk)
1061 strbuf_reset(&s->buf);
1062 strbuf_commented_addf(&s->buf, _("Manual hunk edit mode -- see bottom for "
1063 "a quick guide.\n"));
1064 render_hunk(s, hunk, 0, 0, &s->buf);
1065 strbuf_commented_addf(&s->buf,
1067 "To remove '%c' lines, make them ' ' lines "
1069 "To remove '%c' lines, delete them.\n"
1070 "Lines starting with %c will be removed.\n"),
1071 s->mode->is_reverse ? '+' : '-',
1072 s->mode->is_reverse ? '-' : '+',
1074 strbuf_commented_addf(&s->buf, "%s", _(s->mode->edit_hunk_hint));
1076 * TRANSLATORS: 'it' refers to the patch mentioned in the previous
1079 strbuf_commented_addf(&s->buf,
1080 _("If it does not apply cleanly, you will be "
1081 "given an opportunity to\n"
1082 "edit again. If all lines of the hunk are "
1083 "removed, then the edit is\n"
1084 "aborted and the hunk is left unchanged.\n"));
1086 if (strbuf_edit_interactively(&s->buf, "addp-hunk-edit.diff", NULL) < 0)
1089 /* strip out commented lines */
1090 hunk->start = s->plain.len;
1091 for (i = 0; i < s->buf.len; ) {
1092 size_t next = find_next_line(&s->buf, i);
1094 if (s->buf.buf[i] != comment_line_char)
1095 strbuf_add(&s->plain, s->buf.buf + i, next - i);
1099 hunk->end = s->plain.len;
1100 if (hunk->end == hunk->start)
1101 /* The user aborted editing by deleting everything */
1104 recolor_hunk(s, hunk);
1107 * If the hunk header is intact, parse it, otherwise simply use the
1108 * hunk header prior to editing (which will adjust `hunk->start` to
1109 * skip the hunk header).
1111 if (s->plain.buf[hunk->start] == '@' &&
1112 parse_hunk_header(s, hunk) < 0)
1113 return error(_("could not parse hunk header"));
1118 static ssize_t recount_edited_hunk(struct add_p_state *s, struct hunk *hunk,
1119 size_t orig_old_count, size_t orig_new_count)
1121 struct hunk_header *header = &hunk->header;
1124 header->old_count = header->new_count = 0;
1125 for (i = hunk->start; i < hunk->end; ) {
1126 switch (s->plain.buf[i]) {
1128 header->old_count++;
1131 header->new_count++;
1133 case ' ': case '\r': case '\n':
1134 header->old_count++;
1135 header->new_count++;
1139 i = find_next_line(&s->plain, i);
1142 return orig_old_count - orig_new_count
1143 - header->old_count + header->new_count;
1146 static int run_apply_check(struct add_p_state *s,
1147 struct file_diff *file_diff)
1149 struct child_process cp = CHILD_PROCESS_INIT;
1151 strbuf_reset(&s->buf);
1152 reassemble_patch(s, file_diff, 1, &s->buf);
1154 setup_child_process(s, &cp,
1155 "apply", "--check", NULL);
1156 argv_array_pushv(&cp.args, s->mode->apply_check_args);
1157 if (pipe_command(&cp, s->buf.buf, s->buf.len, NULL, 0, NULL, 0))
1158 return error(_("'git apply --cached' failed"));
1163 static int read_single_character(struct add_p_state *s)
1165 if (s->s.use_single_key) {
1166 int res = read_key_without_echo(&s->answer);
1167 printf("%s\n", res == EOF ? "" : s->answer.buf);
1171 if (git_read_line_interactively(&s->answer) == EOF)
1176 static int prompt_yesno(struct add_p_state *s, const char *prompt)
1179 color_fprintf(stdout, s->s.prompt_color, "%s", _(prompt));
1181 if (read_single_character(s) == EOF)
1183 switch (tolower(s->answer.buf[0])) {
1190 static int edit_hunk_loop(struct add_p_state *s,
1191 struct file_diff *file_diff, struct hunk *hunk)
1193 size_t plain_len = s->plain.len, colored_len = s->colored.len;
1199 int res = edit_hunk_manually(s, hunk);
1208 recount_edited_hunk(s, hunk,
1209 backup.header.old_count,
1210 backup.header.new_count);
1211 if (!run_apply_check(s, file_diff))
1215 /* Drop edits (they were appended to s->plain) */
1216 strbuf_setlen(&s->plain, plain_len);
1217 strbuf_setlen(&s->colored, colored_len);
1221 * TRANSLATORS: do not translate [y/n]
1222 * The program will only accept that input at this point.
1223 * Consider translating (saying "no" discards!) as
1224 * (saying "n" for "no" discards!) if the translation
1225 * of the word "no" does not start with n.
1227 res = prompt_yesno(s, _("Your edited hunk does not apply. "
1228 "Edit again (saying \"no\" discards!) "
1235 static int apply_for_checkout(struct add_p_state *s, struct strbuf *diff,
1238 const char *reverse = is_reverse ? "-R" : NULL;
1239 struct child_process check_index = CHILD_PROCESS_INIT;
1240 struct child_process check_worktree = CHILD_PROCESS_INIT;
1241 struct child_process apply_index = CHILD_PROCESS_INIT;
1242 struct child_process apply_worktree = CHILD_PROCESS_INIT;
1243 int applies_index, applies_worktree;
1245 setup_child_process(s, &check_index,
1246 "apply", "--cached", "--check", reverse, NULL);
1247 applies_index = !pipe_command(&check_index, diff->buf, diff->len,
1250 setup_child_process(s, &check_worktree,
1251 "apply", "--check", reverse, NULL);
1252 applies_worktree = !pipe_command(&check_worktree, diff->buf, diff->len,
1255 if (applies_worktree && applies_index) {
1256 setup_child_process(s, &apply_index,
1257 "apply", "--cached", reverse, NULL);
1258 pipe_command(&apply_index, diff->buf, diff->len,
1261 setup_child_process(s, &apply_worktree,
1262 "apply", reverse, NULL);
1263 pipe_command(&apply_worktree, diff->buf, diff->len,
1269 if (!applies_index) {
1270 err(s, _("The selected hunks do not apply to the index!"));
1271 if (prompt_yesno(s, _("Apply them to the worktree "
1273 setup_child_process(s, &apply_worktree,
1274 "apply", reverse, NULL);
1275 return pipe_command(&apply_worktree, diff->buf,
1276 diff->len, NULL, 0, NULL, 0);
1278 err(s, _("Nothing was applied.\n"));
1280 /* As a last resort, show the diff to the user */
1281 fwrite(diff->buf, diff->len, 1, stderr);
1286 #define SUMMARY_HEADER_WIDTH 20
1287 #define SUMMARY_LINE_WIDTH 80
1288 static void summarize_hunk(struct add_p_state *s, struct hunk *hunk,
1291 struct hunk_header *header = &hunk->header;
1292 struct strbuf *plain = &s->plain;
1293 size_t len = out->len, i;
1295 strbuf_addf(out, " -%lu,%lu +%lu,%lu ",
1296 header->old_offset, header->old_count,
1297 header->new_offset, header->new_count);
1298 if (out->len - len < SUMMARY_HEADER_WIDTH)
1299 strbuf_addchars(out, ' ',
1300 SUMMARY_HEADER_WIDTH + len - out->len);
1301 for (i = hunk->start; i < hunk->end; i = find_next_line(plain, i))
1302 if (plain->buf[i] != ' ')
1305 strbuf_add(out, plain->buf + i, find_next_line(plain, i) - i);
1306 if (out->len - len > SUMMARY_LINE_WIDTH)
1307 strbuf_setlen(out, len + SUMMARY_LINE_WIDTH);
1308 strbuf_complete_line(out);
1311 #define DISPLAY_HUNKS_LINES 20
1312 static size_t display_hunks(struct add_p_state *s,
1313 struct file_diff *file_diff, size_t start_index)
1315 size_t end_index = start_index + DISPLAY_HUNKS_LINES;
1317 if (end_index > file_diff->hunk_nr)
1318 end_index = file_diff->hunk_nr;
1320 while (start_index < end_index) {
1321 struct hunk *hunk = file_diff->hunk + start_index++;
1323 strbuf_reset(&s->buf);
1324 strbuf_addf(&s->buf, "%c%2d: ", hunk->use == USE_HUNK ? '+'
1325 : hunk->use == SKIP_HUNK ? '-' : ' ',
1327 summarize_hunk(s, hunk, &s->buf);
1328 fputs(s->buf.buf, stdout);
1334 static const char help_patch_remainder[] =
1335 N_("j - leave this hunk undecided, see next undecided hunk\n"
1336 "J - leave this hunk undecided, see next hunk\n"
1337 "k - leave this hunk undecided, see previous undecided hunk\n"
1338 "K - leave this hunk undecided, see previous hunk\n"
1339 "g - select a hunk to go to\n"
1340 "/ - search for a hunk matching the given regex\n"
1341 "s - split the current hunk into smaller hunks\n"
1342 "e - manually edit the current hunk\n"
1343 "? - print help\n");
1345 static int patch_update_file(struct add_p_state *s,
1346 struct file_diff *file_diff)
1348 size_t hunk_index = 0;
1349 ssize_t i, undecided_previous, undecided_next;
1352 struct child_process cp = CHILD_PROCESS_INIT;
1353 int colored = !!s->colored.len, quit = 0;
1354 enum prompt_mode_type prompt_mode_type;
1356 if (!file_diff->hunk_nr)
1359 strbuf_reset(&s->buf);
1360 render_diff_header(s, file_diff, colored, &s->buf);
1361 fputs(s->buf.buf, stdout);
1363 if (hunk_index >= file_diff->hunk_nr)
1365 hunk = file_diff->hunk + hunk_index;
1367 undecided_previous = -1;
1368 for (i = hunk_index - 1; i >= 0; i--)
1369 if (file_diff->hunk[i].use == UNDECIDED_HUNK) {
1370 undecided_previous = i;
1374 undecided_next = -1;
1375 for (i = hunk_index + 1; i < file_diff->hunk_nr; i++)
1376 if (file_diff->hunk[i].use == UNDECIDED_HUNK) {
1381 /* Everything decided? */
1382 if (undecided_previous < 0 && undecided_next < 0 &&
1383 hunk->use != UNDECIDED_HUNK)
1386 strbuf_reset(&s->buf);
1387 render_hunk(s, hunk, 0, colored, &s->buf);
1388 fputs(s->buf.buf, stdout);
1390 strbuf_reset(&s->buf);
1391 if (undecided_previous >= 0)
1392 strbuf_addstr(&s->buf, ",k");
1394 strbuf_addstr(&s->buf, ",K");
1395 if (undecided_next >= 0)
1396 strbuf_addstr(&s->buf, ",j");
1397 if (hunk_index + 1 < file_diff->hunk_nr)
1398 strbuf_addstr(&s->buf, ",J");
1399 if (file_diff->hunk_nr > 1)
1400 strbuf_addstr(&s->buf, ",g,/");
1401 if (hunk->splittable_into > 1)
1402 strbuf_addstr(&s->buf, ",s");
1403 if (hunk_index + 1 > file_diff->mode_change &&
1404 !file_diff->deleted)
1405 strbuf_addstr(&s->buf, ",e");
1407 if (file_diff->deleted)
1408 prompt_mode_type = PROMPT_DELETION;
1409 else if (file_diff->added)
1410 prompt_mode_type = PROMPT_ADDITION;
1411 else if (file_diff->mode_change && !hunk_index)
1412 prompt_mode_type = PROMPT_MODE_CHANGE;
1414 prompt_mode_type = PROMPT_HUNK;
1416 color_fprintf(stdout, s->s.prompt_color,
1417 "(%"PRIuMAX"/%"PRIuMAX") ",
1418 (uintmax_t)hunk_index + 1,
1419 (uintmax_t)file_diff->hunk_nr);
1420 color_fprintf(stdout, s->s.prompt_color,
1421 _(s->mode->prompt_mode[prompt_mode_type]),
1424 if (read_single_character(s) == EOF)
1429 ch = tolower(s->answer.buf[0]);
1431 hunk->use = USE_HUNK;
1433 hunk_index = undecided_next < 0 ?
1434 file_diff->hunk_nr : undecided_next;
1435 } else if (ch == 'n') {
1436 hunk->use = SKIP_HUNK;
1437 goto soft_increment;
1438 } else if (ch == 'a') {
1439 for (; hunk_index < file_diff->hunk_nr; hunk_index++) {
1440 hunk = file_diff->hunk + hunk_index;
1441 if (hunk->use == UNDECIDED_HUNK)
1442 hunk->use = USE_HUNK;
1444 } else if (ch == 'd' || ch == 'q') {
1445 for (; hunk_index < file_diff->hunk_nr; hunk_index++) {
1446 hunk = file_diff->hunk + hunk_index;
1447 if (hunk->use == UNDECIDED_HUNK)
1448 hunk->use = SKIP_HUNK;
1454 } else if (s->answer.buf[0] == 'K') {
1458 err(s, _("No previous hunk"));
1459 } else if (s->answer.buf[0] == 'J') {
1460 if (hunk_index + 1 < file_diff->hunk_nr)
1463 err(s, _("No next hunk"));
1464 } else if (s->answer.buf[0] == 'k') {
1465 if (undecided_previous >= 0)
1466 hunk_index = undecided_previous;
1468 err(s, _("No previous hunk"));
1469 } else if (s->answer.buf[0] == 'j') {
1470 if (undecided_next >= 0)
1471 hunk_index = undecided_next;
1473 err(s, _("No next hunk"));
1474 } else if (s->answer.buf[0] == 'g') {
1476 unsigned long response;
1478 if (file_diff->hunk_nr < 2) {
1479 err(s, _("No other hunks to goto"));
1482 strbuf_remove(&s->answer, 0, 1);
1483 strbuf_trim(&s->answer);
1484 i = hunk_index - DISPLAY_HUNKS_LINES / 2;
1485 if (i < file_diff->mode_change)
1486 i = file_diff->mode_change;
1487 while (s->answer.len == 0) {
1488 i = display_hunks(s, file_diff, i);
1489 printf("%s", i < file_diff->hunk_nr ?
1490 _("go to which hunk (<ret> to see "
1491 "more)? ") : _("go to which hunk? "));
1493 if (strbuf_getline(&s->answer,
1496 strbuf_trim_trailing_newline(&s->answer);
1499 strbuf_trim(&s->answer);
1500 response = strtoul(s->answer.buf, &pend, 10);
1501 if (*pend || pend == s->answer.buf)
1502 err(s, _("Invalid number: '%s'"),
1504 else if (0 < response && response <= file_diff->hunk_nr)
1505 hunk_index = response - 1;
1507 err(s, Q_("Sorry, only %d hunk available.",
1508 "Sorry, only %d hunks available.",
1509 file_diff->hunk_nr),
1510 (int)file_diff->hunk_nr);
1511 } else if (s->answer.buf[0] == '/') {
1515 if (file_diff->hunk_nr < 2) {
1516 err(s, _("No other hunks to search"));
1519 strbuf_remove(&s->answer, 0, 1);
1520 strbuf_trim_trailing_newline(&s->answer);
1521 if (s->answer.len == 0) {
1522 printf("%s", _("search for regex? "));
1524 if (strbuf_getline(&s->answer,
1527 strbuf_trim_trailing_newline(&s->answer);
1528 if (s->answer.len == 0)
1531 ret = regcomp(®ex, s->answer.buf,
1532 REG_EXTENDED | REG_NOSUB | REG_NEWLINE);
1536 regerror(ret, ®ex, errbuf, sizeof(errbuf));
1537 err(s, _("Malformed search regexp %s: %s"),
1538 s->answer.buf, errbuf);
1543 /* render the hunk into a scratch buffer */
1544 render_hunk(s, file_diff->hunk + i, 0, 0,
1546 if (regexec(®ex, s->buf.buf, 0, NULL, 0)
1550 if (i == file_diff->hunk_nr)
1552 if (i != hunk_index)
1554 err(s, _("No hunk matches the given pattern"));
1558 } else if (s->answer.buf[0] == 's') {
1559 size_t splittable_into = hunk->splittable_into;
1560 if (splittable_into < 2)
1561 err(s, _("Sorry, cannot split this hunk"));
1562 else if (!split_hunk(s, file_diff,
1563 hunk - file_diff->hunk))
1564 color_fprintf_ln(stdout, s->s.header_color,
1565 _("Split into %d hunks."),
1566 (int)splittable_into);
1567 } else if (s->answer.buf[0] == 'e') {
1568 if (hunk_index + 1 == file_diff->mode_change)
1569 err(s, _("Sorry, cannot edit this hunk"));
1570 else if (edit_hunk_loop(s, file_diff, hunk) >= 0) {
1571 hunk->use = USE_HUNK;
1572 goto soft_increment;
1575 const char *p = _(help_patch_remainder), *eol = p;
1577 color_fprintf(stdout, s->s.help_color, "%s",
1578 _(s->mode->help_patch_text));
1581 * Show only those lines of the remainder that are
1582 * actually applicable with the current hunk.
1584 for (; *p; p = eol + (*eol == '\n')) {
1585 eol = strchrnul(p, '\n');
1588 * `s->buf` still contains the part of the
1589 * commands shown in the prompt that are not
1592 if (*p != '?' && !strchr(s->buf.buf, *p))
1595 color_fprintf_ln(stdout, s->s.help_color,
1596 "%.*s", (int)(eol - p), p);
1601 /* Any hunk to be used? */
1602 for (i = 0; i < file_diff->hunk_nr; i++)
1603 if (file_diff->hunk[i].use == USE_HUNK)
1606 if (i < file_diff->hunk_nr) {
1607 /* At least one hunk selected: apply */
1608 strbuf_reset(&s->buf);
1609 reassemble_patch(s, file_diff, 0, &s->buf);
1611 discard_index(s->s.r->index);
1612 if (s->mode->apply_for_checkout)
1613 apply_for_checkout(s, &s->buf,
1614 s->mode->is_reverse);
1616 setup_child_process(s, &cp, "apply", NULL);
1617 argv_array_pushv(&cp.args, s->mode->apply_args);
1618 if (pipe_command(&cp, s->buf.buf, s->buf.len,
1620 error(_("'git apply' failed"));
1622 if (!repo_read_index(s->s.r))
1623 repo_refresh_and_write_index(s->s.r, REFRESH_QUIET, 0,
1624 1, NULL, NULL, NULL);
1631 int run_add_p(struct repository *r, enum add_p_mode mode,
1632 const char *revision, const struct pathspec *ps)
1634 struct add_p_state s = {
1635 { r }, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT
1637 size_t i, binary_count = 0;
1639 init_add_i_state(&s.s, r);
1641 if (mode == ADD_P_STASH)
1642 s.mode = &patch_mode_stash;
1643 else if (mode == ADD_P_RESET) {
1644 if (!revision || !strcmp(revision, "HEAD"))
1645 s.mode = &patch_mode_reset_head;
1647 s.mode = &patch_mode_reset_nothead;
1648 } else if (mode == ADD_P_CHECKOUT) {
1650 s.mode = &patch_mode_checkout_index;
1651 else if (!strcmp(revision, "HEAD"))
1652 s.mode = &patch_mode_checkout_head;
1654 s.mode = &patch_mode_checkout_nothead;
1655 } else if (mode == ADD_P_WORKTREE) {
1657 s.mode = &patch_mode_checkout_index;
1658 else if (!strcmp(revision, "HEAD"))
1659 s.mode = &patch_mode_worktree_head;
1661 s.mode = &patch_mode_worktree_nothead;
1663 s.mode = &patch_mode_add;
1664 s.revision = revision;
1666 if (discard_index(r->index) < 0 || repo_read_index(r) < 0 ||
1667 (!s.mode->index_only &&
1668 repo_refresh_and_write_index(r, REFRESH_QUIET, 0, 1,
1669 NULL, NULL, NULL) < 0) ||
1670 parse_diff(&s, ps) < 0) {
1671 strbuf_release(&s.plain);
1672 strbuf_release(&s.colored);
1673 clear_add_i_state(&s.s);
1677 for (i = 0; i < s.file_diff_nr; i++)
1678 if (s.file_diff[i].binary && !s.file_diff[i].hunk_nr)
1680 else if (patch_update_file(&s, s.file_diff + i))
1683 if (s.file_diff_nr == 0)
1684 fprintf(stderr, _("No changes.\n"));
1685 else if (binary_count == s.file_diff_nr)
1686 fprintf(stderr, _("Only binary files changed.\n"));
1688 strbuf_release(&s.answer);
1689 strbuf_release(&s.buf);
1690 strbuf_release(&s.plain);
1691 strbuf_release(&s.colored);
1692 clear_add_i_state(&s.s);