X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9ef4b5e677919f95dd2aa08ca51a0313c6c5542d..4292802ee5f93f7ec7644c5d0a30f7ffeb95e566:/IkiWiki/Plugin/cvs.pm

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 4543489a6..a9fe162a1 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -1,7 +1,7 @@
-#!/usr/pkg/bin/perl
+#!/usr/bin/perl
 package IkiWiki::Plugin::cvs;
 
-# Copyright (c) 2008 Amitai Schlair
+# Copyright (c) 2009 Amitai Schlair
 # All rights reserved.
 #
 # This code is derived from software contributed to ikiwiki
@@ -49,6 +49,7 @@ sub import {
 	hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
 	hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
+	hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime);
 }
 
 sub genwrapper () {
@@ -85,6 +86,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0, # rcs plugin
 			rebuild => undef,
+			section => "rcs",
 		},
 		cvsrepo => {
 			type => "string",
@@ -181,7 +183,7 @@ sub rcs_prepedit ($) {
 	return defined $rev ? $rev : "";
 }
 
-sub rcs_commit ($$$;$$) {
+sub rcs_commit ($$$;$$$) {
 	# Tries to commit the page; returns undef on _success_ and
 	# a version of the page with the rcs's conflict markers on failure.
 	# The file is relative to the srcdir.
@@ -190,6 +192,7 @@ sub rcs_commit ($$$;$$) {
 	my $rcstoken=shift;
 	my $user=shift;
 	my $ipaddr=shift;
+	my $emailuser=shift;
 
 	return unless cvs_is_controlling;
 
@@ -222,10 +225,10 @@ sub rcs_commit ($$$;$$) {
 	return undef # success
 }
 
-sub rcs_commit_staged ($$$) {
+sub rcs_commit_staged ($$$;$) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
 	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr)=@_;
+	my ($message, $user, $ipaddr, $emailuser)=@_;
 
 	if (defined $user) {
 		$message="web commit by $user".(length $message ? ": $message" : "");
@@ -303,7 +306,7 @@ sub rcs_rename ($$) {
 	rcs_remove($src);
 }
 
-sub rcs_recentchanges($) {
+sub rcs_recentchanges ($) {
 	my $num = shift;
 	my @ret;
 
@@ -322,7 +325,7 @@ sub rcs_recentchanges($) {
 	eval q{use File::ReadBackwards};
 	error($@) if $@;
 
-	my (undef, $tmpfile) = tempfile(OPEN=>0);
+	my ($tmphandle, $tmpfile) = tempfile();
 	system("env TZ=UTC cvsps -q --cvs-direct -z 30 -x >$tmpfile");
 	if ($? == -1) {
 		error "couldn't run cvsps: $!\n";
@@ -484,4 +487,8 @@ sub rcs_getctime ($) {
 	return $date;
 }
 
+sub rcs_getmtime ($) {
+	error "rcs_getmtime is not implemented for cvs\n"; # TODO
+}
+
 1