--- trunk/lib/Frey/SVK.pm 2008/11/28 00:09:51 576 +++ trunk/lib/Frey/SVK.pm 2008/11/28 18:29:59 598 @@ -4,6 +4,18 @@ extends 'Frey'; with 'Frey::Web'; +has commit_path => ( + documentation => 'path to commit', + is => 'rw', + isa => 'ArrayRef|Str', +); + +has message => ( + documentation => 'commit message', + is => 'rw', + isa => 'Str', +); + sub svk { my ( $self, $exec, $coderef ) = @_; open(my $svk, '-|', 'svk ' . $exec) or die "svk $exec: $@"; @@ -18,7 +30,7 @@ my ($self) = @_; my @modified; my $svk = $self->svk('status -q', sub { - push @modified, $1 if /^(M|A)\s+(.+)/; + push @modified, $1 if /^\w+\s+(.+)/; }); return @modified; } @@ -42,19 +54,27 @@ } } -sub as_markup { +sub status_as_markup { my ($self) = @_; - - if ( ! $self->can('html_escape') ) { - Frey::Web->meta->apply( $self ); - $self->TODO( "Frey::Web role missing" ); - } - my $status = `svk status -q`; - $status =~ s{^(\w+\s+)(\S+)$}{$1$2}gm; + $status =~ s{^(\w+\s+)(\S+)$}{$1$2}gm; $self->add_css( qq| pre.l a { text-decoration: none; } | ); - $status = qq|
$status
|; + $status = qq| +
+
+ +
+
+
$status
+
+ |; $self->add_status( $status ); + warn "status_as_markup ",length($status)," bytes"; + return $status; +} + +sub diff_as_markup { + my ($self) = @_; my $diff = `svk diff`; @@ -68,9 +88,23 @@ $diff =~ s{^(===\s+)(\S+)$}{$1$2}gm; $diff = qq|
$diff
|; + warn "diff_as_markup ",length($diff)," bytes"; + return $diff; +} + +sub as_markup { + my ($self) = @_; + + if ( ! $self->can('html_escape') ) { + Frey::Web->meta->apply( $self ); + $self->TODO( "Frey::Web role missing" ); + } - my $html = $status . $diff; - warn "html ",length($html)," bytes"; + my $html + = ( $self->status_as_markup || $self->error('no status_or_markup output') ) + . ( $self->diff_as_markup || $self->error('no diff_as_markup output') ) + ; + warn "as_markup ",length($html)," bytes"; return $html; }