diff options
author | Eric Wong <e@80x24.org> | 2022-11-28 05:32:31 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2022-11-28 23:39:00 +0000 |
commit | 556fb7af0e43c1183933d6afe451eb81296b802c (patch) | |
tree | 6629550e8a9502b4fc4c91d6cfa28a563a10c8f6 | |
parent | af4e0589aa6e29baadf9afd382c6da698395ec8e (diff) | |
download | public-inbox-556fb7af0e43c1183933d6afe451eb81296b802c.tar.gz |
grokmirror supports it, and we also support cgit, so this should make running mirrors easier. This will be useful for scripting purposes, too.
-rw-r--r-- | lib/PublicInbox/LeiMirror.pm | 39 | ||||
-rwxr-xr-x | script/public-inbox-clone | 4 |
2 files changed, 40 insertions, 3 deletions
diff --git a/lib/PublicInbox/LeiMirror.pm b/lib/PublicInbox/LeiMirror.pm index 0508c9a8..d4b14699 100644 --- a/lib/PublicInbox/LeiMirror.pm +++ b/lib/PublicInbox/LeiMirror.pm @@ -991,6 +991,34 @@ sub dump_manifest ($$) { utime($mtime, $mtime, "$ft") or die "utime(..., $ft): $!"; } +sub dump_project_list ($$) { + my ($self, $m) = @_; + my $f = $self->{'-project-list'} // return; + my $old = PublicInbox::Git::try_cat($f); + my %new; + + open my $dh, '<', '.' or die "open(.): $!"; + chdir($self->{dst}) or die "chdir($self->{dst}): $!"; + my @local = grep { -e $_ ? ($new{$_} = undef) : 1 } split(/\n/s, $old); + chdir($dh) or die "chdir(restore): $!"; + + $new{substr($_, 1)} = 1 for keys %$m; # drop leading '/' + my @list = sort keys %new; + my @remote = grep { !defined($new{$_}) } @list; + + warn <<EOM if @remote; +The following local repositories are ignored/gone from $self->{src}: +EOM + warn "\t", $_, "\n" for @remote; + warn <<EOM if @local; +The following repos in $f no longer exist on the filesystem: +EOM + warn "\t", $_, "\n" for @local; + + my (undef, $dn, $bn) = File::Spec->splitpath($f); + atomic_write($dn, $bn, join("\n", @list, '')); +} + # FIXME: this gets confused by single inbox instance w/ global manifest.js.gz sub try_manifest { my ($self) = @_; @@ -1104,6 +1132,7 @@ EOM warn(<<EOM, map { ("\t", $_, "\n") } @$bad) if $bad; W: The following exist and have not been converted to symlinks EOM + dump_project_list($self, $m); ft_rename($ft, $manifest, 0666); } @@ -1124,14 +1153,18 @@ sub do_mirror { # via wq_io_do or public-inbox-clone $ic =~ /\A(?:v1|v2|always|never)\z/s or die <<""; --inbox-config must be one of `always', `v2', `v1', or `never' - # we support --objstore= and --manifest= with '' (empty string) - for my $default (qw(objstore manifest.js.gz)) { - my ($k) = (split(/\./, $default))[0]; + # we support these switches with '' (empty string). + # defaults match example conf distributed with grokmirror + my @pairs = qw(objstore objstore manifest manifest.js.gz + project-list projects.list); + while (@pairs) { + my ($k, $default) = splice(@pairs, 0, 2); my $v = $lei->{opt}->{$k} // next; $v = $default if $v eq ''; $v = "$self->{dst}/$v" if $v !~ m!\A\.{0,2}/!; $self->{"-$k"} = $v; } + local $LIVE = {}; local $TODO = {}; local $FGRP_TODO = {}; diff --git a/script/public-inbox-clone b/script/public-inbox-clone index efe0cff6..677c56c8 100755 --- a/script/public-inbox-clone +++ b/script/public-inbox-clone @@ -22,8 +22,12 @@ options: --quiet | -q increase verbosity (may be repeated) -C DIR chdir to specified directory EOF + +# cgit calls it `project-list', grokmirror calls it `projectslist', +# support both :/ GetOptions($opt, qw(help|h quiet|q verbose|v+ C=s@ c=s@ include|I=s@ exclude=s@ inbox-config=s inbox-version=i objstore=s manifest=s + project-list|projectslist=s prune|p keep-going|k dry-run|n jobs|j=i no-torsocks torsocks=s epoch=s)) or die $help; if ($opt->{help}) { print $help; exit }; |