stop using REMOTE_ADDR

[git.ikiwiki.info.git] / IkiWiki / Plugin / cvs.pm

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 4543489a621ed3e014ee9ca054d60ac53f951619..a9fe162a1b7957e4f10e16163bea303b36936b7c 100644 (file)
--- 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;
 
 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
 # 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_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 () {
 }
 
 sub genwrapper () {


@@ -85,6 +86,7 @@ sub getsetup () {
                plugin => {
                        safe => 0, # rcs plugin
                        rebuild => undef,
                plugin => {
                        safe => 0, # rcs plugin
                        rebuild => undef,

+                       section => "rcs",

                },
                cvsrepo => {
                        type => "string",
                },
                cvsrepo => {
                        type => "string",


@@ -181,7 +183,7 @@ sub rcs_prepedit ($) {
        return defined $rev ? $rev : "";
 }
 
        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.
        # 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 $rcstoken=shift;
        my $user=shift;
        my $ipaddr=shift;

+       my $emailuser=shift;

 
        return unless cvs_is_controlling;
 
 
        return unless cvs_is_controlling;
 


@@ -222,10 +225,10 @@ sub rcs_commit ($$$;$$) {
        return undef # success
 }
 
        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.
        # 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" : "");
 
        if (defined $user) {
                $message="web commit by $user".(length $message ? ": $message" : "");


@@ -303,7 +306,7 @@ sub rcs_rename ($$) {
        rcs_remove($src);
 }
 
        rcs_remove($src);
 }
 

-sub rcs_recentchanges($) {
+sub rcs_recentchanges ($) {

        my $num = shift;
        my @ret;
 
        my $num = shift;
        my @ret;
 


@@ -322,7 +325,7 @@ sub rcs_recentchanges($) {
        eval q{use File::ReadBackwards};
        error($@) if $@;
 
        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";
        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;
 }
 
        return $date;
 }
 

+sub rcs_getmtime ($) {
+       error "rcs_getmtime is not implemented for cvs\n"; # TODO
+}
+

 1
 1