From: Eric Wong <e@80x24.org>
Date: Fri, 12 Aug 2016 22:08:50 +0000 (+0000)
Subject: watch: respect altid for incremental watch changes
X-Git-Tag: v1.0.0~237
X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=commitdiff_plain;h=4e6710183bc331020a406077a1873f2713973f07

watch: respect altid for incremental watch changes

We need to pass the Inbox object to SearchIdx to get altid
mappings properly for incremental imports.

TODO: use the Inbox object in more places where it makes sense
to do so.
---

diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index ff5b3f38..9555d27c 100644
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -12,12 +12,13 @@ use PublicInbox::Spawn qw(spawn);
 use PublicInbox::MID qw(mid_mime mid2path);
 
 sub new {
-	my ($class, $git, $name, $email) = @_;
+	my ($class, $git, $name, $email, $inbox) = @_;
 	bless {
 		git => $git,
 		ident => "$name <$email>",
 		mark => 1,
 		ref => 'refs/heads/master',
+		inbox => $inbox,
 	}, $class
 }
 
@@ -237,7 +238,8 @@ sub done {
 
 		eval {
 			require PublicInbox::SearchIdx;
-			my $s = PublicInbox::SearchIdx->new($git_dir);
+			my $inbox = $self->{inbox} || $git_dir;
+			my $s = PublicInbox::SearchIdx->new($inbox);
 			$s->index_sync({ ref => $self->{ref} });
 		};
 	}
diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index 145b3636..f34419a3 100644
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -214,7 +214,7 @@ sub _importer_for {
 		my $git = $inbox->git;
 		my $name = $inbox->{name};
 		my $addr = $inbox->{-primary_address};
-		PublicInbox::Import->new($git, $name, $addr);
+		PublicInbox::Import->new($git, $name, $addr, $inbox);
 	};
 	$self->{importers}->{"$im"} = $im;
 }