t/git-cgi.t: fix race condition

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

diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm
index ffacb8cf9534a2055d945224a60bd98fc12e14b7..fd11f2c637597d98915f6a5bc29fc03ff6d0c572 100644 (file)
--- a/IkiWiki/Plugin/svn.pm
+++ b/IkiWiki/Plugin/svn.pm
@@ -5,6 +5,7 @@ use warnings;
 use strict;
 use IkiWiki;
 use POSIX qw(setlocale LC_CTYPE);
 use strict;
 use IkiWiki;
 use POSIX qw(setlocale LC_CTYPE);

+use URI::Escape q{uri_escape_utf8};

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


@@ -122,10 +123,8 @@ sub svn_info ($$) {
 }
 
 sub rcs_update () {
 }
 
 sub rcs_update () {

-       if (-d "$config{srcdir}/.svn") {
-               if (system("svn", "update", "--quiet", $config{srcdir}) != 0) {
-                       warn("svn update failed\n");
-               }
+       if (system("svn", "update", "--quiet", $config{srcdir}) != 0) {
+               warn("svn update failed\n");

        }
 }
 
        }
 }
 


@@ -136,75 +135,71 @@ sub rcs_prepedit ($) {
        # The file is relative to the srcdir.
        my $file=shift;
        
        # The file is relative to the srcdir.
        my $file=shift;
        

-       if (-d "$config{srcdir}/.svn") {
-               # For subversion, return the revision of the file when
-               # editing begins.
-               my $rev=svn_info("Revision", "$config{srcdir}/$file");
-               return defined $rev ? $rev : "";
+       # For subversion, return the revision of the file when
+       # editing begins.
+       my $rev=svn_info("Revision", "$config{srcdir}/$file");
+       return defined $rev ? $rev : "";
+}
+
+sub commitmessage (@) {
+       my %params=@_;
+
+       if (defined $params{session}) {
+               if (defined $params{session}->param("name")) {
+                       return "web commit by ".
+                               $params{session}->param("name").
+                               (length $params{message} ? ": $params{message}" : "");
+               }
+               elsif (defined $params{session}->remote_addr()) {
+                       return "web commit from ".
+                               $params{session}->remote_addr().
+                               (length $params{message} ? ": $params{message}" : "");
+               }

        }
        }

+       return $params{message};

 }
 
 }
 

-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.

-       my $file=shift;
-       my $message=shift;
-       my $rcstoken=shift;
-       my $user=shift;
-       my $ipaddr=shift;
-       my $emailuser=shift;
-
-       if (defined $user) {
-               $message="web commit by $user".(length $message ? ": $message" : "");
-       }
-       elsif (defined $ipaddr) {
-               $message="web commit from $ipaddr".(length $message ? ": $message" : "");
-       }
-
-       if (-d "$config{srcdir}/.svn") {
-               # Check to see if the page has been changed by someone
-               # else since rcs_prepedit was called.
-               my ($oldrev)=$rcstoken=~/^([0-9]+)$/; # untaint
-               my $rev=svn_info("Revision", "$config{srcdir}/$file");
-               if (defined $rev && defined $oldrev && $rev != $oldrev) {
-                       # Merge their changes into the file that we've
-                       # changed.
-                       if (system("svn", "merge", "--quiet", "-r$oldrev:$rev",
-                                  "$config{srcdir}/$file", "$config{srcdir}/$file") != 0) {
-                               warn("svn merge -r$oldrev:$rev failed\n");
-                       }
+       my %params=@_;
+
+       # Check to see if the page has been changed by someone
+       # else since rcs_prepedit was called.
+       my ($oldrev)=$params{token}=~/^([0-9]+)$/; # untaint
+       my $rev=svn_info("Revision", "$config{srcdir}/$params{file}");
+       if (defined $rev && defined $oldrev && $rev != $oldrev) {
+               # Merge their changes into the file that we've
+               # changed.
+               if (system("svn", "merge", "--quiet", "-r$oldrev:$rev",
+                          "$config{srcdir}/$params{file}", "$config{srcdir}/$params{file}") != 0) {
+                       warn("svn merge -r$oldrev:$rev failed\n");

                }
                }

+       }

 
 

-               if (system("svn", "commit", "--quiet", 
-                          "--encoding", "UTF-8", "-m",
-                          IkiWiki::possibly_foolish_untaint($message),
-                          $config{srcdir}) != 0) {
-                       my $conflict=readfile("$config{srcdir}/$file");
-                       if (system("svn", "revert", "--quiet", "$config{srcdir}/$file") != 0) {
-                               warn("svn revert failed\n");
-                       }
-                       return $conflict;
+       if (system("svn", "commit", "--quiet", 
+                  "--encoding", "UTF-8", "-m",
+                  IkiWiki::possibly_foolish_untaint(commitmessage(%params)),
+                  $config{srcdir}) != 0) {
+               my $conflict=readfile("$config{srcdir}/$params{file}");
+               if (system("svn", "revert", "--quiet", "$config{srcdir}/$params{file}") != 0) {
+                       warn("svn revert failed\n");

                }
                }

+               return $conflict;

        }
        }

+

        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, $emailuser)=@_;
-       
-       if (defined $user) {
-               $message="web commit by $user".(length $message ? ": $message" : "");
-       }
-       elsif (defined $ipaddr) {
-               $message="web commit from $ipaddr".(length $message ? ": $message" : "");
-       }
+       my %params=@_;

        
        if (system("svn", "commit", "--quiet",
                   "--encoding", "UTF-8", "-m",
        
        if (system("svn", "commit", "--quiet",
                   "--encoding", "UTF-8", "-m",

-                  IkiWiki::possibly_foolish_untaint($message),
+                  IkiWiki::possibly_foolish_untaint(commitmessage(%params)),

                   $config{srcdir}) != 0) {
                warn("svn commit failed\n");
                return 1; # failure     
                   $config{srcdir}) != 0) {
                warn("svn commit failed\n");
                return 1; # failure     


@@ -216,16 +211,8 @@ sub rcs_add ($) {
        # filename is relative to the root of the srcdir
        my $file=shift;
 
        # filename is relative to the root of the srcdir
        my $file=shift;
 

-       if (-d "$config{srcdir}/.svn") {
-               my $parent=IkiWiki::dirname($file);
-               while (! -d "$config{srcdir}/$parent/.svn") {
-                       $file=$parent;
-                       $parent=IkiWiki::dirname($file);
-               }
-               
-               if (system("svn", "add", "--quiet", "$config{srcdir}/$file") != 0) {
-                       warn("svn add failed\n");
-               }
+       if (system("svn", "add", "--parents", "--quiet", "$config{srcdir}/$file") != 0) {
+               warn("svn add failed\n");

        }
 }
 
        }
 }
 


@@ -233,10 +220,8 @@ sub rcs_remove ($) {
        # filename is relative to the root of the srcdir
        my $file=shift;
 
        # filename is relative to the root of the srcdir
        my $file=shift;
 

-       if (-d "$config{srcdir}/.svn") {
-               if (system("svn", "rm", "--force", "--quiet", "$config{srcdir}/$file") != 0) {
-                       warn("svn rm failed\n");
-               }
+       if (system("svn", "rm", "--force", "--quiet", "$config{srcdir}/$file") != 0) {
+               warn("svn rm failed\n");

        }
 }
 
        }
 }
 


@@ -244,22 +229,9 @@ sub rcs_rename ($$) {
        # filenames relative to the root of the srcdir
        my ($src, $dest)=@_;
        
        # filenames relative to the root of the srcdir
        my ($src, $dest)=@_;
        

-       if (-d "$config{srcdir}/.svn") {
-               # Add parent directory for $dest
-               my $parent=IkiWiki::dirname($dest);
-               if (! -d "$config{srcdir}/$parent/.svn") {
-                       while (! -d "$config{srcdir}/$parent/.svn") {
-                               $parent=IkiWiki::dirname($dest);
-                       }
-                       if (system("svn", "add", "--quiet", "$config{srcdir}/$parent") != 0) {
-                               warn("svn add $parent failed\n");
-                       }
-               }
-
-               if (system("svn", "mv", "--force", "--quiet", 
-                   "$config{srcdir}/$src", "$config{srcdir}/$dest") != 0) {
-                       warn("svn rename failed\n");
-               }
+       if (system("svn", "mv", "--parents", "--force", "--quiet", 
+           "$config{srcdir}/$src", "$config{srcdir}/$dest") != 0) {
+               warn("svn rename failed\n");

        }
 }
 
        }
 }
 


@@ -267,8 +239,6 @@ sub rcs_recentchanges ($) {
        my $num=shift;
        my @ret;
        
        my $num=shift;
        my @ret;
        

-       return unless -d "$config{srcdir}/.svn";
-

        eval q{
                use Date::Parse;
                use XML::SAX;
        eval q{
                use Date::Parse;
                use XML::SAX;


@@ -323,7 +293,8 @@ sub rcs_recentchanges ($) {
                        }
 
                        my $diffurl=defined $config{diffurl} ? $config{diffurl} : "";
                        }
 
                        my $diffurl=defined $config{diffurl} ? $config{diffurl} : "";

-                       $diffurl=~s/\[\[file\]\]/$file/g;
+                       my $efile = uri_escape_utf8($file);
+                       $diffurl=~s/\[\[file\]\]/$efile/g;

                        $diffurl=~s/\[\[r1\]\]/$rev - 1/eg;
                        $diffurl=~s/\[\[r2\]\]/$rev/g;
 
                        $diffurl=~s/\[\[r1\]\]/$rev - 1/eg;
                        $diffurl=~s/\[\[r2\]\]/$rev/g;
 


@@ -346,8 +317,9 @@ sub rcs_recentchanges ($) {
        return @ret;
 }
 
        return @ret;
 }
 

-sub rcs_diff ($) {
+sub rcs_diff ($;$) {

        my $rev=IkiWiki::possibly_foolish_untaint(int(shift));
        my $rev=IkiWiki::possibly_foolish_untaint(int(shift));

+       my $maxlines=shift;

        return `svnlook diff $config{svnrepo} -r$rev --no-diff-deleted`;
 }
 
        return `svnlook diff $config{svnrepo} -r$rev --no-diff-deleted`;
 }
 


@@ -367,7 +339,7 @@ sub findtimes ($) {
                
        my $child = open(SVNLOG, "-|");
        if (! $child) {
                
        my $child = open(SVNLOG, "-|");
        if (! $child) {

-               exec("svn", "log", $file) || error("svn log $file failed to run");
+               exec("svn", "log", "$config{srcdir}/$file") || error("svn log failed to run");

        }
 
        my ($cdate, $mdate);
        }
 
        my ($cdate, $mdate);


@@ -377,10 +349,10 @@ sub findtimes ($) {
                        $mdate=$1 unless defined $mdate;
                }
        }
                        $mdate=$1 unless defined $mdate;
                }
        }

-       close SVNLOG || error "svn log $file exited $?";
+       close SVNLOG || error "svn log exited $?";

 
        if (! defined $cdate) {
 
        if (! defined $cdate) {

-               error "failed to parse svn log for $file\n";
+               error "failed to parse svn log for $file";

        }
                
        eval q{use Date::Parse};
        }
                
        eval q{use Date::Parse};