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

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

diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index 9676086f648d4482d548640d7bc17c01144caff3..a0b934a312d508cba5175eb439eaa1841358f936 100644 (file)
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -13,7 +13,7 @@ use POSIX qw(dup2);
 require IO::Handle;
 use PublicInbox::Spawn qw(spawn popen_rd);
 use base qw(Exporter);
-our @EXPORT_OK = qw(git_unquote);
+our @EXPORT_OK = qw(git_unquote git_quote);
 
 my %GIT_ESC = (
        a => "\a",
@@ -26,6 +26,8 @@ my %GIT_ESC = (
        '"' => '"',
        '\\' => '\\',
 );
+my %ESC_GIT = map { $GIT_ESC{$_} => $_ } keys %GIT_ESC;
+
 
 # unquote pathnames used by git, see quote.c::unquote_c_style.c in git.git
 sub git_unquote ($) {
@@ -36,6 +38,14 @@ sub git_unquote ($) {
        $_[0];
 }
 
+sub git_quote ($) {
+       if ($_[0] =~ s/([\\"\a\b\f\n\r\t\013]|[^[:print:]])/
+                     '\\'.($ESC_GIT{$1}||sprintf("%0o",ord($1)))/egs) {
+               return qq{"$_[0]"};
+       }
+       $_[0];
+}
+
 sub new {
        my ($class, $git_dir) = @_;
        my @st;
@@ -54,9 +64,25 @@ sub alternates_changed {
        $self->{st} = \@st;
 }
 
+sub last_check_err {
+       my ($self) = @_;
+       my $fh = $self->{err_c} or return;
+       sysseek($fh, 0, 0) or fail($self, "sysseek failed: $!");
+       defined(sysread($fh, my $buf, -s $fh)) or
+                       fail($self, "sysread failed: $!");
+       $buf;
+}
+
 sub _bidi_pipe {
-       my ($self, $batch, $in, $out, $pid) = @_;
-       return if $self->{$pid};
+       my ($self, $batch, $in, $out, $pid, $err) = @_;
+       if ($self->{$pid}) {
+               if (defined $err) { # "err_c"
+                       my $fh = $self->{$err};
+                       sysseek($fh, 0, 0) or fail($self, "sysseek failed: $!");
+                       truncate($fh, 0) or fail($self, "truncate failed: $!");
+               }
+               return;
+       }
        my ($in_r, $in_w, $out_r, $out_w);
 
        pipe($in_r, $in_w) or fail($self, "pipe failed: $!");
@@ -66,8 +92,14 @@ sub _bidi_pipe {
                fcntl($in_w, 1031, 4096) if $batch eq '--batch-check';
        }
 
-       my @cmd = ('git', "--git-dir=$self->{git_dir}", qw(cat-file), $batch);
+       my @cmd = (qw(git), "--git-dir=$self->{git_dir}",
+                       qw(-c core.abbrev=40 cat-file), $batch);
        my $redir = { 0 => fileno($out_r), 1 => fileno($in_w) };
+       if ($err) {
+               open(my $fh, '+>', undef) or fail($self, "open.err failed: $!");
+               $self->{$err} = $fh;
+               $redir->{2} = fileno($fh);
+       }
        my $p = spawn(\@cmd, undef, $redir);
        defined $p or fail($self, "spawn failed: $!");
        $self->{$pid} = $p;
@@ -142,12 +174,25 @@ sub batch_prepare ($) { _bidi_pipe($_[0], qw(--batch in out pid)) }
 
 sub check {
        my ($self, $obj) = @_;
-       $self->_bidi_pipe(qw(--batch-check in_c out_c pid_c));
+       _bidi_pipe($self, qw(--batch-check in_c out_c pid_c err_c));
        $self->{out_c}->print($obj, "\n") or fail($self, "write error: $!");
        local $/ = "\n";
        chomp(my $line = $self->{in_c}->getline);
        my ($hex, $type, $size) = split(' ', $line);
-       return if $type eq 'missing';
+
+       # Future versions of git.git may show 'ambiguous', but for now,
+       # we must handle 'dangling' below (and maybe some other oddball
+       # stuff):
+       # https://public-inbox.org/git/20190118033845.s2vlrb3wd3m2jfzu@dcvr/T/
+       return if $type eq 'missing' || $type eq 'ambiguous';
+
+       if ($hex eq 'dangling' || $hex eq 'notdir' || $hex eq 'loop') {
+               $size = $type + length("\n");
+               my $r = read($self->{in_c}, my $buf, $size);
+               defined($r) or fail($self, "read failed: $!");
+               return;
+       }
+
        ($hex, $type, $size);
 }
 
@@ -202,19 +247,33 @@ sub packed_bytes {
 
 sub DESTROY { cleanup(@_) }
 
+sub local_nick ($) {
+       my ($self) = @_;
+       my $ret = '???';
+       # don't show full FS path, basename should be OK:
+       if ($self->{git_dir} =~ m!/([^/]+)(?:/\.git)?\z!) {
+               $ret = "/path/to/$1";
+       }
+       wantarray ? ($ret) : $ret;
+}
+
 # show the blob URL for cgit/gitweb/whatever
 sub src_blob_url {
        my ($self, $oid) = @_;
-       # blob_fmt = "https://example.com/foo.git/blob/%s"
-       if (my $bfu = $self->{blob_fmt_url}) {
-               return sprintf($bfu, $oid);
+       # blob_url_format = "https://example.com/foo.git/blob/%s"
+       if (my $bfu = $self->{blob_url_format}) {
+               return map { sprintf($_, $oid) } @$bfu if wantarray;
+               return sprintf($bfu->[0], $oid);
        }
+       local_nick($self);
+}
 
-       # don't show full FS path, basename should be OK:
-       if ($self->{git_dir} =~ m!/([^/]+)\z!) {
-               return "/path/to/$1";
+sub pub_urls {
+       my ($self) = @_;
+       if (my $urls = $self->{cgit_url}) {
+               return @$urls;
        }
-       '???';
+       local_nick($self);
 }
 
 1;