(no commit message)

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

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 60f5372eb01813017245f28fe16785b7051e3d9b..f6db8bc98b0f723feb40363eb7978ffc469c9ab9 100644 (file)
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -1,11 +1,42 @@
-#!/usr/pkg/bin/perl
+#!/usr/bin/perl

 package IkiWiki::Plugin::cvs;
 
 package IkiWiki::Plugin::cvs;
 

+# Copyright (c) 2009 Amitai Schlair
+# All rights reserved.
+#
+# This code is derived from software contributed to ikiwiki
+# by Amitai Schlair.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY IKIWIKI AND CONTRIBUTORS ``AS IS''
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION
+# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+

 use warnings;
 use strict;
 use IkiWiki;
 
 use warnings;
 use strict;
 use IkiWiki;
 

+use File::chdir;
+

 sub import {
 sub import {

+       hook(type => "genwrapper", id => "cvs", call => \&genwrapper);

        hook(type => "checkconfig", id => "cvs", call => \&checkconfig);
        hook(type => "getsetup", id => "cvs", call => \&getsetup);
        hook(type => "rcs", id => "rcs_update", call => \&rcs_update);
        hook(type => "checkconfig", id => "cvs", call => \&checkconfig);
        hook(type => "getsetup", id => "cvs", call => \&getsetup);
        hook(type => "rcs", id => "rcs_update", call => \&rcs_update);


@@ -20,6 +51,17 @@ sub import {
        hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
 }
 
        hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
 }
 

+sub genwrapper () {
+       return <<EOF;
+       {
+               int j;
+               for (j = 1; j < argc; j++)
+                       if (strstr(argv[j], "New directory") != NULL)
+                               exit(0);
+       }
+EOF
+}
+

 sub checkconfig () {
        if (! defined $config{cvspath}) {
                $config{cvspath}="ikiwiki";
 sub checkconfig () {
        if (! defined $config{cvspath}) {
                $config{cvspath}="ikiwiki";


@@ -61,7 +103,7 @@ sub getsetup () {
                cvs_wrapper => {
                        type => "string",
                        example => "/cvs/wikirepo/CVSROOT/post-commit",
                cvs_wrapper => {
                        type => "string",
                        example => "/cvs/wikirepo/CVSROOT/post-commit",

-                       description => "cvs post-commit hook to generate (triggered by CVSROOT/loginfo entry",
+                       description => "cvs post-commit hook to generate (triggered by CVSROOT/loginfo entry)",

                        safe => 0, # file
                        rebuild => 0,
                },
                        safe => 0, # file
                        rebuild => 0,
                },


@@ -92,7 +134,7 @@ sub cvs_info ($$) {
        my $field=shift;
        my $file=shift;
 
        my $field=shift;
        my $file=shift;
 

-       chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
+       local $CWD = $config{srcdir};

 
        my $info=`cvs status $file`;
        my ($ret)=$info=~/^\s*$field:\s*(\S+)/m;
 
        my $info=`cvs status $file`;
        my ($ret)=$info=~/^\s*$field:\s*(\S+)/m;


@@ -103,12 +145,12 @@ sub cvs_runcvs(@) {
        my @cmd = @_;
        unshift @cmd, 'cvs', '-Q';
 
        my @cmd = @_;
        unshift @cmd, 'cvs', '-Q';
 

-       chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
+       local $CWD = $config{srcdir};

 
 

-       open(my $savederr, ">&STDERR");
-       open(STDERR, ">", "/dev/null");
+       open(my $savedout, ">&STDOUT");
+       open(STDOUT, ">", "/dev/null");

        my $ret = system(@cmd);
        my $ret = system(@cmd);

-       open(STDERR, ">$savederr");
+       open(STDOUT, ">&", $savedout);

 
        return ($ret == 0) ? 1 : 0;
 }
 
        return ($ret == 0) ? 1 : 0;
 }


@@ -221,11 +263,13 @@ sub rcs_add ($) {
                        if (defined($filemime) && $filemime eq 'text/plain') {
                                cvs_runcvs('add', $file) ||
                                        warn("cvs add $file failed\n");
                        if (defined($filemime) && $filemime eq 'text/plain') {
                                cvs_runcvs('add', $file) ||
                                        warn("cvs add $file failed\n");

-                       } else {
+                       }
+                       else {

                                cvs_runcvs('add', '-kb', $file) ||
                                        warn("cvs add binary $file failed\n");
                        }
                                cvs_runcvs('add', '-kb', $file) ||
                                        warn("cvs add binary $file failed\n");
                        }

-               } else {
+               }
+               else {

                        # directory
                        cvs_runcvs('add', $file) ||
                                warn("cvs add $file failed\n");
                        # directory
                        cvs_runcvs('add', $file) ||
                                warn("cvs add $file failed\n");


@@ -249,7 +293,7 @@ sub rcs_rename ($$) {
 
        return unless cvs_is_controlling;
 
 
        return unless cvs_is_controlling;
 

-       chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
+       local $CWD = $config{srcdir};

 
        if (system("mv", "$src", "$dest") != 0) {
                warn("filesystem rename failed\n");
 
        if (system("mv", "$src", "$dest") != 0) {
                warn("filesystem rename failed\n");


@@ -268,7 +312,7 @@ sub rcs_recentchanges($) {
        eval q{use Date::Parse};
        error($@) if $@;
 
        eval q{use Date::Parse};
        error($@) if $@;
 

-       chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
+       local $CWD = $config{srcdir};

 
        # There's no cvsps option to get the last N changesets.
        # Write full output to a temp file and read backwards.
 
        # There's no cvsps option to get the last N changesets.
        # Write full output to a temp file and read backwards.


@@ -278,11 +322,12 @@ 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";

-       } elsif (($? >> 8) != 0) {
+       }
+       elsif (($? >> 8) != 0) {

                error "cvsps exited " . ($? >> 8) . ": $!\n";
        }
 
                error "cvsps exited " . ($? >> 8) . ": $!\n";
        }
 


@@ -339,7 +384,8 @@ sub rcs_recentchanges($) {
                    $message[0]->{line}=~/$config{web_commit_regexp}/) {
                        $user=defined $2 ? "$2" : "$3";
                        $message[0]->{line}=$4;
                    $message[0]->{line}=~/$config{web_commit_regexp}/) {
                        $user=defined $2 ? "$2" : "$3";
                        $message[0]->{line}=$4;

-               } else {
+               }
+               else {

                        $committype="cvs";
                }
 
                        $committype="cvs";
                }
 


@@ -349,21 +395,24 @@ sub rcs_recentchanges($) {
                $line = <SPSVC>;
                if ($line =~ /^Author: (.*)$/) {
                        $user = $1 unless defined $user && length $user;
                $line = <SPSVC>;
                if ($line =~ /^Author: (.*)$/) {
                        $user = $1 unless defined $user && length $user;

-               } else {
+               }
+               else {

                        error "expected Author, got $line";
                }
 
                $line = <SPSVC>;
                if ($line =~ /^Date: (.*)$/) {
                        $when = str2time($1, 'UTC');
                        error "expected Author, got $line";
                }
 
                $line = <SPSVC>;
                if ($line =~ /^Date: (.*)$/) {
                        $when = str2time($1, 'UTC');

-               } else {
+               }
+               else {

                        error "expected Date, got $line";
                }
 
                $line = <SPSVC>;
                if ($line =~ /^PatchSet (.*)$/) {
                        $rev = $1;
                        error "expected Date, got $line";
                }
 
                $line = <SPSVC>;
                if ($line =~ /^PatchSet (.*)$/) {
                        $rev = $1;

-               } else {
+               }
+               else {

                        error "expected PatchSet, got $line";
                }
 
                        error "expected PatchSet, got $line";
                }
 


@@ -388,7 +437,7 @@ sub rcs_recentchanges($) {
 sub rcs_diff ($) {
        my $rev=IkiWiki::possibly_foolish_untaint(int(shift));
 
 sub rcs_diff ($) {
        my $rev=IkiWiki::possibly_foolish_untaint(int(shift));
 

-       chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
+       local $CWD = $config{srcdir};

 
        # diff output is unavoidably preceded by the cvsps PatchSet entry
        my @cvsps = `env TZ=UTC cvsps -q --cvs-direct -z 30 -g -s $rev`;
 
        # diff output is unavoidably preceded by the cvsps PatchSet entry
        my @cvsps = `env TZ=UTC cvsps -q --cvs-direct -z 30 -g -s $rev`;


@@ -401,7 +450,8 @@ sub rcs_diff ($) {
 
        if (wantarray) {
                return @cvsps;
 
        if (wantarray) {
                return @cvsps;

-       } else {
+       }
+       else {

                return join("", @cvsps);
        }
 }
                return join("", @cvsps);
        }
 }