X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FViewDiff.pm;h=5d23881b55c1e9a2c74b2d6afd3c1b0c04954488;hb=ab9c03ff4aa369b397dc1a8c8936153c8565fd05;hp=8c1853e625557872003af9d74cad0fc13cc3875a;hpb=6320f9f813443cdd14476f723deb022e2dfff9c4;p=public-inbox.git
diff --git a/lib/PublicInbox/ViewDiff.pm b/lib/PublicInbox/ViewDiff.pm
index 8c1853e6..5d23881b 100644
--- a/lib/PublicInbox/ViewDiff.pm
+++ b/lib/PublicInbox/ViewDiff.pm
@@ -10,12 +10,11 @@ package PublicInbox::ViewDiff;
use strict;
use v5.10.1;
use parent qw(Exporter);
-our @EXPORT_OK = qw(flush_diff);
+our @EXPORT_OK = qw(flush_diff uri_escape_path);
use URI::Escape qw(uri_escape_utf8);
use PublicInbox::Hval qw(ascii_html to_attr);
use PublicInbox::Git qw(git_unquote);
-my $UNSAFE = "^A-Za-z0-9\-\._~/"; # '/' + $URI::Escape::Unsafe{RFC3986}
my $OID_NULL = '0{7,}';
my $OID_BLOB = '[a-f0-9]{7,}';
my $LF = qr!\n!;
@@ -41,22 +40,24 @@ our $EXTRACT_DIFFS = qr/(
^\+{3}\x20($FN)$LF)/msx;
our $IS_OID = qr/\A$OID_BLOB\z/s;
+sub uri_escape_path {
+ # '/' + $URI::Escape::Unsafe{RFC3986}
+ uri_escape_utf8($_[0], "^A-Za-z0-9\-\._~/");
+}
+
# link to line numbers in blobs
-sub diff_hunk ($$$$) {
- my ($dst, $dctx, $ca, $cb) = @_;
+sub diff_hunk ($$$) {
+ my ($dctx, $ca, $cb) = @_;
my ($oid_a, $oid_b, $spfx) = @$dctx{qw(oid_a oid_b spfx)};
if (defined($spfx) && defined($oid_a) && defined($oid_b)) {
- my ($n) = ($ca =~ /^-([0-9]+)/);
- $n = defined($n) ? "#n$n" : '';
-
- $$dst .= qq(@@ {Q}$n">$ca);
+ my $n = ($ca =~ /^-([0-9]+)/) ? "#n$1" : '';
+ my $x = qq(@@ {Q}$n">$ca);
- ($n) = ($cb =~ /^\+([0-9]+)/);
- $n = defined($n) ? "#n$n" : '';
- $$dst .= qq( {Q}$n">$cb @@);
+ $n = ($cb =~ /^\+([0-9]+)/) ? "#n$1" : '';
+ $x .= qq( {Q}$n">$cb @@);
} else {
- $$dst .= "@@ $ca $cb @@";
+ "@@ $ca $cb @@";
}
}
@@ -66,8 +67,8 @@ sub oid ($$$) {
}
# returns true if diffstat anchor written, false otherwise
-sub anchor0 ($$$$) {
- my ($dst, $ctx, $fn, $rest) = @_;
+sub anchor0 ($$$) {
+ my ($ctx, $fn, $rest) = @_;
my $orig = $fn;
@@ -83,15 +84,12 @@ sub anchor0 ($$$$) {
# long filenames will require us to check in anchor1()
push(@{$ctx->{-long_path}}, $fn) if $fn =~ s!\A\.\.\./?!!;
- if (defined(my $attr = to_attr($ctx->{-apfx}.$fn))) {
- $ctx->{-anchors}->{$attr} = 1;
- my $spaces = ($orig =~ s/( +)\z//) ? $1 : '';
- $$dst .= " " .
- ascii_html($orig) . '' . $spaces .
+ my $attr = to_attr($ctx->{-apfx}.$fn) // return;
+ $ctx->{-anchors}->{$attr} = 1;
+ my $spaces = ($orig =~ s/( +)\z//) ? $1 : '';
+ print { $ctx->{zfh} } " ",
+ ascii_html($orig), '', $spaces,
$ctx->{-linkify}->to_html($rest);
- return 1;
- }
- undef;
}
# returns "diff --git" anchor destination, undef otherwise
@@ -123,14 +121,14 @@ sub diff_header ($$$) {
$pa = (split(m'/', git_unquote($pa), 2))[1] if $pa ne '/dev/null';
$pb = (split(m'/', git_unquote($pb), 2))[1] if $pb ne '/dev/null';
if ($pa eq $pb && $pb ne '/dev/null') {
- $dctx->{Q} = "?b=".uri_escape_utf8($pb, $UNSAFE);
+ $dctx->{Q} = '?b='.uri_escape_path($pb);
} else {
my @q;
if ($pb ne '/dev/null') {
- push @q, 'b='.uri_escape_utf8($pb, $UNSAFE);
+ push @q, 'b='.uri_escape_path($pb);
}
if ($pa ne '/dev/null') {
- push @q, 'a='.uri_escape_utf8($pa, $UNSAFE);
+ push @q, 'a='.uri_escape_path($pa);
}
$dctx->{Q} = '?'.join('&', @q);
}
@@ -155,37 +153,34 @@ sub diff_header ($$$) {
warn "BUG? <$$x> had no ^index line";
}
$$x =~ s!^diff --git!anchor1($ctx, $pb) // 'diff --git'!ems;
- my $dst = $ctx->{obuf};
- $$dst .= qq();
- $$dst .= $$x;
- $$dst .= '';
+ print { $ctx->{zfh} } qq(), $$x, '';
$dctx;
}
sub diff_before_or_after ($$) {
my ($ctx, $x) = @_;
- my $linkify = $ctx->{-linkify};
- my $dst = $ctx->{obuf};
- if (exists $ctx->{-anchors} && $$x =~ /\A(.*?) # likely "---\n"
+ if (exists $ctx->{-anchors} && $$x =~ /\A(.*?) # likely "---\n" # \$1
# diffstat lines:
((?:^\x20(?:[^\n]+?)(?:\x20+\|\x20[^\n]*\n))+)
(\x20[0-9]+\x20files?\x20)changed,([^\n]+\n)
(.*?)\z/msx) { # notes, commit message, etc
- undef $$x;
my @x = ($5, $4, $3, $2, $1);
- $$dst .= $linkify->to_html(pop @x); # uninteresting prefix
- for my $l (split(/^/m, pop(@x))) { # per-file diffstat lines
+ undef $$x;
+ my $lnk = $ctx->{-linkify};
+ my $zfh = $ctx->{zfh};
+ print $zfh $lnk->to_html(pop @x); # $1 uninteresting prefix
+ for my $l (split(/^/m, pop(@x))) { # $2 per-file stat lines
$l =~ /^ (.+)( +\| .*\z)/s and
- anchor0($dst, $ctx, $1, $2) and next;
- $$dst .= $linkify->to_html($l);
+ anchor0($ctx, $1, $2) and next;
+ print $zfh $lnk->to_html($l);
}
- $$dst .= $x[2]; # $3 /^ \d+ files? /
my $ch = $ctx->{changed_href} // '#related';
- $$dst .= qq(changed,);
- $$dst .= ascii_html($x[1]); # $4: insertions/deletions
- $$dst .= $linkify->to_html($x[0]); # notes, commit message, etc
+ print $zfh pop(@x), # $3 /^ \d+ files? /
+ qq(changed,),
+ ascii_html(pop @x), # insertions/deletions
+ $lnk->to_html(@x); # notes, commit message, etc
} else {
- $$dst .= $linkify->to_html($$x);
+ print { $ctx->{zfh} } $ctx->{-linkify}->to_html($$x);
}
}
@@ -196,9 +191,9 @@ sub flush_diff ($$) {
my @top = split($EXTRACT_DIFFS, $$cur);
undef $$cur; # free memory
- my $linkify = $ctx->{-linkify};
- my $dst = $ctx->{obuf};
+ my $lnk = $ctx->{-linkify};
my $dctx; # {}, keys: Q, oid_a, oid_b
+ my $zfh = $ctx->zfh;
while (defined(my $x = shift @top)) {
if (scalar(@top) >= 4 &&
@@ -206,7 +201,7 @@ sub flush_diff ($$) {
$top[0] =~ $IS_OID) {
$dctx = diff_header(\$x, $ctx, \@top);
} elsif ($dctx) {
- my $after = '';
+ open(my $afh, '>>', \(my $after='')) or die "open: $!";
# Quiet "Complex regular subexpression recursion limit"
# warning. Perl will truncate matches upon hitting
@@ -222,28 +217,28 @@ sub flush_diff ($$) {
(?:(?:^-[^\n]*\n)+)|
(?:^@@ [^\n]+\n))/xsm, $x)) {
if (!defined($dctx)) {
- $after .= $s;
+ print $afh $s;
} elsif ($s =~ s/\A@@ (\S+) (\S+) @@//) {
- $$dst .= qq();
- diff_hunk($dst, $dctx, $1, $2);
- $$dst .= $linkify->to_html($s);
- $$dst .= '';
- } elsif ($s =~ /\A\+/) {
- $$dst .= qq();
- $$dst .= $linkify->to_html($s);
- $$dst .= '';
+ print $zfh qq(),
+ diff_hunk($dctx, $1, $2),
+ $lnk->to_html($s),
+ '';
+ } elsif ($s =~ /\A\+/) { # $s may be huge
+ print $zfh qq(),
+ $lnk->to_html($s),
+ '';
} elsif ($s =~ /\A-- $/sm) { # email sig starts
$dctx = undef;
- $after .= $s;
- } elsif ($s =~ /\A-/) {
- $$dst .= qq();
- $$dst .= $linkify->to_html($s);
- $$dst .= '';
- } else {
- $$dst .= $linkify->to_html($s);
+ print $afh $s;
+ } elsif ($s =~ /\A-/) { # $s may be huge
+ print $zfh qq(),
+ $lnk->to_html($s),
+ '';
+ } else { # $s may be huge
+ print $zfh $lnk->to_html($s);
}
}
- diff_before_or_after($ctx, \$after) unless $dctx;
+ diff_before_or_after($ctx, \$after) if !$dctx;
} else {
diff_before_or_after($ctx, \$x);
}