X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLeiMirror.pm;h=33cf55aba2536dfc0f3d298cea9a8849e42a0a06;hb=eb22c4833d455b655b42b492dfad7f2abfc83203;hp=04e5495561e1533b18e25835c46ddec77ebc689f;hpb=f707a4b4cf265bbef7bdf170d21289cb6ec9966c;p=public-inbox.git

diff --git a/lib/PublicInbox/LeiMirror.pm b/lib/PublicInbox/LeiMirror.pm
index 04e54955..33cf55ab 100644
--- a/lib/PublicInbox/LeiMirror.pm
+++ b/lib/PublicInbox/LeiMirror.pm
@@ -379,6 +379,7 @@ sub fgrp_fetch_all {
 	push(@fetch, "-j$j") if $j;
 	while (my ($osdir, $fgrpv) = each %$todo) {
 		my $f = "$osdir/config";
+		return if !keep_going($self);
 
 		# clobber group from previous run atomically
 		my $cmd = ['git', "--git-dir=$osdir", qw(config -f),
@@ -427,20 +428,9 @@ sub forkgroup_prep {
 	my $key = $self->{-key} // die 'BUG: no -key';
 	my $rn = substr(sha256_hex($key), 0, 16);
 	if (!-d $self->{cur_dst} && !$self->{dry_run}) {
-		my $alt = File::Spec->rel2abs("$dir/objects");
 		PublicInbox::Import::init_bare($self->{cur_dst});
-		my $o = "$self->{cur_dst}/objects";
-		my $f = "$o/info/alternates";
-		my $l = File::Spec->abs2rel($alt, File::Spec->rel2abs($o));
-		open my $fh, '+>>', $f or die "open($f): $!";
-		seek($fh, SEEK_SET, 0) or die "seek($f): $!";
-		chomp(my @cur = <$fh>);
-		if (!grep(/\A\Q$l\E\z/, @cur)) {
-			say $fh $l or die "say($f): $!";
-		}
-		close $fh or die "close($f): $!";
-		$f = "$self->{cur_dst}/config";
-		open $fh, '+>>', $f or die "open:($f): $!";
+		my $f = "$self->{cur_dst}/config";
+		open my $fh, '+>>', $f or die "open:($f): $!";
 		print $fh <<EOM or die "print($f): $!";
 ; rely on the "$rn" remote in the
 ; $fg fork group for fetches
@@ -452,6 +442,19 @@ sub forkgroup_prep {
 EOM
 		close $fh or die "close($f): $!";
 	}
+	if (!$self->{dry_run}) {
+		my $alt = File::Spec->rel2abs("$dir/objects");
+		my $o = "$self->{cur_dst}/objects";
+		my $f = "$o/info/alternates";
+		my $l = File::Spec->abs2rel($alt, File::Spec->rel2abs($o));
+		open my $fh, '+>>', $f or die "open($f): $!";
+		seek($fh, SEEK_SET, 0) or die "seek($f): $!";
+		chomp(my @cur = <$fh>);
+		if (!grep(/\A\Q$l\E\z/, @cur)) {
+			say $fh $l or die "say($f): $!";
+		}
+		close $fh or die "close($f): $!";
+	}
 	bless {
 		%$self, -osdir => $dir, -remote => $rn, -uri => $uri
 	}, __PACKAGE__;
@@ -990,6 +993,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) = @_;
@@ -1103,6 +1134,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);
 }
 
@@ -1123,14 +1155,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 = {};