X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FGitalist%2FGit%2FObject.pm;h=7d46632b465268e1f51638d9e21cff1fb98633db;hb=96410fb53cae4b097d227548ef75600f5d8f19b4;hp=2daf3ec925c423c20a84eb979e18321d575c4ff9;hpb=4b59c2c514cda8914018f12051345e04132ae5b0;p=catagits%2FGitalist.git

diff --git a/lib/Gitalist/Git/Object.pm b/lib/Gitalist/Git/Object.pm
index 2daf3ec..7d46632 100644
--- a/lib/Gitalist/Git/Object.pm
+++ b/lib/Gitalist/Git/Object.pm
@@ -1,21 +1,12 @@
 use MooseX::Declare;
 use Moose::Autobox;
 
-class Gitalist::Git::Object {
+class Gitalist::Git::Object with Gitalist::Git::Serializable is dirty {
+    use MooseX::Storage::Meta::Attribute::Trait::DoNotSerialize;
+
     use MooseX::Types::Moose qw/Str Int Bool Maybe ArrayRef/;
     use MooseX::Types::Common::String qw/NonEmptySimpleStr/;
-
-    use Fcntl ':mode';
-    use constant {
-        S_IFINVALID => 0030000,
-        S_IFGITLINK => 0160000,
-    };
-
-    BEGIN {
-        no warnings;
-        *S_ISLNK = sub ($) {}
-            if $^O eq 'MSWin32';
-    }
+    use overload '""' => '_to_string', fallback => 1;
 
     # repository and sha1 are required initargs
     has repository => ( isa => 'Gitalist::Git::Repository',
@@ -43,12 +34,12 @@ class Gitalist::Git::Object {
                 lazy_build => 1 )
         for qw/modestr size/;
 
-    has _gpp_obj => ( isa => 'Git::PurePerl::Object',
-                      required => 1,
-                      is => 'ro',
+    has _gpp_obj => ( isa        => 'Git::PurePerl::Object',
+                      required   => 1,
+                      is         => 'ro',
                       lazy_build => 1,
-                      handles => [ 'content',
-                               ],
+                      handles    => [ 'content' ],
+                      traits     => ['DoNotSerialize']
                   );
 
     # objects can't determine their mode or filename
@@ -63,6 +54,9 @@ class Gitalist::Git::Object {
     method BUILD { $self->$_() for qw/_gpp_obj size modestr/ }
 
 ## Private methods
+    method _to_string {
+        return $self->sha1;
+    };
 
 ## Builders
     method _build__gpp_obj {
@@ -80,11 +74,16 @@ class Gitalist::Git::Object {
     }
 
     method _build_modestr {
-	# XXX The POSIX constants make win32 sad :(
         return _mode_str($self->mode);
     }
 
-    # via gitweb.pm
+    # via gitweb.pm circa line 1305
+    use Fcntl ':mode';
+    use constant {
+        S_IFINVALID => 0030000,
+        S_IFGITLINK => 0160000,
+    };
+
     # submodule/subrepository, a commit object reference
     sub S_ISGITLINK($) {
         return (($_[0] & S_IFMT) == S_IFGITLINK)
@@ -98,7 +97,7 @@ class Gitalist::Git::Object {
             return 'm---------';
         } elsif (S_ISDIR($mode & S_IFMT)) {
             return 'drwxr-xr-x';
-        } elsif (S_ISLNK($mode)) {
+        } elsif ($^O ne 'MSWin32' and S_ISLNK($mode)) { # this is ENOLINKS country, we can't stop here!
             return 'lrwxrwxrwx';
         } elsif (S_ISREG($mode)) {
             # git cares only about the executable bit