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 2E49E1F59D 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=ftKpWOi95kw3crDp5kHFYpsfeSxuGIfP87rzi51dPdI=; h=From:To:Subject:Date:In-Reply-To:References:From; b=klXgXfx7TtIzfRdp6W3pxiS9u/ltc/4pdNzEa+Ks+GhWMbhiIJWsSK730W6P3eNN3 H2QwZ611Roe90oIgaeQR2YLR+dI9yKQLBx+jmLrl2erzLOtt5+muaIHBP1h7qGEe9q 2bnD6nLFfsPvtvJVxL3MyayiFc5z/pvEsy1n6BZs= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/8] view: generate query in single-message and commit views Date: Tue, 23 Aug 2022 08:31:56 +0000 Message-Id: <20220823083203.1128993-2-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: The dfblob: search prefix is probably under-utilized, but is extremely powerful IMHO. To make it easier-to-use, add a search textarea with it prefilled with values for the existing patch message. This allows users to easily run a query for all patches which alter or result in either pre or post-image blobs in the current patch. Behavior changes are as follows: "changed" in the diffstat jumps to the bottom of the message. For /T/ and /t/, it goes to the "related" anchor which is just above the reply instructions in the single-message view. For the single message view, it'll jump to the textarea search form. I initially wanted to use a normal `{mhref} = $mhref; + $ctx->{end_id} = "e$id"; $ctx->{obuf} = \$rv; $eml->each_part(\&add_text_body, $ctx, 1); delete $ctx->{obuf}; @@ -256,6 +258,9 @@ sub eml_entry { " raw" . " reply"; + delete($ctx->{-qry}) and + $rv .= qq[ related]; + my $hr; if (defined(my $pct = $smsg->{pct})) { # used by SearchView.pm $rv .= "\t[relevance $pct%]"; @@ -820,15 +825,38 @@ sub _parent_headers { # returns a string buffer sub html_footer { my ($ctx, $hdr) = @_; - my $ibx = $ctx->{ibx}; my $upfx = '../'; my $skel; my $rv = '
';
-	if ($ibx->over) {
+	my $related;
+	my $qry = delete $ctx->{-qry};
+	if ($qry && $ctx->{ibx}->isrch) {
+		my $q = ''; # search for either ancestor or descendent patches
+		for (@{$qry->{dfpre}}, @{$qry->{dfpost}}) {
+			chop if length > 7; # include 1 abbrev "older" patches
+			$q .= "dfblob:$_ ";
+		}
+		chop $q; # omit trailing SP
+		local $Text::Wrap::columns = COLS;
+		local $Text::Wrap::huge = 'overflow';
+		$q = wrap('', '', $q);
+		my $rows = ($q =~ tr/\n/\n/) + 1;
+		$q = ascii_html($q);
+		$related = <
find likely ancestor, descendant, or conflicting patches:
+
+\t(help)

+EOM
+	}
+	if ($ctx->{ibx}->over) {
 		my $t = ts2str($ctx->{-t_max});
 		my $t_fmt = fmt_ts($ctx->{-t_max});
-		$skel .= <\t";
+		$skel = <~$t_fmt UTC|newest]
 EOF
@@ -869,6 +897,7 @@ EOF
 	$rv .= qq(reply);
 	$rv .= $skel;
 	$rv .= '
'; + $rv .= $related // ''; $rv .= msg_reply($ctx, $hdr); } diff --git a/lib/PublicInbox/ViewDiff.pm b/lib/PublicInbox/ViewDiff.pm index fb394b7c..960f7e61 100644 --- a/lib/PublicInbox/ViewDiff.pm +++ b/lib/PublicInbox/ViewDiff.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2019-2021 all contributors +# Copyright (C) all contributors # License: AGPL-3.0+ # # used by PublicInbox::View @@ -141,13 +141,16 @@ sub diff_header ($$$) { # no need to capture oid_a and oid_b on add/delete, # we just linkify OIDs directly via s///e in conditional - if (($$x =~ s/$NULL_TO_BLOB/$1 . oid($dctx, $spfx, $2)/e) || - ($$x =~ s/$BLOB_TO_NULL/ - 'index ' . oid($dctx, $spfx, $1) . $2/e)) { + if ($$x =~ s/$NULL_TO_BLOB/$1 . oid($dctx, $spfx, $2)/e) { + push @{$ctx->{-qry}->{dfpost}}, $2; + } elsif ($$x =~ s/$BLOB_TO_NULL/'index '.oid($dctx, $spfx, $1).$2/e) { + push @{$ctx->{-qry}->{dfpre}}, $1; } elsif ($$x =~ $BLOB_TO_BLOB) { # modification-only, not add/delete: # linkify hunk headers later using oid_a and oid_b @$dctx{qw(oid_a oid_b)} = ($1, $2); + push @{$ctx->{-qry}->{dfpre}}, $1; + push @{$ctx->{-qry}->{dfpost}}, $2; } else { warn "BUG? <$$x> had no ^index line"; } @@ -172,9 +175,16 @@ sub diff_before_or_after ($$) { # ok, looks like a diffstat, go line-by-line: for my $l (split(/^/m, $y)) { if ($l =~ /^ (.+)( +\| .*\z)/s) { - anchor0($dst, $ctx, $1, $2) and next; + 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); } - $$dst .= $linkify->to_html($l); } } else { # commit message, notes, etc $$dst .= $linkify->to_html($y); diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm index 19d34092..dcb5c67f 100644 --- a/lib/PublicInbox/ViewVCS.pm +++ b/lib/PublicInbox/ViewVCS.pm @@ -21,6 +21,8 @@ use PublicInbox::WwwStream qw(html_oneshot); use PublicInbox::Linkify; use PublicInbox::Tmpfile; use PublicInbox::ViewDiff qw(flush_diff); +use PublicInbox::View; +use Text::Wrap qw(wrap); use PublicInbox::Hval qw(ascii_html to_filename); my $hl = eval { require PublicInbox::HlMod; @@ -157,6 +159,32 @@ EOM $bdy =~ s/\r?\n/\n/gs; flush_diff($ctx, \$bdy); $ctx->zmore($buf); + undef $buf; + # TODO: should there be another textarea which attempts to + # search for the exact email which was applied to make this + # commit? + if (my $qry = delete $ctx->{-qry}) { + my $q = ''; + for (@{$qry->{dfpost}}, @{$qry->{dfpre}}) { + # keep blobs as short as reasonable, emails + # are going to be older than what's in git + substr($_, 7, 64, ''); + $q .= "dfblob:$_ "; + } + chop $q; # no trailing SP + local $Text::Wrap::columns = PublicInbox::View::COLS; + local $Text::Wrap::huge = 'overflow'; + $q = wrap('', '', $q); + my $rows = ($q =~ tr/\n/\n/) + 1; + $q = ascii_html($q); + $ctx->zmore(<
find related emails, including ancestors/descendants/conflicts
+
+\t(help)
+EOM + } } $x = $ctx->zflush($ctx->_html_end); my $res_hdr = delete $ctx->{-res_hdr};