From: Eric Wong <e@yhbt.net> To: meta@public-inbox.org Subject: [PATCH 20/22] viewdiff: add "b=" param when missing "diff --git" line Date: Sat, 25 Jan 2020 04:45:08 +0000 Message-ID: <20200125044510.13769-21-e@yhbt.net> (raw) In-Reply-To: <20200125044510.13769-1-e@yhbt.net> <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);
next prev parent reply other threads:[~2020-01-25 4:45 UTC|newest] Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-01-25 4:44 [PATCH 00/22] HTML display cleanups, fixes, speedups Eric Wong 2020-01-25 4:44 ` [PATCH 01/22] www*stream: favor \&close instead of *close Eric Wong 2020-01-25 4:44 ` [PATCH 02/22] www: use "skel" terminology consistently Eric Wong 2020-01-25 4:44 ` [PATCH 03/22] view: improve readability around walk_thread Eric Wong 2020-01-25 4:44 ` [PATCH 04/22] searchview: keep $noop sub private to the package Eric Wong 2020-01-25 4:44 ` [PATCH 05/22] view: reduce parameters for html_footer Eric Wong 2020-01-25 4:44 ` [PATCH 06/22] view: thread_skel: drop constant tpfx parameter Eric Wong 2020-01-25 4:44 ` [PATCH 07/22] view: simplify duplicate Message-ID handling Eric Wong 2020-01-25 4:44 ` [PATCH 08/22] wwwstream: discard single-use $ctx fields after use Eric Wong 2020-01-25 4:44 ` [PATCH 09/22] view: start performing buffering into {obuf} Eric Wong 2020-01-25 4:44 ` [PATCH 10/22] t/plack.t: modernize and unindent Eric Wong 2020-01-25 4:44 ` [PATCH 11/22] init: use Import::run_die instead of system() Eric Wong 2020-01-25 4:45 ` [PATCH 12/22] tests: move the majority of t/view.t into t/plack.t Eric Wong 2020-01-25 4:45 ` [PATCH 13/22] xt/perf-msgview: switch to multipart_text_as_html Eric Wong 2020-01-25 4:45 ` [PATCH 14/22] view: inline and eliminate msg_html Eric Wong 2020-01-25 4:45 ` [PATCH 15/22] linkify: compile $LINK_RE once Eric Wong 2020-01-25 4:45 ` [PATCH 16/22] linkify: move to_html over from ViewDiff Eric Wong 2020-01-25 4:45 ` [PATCH 17/22] searchidx: skip filenames on "diff --git ..." Eric Wong 2020-01-25 4:45 ` [PATCH 18/22] searchidx: don't assume "a/" and "b/" as prefixes Eric Wong 2020-01-25 4:45 ` [PATCH 19/22] viewdiff: add "b=" param with non-standard diff prefix Eric Wong 2020-01-25 4:45 ` Eric Wong [this message] 2020-01-25 4:45 ` [PATCH 21/22] viewdiff: use autovivification for long_path hash Eric Wong 2020-01-25 4:45 ` [PATCH 22/22] viewdiff: rewrite and simplify Eric Wong
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://public-inbox.org/README * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200125044510.13769-21-e@yhbt.net \ --to=e@yhbt.net \ --cc=meta@public-inbox.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
user/dev discussion of public-inbox itself This inbox may be cloned and mirrored by anyone: git clone --mirror http://public-inbox.org/meta git clone --mirror http://czquwvybam4bgbro.onion/meta git clone --mirror http://hjrcffqmbrq6wope.onion/meta git clone --mirror http://ou63pmih66umazou.onion/meta # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 meta meta/ http://public-inbox.org/meta \ meta@public-inbox.org public-inbox-index meta Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.mail.public-inbox.meta nntp://ou63pmih66umazou.onion/inbox.comp.mail.public-inbox.meta nntp://czquwvybam4bgbro.onion/inbox.comp.mail.public-inbox.meta nntp://hjrcffqmbrq6wope.onion/inbox.comp.mail.public-inbox.meta nntp://news.gmane.io/gmane.mail.public-inbox.general note: .onion URLs require Tor: https://www.torproject.org/ code repositories for the project(s) associated with this inbox: https://80x24.org/public-inbox.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git