$INBOX/_/text/color/ and sample user-side CSS

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

diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm
index 51be2cdf91f0d6fed4e41f8b11dc7c3eda2cdc48..8fde2329fa757a639aba76375c4ab63ffa55ab1b 100644 (file)
--- a/lib/PublicInbox/SolverGit.pm
+++ b/lib/PublicInbox/SolverGit.pm
@@ -105,6 +105,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));
@@ -221,11 +226,13 @@ sub prepare_index ($$$$) {
        my ($r, $w);
        my $path_a = $di->{path_a} or die "BUG: path_a missing for $oid_full";
        my $mode_a = $di->{mode_a} || extract_old_mode($di);
-       my @git = (qw(git -C), $wt_dir);
 
+       # unlike git-apply(1), this only gets called once in a patch
+       # series and happens too quickly to be worth making async:
        pipe($r, $w) or die "pipe: $!";
        my $rdr = { 0 => fileno($r) };
-       my $pid = spawn([@git, qw(update-index -z --index-info)], {}, $rdr);
+       my $pid = spawn([qw(git -C), $wt_dir,
+                        qw(update-index -z --index-info)], undef, $rdr);
        close $r or die "close pipe(r): $!";
        print $w "$mode_a $oid_full\t$path_a\0" or die "print update-index: $!";
 
@@ -246,8 +253,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);
 }
 
@@ -356,6 +366,9 @@ sub apply_patches_cb ($$$$$) {
 # recreate $oid_b
 # Returns an array ref: [ ::Git object, oid_full, type, size, di ]
 # or undef if nothing was found.
+#
+# TODO: complete the migration of this and ViewVCS into an evented
+# model for fairness
 sub solve ($$$$) {
        my ($self, $out, $oid_b, $hints) = @_;
 
@@ -420,8 +433,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
        }
 }