X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fsolver_git.t;h=d8942747f2106e082735b1ec9bdb2ad2761c34c0;hb=e28f33dc1b6e6a296946c0c58b43900c6cbd07f7;hp=6d4b93c714eb9cff5abaee31e192a869b78a6288;hpb=d41790d816a48c314a1443e1430d56366758ae0a;p=public-inbox.git
diff --git a/t/solver_git.t b/t/solver_git.t
index 6d4b93c7..d8942747 100644
--- a/t/solver_git.t
+++ b/t/solver_git.t
@@ -1,15 +1,17 @@
#!perl -w
-# Copyright (C) 2019-2021 all contributors
+# Copyright (C) all contributors
# License: AGPL-3.0+
use strict;
use v5.10.1;
use PublicInbox::TestCommon;
use Cwd qw(abs_path);
require_git(2.6);
-use Digest::SHA qw(sha1_hex);
+use PublicInbox::ContentHash qw(git_sha);
use PublicInbox::Spawn qw(popen_rd);
require_mods(qw(DBD::SQLite Search::Xapian Plack::Util));
-my $git_dir = xqx([qw(git rev-parse --git-dir)], undef, {2 => \(my $null)});
+my $rdr = { 2 => \(my $null) };
+my $git_dir = xqx([qw(git rev-parse --git-common-dir)], undef, $rdr);
+$git_dir = xqx([qw(git rev-parse --git-dir)], undef, $rdr) if $? != 0;
$? == 0 or plan skip_all => "$0 must be run from a git working tree";
chomp $git_dir;
@@ -17,45 +19,59 @@ chomp $git_dir;
$git_dir = abs_path($git_dir);
use_ok "PublicInbox::$_" for (qw(Inbox V2Writable Git SolverGit WWW));
+my $patch2 = eml_load 't/solve/0002-rename-with-modifications.patch';
+my $patch2_oid = git_sha(1, $patch2)->hexdigest;
my ($tmpdir, $for_destroy) = tmpdir();
my $ibx = create_inbox 'v2', version => 2,
indexlevel => 'medium', sub {
my ($im) = @_;
$im->add(eml_load 't/solve/0001-simple-mod.patch') or BAIL_OUT;
- $im->add(eml_load 't/solve/0002-rename-with-modifications.patch') or
- BAIL_OUT;
+ $im->add($patch2) or BAIL_OUT;
};
+my $md = "$tmpdir/md";
+File::Path::mkpath([map { $md.$_ } (qw(/ /cur /new /tmp))]);
+symlink(abs_path('t/solve/0001-simple-mod.patch'), "$md/cur/foo:2,") or
+ xbail "symlink: $!";
+
+my $v1_0_0_rev = '8a918a8523bc9904123460f85999d75f6d604916';
my $v1_0_0_tag = 'cb7c42b1e15577ed2215356a2bf925aef59cdd8d';
my $v1_0_0_tag_short = substr($v1_0_0_tag, 0, 16);
my $expect = '69df7d565d49fbaaeb0a067910f03dc22cd52bd0';
my $non_existent = 'ee5e32211bf62ab6531bdf39b84b6920d0b6775a';
-test_lei({tmpdir => $tmpdir}, sub {
+test_lei({tmpdir => "$tmpdir/blob"}, sub {
+ lei_ok('blob', '--mail', $patch2_oid, '-I', $ibx->{inboxdir},
+ \'--mail works for existing oid');
+ is($lei_out, $patch2->as_string, 'blob matches');
+ ok(!lei('blob', '--mail', '69df7d5', '-I', $ibx->{inboxdir}),
+ "--mail won't run solver");
+ like($lei_err, qr/\b69df7d5\b/, 'OID in error by git(1)');
+
lei_ok('blob', '69df7d5', '-I', $ibx->{inboxdir});
- is(sha1_hex("blob ".length($lei_out)."\0".$lei_out),
- $expect, 'blob contents output');
+ is(git_sha(1, \$lei_out)->hexdigest, $expect, 'blob contents output');
my $prev = $lei_out;
lei_ok(qw(blob --no-mail 69df7d5 -I), $ibx->{inboxdir});
is($lei_out, $prev, '--no-mail works');
ok(!lei(qw(blob -I), $ibx->{inboxdir}, $non_existent),
'non-existent blob fails');
+ my $abbrev = substr($non_existent, 0, 7);
+ like($lei_err, qr/could not find $abbrev/, 'failed abbreviation noted');
SKIP: {
skip '/.git exists', 1 if -e '/.git';
- require PublicInbox::OnDestroy;
- opendir my $dh, '.' or xbail "opendir: $!";
- my $end = PublicInbox::OnDestroy->new($$, sub {
- chdir $dh or xbail "chdir: $!";
- });
lei_ok(qw(-C / blob 69df7d5 -I), $ibx->{inboxdir},
"--git-dir=$git_dir");
is($lei_out, $prev, '--git-dir works');
ok(!lei(qw(-C / blob --no-cwd 69df7d5 -I), $ibx->{inboxdir}),
'--no-cwd works');
+ like($lei_err, qr/no --git-dir to try/,
+ 'lack of --git-dir noted');
ok(!lei(qw(-C / blob -I), $ibx->{inboxdir}, $non_existent),
'non-existent blob fails');
+ like($lei_err, qr/no --git-dir to try/,
+ 'lack of --git-dir noted');
}
# fallbacks
@@ -63,6 +79,70 @@ test_lei({tmpdir => $tmpdir}, sub {
lei_ok('blob', $v1_0_0_tag_short, '-I', $ibx->{inboxdir});
});
+test_lei({tmpdir => "$tmpdir/rediff"}, sub {
+ lei_ok(qw(rediff -q -U9 t/solve/0001-simple-mod.patch));
+ like($lei_out, qr!^\Q+++\E b/TODO\n@@ -103,9 \+103,11 @@!sm,
+ 'got more context with -U9');
+
+ my (undef, $re) = split(/\n\n/, $lei_out, 2);
+ $re =~ s/^/> /sgm;
+ substr($re, 0, 0, < \$re, %$lei_opt });
+ my $exp = <<'EOM';
+From: me@example.com
+Subject: Re: awesome advice
+
+EOM
+ like($lei_out, qr/\Q$exp\E/, '--drq preserved header');
+
+ # n.b. --drq can requote the attribution line ("So-and-so wrote:"),
+ # but it's probably not worth preventing...
+
+ $exp = <<'EOM';
+> ---
+> TODO | 2 ++
+> Ω | 5 --
+> 1 file changed, 2 insertions(+)
+>
+> diff --git a/TODO b/TODO
+> index 605013e4904baabecd4a0a55997aebd8e8477a8f..69df7d565d49fbaaeb0a067910f03dc22cd52bd0 100644
+> --- a/TODO
+> +++ b/TODO
+> @@ -96,16 +96,18 @@ all need to be considered for everything we introduce)
+EOM
+ $exp =~ s/^>$/> /sgm; # re-add trailing white space
+ like($lei_out, qr/\Q$exp\E/, '--drq diffstat + context');
+
+ lei_ok(qw(rediff -q --full-index -U9 t/solve/bare.patch));
+ $exp = <<'EOM';
+diff --git a/script/public-inbox-extindex b/script/public-inbox-extindex
+old mode 100644
+new mode 100755
+index 15ac20eb871bf47697377e58a27db23102a38fca..771486c425b315bae70fd8a82d62ab0331e0a827
+--- a/script/public-inbox-extindex
++++ b/script/public-inbox-extindex
+@@ -1,13 +1,12 @@
+ #!perl -w
+EOM
+ like($lei_out, qr/\Q$exp\E/,
+ 'preserve mode, regen header + context from -U0 patch');
+ is($lei_err, '', 'no warnings from bare patch');
+ my $e = { GIT_DIR => "$ENV{HOME}/.local/share/lei/store/ALL.git" };
+ my @x = xqx([qw(git cat-file --batch-all-objects --batch-check)], $e);
+ is_deeply(\@x, [], 'no objects stored') or diag explain(\@x);
+});
+
+test_lei({tmpdir => "$tmpdir/index-eml-only"}, sub {
+ lei_ok(qw(index), $md);
+ lei_ok(qw(blob 69df7d5)); # hits LeiSearch->smsg_eml -> lms->local_blob
+});
+
my $git = PublicInbox::Git->new($git_dir);
$ibx->{-repo_objs} = [ $git ];
my $res;
@@ -167,6 +247,8 @@ SKIP: {
my $cfgpath = "$tmpdir/httpd-config";
open my $cfgfh, '>', $cfgpath or die;
print $cfgfh <{-primary_address}
inboxdir = $ibx->{inboxdir}
@@ -210,26 +292,87 @@ EOF
while (my ($label, $size) = each %bin) {
$res = $cb->(GET("/$name/$oid{$label}/s/"));
is($res->code, 200, "$label binary file");
- ok(index($res->content, "blob $size bytes") >= 0,
+ ok(index($res->content,
+ "blob $oid{$label} $size bytes") >= 0,
"showed $label binary blob size");
$res = $cb->(GET("/$name/$oid{$label}/s/raw"));
is($res->code, 200, "$label raw binary download");
is($res->content, "\0" x $size,
"$label content matches");
}
+ my $utf8 = 'e022d3377fd2c50fd9931bf96394728958a90bf3';
+ $res = $cb->(GET("/$name/$utf8/s/"));
+ is($res->code, 200, 'shows commit w/ utf8.eml');
+ like($res->content, qr/Eléanor/,
+ 'UTF-8 commit shown properly');
+
+ # WwwCoderepo
+ my $olderr;
+ if (defined $ENV{PLACK_TEST_EXTERNALSERVER_URI}) {
+ ok(!-s "$tmpdir/stderr.log",
+ 'nothing in stderr.log, yet');
+ } else {
+ open $olderr, '>&', \*STDERR or xbail "open: $!";
+ open STDERR, '+>>', "$tmpdir/stderr.log" or
+ xbail "open: $!";
+ }
+ $res = $cb->(GET('/binfoo/'));
+ defined($ENV{PLACK_TEST_EXTERNALSERVER_URI}) or
+ open STDERR, '>&', $olderr or xbail "open: $!";
+ is($res->code, 200, 'coderepo summary (binfoo)');
+ if (ok(-s "$tmpdir/stderr.log")) {
+ open my $fh, '<', "$tmpdir/stderr.log" or xbail $!;
+ my $s = do { local $/; <$fh> };
+ open $fh, '>', "$tmpdir/stderr.log" or xbail $!;
+ ok($s =~ s/^fatal: your current branch.*?\n//sm,
+ 'got current branch warning');
+ ok($s =~ s/^.*? exit status=[1-9]+ .*?\n//sm,
+ 'got exit status warning');
+ is($s, '', 'no unexpected warnings on empty coderepo');
+ }
+ $res = $cb->(GET('/public-inbox/'));
+ is($res->code, 200, 'coderepo summary (public-inbox)');
+ $res = $cb->(GET('/public-inbox'));
+ is($res->code, 301, 'redirected');
+
+ my $fn = 'public-inbox-1.0.0.tar.gz';
+ $res = $cb->(GET("/public-inbox/snapshot/$fn"));
+ is($res->code, 200, 'tar.gz snapshot');
+ is($res->header('Content-Disposition'),
+ qq'inline; filename="$fn"', 'c-d header');
+ is($res->header('ETag'), qq'"$v1_0_0_rev"', 'etag header');
+ my $exp = xqx([qw(git archive --format=tar.gz
+ --prefix=public-inbox-1.0.0/ v1.0.0)],
+ { GIT_DIR => $git_dir });
+ my $got = $res->content;
+ is(length($got), length($exp),
+ "length matches installed `git archive' output") and
+ is(git_sha(1, \$got)->hexdigest, git_sha(1, \$exp)->hexdigest,
+ "content matches installed `git archive' output");
+
+ $fn = 'public-inbox-1.0.2.tar.gz';
+ $res = $cb->(GET("/public-inbox/snapshot/$fn"));
+ is($res->code, 404, '404 on non-existent tag');
+
+ $fn = 'public-inbox-1.0.0.tar.bz2';
+ $res = $cb->(GET("/public-inbox/snapshot/$fn"));
+ is($res->code, 404, '404 on unconfigured snapshot format');
};
test_psgi(sub { $www->call(@_) }, $client);
+ my $env = { PI_CONFIG => $cfgpath, TMPDIR => $tmpdir };
+ test_httpd($env, $client, 7, sub {
SKIP: {
- require_mods(qw(Plack::Test::ExternalServer), 7);
- my $env = { PI_CONFIG => $cfgpath };
- my $sock = tcp_server() or die;
- my ($out, $err) = map { "$tmpdir/std$_.log" } qw(out err);
- my $cmd = [ qw(-httpd -W0), "--stdout=$out", "--stderr=$err" ];
- my $td = start_script($cmd, $env, { 3 => $sock });
- my ($h, $p) = tcp_host_port($sock);
- local $ENV{PLACK_TEST_EXTERNALSERVER_URI} = "http://$h:$p";
- Plack::Test::ExternalServer::test_psgi(client => $client);
- }
+ require_cmd('curl', 1) or skip 'no curl', 1;
+ mkdir "$tmpdir/ext" // xbail "mkdir $!";
+ my $rurl = "$ENV{PLACK_TEST_EXTERNALSERVER_URI}/$name";
+ test_lei({tmpdir => "$tmpdir/ext"}, sub {
+ lei_ok(qw(blob --no-mail 69df7d5 -I), $rurl);
+ is(git_sha(1, \$lei_out)->hexdigest, $expect,
+ 'blob contents output');
+ ok(!lei(qw(blob -I), $rurl, $non_existent),
+ 'non-existent blob fails');
+ });
+ }});
}
done_testing();