* Correct a pair of logic errors that triggered if svnpath was empty.

diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm
index 761a40a274dc41656b1d068cd70fb811e50c1471..987469ba07a221c561825968b05e347acf5b8ada 100644 (file)
--- a/IkiWiki/Rcs/svn.pm
+++ b/IkiWiki/Rcs/svn.pm
@@ -187,14 +187,17 @@ sub rcs_recentchanges ($) { #{{{
                        $committype="svn";
                }
 
                        $committype="svn";
                }
 

-               foreach (keys %{$logentry->{paths}}) {
-                       next unless ! length $config{svnpath} || 
-                                   /^\/\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,


@@ -231,9 +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 (! length $config{svnpath} || 
-                   $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;

                }
        }
        
                }
        }
        

diff --git a/debian/changelog b/debian/changelog
index eef365b83e47f4a246820f6b82a6f2b0dec05f22..03c308831e45cb96906a80614ed076b9ab369f68 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (2.11) UNRELEASED; urgency=low
+
+  * Correct a pair of logic errors that triggered if svnpath was empty.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 21 Oct 2007 18:49:40 -0400
+

 ikiwiki (2.10) unstable; urgency=low
 
   * Tidy ctime debug output for git.
 ikiwiki (2.10) unstable; urgency=low
 
   * Tidy ctime debug output for git.