From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 4ABC11F601 for ; Tue, 23 Aug 2022 08:32:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1661243524; bh=scNBz5eiNb6Y71gjj/Mq0jZHzRAPMjyFzFWX5biq4Ig=; h=From:To:Subject:Date:In-Reply-To:References:From; b=plmQO5KzEC0KOKyQvVJmklX219Igs1hTYDKWy8kG3yUAdXS4Nae9Ht0LHkoF3qhb7 MCHPxFrQSu9Re18V0ludSbVXuvuHB0OaNKekC3jogRKnhN1TxgOFXqXoAeEWoG8xSv +vs8ZpOGyw8OPHteWkDsfXH60+x2uLMUusLdmX7A= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 2/8] viewdiff: linkify diffstats for non-format-patch emails Date: Tue, 23 Aug 2022 08:31:57 +0000 Message-Id: <20220823083203.1128993-3-e@80x24.org> In-Reply-To: <20220823083203.1128993-1-e@80x24.org> References: <20220823083203.1128993-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Some folks unfortunately use "git diff --stat -p" to generate patches. These messages lack the /^---$/ line and causing diffstats to not get linkified properly. We now treat the /^---$/ as optional and rely on the presence of file lines with / \| / proceeding a /\d+ files? changed,/ line. --- lib/PublicInbox/ViewDiff.pm | 41 +++++++++++++++++-------------------- lib/PublicInbox/ViewVCS.pm | 2 +- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/lib/PublicInbox/ViewDiff.pm b/lib/PublicInbox/ViewDiff.pm index 960f7e61..ee2d688c 100644 --- a/lib/PublicInbox/ViewDiff.pm +++ b/lib/PublicInbox/ViewDiff.pm @@ -166,29 +166,26 @@ sub diff_before_or_after ($$) { my ($ctx, $x) = @_; my $linkify = $ctx->{-linkify}; my $dst = $ctx->{obuf}; - my $anchors = exists($ctx->{-anchors}) ? 1 : 0; - for my $y (split(/(^---\n)/sm, $$x)) { - if ($y =~ /\A---\n\z/s) { - $$dst .= "---\n"; # all HTML is "\r\n" => "\n" - $anchors |= 2; - } elsif ($anchors == 3 && $y =~ /^ [0-9]+ files? changed, /sm) { - # ok, looks like a diffstat, go line-by-line: - for my $l (split(/^/m, $y)) { - if ($l =~ /^ (.+)( +\| .*\z)/s) { - anchor0($dst, $ctx, $1, $2) or - $$dst .= $linkify->to_html($l); - } elsif ($l =~ s/^( [0-9]+ files? )changed,//) { - $$dst .= $1; - my $end = $ctx->{end_id} // 'related'; - $$dst .= "changed,"; - $$dst .= ascii_html($l); - } else { - $$dst .= $linkify->to_html($l); - } - } - } else { # commit message, notes, etc - $$dst .= $linkify->to_html($y); + if (exists $ctx->{-anchors} && $$x =~ /\A(.*?) # likely "---\n" + # 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 + $l =~ /^ (.+)( +\| .*\z)/s and + anchor0($dst, $ctx, $1, $2) and next; + $$dst .= $linkify->to_html($l); } + $$dst .= $x[2]; # $3 /^ \d+ files? / + my $end = $ctx->{end_id} // 'related'; + $$dst .= "changed,"; + $$dst .= ascii_html($x[1]); # $4: insertions/deletions + $$dst .= $linkify->to_html($x[0]); # notes, commit message, etc + } else { + $$dst .= $linkify->to_html($$x); } } diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm index dcb5c67f..4165a1de 100644 --- a/lib/PublicInbox/ViewVCS.pm +++ b/lib/PublicInbox/ViewVCS.pm @@ -153,10 +153,10 @@ EOM $buf = ''; $ctx->{obuf} = \$buf; $ctx->{-apfx} = $ctx->{-spfx} = $upfx; - $ctx->{-anchors} = {}; $bdy = ''; read($fh, $bdy, -s _); $bdy =~ s/\r?\n/\n/gs; + $ctx->{-anchors} = {} if $bdy =~ /^diff --git /sm; flush_diff($ctx, \$bdy); $ctx->zmore($buf); undef $buf;