view: s/threaded/nested/ in view

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

diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index 13671a4fa3313f79e3c4d53813ab1cb815ecb032..31dc769583bd32777e2d25e16de743fd507a65c0 100644 (file)
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -54,6 +54,8 @@ sub gfi_start {
        $self->{lockfh} = $lockfh;
        $self->{pid} = $pid;
        $self->{nchg} = 0;
+       binmode $out_w, ':raw' or die "binmode :raw failed: $!";
+       binmode $in_r, ':raw' or die "binmode :raw failed: $!";
        ($in_r, $out_w);
 }
 
@@ -187,15 +189,15 @@ sub add {
                print $w "reset $ref\n" or wfail;
        }
 
+       utf8::encode($email);
+       utf8::encode($name);
+       utf8::encode($subject);
        # quiet down wide character warnings:
-       binmode $w, ':utf8' or die "binmode :utf8 failed: $!";
        print $w "commit $ref\nmark :$commit\n",
                "author $name <$email> $date\n",
-               "committer $self->{ident} ", now2822(), "\n",
-               "data ", (bytes::length($subject) + 1), "\n",
+               "committer $self->{ident} ", now2822(), "\n" or wfail;
+       print $w "data ", (length($subject) + 1), "\n",
                $subject, "\n\n" or wfail;
-       binmode $w, ':raw' or die "binmode :raw failed: $!";
-
        if ($tip ne '') {
                print $w 'from ', ($parent ? $parent : $tip), "\n" or wfail;
        }