fetch: support v2 w/o manifest on old WWW

[public-inbox.git] / t / solver_git.t

diff --git a/t/solver_git.t b/t/solver_git.t
index 6875e26b8f49311a1ac97bbcf60158be4ecd166b..d5f4c4a02758d4ad8de142f59ef3461c9b067997 100644 (file)
--- a/t/solver_git.t
+++ b/t/solver_git.t
@@ -7,8 +7,7 @@ use PublicInbox::TestCommon;
 use Cwd qw(abs_path);
 require_git(2.6);
 use PublicInbox::ContentHash qw(git_sha);
-use PublicInbox::Eml;
-use PublicInbox::Spawn qw(popen_rd which);
+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)});
 $? == 0 or plan skip_all => "$0 must be run from a git working tree";
@@ -28,26 +27,33 @@ my $ibx = create_inbox 'v2', version => 2,
        $im->add(eml_load 't/solve/0001-simple-mod.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_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(git_sha(1, PublicInbox::Eml->new($lei_out))->hexdigest,
-               $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';
                lei_ok(qw(-C / blob 69df7d5 -I), $ibx->{inboxdir},
@@ -56,9 +62,13 @@ test_lei({tmpdir => $tmpdir}, sub {
 
                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
@@ -66,6 +76,33 @@ 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');
+       lei_ok(qw(rediff -q -U9 t/solve/bare.patch));
+       my $exp = <<'EOM';
+diff --git a/script/public-inbox-extindex b/script/public-inbox-extindex
+old mode 100644
+new mode 100755
+index 15ac20eb..771486c4
+--- 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');
+       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;
@@ -233,14 +270,13 @@ EOF
                my $url = "http://$h:$p";
                local $ENV{PLACK_TEST_EXTERNALSERVER_URI} = $url;
                Plack::Test::ExternalServer::test_psgi(client => $client);
-               skip 'no curl', 1 unless which('curl');
+               require_cmd('curl', 1) or skip 'no curl', 1;
 
                mkdir "$tmpdir/ext" // xbail "mkdir $!";
                test_lei({tmpdir => "$tmpdir/ext"}, sub {
                        my $rurl = "$url/$name";
                        lei_ok(qw(blob --no-mail 69df7d5 -I), $rurl);
-                       my $eml = PublicInbox::Eml->new($lei_out);
-                       is(git_sha(1, $eml)->hexdigest, $expect,
+                       is(git_sha(1, \$lei_out)->hexdigest, $expect,
                                'blob contents output');
                        ok(!lei(qw(blob -I), $rurl, $non_existent),
                                        'non-existent blob fails');