recentchanges

[ikiwiki.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index 6cbaf8972a461e68751b75698b4b92b666a74b8f..813c38b52d6261b9fbd21d37736592b388cedb3f 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -350,16 +350,74 @@ sub rcs_commit ($) {
        }
 }
 
-sub rcs_ad ($) {
+sub rcs_add ($) {
        my $file=shift;
 
        if (-d "$srcdir/.svn") {
-               if (system("svn", "add", "--quiet", $file) != 0) {
+               my $parent=dirname($file);
+               while (! -d "$srcdir/$parent/.svn") {
+                       $file=$parent;
+                       $parent=dirname($file);
+               }
+               
+               if (system("svn", "add", "--quiet", "$srcdir/$file") != 0) {
                        warn("svn add failed\n");
                }
        }
 }
 
+sub rcs_recentchanges ($) {
+       my $num=shift;
+       my @ret;
+       
+       eval {use Date::Parse};
+       eval {use Time::Duration};
+       
+       if (-d "$srcdir/.svn") {
+               my $info=`LANG=C svn info $srcdir`;
+               my ($svn_url)=$info=~/^URL: (.*)$/m;
+
+               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));
+                       }
+                       elsif ($state eq 'header' && /^\s+(.*)/) {
+                               push @pages, $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; most recent is $ret[$#ret]\n";
+                               return @ret if @ret >= $num;
+                               
+                               $state='header';
+                               $message=$rev=$user=$when=undef;
+                               @pages=();
+                       }
+                       elsif ($state eq 'body') {
+                               $message.="$_<br>\n";
+                       }
+               }
+       }
+
+       return @ret;
+}
+
 sub prune ($) {
        my $file=shift;
 
@@ -580,11 +638,37 @@ sub cgi () {
                error("\"do\" parameter missing");
        }
        
+       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.="<br>\n";
+                       $list.="changed ".$change->{when}." by ".
+                              htmllink("index", $change->{user}).
+                              ": <i>".$change->{message}."<br>\n";
+                       $list.="</li>\n";
+               }
+               $list.="</ul>\n";
+               
+               print $q->header,
+                     $q->start_html("RecentChanges"),
+                     $q->h1("<a href=\"$url\">$wikiname</a>/ RecentChanges"),
+                     $list,
+                     $q->end_form,
+                     $q->end_html;
+               return;
+       }
+       
        my ($page)=$q->param('page')=~/$wiki_file_regexp/;
        if (! defined $page || ! length $page || $page ne $q->param('page') ||
            $page=~/$wiki_file_prune_regexp/ || $page=~/^\//) {
                error("bad page name");
        }
+       $page=lc($page);
        
        my $action=$q->request_uri;
        $action=~s/\?.*//;
@@ -596,7 +680,6 @@ sub cgi () {
                }
 
                my @page_locs;
-               my $default_loc="";
                my ($from)=$q->param('from')=~/$wiki_file_regexp/;
                if (! defined $from || ! length $from ||
                    $from ne $q->param('from') ||
@@ -604,29 +687,30 @@ sub cgi () {
                        @page_locs=$page;
                }
                else {
-                       @page_locs="$from/$page";
-                       $from=dirname($from);
+                       my $dir=$from."/";
+                       $dir=~s![^/]+/$!!;
+                       push @page_locs, $dir.$page;
                        push @page_locs, "$from/$page";
-                       $default_loc="$from/$page";
-                       while (length $from) {
-                               $from=dirname($from);
-                               push @page_locs, "$from/$page";
+                       while (length $dir) {
+                               $dir=~s![^/]+/$!!;
+                               push @page_locs, $dir.$page;
                        }
                }
                
                $q->param("do", "save");
                print $q->header,
-                     $q->start_html("$wikiname: Creating $page"),
-                     $q->h1("$wikiname: Creating $page"),
+                     $q->start_html("Creating $page"),
+                     $q->start_h1("<a href=\"$url\">$wikiname</a>/ Creating $page"),
                      $q->start_form(-action => $action),
                      $q->hidden('do'),
-                     $q->popup_menu('page', \@page_locs, $default_loc),
+                     "Select page location:",
+                     $q->popup_menu('page', \@page_locs),
                      $q->textarea(-name => 'content',
                               -default => "",
                               -rows => 20,
                               -columns => 80),
                      $q->br,
-                     "Optional comment about this change",
+                     "Optional comment about this change:",
                      $q->br,
                      $q->textfield(-name => "comments", -size => 80),
                      $q->br,
@@ -642,8 +726,8 @@ sub cgi () {
                }
                $q->param("do", "save");
                print $q->header,
-                     $q->start_html("$wikiname: Editing $page"),
-                     $q->h1("$wikiname: Editing $page"),
+                     $q->start_html("Editing $page"),
+                     $q->h1("<a href=\"$url\">$wikiname</a>/ Editing $page"),
                      $q->start_form(-action => $action),
                      $q->hidden('do'),
                      $q->hidden('page'),
@@ -652,7 +736,7 @@ sub cgi () {
                               -rows => 20,
                               -columns => 80),
                      $q->br,
-                     "Optional comment about this change",
+                     "Optional comment about this change:",
                      $q->br,
                      $q->textfield(-name => "comments", -size => 80),
                      $q->br,