diff options
| author | Eric Wong <e@yhbt.net> | 2020-02-24 07:33:27 +0000 |
|---|---|---|
| committer | Eric Wong <e@yhbt.net> | 2020-02-24 18:30:12 +0000 |
| commit | 41f34b29a850b987db36eb75aa3101f0eb540f1c (patch) | |
| tree | 2ce666773bf6028a67ae4d909640a47d46bcf5f6 | |
| parent | af8434f5f729a541cf8c50dfcb7d96a413facd2b (diff) | |
| download | public-inbox-41f34b29a850b987db36eb75aa3101f0eb540f1c.tar.gz | |
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.
| -rw-r--r-- | lib/PublicInbox/ViewDiff.pm | 11 |
1 files 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, |