| 3 |
|
|
| 4 |
extends 'Frey'; |
extends 'Frey'; |
| 5 |
with 'Frey::Web'; |
with 'Frey::Web'; |
| 6 |
|
with 'Frey::Path'; |
| 7 |
|
|
| 8 |
has commit_path => ( |
use Moose::Util::TypeConstraints; |
| 9 |
documentation => 'path to commit', |
|
| 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', |
is => 'rw', |
| 20 |
isa => 'Str', |
isa => 'Str', |
| 21 |
); |
); |
| 22 |
|
|
| 23 |
has message => ( |
has commit_message => ( |
| 24 |
documentation => 'commit message', |
documentation => 'commit message', |
| 25 |
is => 'rw', |
is => 'rw', |
| 26 |
isa => 'Str', |
isa => 'Str', |
| 67 |
sub status_as_markup { |
sub status_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<a href="#$2">$2</a>}gm; |
# $status =~ s{^(\w+\s+)(\S+)$}{$1<input name="commit_path" value="$2" type="checkbox"><a href="#$2">$2</a>}gm; # FIXME |
| 71 |
$self->add_css( qq| pre.l a { text-decoration: none; } | ); |
$status =~ s{^(\w+[\+\s]+)(\S+)$}{$1<a href="#$2">$2</a>}gm; |
| 72 |
$status = qq|<pre class="l">$status</pre>|; |
if ( $status ) { |
| 73 |
$self->add_status( $status ); |
$self->add_css(qq| |
| 74 |
|
pre.l a { text-decoration: none; } |
| 75 |
|
div.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 |
|
$status = qq| |
| 86 |
|
<div class="commit" method="post"> |
| 87 |
|
<form> |
| 88 |
|
<textarea name="commit_message" cols=40 rows=4></textarea> |
| 89 |
|
<br><input type="submit" name="action" value="commit"> |
| 90 |
|
</form> |
| 91 |
|
</div> |
| 92 |
|
<pre class="l">$status</pre> |
| 93 |
|
|; |
| 94 |
|
$self->add_status( $status ); |
| 95 |
|
|
| 96 |
|
} |
| 97 |
warn "status_as_markup ",length($status)," bytes"; |
warn "status_as_markup ",length($status)," bytes"; |
| 98 |
return $status; |
return $status; |
| 99 |
} |
} |
| 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.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<a name="$2">$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"; |
| 125 |
sub as_markup { |
sub as_markup { |
| 126 |
my ($self) = @_; |
my ($self) = @_; |
| 127 |
|
|
| 128 |
if ( ! $self->can('html_escape') ) { |
my $html = ''; |
| 129 |
Frey::Web->meta->apply( $self ); |
my $cmd; |
| 130 |
$self->TODO( "Frey::Web role missing" ); |
|
| 131 |
|
if ( $self->action eq 'postpone' ) { |
| 132 |
|
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' ) { |
| 141 |
|
confess "need commit message" unless $self->commit_message; |
| 142 |
|
my $msg = $self->commit_message; |
| 143 |
|
$msg =~ s{"}{\\"}gs; |
| 144 |
|
$cmd .= qq{ -m "$msg"}; |
| 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 |
my $html = $self->status_as_markup . $self->diff_as_markup; |
$self->title( 'svk' . ( $self->action ? ' - ' . $self->action : '' ) ); # XXX without this we get wrong icon and title |
| 163 |
|
|
| 164 |
|
$html .= $self->status_as_markup || 'No changes in files tracked by SVK'; |
| 165 |
|
$html .= $self->diff_as_markup; |
| 166 |
|
|
| 167 |
warn "as_markup ",length($html)," bytes"; |
warn "as_markup ",length($html)," bytes"; |
| 168 |
|
|
| 169 |
return $html; |
return $html; |
Parent Directory
| 
Revision Log
| 
Patch