[05/19] built-in add -p: color the prompt and the help text

Message ID	7d3a59dd117a670734e8420093e7ccbe28d1650c.1576224486.git.gitgitgadget@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=h4OP=2D=vger.kernel.org=git-owner@kernel.org> Message-Id: <7d3a59dd117a670734e8420093e7ccbe28d1650c.1576224486.git.gitgitgadget@gmail.com> In-Reply-To: <pull.173.git.1576224486.gitgitgadget@gmail.com> References: <pull.173.git.1576224486.gitgitgadget@gmail.com> From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> Date: Fri, 13 Dec 2019 08:07:52 +0000 Subject: [PATCH 05/19] built-in add -p: color the prompt and the help text Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin <johannes.schindelin@gmx.de>, Junio C Hamano <gitster@pobox.com>, Johannes Schindelin <johannes.schindelin@gmx.de> Sender: git-owner@vger.kernel.org Precedence: bulk
Series	Implement the git add --patch backend in C \| expand [00/19] Implement the git add --patch backend in C [01/19] built-in add -i: start implementing the `patch` functionality in C [02/19] built-in add -i: wire up the new C code for the `patch` command [03/19] built-in add -p: show colored hunks by default [04/19] built-in add -p: adjust hunk headers as needed [05/19] built-in add -p: color the prompt and the help text [06/19] built-in add -p: offer a helpful error message when hunk navigation failed [07/19] built-in add -p: support multi-file diffs [08/19] built-in add -p: handle deleted empty files [09/19] built-in app -p: allow selecting a mode change as a "hunk" [10/19] built-in add -p: show different prompts for mode changes and deletions [11/19] built-in add -p: implement the hunk splitting feature [12/19] built-in add -p: coalesce hunks after splitting them [13/19] strbuf: add a helper function to call the editor "on an strbuf" [14/19] built-in add -p: implement hunk editing [15/19] built-in add -p: implement the 'g' ("goto") command [16/19] built-in add -p: implement the '/' ("search regex") command [17/19] built-in add -p: implement the 'q' ("quit") command [18/19] built-in add -p: only show the applicable parts of the help text [19/19] built-in add -p: show helpful hint when nothing can be staged

Message ID

7d3a59dd117a670734e8420093e7ccbe28d1650c.1576224486.git.gitgitgadget@gmail.com (mailing list archive)

State

New, archived

Headers

Message-Id: 
 <7d3a59dd117a670734e8420093e7ccbe28d1650c.1576224486.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.173.git.1576224486.gitgitgadget@gmail.com>
References: <pull.173.git.1576224486.gitgitgadget@gmail.com>
From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
Date: Fri, 13 Dec 2019 08:07:52 +0000
Subject: [PATCH 05/19] built-in add -p: color the prompt and the help text
Fcc: Sent
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
To: git@vger.kernel.org
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
        Junio C Hamano <gitster@pobox.com>,
        Johannes Schindelin <johannes.schindelin@gmx.de>
Sender: git-owner@vger.kernel.org
Precedence: bulk

Series

Implement the git add --patch backend in C | expand

Commit Message

John Passaro via GitGitGadget Dec. 13, 2019, 8:07 a.m. UTC

From: Johannes Schindelin <johannes.schindelin@gmx.de>

... just like the Perl version ;-)

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 add-patch.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/add-patch.c b/add-patch.c
index e266a96ca7..dab2ff2381 100644
--- a/add-patch.c
+++ b/add-patch.c
@@ -334,9 +334,12 @@  static int patch_update_file(struct add_p_state *s)
 			strbuf_addstr(&s->buf, ",j");
 		if (hunk_index + 1 < s->hunk_nr)
 			strbuf_addstr(&s->buf, ",J");
-		printf("(%"PRIuMAX"/%"PRIuMAX") ",
-		       (uintmax_t)hunk_index + 1, (uintmax_t)s->hunk_nr);
-		printf(_("Stage this hunk [y,n,a,d%s,?]? "), s->buf.buf);
+		color_fprintf(stdout, s->s.prompt_color,
+			      "(%"PRIuMAX"/%"PRIuMAX") ",
+			      (uintmax_t)hunk_index + 1, (uintmax_t)s->hunk_nr);
+		color_fprintf(stdout, s->s.prompt_color,
+			      _("Stage this hunk [y,n,a,d%s,?]? "),
+			      s->buf.buf);
 		fflush(stdout);
 		if (strbuf_getline(&s->answer, stdin) == EOF)
 			break;
@@ -376,7 +379,8 @@  static int patch_update_file(struct add_p_state *s)
 		else if (undecided_next >= 0 && s->answer.buf[0] == 'j')
 			hunk_index = undecided_next;
 		else
-			puts(_(help_patch_text));
+			color_fprintf(stdout, s->s.help_color,
+				      _(help_patch_text));
 	}
 
 	/* Any hunk to be used? */

[05/19] built-in add -p: color the prompt and the help text

Commit Message

Patch