3 |
|
|
4 |
extends 'Frey'; |
extends 'Frey'; |
5 |
with 'Frey::Web'; |
with 'Frey::Web'; |
6 |
|
with 'Frey::Path'; |
7 |
|
with 'Frey::HTML::Diff'; |
8 |
|
|
9 |
has commit_path => ( |
use Moose::Util::TypeConstraints; |
10 |
documentation => 'path to commit', |
|
11 |
|
enum 'SVK_Action' => ( 'commit', 'revert', 'postpone' ); |
12 |
|
|
13 |
|
has action => ( |
14 |
|
is => 'rw', |
15 |
|
isa => 'SVK_Action', |
16 |
|
); |
17 |
|
|
18 |
|
has path => ( |
19 |
|
documentation => 'path to work with', |
20 |
is => 'rw', |
is => 'rw', |
21 |
isa => 'ArrayRef|Str', |
isa => 'Str|ArrayRef', |
22 |
); |
); |
23 |
|
|
24 |
has message => ( |
has commit_message => ( |
25 |
documentation => 'commit message', |
documentation => 'commit message', |
26 |
is => 'rw', |
is => 'rw', |
27 |
isa => 'Str', |
isa => 'Str', |
37 |
close($svk) or die "can't close svk $exec: $@"; |
close($svk) or die "can't close svk $exec: $@"; |
38 |
} |
} |
39 |
|
|
40 |
|
our $svk_status_path = '^(\w+[\+\s]+)(.+)'; |
41 |
|
|
42 |
sub modified { |
sub modified { |
43 |
my ($self) = @_; |
my ($self) = @_; |
44 |
my @modified; |
my @modified; |
45 |
my $svk = $self->svk('status -q', sub { |
my $svk = $self->svk('status -q', sub { |
46 |
push @modified, $1 if /^\w+\s+(.+)/; |
push @modified, $2 if m{$svk_status_path}; |
47 |
}); |
}); |
48 |
return @modified; |
return @modified; |
49 |
} |
} |
67 |
} |
} |
68 |
} |
} |
69 |
|
|
70 |
sub status_as_markup { |
sub commit_as_markup { |
71 |
my ($self) = @_; |
my ($self) = @_; |
72 |
my $status = `svk status -q`; |
my $status = `svk status -q`; |
73 |
$status =~ s{^(\w+\s+)(\S+)$}{$1<input name="commit_path" value="$2" type="checkbox"><a href="#$2">$2</a>}gm; |
$status =~ s{$svk_status_path}{$1 . $self->checkbox('path',$2) . qq|<a href="#$2">$2</a>|}egm; |
74 |
$self->add_css( qq| pre.l a { text-decoration: none; } | ); |
if ( $status ) { |
75 |
$status = qq| |
$self->add_css(qq| |
76 |
<form> |
pre.l a { text-decoration: none; } |
77 |
<div style="background: #ffd; float: right; padding: 1em;"> |
form.commit { |
78 |
<textarea name="message" width=20 height=4></textarea> |
background: #eee; |
79 |
<br><input type="submit" value="Commit"> |
padding: 1em 1em; |
80 |
</div> |
position: fixed; |
81 |
<pre class="l">$status</pre> |
top: 1em; |
82 |
</form> |
right: 1em; |
83 |
|; |
z-index: 10; |
84 |
$self->add_status( $status ); |
opacity: .2; |
85 |
warn "status_as_markup ",length($status)," bytes"; |
filter: alpha(opacity=20); |
86 |
|
} |
87 |
|
form.commit:hover { |
88 |
|
opacity: 1; |
89 |
|
filter: alpha(opacity=100); |
90 |
|
} |
91 |
|
| ); |
92 |
|
|
93 |
|
|
94 |
|
$status = qq| |
95 |
|
<form class="commit" method="post"> |
96 |
|
<pre class="l">$status</pre> |
97 |
|
<textarea name="commit_message" cols=40 rows=4></textarea> |
98 |
|
<br> |
99 |
|
<a target="Frey::Test::Runner" href="/Frey::Test::Runner/as_markup" title="run tests for all changes" style="float: right;">test</a> |
100 |
|
<input type="submit" name="action" value="commit"> |
101 |
|
</form> |
102 |
|
|; |
103 |
|
$self->add_status( status => $status ); |
104 |
|
warn "commit_as_markup ",length($status)," bytes"; |
105 |
|
} |
106 |
return $status; |
return $status; |
107 |
} |
} |
108 |
|
|
110 |
my ($self) = @_; |
my ($self) = @_; |
111 |
|
|
112 |
my $diff = `svk diff`; |
my $diff = `svk diff`; |
113 |
|
$self->add_status( diff => $diff ); |
114 |
|
|
115 |
|
$diff = $self->html_diff( $diff ); |
116 |
|
|
117 |
$diff = $self->html_escape( $diff ); |
sub form { |
118 |
$self->add_css( qq| |
my ( $path, $action ) = @_; |
119 |
pre span.add { background: #dfd } |
qq|<form class="inline" method="post"><input type="hidden" name="path" value="$path"><input type="submit" name="action" value="$action"></form>|; |
120 |
pre span.del { background: #fdd } |
}; |
121 |
| ); |
$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{^(\+.+?)$}{<span class="add">$1</span>}gm; |
|
|
$diff =~ s{^(\-.+?)$}{<span class="del">$1</span>}gm; |
|
|
$diff =~ s{^(===\s+)(\S+)$}{$1<a name="$2">$2</a>}gm; |
|
122 |
|
|
|
$diff = qq|<pre>$diff</pre>|; |
|
123 |
warn "diff_as_markup ",length($diff)," bytes"; |
warn "diff_as_markup ",length($diff)," bytes"; |
124 |
return $diff; |
return $diff; |
125 |
} |
} |
126 |
|
|
127 |
sub as_markup { |
sub action_as_markup { |
128 |
my ($self) = @_; |
my ($self) = @_; |
129 |
|
|
130 |
if ( ! $self->can('html_escape') ) { |
my $cmd; |
131 |
Frey::Web->meta->apply( $self ); |
|
132 |
$self->TODO( "Frey::Web role missing" ); |
if ( $self->action eq 'postpone' ) { |
133 |
|
my $old = $self->path; |
134 |
|
my $new = $old; |
135 |
|
$new =~ s{/([^/]+)$}{/.postponed.$1}; |
136 |
|
|
137 |
|
die "Allready have ", $self->path_size($new) if -e $new; |
138 |
|
$cmd = "mv $old $new && svk revert $old"; |
139 |
|
} elsif ( $self->action ) { |
140 |
|
$cmd = 'svk ' . $self->action; |
141 |
|
if ( $self->action eq 'commit' ) { |
142 |
|
my $msg = $self->commit_message || return $self->error( "need commit message\n" ); |
143 |
|
$msg =~ s{"}{\\"}gs; |
144 |
|
$cmd .= qq{ -m "$msg"}; |
145 |
|
} else { |
146 |
|
confess "need path" unless $self->path; |
147 |
|
} |
148 |
|
|
149 |
|
my @paths = eval { @{ $self->path } }; # XXX sigh! |
150 |
|
@paths = ( $self->path ) unless @paths; |
151 |
|
warn "# path ", $self->dump( @paths ); |
152 |
|
|
153 |
|
$cmd .= ' ' . join( ' ',@paths ); |
154 |
|
} |
155 |
|
if ( $cmd ) { |
156 |
|
$cmd .= ' 2>&1'; |
157 |
|
warn "# cmd $cmd"; |
158 |
|
|
159 |
|
my $out = `$cmd`; |
160 |
|
warn "# output of $cmd is: $out"; |
161 |
|
|
162 |
|
return qq| |
163 |
|
Command <tt>$cmd</tt> produced output: |
164 |
|
<pre style="background: #ff8;">$out</pre> |
165 |
|
<a href="">reload page</a> to prevent this post from triggering again<br> |
166 |
|
|; |
167 |
} |
} |
168 |
|
|
169 |
my $html |
} |
170 |
= ( $self->status_as_markup || $self->error('no status_or_markup output') ) |
|
171 |
. ( $self->diff_as_markup || $self->error('no diff_as_markup output') ) |
sub as_markup { |
172 |
; |
my ($self) = @_; |
173 |
|
|
174 |
|
my $html = $self->action_as_markup; |
175 |
|
|
176 |
|
$self->title( 'svk' . ( $self->action ? ' - ' . $self->action : '' ) ); # XXX without this we get wrong icon and title |
177 |
|
|
178 |
|
$html .= $self->commit_as_markup . $self->diff_as_markup || |
179 |
|
qq|No changes in tracked files|; |
180 |
|
|
181 |
warn "as_markup ",length($html)," bytes"; |
warn "as_markup ",length($html)," bytes"; |
182 |
|
|
183 |
return $html; |
return $html; |