Merge branch 'master' into po

[git.ikiwiki.info.git] / doc / todo / mercurial.mdwn

diff --git a/doc/todo/mercurial.mdwn b/doc/todo/mercurial.mdwn
index 414aaa8073c3f6f857bff2b7fbc0df005bcfb76f..e71c8106adc832fb30203868174cd857a79450e3 100644 (file)
--- a/doc/todo/mercurial.mdwn
+++ b/doc/todo/mercurial.mdwn
@@ -14,6 +14,10 @@
   It seems that with the current mercurial commit code, it will always
   blindly overwrite the current file with the web edited version, losing
   any other changes.
   It seems that with the current mercurial commit code, it will always
   blindly overwrite the current file with the web edited version, losing
   any other changes.

+* `rcs_commit_staged`, `rcs_rename`, `rcs_remove`, and `rcs_diff` are not
+  implemented for mercurial, and so attachments, remove and rename plugins
+  and recentchangesdiff cannot be used with it. (These should be fairly
+  easy to add..)

 
 Posthook: in `$srcdir/.hg/hgrc`, I have the following
 
 
 Posthook: in `$srcdir/.hg/hgrc`, I have the following
 


@@ -49,15 +53,19 @@ The problem with --post-commit is that if you delete some pages in $SRC, ikiwiki
 >> --[[users/weakish]]
 
 >>> I don't see anything preventing you from using a setup file with
 >> --[[users/weakish]]
 
 >>> I don't see anything preventing you from using a setup file with

->>> `mercurual_wrapper => ".hg/ikiwiki-hook",` and then modifying the hgrc
+>>> `mercurial_wrapper => ".hg/ikiwiki-hook",` and then modifying the hgrc

 >>> to run that wrapper. --[[Joey]] 
 
 >>> to run that wrapper. --[[Joey]] 
 

+>> Thanks for pointing out this.  I have some stupid misunderstanding on the
+>> usage of mercurial_wrapper before.  The wrapper works nicely! --[[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 = path.to.the.mercurial.wrapper

 
 

-<p><del>post-commit = ikiwiki --setup path.to.setup.file --refresh</del><strong>This will cause deadlock! See bleow!</strong></p>
+-----

 
 I have no idea when the deadlock will happen.  --[[users/weakish]]
 
 
 I have no idea when the deadlock will happen.  --[[users/weakish]]