recentchanges

[ikiwiki.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index a89b24bb7ec962724a2411c5ba21522f6e693505..778ee47c97e76eafc8a88e4345cc361068a3b079 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -379,9 +379,9 @@ sub rcs_recentchanges ($) {
                my $info=`LANG=C svn info $srcdir`;
                my ($svn_url)=$info=~/^URL: (.*)$/m;
 
-               # FIXME: currently assumes that the wiki is under trunk in
-               # svn.
-               my ($svn_base)=$svn_url=~m!(/trunk/.*)!;
+               # 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+).*/;
@@ -397,7 +397,7 @@ sub rcs_recentchanges ($) {
                                $user=$2;
                                $when=concise(ago(time - str2time($3)));
                        }
-                       elsif ($state eq 'header' && /^\s+[A-Z]\s+\Q$svn_base\E(.+)$/) {
+                       elsif ($state eq 'header' && /^\s+[A-Z]\s+\Q$svn_base\E\/(.+)$/) {
                                push @pages, $1;
                        }
                        elsif ($state eq 'header' && /^$/) {