sub build_per_context_instance {
my ( $self, $c ) = @_;
-
+
+ # If we don't have a project param it probably means we're at /
+ return $self
+ unless $c->req->param('p');
+
$self->project( $c->req->param('p') );
(my $pd = $self->project_dir( $self->project )) =~ s{/\.git$}();
: $self->dir_from_project_name($project);
$dir .= '/.git'
- if -f dir($dir)->file('.git/HEAD');
+ if -f dir($dir)->file('.git/HEAD');
return $dir;
}
Returns a hash corresponding to a given project's properties. The keys will
be:
- name
- description (empty if .git/description is empty/unnamed)
- owner
- last_change
+ name
+ description (empty if .git/description is empty/unnamed)
+ owner
+ last_change
=cut
=cut
sub head_hash {
- my ($self, $head, $project) = @_;
+ my ($self, $head) = @_;
- my $output = $self->run_cmd_in($project || $self->project, qw/rev-parse --verify/, $head || 'HEAD' );
- return unless defined $output;
+ my($output) = $self->command(qw/rev-parse --verify/, $head || 'HEAD' );
+ return unless $output;
my($sha1) = $output =~ /^($SHA1RE)$/;
return $sha1;
For a given tree sha1 return an array describing the tree's contents. Where
the keys for each item will be:
- mode
- type
- object
- file
+ mode
+ type
+ object
+ file
=cut
sub list_tree {
- my ($self, $rev, $project) = @_;
+ my ($self, $sha1) = @_;
- $project ||= $self->project;
- $rev ||= $self->head_hash($project);
+ $sha1 = $self->head_hash($sha1)
+ if !$sha1 or $sha1 !~ $SHA1RE;
- my $output = $self->run_cmd_in($project, qw/ls-tree -z/, $rev);
- return unless defined $output;
+ my($output) = $self->command(qw/ls-tree -z/, $sha1);
+ return
+ unless $output;
my @ret;
for my $line (split /\0/, $output) {
push @ret, {
mode => oct $mode,
- # XXX I wonder why directories always turn up as 040000 ...
+ # XXX I wonder why directories always turn up as 040000 ...
modestr => $self->get_object_mode_string({mode=>oct $mode}),
type => $type,
object => $object,
=cut
sub get_object_type {
- my ($self, $object, $project) = @_;
+ my ($self, $object) = @_;
- chomp(my $output = $self->run_cmd_in($project || $self->project, qw/cat-file -t/, $object));
- return unless $output;
+ my($output) = $self->command(qw/cat-file -t/, $object)
+ or return;
return $output;
}
=cut
sub cat_file {
- my ($self, $object, $project) = @_;
+ my ($self, $object) = @_;
my $type = $self->get_object_type($object);
die "object `$object' is not a file\n"
if (!defined $type || $type ne 'blob');
- my $output = $self->run_cmd_in($project || $self->project, qw/cat-file -p/, $object);
- return unless $output;
+ my($output) = $self->command(qw/cat-file -p/, $object)
+ or return;
return $output;
}
my($line) = $self->command('ls-tree', $base, '--', $path)
or return;
- #'100644 blob 0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa panic.c'
+ #'100644 blob 0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa panic.c'
$line =~ m/^([0-9]+) (.+) ($SHA1RE)\t/;
return defined $type && $type ne $2
? ()
my ($self, @args) = @_;
return $self->command(
- qw(diff-tree -r -M --no-commit-id --full-index),
- @args
+ qw(diff-tree -r -M --no-commit-id --full-index),
+ @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';
+ ? $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
+ ( $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);
return \@difftree
- unless $args{patch};
+ unless $args{patch};
# The blank line between the tree and the patch.
shift @out;
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;
}
-
- # XXX Somewhat hacky. Ahem.
- $ret[-1]{diff} .= "$_\n";
+
+ 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;
my @keys = qw(modesrc modedst sha1src sha1dst status src dst);
my @ret;
- while($diff->[0] =~ /^:\d+/) {
- local $_ = shift @$diff;
+ 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 = /^:(\d+) (\d+) ($SHA1RE) ($SHA1RE) ([ACDMRTUX])\t([^\t]+)(?:\t([^\n]+))?$/;
+ 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+$/;
+ $line{is_new} = $line{sha1src} =~ /^0+$/
+ if $line{sha1src};
+ @line{qw/status sim/} = $line{status} =~ /(R)(\d+)/
+ if $line{status} =~ /^R/;
push @ret, \%line;
}
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
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'
+ );
+ }
+ $DB::single=1;
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} : ()),
return unless $self->valid_rev($rev);
return $self->list_revs(
- rev => $rev, count => 1,
- ( $project ? (project => $project) : () )
+ rev => $rev, count => 1,
+ ( $project ? (project => $project) : () )
);
}
=cut
sub refs_for {
- my($self, $sha1) = @_;
+ my($self, $sha1) = @_;
- my $refs = $self->references->{$sha1};
+ my $refs = $self->references->{$sha1};
- return $refs ? @$refs : ();
+ return $refs ? @$refs : ();
}
=head2 references
=cut
sub references {
- my($self) = @_;
+ my($self) = @_;
- return $self->{references}
- if $self->{references};
+ return $self->{references}
+ if $self->{references};
- # 5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c refs/tags/v2.6.11
- # c39ae07f393806ccf406ef966e9a15afc43cc36a refs/tags/v2.6.11^{}
- my @reflist = $self->command(qw(show-ref --dereference))
- or return;
+ # 5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c refs/tags/v2.6.11
+ # c39ae07f393806ccf406ef966e9a15afc43cc36a refs/tags/v2.6.11^{}
+ my @reflist = $self->command(qw(show-ref --dereference))
+ or return;
- my %refs;
- for(@reflist) {
- push @{$refs{$1}}, $2
- if m!^($SHA1RE)\srefs/(.*)$!;
- }
+ my %refs;
+ for(@reflist) {
+ push @{$refs{$1}}, $2
+ if m!^($SHA1RE)\srefs/(.*)$!;
+ }
- return $self->{references} = \%refs;
+ return $self->{references} = \%refs;
}
1;
projects / catagits/Gitalist.git / blobdiff