# don't try to support all the git-show(1) options for non-blob,
# this is just a convenience:
- $type ne 'blob' and return $lei->err(<<EOF);
+ $type ne 'blob' and return warn(<<EOF);
# $oid is a $type of $size bytes in:
# $git->{git_dir} (wanted: $oid_want)
EOF
$self->{blob}->{$oid_want}; # full OID
}
+sub _lei_diff_prepare ($$) {
+ my ($lei, $cmd) = @_;
+ my $opt = $lei->{opt};
+ push @$cmd, '--'.($opt->{color} && !$opt->{'no-color'} ? '' : 'no-').
+ 'color';
+ for my $o (@PublicInbox::LEI::diff_opt) {
+ my $c = '';
+ # remove single char short option
+ $o =~ s/\|([a-z0-9])\b//i and $c = $1;
+ if ($o =~ s/=[is]@\z//) {
+ my $v = $opt->{$o} or next;
+ push @$cmd, map { $c ? "-$c$_" : "--$o=$_" } @$v;
+ } elsif ($o =~ s/=[is]\z//) {
+ my $v = $opt->{$o} // next;
+ push @$cmd, $c ? "-$c$v" : "--$o=$v";
+ } elsif ($o =~ s/:[is]\z//) {
+ my $v = $opt->{$o} // next;
+ push @$cmd, $c ? "-$c$v" :
+ ($v eq '' ? "--$o" : "--$o=$v");
+ } elsif ($o =~ s/!\z//) {
+ my $v = $opt->{$o} // next;
+ push @$cmd, $v ? "--$o" : "--no-$o";
+ } elsif ($opt->{$o}) {
+ push @$cmd, $c ? "-$c" : "--$o";
+ }
+ }
+}
+
sub diff_ctxq ($$) {
my ($self, $ctxq) = @_;
return unless $ctxq;
waitpid($pid, 0);
die "fast-import failed: \$?=$?" if $?;
- my @cmd = qw(diff);
- my $opt = $lei->{opt};
- push @cmd, '--'.($opt->{color} && !$opt->{'no-color'} ? '' : 'no-').
- 'color';
- for my $o (@PublicInbox::LEI::diff_opt) {
- my $c = '';
- # remove single char short option
- $o =~ s/\|([a-z0-9])\b//i and $c = $1;
- if ($o =~ s/=[is]@\z//) {
- my $v = $opt->{$o} or next;
- push @cmd, map { $c ? "-$c$_" : "--$o=$_" } @$v;
- } elsif ($o =~ s/=[is]\z//) {
- my $v = $opt->{$o} // next;
- push @cmd, $c ? "-$c$v" : "--$o=$v";
- } elsif ($o =~ s/:[is]\z//) {
- my $v = $opt->{$o} // next;
- push @cmd, $c ? "-$c$v" :
- ($v eq '' ? "--$o" : "--$o=$v");
- } elsif ($o =~ s/!\z//) {
- my $v = $opt->{$o} // next;
- push @cmd, $v ? "--$o" : "--no-$o";
- } elsif ($opt->{$o}) {
- push @cmd, $c ? "-$c" : "--$o";
- }
- }
- $lei->qerr("# git @cmd");
- push @cmd, qw(A B);
- unshift @cmd, 'git', "--git-dir=$rw->{git_dir}";
- $pid = spawn(\@cmd, $lei->{env}, { 2 => $lei->{2}, 1 => $lei->{1} });
+ my $cmd = [ 'diff' ];
+ _lei_diff_prepare($lei, $cmd);
+ $lei->qerr("# git @$cmd");
+ push @$cmd, qw(A B);
+ unshift @$cmd, 'git', "--git-dir=$rw->{git_dir}";
+ $pid = spawn($cmd, $lei->{env}, { 2 => $lei->{2}, 1 => $lei->{1} });
waitpid($pid, 0);
$lei->child_error($?) if $?; # for git diff --exit-code
undef;
($lei->{opt}->{drq} && !$lei->{opt}->{verbose}) and
$lei->{opt}->{quiet} //= 1;
$lei->_lei_store(1)->write_prepare($lei);
- $lei->{opt}->{'in-format'} //= 'eml';
+ $lei->{opt}->{'in-format'} //= 'eml' if $lei->{opt}->{stdin};
# maybe it's a non-email (code) blob from a coderepo
my $git_dirs = $lei->{opt}->{'git-dir'} //= [];
if ($lei->{opt}->{cwd} // 1) {
my $isatty = -t $lei->{1};
$lei->{opt}->{color} //= $isatty;
$lei->start_pager if $isatty;
- my ($op_c, $ops) = $lei->workers_start($self, 1);
- $lei->{wq1} = $self;
- net_merge_all_done($self) unless $lei->{auth};
- $lei->wait_wq_events($op_c, $ops);
+ $lei->wq1_start($self);
}
sub ipc_atfork_child {
$self->{gits} = [ map {
PublicInbox::Git->new($lei->rel2abs($_))
} @{$self->{lei}->{opt}->{'git-dir'}} ];
- $lei->{env}->{'psgi.errors'} = $lei->{2}; # ugh...
$lei->{env}->{TMPDIR} = $self->{rdtmp}->dirname;
if (my $nr = ($lei->{opt}->{drq} || $lei->{opt}->{'dequote-only'})) {
my $re = '\s*> ' x $nr;