--- trunk/lib/Frey/SVK.pm	2008/11/29 00:20:23	614
+++ trunk/lib/Frey/SVK.pm	2008/12/02 22:23:56	698
@@ -3,20 +3,24 @@
 
 extends 'Frey';
 with 'Frey::Web';
+with 'Frey::Path';
 
-has commit_path => (
-	documentation => 'path to commit',
+use Moose::Util::TypeConstraints;
+
+enum 'SVK_Action' => ( 'commit', 'revert', 'postpone' );
+
+has action => (
 	is => 'rw',
-	isa => 'ArrayRef|Str',
+	isa => 'SVK_Action',
 );
 
-has revert_path => (
-	documentation => 'path to commit',
+has path => (
+	documentation => 'path to work with',
 	is => 'rw',
-	isa => 'ArrayRef|Str',
+	isa => 'Str|ArrayRef',
 );
 
-has message => (
+has commit_message => (
 	documentation => 'commit message',
 	is => 'rw',
 	isa => 'Str',
@@ -60,24 +64,44 @@
 	}
 }
 
-sub status_as_markup {
+sub checkbox {
+	my ($self,$name,$value) = @_;
+	my $checked = '';
+	my $all_checkboxes = $self->$name;
+	$all_checkboxes = [ $all_checkboxes ] unless ref($all_checkboxes) eq 'ARRAY'; # sigh, too chatty
+	$checked = ' checked' if grep { $_ eq $value } @$all_checkboxes;
+	warn "# checkbox $name $value $checked\t", $self->dump( $self->$name );
+	qq|<input name="$name" value="$value" type="checkbox"$checked>|;
+}
+
+sub commit_as_markup {
 	my ($self) = @_;
 	my $status = `svk status -q`;
-	$status =~ s{^(\w+\s+)(\S+)$}{$1<input name="commit_path" value="$2" type="checkbox"><a href="#$2">$2</a>}gm;
+	$status =~ s{^(\w+[\+\s]+)(\S+)$}{$1 . $self->checkbox('path',$2) . qq|<a href="#$2">$2</a>|}egm;
 	if ( $status ) {
-		$self->add_css( qq| pre.l a { text-decoration: none; } | );
+		$self->add_css(qq|
+			pre.l a { text-decoration: none; }
+			form.commit {
+				background: #eee;
+				padding: 1em 1em;
+				position: fixed;
+				top: 1em;
+				right: 1em;
+				z-index: 10;
+			}
+		| );
+
+
 		$status = qq|
-			<form>
-			<div style="background: #ffd; float: right; padding: 1em;">
-				<textarea name="message" width=20 height=4></textarea>
-				<br><input type="submit" value="Commit">
-			</div>
+			<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">
 			</form>
 		|;
-		$self->add_status( $status );
+		$self->add_status( status => $status );
+		warn "commit_as_markup ",length($status)," bytes";
 	}
-	warn "status_as_markup ",length($status)," bytes";
 	return $status;
 }
 
@@ -85,43 +109,76 @@
 	my ($self) = @_;
 
 	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.revert { display: inline }
+	pre form.inline { display: inline }
 	| );
 	$diff =~ s{^(\+.+?)$}{<span class="add">$1</span>}gm;
 	$diff =~ s{^(\-.+?)$}{<span class="del">$1</span>}gm;
-	$diff =~ s{^(===\s+)(\S+)$}{$1<form class="revert"><input type="hidden" name="revert_path" value="$2"><input type="submit" value="Revert"></form> <a name="$2">$2</a>}gm;
+	sub form {
+		my ( $path, $action ) = @_;
+		qq|<form class="inline"><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>|;
 	warn "diff_as_markup ",length($diff)," bytes";
 	return $diff;
 }
 
-sub as_markup {
+sub action_as_markup {
 	my ($self) = @_;
 
-	my $html = '';
+	my $cmd;
 
-	if ( $self->revert_path ) {
-		my $cmd = 'svk revert ' . join(' ', $self->revert_path );
-		my $revert = `$cmd`;
-		warn "$cmd $revert";
-		$html .= qq|<code style="background: #ff8;">$revert</code>|;
+	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' ) {
+			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;
+		}
+		$cmd .= ' ' . join(' ',$self->path);
+	}
+	if ( $cmd ) {
+		$cmd .= ' 2>&1';
+		warn "# cmd $cmd";
+
+		my $out = `$cmd`;
+		warn "# output of $cmd is: $out";
+
+		return qq|
+			Command <tt>$cmd</tt> produced output:
+			<pre style="background: #ff8;">
+			$out
+			</pre>
+		|;
 	}
 
-	$self->title('svk'); # 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 || $self->error('no status_or_markup output');
-	$html .= $self->diff_as_markup   || $self->error('no diff_as_markup output');
+	$html .= $self->commit_as_markup . $self->diff_as_markup ||
+		qq|No changes in tracked files|;
 
 	warn "as_markup ",length($html)," bytes";