summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhttp://weakish.int.eu.org/ <http://weakish.int.eu.org/@web>2009-02-10 04:38:14 -0500
committerJoey Hess <joey@kitenet.net>2009-02-10 04:38:14 -0500
commitff5d52b0d2dc025cedadb3b9d06f46e8954d7a38 (patch)
tree543602e1fab6c60af6fb3d492c466636f47bfad4
parent9a84181ad9bbef5bdc4a9ecb3160994f79d8b9cb (diff)
del wrong hook & ikiwiki --post-commit --a-lot-of-switches
-rw-r--r--doc/todo/mercurial.mdwn25
1 files changed, 13 insertions, 12 deletions
diff --git a/doc/todo/mercurial.mdwn b/doc/todo/mercurial.mdwn
index e45629102..2f844db03 100644
--- 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]]
-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.
@@ -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]]
+>> 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
- 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.
>
@@ -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]]
+
***
I have a few notes on mercurial usage after trying it out for a while: