3 |
|
|
4 |
extends 'Frey'; |
extends 'Frey'; |
5 |
with 'Frey::Web'; |
with 'Frey::Web'; |
6 |
|
with 'Frey::Path'; |
7 |
|
|
8 |
|
use Moose::Util::TypeConstraints; |
9 |
|
|
10 |
|
enum 'SVK_Action' => ( 'commit', 'revert', 'postpone' ); |
11 |
|
|
12 |
|
has action => ( |
13 |
|
is => 'rw', |
14 |
|
isa => 'SVK_Action', |
15 |
|
); |
16 |
|
|
17 |
|
has path => ( |
18 |
|
documentation => 'path to work with', |
19 |
|
is => 'rw', |
20 |
|
isa => 'Str', |
21 |
|
); |
22 |
|
|
23 |
|
has commit_message => ( |
24 |
|
documentation => 'commit message', |
25 |
|
is => 'rw', |
26 |
|
isa => 'Str', |
27 |
|
); |
28 |
|
|
29 |
sub svk { |
sub svk { |
30 |
my ( $self, $exec, $coderef ) = @_; |
my ( $self, $exec, $coderef ) = @_; |
40 |
my ($self) = @_; |
my ($self) = @_; |
41 |
my @modified; |
my @modified; |
42 |
my $svk = $self->svk('status -q', sub { |
my $svk = $self->svk('status -q', sub { |
43 |
push @modified, $1 if /^M\s+(.+)/; |
push @modified, $1 if /^\w+\s+(.+)/; |
44 |
}); |
}); |
45 |
return @modified; |
return @modified; |
46 |
} |
} |
53 |
my ( $label, $value ) = split(/:\s+/, $_, 2); |
my ( $label, $value ) = split(/:\s+/, $_, 2); |
54 |
$info->{$label} = $value if $label; |
$info->{$label} = $value if $label; |
55 |
}); |
}); |
56 |
|
warn "# svk info ",$self->dump( $info ); |
57 |
return $info; |
return $info; |
58 |
} |
} |
59 |
|
|
64 |
} |
} |
65 |
} |
} |
66 |
|
|
67 |
sub as_markup { |
sub commit_as_markup { |
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 |
71 |
|
# $status =~ s{^(\w+[\+\s]+)(\S+)$}{$1<a href="#$2">$2</a>}gm; |
72 |
|
if ( $status ) { |
73 |
|
$self->add_css(qq| |
74 |
|
pre.l a { text-decoration: none; } |
75 |
|
form.commit { |
76 |
|
background: #ffd; |
77 |
|
padding: 1em 1em; |
78 |
|
position: fixed; |
79 |
|
top: 1em; |
80 |
|
right: 1em; |
81 |
|
z-index: 10; |
82 |
|
} |
83 |
|
| ); |
84 |
|
|
85 |
|
|
86 |
|
$status = qq| |
87 |
|
<form class="commit" method="post"> |
88 |
|
<pre class="l">$status</pre> |
89 |
|
<textarea name="commit_message" cols=40 rows=4></textarea> |
90 |
|
<br><input type="submit" name="action" value="commit"> |
91 |
|
</form> |
92 |
|
|; |
93 |
|
$self->add_status( status => $status ); |
94 |
|
warn "commit_as_markup ",length($status)," bytes"; |
95 |
|
} |
96 |
|
return $status; |
97 |
|
} |
98 |
|
|
99 |
|
sub diff_as_markup { |
100 |
|
my ($self) = @_; |
101 |
|
|
102 |
my $diff = `svk diff`; |
my $diff = `svk diff`; |
103 |
|
$self->add_status( diff => $diff ); |
104 |
|
|
105 |
|
$diff = $self->html_escape( $diff ); |
106 |
|
$self->add_css( qq| |
107 |
|
pre span.add { background: #dfd } |
108 |
|
pre span.del { background: #fdd } |
109 |
|
pre form.inline { display: inline } |
110 |
|
| ); |
111 |
|
$diff =~ s{^(\+.+?)$}{<span class="add">$1</span>}gm; |
112 |
|
$diff =~ s{^(\-.+?)$}{<span class="del">$1</span>}gm; |
113 |
|
sub form { |
114 |
|
my ( $path, $action ) = @_; |
115 |
|
qq|<form class="inline"><input type="hidden" name="path" value="$path"><input type="submit" name="action" value="$action"></form>|; |
116 |
|
}; |
117 |
|
$diff =~ s{^(===\s+)(\S+)$}{$1 . form($2,'revert') . qq| <a name="$2" target="editor" href="/editor+$2+1">$2</a> | . form($2,'postpone') }gem; |
118 |
|
|
119 |
|
$diff = qq|<pre>$diff</pre>|; |
120 |
|
warn "diff_as_markup ",length($diff)," bytes"; |
121 |
|
return $diff; |
122 |
|
} |
123 |
|
|
124 |
|
sub as_markup { |
125 |
|
my ($self) = @_; |
126 |
|
|
127 |
|
my $html = ''; |
128 |
|
my $cmd; |
129 |
|
|
130 |
|
if ( $self->action eq 'postpone' ) { |
131 |
|
my $old = $self->path; |
132 |
|
my $new = $old; |
133 |
|
$new =~ s{/([^/]+)$}{/.postponed.$1}; |
134 |
|
|
135 |
|
die "Allready have ", $self->path_size($new) if -e $new; |
136 |
|
$cmd = "mv $old $new && svk revert $old"; |
137 |
|
} elsif ( $self->action ) { |
138 |
|
$cmd = 'svk ' . $self->action; |
139 |
|
if ( $self->action eq 'commit' ) { |
140 |
|
my $msg = $self->commit_message || confess "need commit message"; |
141 |
|
$msg =~ s{"}{\\"}gs; |
142 |
|
$cmd .= qq{ -m "$msg"}; |
143 |
|
} elsif ( my $path = $self->path ) { |
144 |
|
$cmd .= " $path"; |
145 |
|
} else { |
146 |
|
confess "need path" unless $self->path; |
147 |
|
} |
148 |
|
} |
149 |
|
if ( $cmd ) { |
150 |
|
$cmd .= ' 2>&1'; |
151 |
|
my $out = `$cmd`; |
152 |
|
warn "$cmd $out"; |
153 |
|
|
154 |
|
$html .= qq| |
155 |
|
<code style="background: #ff8;"> |
156 |
|
$cmd\n |
157 |
|
<b>$out</b> |
158 |
|
</code> |
159 |
|
|; |
160 |
|
} |
161 |
|
|
162 |
|
$self->title( 'svk' . ( $self->action ? ' - ' . $self->action : '' ) ); # XXX without this we get wrong icon and title |
163 |
|
|
164 |
|
$html .= $self->commit_as_markup . $self->diff_as_markup; |
165 |
|
|
166 |
my $html |
warn "as_markup ",length($html)," bytes"; |
|
= qq|<pre>$status</pre><hr><pre>| |
|
|
# . $self->html_escape( $diff ) |
|
|
. $diff |
|
|
. qq|</pre>| |
|
|
; |
|
|
warn "diff ",length($html)," bytes"; |
|
167 |
|
|
168 |
return $html; |
return $html; |
169 |
} |
} |