-# Copyright (C) 2015-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2021 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
use strict;
-use warnings;
use Test::More;
use PublicInbox::TestCommon;
my ($dir, $for_destroy) = tmpdir();
-use PublicInbox::Spawn qw(popen_rd);
use PublicInbox::Import;
-
-use_ok 'PublicInbox::Git';
+use POSIX qw(strftime);
+use PublicInbox::Git;
{
- PublicInbox::Import::init_bare($dir);
+ PublicInbox::Import::init_bare($dir, 'master');
my $fi_data = './t/git.fast-import-data';
open my $fh, '<', $fi_data or die
"fast-import data readable (or run test at top level: $!";
xsys([qw(git fast-import --quiet)], { GIT_DIR => $dir }, $rdr);
is($?, 0, 'fast-import succeeded');
}
+{
+ my $git = PublicInbox::Git->new("$dir/foo.git");
+ my $nick = $git->local_nick; # internal sub
+ unlike($nick, qr/\.git\.git\z/, "no doubled `.git.git' suffix");
+ like($nick, qr/\.git\z/, "one `.git' suffix");
+ $git = PublicInbox::Git->new($dir);
+ $nick = $git->local_nick; # internal sub
+ like($nick, qr/\.git\z/, "local nick always adds `.git' suffix");
+ my @s = $git->date_parse('1970-01-01T00:00:00Z');
+ is($s[0], 0, 'parsed epoch');
+ local $ENV{TZ} = 'UTC';
+ @s = $git->date_parse('1993-10-02 01:02:09', '2010-10-02 01:03:04');
+ is(strftime('%Y-%m-%dT%H:%M:%SZ', gmtime($s[0])),
+ '1993-10-02T01:02:09Z', 'round trips');
+ is(strftime('%Y-%m-%dT%H:%M:%SZ', gmtime($s[1])),
+ '2010-10-02T01:03:04Z', '2nd arg round trips');
+ @s = $git->date_parse('1993-10-02');
+ is(strftime('%Y-%m-%d', gmtime($s[0])), '1993-10-02',
+ 'round trips date-only');
+}
{
my $gcf = PublicInbox::Git->new($dir);
my ($bref, $oid_hex, $type, $size, $arg) = @_;
$missing = [ @_ ];
}, $arg);
- $gcf->cat_async_wait;
+ $gcf->async_wait_all;
my ($bref, $oid_hex, $type, $size, $arg_res) = @$res;
is_deeply([$oid_hex, $type, $size], \@x, 'got expected header');
is($arg_res, $arg, 'arg passed to cat_async');
is_deeply($raw, $bref, 'blob result matches');
- is_deeply($missing, [ undef, undef, undef, undef, $arg],
+ is_deeply($missing, [ undef, 'non-existent', 'missing', undef, $arg],
'non-existent blob gives expected result');
+
+ $res = [];
+ $gcf->cat_async($oid, sub { push @$res, \@_ });
+ $gcf->cat_async($oid, sub { die 'HI' });
+ $gcf->cat_async($oid, sub { push @$res, \@_ });
+ eval { $gcf->async_wait_all };
+ like($@, qr/\bHI\b/, 'die in callback propagates');
+ is(scalar(@$res), 2, 'two results');
+ is_deeply($res->[0], [ $raw, @x, undef ], '1st cb result');
+ is_deeply($res->[1], [ undef, $oid, undef, undef, undef ],
+ '2nd cb aborted ');
+
+ my @w;
+ local $PublicInbox::Git::async_warn = 1;
+ local $SIG{__WARN__} = sub { push @w, @_ };
+ $res = [];
+ $gcf->cat_async($oid, sub { push @$res, \@_ });
+ $gcf->cat_async($oid, sub { die 'HI' });
+ $gcf->cat_async($oid, sub { push @$res, \@_ });
+ eval { $gcf->async_wait_all };
+ is(scalar(@$res), 2, 'two results');
+ is_deeply($res->[0], [ $raw, @x, undef ], '1st cb result');
+ is_deeply($res->[1], [ $raw, @x, undef ], '2st cb result');
+ like("@w", qr/\bHI\b/, 'die turned to warning');
}
if (1) {
chomp $buf;
my $gcf = PublicInbox::Git->new($dir);
- my $rsize;
- my $x = $gcf->cat_file($buf, \$rsize);
- is($rsize, $size, 'got correct size ref on big file');
- is(length($$x), $size, 'read correct number of bytes');
+ my @x = $gcf->cat_file($buf);
+ is($x[2], 'blob', 'got blob on wantarray');
+ is($x[3], $size, 'got correct size ref on big file');
+ is(length(${$x[0]}), $size, 'read correct number of bytes');
my $ref = $gcf->qx(qw(cat-file blob), $buf);
+ is($?, 0, 'no error on scalar success');
my @ref = $gcf->qx(qw(cat-file blob), $buf);
+ is($?, 0, 'no error on wantarray success');
my $nl = scalar @ref;
ok($nl > 1, "qx returned array length of $nl");
+ is(join('', @ref), $ref, 'qx array and scalar context both work');
$gcf->qx(qw(repack -adq));
ok($gcf->packed_bytes > 0, 'packed size is positive');
+ my $rdr;
+ open $rdr->{2}, '+>', '/dev/null' or xbail "open $!";
+ $gcf->qx([qw(rev-parse --verify bogus)], undef, $rdr);
+ isnt($?, 0, '$? set on failure: '.$?);
}
-if ('alternates reloaded') {
+SKIP: {
+ require_git(2.6, 7) or skip('need git 2.6+ for --batch-all-objects', 7);
my ($alt, $alt_obj) = tmpdir();
- my @cmd = ('git', "--git-dir=$alt", qw(hash-object -w --stdin));
+ my $hash_obj = [ 'git', "--git-dir=$alt", qw(hash-object -w --stdin) ];
PublicInbox::Import::init_bare($alt);
open my $fh, '<', "$alt/config" or die "open failed: $!\n";
- my $rd = popen_rd(\@cmd, {}, { 0 => $fh } );
- close $fh or die "close failed: $!";
- chomp(my $remote = <$rd>);
+ chomp(my $remote = xqx($hash_obj, undef, { 0 => $fh }));
my $gcf = PublicInbox::Git->new($dir);
is($gcf->cat_file($remote), undef, "remote file not found");
open $fh, '>>', "$dir/objects/info/alternates" or
die "open failed: $!\n";
- print $fh "$alt/objects" or die "print failed: $!\n";
+ print $fh "$alt/objects\n" or die "print failed: $!\n";
close $fh or die "close failed: $!";
my $found = $gcf->cat_file($remote);
open $fh, '<', "$alt/config" or die "open failed: $!\n";
my $config = eval { local $/; <$fh> };
is($$found, $config, 'alternates reloaded');
+ # with the async interface
+ my ($async_alt, $async_dir_obj) = tmpdir();
+ PublicInbox::Import::init_bare($async_alt);
+ my @exist = map { chomp; [ split / / ] } (xqx(['git', "--git-dir=$dir",
+ qw(cat-file --batch-all-objects --batch-check)]));
+ my $results = [];
+ my $cb = sub {
+ my ($bref, $oid, $type, $size) = @_;
+ push @$results, [ $oid, $type, $size ];
+ };
+ for my $i (0..5) {
+ $gcf->cat_async($exist[$i]->[0], $cb, $results);
+ next if $i != 3;
+
+ # stick a new alternate into a running async pipeline
+ $hash_obj->[1] = "--git-dir=$async_alt";
+ $remote = xqx($hash_obj, undef, { 0 => \'async' });
+ chomp $remote;
+ open $fh, '>>', "$dir/objects/info/alternates" or
+ die "open failed: $!\n";
+ print $fh "$async_alt/objects\n" or die "print failed: $!\n";
+ close $fh or die "close failed: $!";
+ # trigger cat_async_retry:
+ $gcf->cat_async($remote, $cb, $results);
+ }
+ $gcf->async_wait_all;
+ my $expect = [ @exist[0..3], [ $remote, 'blob', 5 ], @exist[4..5] ];
+ is_deeply($results, $expect, 'got expected results');
+
ok(!$gcf->cleanup, 'cleanup can expire');
ok(!$gcf->cleanup, 'cleanup idempotent');
is(git_quote($s = "hello\"world"), '"hello\"world"', 'quoted dq');
is(git_quote($s = "hello\\world"), '"hello\\\\world"', 'quoted backslash');
is(git_quote($s = "hello\nworld"), '"hello\\nworld"', 'quoted LF');
+is(git_quote($s = "hello\x06world"), '"hello\\006world"', 'quoted \\x06');
+is(git_unquote($s = '"hello\\006world"'), "hello\x06world", 'unquoted \\x06');
done_testing();