mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add-patch: introduce 'p' in interactive-patch

Browse Source 
Shortly we're going make interactive-patch stop printing automatically
the hunk under certain circumstances.

Let's introduce a new option to allow the user to explicitly request
the printing.

Signed-off-by: Rubén Justo <rjusto@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Rubén Justo 2024-03-29 04:58:28 +01:00 committed by Junio C Hamano
parent c75fd8d815
commit 66c14ab592
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/git-add.txt
View File

@ -348,6 +348,7 @@ patch::
K - leave this hunk undecided, see previous hunk K - leave this hunk undecided, see previous hunk
s - split the current hunk into smaller hunks s - split the current hunk into smaller hunks
e - manually edit the current hunk e - manually edit the current hunk
p - print the current hunk
? - print help ? - print help
+ +
After deciding the fate for all hunks, if there is any hunk After deciding the fate for all hunks, if there is any hunk

4
add-patch.c
View File

@ -1388,6 +1388,7 @@ N_("j - leave this hunk undecided, see next undecided hunk\n"
"/ - search for a hunk matching the given regex\n" "/ - search for a hunk matching the given regex\n"
"s - split the current hunk into smaller hunks\n" "s - split the current hunk into smaller hunks\n"
"e - manually edit the current hunk\n" "e - manually edit the current hunk\n"
"p - print the current hunk\n"
"? - print help\n"); "? - print help\n");
static int patch_update_file(struct add_p_state *s, static int patch_update_file(struct add_p_state *s,
@ -1480,6 +1481,7 @@ static int patch_update_file(struct add_p_state *s,
permitted |= ALLOW_EDIT; permitted |= ALLOW_EDIT;
strbuf_addstr(&s->buf, ",e"); strbuf_addstr(&s->buf, ",e");
} }
strbuf_addstr(&s->buf, ",p");
} }
if (file_diff->deleted) if (file_diff->deleted)
prompt_mode_type = PROMPT_DELETION; prompt_mode_type = PROMPT_DELETION;
@ -1658,6 +1660,8 @@ static int patch_update_file(struct add_p_state *s,
hunk->use = USE_HUNK; hunk->use = USE_HUNK;
goto soft_increment; goto soft_increment;
} }
} else if (s->answer.buf[0] == 'p') {
/* nothing special is needed */
} else { } else {
const char *p = _(help_patch_remainder), *eol = p; const char *p = _(help_patch_remainder), *eol = p;

22
t/t3701-add-interactive.sh
View File

@ -325,9 +325,9 @@ test_expect_success 'different prompts for mode change/deleted' '
git -c core.filemode=true add -p >actual && git -c core.filemode=true add -p >actual &&
sed -n "s/^\(([0-9/]*) Stage .*?\).*/\1/p" actual >actual.filtered && sed -n "s/^\(([0-9/]*) Stage .*?\).*/\1/p" actual >actual.filtered &&
cat >expect <<-\EOF && cat >expect <<-\EOF &&
(1/1) Stage deletion [y,n,q,a,d,?]? (1/1) Stage deletion [y,n,q,a,d,p,?]?
(1/2) Stage mode change [y,n,q,a,d,j,J,g,/,?]? (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,?]? (2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]?
EOF EOF
test_cmp expect actual.filtered test_cmp expect actual.filtered
' '
@ -514,13 +514,13 @@ test_expect_success 'split hunk setup' '
test_expect_success 'goto hunk' ' test_expect_success 'goto hunk' '
test_when_finished "git reset" && test_when_finished "git reset" &&
tr _ " " >expect <<-EOF && tr _ " " >expect <<-EOF &&
(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,?]? + 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 _ 2: -2,4 +3,8 +21
go to which hunk? @@ -1,2 +1,3 @@ go to which hunk? @@ -1,2 +1,3 @@
_10 _10
+15 +15
_20 _20
(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,?]?_ (1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]?_
EOF EOF
test_write_lines s y g 1 | git add -p >actual && test_write_lines s y g 1 | git add -p >actual &&
tail -n 7 <actual >actual.trimmed && tail -n 7 <actual >actual.trimmed &&
@ -530,11 +530,11 @@ test_expect_success 'goto hunk' '
test_expect_success 'navigate to hunk via regex' ' test_expect_success 'navigate to hunk via regex' '
test_when_finished "git reset" && test_when_finished "git reset" &&
tr _ " " >expect <<-EOF && tr _ " " >expect <<-EOF &&
(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,?]? @@ -1,2 +1,3 @@ (2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? @@ -1,2 +1,3 @@
_10 _10
+15 +15
_20 _20
(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,?]?_ (1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]?_
EOF EOF
test_write_lines s y /1,2 | git add -p >actual && test_write_lines s y /1,2 | git add -p >actual &&
tail -n 5 <actual >actual.trimmed && tail -n 5 <actual >actual.trimmed &&
@ -715,21 +715,21 @@ test_expect_success 'colors can be overridden' '
<BLUE>+<RESET><BLUE>new<RESET> <BLUE>+<RESET><BLUE>new<RESET>
<CYAN> more-context<RESET> <CYAN> more-context<RESET>
<BLUE>+<RESET><BLUE>another-one<RESET> <BLUE>+<RESET><BLUE>another-one<RESET>
<YELLOW>(1/1) Stage this hunk [y,n,q,a,d,s,e,?]? <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> <MAGENTA>@@ -1,3 +1,3 @@<RESET>
<CYAN> context<RESET> <CYAN> context<RESET>
<BOLD>-old<RESET> <BOLD>-old<RESET>
<BLUE>+<RESET><BLUE>new<RESET> <BLUE>+<RESET><BLUE>new<RESET>
<CYAN> more-context<RESET> <CYAN> more-context<RESET>
<YELLOW>(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,?]? <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> <CYAN> more-context<RESET>
<BLUE>+<RESET><BLUE>another-one<RESET> <BLUE>+<RESET><BLUE>another-one<RESET>
<YELLOW>(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,?]? <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> <CYAN> context<RESET>
<BOLD>-old<RESET> <BOLD>-old<RESET>
<BLUE>+new<RESET> <BLUE>+new<RESET>
<CYAN> more-context<RESET> <CYAN> more-context<RESET>
<YELLOW>(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,?]? <RESET> <YELLOW>(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? <RESET>
EOF EOF
test_cmp expect actual test_cmp expect actual
' '