1 files changed, 27 insertions, 5 deletions
diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm
index 49fb1c58..90c09078 100644
--- a/lib/PublicInbox/ViewVCS.pm
+++ b/lib/PublicInbox/ViewVCS.pm
@@ -2,6 +2,17 @@
  # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
  
  # show any VCS object, similar to "git show"
+# FIXME: we only show blobs for now
+#
+# This can use a "solver" to reconstruct blobs based on git
+# patches (with abbreviated OIDs in the header).  However, the
+# abbreviated OIDs must match exactly what's in the original
+# email (unless a normal code repo already has the blob).
+#
+# In other words, we can only reliably reconstruct blobs based
+# on links generated by ViewDiff (and only if the emailed
+# patches apply 100% cleanly to published blobs).
+
  package PublicInbox::ViewVCS;
  use strict;
  use warnings;
@@ -9,7 +20,7 @@ use Encode qw(find_encoding);
  use PublicInbox::SolverGit;
  use PublicInbox::WwwStream;
  use PublicInbox::Linkify;
-use PublicInbox::Hval qw(ascii_html);
+use PublicInbox::Hval qw(ascii_html to_filename);
  my %QP_MAP = ( A => 'oid_a', B => 'oid_b', a => 'path_a', b => 'path_b' );
  my $max_size = 1024 * 1024; # TODO: configurable
  my $enc_utf8 = find_encoding('UTF-8');
@@ -63,8 +74,18 @@ sub show ($$;$) {
                  return html_page($ctx, 500, \$log);
          }
  
-        if (index($$blob, "\0") >= 0) {
-                $log = "<pre>$oid $type $size bytes (binary)</pre>" . $log;
+        my $binary = index($$blob, "\0") >= 0;
+        if ($fn) {
+                my $h = [ 'Content-Length', $size, 'Content-Type' ];
+                push(@$h, ($binary ? 'application/octet-stream' : 'text/plain'));
+                return [ 200, $h, [ $$blob ]];
+        }
+
+        my $path = to_filename($di->{path_b} || $hints->{path_b} || 'blob');
+        my $raw_link = "(<a\nhref=_$path>raw</a>)";
+        if ($binary) {
+                $log = "<pre>$oid $type $size bytes (binary)" .
+                        " $raw_link</pre>" . $log;
                  return html_page($ctx, 200, \$log);
          }
  
@@ -73,13 +94,14 @@ sub show ($$;$) {
          my $pad = length($nl);
  
          # using some of the same CSS class names and ids as cgit
-        $log = "<pre>$oid $type $size bytes</pre><hr /><table\nclass=blob>".
+        $log = "<pre>$oid $type $size bytes $raw_link</pre>" .
+                "<hr /><table\nclass=blob>".
                  "<tr><td\nclass=linenumbers><pre>" . join('', map {
                          sprintf("<a id=n$_ href=#n$_>% ${pad}u</a>\n", $_)
                  } (1..$nl)) . '</pre></td>' .
                  '<td><pre> </pre></td>'. # pad for non-CSS users
                  "<td\nclass=lines><pre><code>" .  ascii_html($$blob) .
-                '</pre></td></tr></table>' . $log;
+                '</code></pre></td></tr></table>' . $log;
  
          html_page($ctx, 200, \$log);
  }