lei (lcat|q): support --no-color and --color

This should be familiar to git users who wish to force color
when writing to pipes or disable color.

diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index 403f9ed8872a1226839d26bcf79d3e388c6baa3a..7ffcf163182cb16d7628c9e95aaa43649bb1a20c 100644 (file)
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -144,8 +144,8 @@ our %CMD = ( # sorted in order of importance/use:
        @lxs_opt,
        qw(save output|mfolder|o=s format|f=s dedupe|d=s threads|t+
        sort|s=s reverse|r offset=i pretty jobs|j=s globoff|g augment|a
-       import-before! lock=s@ rsyncable alert=s@ mua=s verbose|v+), @c_opt,
-       opt_dash('limit|n=i', '[0-9]+') ],
+       import-before! lock=s@ rsyncable alert=s@ mua=s verbose|v+
+       color!), @c_opt, opt_dash('limit|n=i', '[0-9]+') ],
 
 'up' => [ 'OUTPUT|--all', 'update saved search',
        qw(jobs|j=s lock=s@ alert=s@ mua=s verbose|v+ all:s), @c_opt ],
@@ -155,8 +155,8 @@ our %CMD = ( # sorted in order of importance/use:
        # some of these options are ridiculous for lcat
        @lxs_opt, qw(output|mfolder|o=s format|f=s dedupe|d=s threads|t+
        sort|s=s reverse|r offset=i jobs|j=s globoff|g augment|a
-       import-before! lock=s@ rsyncable alert=s@ mua=s verbose|v+), @c_opt,
-       opt_dash('limit|n=i', '[0-9]+') ],
+       import-before! lock=s@ rsyncable alert=s@ mua=s verbose|v+
+       color!), @c_opt, opt_dash('limit|n=i', '[0-9]+') ],
 
 'blob' => [ 'OID', 'show a git blob, reconstructing from mail if necessary',
        qw(git-dir=s@ cwd! verbose|v+ mail! oid-a|A=s path-a|a=s path-b|b=s),
@@ -268,6 +268,7 @@ my %OPTDESC = (
 'incremental!  import' => 'import already seen IMAP and NNTP articles',
 'globoff|g' => "do not match locations using '*?' wildcards ".
                "and\xa0'[]'\x{a0}ranges",
+'color!' => 'disable color (for --format=text)',
 'verbose|v+' => 'be more verbose',
 'external!' => 'do not use externals',
 'mail!' => 'do not look in mail storage for OID',

diff --git a/lib/PublicInbox/LeiViewText.pm b/lib/PublicInbox/LeiViewText.pm
index e0d62c0d2ab7de7e1ac53466b42e37d4bd21ff9e..d0f8b7f43aa1cc3cc9896183767a422ca7a479ec 100644 (file)
--- a/lib/PublicInbox/LeiViewText.pm
+++ b/lib/PublicInbox/LeiViewText.pm
@@ -69,7 +69,7 @@ sub uncolored { ${$_[0]->{obuf}} .= $_[2] }
 sub new {
        my ($cls, $lei) = @_;
        my $self = bless { %{$lei->{opt}}, -colored => \&uncolored }, $cls;
-       return $self unless $self->{color} || -t $lei->{1};
+       return $self unless $self->{color} //= -t $lei->{1};
        my $cmd = [ qw(git config -z --includes -l) ];
        my ($r, $pid) = popen_rd($cmd, undef, { 2 => $lei->{2} });
        my $cfg = PublicInbox::Config::config_fh_parse($r, "\0", "\n");