--- trunk/lib/Frey/SVN.pm	2009/01/24 19:35:41	1013
+++ trunk/lib/Frey/SVN.pm	2009/04/28 22:36:26	1073
@@ -8,10 +8,13 @@
 
 extends 'Frey';
 with 'Frey::Web';
-#with 'Frey::Storage';
+with 'Frey::Storage';
+with 'Frey::HTML::Diff';
 
 use XML::Simple;
 use DateTimeX::Easy;
+use Text::Diff::Parser;
+use File::Path qw/mkpath/;
 
 has repository => (
 	is => 'rw',
@@ -31,6 +34,18 @@
 	default => 50,
 );
 
+has include_diff => (
+	is => 'ro',
+	isa => 'Bool',
+	default => 0,
+);
+
+has file_stats => (
+	is => 'ro',
+	isa => 'Bool',
+	default => 1,
+);
+
 sub iterator {
 	my ($self,$coderef) = @_;
 	
@@ -57,10 +72,12 @@
 	warn "# path $path\n";
 
 	my $cmd;
+	my $svn_path = $path;
+
 	if ($path =~ m#file://# || -e "$path/.svn") {
 		$cmd = "svn log -v --xml $path";
 	} else {
-		my $svn_path = sh_regex('svk info', qr#Mirrored From:\s+([^,]+)#i);
+		$svn_path = sh_regex('svk info', qr#Mirrored From:\s+([^,]+)#i);
 
 		if (! $svn_path) {
 
@@ -97,6 +114,46 @@
 
 	foreach my $e (@{$xml->{'logentry'}}) {
 		warn "# e = ",$self->dump( $e ) if $self->debug;
+
+		if ( $self->include_diff || $self->file_stats ) {
+			my $rev = $e->{'revision'};
+
+			$e->{diff_paths}->{rev} = $rev; # XXX debug
+
+			my $cache = $svn_path;
+			$cache =~ s{^\w+:/+}{};
+			$cache = "var/svn/$cache";
+			mkpath $cache unless -e $cache;
+			my $diff_paths = $self->load( "$cache/$rev.yaml" );
+			if ( ! $diff_paths ) {
+				my $cmd = "svn diff -c $rev $svn_path";
+				my ( $diff_fh, $diff_out );
+				my $diff_file = "$cache/$rev.diff";
+
+				open($diff_fh, '-|', $cmd)       || die "can't open pipe from $cmd: $!";
+				open($diff_out,'>' , $diff_file) || die "can't write $diff_file: $!";
+				warn "# creating $diff_file from $cmd\n";
+
+				my $diff_path;
+
+				while( <$diff_fh> ) {
+					print $diff_out $_;
+
+					if ( m{^\+\+\+ (\S+)} ) {
+						$diff_path = "/$1"; # subversion paths start with /
+					} elsif ( m{^\+} && $diff_path ) {
+						$diff_paths->{$diff_path}->{added}++;
+					} elsif ( m{^-} && $diff_path ) {
+						$diff_paths->{$diff_path}->{removed}++;
+					}
+				}
+
+				$self->store( "$cache/$rev.yaml", $diff_paths );
+			}
+			$e->{diff}       = $self->load( "$cache/$rev.diff" ) if $self->include_diff;
+			$e->{diff_paths} = $self->load( "$cache/$rev.yaml" );
+		}
+
 		$coderef->($e);
 	}
 }
@@ -159,6 +216,7 @@
 
 	my $max_path_len = 0;
 	my $path_count;
+	my $stats;
 
 	$self->iterator( sub {
 		my $e = shift;
@@ -191,8 +249,25 @@
 
 			$max_path_len = length $path if length $path > $max_path_len;
 			$path_count->{$path}++;
+
+			if ( my $added = $e->{diff_paths}->{$path}->{added} ) {
+				$stats->{total_added} += $added;
+			}
+
+			if ( my $removed = $e->{diff_paths}->{$path}->{removed} ) {
+				$stats->{total_removed} += $removed;
+			}
 		}
 
+		my $diff = $self->html_diff( $e->{diff} ) if $e->{diff};
+
+		$self->add_css(qq|
+			.diff-lines {
+				margin-left: 1em;
+				float: right;
+			}
+		|);
+
 		$html .= qq|
 			<div class="commit">
 				<span class="date">$date</span>
@@ -204,17 +279,42 @@
 					map {
 						my $path = $_;
 						$path =~ s{<[^>]+>}{}g;
-						qq|<a href="?repository=$repository;path=$path" title="$path ##">$_</a>|
+						my $diff = '';
+						if ( $diff = $e->{diff_paths}->{$path} ) {
+							$diff
+							= qq|<span class="diff-lines">|
+							. join(" ",
+								map {
+									my $v = $diff->{$_};
+									s[added][+$v];
+									s[removed][-$v];
+									$_;
+								} keys %$diff
+							)
+							. qq|</span>|
+							;
+							warn "DIFF $diff";
+						}
+
+						qq|$diff<a href="?repository=$repository;path=$path" title="$path ##">$_</a>|
 					} @files
 				)
 				. qq|
 				</div>
 				$msg
+				$diff
 			</div>
 		|;
 
 	});
 
+	$max_path_len +=
+	      length( $stats->{total_added} )
+		+ length( $stats->{total_removed} )
+		;
+
+	$max_path_len += int( $max_path_len / 10 ); # we are using ex, so we add 10%
+
 	$self->add_css(qq|
 		.files {
 			width: ${max_path_len}ex;
@@ -223,6 +323,8 @@
 
 	$html =~ s[title="(\S+) ##"]['title="' . $path_count->{$1} . '"']gse;
 
+	$html .= $self->dump( 'stats', $stats );
+
 	return $html;
 }
 
@@ -242,7 +344,13 @@
 
 		foreach my $p (@{$e->{'paths'}->{'path'}}) {
 			my ($action,$path) = ($p->{'action'},$p->{'content'});
-			$file_events .= qq|\t<event filename="$path" date="$date" author="$author" />\n|;
+			my $weight = '';
+			if ( my $s = $e->{diff_paths}->{$path} ) {
+				$weight  = $s->{removed}   if defined $s->{removed};
+				$weight += $s->{added} * 2 if defined $s->{added};
+				$weight  = qq| weight="$weight" |;
+			}
+			$file_events .= qq|\t<event filename="$path" date="$date" author="$author"$weight/>\n|;
 		}
 
 	});