From: Zachary Stevens Date: Sun, 27 Jun 2010 00:24:53 +0000 (+0100) Subject: Remove Repository->get_object_or_head. X-Git-Tag: 0.002007~24 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FGitalist.git;a=commitdiff_plain;h=944f7f7b046e9d7b6c4a2f10677a0ff8bb7b0074 Remove Repository->get_object_or_head. Redundant - R->get_object does the same thing. --- diff --git a/lib/Gitalist/Git/Repository.pm b/lib/Gitalist/Git/Repository.pm index ffc0e89..513f607 100644 --- a/lib/Gitalist/Git/Repository.pm +++ b/lib/Gitalist/Git/Repository.pm @@ -75,11 +75,6 @@ class Gitalist::Git::Repository with Gitalist::Git::HasUtils { ## Public methods - method get_object_or_head (NonEmptySimpleStr $ref) { - my $sha1 = is_SHA1($ref) ? $ref : $self->head_hash($ref); - $self->get_object($sha1); - } - method head_hash (Str $head?) { my $output = $self->run_cmd(qw/rev-parse --verify/, $head || 'HEAD' ); confess("No such head: " . $head) unless defined $output; diff --git a/lib/Gitalist/URIStructure/Ref.pm b/lib/Gitalist/URIStructure/Ref.pm index 194786f..9ce2457 100644 --- a/lib/Gitalist/URIStructure/Ref.pm +++ b/lib/Gitalist/URIStructure/Ref.pm @@ -20,7 +20,7 @@ after 'base' => sub { sub find : Chained('base') PathPart('') CaptureArgs(1) { my ($self, $c, $sha1part) = @_; # FIXME - Should not be here! - $c->stash->{Commit} = $c->stash->{Repository}->get_object_or_head($sha1part) + $c->stash->{Commit} = $c->stash->{Repository}->get_object($sha1part) or $c->detach('/error404', "Couldn't find a object for '$sha1part' in XXXX!"); $c->stash->{data} = $c->stash->{Commit}; } @@ -34,7 +34,7 @@ sub _set_diff_args { $c->stash(parent => shift @rest) if @rest == 2 # Check that the single arg is unlikely to be a path. - or @rest && to_SHA1($rest[0]) && $c->stash->{Repository}->get_object_or_head($rest[0]); + or @rest && to_SHA1($rest[0]) && $c->stash->{Repository}->get_object($rest[0]); $c->stash(filename => $rest[-1]) if @rest; }