/[Frey]/trunk/lib/Frey/SVK.pm
This is repository of my old source code which isn't updated any more. Go to git.rot13.org for current projects!
ViewVC logotype

Diff of /trunk/lib/Frey/SVK.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 626 by dpavlin, Sat Nov 29 21:55:53 2008 UTC revision 681 by dpavlin, Tue Dec 2 17:34:23 2008 UTC
# Line 3  use Moose; Line 3  use Moose;
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',
# Line 106  sub diff_as_markup { Line 107  sub diff_as_markup {
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";
# Line 121  sub as_markup { Line 126  sub as_markup {
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;
# Line 132  sub as_markup { Line 145  sub as_markup {
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
# Line 145  sub as_markup { Line 161  sub as_markup {
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    
Legend:
Removed from v.626  
changed lines
  Added in v.681
  ViewVC Help
Powered by ViewVC 1.1.26