--- trunk/lib/Frey/SVK.pm 2008/11/29 21:55:53 626 +++ trunk/lib/Frey/SVK.pm 2008/11/30 14:43:44 637 @@ -6,7 +6,7 @@ use Moose::Util::TypeConstraints; -enum 'SVK_Action' => ( 'commit', 'revert' ); +enum 'SVK_Action' => ( 'commit', 'revert', 'postpone' ); has action => ( is => 'rw', @@ -106,11 +106,15 @@ $self->add_css( qq| pre span.add { background: #dfd } pre span.del { background: #fdd } - pre form.revert { display: inline } + pre form.inline { display: inline } | ); $diff =~ s{^(\+.+?)$}{$1}gm; $diff =~ s{^(\-.+?)$}{$1}gm; - $diff =~ s{^(===\s+)(\S+)$}{$1
$2}gm; + sub form { + my ( $path, $action ) = @_; + qq|
|; + }; + $diff =~ s{^(===\s+)(\S+)$}{$1 . form($2,'revert') . qq| $2 | . form($2,'postpone') }gem; $diff = qq|
$diff
|; warn "diff_as_markup ",length($diff)," bytes"; @@ -121,8 +125,14 @@ my ($self) = @_; my $html = ''; + my $cmd; - if ( $self->action ) { + if ( $self->action eq 'postpone' ) { + my $old = $self->path; + my $new = $old . '.postponed'; + die "Allready have $new" if -e $new; + $cmd = "mv $old $new && svk revert $old"; + } elsif ( $self->action ) { my $cmd = 'svk ' . $self->action . ' ' . $self->path; if ( $self->action eq 'commit' ) { confess "need commit message" unless $self->commit_message; @@ -132,9 +142,12 @@ } else { confess "need path" unless $self->path; } + } + if ( $cmd ) { $cmd .= ' 2>&1'; my $out = `$cmd`; warn "$cmd $out"; + $html .= qq| $cmd\n