web commit by maxx: fix copyright info

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

diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm
index fbf6b2c9ecc7be2556afe95cfa0ab11216731734..987469ba07a221c561825968b05e347acf5b8ada 100644 (file)
--- a/IkiWiki/Rcs/svn.pm
+++ b/IkiWiki/Rcs/svn.pm
@@ -5,8 +5,20 @@ use strict;
 use IkiWiki;
 use POSIX qw(setlocale LC_CTYPE);
 
 use IkiWiki;
 use POSIX qw(setlocale LC_CTYPE);
 

+package IkiWiki::Rcs::svn;
+
+sub import { #{{{
+       if (exists $IkiWiki::config{svnpath}) {
+               # code depends on the path not having extraneous slashes
+               $IkiWiki::config{svnpath}=~tr#/#/#s;
+               $IkiWiki::config{svnpath}=~s/\/$//;
+               $IkiWiki::config{svnpath}=~s/^\///;
+       }
+} #}}}
+
+

 package IkiWiki;
 package IkiWiki;

-               
+

 # svn needs LC_CTYPE set to a UTF-8 locale, so try to find one. Any will do.
 sub find_lc_ctype() {
        my $current = setlocale(LC_CTYPE());
 # svn needs LC_CTYPE set to a UTF-8 locale, so try to find one. Any will do.
 sub find_lc_ctype() {
        my $current = setlocale(LC_CTYPE());


@@ -60,13 +72,22 @@ sub rcs_prepedit ($) { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

-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.
        my $file=shift;
        my $message=shift;
        my $rcstoken=shift;
        # 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;
+
+       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
 
        if (-d "$config{srcdir}/.svn") {
                # Check to see if the page has been changed by someone


@@ -76,9 +97,8 @@ sub rcs_commit ($$$) { #{{{
                if (defined $rev && defined $oldrev && $rev != $oldrev) {
                        # Merge their changes into the file that we've
                        # changed.
                if (defined $rev && defined $oldrev && $rev != $oldrev) {
                        # Merge their changes into the file that we've
                        # changed.

-                       chdir($config{srcdir}); # svn merge wants to be here

                        if (system("svn", "merge", "--quiet", "-r$oldrev:$rev",
                        if (system("svn", "merge", "--quiet", "-r$oldrev:$rev",

-                                  "$config{srcdir}/$file") != 0) {
+                                  "$config{srcdir}/$file", "$config{srcdir}/$file") != 0) {

                                warn("svn merge -r$oldrev:$rev failed\n");
                        }
                }
                                warn("svn merge -r$oldrev:$rev failed\n");
                        }
                }


@@ -86,7 +106,7 @@ sub rcs_commit ($$$) { #{{{
                if (system("svn", "commit", "--quiet", 
                           "--encoding", "UTF-8", "-m",
                           possibly_foolish_untaint($message),
                if (system("svn", "commit", "--quiet", 
                           "--encoding", "UTF-8", "-m",
                           possibly_foolish_untaint($message),

-                          "$config{srcdir}") != 0) {
+                          $config{srcdir}) != 0) {

                        my $conflict=readfile("$config{srcdir}/$file");
                        if (system("svn", "revert", "--quiet", "$config{srcdir}/$file") != 0) {
                                warn("svn revert failed\n");
                        my $conflict=readfile("$config{srcdir}/$file");
                        if (system("svn", "revert", "--quiet", "$config{srcdir}/$file") != 0) {
                                warn("svn revert failed\n");


@@ -122,7 +142,6 @@ sub rcs_recentchanges ($) { #{{{
 
        eval q{
                use Date::Parse;
 
        eval q{
                use Date::Parse;

-               use Time::Duration;

                use XML::SAX;
                use XML::Simple;
        };
                use XML::SAX;
                use XML::Simple;
        };


@@ -168,13 +187,17 @@ sub rcs_recentchanges ($) { #{{{
                        $committype="svn";
                }
 
                        $committype="svn";
                }
 

-               foreach (keys %{$logentry->{paths}}) {
-                       next unless /^\/\Q$config{svnpath}\E\/([^ ]+)(?:$|\s)/;
-                       my $file=$1;
+               foreach my $file (keys %{$logentry->{paths}}) {
+                       if (length $config{svnpath}) {
+                               next unless $file=~/^\/\Q$config{svnpath}\E\/([^ ]+)(?:$|\s)/;
+                               $file=$1;
+                       }
+

                        my $diffurl=$config{diffurl};
                        $diffurl=~s/\[\[file\]\]/$file/g;
                        $diffurl=~s/\[\[r1\]\]/$rev - 1/eg;
                        $diffurl=~s/\[\[r2\]\]/$rev/g;
                        my $diffurl=$config{diffurl};
                        $diffurl=~s/\[\[file\]\]/$file/g;
                        $diffurl=~s/\[\[r1\]\]/$rev - 1/eg;
                        $diffurl=~s/\[\[r2\]\]/$rev/g;

+

                        push @pages, {
                                page => pagename($file),
                                diffurl => $diffurl,
                        push @pages, {
                                page => pagename($file),
                                diffurl => $diffurl,


@@ -195,7 +218,7 @@ sub rcs_recentchanges ($) { #{{{
 
 sub rcs_notify () { #{{{
        if (! exists $ENV{REV}) {
 
 sub rcs_notify () { #{{{
        if (! exists $ENV{REV}) {

-               error("REV is not set, not running from svn post-commit hook, cannot send notifications");
+               error(gettext("REV is not set, not running from svn post-commit hook, cannot send notifications"));

        }
        my $rev=int(possibly_foolish_untaint($ENV{REV}));
        
        }
        my $rev=int(possibly_foolish_untaint($ENV{REV}));
        


@@ -211,8 +234,13 @@ sub rcs_notify () { #{{{
        my @changed_pages;
        foreach my $change (`svnlook changed $config{svnrepo} -r $rev`) {
                chomp $change;
        my @changed_pages;
        foreach my $change (`svnlook changed $config{svnrepo} -r $rev`) {
                chomp $change;

-               if ($change =~ /^[A-Z]+\s+\Q$config{svnpath}\E\/(.*)/) {
-                       push @changed_pages, $1;
+               if (length $config{svnpath}) {
+                       if ($change =~ /^[A-Z]+\s+\Q$config{svnpath}\E\/(.*)/) {
+                               push @changed_pages, $1;
+                       }
+               }
+               else {
+                       push @changed_pages, $change;

                }
        }
        
                }
        }