X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FGitalist%2FModel%2FGit.pm;h=4579f60945c269bccd8606aa08b7653dde62e014;hb=f71a83ab3d5ff95644bff1d0d72a161d7b10d5d4;hp=67e7294b5d8f43db3ea98fe76cbc1ba4d545010e;hpb=37997f11859dc8531624c23817ec7b50409cba2e;p=catagits%2FGitalist.git diff --git a/lib/Gitalist/Model/Git.pm b/lib/Gitalist/Model/Git.pm index 67e7294..4579f60 100644 --- a/lib/Gitalist/Model/Git.pm +++ b/lib/Gitalist/Model/Git.pm @@ -2,22 +2,13 @@ package Gitalist::Model::Git; use Moose; use namespace::autoclean; +use MooseX::Types::Common::String qw/NonEmptySimpleStr/; +use Moose::Autobox; extends 'Catalyst::Model'; with 'Catalyst::Component::InstancePerContext'; -use DateTime; -use Path::Class; -use File::Which; -use Carp qw/croak/; -use File::Find::Rule; -use DateTime::Format::Mail; -use File::Stat::ModeString; -use List::MoreUtils qw/any/; -use Scalar::Util qw/blessed/; -use MooseX::Types::Common::String qw/NonEmptySimpleStr/; # FIXME, use Types::Path::Class and coerce - -use Git::PurePerl; +has repo_dir => ( is => 'ro', required => 1, isa => NonEmptySimpleStr ); =head1 NAME @@ -31,27 +22,53 @@ Gitalist::Model::Git - the model for git interactions =cut +use Git::PurePerl; +use Path::Class qw/dir/; +sub build_per_context_instance { + my ( $self, $c ) = @_; + + my $app = blessed($c) || $c; + my $model = Git::Repos->new( + project => ([$c->req->parameters->{p} || '/']->flatten)[0], + repo_dir => $self->repo_dir, + ); + + # This is fugly as fuck. Move Git::PurePerl construction into attribute builders.. + my ($pd, $gd) = $model->project_dir( $model->project )->resolve =~ m{((.+?)(:?/\/\.git)?$)}; + $gd .= '/.git' if ($gd !~ /\.git$/ and -d "$gd/.git"); + $model->gpp( Git::PurePerl->new(gitdir => $gd, directory => $pd) ); + + return $model; +} + +package Git::Repos; # Better name? Split out into own file once we have a sane name. +use Moose; +use namespace::autoclean; +use DateTime; +use Path::Class; +use File::Which; +use Carp qw/croak/; +use File::Find::Rule; +use DateTime::Format::Mail; +use File::Stat::ModeString; +use List::MoreUtils qw/any zip/; +use MooseX::Types::Common::String qw/NonEmptySimpleStr/; # FIXME, use Types::Path::Class and coerce + +use Git::PurePerl; + # Should these live in a separate module? Or perhaps extended Regexp::Common? +# No, should be a MooseX::Types module!! our $SHA1RE = qr/[0-9a-fA-F]{40}/; # These are static and only need to be setup on app start. -has repo_dir => ( isa => NonEmptySimpleStr, is => 'ro', lazy_build => 1 ); # Fixme - path::class +has repo_dir => ( isa => NonEmptySimpleStr, is => 'ro', required => 1 ); # Fixme - path::class has git => ( isa => NonEmptySimpleStr, is => 'ro', lazy_build => 1 ); # These are dynamic and can be different from one request to the next. has project => ( isa => NonEmptySimpleStr, is => 'rw'); has gpp => ( isa => 'Git::PurePerl', is => 'rw', lazy_build => 1 ); -sub build_per_context_instance { - my ( $self, $c ) = @_; - - $self->project( $c->req->param('p') ); - (my $pd = $self->project_dir( $self->project )) =~ s{/\.git$}(); - $self->gpp( Git::PurePerl->new(directory => $pd) ); - return $self; -} - =head2 BUILD =cut @@ -74,10 +91,6 @@ EOR return $git; } - -sub _build_repo_dir { - return Gitalist->config->{repo_dir}; -} =head2 get_object @@ -238,29 +251,28 @@ each item will contain the contents of L. =cut sub list_projects { - my ($self, $dir) = @_; - - my $base = dir($dir || $self->repo_dir); - - my @ret; - my $dh = $base->open; - while (my $file = $dh->read) { - next if $file =~ /^.{1,2}$/; - - my $obj = $base->subdir($file); - next unless -d $obj; - next unless $self->is_git_repo($obj); - - # XXX Leaky abstraction alert! - my $is_bare = !-d $obj->subdir('.git'); - - my $name = (File::Spec->splitdir($obj))[-1]; - push @ret, { - name => ($name . ( $is_bare ? '' : '/.git' )), - $self->get_project_properties( - $is_bare ? $obj : $obj->subdir('.git') - ), - }; + my ($self, $dir) = @_; + + my $base = dir($dir || $self->repo_dir); + + my @ret; + my $dh = $base->open or die("Cannot open dir $base"); + while (my $file = $dh->read) { + next if $file =~ /^.{1,2}$/; + + my $obj = $base->subdir($file); + next unless -d $obj; + next unless $self->is_git_repo($obj); + # XXX Leaky abstraction alert! + my $is_bare = !-d $obj->subdir('.git'); + + my $name = (File::Spec->splitdir($obj))[-1]; + push @ret, { + name => ($name . ( $is_bare ? '' : '/.git' )), + $self->get_project_properties( + $is_bare ? $obj : $obj->subdir('.git') + ), + }; } return [sort { $a->{name} cmp $b->{name} } @ret]; @@ -367,7 +379,7 @@ Return the contents of a given file. sub cat_file { my ($self, $object, $project) = @_; - my $type = $self->get_object_type($object); + my $type = $self->get_object_type($object, $project); die "object `$object' is not a file\n" if (!defined $type || $type ne 'blob'); @@ -417,18 +429,21 @@ Provides the raw output of a diff. =cut -sub raw_diff { - my ($self, @revs) = @_; +# gitweb uses the following sort of command for diffing merges: +# /home/dbrook/apps/bin/git --git-dir=/home/dbrook/dev/app/.git diff-tree -r -M --no-commit-id --patch-with-raw --full-index --cc 316cf158df3f6207afbae7270bcc5ba0 -- +# and for regular diffs +# /home/dbrook/apps/bin/git --git-dir=/home/dbrook/dev/app/.git diff-tree -r -M --no-commit-id --patch-with-raw --full-index 2e3454ca0749641b42f063730b0090e1 316cf158df3f6207afbae7270bcc5ba0 -- - croak("Gitalist::Model::Git::diff needs either one or two revisions, got: @revs") - if scalar @revs < 1 - || scalar @revs > 2 - || any { !$self->valid_rev($_) } @revs; +sub raw_diff { + my ($self, @args) = @_; - return $self->command(diff => '--full-index', @revs); + return $self->command( + qw(diff-tree -r -M --no-commit-id --full-index), + @args + ); } -=begin +=pod diff --git a/TODO b/TODO index 6a05e77..2071fd0 100644 --- a/TODO @@ -458,35 +473,97 @@ and some associated metadata. =cut +# XXX Ideally this would return a wee object instead of ad hoc structures. sub diff { - my($self, @revs) = @_; + my($self, %args) = @_; + + # So either a parent is specifed, or we use the commit's parent if there's + # only one, otherwise it was a merge commit. + my $parent = $args{parent} + ? $args{parent} + : @{$args{commit}->parents} <= 1 + ? $args{commit}->parent_sha1 + : '-c'; + my @etc = ( + ( $args{file} ? ('--', $args{file}) : () ), + ); + + my @out = $self->raw_diff( + ( $args{patch} ? '--patch-with-raw' : () ), + $parent, $args{commit}->sha1, @etc + ); + + # XXX Yes, there is much wrongness having parse_diff_tree be destructive. + my @difftree = $self->parse_diff_tree(\@out); - my @diff = $self->raw_diff(@revs); + return \@difftree + unless $args{patch}; + + # The blank line between the tree and the patch. + shift @out; + + # XXX And no I'm not happy about having diff return tree + patch. + return \@difftree, [$self->parse_diff(@out)]; +} + +sub parse_diff { + my($self, @diff) = @_; my @ret; for (@diff) { - # This regex is a little pathological. - if(m{^diff --git (a/(.*?)) (b/\2)}) { + # This regex is a little pathological. + if(m{^diff --git (a/(.*?)) (b/\2)}) { push @ret, { - head => $_, - a => $1, - b => $3, - file => $2, - diff => '', + head => $_, + a => $1, + b => $3, + file => $2, + diff => '', }; - next; - } - - if(/^index (\w+)\.\.(\w+) (\d+)$/) { - @{$ret[-1]}{qw(index src dst mode)} = ($_, $1, $2, $3); - next + next; } + + if(/^index (\w+)\.\.(\w+) (\d+)$/) { + @{$ret[-1]}{qw(index src dst mode)} = ($_, $1, $2, $3); + next + } + + # XXX Somewhat hacky. Ahem. + $ret[@ret ? -1 : 0]{diff} .= "$_\n"; + } + + return @ret; +} + +# $ git diff-tree -r --no-commit-id -M b222ff0a7260cc1777c7e455dfcaf22551a512fc 7e54e579e196c6c545fee1030175f65a111039d4 +# :100644 100644 6a85d6c6315b55a99071974eb6ce643aeb2799d6 44c03ed6c328fa6de4b1d9b3f19a3de96b250370 M templates/blob.tt2 + +=head2 parse_diff_tree - croak("No diff found for @revs") - unless @ret; +Given a L commit object return a list of hashes corresponding +to the C output. - # XXX Somewhat hacky. Ahem. - $ret[-1]{diff} .= "$_\n"; +=cut + +sub parse_diff_tree { + my($self, $diff) = @_; + + my @keys = qw(modesrc modedst sha1src sha1dst status src dst); + my @ret; + while(@$diff and $diff->[0] =~ /^:\d+/) { + my $line = shift @$diff; + # see. man git-diff-tree for more info + # mode src, mode dst, sha1 src, sha1 dst, status, src[, dst] + my @vals = $line =~ /^:(\d+) (\d+) ($SHA1RE) ($SHA1RE) ([ACDMRTUX]\d*)\t([^\t]+)(?:\t([^\n]+))?$/; + my %line = zip @keys, @vals; + # Some convenience keys + $line{file} = $line{src}; + $line{sha1} = $line{sha1dst}; + $line{is_new} = $line{sha1src} =~ /^0+$/ + if $line{sha1src}; + @line{qw/status sim/} = $line{status} =~ /(R)(\d+)/ + if $line{status} =~ /^R/; + push @ret, \%line; } return @ret; @@ -500,22 +577,11 @@ Given the output of the C command return a list of hashes. sub parse_rev_list { my ($self, $output) = @_; - my @ret; - - my @revs = split /\0/, $output; - - for my $rev (split /\0/, $output) { - for my $line (split /\n/, $rev, 6) { - chomp $line; - next unless $line; - if ($self->valid_rev($line)) { - push @ret, $self->get_object($line); - } - } - } - - return @ret; + return + map $self->get_object($_), + grep $self->valid_rev($_), + map split(/\n/, $_, 6), split /\0/, $output; } =head2 list_revs @@ -528,12 +594,27 @@ array of hashes. sub list_revs { my ($self, %args) = @_; - $args{sha1} ||= $self->head_hash($args{project}); + $args{sha1} = $self->head_hash($args{sha1}) + if !$args{sha1} || $args{sha1} !~ $SHA1RE; + + my @search_opts; + if($args{search}) { + my $sargs = $args{search}; + $sargs->{type} = 'grep' + if $sargs->{type} eq 'commit'; + @search_opts = ( + # This seems a little fragile ... + qq[--$sargs->{type}=$sargs->{text}], + '--regexp-ignore-case', + $sargs->{regexp} ? '--extended-regexp' : '--fixed-strings' + ); + } my $output = $self->run_cmd_in($args{project} || $self->project, 'rev-list', '--header', - (defined $args{ count } ? "--max-count=$args{count}" : ()), - (defined $args{ skip } ? "--skip=$args{skip}" : ()), + (defined $args{ count } ? "--max-count=$args{count}" : ()), + (defined $args{ skip } ? "--skip=$args{skip}" : ()), + @search_opts, $args{sha1}, '--', ($args{file} ? $args{file} : ()), @@ -575,8 +656,7 @@ sub reflog { = $self->run_cmd_in($self->project, qw(log -g), @logargs) =~ /(^commit.+?(?:(?=^commit)|(?=\z)))/msg; -=begin - +=pod commit 02526fc15beddf2c64798a947fecdd8d11bf993d Reflog: HEAD@{14} (The Git Server ) Reflog message: push @@ -687,51 +767,6 @@ sub references { return $self->{references} = \%refs; } -=begin - -$ git diff-tree -r --no-commit-id -M b222ff0a7260cc1777c7e455dfcaf22551a512fc 7e54e579e196c6c545fee1030175f65a111039d4 -:100644 100644 8976ebc7df65475b3def53a1653533c3f61070d0 852b6e170f1bad1fbd9930d3178dda8fdf1feae7 M TODO -:100644 100644 75f5e5f9ed10ae82a960fde77ecf138159c37610 7f54f8c3a4ad426f6889b13cfba5f5ad9969e3c6 M lib/Gitalist/Controller/Root.pm -:100644 100644 2c65caa46b56302502b9e6eef952b6f379c71fee e418acf5f7b5f771b0b2ef8be784e8dcd60a4271 M lib/Gitalist/View/Default.pm -:000000 100644 0000000000000000000000000000000000000000 642599f9ccfc4dbc7034987ad3233655010ff348 A lib/Gitalist/View/SyntaxHighlight.pm -:000000 100644 0000000000000000000000000000000000000000 3d2e533c41f01276b6f844bae98297273b38dffc A root/static/css/syntax-dark.css -:100644 100644 6a85d6c6315b55a99071974eb6ce643aeb2799d6 44c03ed6c328fa6de4b1d9b3f19a3de96b250370 M templates/blob.tt2 - -=cut - -use List::MoreUtils qw(zip); -# XXX Hrm, getting called twice, not sure why. -=head2 diff_tree - -Given a L commit object return a list of hashes corresponding -to the C output. - -=cut - -sub diff_tree { - my($self, $commit) = @_; - - my @dtout = $self->command( - # XXX should really deal with multple parents ... - qw(diff-tree -r --no-commit-id -M), $commit->parent_sha1, $commit->sha1 - ); - - my @keys = qw(modesrc modedst sha1src sha1dst status src dst); - my @difftree = map { - # see. man git-diff-tree for more info - # mode src, mode dst, sha1 src, sha1 dst, status, src[, dst] - my @vals = /^:(\d+) (\d+) ($SHA1RE) ($SHA1RE) ([ACDMRTUX])\t([^\t]+)(?:\t([^\n]+))?$/; - my %line = zip @keys, @vals; - # Some convenience keys - $line{file} = $line{src}; - $line{sha1} = $line{sha1dst}; - $line{is_new} = $line{sha1src} =~ /^0+$/; - \%line; - } @dtout; - - return @difftree; -} - 1; __PACKAGE__->meta->make_immutable;