From: "Kunal Tyagi via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Kunal Tyagi <tyagi.kunal@live.com>,
Junio C Hamano <gitster@pobox.com>,
Kunal Tyagi <tyagi.kunal@live.com>
Subject: [PATCH v3 1/1] add -i: Show progress counter in the prompt
Date: Sun, 29 Sep 2019 22:22:59 -0700 (PDT) [thread overview]
Message-ID: <b351c74a3fc5787e8a41c12342b592d38ef0dede.1569820977.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.349.v3.git.gitgitgadget@gmail.com>
From: Kunal Tyagi <tyagi.kunal@live.com>
Report the current hunk count and total number of hunks for the current
file in the prompt
Adjust the expected output in some tests to account for new data on the prompt
Signed-off-by: Kunal Tyagi <tyagi.kunal@live.com>
---
git-add--interactive.perl | 2 +-
t/t3701-add-interactive.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index c20ae9e210..52659bb74c 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -1541,7 +1541,7 @@ sub patch_update_file {
for (@{$hunk[$ix]{DISPLAY}}) {
print;
}
- print colored $prompt_color,
+ print colored $prompt_color, "(", ($ix+1), "/$num) ",
sprintf(__($patch_update_prompt_modes{$patch_mode}{$hunk[$ix]{TYPE}}), $other);
my $line = prompt_single_character;
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index 69991a3168..d50e165ca8 100755
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -314,7 +314,7 @@ test_expect_success C_LOCALE_OUTPUT 'add first line works' '
git commit -am "clear local changes" &&
git apply patch &&
printf "%s\n" s y y | git add -p file 2>error |
- sed -n -e "s/^Stage this hunk[^@]*\(@@ .*\)/\1/" \
+ sed -n -e "s/^([1-2]\/[1-2]) Stage this hunk[^@]*\(@@ .*\)/\1/" \
-e "/^[-+@ \\\\]"/p >output &&
test_must_be_empty error &&
git diff --cached >diff &&
--
gitgitgadget
next prev parent reply other threads:[~2019-09-30 5:23 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-23 7:26 [PATCH 0/1] git-add--interactive.perl: Add progress counter in the prompt Kunal Tyagi via GitGitGadget
2019-09-23 7:26 ` [PATCH 1/1] " Kunal Tyagi via GitGitGadget
2019-09-25 15:38 ` Johannes Schindelin
2019-09-25 15:35 ` [PATCH 0/1] " Johannes Schindelin
2019-09-29 1:30 ` [PATCH v2 " Kunal Tyagi via GitGitGadget
2019-09-29 1:30 ` [PATCH v2 1/1] " Kunal Tyagi via GitGitGadget
2019-09-30 1:34 ` Junio C Hamano
2019-09-30 17:30 ` Johannes Schindelin
2019-09-30 5:22 ` [PATCH v3 0/1] " Kunal Tyagi via GitGitGadget
2019-09-30 5:22 ` Kunal Tyagi via GitGitGadget [this message]
2019-10-04 5:52 ` [PATCH v3 1/1] add -i: Show " Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b351c74a3fc5787e8a41c12342b592d38ef0dede.1569820977.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=tyagi.kunal@live.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).