* Support setting svnpath to "" for wikis that are rooted at the top of

  their svn repositories, with no trunk directory.

diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm
index af4641d3af00b713ea428dde0b1371c70e2a5b47..c5e977bced1479f75a626031c201a48e8e5b0910 100644 (file)
--- a/IkiWiki/Rcs/svn.pm
+++ b/IkiWiki/Rcs/svn.pm
@@ -176,7 +176,8 @@ sub rcs_recentchanges ($) { #{{{
                }
 
                foreach (keys %{$logentry->{paths}}) {
                }
 
                foreach (keys %{$logentry->{paths}}) {

-                       next unless /^\/\Q$config{svnpath}\E\/([^ ]+)(?:$|\s)/;
+                       next unless ! length $config{svnpath} || 
+                                   /^\/\Q$config{svnpath}\E\/([^ ]+)(?:$|\s)/;

                        my $file=$1;
                        my $diffurl=$config{diffurl};
                        $diffurl=~s/\[\[file\]\]/$file/g;
                        my $file=$1;
                        my $diffurl=$config{diffurl};
                        $diffurl=~s/\[\[file\]\]/$file/g;


@@ -218,7 +219,8 @@ 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\/(.*)/) {
+               if (! length $config{svnpath} || 
+                   $change =~ /^[A-Z]+\s+\Q$config{svnpath}\E\/(.*)/) {

                        push @changed_pages, $1;
                }
        }
                        push @changed_pages, $1;
                }
        }

diff --git a/debian/changelog b/debian/changelog
index 09dab5611127eb65d38801b3d8713521dabf0e3f..3611d69ecae50e4ae35284e958901589fd313ab9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (1.51) UNRELEASED; urgency=low
+
+  * Support setting svnpath to "" for wikis that are rooted at the top of
+    their svn repositories, with no trunk directory.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 16 Apr 2007 15:07:21 -0400
+

 ikiwiki (1.50) unstable; urgency=low
 
   [ Josh Triplett ]
 ikiwiki (1.50) unstable; urgency=low
 
   [ Josh Triplett ]

diff --git a/doc/bugs/RecentChanges_broken_with_empty_svnpath.mdwn b/doc/bugs/RecentChanges_broken_with_empty_svnpath.mdwn
index 961c31177fe2007eef6a0784b2c611e7cac55518..836c39a71da6f86c29c2b5f88488bd0087d0022d 100644 (file)
--- a/doc/bugs/RecentChanges_broken_with_empty_svnpath.mdwn
+++ b/doc/bugs/RecentChanges_broken_with_empty_svnpath.mdwn
@@ -21,3 +21,6 @@ I can not see why this check is needed in the first place, so here's a patch for
                        my $file=$1;
                        my $diffurl=$config{diffurl};
                        $diffurl=~s/\[\[file\]\]/$file/g;
                        my $file=$1;
                        my $diffurl=$config{diffurl};
                        $diffurl=~s/\[\[file\]\]/$file/g;

+
+> It's necessary for wikis, such as this one, that keep other things in the
+> same svn repository. Bug [[fixed|done]]. --[[Joey]]

diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index 1d545e82375d66163c0ce752a7ec7b374bc565b0..0107b36ce195255a6dc44a88de6629cb93a47002 100644 (file)
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -160,7 +160,8 @@ configuration options of their own.
 
   Specify the path inside your svn repository where the wiki is located.
   This defaults to `trunk`; change it if your wiki is at some other path
 
   Specify the path inside your svn repository where the wiki is located.
   This defaults to `trunk`; change it if your wiki is at some other path

-  inside the repository.
+  inside the repository. If your wiki is rooted at the top of the repository,
+  set svnpath to "".

 
 * --rss, --norss
 
 
 * --rss, --norss