X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fgit.t;h=d8957e422fd31083815fa46f6df9dfd166fc0d5b;hb=115d59641bda19405a3ed82dc72e129f9196fad5;hp=2cfff248a01e6f51a3d838c01e9d17c3cff793a1;hpb=0c8106d44f317175e122744b43407bf067183175;p=public-inbox.git
diff --git a/t/git.t b/t/git.t
index 2cfff248..d8957e42 100644
--- a/t/git.t
+++ b/t/git.t
@@ -1,17 +1,15 @@
-# Copyright (C) 2015-2020 all contributors
+# Copyright (C) all contributors
# License: AGPL-3.0+
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: $!";
@@ -19,6 +17,26 @@ use_ok 'PublicInbox::Git';
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);
@@ -26,7 +44,7 @@ use_ok 'PublicInbox::Git';
my $f = 'HEAD:foo.txt';
my @x = $gcf->check($f);
is(scalar @x, 3, 'returned 3 element array for existing file');
- like($x[0], qr/\A[a-f0-9]{40}\z/, 'returns obj ID in 1st element');
+ like($x[0], qr/\A[a-f0-9]{40,64}\z/, 'returns obj ID in 1st element');
is('blob', $x[1], 'returns obj type in 2nd element');
like($x[2], qr/\A\d+\z/, 'returns obj size in 3rd element');
@@ -48,13 +66,37 @@ use_ok 'PublicInbox::Git';
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, '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) {
@@ -70,10 +112,10 @@ 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');
@@ -85,8 +127,10 @@ if (1) {
$gcf->qx(qw(repack -adq));
ok($gcf->packed_bytes > 0, 'packed size is positive');
- $gcf->qx(qw(rev-parse --verify bogus));
- isnt($?, 0, '$? set on failure'.$?);
+ my $rdr;
+ open $rdr->{2}, '+>', '/dev/null' or xbail "open $!";
+ $gcf->qx([qw(rev-parse --verify bogus)], undef, $rdr);
+ isnt($?, 0, '$? set on failure: '.$?);
}
SKIP: {
@@ -132,7 +176,7 @@ SKIP: {
# trigger cat_async_retry:
$gcf->cat_async($remote, $cb, $results);
}
- $gcf->cat_async_wait;
+ $gcf->async_wait_all;
my $expect = [ @exist[0..3], [ $remote, 'blob', 5 ], @exist[4..5] ];
is_deeply($results, $expect, 'got expected results');
@@ -155,5 +199,7 @@ is(git_quote($s = "Eléanor"), '"El\\303\\251anor"', 'quoted octal');
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();