2 |
use Moose; |
use Moose; |
3 |
|
|
4 |
extends 'Frey'; |
extends 'Frey'; |
5 |
with 'Frey::Web'; |
with 'Frey::Web', 'Frey::Path', 'Frey::HTML::Diff'; |
|
with 'Frey::Path'; |
|
6 |
|
|
7 |
use Moose::Util::TypeConstraints; |
use Moose::Util::TypeConstraints; |
8 |
|
|
25 |
isa => 'Str', |
isa => 'Str', |
26 |
); |
); |
27 |
|
|
28 |
|
our $svk = 'svk'; |
29 |
|
$svk = 'svn' if -e '.svn'; |
30 |
|
warn "using $svk"; |
31 |
|
|
32 |
sub svk { |
sub svk { |
33 |
my ( $self, $exec, $coderef ) = @_; |
my ( $self, $exec, $coderef ) = @_; |
34 |
open(my $svk, '-|', 'svk ' . $exec) or die "svk $exec: $@"; |
open(my $pipe, '-|', "$svk $exec") or die "$svk $exec: $@"; |
35 |
while(<$svk>) { |
while(<$pipe>) { |
36 |
chomp; |
chomp; |
37 |
$coderef->( $_ ); |
$coderef->( $_ ); |
38 |
} |
} |
39 |
close($svk) or die "can't close svk $exec: $@"; |
close($pipe) or die "can't close $svk $exec: $@"; |
40 |
} |
} |
41 |
|
|
42 |
our $svk_status_path = '^(\w+[\+\s]+)(.+)'; |
our $svk_status_path = '^(\w+[\+\s]+)(.+)'; |
58 |
my ( $label, $value ) = split(/:\s+/, $_, 2); |
my ( $label, $value ) = split(/:\s+/, $_, 2); |
59 |
$info->{$label} = $value if $label; |
$info->{$label} = $value if $label; |
60 |
}); |
}); |
61 |
warn "# svk info ",$self->dump( $info ); |
warn "# $svk info ",$self->dump( $info ); |
62 |
return $info; |
return $info; |
63 |
} |
} |
64 |
|
|
71 |
|
|
72 |
sub commit_as_markup { |
sub commit_as_markup { |
73 |
my ($self) = @_; |
my ($self) = @_; |
74 |
my $status = `svk status -q`; |
my $status = `$svk status -q`; |
75 |
$status =~ s{$svk_status_path}{$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; |
76 |
if ( $status ) { |
if ( $status ) { |
77 |
$self->add_css(qq| |
$self->add_css(qq| |
97 |
<form class="commit" method="post"> |
<form class="commit" method="post"> |
98 |
<pre class="l">$status</pre> |
<pre class="l">$status</pre> |
99 |
<textarea name="commit_message" cols=40 rows=4></textarea> |
<textarea name="commit_message" cols=40 rows=4></textarea> |
100 |
<br><input type="submit" name="action" value="commit"> |
<br> |
101 |
|
<a target="Frey::Test::Runner" href="/Frey::Test::Runner/as_markup" title="run tests for all changes" style="float: right;">test</a> |
102 |
|
<input type="submit" name="action" value="commit"> |
103 |
</form> |
</form> |
104 |
|; |
|; |
105 |
$self->add_status( status => $status ); |
$self->add_status( status => $status ); |
111 |
sub diff_as_markup { |
sub diff_as_markup { |
112 |
my ($self) = @_; |
my ($self) = @_; |
113 |
|
|
114 |
my $diff = `svk diff`; |
my $diff = `$svk diff`; |
115 |
$self->add_status( diff => $diff ); |
$self->add_status( diff => $diff ); |
116 |
|
|
117 |
$diff = $self->html_escape( $diff ); |
$diff = $self->html_diff( $diff ); |
118 |
$self->add_css( qq| |
|
|
pre span.add, |
|
|
pre span.del { |
|
|
float: left; |
|
|
width: 100%; |
|
|
} |
|
|
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; |
|
119 |
sub form { |
sub form { |
120 |
my ( $path, $action ) = @_; |
my ( $path, $action ) = @_; |
121 |
qq|<form class="inline" method="post"><input type="hidden" name="path" value="$path"><input type="submit" name="action" value="$action"></form>|; |
qq|<form class="inline" method="post"><input type="hidden" name="path" value="$path"><input type="submit" name="action" value="$action"></form>|; |
122 |
}; |
}; |
123 |
$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 =~ s{(^|<pre>)(===\s+)(\S+)$}{$1 . $2 . form($3,'revert') . qq| <a name="$3" target="editor" href="/editor+$3+1">$3</a> | . form($3,'postpone') }gem; |
124 |
|
|
|
$diff = qq|<pre>$diff</pre>| if $diff; |
|
125 |
warn "diff_as_markup ",length($diff)," bytes"; |
warn "diff_as_markup ",length($diff)," bytes"; |
126 |
return $diff; |
return $diff; |
127 |
} |
} |
137 |
$new =~ s{/([^/]+)$}{/.postponed.$1}; |
$new =~ s{/([^/]+)$}{/.postponed.$1}; |
138 |
|
|
139 |
die "Allready have ", $self->path_size($new) if -e $new; |
die "Allready have ", $self->path_size($new) if -e $new; |
140 |
$cmd = "mv $old $new && svk revert $old"; |
$cmd = "mv $old $new && $svk revert $old"; |
141 |
} elsif ( $self->action ) { |
} elsif ( $self->action ) { |
142 |
$cmd = 'svk ' . $self->action; |
$cmd = "$svk " . $self->action; |
143 |
if ( $self->action eq 'commit' ) { |
if ( $self->action eq 'commit' ) { |
144 |
my $msg = $self->commit_message || return $self->error( "need commit message\n" ); |
my $msg = $self->commit_message || return $self->error( "need commit message\n" ); |
145 |
$msg =~ s{"}{\\"}gs; |
$msg =~ s{"}{\\"}gs; |
164 |
return qq| |
return qq| |
165 |
Command <tt>$cmd</tt> produced output: |
Command <tt>$cmd</tt> produced output: |
166 |
<pre style="background: #ff8;">$out</pre> |
<pre style="background: #ff8;">$out</pre> |
167 |
<a href="">reload page</a> to prevent this post from triggering again |
<a href="">reload page</a> to prevent this post from triggering again<br> |
168 |
|; |
|; |
169 |
} |
} |
170 |
|
|
175 |
|
|
176 |
my $html = $self->action_as_markup; |
my $html = $self->action_as_markup; |
177 |
|
|
178 |
$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 |
179 |
|
|
180 |
$html .= $self->commit_as_markup . $self->diff_as_markup || |
$html .= $self->commit_as_markup . $self->diff_as_markup || |
181 |
qq|No changes in tracked files|; |
qq|No changes in tracked files|; |
185 |
return $html; |
return $html; |
186 |
} |
} |
187 |
|
|
188 |
|
__PACKAGE__->meta->make_immutable; |
189 |
|
no Moose; |
190 |
|
no Moose::Util::TypeConstraints; |
191 |
|
|
192 |
1; |
1; |