--- trunk/lib/Frey/SVN.pm	2009/01/24 19:35:41	1013
+++ trunk/lib/Frey/SVN.pm	2009/04/27 19:55:32	1067
@@ -8,10 +8,12 @@
 
 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;
 
 has repository => (
 	is => 'rw',
@@ -31,6 +33,18 @@
 	default => 50,
 );
 
+has include_diff => (
+	is => 'ro',
+	isa => 'Bool',
+	default => 1,
+);
+
+has file_stats => (
+	is => 'ro',
+	isa => 'Bool',
+	default => 1,
+);
+
 sub iterator {
 	my ($self,$coderef) = @_;
 	
@@ -57,10 +71,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 +113,34 @@
 
 	foreach my $e (@{$xml->{'logentry'}}) {
 		warn "# e = ",$self->dump( $e ) if $self->debug;
+
+		if ( $self->include_diff || $self->file_stats ) {
+			my $rev = $e->{'revision'};
+			my $file = $svn_path;
+			$file =~ s{^\w+:/+}{};
+			my $file = "var/svn/$file/$rev.diff";
+			my $diff = $self->load( $file );
+			if ( ! $diff ) {
+				$diff = `svn diff -c $rev $svn_path`;
+				$self->store( $file, $diff );
+			}
+
+			$e->{diff} .= $diff if $self->include_diff;
+
+			$e->{diff_paths}->{rev} = $rev; # XXX debug
+
+			my $diff_path;
+			foreach my $line ( split(/[\n\r]/, $diff ) ) {
+				if ( $line =~ m{^\+\+\+ (\S+)} ) {
+					$diff_path = "/$1"; # subversion paths start with /
+				} elsif ( $line =~ m{^\+} ) {
+					$e->{diff_paths}->{$diff_path}->{added}++;
+				} elsif ( $line =~ m{^-} ) {
+					$e->{diff_paths}->{$diff_path}->{removed}++;
+				}
+			}
+		}
+
 		$coderef->($e);
 	}
 }
@@ -193,6 +237,10 @@
 			$path_count->{$path}++;
 		}
 
+		my $diff = $self->html_diff( $e->{diff} ) if $e->{diff};
+
+		$html .= $self->dump( $e->{diff_paths} );
+
 		$html .= qq|
 			<div class="commit">
 				<span class="date">$date</span>
@@ -210,6 +258,7 @@
 				. qq|
 				</div>
 				$msg
+				$diff
 			</div>
 		|;
 
@@ -242,7 +291,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 ( defined   $e->{diff_paths}->{$path} ) {
+				$weight  = $e->{diff_paths}->{$path}->{removed};
+				$weight += $e->{diff_paths}->{$path}->{added} * 2;
+				$weight  = qq| weight="$weight" |;
+			}
+			$file_events .= qq|\t<event filename="$path" date="$date" author="$author"$weight/>\n|;
 		}
 
 	});