apply monotone patch

[ikiwiki.git] / doc / bugs / Monotone_rcs_support.mdwn

diff --git a/doc/bugs/Monotone_rcs_support.mdwn b/doc/bugs/Monotone_rcs_support.mdwn
index 9514472ee336914e078f3e8f61612462f08996f7..d1ef00246cd7a97410da9886f33584baa484aa0e 100644 (file)
--- a/doc/bugs/Monotone_rcs_support.mdwn
+++ b/doc/bugs/Monotone_rcs_support.mdwn
@@ -1,6 +1,6 @@
 #Ikiwiki plugin for the Monotone revision control system.
 
 #Ikiwiki plugin for the Monotone revision control system.
 

-I've just made a patch to the ikiwiki code that allows it to use the [Monotone](http://monotone.ca/) revision control system.  It is available at:
+I've just made a patch to the ikiwiki code that allows it to use the [[rcs/Monotone]] revision control system.  It is available at:

 
 <http://www.cse.unsw.edu.au/~willu/monotone-ikiwiki.diff>
 
 
 <http://www.cse.unsw.edu.au/~willu/monotone-ikiwiki.diff>
 


@@ -18,7 +18,7 @@ Note: This patch requires a rather recent Monotone perl module (18 August 2007 o
 
 >>> Fair enough. Didn't realize you were a monotone committer. :-)
 
 
 >>> Fair enough. Didn't realize you were a monotone committer. :-)
 

->>>> I am, but still a little newish.  Feedback is good.
+>>>> I am, but still a little newish.  Feedback is good.  In particular, this is my first major bit of PERL.

 
 > Having rcs_commit return a warning message when there's an unresolved conflict
 > isn't right; that message will populate the page edit box. You might want
 
 > Having rcs_commit return a warning message when there's an unresolved conflict
 > isn't right; that message will populate the page edit box. You might want


@@ -33,11 +33,38 @@ Note: This patch requires a rather recent Monotone perl module (18 August 2007 o
 [[tag patch]]
 
 >> I've [[accepted|done]] this patch, thank you! 
 [[tag patch]]
 
 >> I've [[accepted|done]] this patch, thank you! 

->> 
+
+>>> Thanks for committing it.  I hate keeping my own diffs. :)
+

 >> I did make a few changes. Please review, and make sure it still works
 >> (a test case like we have for some of the other RCSes would be nice..)
 >> I did make a few changes. Please review, and make sure it still works
 >> (a test case like we have for some of the other RCSes would be nice..)

->> 
+
+>>> Tested.  It still works at least as well as it did.  I'll try to get to a test case soon.
+>>> In checking the source I noticed a few bogus comments I left in when editing,
+>>> and a bug in page adding.
+>>> Here is a small patch for them:
+
+>>>> applied
+
+Here is another patch.  It fixes a FIXME you added.  I was using $file within backticks because
+I was getting an error trying to do it right.  I've figured out the error, and now do it right.  This
+should also speed things up (very slightly)
+
+> applied
+

 >> BTW, will all the monotone output parsing work if LANG != C?
 >> BTW, will all the monotone output parsing work if LANG != C?

->> 
+
+>>> It should (he says crossing fingers).
+>>> In the places where I do any complex parsing I'm using a special
+>>> version of the mtn commands designed for scripting.  They have a
+>>> stable, easy to parse, output that doesn't get translated (I think).
+

 >> Do monotone post-commit hooks actually use REV?
 >> Do monotone post-commit hooks actually use REV?

->> --[[Joey]]
+
+>>> Monotone post-commit hooks are written in Lua and can do
+>>> what they please.  Setting the REV environment var before
+>>> calling Ikiwiki seems reasonable, but I've not written the
+>>> Lua hook.
+
+>>>> So the rcs_notify support is not just untested, but can't work
+>>>> at all w/o further development.