urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

their svn repositories, with no trunk directory.
master
joey 2007-04-16 19:07:52 +00:00
parent 2cf2d4b6ed
commit c5975243a5
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IkiWiki/Rcs/svn.pm
View File

@ -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;
}
}

7
debian/changelog vendored
View File

@ -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 ]

3
doc/bugs/RecentChanges_broken_with_empty_svnpath.mdwn
View File

@ -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]]

3
doc/usage.mdwn
View File

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