summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-03-20 05:09:30 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-03-20 05:09:30 +0000
commitba335c94c7e1da5506f45e4c2ee8e521bad8bacd (patch)
treebd7b2a5bed43db149660ff736dc591b29de74ae1
parentd1cef7a6ab70740fc74ff143b62a6a3570af75af (diff)
fix setup file error
improve svn log regexp to deal with file copies/moves
-rw-r--r--doc/ikiwiki.setup2
-rwxr-xr-xikiwiki2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index e60d0f407..7167e6e57 100644
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -27,7 +27,7 @@ use IkiWiki::Setup::Standard {
# Note that this will overwrite any exsting
# post-commit hook script, which may not be
# what you want.
- wrapper => "$config{svnrepo}/hooks/post-commit",
+ wrapper => "/svn/wiki/hooks/post-commit",
wrappermode => 04755,
},
{
diff --git a/ikiwiki b/ikiwiki
index 2130c4f78..d727d904a 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -567,7 +567,7 @@ sub rcs_recentchanges ($) { #{{{
$user=$2;
$when=concise(ago(time - str2time($3)));
}
- elsif ($state eq 'header' && /^\s+[A-Z]\s+\Q$svn_base\E\/(.+)$/) {
+ elsif ($state eq 'header' && /^\s+[A-Z]\s+\Q$svn_base\E\/([^ ]+)(?:$|\s)/) {
push @pages, { link => htmllink("", pagename($1), 1) }
if length $1;
}