* [PATCH 2/3] viewdiff: remove optional CR handling
2020-02-24 7:33 6% [PATCH 0/3] avoid redundant CRLF handling Eric Wong
@ 2020-02-24 7:33 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-02-24 7:33 UTC (permalink / raw)
To: meta
The only caller of `flush_diff' is `add_text_body', and that
already did CRLF conversion on the text part. The regexps in
SolverGit still need to preserve CR, however, since that
actually applies patches (instead of rendering them), and we
need to preserve CRLF patches for CRLF files.
---
lib/PublicInbox/ViewDiff.pm | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/lib/PublicInbox/ViewDiff.pm b/lib/PublicInbox/ViewDiff.pm
index 604b1f23..0f5c0e4e 100644
--- a/lib/PublicInbox/ViewDiff.pm
+++ b/lib/PublicInbox/ViewDiff.pm
@@ -150,8 +150,8 @@ sub diff_header ($$$$) {
sub diff_before_or_after ($$$) {
my ($dst, $ctx, $x) = @_;
my $linkify = $ctx->{-linkify};
- for my $y (split(/(^---\r?\n)/sm, $$x)) {
- if ($y =~ /\A---\r?\n\z/s) {
+ for my $y (split(/(^---\n)/sm, $$x)) {
+ if ($y =~ /\A---\n\z/s) {
$$dst .= "---\n"; # all HTML is "\r\n" => "\n"
} elsif ($y =~ /^ [0-9]+ files? changed, /sm) {
# ok, looks like a diffstat, go line-by-line:
@@ -167,11 +167,12 @@ sub diff_before_or_after ($$$) {
}
}
+# callers must do CRLF => LF conversion before calling this
sub flush_diff ($$$) {
my ($dst, $ctx, $cur) = @_;
- state $LF = qr!\r?\n!;
- state $ANY = qr![^\r\n]!;
- state $FN = qr!(?:"?[^/\n]+/[^\r\n]+|/dev/null)!;
+ state $LF = qr!\n!;
+ state $ANY = qr![^\n]!;
+ state $FN = qr!(?:"?[^/\n]+/[^\n]+|/dev/null)!;
my @top = split(/(
(?: # begin header stuff, don't capture filenames, here,
^ permalink raw reply related [relevance 7%]
* [PATCH 0/3] avoid redundant CRLF handling
@ 2020-02-24 7:33 6% Eric Wong
2020-02-24 7:33 7% ` [PATCH 2/3] viewdiff: remove optional CR handling Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2020-02-24 7:33 UTC (permalink / raw)
To: meta
Redundant ops waste cycles and make the code more difficult to
follow. And 3/3 is an overdue cleanup which can also serve as
an impromptu test for solver...
Eric Wong (3):
hval: ascii_html: drop CRLF => LF conversion
viewdiff: remove optional CR handling
examples/nginx_proxy: convert CRLF to LF
examples/nginx_proxy | 48 ++++++++++++++++++-------------------
lib/PublicInbox/Hval.pm | 1 -
lib/PublicInbox/ViewDiff.pm | 11 +++++----
lib/PublicInbox/ViewVCS.pm | 2 +-
t/plack.t | 27 +++++++++++++++++++++
5 files changed, 58 insertions(+), 31 deletions(-)
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-02-24 7:33 6% [PATCH 0/3] avoid redundant CRLF handling Eric Wong
2020-02-24 7:33 7% ` [PATCH 2/3] viewdiff: remove optional CR handling 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).