Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/doc/post-commit/discussion.mdwn b/doc/post-commit/discussion.mdwn
index 31347a614b9e52f3dcaa8fc0c69b72d5d82183d5..c15396978f11ec6983293dd54fe10cdf6c580c0b 100644 (file)
--- a/doc/post-commit/discussion.mdwn
+++ b/doc/post-commit/discussion.mdwn
@@ -45,3 +45,16 @@ Thanks
 > Yes, ikiwiki does expect you to use your revision control system to check
 > in changes. Otherwise, recentchanges cannot work right, since it uses the
 > commit history from your revision control system. --[[Joey]]
+
+-----
+
+I'm working on an [[rcs]] plugin for CVS, adapted from `svn.pm`, in order to integrate ikiwiki at sites where that's all they've got. What's working so far: web commit (post-commit hook and all), diff, add (under certain conditions), and remove. What's not working: with rcs_add(), iff any of the new page's parent dirs aren't already under CVS control and the post-commit hook is enabled, the browser and ikiwiki stall for several seconds trying to add it, then time out. (If I kill ikiwiki when this is happening, it cvs adds the topmost parent that needed adding; if I wait for timeout, it doesn't. I think.) If I disable the post-commit hook and do the same kind of thing, the page is created and saved.
+
+In case you're lucky enough not to know, cvs adds on directories are weird -- they operate immediately against the repository, unlike file adds:
+
+    $ cvs add randomdir
+    Directory /Users/schmonz/Documents/cvswiki/repository/ikiwiki/randomdir added to the repository
+
+I was able to work out that when I'm seeing this page save misbehavior, my plugin is somewhere inside `system("cvs", "-Q", "add", "$file")`, which was never returning. If I changed it to anything other than cvs it iterated correctly over all the parent dirs which needed to be added to CVS, in the proper order. (cvs add isn't recursive, sadly.)
+
+Can you offer an educated guess what's going wrong here? --[[Schmonz]]

diff --git a/doc/todo/source_link.mdwn b/doc/todo/source_link.mdwn
index 962e099a6b47fafb47b59e2918e4f8a340e4d090..6abfea55cc678a9fb767e1cff896be4a805a07b7 100644 (file)
--- a/doc/todo/source_link.mdwn
+++ b/doc/todo/source_link.mdwn
@@ -24,6 +24,9 @@ I just implemented this.  There is one [[patch]] to the default page template, a
 >>
 >> --[[smcv]]
 
+>>> That looks like a nice set of fixes.  One more that might be worthwhile: instead of reading the page source into a var, and then writing it out later, it might be nice to just
+>>>  `print readfile(srcfile(pagesources{$page}));` at the appropriate point. -- [[Will]]
+
 ----
 
     diff --git a/templates/page.tmpl b/templates/page.tmpl