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.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 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 DFE971F45E for ; Sun, 16 Feb 2020 10:07:30 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] viewdiff: do not generate "a=" parameter if "b=" matches Date: Sun, 16 Feb 2020 04:07:30 -0600 Message-Id: <20200216100730.20021-1-e@yhbt.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Long URLs waste bandwidth and redundant query parameters make caching more difficult and expensive. Fixes: ddec19694cbf0e1d ("viewdiff: rewrite and simplify") --- lib/PublicInbox/ViewDiff.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/PublicInbox/ViewDiff.pm b/lib/PublicInbox/ViewDiff.pm index b2dcbf8f..604b1f23 100644 --- a/lib/PublicInbox/ViewDiff.pm +++ b/lib/PublicInbox/ViewDiff.pm @@ -106,17 +106,18 @@ sub diff_header ($$$$) { my (undef, undef, $pa, $pb) = splice(@$top, 0, 4); # ignore oid_{a,b} my $spfx = $ctx->{-spfx}; my $dctx = { spfx => $spfx }; + + # get rid of leading "a/" or "b/" (or whatever --{src,dst}-prefix are) + $pa = (split('/', git_unquote($pa), 2))[1] if $pa ne '/dev/null'; + $pb = (split('/', git_unquote($pb), 2))[1] if $pb ne '/dev/null'; if ($pa eq $pb && $pb ne '/dev/null') { - $pa = $pb = (split('/', git_unquote($pb), 2))[1]; $dctx->{Q} = "?b=".uri_escape_utf8($pb, UNSAFE); } else { my @q; if ($pb ne '/dev/null') { - $pb = (split('/', git_unquote($pb), 2))[1]; push @q, 'b='.uri_escape_utf8($pb, UNSAFE); } if ($pa ne '/dev/null') { - $pa = (split('/', git_unquote($pa), 2))[1]; push @q, 'a='.uri_escape_utf8($pa, UNSAFE); } $dctx->{Q} = '?'.join('&', @q);