* [PATCH 20/22] viewdiff: add "b=" param when missing "diff --git" line
2020-01-25 4:44 4% [PATCH 00/22] HTML display cleanups, fixes, speedups Eric Wong
@ 2020-01-25 4:45 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-01-25 4:45 UTC (permalink / raw)
To: meta
<2841d2de-32ad-eae8-6039-9251a40bb00e@tngtech.com> as posted to
git@vger contained an otherwise valid diff without a "diff
--git" line. Generate a "b=" parameter in that case using the
"+++" line instead of the "diff --git" line. SearchIdx.pm no
longer uses the "diff --git" line for filename information,
either.
---
lib/PublicInbox/ViewDiff.pm | 31 +++++++++++++++++++++++++++++--
1 file changed, 29 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/ViewDiff.pm b/lib/PublicInbox/ViewDiff.pm
index 6a60d0dc..ff7d85f5 100644
--- a/lib/PublicInbox/ViewDiff.pm
+++ b/lib/PublicInbox/ViewDiff.pm
@@ -133,6 +133,17 @@ sub anchor1 ($$$$$) {
undef
}
+sub missing_diff_git_line ($$) {
+ my ($dctx, $pb) = @_;
+ # missing "diff --git ..."
+ $dctx->{path_b} = $pb;
+ $dctx->{Q} = '?b='.uri_escape_utf8($pb, UNSAFE);
+ my $pa = $dctx->{path_a};
+ if (defined($pa) && $pa ne $pb) {
+ $dctx->{Q} .= '&a='. uri_escape_utf8($pa, UNSAFE);
+ }
+}
+
sub flush_diff ($$$) {
my ($dst, $ctx, $linkify) = @_;
my $diff = $ctx->{-diff};
@@ -192,8 +203,24 @@ sub flush_diff ($$$) {
$$dst .= '</span>';
$state = DSTATE_CTX;
$$dst .= $linkify->to_html($s);
- } elsif ($s =~ m!^--- (?:$PATH_X)!o ||
- $s =~ m!^\+{3} (?:$PATH_X)!o) {
+ } elsif ($s =~ m!^--- ($PATH_X)!o) {
+ my $pa = $1;
+ $pa = (split('/', git_unquote($pa), 2))[1];
+ if (($dctx->{path_a} // '') ne $pa) {
+ # missing "diff --git ..." ?
+ $dctx->{path_a} = $pa;
+ }
+ # color only (no oid link) if missing dctx->{oid_*}
+ $state <= DSTATE_STAT and
+ to_state($dst, $state, DSTATE_HEAD);
+ $$dst .= $linkify->to_html($s);
+ } elsif ($s =~ m!^\+{3} ($PATH_X)!o) {
+ my $pb = $1;
+ $pb = (split('/', git_unquote($pb), 2))[1];
+ if (($dctx->{path_b} // '') ne $pb) {
+ missing_diff_git_line($dctx, $pb);
+ }
+
# color only (no oid link) if missing dctx->{oid_*}
$state <= DSTATE_STAT and
to_state($dst, $state, DSTATE_HEAD);
^ permalink raw reply related [relevance 7%]
* [PATCH 00/22] HTML display cleanups, fixes, speedups
@ 2020-01-25 4:44 4% Eric Wong
2020-01-25 4:45 7% ` [PATCH 20/22] viewdiff: add "b=" param when missing "diff --git" line Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2020-01-25 4:44 UTC (permalink / raw)
To: meta
There's a lot more to do, but there's a couple of fixes for diff
viewing and href generation for solver. ViewDiff.pm is
significantly easier-to-read and follow <span> tags for.
Eric Wong (22):
www*stream: favor \&close instead of *close
www: use "skel" terminology consistently
view: improve readability around walk_thread
searchview: keep $noop sub private to the package
view: reduce parameters for html_footer
view: thread_skel: drop constant tpfx parameter
view: simplify duplicate Message-ID handling
wwwstream: discard single-use $ctx fields after use
view: start performing buffering into {obuf}
t/plack.t: modernize and unindent
init: use Import::run_die instead of system()
tests: move the majority of t/view.t into t/plack.t
xt/perf-msgview: switch to multipart_text_as_html
view: inline and eliminate msg_html
linkify: compile $LINK_RE once
linkify: move to_html over from ViewDiff
searchidx: skip filenames on "diff --git ..."
searchidx: don't assume "a/" and "b/" as prefixes
viewdiff: add "b=" param with non-standard diff prefix
viewdiff: add "b=" param when missing "diff --git" line
viewdiff: use autovivification for long_path hash
viewdiff: rewrite and simplify
lib/PublicInbox/Linkify.pm | 4 +-
lib/PublicInbox/SearchIdx.pm | 12 +-
lib/PublicInbox/SearchView.pm | 14 +-
lib/PublicInbox/View.pm | 214 +++++++--------
lib/PublicInbox/ViewDiff.pm | 283 ++++++++++---------
lib/PublicInbox/ViewVCS.pm | 10 +-
lib/PublicInbox/WwwAtomStream.pm | 10 +-
lib/PublicInbox/WwwListing.pm | 3 +-
lib/PublicInbox/WwwStream.pm | 21 +-
script/public-inbox-init | 10 +-
t/mid.t | 8 +-
t/plack.t | 456 ++++++++++++++++++-------------
t/view.t | 207 ++------------
xt/perf-msgview.t | 10 +-
xt/solver.t | 2 +-
15 files changed, 564 insertions(+), 700 deletions(-)
^ permalink raw reply [relevance 4%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-01-25 4:44 4% [PATCH 00/22] HTML display cleanups, fixes, speedups Eric Wong
2020-01-25 4:45 7% ` [PATCH 20/22] viewdiff: add "b=" param when missing "diff --git" line Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).