CVS operations generally need to be within CVS checkouts, so these chdir()

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

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index ff9d578e2f120d106050a70aa43b135c6be43f0d..e926425f292cca2554ff1944d35b0ddf8b2b124f 100644 (file)
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -5,6 +5,8 @@ use warnings;
 use strict;
 use IkiWiki;
 
 use strict;
 use IkiWiki;
 

+use File::chdir;
+

 sub import {
        hook(type => "wrapperargcheck", id => "cvs", call => \&wrapperargcheck);
        hook(type => "checkconfig", id => "cvs", call => \&checkconfig);
 sub import {
        hook(type => "wrapperargcheck", id => "cvs", call => \&wrapperargcheck);
        hook(type => "checkconfig", id => "cvs", call => \&checkconfig);


@@ -104,7 +106,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;


@@ -115,7 +117,7 @@ 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 $savedout, ">&STDOUT");
        open(STDOUT, ">", "/dev/null");
 
        open(my $savedout, ">&STDOUT");
        open(STDOUT, ">", "/dev/null");


@@ -261,7 +263,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");


@@ -280,7 +282,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.


@@ -400,7 +402,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`;