Merge branch 'master' into recentchanges

IkiWiki/Rcs/Stub.pm

@@ -37,7 +37,7 @@ sub rcs_recentchanges ($) {
 	# Examine the RCS history and generate a list of recent changes.
 	# The data structure returned for each change is:
 	# {
-	# 	id => # the RCSs id for this commit
+	# 	rev => # the RCSs id for this commit
 	# 	user => # name of user who made the change,
 	# 	committype => # either "web" or the name of the rcs,
 	# 	when => # time when the change was made,

IkiWiki/Rcs/git.pm

@@ -407,7 +407,7 @@ sub rcs_recentchanges ($) { #{{{
 		}
 
 		push @rets, {
-			id         => $sha1,
+			rev        => $sha1,
 			user       => $user,
 			committype => $type,
 			when       => $when,

IkiWiki/Rcs/mercurial.pm

@@ -139,7 +139,7 @@ sub rcs_recentchanges ($) { #{{{
 		$user =~ s/^\s*//;
 
 		push @ret, {
-			id         => $info->{"changeset"},
+			rev        => $info->{"changeset"},
 			user       => $user,
 			committype => "mercurial",
 			when       => time - str2time($info->{"date"}),

IkiWiki/Rcs/monotone.pm

@@ -438,7 +438,7 @@ sub rcs_recentchanges ($) { #{{{
 		}
 		
 		push @ret, {
-			id => $rev,
+			rev => $rev,
 			user => $user,
 			committype => $committype,
 			when => $when,

IkiWiki/Rcs/svn.pm

@@ -204,7 +204,7 @@ sub rcs_recentchanges ($) { #{{{
 			} if length $file;
 		}
 		push @ret, {
-			id => $rev,
+			rev => $rev,
 			user => $user,
 			committype => $committype,
 			when => $when,

IkiWiki/Rcs/tla.pm

@@ -146,7 +146,7 @@ sub rcs_recentchanges ($) {
 			} if length $file;
 		}
 		push @ret, {
-			id => $change,
+			rev => $change,
 			user => $user,
 			committype => $committype,
 			when => $when,