del wrong hook & ikiwiki --post-commit --a-lot-of-switches

diff --git a/doc/todo/mercurial.mdwn b/doc/todo/mercurial.mdwn
index e45629102bce5c27678f1f21d79f8a2fa543badb..2f844db03ce0f6a0de6f77051be7ff49cf8746bc 100644 (file)
--- a/doc/todo/mercurial.mdwn
+++ b/doc/todo/mercurial.mdwn
@@ -29,7 +29,7 @@ This should update the working directory and run ikiwiki every time a change is
 > It can deadlock if the post-commit hook runs with --refresh in the
 > former case. --[[Joey]]
 
 > It can deadlock if the post-commit hook runs with --refresh in the
 > former case. --[[Joey]]
 

-The problem with --post-commit is that if you delete some pages in $SRC, ikiwiki --setup setupfile --post-commit will not delete them in $DEST.
+The problem with --post-commit is that if you delete some pages in $SRC, ikiwiki --setup setupfile --post-commit will not delete them in $DEST. --[[weakish]]

 
 > You should really be using a setup file that has `mercurial_wrapper`
 > set, and running the wrapper generated by that from your hook.
 
 > You should really be using a setup file that has `mercurial_wrapper`
 > set, and running the wrapper generated by that from your hook.


@@ -38,23 +38,23 @@ The problem with --post-commit is that if you delete some pages in $SRC, ikiwiki
 > alone (which doesn't delete files from $DEST either). Will fix that.
 > --[[Joey]] 
 
 > alone (which doesn't delete files from $DEST either). Will fix that.
 > --[[Joey]] 
 

+>> Mercurial doesn't support put hooks in .hg/hooks/* (like git). In Mercurial, the only way to run
+>> your own hooks is specifying them in the hgrc file. (Or write a new extension.)
+>> I guess use a very long command will work.
+>> (e.g. ikiwiki --post-commit --a-lot-of-switches --set var=value $SRC $DEST)
+>> (Fortunately ikiwiki supports --set var=value so without --setup works.)
+>>
+>> Alternative is always editing via cgi or pushing.  Never work on the $SRC/repo directly.
+>> --[[weakish]]
+

 I add the following to .hg/hgrc:(I use changegroup since I don't think we need refresh per changeset, please point out if I am wrong.)
 
     [hooks]
     changegroup = hg update >&2 && ikiwiki --setup path.to.setup.file --refresh
 I add the following to .hg/hgrc:(I use changegroup since I don't think we need refresh per changeset, please point out if I am wrong.)
 
     [hooks]
     changegroup = hg update >&2 && ikiwiki --setup path.to.setup.file --refresh

-    post-commit = ikiwiki --setup path.to.setup.file --refresh
-
-I tried the follwing commands in $SRC:
-
-    touch deadlocktest.mdwn
-    hg add
-    hg ci

 
 

-No deadlock happens.  (Also I push to the $SRC from another machine, again, no deadlock.  If there is conflicts between $SRC and my own repo, hg pull will abort.  You have to pull, merge and push again.)
+<p><del>post-commit = ikiwiki --setup path.to.setup.file --refresh</del><strong>This will cause deadlock! See bleow!</strong></p>

 
 

-
-
-Of course these tests are too simple.  The problem is I have no idea when the deadlock will happen. If someone is kind enough to point out, I will run more test.
+I have no idea when the deadlock will happen.  --[[weakish]]

 
 > For the deadlock to occur, a edit has to be made via the web.
 > 
 
 > For the deadlock to occur, a edit has to be made via the web.
 > 


@@ -75,6 +75,7 @@ Of course these tests are too simple.  The problem is I have no idea when the de
 > and the ikiwiki CGI handles the wiki refresh.
 > --[[Joey]]  
 
 > and the ikiwiki CGI handles the wiki refresh.
 > --[[Joey]]  
 

+

 ***
 
 I have a few notes on mercurial usage after trying it out for a while:
 ***
 
 I have a few notes on mercurial usage after trying it out for a while: