Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info

[ikiwiki.git] / IkiWiki / Rcs / monotone.pm

diff --git a/IkiWiki/Rcs/monotone.pm b/IkiWiki/Rcs/monotone.pm
index c4a6d98644c5be7bac2ee606dea2a3e7cc5ba505..06615da111a6ce4f2aa6b24ff71df24b9f73830b 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;
        }
 } #}}}
@@ -470,6 +475,10 @@ sub rcs_recentchanges ($) { #{{{
        return @ret;
 } #}}}
 
+sub rcs_diff ($) { #{{{
+       # TODO
+} #}}}
+
 sub rcs_getctime ($) { #{{{
        my $file=shift;