Re: [PATCH v2 09/11] add -i (Perl version): include indentation in the colored header

From: Phillip Wood <phillip.wood123@gmail.com>
To: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
	git@vger.kernel.org
Cc: Philippe Blain <levraiphilippeblain@gmail.com>,
	Jeff King <peff@peff.net>,
	Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH v2 09/11] add -i (Perl version): include indentation in the colored header
Date: Fri, 13 Nov 2020 12:11:41 +0000	[thread overview]
Message-ID: <70fae5a9-354d-978b-c560-d7fcabb25c76@gmail.com> (raw)
In-Reply-To: <304614751ea1b1db80fbbbdc909b3d198c20313e.1605097704.git.gitgitgadget@gmail.com>

Hi Dscho

On 11/11/2020 12:28, Johannes Schindelin via GitGitGadget wrote:
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
> 
> The header is formatted by padding each column heading with spaces up to
> the length of 12 characters. These padding spaces are naturally included
> when coloring the entire header.
> 
> However, the preceding five spaces indentation for non-flat lists were
> _not_ included in the Perl version, but _were_ included in the built-in
> version. Let's adjust the former to align with the latter's behavior.

I had trouble understanding this. I think my confusion is that the 
padding was printed when the header was colored, but it was not inside 
the colored part whereas the subject lead be to think there was no 
indentation printed when the header was colored. I assume this change is 
so that we can use the same test for both versions?

Best Wishes

Phillip

> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
>   git-add--interactive.perl | 6 ++----
>   1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/git-add--interactive.perl b/git-add--interactive.perl
> index e713fe3d02..adbac2bc6d 100755
> --- a/git-add--interactive.perl
> +++ b/git-add--interactive.perl
> @@ -483,10 +483,8 @@ sub list_and_choose {
>   		my $last_lf = 0;
>   
>   		if ($opts->{HEADER}) {
> -			if (!$opts->{LIST_FLAT}) {
> -				print "     ";
> -			}
> -			print colored $header_color, "$opts->{HEADER}\n";
> +			my $indent = $opts->{LIST_FLAT} ? "" : "     ";
> +			print colored $header_color, "$indent$opts->{HEADER}\n";
>   		}
>   		for ($i = 0; $i < @stuff; $i++) {
>   			my $chosen = $chosen[$i] ? '*' : ' ';
> 