solver: force quoted-printable bodies to LF

[public-inbox.git] / lib / PublicInbox / SolverGit.pm

diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm
index 13065348b1da882c23843df3268de017106f7f1a..612f495bd3bc2ba0c9a0d51b11a82a348865f72e 100644 (file)
--- a/lib/PublicInbox/SolverGit.pm
+++ b/lib/PublicInbox/SolverGit.pm
@@ -78,6 +78,14 @@ sub extract_diff ($$$$) {
        my ($s, undef) = msg_part_text($part, $ct);
        defined $s or return;
        my $di = {};
+
+       # Email::MIME::Encodings forces QP to be CRLF upon decoding,
+       # change it back to LF:
+       my $cte = $part->header('Content-Transfer-Encoding') || '';
+       if ($cte =~ /\bquoted-printable\b/i && $part->crlf eq "\n") {
+               $s =~ s/\r\n/\n/sg;
+       }
+
        foreach my $l (split(/^/m, $s)) {
                if ($l =~ $re) {
                        $di->{oid_a} = $1;
@@ -105,6 +113,11 @@ sub extract_diff ($$$$) {
 
                        my ($path_a, $path_b) = ($1, $2);
 
+                       # diff header lines won't have \r because git
+                       # will quote them, but Email::MIME gives CRLF
+                       # for quoted-printable:
+                       $path_b =~ tr/\r//d;
+
                        # don't care for leading 'a/' and 'b/'
                        my (undef, @a) = split(m{/}, git_unquote($path_a));
                        my (undef, @b) = split(m{/}, git_unquote($path_b));
@@ -248,8 +261,11 @@ sub do_apply_begin ($$$) {
 
        defined(my $err_fd = fileno($out)) or die "fileno(out): $!";
        my $rdr = { 0 => fileno($tmp), 1 => $err_fd, 2 => $err_fd };
+
+       # we need --ignore-whitespace because some patches are CRLF
        my $cmd = [ qw(git -C), $wt_dir,
-                   qw(apply --cached --whitespace=warn --verbose) ];
+                   qw(apply --cached --ignore-whitespace
+                      --whitespace=warn --verbose) ];
        spawn($cmd, undef, $rdr);
 }
 
@@ -425,8 +441,12 @@ sub solve ($$$$) {
        };
 
        while (1) {
-               my $ret = $cb->();
-               return $ret if (ref($ret) || !defined($ret));
+               my $ret = eval { $cb->() };
+               unless (defined($ret)) {
+                       print $out "E: $@\n" if $@;
+                       return;
+               }
+               return $ret if ref($ret);
                # $ret == ''; so continue looping here
        }
 }