Skip to content

Commit

Permalink
add-patch: introduce the command '|'
Browse files Browse the repository at this point in the history 
Introduce a new command '|' to send the current hunk to a program.  If
no program is specified, use the pager.

Signed-off-by: Rubén Justo <rjusto@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
@rjusto @gitster
rjusto authored and gitster committed Jun 4, 2024
1 parent 071c516 commit c6ac9f6
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 19 deletions.
25 changes: 23 additions & 2 deletions add-patch.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "environment.h"
#include "gettext.h"
#include "object-name.h"
#include "pager.h"
#include "read-cache-ll.h"
#include "repository.h"
#include "strbuf.h"
Expand Down Expand Up @@ -1389,6 +1390,7 @@ N_("j - leave this hunk undecided, see next undecided hunk\n"
"s - split the current hunk into smaller hunks\n"
"e - manually edit the current hunk\n"
"p - print the current hunk\n"
"| - use pager to show the current hunk, or use |<program> to customize\n"
"? - print help\n");

static int patch_update_file(struct add_p_state *s,
Expand All @@ -1401,6 +1403,7 @@ static int patch_update_file(struct add_p_state *s,
struct child_process cp = CHILD_PROCESS_INIT;
int colored = !!s->colored.len, quit = 0;
enum prompt_mode_type prompt_mode_type;
const char* pager = NULL;
enum {
ALLOW_GOTO_PREVIOUS_HUNK = 1 << 0,
ALLOW_GOTO_PREVIOUS_UNDECIDED_HUNK = 1 << 1,
Expand Down Expand Up @@ -1449,9 +1452,15 @@ static int patch_update_file(struct add_p_state *s,
strbuf_reset(&s->buf);
if (file_diff->hunk_nr) {
if (rendered_hunk_index != hunk_index) {
if (pager)
setup_custom_pager(pager);
render_hunk(s, hunk, 0, colored, &s->buf);
fputs(s->buf.buf, stdout);
rendered_hunk_index = hunk_index;
if (pager) {
wait_for_pager();
pager = NULL;
}
}

strbuf_reset(&s->buf);
Expand Down Expand Up @@ -1485,6 +1494,7 @@ static int patch_update_file(struct add_p_state *s,
strbuf_addstr(&s->buf, ",e");
}
strbuf_addstr(&s->buf, ",p");
strbuf_addstr(&s->buf, ",|");
}
if (file_diff->deleted)
prompt_mode_type = PROMPT_DELETION;
Expand Down Expand Up @@ -1512,8 +1522,8 @@ static int patch_update_file(struct add_p_state *s,
continue;
ch = tolower(s->answer.buf[0]);

/* 'g' takes a hunk number and '/' takes a regexp */
if (s->answer.len != 1 && (ch != 'g' && ch != '/')) {
/* 'g' takes a hunk number, '/' takes a regexp and '|' takes a program */
if (s->answer.len != 1 && (ch != 'g' && ch != '/' && ch != '|')) {
err(s, _("Only one letter is expected, got '%s'"), s->answer.buf);
continue;
}
Expand Down Expand Up @@ -1674,6 +1684,17 @@ static int patch_update_file(struct add_p_state *s,
}
} else if (s->answer.buf[0] == 'p') {
rendered_hunk_index = -1;
} else if (ch == '|') {
strbuf_remove(&s->answer, 0, 1);
if (s->s.use_single_key && s->answer.len == 0) {
printf("%s", _("program? "));
fflush(stdout);
strbuf_getline(&s->answer, stdin);
strbuf_trim_trailing_newline(&s->answer);
}
strbuf_trim(&s->answer);
pager = s->answer.buf;
rendered_hunk_index = -1;
} else if (s->answer.buf[0] == '?') {
const char *p = _(help_patch_remainder), *eol = p;

Expand Down
55 changes: 38 additions & 17 deletions t/t3701-add-interactive.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ test_expect_success 'unknown command' '
git add -N command &&
git diff command >expect &&
cat >>expect <<-EOF &&
(1/1) Stage addition [y,n,q,a,d,e,p,?]? Unknown command ${SQ}W${SQ} (use ${SQ}?${SQ} for help)
(1/1) Stage addition [y,n,q,a,d,e,p,?]?$SP
(1/1) Stage addition [y,n,q,a,d,e,p,|,?]? Unknown command ${SQ}W${SQ} (use ${SQ}?${SQ} for help)
(1/1) Stage addition [y,n,q,a,d,e,p,|,?]?$SP
EOF
git add -p -- command <command >actual 2>&1 &&
test_cmp expect actual
Expand Down Expand Up @@ -348,9 +348,9 @@ test_expect_success 'different prompts for mode change/deleted' '
git -c core.filemode=true add -p >actual &&
sed -n "s/^\(([0-9/]*) Stage .*?\).*/\1/p" actual >actual.filtered &&
cat >expect <<-\EOF &&
(1/1) Stage deletion [y,n,q,a,d,p,?]?
(1/2) Stage mode change [y,n,q,a,d,j,J,g,/,p,?]?
(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]?
(1/1) Stage deletion [y,n,q,a,d,p,|,?]?
(1/2) Stage mode change [y,n,q,a,d,j,J,g,/,p,|,?]?
(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,|,?]?
EOF
test_cmp expect actual.filtered
'
Expand Down Expand Up @@ -537,13 +537,13 @@ test_expect_success 'split hunk setup' '
test_expect_success 'goto hunk 1 with "g 1"' '
test_when_finished "git reset" &&
tr _ " " >expect <<-EOF &&
(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? + 1: -1,2 +1,3 +15
(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,|,?]? + 1: -1,2 +1,3 +15
_ 2: -2,4 +3,8 +21
go to which hunk? @@ -1,2 +1,3 @@
_10
+15
_20
(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]?_
(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,|,?]?_
EOF
test_write_lines s y g 1 | git add -p >actual &&
tail -n 7 <actual >actual.trimmed &&
Expand All @@ -556,7 +556,7 @@ test_expect_success 'goto hunk 1 with "g1"' '
_10
+15
_20
(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]?_
(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,|,?]?_
EOF
test_write_lines s y g1 | git add -p >actual &&
tail -n 4 <actual >actual.trimmed &&
Expand All @@ -566,11 +566,11 @@ test_expect_success 'goto hunk 1 with "g1"' '
test_expect_success 'navigate to hunk via regex /pattern' '
test_when_finished "git reset" &&
tr _ " " >expect <<-EOF &&
(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? @@ -1,2 +1,3 @@
(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,|,?]? @@ -1,2 +1,3 @@
_10
+15
_20
(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]?_
(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,|,?]?_
EOF
test_write_lines s y /1,2 | git add -p >actual &&
tail -n 5 <actual >actual.trimmed &&
Expand All @@ -583,7 +583,7 @@ test_expect_success 'navigate to hunk via regex / pattern' '
_10
+15
_20
(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]?_
(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,|,?]?_
EOF
test_write_lines s y / 1,2 | git add -p >actual &&
tail -n 4 <actual >actual.trimmed &&
Expand All @@ -595,17 +595,38 @@ test_expect_success 'print again the hunk' '
tr _ " " >expect <<-EOF &&
+15
20
(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? @@ -1,2 +1,3 @@
(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,|,?]? @@ -1,2 +1,3 @@
10
+15
20
(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]?_
(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,|,?]?_
EOF
test_write_lines s y g 1 p | git add -p >actual &&
tail -n 7 <actual >actual.trimmed &&
test_cmp expect actual.trimmed
'

test_expect_success TTY 'print again the hunk (PAGER)' '
test_when_finished "git reset" &&
cat >expect <<-EOF &&
<GREEN>+<RESET><GREEN>15<RESET>
20<RESET>
<BOLD;BLUE>(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,|,?]? <RESET>PAGER <CYAN>@@ -1,2 +1,3 @@<RESET>
PAGER 10<RESET>
PAGER <GREEN>+<RESET><GREEN>15<RESET>
PAGER 20<RESET>
<BOLD;BLUE>(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,|,?]? <RESET>
EOF
test_write_lines s y g 1 \| |
(
GIT_PAGER="sed s/^/PAGER\ /" &&
export GIT_PAGER &&
test_terminal --no-stdin-pty git add -p >actual
) &&
tail -n 7 <actual | test_decode_color >actual.trimmed &&
test_cmp expect actual.trimmed
'

test_expect_success 'split hunk "add -p (edit)"' '
# Split, say Edit and do nothing. Then:
#
Expand Down Expand Up @@ -780,21 +801,21 @@ test_expect_success 'colors can be overridden' '
<BLUE>+<RESET><BLUE>new<RESET>
<CYAN> more-context<RESET>
<BLUE>+<RESET><BLUE>another-one<RESET>
<YELLOW>(1/1) Stage this hunk [y,n,q,a,d,s,e,p,?]? <RESET><BOLD>Split into 2 hunks.<RESET>
<YELLOW>(1/1) Stage this hunk [y,n,q,a,d,s,e,p,|,?]? <RESET><BOLD>Split into 2 hunks.<RESET>
<MAGENTA>@@ -1,3 +1,3 @@<RESET>
<CYAN> context<RESET>
<BOLD>-old<RESET>
<BLUE>+<RESET><BLUE>new<RESET>
<CYAN> more-context<RESET>
<YELLOW>(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? <RESET><MAGENTA>@@ -3 +3,2 @@<RESET>
<YELLOW>(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,|,?]? <RESET><MAGENTA>@@ -3 +3,2 @@<RESET>
<CYAN> more-context<RESET>
<BLUE>+<RESET><BLUE>another-one<RESET>
<YELLOW>(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? <RESET><MAGENTA>@@ -1,3 +1,3 @@<RESET>
<YELLOW>(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,|,?]? <RESET><MAGENTA>@@ -1,3 +1,3 @@<RESET>
<CYAN> context<RESET>
<BOLD>-old<RESET>
<BLUE>+new<RESET>
<CYAN> more-context<RESET>
<YELLOW>(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? <RESET>
<YELLOW>(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,|,?]? <RESET>
EOF
test_cmp expect actual
'
Expand Down

0 comments on commit c6ac9f6

Please sign in to comment.