summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-04-16 19:07:52 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-04-16 19:07:52 +0000
commitc5975243a5a660f99bcbb4d378a73e987def220b (patch)
tree4c5f86159fabffc34b8d4a0be34354606adaf614
parent2cf2d4b6ed50b08312c5e62ee77cd6cf9604d0f0 (diff)
* Support setting svnpath to "" for wikis that are rooted at the top of
their svn repositories, with no trunk directory.
-rw-r--r--IkiWiki/Rcs/svn.pm6
-rw-r--r--debian/changelog7
-rw-r--r--doc/bugs/RecentChanges_broken_with_empty_svnpath.mdwn3
-rw-r--r--doc/usage.mdwn3
4 files changed, 16 insertions, 3 deletions
diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm
index af4641d3a..c5e977bce 100644
--- a/IkiWiki/Rcs/svn.pm
+++ b/IkiWiki/Rcs/svn.pm
@@ -176,7 +176,8 @@ sub rcs_recentchanges ($) { #{{{
}
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;
@@ -218,7 +219,8 @@ sub rcs_notify () { #{{{
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;
}
}
diff --git a/debian/changelog b/debian/changelog
index 09dab5611..3611d69ec 100644
--- 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 ]
diff --git a/doc/bugs/RecentChanges_broken_with_empty_svnpath.mdwn b/doc/bugs/RecentChanges_broken_with_empty_svnpath.mdwn
index 961c31177..836c39a71 100644
--- 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;
+
+> 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 1d545e823..0107b36ce 100644
--- 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
- inside the repository.
+ inside the repository. If your wiki is rooted at the top of the repository,
+ set svnpath to "".
* --rss, --norss