3 |
|
|
4 |
extends 'Frey'; |
extends 'Frey'; |
5 |
with 'Frey::Web'; |
with 'Frey::Web'; |
6 |
|
with 'Frey::Path'; |
7 |
|
|
8 |
use Moose::Util::TypeConstraints; |
use Moose::Util::TypeConstraints; |
9 |
|
|
10 |
enum 'SVK_Action' => ( 'commit', 'revert' ); |
enum 'SVK_Action' => ( 'commit', 'revert', 'postpone' ); |
11 |
|
|
12 |
has action => ( |
has action => ( |
13 |
is => 'rw', |
is => 'rw', |
68 |
my ($self) = @_; |
my ($self) = @_; |
69 |
my $status = `svk status -q`; |
my $status = `svk status -q`; |
70 |
# $status =~ s{^(\w+\s+)(\S+)$}{$1<input name="commit_path" value="$2" type="checkbox"><a href="#$2">$2</a>}gm; # FIXME |
# $status =~ s{^(\w+\s+)(\S+)$}{$1<input name="commit_path" value="$2" type="checkbox"><a href="#$2">$2</a>}gm; # FIXME |
71 |
$status =~ s{^(\w+\s+)(\S+)$}{$1<a href="#$2">$2</a>}gm; |
$status =~ s{^(\w+[\+\s]+)(\S+)$}{$1<a href="#$2">$2</a>}gm; |
72 |
if ( $status ) { |
if ( $status ) { |
73 |
$self->add_css(qq| |
$self->add_css(qq| |
74 |
pre.l a { text-decoration: none; } |
pre.l a { text-decoration: none; } |
83 |
| ); |
| ); |
84 |
|
|
85 |
$status = qq| |
$status = qq| |
86 |
<div class="commit"> |
<div class="commit" method="post"> |
87 |
<form> |
<form> |
88 |
<textarea name="commit_message" cols=40 rows=4></textarea> |
<textarea name="commit_message" cols=40 rows=4></textarea> |
89 |
<br><input type="submit" name="action" value="commit"> |
<br><input type="submit" name="action" value="commit"> |
107 |
$self->add_css( qq| |
$self->add_css( qq| |
108 |
pre span.add { background: #dfd } |
pre span.add { background: #dfd } |
109 |
pre span.del { background: #fdd } |
pre span.del { background: #fdd } |
110 |
pre form.revert { display: inline } |
pre form.inline { display: inline } |
111 |
| ); |
| ); |
112 |
$diff =~ s{^(\+.+?)$}{<span class="add">$1</span>}gm; |
$diff =~ s{^(\+.+?)$}{<span class="add">$1</span>}gm; |
113 |
$diff =~ s{^(\-.+?)$}{<span class="del">$1</span>}gm; |
$diff =~ s{^(\-.+?)$}{<span class="del">$1</span>}gm; |
114 |
$diff =~ s{^(===\s+)(\S+)$}{$1<form class="revert"><input type="hidden" name="path" value="$2"><input type="submit" name="action" value="revert"></form> <a name="$2" target="editor" href="/editor+$2+1">$2</a>}gm; |
sub form { |
115 |
|
my ( $path, $action ) = @_; |
116 |
|
qq|<form class="inline"><input type="hidden" name="path" value="$path"><input type="submit" name="action" value="$action"></form>|; |
117 |
|
}; |
118 |
|
$diff =~ s{^(===\s+)(\S+)$}{$1 . form($2,'revert') . qq| <a name="$2" target="editor" href="/editor+$2+1">$2</a> | . form($2,'postpone') }gem; |
119 |
|
|
120 |
$diff = qq|<pre>$diff</pre>|; |
$diff = qq|<pre>$diff</pre>|; |
121 |
warn "diff_as_markup ",length($diff)," bytes"; |
warn "diff_as_markup ",length($diff)," bytes"; |
126 |
my ($self) = @_; |
my ($self) = @_; |
127 |
|
|
128 |
my $html = ''; |
my $html = ''; |
129 |
|
my $cmd; |
130 |
|
|
131 |
if ( $self->action ) { |
if ( $self->action eq 'postpone' ) { |
132 |
my $cmd = 'svk ' . $self->action . ' ' . $self->path; |
my $old = $self->path; |
133 |
|
my $new = $old; |
134 |
|
$new =~ s{/([^/]+)$}{/.postponed.$1}; |
135 |
|
|
136 |
|
die "Allready have ", $self->path_size($new) if -e $new; |
137 |
|
$cmd = "mv $old $new && svk revert $old"; |
138 |
|
} elsif ( $self->action ) { |
139 |
|
$cmd = 'svk ' . $self->action . ' ' . $self->path; |
140 |
if ( $self->action eq 'commit' ) { |
if ( $self->action eq 'commit' ) { |
141 |
confess "need commit message" unless $self->commit_message; |
confess "need commit message" unless $self->commit_message; |
142 |
my $msg = $self->commit_message; |
my $msg = $self->commit_message; |
145 |
} else { |
} else { |
146 |
confess "need path" unless $self->path; |
confess "need path" unless $self->path; |
147 |
} |
} |
148 |
|
} |
149 |
|
if ( $cmd ) { |
150 |
$cmd .= ' 2>&1'; |
$cmd .= ' 2>&1'; |
151 |
my $out = `$cmd`; |
my $out = `$cmd`; |
152 |
warn "$cmd $out"; |
warn "$cmd $out"; |
153 |
|
|
154 |
$html .= qq| |
$html .= qq| |
155 |
<code style="background: #ff8;"> |
<code style="background: #ff8;"> |
156 |
$cmd\n |
$cmd\n |
161 |
|
|
162 |
$self->title( 'svk' . ( $self->action ? ' - ' . $self->action : '' ) ); # XXX without this we get wrong icon and title |
$self->title( 'svk' . ( $self->action ? ' - ' . $self->action : '' ) ); # XXX without this we get wrong icon and title |
163 |
|
|
|
if ( ! $self->can('html_escape') ) { |
|
|
Frey::Web->meta->apply( $self ); |
|
|
$self->TODO( "Frey::Web role missing" ); |
|
|
} |
|
|
|
|
164 |
$html .= $self->status_as_markup || 'No changes in files tracked by SVK'; |
$html .= $self->status_as_markup || 'No changes in files tracked by SVK'; |
165 |
$html .= $self->diff_as_markup; |
$html .= $self->diff_as_markup; |
166 |
|
|