Decode commit objects correctly

Author: ilmari

.gitignore

@@ -12,6 +12,7 @@ t/checkout/*
 test-project-packs/*
 test-project-packs2/*
 test-project/*
+test-encoding/*
 MANIFEST
 *~
 

Makefile.PL

@@ -26,5 +26,6 @@ requires        'MooseX::Types::Path::Class' => '0';
 requires 'namespace::autoclean';
 
 test_requires   'Test::More'                 => '0.88';
+test_requires   'Test::utf8'                 => '0.02';
 
 WriteAll;

lib/Git/PurePerl/Object/Commit.pm

@@ -2,6 +2,7 @@ package Git::PurePerl::Object::Commit;
 use Moose;
 use MooseX::StrictConstructor;
 use Moose::Util::TypeConstraints;
+use Encode qw/decode/;
 use namespace::autoclean;
 
 extends 'Git::PurePerl::Object';
@@ -16,6 +17,7 @@ has 'committer' =>
     ( is => 'rw', isa => 'Git::PurePerl::Actor', required => 0 );
 has 'committed_time' => ( is => 'rw', isa => 'DateTime', required => 0 );
 has 'comment'        => ( is => 'rw', isa => 'Str',      required => 0 );
+has 'encoding'       => ( is => 'rw', isa => 'Str',      required => 0 );
 
 my %method_map = (
     'tree'      => 'tree_sha1',
@@ -28,27 +30,37 @@ sub BUILD {
     my $self = shift;
     return unless $self->content;
     my @lines = split "\n", $self->content;
+    my %header;
     while ( my $line = shift @lines ) {
         last unless $line;
         my ( $key, $value ) = split ' ', $line, 2;
-        if ( $key eq 'committer' or $key eq 'author' ) {
-            my @data = split ' ', $value;
-            my ( $email, $epoch, $tz ) = splice( @data, -3 );
-            $email = substr( $email, 1, -1 );
-            my $name = join ' ', @data;
-            my $actor
-                = Git::PurePerl::Actor->new( name => $name, email => $email );
-            $self->$key($actor);
-            $key = $method_map{$key};
-            my $dt
-                = DateTime->from_epoch( epoch => $epoch, time_zone => $tz );
-            $self->$key($dt);
-        } else {
-            $key = $method_map{$key} || $key;
-            $self->$key($value);
+        push @{$header{$key}}, $value;
+    }
+    $header{encoding}
+        ||= [ $self->git->config->get(key => "i18n.commitEncoding") || "utf-8" ];
+    my $encoding = $header{encoding}->[-1];
+    for my $key (keys %header) {
+        for my $value (@{$header{$key}}) {
+            $value = decode($encoding, $value);
+            if ( $key eq 'committer' or $key eq 'author' ) {
+                my @data = split ' ', $value;
+                my ( $email, $epoch, $tz ) = splice( @data, -3 );
+                $email = substr( $email, 1, -1 );
+                my $name = join ' ', @data;
+                my $actor
+                    = Git::PurePerl::Actor->new( name => $name, email => $email );
+                $self->$key($actor);
+                $key = $method_map{$key};
+                my $dt
+                    = DateTime->from_epoch( epoch => $epoch, time_zone => $tz );
+                $self->$key($dt);
+            } else {
+                $key = $method_map{$key} || $key;
+                $self->$key($value);
+            }
         }
     }
-    $self->comment( join "\n", @lines );
+    $self->comment( decode($encoding, join "\n", @lines) );
 }
 
 

t/00_setup.t

@@ -4,7 +4,7 @@ use warnings;
 use Test::More;
 use Archive::Extract;
 
-foreach my $name qw(test-project test-project-packs test-project-packs2) {
+foreach my $name qw(test-project test-project-packs test-project-packs2 test-encoding) {
     next if -d $name;
     my $ae = Archive::Extract->new( archive => "$name.tgz" );
     $ae->extract;

t/encoding.t

@@ -0,0 +1,23 @@
+#!perl
+use strict;
+use warnings;
+use Test::More;
+use Git::PurePerl;
+use Test::utf8;
+
+my $git = Git::PurePerl->new( directory => "test-encoding" );
+
+for ([$git->master, "utf-8", $git->master->parent, "iso-8859-1"]) {
+    my ($commit, $encoding) = @{$_};
+    is( $commit->encoding, $encoding );
+    for my $role (qw(author committer)) {
+        is_flagged_utf8( $commit->$role->name );
+        is_sane_utf8( $commit->$role->name );
+        is( $commit->author->name, "T\x{e9}st User" );
+    }
+    is_flagged_utf8( $commit->comment );
+    is_sane_utf8( $commit->comment );
+    is( $commit->comment, "Touch\x{e9}");
+}
+
+done_testing;