--- trunk/lib/Frey/SVK.pm 2008/11/29 16:54:26 622 +++ trunk/lib/Frey/SVK.pm 2008/12/05 17:34:10 726 @@ -3,10 +3,11 @@ extends 'Frey'; with 'Frey::Web'; +with 'Frey::Path'; use Moose::Util::TypeConstraints; -enum 'SVK_Action' => ( 'commit', 'revert' ); +enum 'SVK_Action' => ( 'commit', 'revert', 'postpone' ); has action => ( is => 'rw', @@ -16,7 +17,7 @@ has path => ( documentation => 'path to work with', is => 'rw', - isa => 'Str', + isa => 'Str|ArrayRef', ); has commit_message => ( @@ -63,16 +64,15 @@ } } -sub status_as_markup { +sub commit_as_markup { my ($self) = @_; my $status = `svk status -q`; -# $status =~ s{^(\w+\s+)(\S+)$}{$1$2}gm; # FIXME - $status =~ s{^(\w+\s+)(\S+)$}{$1$2}gm; + $status =~ s{^(\w+[\+\s]+)(\S+)$}{$1 . $self->checkbox('path',$2) . qq|$2|}egm; if ( $status ) { $self->add_css(qq| pre.l a { text-decoration: none; } - div.commit { - background: #ffd; + form.commit { + background: #eee; padding: 1em 1em; position: fixed; top: 1em; @@ -81,19 +81,17 @@ } | ); + $status = qq| -
$diff|; + $diff = qq|
$diff| if $diff; warn "diff_as_markup ",length($diff)," bytes"; return $diff; } -sub as_markup { +sub action_as_markup { my ($self) = @_; - my $html = ''; + my $cmd; - if ( $self->action ) { - my $cmd = 'svk ' . $self->action . ' ' . $self->path; + if ( $self->action eq 'postpone' ) { + my $old = $self->path; + my $new = $old; + $new =~ s{/([^/]+)$}{/.postponed.$1}; + + die "Allready have ", $self->path_size($new) if -e $new; + $cmd = "mv $old $new && svk revert $old"; + } elsif ( $self->action ) { + $cmd = 'svk ' . $self->action; if ( $self->action eq 'commit' ) { - confess "need commit message" unless $self->commit_message; - my $msg = $self->commit_message; + my $msg = $self->commit_message || return $self->error( "need commit message\n" ); $msg =~ s{"}{\\"}gs; $cmd .= qq{ -m "$msg"}; } else { confess "need path" unless $self->path; } + + my @paths = eval { @{ $self->path } }; # XXX sigh! + @paths = ( $self->path ) unless @paths; + warn "# path ", $self->dump( @paths ); + + $cmd .= ' ' . join( ' ',@paths ); + } + if ( $cmd ) { $cmd .= ' 2>&1'; + warn "# cmd $cmd"; + my $out = `$cmd`; - warn "$cmd $out"; - $html .= qq| -
- $cmd\n
- $out
-
+ warn "# output of $cmd is: $out";
+
+ return qq|
+ Command $cmd produced output:
+ $out|; } - $self->title( 'svk' . ( $self->action ? ' - ' . $self->action : '' ) ); # XXX without this we get wrong icon and title +} - if ( ! $self->can('html_escape') ) { - Frey::Web->meta->apply( $self ); - $self->TODO( "Frey::Web role missing" ); - } +sub as_markup { + my ($self) = @_; + + my $html = $self->action_as_markup; + + $self->title( 'svk' . ( $self->action ? ' - ' . $self->action : '' ) ); # XXX without this we get wrong icon and title - $html .= $self->status_as_markup || 'No changes in files tracked by SVK'; - $html .= $self->diff_as_markup; + $html .= $self->commit_as_markup . $self->diff_as_markup || + qq|No changes in tracked files|; warn "as_markup ",length($html)," bytes";