use PublicInbox::Git qw(git_unquote);
use PublicInbox::Spawn qw(popen_rd);
use URI::Escape qw(uri_escape_utf8);
+my $FN = qr!((?:"?[^/\n]+/[^\r\n]+)|/dev/null)!;
sub xphrase ($) {
my ($s) = @_;
map {
s/\A\s*//;
s/\s+\z//;
- /[\|=><,\sA-Z]/ && !m![\./:\\\@]! ? qq("$_") : $_;
+ m![^\./:\\\@\-\w]! ? qq("$_") : $_ ;
} ($s =~ m!(\w[\|=><,\./:\\\@\-\w\s]+)!g);
}
push @{$lei->{qterms}->{dfctx}}, xphrase($_);
} elsif (/^-- $/) { # email signature begins
$in_diff = undef;
- } elsif (m!^diff --git "?[^/]+/.+ "?[^/]+/.+\z!) {
+ } elsif (m!^diff --git $FN $FN!) {
# wait until "---" and "+++" to capture filenames
$in_diff = 1;
} elsif (/^index ([a-f0-9]+)\.\.([a-f0-9]+)\b/) {
push @{$lei->{qterms}->{dfpre}}, $oa;
push @{$lei->{qterms}->{dfpost}}, $ob;
# who uses dfblob?
- } elsif (m!^(?:---|\+{3}) ("?[^/]+/.+)!) {
+ } elsif (m!^(?:---|\+{3}) ($FN)!) {
+ next if $1 eq '/dev/null';
my $fn = (split(m!/!, git_unquote($1.''), 2))[1];
push @{$lei->{qterms}->{dfn}}, xphrase($fn);
} elsif ($in_diff && s/^\+//) { # diff added
push @{$lei->{qterms}->{dfb}}, xphrase($_);
} elsif ($in_diff && s/^-//) { # diff removed
push @{$lei->{qterms}->{dfa}}, xphrase($_);
+ } elsif (/^@@ (?:\S+) (?:\S+) @@\s*$/) {
+ # traditional diff w/o -p
} elsif (/^@@ (?:\S+) (?:\S+) @@\s*(\S+.*)/) {
push @{$lei->{qterms}->{dfhh}}, xphrase($1);
} elsif (/^(?:dis)similarity index/ ||
}
my $smsg = bless {}, 'PublicInbox::Smsg';
my $in = $self->{0};
+ my @cmd;
unless ($in) {
my $input = $self->{input};
- if (-e $input) {
- $in = $lei->fopen('<', $input) or
+ my $devfd = $lei->path_to_fd($input) // return;
+ if ($devfd >= 0) {
+ $in = $lei->{$devfd};
+ } elsif (-e $input) {
+ open($in, '<', $input) or
return $lei->fail("open < $input: $!");
} else {
- my @cmd = (qw(git format-patch --stdout -1), $input);
+ @cmd = (qw(git format-patch --stdout -1), $input);
$in = popen_rd(\@cmd, undef, { 2 => $lei->{2} });
}
};
- my $eml = PublicInbox::Eml->new(\(do { local $/; <$in> }));
+ my $str = do { local $/; <$in> };
+ @cmd && !close($in) and return $lei->fail("E: @cmd failed: $?");
+ my $eml = PublicInbox::Eml->new(\$str);
$lei->{diff_want} = +{ map { $_ => 1 } @want };
$smsg->populate($eml);
while (my ($pfx, $fields) = each %pfx2smsg) {
if ($lei->{opt}->{debug}) {
my $json = ref(PublicInbox::Config->json)->new;
$json->utf8->canonical->pretty;
- $lei->err($json->encode($lei->{qterms}));
+ print { $lei->{2} } $json->encode($lei->{qterms});
}
my (@q, %seen);
for my $pfx (@want) {
my $end = ($pfx =~ s/([0-9\*]+)\z//) ? $1 : '';
my $x = delete($lei->{qterms}->{$pfx}) or next;
my $star = $end =~ tr/*//d ? '*' : '';
- my $min_len = ($end // 0) + 0;
+ my $min_len = ($end || 0) + 0;
# no wildcards for bool_pfx_external
$star = '' if $pfx =~ /\A(dfpre|dfpost|mid)\z/;
$lei->out(@q, "\n");
}
-sub call { # the "lei patch-to-query" entry point
- my ($cls, $lei, $input) = @_;
- my $self = $lei->{p2q} = bless {}, $cls;
+sub lei_p2q { # the "lei patch-to-query" entry point
+ my ($lei, $input) = @_;
+ my $self = bless {}, __PACKAGE__;
if ($lei->{opt}->{stdin}) {
- $self->{0} = delete $lei->{0}; # guard from lei_atfork_child
+ $self->{0} = delete $lei->{0}; # guard from _lei_atfork_child
} else {
$self->{input} = $input;
}
- my $op = $lei->workers_start($self, 'lei patch2query', 1, {
- '' => [ $lei->{p2q_done} // $lei->can('dclose'), $lei ]
- });
+ my ($op_c, $ops) = $lei->workers_start($self, 1);
+ $lei->{wq1} = $self;
$self->wq_io_do('do_p2q', []);
- $self->wq_close(1);
- while ($op && $op->{sock}) { $op->event_step }
+ $self->wq_close;
+ $lei->wait_wq_events($op_c, $ops);
}
sub ipc_atfork_child {
my ($self) = @_;
- my $lei = $self->{lei};
- $lei->lei_atfork_child;
- $SIG{__WARN__} = PublicInbox::Eml::warn_ignore_cb();
+ $self->{lei}->_lei_atfork_child;
$self->SUPER::ipc_atfork_child;
}