* monotone: Add code to default mergerc file to run

  _MTN/ikiwiki-netsync-hook when a commit is merged in from the net.

diff --git a/IkiWiki/Rcs/monotone.pm b/IkiWiki/Rcs/monotone.pm
index c4a6d98644c5be7bac2ee606dea2a3e7cc5ba505..6a156892a096891e23bd7fb1d879f31198ea44b6 100644 (file)
--- a/IkiWiki/Rcs/monotone.pm
+++ b/IkiWiki/Rcs/monotone.pm
@@ -136,6 +136,11 @@ sub check_mergerc () { #{{{
                debug("$mergerc doesn't exist. Creating file with default mergers.");
                open (my $out, ">", $mergerc) or error("can't open $mergerc: $!");
                print $out <DATA>;
+               print $out <<"EOF";
+       function note_netsync_revision_received(new_id, revision, certs, session_id)
+               execute("$config{mtnrootdir}/_MTN/ikiwiki-netsync-hook", new_id)
+       end
+EOF
                close $out;
        }
 } #}}}

diff --git a/debian/changelog b/debian/changelog
index 02d6aa499fb5a928717cc732535f2f49a826f68d..02de6fbbb3d139e071bf375faea02e850b82f689 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,8 @@ ikiwiki (2.40) UNRELEASED; urgency=low
   * Fix a bug where user A created a page concurrently with user B, and
     when B previewed it would redirect B to A's new page, losing B's work.
     Instead, don't redirect and let conflict handling resolve it.
+  * monotone: Add code to default mergerc file to run
+    _MTN/ikiwiki-netsync-hook when a commit is merged in from the net.
 
  -- Josh Triplett <josh@freedesktop.org>  Sun, 10 Feb 2008 13:18:58 -0800
 

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 0094bcb2acf3f4b796807b8c1e5a1fa3f8d38470..2c9b0207162c91147eefda756427d2f247b0ad9f 100644 (file)
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -90,6 +90,11 @@ use IkiWiki::Setup::Standard {
                #       wrapper => "/git/wiki.git/hooks/post-update",
                #       wrappermode => "06755",
                #},
+               #{
+               #       # The monotone netsync hook.
+               #       wrapper => "path/to/root/of/workspace/_MTN/ikiwiki-netsync-hook",
+               #       wrappermode => "06755",
+               #},
        ],
 
        # Default to generating rss feeds for blogs?