Update my surname to its new legal spelling.

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

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 8e0e2a4dab54473902e8b383ff99072a0198d403..f6f7edfb2855107674154bef114d8c434fe8452a 100644 (file)
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -1,11 +1,11 @@
 #!/usr/bin/perl
 package IkiWiki::Plugin::cvs;
 
 #!/usr/bin/perl
 package IkiWiki::Plugin::cvs;
 

-# Copyright (c) 2009 Amitai Schlair
+# Copyright (c) 2009 Amitai Schleier

 # All rights reserved.
 #
 # This code is derived from software contributed to ikiwiki
 # All rights reserved.
 #
 # This code is derived from software contributed to ikiwiki

-# by Amitai Schlair.
+# by Amitai Schleier.

 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions


@@ -33,6 +33,7 @@ use warnings;
 use strict;
 use IkiWiki;
 
 use strict;
 use IkiWiki;
 

+use URI::Escape q{uri_escape_utf8};

 use File::chdir;
 
 
 use File::chdir;
 
 


@@ -215,14 +216,12 @@ sub rcs_add ($) {
 
        while ($file = pop @files_to_add) {
                if (@files_to_add == 0) {
 
        while ($file = pop @files_to_add) {
                if (@files_to_add == 0) {

-                       # file

                        cvs_runcvs('add', cvs_keyword_subst_args($file)) ||
                        cvs_runcvs('add', cvs_keyword_subst_args($file)) ||

-                               warn("cvs add $file failed\n");
+                               warn("cvs add file $file failed\n");

                }
                else {
                }
                else {

-                       # directory

                        cvs_runcvs('add', $file) ||
                        cvs_runcvs('add', $file) ||

-                               warn("cvs add $file failed\n");
+                               warn("cvs add dir $file failed\n");

                }
        }
 }
                }
        }
 }


@@ -315,7 +314,10 @@ sub rcs_recentchanges ($) {
                        $oldrev =~ s/INITIAL/0/;
                        $newrev =~ s/\(DEAD\)//;
                        my $diffurl = defined $config{diffurl} ? $config{diffurl} : "";
                        $oldrev =~ s/INITIAL/0/;
                        $newrev =~ s/\(DEAD\)//;
                        my $diffurl = defined $config{diffurl} ? $config{diffurl} : "";

-                       $diffurl=~s/\[\[file\]\]/$page/g;
+                       my $epage = join('/',
+                               map { uri_escape_utf8($_) } split('/', $page)
+                       );
+                       $diffurl=~s/\[\[file\]\]/$epage/g;

                        $diffurl=~s/\[\[r1\]\]/$oldrev/g;
                        $diffurl=~s/\[\[r2\]\]/$newrev/g;
                        unshift @pages, {
                        $diffurl=~s/\[\[r1\]\]/$oldrev/g;
                        $diffurl=~s/\[\[r2\]\]/$newrev/g;
                        unshift @pages, {


@@ -454,12 +456,12 @@ sub commitmessage (@) {
        if (defined $params{session}) {
                if (defined $params{session}->param("name")) {
                        return "web commit by ".
        if (defined $params{session}) {
                if (defined $params{session}->param("name")) {
                        return "web commit by ".

-                               $params{session}->param("name").
+                               IkiWiki::cloak($params{session}->param("name")).

                                (length $params{message} ? ": $params{message}" : "");
                }
                elsif (defined $params{session}->remote_addr()) {
                        return "web commit from ".
                                (length $params{message} ? ": $params{message}" : "");
                }
                elsif (defined $params{session}->remote_addr()) {
                        return "web commit from ".

-                               $params{session}->remote_addr().
+                               IkiWiki::cloak($params{session}->remote_addr()).

                                (length $params{message} ? ": $params{message}" : "");
                }
        }
                                (length $params{message} ? ": $params{message}" : "");
                }
        }


@@ -493,24 +495,53 @@ sub cvs_keyword_subst_args ($) {
        my $filemime = File::MimeInfo::default($file);
        # if (-T $file) {
 
        my $filemime = File::MimeInfo::default($file);
        # if (-T $file) {
 

-       if (defined($filemime) && $filemime eq 'text/plain') {
-               return ($file);
-       }
-       else {
-               return ('-kb', $file);
-       }
+       defined($filemime) && $filemime eq 'text/plain'
+               ? return ('-kkv', $file)
+               : return ('-kb', $file);

 }
 
 sub cvs_runcvs(@) {
        my @cmd = @_;
        unshift @cmd, 'cvs', '-Q';
 
 }
 
 sub cvs_runcvs(@) {
        my @cmd = @_;
        unshift @cmd, 'cvs', '-Q';
 

-       local $CWD = $config{srcdir};
+       # CVS can't operate outside a srcdir, so we're always setting $CWD.
+       # "local $CWD" restores the previous value when we go out of scope.
+       # Usually that's correct. But if we're removing the last file from
+       # a directory, the post-commit hook will exec in a working directory
+       # that's about to not exist (CVS will prune it).
+       #
+       # chdir() manually here, so we can selectively not chdir() back.
+
+       my $oldcwd = $CWD;
+       chdir($config{srcdir});
+
+       eval q{
+               use IPC::Open3;
+               use Symbol qw(gensym);
+               use IO::File;
+       };
+       error($@) if $@;
+
+       my $cvsout = '';
+       my $cvserr = '';
+       local *CATCHERR = IO::File->new_tmpfile;
+       my $pid = open3(gensym(), \*CATCHOUT, ">&CATCHERR", @cmd);
+       while (my $l = <CATCHOUT>) {
+               $cvsout .= $l
+                       unless 1;
+       }
+       waitpid($pid, 0);
+       my $ret = $? >> 8;
+       seek CATCHERR, 0, 0;
+       while (my $l = <CATCHERR>) {
+               $cvserr .= $l
+                       unless $l =~ /^cvs commit: changing keyword expansion /;
+       }
+
+       print STDOUT $cvsout;
+       print STDERR $cvserr;

 
 

-       open(my $savedout, ">&STDOUT");
-       open(STDOUT, ">", "/dev/null");
-       my $ret = system(@cmd);
-       open(STDOUT, ">&", $savedout);
+       chdir($oldcwd) if -d $oldcwd;

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