X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FImport.pm;h=95d654f667221711de6897ffd632b197bd6d10cf;hb=6ae5319be740b48370f32fe043d112bf09dd18da;hp=d279fea1a43f25a823cd168801cc82bc24034e13;hpb=c5c709dcef1b5904467ff2aea3943f00a891dade;p=public-inbox.git

diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index d279fea1..95d654f6 100644
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # git fast-import-based ssoma-mda MDA replacement
@@ -274,8 +274,8 @@ sub git_timestamp {
 	"$ts $zone";
 }
 
-sub extract_cmt_info ($) {
-	my ($mime) = @_;
+sub extract_cmt_info ($;$) {
+	my ($mime, $smsg) = @_;
 
 	my $sender = '';
 	my $from = $mime->header('From');
@@ -293,6 +293,10 @@ sub extract_cmt_info ($) {
 		}
 	}
 	if (defined $email) {
+		# Email::Address::XS may leave quoted '<' in addresses,
+		# which git-fast-import doesn't like
+		$email =~ tr/<>//d;
+
 		# quiet down wide character warnings with utf8::encode
 		utf8::encode($email);
 	} else {
@@ -321,6 +325,10 @@ sub extract_cmt_info ($) {
 	utf8::encode($subject);
 	my $at = git_timestamp(my @at = msg_datestamp($hdr));
 	my $ct = git_timestamp(my @ct = msg_timestamp($hdr));
+	if ($smsg) {
+		$smsg->{ds} = $at[0];
+		$smsg->{ts} = $ct[0];
+	}
 	($name, $email, $at, $ct, $subject);
 }
 
@@ -366,9 +374,9 @@ sub clean_tree_v2 ($$$) {
 # returns undef on duplicate
 # returns the :MARK of the most recent commit
 sub add {
-	my ($self, $mime, $check_cb) = @_; # mime = Email::MIME
+	my ($self, $mime, $check_cb, $smsg) = @_; # mime = Email::MIME
 
-	my ($name, $email, $at, $ct, $subject) = extract_cmt_info($mime);
+	my ($name, $email, $at, $ct, $subject) = extract_cmt_info($mime, $smsg);
 	my $path_type = $self->{path_type};
 	my $path;
 	if ($path_type eq '2/38') {
@@ -398,9 +406,10 @@ sub add {
 	print $w $raw_email, "\n" or wfail;
 
 	# v2: we need this for Xapian
-	if ($self->{want_object_info}) {
-		my $oid = $self->get_mark(":$blob");
-		$self->{last_object} = [ $oid, $n, \$raw_email ];
+	if ($smsg) {
+		$smsg->{blob} = $self->get_mark(":$blob");
+		$smsg->{bytes} = $n;
+		$smsg->{-raw_email} = \$raw_email;
 	}
 	my $ref = $self->{ref};
 	my $commit = $self->{mark}++;
@@ -431,14 +440,31 @@ sub run_die ($;$$) {
 	$? == 0 or die join(' ', @$cmd) . " failed: $?\n";
 }
 
+my @INIT_FILES = ('HEAD' => "ref: refs/heads/master\n",
+		'description' => <<EOD,
+Unnamed repository; edit this file 'description' to name the repository.
+EOD
+		'config' => <<EOC);
+[core]
+	repositoryFormatVersion = 0
+	filemode = true
+	bare = true
+[repack]
+	writeBitmaps = true
+EOC
+
 sub init_bare {
-	my ($dir) = @_;
-	my @cmd = (qw(git init --bare -q), $dir);
-	run_die(\@cmd);
-	# set a reasonable default:
-	@cmd = (qw/git config/, "--file=$dir/config",
-		'repack.writeBitmaps', 'true');
-	run_die(\@cmd);
+	my ($dir) = @_; # or self
+	$dir = $dir->{git}->{git_dir} if ref($dir);
+	require File::Path;
+	File::Path::mkpath([ map { "$dir/$_" } qw(objects/info refs/heads) ]);
+	for (my $i = 0; $i < @INIT_FILES; $i++) {
+		my $f = $dir.'/'.$INIT_FILES[$i++];
+		next if -f $f;
+		open my $fh, '>', $f or die "open $f: $!";
+		print $fh $INIT_FILES[$i] or die "print $f: $!";
+		close $fh or die "close $f: $!";
+	}
 }
 
 sub done {