X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/0c7bcdaa297ef38f7596cc2298a6ed6714b0529a..e12e98f95855bf250c349a56985bc4c803aa0c05:/ikiwiki

diff --git a/ikiwiki b/ikiwiki
index b57611b66..f533cd096 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -167,9 +167,10 @@ sub isinlinableimage ($) {
 	$file=~/\.(png|gif|jpg|jpeg)$/;
 }
 
-sub htmllink ($$) {
+sub htmllink {
 	my $page=shift;
 	my $link=shift;
+	my $noimagelink=shift;
 
 	my $bestlink=bestlink($page, $link);
 
@@ -188,7 +189,7 @@ sub htmllink ($$) {
 	
 	$bestlink=File::Spec->abs2rel($bestlink, dirname($page));
 	
-	if (isinlinableimage($bestlink)) {
+	if (! $noimagelink && isinlinableimage($bestlink)) {
 		return "<img src=\"$bestlink\">";
 	}
 	return "<a href=\"$bestlink\">$link</a>";
@@ -324,9 +325,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;
 }
@@ -350,16 +351,76 @@ 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 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;
+			if ($state eq 'start' && /$div/) {
+				$state='header';
+			}
+			elsif ($state eq 'header' && /$infoline/) {
+				$rev=$1;
+				$user=$2;
+				$when=concise(ago(time - str2time($3)));
+		    	}
+			elsif ($state eq 'header' && /^\s+[A-Z]\s+\Q$svn_base\E\/(.+)$/) {
+				push @pages, pagename($1) if length $1;
+			}
+			elsif ($state eq 'header' && /^$/) {
+				$state='body';
+			}
+			elsif ($state eq 'body' && /$div/) {
+				push @ret, { rev => $rev, user => $user,
+					when => $when, message => $message,
+					pages => [@pages] } if @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;
 
@@ -498,7 +559,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);
@@ -580,6 +641,28 @@ sub cgi () {
 		error("\"do\" parameter missing");
 	}
 	
+	if ($do eq 'recentchanges') {
+		my $list="<ul>\n";
+		foreach my $change (rcs_recentchanges(100)) {
+			$list.="<li>";
+			$list.=join(", ", map { htmllink("", $_, 1) } @{$change->{pages}});
+			$list.="<br>\n";
+			$list.="changed ".$change->{when}." by ".
+			       htmllink("", $change->{user}, 1).
+			       ": <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 +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') ||
@@ -605,23 +687,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";
+			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:",
-		      $q->popup_menu('page', \@page_locs, $default_loc),
+		      $q->popup_menu('page', \@page_locs),
 		      $q->textarea(-name => 'content',
 		               -default => "",
 		               -rows => 20,
@@ -643,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'),