From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id C298F1F9E5 for ; Wed, 5 May 2021 10:46:39 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 2/2] lei blob: support "lei index"-ed mail Date: Wed, 5 May 2021 10:46:38 +0000 Message-Id: <20210505104638.68435-3-e@80x24.org> In-Reply-To: <20210505104638.68435-1-e@80x24.org> References: <20210505104638.68435-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Normal git retrieval don't work for Maildir blobs indexed using "lei index". Fortunately, this oddness is limited to the LeiStore class and we can override smsg_eml with a fallback to read blobs from Maildirs. --- lib/PublicInbox/LeiSearch.pm | 10 ++++++++++ t/solver_git.t | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/lib/PublicInbox/LeiSearch.pm b/lib/PublicInbox/LeiSearch.pm index cd28a700..c2b12146 100644 --- a/lib/PublicInbox/LeiSearch.pm +++ b/lib/PublicInbox/LeiSearch.pm @@ -144,4 +144,14 @@ sub lms { -f $f ? PublicInbox::LeiMailSync->new($f) : undef; } +# allow SolverGit->resolve_patch to work with "lei index" +sub smsg_eml { + my ($self, $smsg) = @_; + PublicInbox::Inbox::smsg_eml($self, $smsg) // do { + my $lms = lms($self); + my $bref = $lms ? $lms->local_blob($smsg->{blob}, 1) : undef; + $bref ? PublicInbox::Eml->new($bref) : undef; + }; +} + 1; diff --git a/t/solver_git.t b/t/solver_git.t index e566efb3..44cbbfdb 100644 --- a/t/solver_git.t +++ b/t/solver_git.t @@ -27,6 +27,11 @@ 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'; @@ -70,6 +75,11 @@ test_lei({tmpdir => "$tmpdir/rediff"}, sub { 'got more context with -U9'); }); +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;