recentchanges

[ikiwiki.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index ceb34189c0ef87ace50c110c51c8f62a2a1390a8..1b282abf938f63f0fa604e245ad877018e7740f2 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -324,9 +324,9 @@ sub loadindex () {
 sub saveindex () {
        open (OUT, ">$srcdir/.index") || error("cannot write to .index: $!");
        foreach my $page (keys %oldpagemtime) {
-       print OUT "$oldpagemtime{$page} $pagesources{$page} $renderedfiles{$page} ".
-                 join(" ", @{$links{$page}})."\n"
-                       if $oldpagemtime{$page};
+               print OUT "$oldpagemtime{$page} $pagesources{$page} $renderedfiles{$page} ".
+                       join(" ", @{$links{$page}})."\n"
+                               if $oldpagemtime{$page};
        }
        close OUT;
 }
@@ -370,39 +370,41 @@ sub rcs_recentchanges ($) {
        my $num=shift;
        my @ret;
        
-       eval {use Date::Parse};
-       eval {use Time::Duration};
+       eval q{use Date::Parse};
+       eval q{use Time::Duration};
        
        if (-d "$srcdir/.svn") {
                my $info=`LANG=C svn info $srcdir`;
                my ($svn_url)=$info=~/^URL: (.*)$/m;
 
+               # FIXME: currently assumes that the wiki is somewhere
+               # under trunk in svn, doesn't support other layouts.
+               my ($svn_base)=$svn_url=~m!(/trunk(?:/.*)?)$!;
+               
                my $div=qr/^--------------------+$/;
                my $infoline=qr/^r(\d+)\s+\|\s+([^\s]+)\s+\|\s+(\d+-\d+-\d+\s+\d+:\d+:\d+\s+[-+]?\d+).*/;
                my $state='start';
                my ($rev, $user, $when, @pages, $message);
                foreach (`LANG=C svn log -v '$svn_url'`) {
                        chomp;
-                       print STDERR "state: $state ($_)\n";
                        if ($state eq 'start' && /$div/) {
                                $state='header';
                        }
                        elsif ($state eq 'header' && /$infoline/) {
                                $rev=$1;
                                $user=$2;
-                               $when=ago(time - str2time($3));
+                               $when=concise(ago(time - str2time($3)));
                        }
-                       elsif ($state eq 'header' && /^\s+(.*)/) {
-                               push @pages, $1;
+                       elsif ($state eq 'header' && /^\s+[A-Z]\s+\Q$svn_base\E\/(.+)$/) {
+                               push @pages, pagename($1);
                        }
                        elsif ($state eq 'header' && /^$/) {
                                $state='body';
                        }
                        elsif ($state eq 'body' && /$div/) {
-                               push @ret, {rev => $rev, user => $user,
-                                       date => $when, message => $message,
-                                       pages => [@pages]},
-                               print STDERR "have: @ret\n";
+                               push @ret, { rev => $rev, user => $user,
+                                       when => $when, message => $message,
+                                       pages => [@pages] };
                                return @ret if @ret >= $num;
                                
                                $state='header';
@@ -556,7 +558,7 @@ FILE:               foreach my $file (@files) {
 sub gen_wrapper ($$) {
        my ($svn, $rebuild)=@_;
 
-       eval {use Cwd 'abs_path'};
+       eval q{use Cwd 'abs_path'};
        $srcdir=abs_path($srcdir);
        $destdir=abs_path($destdir);
        my $this=abs_path($0);
@@ -641,15 +643,12 @@ sub cgi () {
        if ($do eq 'recentchanges') {
                my $list="<ul>\n";
                foreach my $change (rcs_recentchanges(100)) {
-                       print STDERR "change: $change....\n";
                        $list.="<li>";
-                       foreach my $page (@{$change->{pages}}) {
-                               $list.=$page." ";
-                       }
+                       $list.=join(", ", map { htmllink("index", $_) } @{$change->{pages}});
                        $list.="<br>\n";
                        $list.="changed ".$change->{when}." by ".
                               htmllink("index", $change->{user}).
-                              ": <i>".$change->{message}."<br>\n";
+                              ": <i>".$change->{message}."</i>\n";
                        $list.="</li>\n";
                }
                $list.="</ul>\n";