import: init_bare: allow use as method, use in tests

[public-inbox.git] / lib / PublicInbox / Import.pm

diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index d8dc49b82f9494815b2d49e140560fbe2fbc41b7..351bc660e19b862424e474de545beba50d26719b 100644 (file)
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -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}++;
@@ -432,7 +441,8 @@ sub run_die ($;$$) {
 }
 
 sub init_bare {
-       my ($dir) = @_;
+       my ($dir) = @_; # or self
+       $dir = $dir->{git}->{git_dir} if ref($dir);
        my @cmd = (qw(git init --bare -q), $dir);
        run_die(\@cmd);
        # set a reasonable default: