X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FViewVCS.pm;h=1379bd583cc5cd43427a0ef882e6d6eabc046676;hb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;hp=ead8c2b45fe1fd8e1791227b13872f480e2560aa;hpb=65e3cc8f6cc73e45db827cbeee4ccecbf1502496;p=public-inbox.git diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm index ead8c2b4..1379bd58 100644 --- a/lib/PublicInbox/ViewVCS.pm +++ b/lib/PublicInbox/ViewVCS.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2019 all contributors +# Copyright (C) 2019-2020 all contributors # License: AGPL-3.0+ # show any VCS object, similar to "git show" @@ -33,14 +33,14 @@ my $BIN_DETECT = 8000; # same as git sub html_i { # WwwStream::getline callback my ($nr, $ctx) = @_; - $nr == 1 ? ${delete $ctx->{rv}} : undef; + $nr == 1 ? ${delete $ctx->{obuf}} : undef; } sub html_page ($$$) { my ($ctx, $code, $strref) = @_; my $wcb = delete $ctx->{-wcb}; $ctx->{-upfx} = '../../'; # from "/$INBOX/$OID/s/" - $ctx->{rv} = $strref; + $ctx->{obuf} = $strref; my $res = PublicInbox::WwwStream->response($ctx, $code, \&html_i); $wcb ? $wcb->($res) : $res; } @@ -90,8 +90,7 @@ sub show_other_result ($$) { } my $l = PublicInbox::Linkify->new; utf8::decode($$bref); - $l->linkify_1($$bref); - $$bref = '
'. $l->linkify_2(ascii_html($$bref));
+	$$bref = '
'. $l->to_html($$bref);
 	$$bref .= '

' . $$logref; html_page($ctx, 200, $bref); } @@ -125,9 +124,8 @@ sub solve_result { my $ref = ref($res); my $l = PublicInbox::Linkify->new; - $l->linkify_1($log); $log = '
debug log:

' .
-		$l->linkify_2(ascii_html($log)) . '
'; + $l->to_html($log) . '
'; $res or return html_page($ctx, 404, \$log); $ref eq 'ARRAY' or return html_page($ctx, 500, \$log);