X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/71b33c979f97725cabb7923c618b016e4d6e35a3..47d594bde1884a41e0902cfcb7128d473a73ad1f:/ikiwiki

diff --git a/ikiwiki b/ikiwiki
index a9f76d3fe..1db4a0a4b 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -350,16 +350,72 @@ 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;
+			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,
+					when => $when, message => $message,
+					pages => [@pages] };
+				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,6 +636,30 @@ sub cgi () {
 		error("\"do\" parameter missing");
 	}
 	
+	if ($do eq 'recentchanges') {
+		my $list="<ul>\n";
+		foreach my $change (rcs_recentchanges(100)) {
+			$list.="<li>";
+			foreach my $page (@{$change->{pages}}) {
+				$list.=$page." ";
+			}
+			$list.="<br>\n";
+			$list.="changed ".$change->{when}." by ".
+			       htmllink("index", $change->{user}).
+			       ": <i>".$change->{message}."</i>\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=~/^\//) {
@@ -597,7 +677,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') ||
@@ -605,24 +684,24 @@ sub cgi () {
 			@page_locs=$page;
 		}
 		else {
-			@page_locs="$from/$page";
-			$from=dirname($from);
-			$default_loc="$from/$page";
-			while (length $from) {
-				push @page_locs, "$from/$page";
-				$from=dirname($from);
+			my $dir=$from."/";
+			$dir=~s![^/]+/$!!;
+			push @page_locs, $dir.$page;
+			push @page_locs, "$from/$page";
+			while (length $dir) {
+				$dir=~s![^/]+/$!!;
+				push @page_locs, $dir.$page;
 			}
-			push @page_locs, $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'),
-		      "Select page location: ($default_loc)",
-		      $q->popup_menu('page', \@page_locs, $default_loc),
+		      "Select page location:",
+		      $q->popup_menu('page', \@page_locs),
 		      $q->textarea(-name => 'content',
 		               -default => "",
 		               -rows => 20,
@@ -644,8 +723,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'),