X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FViewDiff.pm;h=5d23881b55c1e9a2c74b2d6afd3c1b0c04954488;hb=ab9c03ff4aa369b397dc1a8c8936153c8565fd05;hp=349ffec8a0d4b52568316acac77d7cfc3e18129a;hpb=de954cac909d1ec0702a5ba2b0eb1823f999043d;p=public-inbox.git

diff --git a/lib/PublicInbox/ViewDiff.pm b/lib/PublicInbox/ViewDiff.pm
index 349ffec8..5d23881b 100644
--- a/lib/PublicInbox/ViewDiff.pm
+++ b/lib/PublicInbox/ViewDiff.pm
@@ -51,13 +51,10 @@ sub diff_hunk ($$$) {
 	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" : '';
-
+		my $n = ($ca =~ /^-([0-9]+)/) ? "#n$1" : '';
 		my $x = qq(@@ <a\nhref="$spfx$oid_a/s/$dctx->{Q}$n">$ca</a>);
 
-		($n) = ($cb =~ /^\+([0-9]+)/);
-		$n = defined($n) ? "#n$n" : '';
+		$n = ($cb =~ /^\+([0-9]+)/) ? "#n$1" : '';
 		$x .= qq( <a\nhref="$spfx$oid_b/s/$dctx->{Q}$n">$cb</a> @@);
 	} else {
 		"@@ $ca $cb @@";
@@ -70,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;
 
@@ -87,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 .= " <a\nid=i$attr\nhref=#$attr>" .
-			ascii_html($orig) . '</a>' . $spaces .
+	my $attr = to_attr($ctx->{-apfx}.$fn) // return;
+	$ctx->{-anchors}->{$attr} = 1;
+	my $spaces = ($orig =~ s/( +)\z//) ? $1 : '';
+	print { $ctx->{zfh} } " <a\nid=i$attr\nhref=#$attr>",
+			ascii_html($orig), '</a>', $spaces,
 			$ctx->{-linkify}->to_html($rest);
-		return 1;
-	}
-	undef;
 }
 
 # returns "diff --git" anchor destination, undef otherwise
@@ -159,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(<span\nclass="head">);
-	$$dst .= $$x;
-	$$dst .= '</span>';
+	print { $ctx->{zfh} } qq(<span\nclass="head">), $$x, '</span>';
 	$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(<a href="$ch">changed</a>,);
-		$$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(<a href="$ch">changed</a>,),
+			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);
 	}
 }
 
@@ -200,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 &&
@@ -210,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
@@ -226,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(<span\nclass="hunk">);
-					$$dst .= diff_hunk($dctx, $1, $2);
-					$$dst .= $linkify->to_html($s);
-					$$dst .= '</span>';
-				} elsif ($s =~ /\A\+/) {
-					$$dst .= qq(<span\nclass="add">);
-					$$dst .= $linkify->to_html($s);
-					$$dst .= '</span>';
+					print $zfh qq(<span\nclass="hunk">),
+						diff_hunk($dctx, $1, $2),
+						$lnk->to_html($s),
+						'</span>';
+				} elsif ($s =~ /\A\+/) { # $s may be huge
+					print $zfh qq(<span\nclass="add">),
+							$lnk->to_html($s),
+							'</span>';
 				} elsif ($s =~ /\A-- $/sm) { # email sig starts
 					$dctx = undef;
-					$after .= $s;
-				} elsif ($s =~ /\A-/) {
-					$$dst .= qq(<span\nclass="del">);
-					$$dst .= $linkify->to_html($s);
-					$$dst .= '</span>';
-				} else {
-					$$dst .= $linkify->to_html($s);
+					print $afh $s;
+				} elsif ($s =~ /\A-/) { # $s may be huge
+					print $zfh qq(<span\nclass="del">),
+							$lnk->to_html($s),
+							'</span>';
+				} 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);
 		}