No ext_urls

[public-inbox.git] / lib / PublicInbox / ViewDiff.pm

diff --git a/lib/PublicInbox/ViewDiff.pm b/lib/PublicInbox/ViewDiff.pm
index fba3d76c7b0cc10473261380c081301f93b5b119..124a723a5fb465247963a5d01fd5c40fda593c11 100644 (file)
--- a/lib/PublicInbox/ViewDiff.pm
+++ b/lib/PublicInbox/ViewDiff.pm
@@ -7,8 +7,7 @@
 # (or reconstruct) blobs.
 
 package PublicInbox::ViewDiff;
-use strict;
-use v5.10.1;
+use v5.12;
 use parent qw(Exporter);
 our @EXPORT_OK = qw(flush_diff uri_escape_path);
 use URI::Escape qw(uri_escape_utf8);
@@ -155,16 +154,16 @@ sub diff_header ($$$) {
 
 sub diff_before_or_after ($$) {
        my ($ctx, $x) = @_;
-       if (exists $ctx->{-anchors} && $$x =~ /\A(.*?) # likely "---\n" # \$1
-                       # diffstat lines:
-                       ((?:^\x20(?:[^\n]+?)(?:\x20+\|\x20[^\n]*\n))+)
-                       (\x20[0-9]+\x20files?\x20)changed,
-                       (.*?)\z/msx) { # notes, commit message, etc
-               my @x = ($4, $3, $2, $1);
-               undef $$x;
+       if (exists $ctx->{-anchors} && $$x =~ # diffstat lines:
+                       /((?:^\x20(?:[^\n]+?)(?:\x20+\|\x20[^\n]*\n))+)
+                       (\x20[0-9]+\x20files?\x20)changed,/msx) {
+               my $pre = substr($$x, 0, $-[0]); # (likely) short prefix
+               substr($$x, 0, $+[0], ''); # sv_chop on $$x ($$x may be long)
+               my @x = ($2, $1);
                my $lnk = $ctx->{-linkify};
                my $zfh = $ctx->{zfh};
-               print $zfh $lnk->to_html(pop @x); # $1 uninteresting prefix
+               # uninteresting prefix
+               print $zfh $lnk->to_html($pre);
                for my $l (split(/^/m, pop(@x))) { # $2 per-file stat lines
                        $l =~ /^ (.+)( +\| .*\z)/s and
                                anchor0($ctx, $1, $2) and next;
@@ -174,7 +173,7 @@ sub diff_before_or_after ($$) {
                print $zfh pop(@x), # $3 /^ \d+ files? /
                        qq(<a href="$ch">changed</a>,),
                        # insertions/deletions, notes, commit message, etc:
-                       $lnk->to_html(@x);
+                       $lnk->to_html($$x);
        } else {
                print { $ctx->{zfh} } $ctx->{-linkify}->to_html($$x);
        }
@@ -197,7 +196,8 @@ sub flush_diff ($$) {
                                $top[0] =~ $IS_OID) {
                        $dctx = diff_header(\$x, $ctx, \@top);
                } elsif ($dctx) {
-                       open(my $afh, '>>', \(my $after='')) or die "open: $!";
+                       open(my $afh, '>>:utf8', \(my $after='')) or
+                               die "open: $!";
 
                        # Quiet "Complex regular subexpression recursion limit"
                        # warning.  Perl will truncate matches upon hitting
@@ -212,6 +212,7 @@ sub flush_diff ($$) {
                        for my $s (split(/((?:(?:^\+[^\n]*\n)+)|
                                        (?:(?:^-[^\n]*\n)+)|
                                        (?:^@@ [^\n]+\n))/xsm, $x)) {
+                               undef $x;
                                if (!defined($dctx)) {
                                        print $afh $s;
                                } elsif ($s =~ s/\A@@ (\S+) (\S+) @@//) {
@@ -234,7 +235,10 @@ sub flush_diff ($$) {
                                        print $zfh $lnk->to_html($s);
                                }
                        }
-                       diff_before_or_after($ctx, \$after) if !$dctx;
+                       if (!$dctx) {
+                               utf8::decode($after);
+                               diff_before_or_after($ctx, \$after);
+                       }
                } else {
                        diff_before_or_after($ctx, \$x);
                }