--- trunk/lib/Frey/SVN.pm 2008/12/09 20:31:31 769 +++ trunk/lib/Frey/SVN.pm 2009/01/09 23:26:25 979 @@ -11,6 +11,7 @@ #with 'Frey::Storage'; use XML::Simple; +use DateTimeX::Easy; has repository => ( is => 'rw', @@ -19,25 +20,15 @@ default => 'file:///home/dpavlin/private/svn/Frey', ); -sub as_markup { - my ($self) = @_; - - # extract svk revision: r113@athlon (orig r999): dpavlin | 2005-09-01 20:38:07 +0200 - my $svk_rev_re = '\s+(r\d+@\w+(\s+\(orig\s+r\d+\))*:\s+\w+\s+\|\s+\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}\s+\+\d+)\s*'; - - sub encode { - my $foo = shift; - $foo =~ s/$svk_rev_re//gsm; - $foo =~ s/</g; - $foo =~ s/>/>/g; - $foo =~ s/"/"/g; - $foo =~ s/([\n\r][\n\r]+)/<\/p>$1
/gis;
- $foo =~ s/([\n\r]+)([\-\*]\s+)/$1
$2/gis;
- $foo =~ s/([\n\r]+)(r\d+:\s+)/$1
$2/gis;
- $foo =~ s/([\n\r]+)(\s+r\d+@)/$1
$2/gis; # svk
- return $foo;
- }
+has limit => (
+ is => 'rw',
+ isa => 'Int',
+ default => 50,
+);
+sub iterator {
+ my ($self,$coderef) = @_;
+
sub sh_regex($$) {
my ($cmd,$regex) = @_;
open(my $sh, $cmd . ' |') || die "sh_regex failed on $cmd: $!";
@@ -87,6 +78,8 @@
$cmd = "svn log -v --xml $svn_path";
}
+ $cmd .= " --limit " . $self->limit if $self->limit;
+
warn "# $cmd\n";
open(my $fh, $cmd .' |') || die "failed $cmd: $!";
my $log;
@@ -97,19 +90,73 @@
my $xml = XMLin($log, ForceArray => [ 'logentry', 'path' ]);
- our $html = '';
- sub html {
- $html .= join("\n", @_);
+ foreach my $e (@{$xml->{'logentry'}}) {
+ warn "# e = ",$self->dump( $e ) if $self->debug;
+ $coderef->($e);
}
+}
+
+sub as_markup {
+ my ($self) = @_;
+
+ # extract svk revision: r113@athlon (orig r999): dpavlin | 2005-09-01 20:38:07 +0200
+ our $svk_rev_re = '\s+(r\d+@\w+(\s+\(orig\s+r\d+\))*:\s+\w+\s+\|\s+\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}\s+\+\d+)\s*';
+
+ sub encode {
+ my $foo = shift;
+ $foo =~ s/$svk_rev_re//gsm;
+ $foo =~ s/</g;
+ $foo =~ s/>/>/g;
+ $foo =~ s/"/"/g;
+# $foo =~ s/([\n\r][\n\r]+)/$1
/gis;
+ $foo =~ s/([\n\r]+)([\-\*]\s+)/$1
$2/gis;
+ $foo =~ s/([\n\r]+)(r\d+:\s+)/$1
$2/gis;
+ $foo =~ s/([\n\r]+)(\s+r\d+@)/$1
$2/gis; # svk
+ return $foo;
+ }
+
+ our $html = qq|
'.$date.' ',$e->{'author'},' r',$e->{'revision'},'
'; + my $msg = $e->{'msg'}; + $msg = '' if ref($msg); # FIXME why do I need this, dammit? + if ( $msg ) { + $msg = encode( $msg ); + $msg = qq| |; + } my @files; @@ -120,16 +167,54 @@ push @files, "$path"; } elsif ($action eq "D") { push @files, "'; + $html .= qq| +',join(", ",@files),': ',encode($e->{'msg'}),'