When editing a page, show that page's sidebar. (Thanks, privat)

[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 0237c00374ab50c7763037890801aac2aef13acc..8687e7983c7a506ef736082e92bfe5be44ac3e2d 100644 (file)
--- a/doc/bugs/Monotone_rcs_support.mdwn
+++ b/doc/bugs/Monotone_rcs_support.mdwn
@@ -1,20 +1,58 @@
-#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:
-
-<http://www.cse.unsw.edu.au/~willu/monotone-ikiwiki.diff>
-
-At the moment it is basically complete.  It implements rcs_notify() and rcs_getctime(), but they're untested.
-
-In an older version of the patch 
-there was support for simultaneous commits, but any conflicts left the repository in an unmerged state which had to be cleaned up using the non-web
-monotone interface.  The user's data was still stored, and the user was informed if that happened.
-
-> The conflict issue seems like the main problem. I might just add it to ikiwiki and mark is as experimental and known buggy though. :-) --[[Joey]]
-
-The current version of the patch handles conflicts through the web interface.  It is still not perfect as it will break if there is a rename that conflicts with a web change (but so will the other Rcs plugins I think).  It also commits a revision with conflict markers if there is a conflict requiring such markers... ick.
-
-Note: This patch requires the Monotone perl module, which is only available in Monotone 0.36 or later.  The module is in the Monotone contrib/ directory.  While 0.36 is relatively new, that Monotone module itself will work with a monotone binary back quite a few releases.
-Apparently this module did't make some versions of the monotone 0.36 release tarball.  It is available from the monotone repository here: <http://viewmtn.angrygoats.net/branch/changes/net.venge.monotone>.
-
-[[tag patch]]
+The Monotone module still lacks support for setting up a post-commit hook,
+so commits made via monotone will not automatically update the wiki.
+
+Here for future reference is the most recent version of support for 
+that I've been sent. It's not yet working; there are path issues. --[[Joey]]
+
+> I think this was fixed in version 2.40. --[[Joey]] [[!tag done]]
+
+<pre>
+diff --git a/IkiWiki/Rcs/monotone.pm b/IkiWiki/Rcs/monotone.pm
+index cde6029..34f8f96 100644
+--- a/IkiWiki/Rcs/monotone.pm
++++ b/IkiWiki/Rcs/monotone.pm
+@@ -186,8 +186,9 @@ sub rcs_update () {
+       check_config();
+ 
+       if (defined($config{mtnsync}) && $config{mtnsync}) {
++              check_mergerc();
+               if (system("mtn", "--root=$config{mtnrootdir}", "sync",
+-                         "--quiet", "--ticker=none", 
++                         "--quiet", "--ticker=none", "--rcfile", $config{mtnmergerc},
+                          "--key", $config{mtnkey}) != 0) {
+                       debug("monotone sync failed before update");
+               }
+@@ -604,4 +605,9 @@ __DATA__
+                  return true
+             end
+       }
++      function note_netsync_revision_received(new_id, revision, certs, session_id)
++          if (program_exists_in_path("ikiwiki-netsync-hook")) then
++              execute("ikiwiki-netsync-hook", new_id)
++          end
++      end
+ EOF
+diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
+index 2103ea5..cff718c 100644
+diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
+index 1377315..0cbe27e 100644
+--- a/doc/ikiwiki.setup
++++ b/doc/ikiwiki.setup
+@@ -88,6 +88,16 @@ use IkiWiki::Setup::Standard {
+               #       # Enable mail notifications of commits.
+               #       notify => 1,
+               #},
++              #{
++              #       # The monotone netsync revision received wrapper.
++              #       # Note that you also need to install a lua
++              #       # hook into monotone to make this work
++              #       # see: http://ikiwiki.info/rcs/monotone/
++              #       wrapper => "/usr/local/bin/ikiwiki-netsync-hook",
++              #       wrappermode => "04755",
++              #       # Enable mail notifications of commits.
++              #       notify => 1,
++              #},
+       ],
+ 
+       # Generate rss feeds for blogs?
+</pre>