From: Eric Wong <e@80x24.org>
To: spew@80x24.org
Subject: [PATCH 5/7] cindex: require `-g GIT_DIR' or `-r PROJECT_ROOT'
Date: Sun, 26 Nov 2023 14:19:31 +0000 [thread overview]
Message-ID: <20231126141933.593525-5-e@80x24.org> (raw)
In-Reply-To: <20231126141933.593525-1-e@80x24.org>
Accepting @ARGV without switches ends up being ambiguous with
optional parameters for --join and --show. Requiring users to
specify `--join=' or `--show=' is a bit awkward (as it with
-clone --objstore= and the like, but that may be historical).
---
Documentation/public-inbox-cindex.pod | 2 +-
script/public-inbox-cindex | 34 +++++++++++++++++----------
t/cindex-join.t | 2 +-
t/cindex.t | 9 +++----
4 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/Documentation/public-inbox-cindex.pod b/Documentation/public-inbox-cindex.pod
index 3ff394be..0c9c4bdb 100644
--- a/Documentation/public-inbox-cindex.pod
+++ b/Documentation/public-inbox-cindex.pod
@@ -4,7 +4,7 @@ public-inbox-cindex - create and update search for code repositories
=head1 SYNOPSIS
-public-inbox-cindex [OPTIONS] GIT_DIR...
+public-inbox-cindex [OPTIONS] -g GIT_DIR [-g GIT_DIR]
public-inbox-cindex [OPTIONS] --update
diff --git a/script/public-inbox-cindex b/script/public-inbox-cindex
index 97890c1b..d615a8ca 100755
--- a/script/public-inbox-cindex
+++ b/script/public-inbox-cindex
@@ -4,8 +4,8 @@
use v5.12;
use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
my $help = <<EOF; # the following should fit w/o scrolling in 80x24 term:
-usage: public-inbox-cindex [options] GIT_DIR...
-usage: public-inbox-cindex [options] --project-list=FILE PROJECT_ROOT
+usage: public-inbox-cindex [options] -g GIT_DIR...
+usage: public-inbox-cindex [options] --project-list=FILE -r PROJECT_ROOT
Create and update search indices for code repos
@@ -29,7 +29,8 @@ GetOptions($opt, qw(quiet|q verbose|v+ reindex jobs|j=i fsync|sync! dangerous
indexlevel|index-level|L=s join:s@
batch_size|batch-size=s max_size|max-size=s
include|I=s@ only=s@ all show:s@
- project-list=s exclude=s@
+ project-list=s exclude=s@ project-root|r=s
+ git-dir|g=s@
sort-parallel=s sort-compress-program=s sort-buffer-size=s
d=s update|u scan! prune dry-run|n C=s@ help|h))
or die $help;
@@ -50,23 +51,32 @@ PublicInbox::Admin::progress_prepare($opt);
my $env = PublicInbox::Admin::index_prepare($opt, $cfg);
%ENV = (%ENV, %$env) if $env;
-require PublicInbox::CodeSearchIdx; # unstable internal API
my @git_dirs;
+require PublicInbox::CodeSearchIdx; # unstable internal API
if (defined(my $pl = $opt->{'project-list'})) {
- my $pfx = shift @ARGV // die <<EOM;
+ my $pfx = $opt->{'project-root'} // die <<EOM;
PROJECTS_ROOT required for --project-list
EOM
- @ARGV and die <<EOM;
---project-list does not accept additional directories
-(@ARGV)
-beyond `$pfx'
+ $opt->{'git-dir'} and die <<EOM;
+--project-list does not accept additional --git-dir directories
+(@{$opt->{'git-dir'}})
EOM
open my $fh, '<', $pl or die "open($pl): $!\n";
chomp(@git_dirs = <$fh>);
- $_ = PublicInbox::Admin::resolve_git_dir("$pfx/$_") for @git_dirs;
-} else {
- @git_dirs = map { PublicInbox::Admin::resolve_git_dir($_) } @ARGV;
+ $pfx .= '/';
+ $pfx =~ tr!/!/!s;
+ substr($_, 0, 0, $pfx) for @git_dirs;
+} elsif (my $gd = $opt->{'git-dir'}) {
+ @git_dirs = @$gd;
+} elsif (@ARGV) {
+ my @g = map { "-g $_" } @ARGV;
+ die <<EOM;
+Specify git directories with `-g' (or --git-dir=): @g
+Or use --project-list=... and --project-root=...
+EOM
}
+
+$_ = PublicInbox::Admin::resolve_git_dir($_) for @git_dirs;
if (defined $cidx_dir) { # external index
die "`%' is not allowed in $cidx_dir\n" if $cidx_dir =~ /\%/;
my $cidx = PublicInbox::CodeSearchIdx->new($cidx_dir, $opt);
diff --git a/t/cindex-join.t b/t/cindex-join.t
index 2836eb6c..8d0b09d2 100644
--- a/t/cindex-join.t
+++ b/t/cindex-join.t
@@ -70,7 +70,7 @@ my $cidxdir = "$tmpdir/cidx";
my $rdr = { 1 => \my $cout, 2 => \my $cerr };
ok run_script([qw(-cindex -v --all --show=join_data),
'--join=aggressive,dt:..2022-12-01',
- '-d', $cidxdir, values %code ],
+ '-d', $cidxdir, map { ('-g', $_) } values %code ],
$env, $rdr), 'initial join inboxes w/ coderepos';
my $out = PublicInbox::Config->json->decode($cout);
is($out->{join_data}->{dt}->[0], '19700101'.'000000',
diff --git a/t/cindex.t b/t/cindex.t
index afcc226e..134df4ea 100644
--- a/t/cindex.t
+++ b/t/cindex.t
@@ -33,7 +33,7 @@ git gc -q
EOM
}; # /create_coderepo
-ok(run_script([qw(-cindex --dangerous -q), "$tmp/wt0"]), 'cindex internal');
+ok(run_script([qw(-cindex --dangerous -q -g), "$tmp/wt0"]), 'cindex internal');
{
my $exists = -e "$tmp/wt0/.git/public-inbox-cindex/cidx.lock";
my @st = stat(_);
@@ -67,13 +67,14 @@ git gc -q
EOM
}; # /create_coderepo
-ok(run_script([qw(-cindex --dangerous -q -d), "$tmp/ext", $zp, "$tmp/wt0"]),
+ok(run_script([qw(-cindex --dangerous -q -d), "$tmp/ext",
+ '-g', $zp, '-g', "$tmp/wt0" ]),
'cindex external');
ok(-e "$tmp/ext/cidx.lock", 'external dir created');
ok(!-d "$zp/.git/public-inbox-cindex", 'no cindex in original coderepo');
ok(run_script([qw(-cindex -L medium --dangerous -q -d),
- "$tmp/med", $zp, "$tmp/wt0"]), 'cindex external medium');
+ "$tmp/med", '-g', $zp, '-g', "$tmp/wt0"]), 'cindex external medium');
SKIP: {
@@ -228,7 +229,7 @@ SKIP: { # --prune
File::Path::remove_tree("$tmp/ext");
mkdir("$tmp/ext", 0707);
-ok(run_script([qw(-cindex --dangerous -q -d), "$tmp/ext", $zp]),
+ok(run_script([qw(-cindex --dangerous -q -d), "$tmp/ext", '-g', $zp]),
'external on existing dir');
{
my @st = stat("$tmp/ext/cidx.lock");
next prev parent reply other threads:[~2023-11-26 14:19 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-26 14:19 [PATCH 1/7] WIP-cidx-xh-split Eric Wong
2023-11-26 14:19 ` [PATCH 2/7] WIP-cidx Eric Wong
2023-11-26 14:19 ` [PATCH 3/7] hval: relative paths Eric Wong
2023-11-26 14:19 ` [PATCH 4/7] www_coderepo: load and use cindex join data Eric Wong
2023-11-26 14:19 ` Eric Wong [this message]
2023-11-26 14:19 ` [PATCH 6/7] git: speed up ->git_path for non-worktrees Eric Wong
2023-11-26 14:19 ` [PATCH 7/7] cindex: set -cfg_f field unconditionally for --show Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231126141933.593525-5-e@80x24.org \
--to=e@80x24.org \
--cc=spew@80x24.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).