--- trunk/lib/Frey/SVK.pm	2008/12/06 14:35:15	737
+++ trunk/lib/Frey/SVK.pm	2009/06/30 15:10:55	1133
@@ -2,8 +2,7 @@
 use Moose;
 
 extends 'Frey';
-with 'Frey::Web';
-with 'Frey::Path';
+with 'Frey::Web', 'Frey::Path', 'Frey::HTML::Diff';
 
 use Moose::Util::TypeConstraints;
 
@@ -36,11 +35,13 @@
 	close($svk) or die "can't close svk $exec: $@";
 }
 
+our $svk_status_path = '^(\w+[\+\s]+)(.+)';
+
 sub modified {
 	my ($self) = @_;
 	my @modified;
 	my $svk = $self->svk('status -q', sub {
-		push @modified, $1 if /^\w+\s+(.+)/;
+		push @modified, $2 if m{$svk_status_path};
 	});
 	return @modified;
 }
@@ -67,7 +68,7 @@
 sub commit_as_markup {
 	my ($self) = @_;
 	my $status = `svk status -q`;
-	$status =~ s{^(\w+[\+\s]+)(\S+)$}{$1 . $self->checkbox('path',$2) . qq|<a href="#$2">$2</a>|}egm;
+	$status =~ s{$svk_status_path}{$1 . $self->checkbox('path',$2) . qq|<a href="#$2">$2</a>|}egm;
 	if ( $status ) {
 		$self->add_css(qq|
 			pre.l a { text-decoration: none; }
@@ -92,7 +93,9 @@
 			<form class="commit" method="post">
 			<pre class="l">$status</pre>
 			<textarea name="commit_message" cols=40 rows=4></textarea>
-			<br><input type="submit" name="action" value="commit">
+			<br>
+			<a target="Frey::Test::Runner" href="/Frey::Test::Runner/as_markup" title="run tests for all changes" style="float: right;">test</a>
+			<input type="submit" name="action" value="commit">
 			</form>
 		|;
 		$self->add_status( status => $status );
@@ -107,21 +110,14 @@
 	my $diff   = `svk diff`;
 	$self->add_status( diff => $diff );
 
-	$diff = $self->html_escape( $diff );
-	$self->add_css( qq|
-	pre span.add { background: #dfd }
-	pre span.del { background: #fdd }
-	pre form.inline { display: inline }
-	| );
-	$diff =~ s{^(\+.+?)$}{<span class="add">$1</span>}gm;
-	$diff =~ s{^(\-.+?)$}{<span class="del">$1</span>}gm;
+	$diff = $self->html_diff( $diff );
+
 	sub form {
 		my ( $path, $action ) = @_;
 		qq|<form class="inline" method="post"><input type="hidden" name="path" value="$path"><input type="submit" name="action" value="$action"></form>|;
 	};
 	$diff =~ s{^(===\s+)(\S+)$}{$1 . form($2,'revert') . qq| <a name="$2" target="editor" href="/editor+$2+1">$2</a> | . form($2,'postpone') }gem;
 
-	$diff = qq|<pre>$diff</pre>| if $diff;
 	warn "diff_as_markup ",length($diff)," bytes";
 	return $diff;
 }
@@ -164,6 +160,7 @@
 		return qq|
 			Command <tt>$cmd</tt> produced output:
 			<pre style="background: #ff8;">$out</pre>
+			<a href="">reload page</a> to prevent this post from triggering again<br>
 		|;
 	}
 
@@ -184,4 +181,8 @@
 	return $html;
 }
 
+__PACKAGE__->meta->make_immutable;
+no Moose;
+no Moose::Util::TypeConstraints;
+
 1;