diff options
Diffstat (limited to 'doc/post-commit/discussion.mdwn')
| -rw-r--r-- | doc/post-commit/discussion.mdwn | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/doc/post-commit/discussion.mdwn b/doc/post-commit/discussion.mdwn index 85853c945..6ae0d9bcb 100644 --- a/doc/post-commit/discussion.mdwn +++ b/doc/post-commit/discussion.mdwn @@ -73,12 +73,30 @@ proper order. (cvs add isn't recursive, sadly.) Can you offer an educated guess what's going wrong here? --[[Schmonz]] -> Got `rcs_recentchanges` working, believe it or not, thanks to -> [cvsps](http://www.cobite.com/cvsps/). If I can figure out this -> interaction between the post-commit hook and `cvs add` on directories, -> the CVS plugin is mostly done. Could it be a locking issue? Where should -> I be looking? Any suggestions appreciated. --[[Schmonz]] - +> Got `rcs_recentchanges` working, believe it or not, thanks to [cvsps](http://www.cobite.com/cvsps/). If I can figure out this interaction between the post-commit hook and `cvs add` on directories, the CVS plugin is mostly done. Could it be a locking issue? Where should I be looking? Any suggestions appreciated. --[[Schmonz]] + +>> Okay, it is definitely a locking issue. First, on the conjecture that +>> `cvs add <directory>` was triggering the post-commit hook and confusing +>> ikiwiki, I wrapped the ikiwiki post-commit binary with a shell script +>> that exited 0 if the triggering file was a directory. The first half of +>> the conjecture was correct -- my wrapper got triggered -- but the web +>> add of `one/two/three.mdwn` (where `one` and `two` weren't existing +>> CVS-controlled dirs) remained hung as before. There were two ikiwiki +>> processes running. On a whim, I killed the one with the higher PID; `cvs +>> add one` immediately completed successfully, then back to a hang and two +>> ikiwiki processes. I killed the newer one again and then `cvs add +>> one/two` and `cvs add one/two/three.mdwn` completed and the web add was +>> successful. --[[Schmonz]] + +>>> Aaaaaand I was wrong about the second half of the conjecture being +>>> wrong. The wrapper script wasn't correctly identifying directories; +>>> with that fixed, everything works. I've created a +>>> [[plugins/contrib/cvs]] plugin page. Thanks for listening. :-) +>>> --[[Schmonz]] + +>> Here is a comment I committed to my laptop from Madrid Airport before +>> your most recent updates, in case it's still useful: +>> >> Locking certianly seems likely to be a problem. ikiwiki calls `rcs_add` >> *before* disabling the post-commit plugin, since all over VCS allow >> adding something in a staged manner. You can see this in, for example, @@ -97,3 +115,4 @@ Can you offer an educated guess what's going wrong here? --[[Schmonz]] >> especially since ikiwiki always commits after an add, in the same >> process, so you could just use a temporary list of things to add. >> --[[Joey]] + |