From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Dan Zwell <dzwell@zwell.net>,
"Shawn O. Pearce" <spearce@spearce.org>,
Wincent Colaiuta <win@wincent.com>,
Git Mailing List <git@vger.kernel.org>,
Jonathan del Strother <maillist@steelskies.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Frank Lichtenheld <frank@lichtenheld.de>
Subject: Re: [PATCH 1/2] Added basic color support to git add --interactive
Date: Sat, 03 Nov 2007 22:36:00 -0700 [thread overview]
Message-ID: <7v640ivagv.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20071104045735.GA12359@segfault.peff.net> (Jeff King's message of "Sun, 4 Nov 2007 00:57:35 -0400")
Jeff King <peff@peff.net> writes:
> On Fri, Nov 02, 2007 at 10:41:00PM -0500, Dan Zwell wrote:
>
>> +sub print_colored {
>> + my $color = shift;
>> + my $string = join("", @_);
>> +
>> + if ($use_color) {
>> + # Put a color code at the beginning of each line, a reset at the end
>> + # color after newlines that are not at the end of the string
>> + $string =~ s/(\n+)(.)/$1$color$2/g;
>> + # reset before newlines
>> + $string =~ s/(\n+)/$normal_color$1/g;
>> + # codes at beginning and end (if necessary):
>> + $string =~ s/^/$color/;
>> + $string =~ s/$/$normal_color/ unless $string =~ /\n$/;
>> + }
>> + print $string;
>> +}
>
> This would probably be a bit more readable by marking the regex as
> multline using /m. Something like:
>
> $string =~ s/^/$color/mg;
> $string =~ s/.$/$&$normal_color/mg;
>
> which covers both the "start/end of line" and "start/end" of string
> cases.
I think you would end up spitting out:
COLOR something RESET LF COLOR RESET LF
instead of:
COLOR something RESET LF LF
when you get "something\n\n" if you did that. Not a big deal,
though, as at this point we would be human I/O bound.
> Also, if there is to be pager support for showing diffs, perhaps
> print_colored needs to take a filehandle argument (or, even simpler,
> change "print_colored(...)" to "print color(...), so the caller can use
> print as usual).
Making it take a FH would be useful. With that, my
proof-of-concept patch to add print_diff_hunk would become:
sub print_diff_hunk {
my ($text) = @_;
my $pager;
if ($use_pager) {
open($pager, "| less");
} else {
$pager = \*STDOUT;
}
for (@$text) {
print_colored $pager $color ...
}
close($pager);
}
next prev parent reply other threads:[~2007-11-04 5:36 UTC|newest]
Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-13 4:13 [PATCH] Color support added to git-add--interactive Dan Zwell
2007-10-13 8:12 ` Jeff King
2007-10-13 12:49 ` Frank Lichtenheld
2007-10-13 12:25 ` Johannes Schindelin
2007-10-13 14:45 ` Wincent Colaiuta
2007-10-13 16:38 ` Jean-Luc Herren
2007-10-13 17:14 ` Wincent Colaiuta
2007-10-13 18:31 ` Andreas Ericsson
2007-10-13 16:38 ` Johannes Schindelin
2007-10-13 17:27 ` Jeff King
2007-10-13 17:51 ` Jeff King
2007-10-13 20:03 ` Dan Zwell
2007-10-13 20:36 ` Wincent Colaiuta
2007-10-13 21:50 ` Dan Z
2007-10-13 22:23 ` Jean-Luc Herren
2007-10-15 3:43 ` Jeff King
2007-10-17 0:47 ` revised: " Dan Zwell
2007-10-17 1:51 ` Shawn O. Pearce
2007-10-17 7:57 ` Dan Zwell
2007-10-17 8:11 ` Shawn O. Pearce
2007-10-22 21:32 ` [PATCH 1/2] Added basic color support to git add --interactive Dan Zwell
2007-10-23 2:11 ` [PATCH] resend of git-add--interactive color patch against spearce/pu Dan Zwell
2007-10-23 2:19 ` [PATCH] Let git-add--interactive read "git colors" from git-config Dan Zwell
2007-10-23 4:29 ` Jeff King
2007-10-23 4:40 ` Shawn O. Pearce
2007-10-23 4:03 ` [PATCH 1/2] Added basic color support to git add --interactive Jeff King
2007-10-23 6:28 ` Wincent Colaiuta
2007-10-23 6:41 ` Jeff King
2007-10-23 7:44 ` Wincent Colaiuta
2007-10-22 21:40 ` [PATCH 2/2] Let git-add--interactive read colors from git-config Dan Zwell
2007-10-23 4:27 ` Jeff King
2007-10-23 8:52 ` Dan Zwell
2007-11-03 3:41 ` [PATCH 1/2] Added basic color support to git add --interactive Dan Zwell
2007-11-04 4:57 ` Jeff King
2007-11-04 5:36 ` Junio C Hamano [this message]
2007-11-04 5:43 ` Jeff King
2007-11-11 0:01 ` [PATCH 0/3] Adding colors to git-add--interactive Dan Zwell
2007-11-11 7:54 ` Jeff King
2007-11-11 8:23 ` Junio C Hamano
2007-11-11 8:39 ` Dan Zwell
2007-11-22 10:54 ` [PATCH 0/5] Colors for git-add--interactive Dan Zwell
2007-11-22 11:57 ` Jeff King
2007-11-22 19:20 ` Junio C Hamano
2007-11-22 10:54 ` [PATCH 1/5] Added basic color support to git add --interactive Dan Zwell
2007-11-22 10:55 ` [PATCH 2/5] Don't return 'undef' in case called in a vector context Dan Zwell
2007-11-22 12:06 ` Jeff King
2007-11-22 21:17 ` Junio C Hamano
2007-11-23 4:15 ` Dan Zwell
2007-11-22 10:55 ` [PATCH 3/5] Added config_default($key, $default) to Git.pm Dan Zwell
2007-11-22 12:14 ` Jeff King
2007-11-22 10:56 ` [PATCH 4/5] Let git-add--interactive read colors from configuration Dan Zwell
2007-11-22 12:18 ` Jeff King
2007-11-22 21:28 ` Junio C Hamano
2007-11-22 22:30 ` Jeff King
2007-11-23 5:32 ` Dan Zwell
2007-11-23 9:09 ` Jeff King
2007-11-23 9:17 ` Junio C Hamano
2007-11-22 10:56 ` [PATCH 5/5] Added diff hunk coloring to git-add--interactive Dan Zwell
2007-11-22 12:25 ` Jeff King
2007-11-22 21:37 ` Junio C Hamano
2007-11-23 10:21 ` Jeff King
2007-11-22 22:35 ` Junio C Hamano
2007-11-11 0:01 ` [PATCH 1/3] Added basic color support to git add --interactive Dan Zwell
2007-11-11 0:02 ` [PATCH 2/3] Let git-add--interactive read colors from .gitconfig Dan Zwell
2007-11-11 0:03 ` [PATCH 3/3] Added diff hunk coloring to git-add--interactive Dan Zwell
2007-11-11 10:00 ` Junio C Hamano
2007-11-11 2:21 ` [PATCH 0/3] Adding colors " Dan Zwell
2007-11-11 2:23 ` Subject: [PATCH 1/3] Added basic color support to git add --interactive Dan Zwell
2007-11-11 19:56 ` Junio C Hamano
2007-11-11 2:23 ` Subject: [PATCH 2/3] Let git-add--interactive read colors from .gitconfig Dan Zwell
2007-11-11 9:53 ` Junio C Hamano
2007-11-11 10:34 ` Junio C Hamano
2007-11-13 1:39 ` Dan Zwell
2007-11-13 2:32 ` Junio C Hamano
2007-11-13 2:55 ` Dan Zwell
2007-11-13 7:26 ` Jeff King
2007-11-13 7:29 ` Junio C Hamano
2007-11-13 8:25 ` Dan Zwell
2007-11-13 9:46 ` Jakub Narebski
2007-11-03 3:41 ` [PATCH 2/2] " Dan Zwell
2007-11-03 5:06 ` *[PATCH " Junio C Hamano
2007-11-03 7:26 ` Dan Zwell
2007-11-03 18:11 ` Junio C Hamano
2007-10-15 4:12 ` [PATCH] Color support added to git-add--interactive Jeff King
2007-10-13 20:21 ` Tom Tobin
2007-10-13 20:26 ` Tom Tobin
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v640ivagv.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=dzwell@zwell.net \
--cc=frank@lichtenheld.de \
--cc=git@vger.kernel.org \
--cc=maillist@steelskies.com \
--cc=peff@peff.net \
--cc=spearce@spearce.org \
--cc=win@wincent.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).