- initial work on a mtn-post-push script which updates IDF's timeline

when new revisions arrive. this still needs some more tests, but
  its a start.
- refactor out the monotonerc template from SyncMonotone.php and
  place it in a separate template file (access control hooks are
  still missing from there)

scripts/mtn-post-push

@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# This hook informs IDF that new revisions arrived in the database
+# of the specified project.
+#
+# This hook is normally installed automatically at the creation of your
+# repository if you have everything configured correctly. If you want
+# to enable it later, you need to call it into your monotonerc file
+# from the hook "note_netsync_end". (See chapter "Event Notifications
+# and Triggers" on <http://monotone.ca/docs/Hooks.html#Hooks>.)
+#
+
+dir=$(dirname "$0")
+res=$(cd "$dir" && /bin/pwd || "$dir")
+SCRIPTDIR="$res/$(readlink $0)"
+PHP_POST_PUSH=$SCRIPTDIR/mtnpostpush.php
+
+base=$(basename "$0")
+TMPFILE=$(mktemp /tmp/${tempfoo}.XXXXXX) || exit 1
+while read rev; do echo $rev >> $TMPFILE; done
+
+echo php $PHP_POST_PUSH "$1" \< $TMPFILE \&\& rm -f $TMPFILE |\
+    at now > /dev/null 2>&1

scripts/mtnpostpush.php

@@ -0,0 +1,63 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of InDefero, an open source project management application.
+# Copyright (C) 2008-2010 Céondo Ltd and contributors.
+#
+# InDefero is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# InDefero is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * This script will send the notifications after a push in your 
+ * repository.
+ */
+
+require dirname(__FILE__).'/../src/IDF/conf/path.php';
+require 'Pluf.php';
+Pluf::start(dirname(__FILE__).'/../src/IDF/conf/idf.php');
+Pluf_Dispatcher::loadControllers(Pluf::f('idf_views'));
+
+/**
+ * [signal]
+ *
+ * mtnpostpush.php::run
+ *
+ * [sender]
+ *
+ * mtnpostpush.php
+ *
+ * [description]
+ *
+ * This signal allows an application to perform a set of tasks
+ * after a push to a monotone repository.
+ *
+ * [parameters]
+ *
+ * array('project' => 'name-of-the-project',
+ *       'revisions' => array('123abc...', '456def...', ...));
+ *
+ */
+
+fwrite(STDERR, "waiting for revisions on STDIN...\n");
+$stdin = file_get_contents('php://stdin');
+
+$params = array('project' => $argv[1],
+                'revisions' => explode("\n", chop($stdin)));
+Pluf_Signal::send('mtnpostpush.php::run', 'mtnpostpush.php', $params);
+
+
+

src/IDF/Plugin/SyncMonotone.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2010 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -37,6 +37,9 @@ class IDF_Plugin_SyncMonotone
         case 'IDF_Project::created':
             $plug->processMonotoneCreate($params['project']);
             break;
+        case 'mtnpostpush.php::run':
+            $plug->processSyncTimeline($params);
+            break;
         }
     }
 
@@ -73,6 +76,13 @@ class IDF_Plugin_SyncMonotone
             );
         }
 
+        $mtnpostpush = realpath(dirname(__FILE__) . "/../../../scripts/mtn-post-push");
+        if (!file_exists($mtnpostpush)) {
+            throw new IDF_Scm_Exception(sprintf(
+                __('Could not find mtn-post-push script "%s".'), $mtnpostpush
+            ));
+        }
+    
         $shortname = $project->shortname;
         $projectpath = sprintf($projecttempl, $shortname);
         if (file_exists($projectpath)) {
@@ -132,34 +142,19 @@ class IDF_Plugin_SyncMonotone
         //
         // step 3) write monotonerc for access control
         //         FIXME: netsync access control is still missing!
-        //
+        //    
-        $monotonerc =<<<END
+        $monotonerc = file_get_contents(dirname(__FILE__) . "/SyncMonotone/monotonerc.tpl");
-function get_remote_automate_permitted(key_identity, command, options)
+        $monotonerc = str_replace(
-    local read_only_commands = {
+            array("%%MTNPOSTPUSH%%", "%%PROJECT%%"),
-        "get_corresponding_path", "get_content_changed", "tags", "branches",
+            array($mtnpostpush, $shortname),
-        "common_ancestors", "packet_for_fdelta", "packet_for_fdata",
+            $monotonerc
-        "packets_for_certs", "packet_for_rdata", "get_manifest_of",
+        );
-        "get_revision", "select", "graph", "children", "parents", "roots",
-        "leaves", "ancestry_difference", "toposort", "erase_ancestors",
-        "descendents", "ancestors", "heads", "get_file_of", "get_file",
-        "interface_version", "get_attributes", "content_diff",
-        "file_merge", "show_conflicts", "certs", "keys"
-    }
 
-    for _,v in ipairs(read_only_commands) do
-        if (v == command[1]) then
-            return true
-        end
-    end
-
-    return false
-end
-END;
         $rcfile = $projectpath.'/monotonerc';
 
         if (!file_put_contents($rcfile, $monotonerc, LOCK_EX)) {
             throw new IDF_Scm_Exception(sprintf(
-                __('Could not write mtn configuration file "%s"'), $rcfile)
+                __('Could not write mtn configuration file "%s"'), $rcfile
             ));
         }
 
@@ -210,7 +205,7 @@ END;
         // have a backup copy of usher.conf around...
         if (!file_put_contents($usher_config, $usher_rc, LOCK_EX)) {
             throw new IDF_Scm_Exception(sprintf(
-                __('Could not write usher configuration file "%s"'), $usher_config)
+                __('Could not write usher configuration file "%s"'), $usher_config
             ));
         }
 
@@ -219,4 +214,33 @@ END;
         //
         IDF_Scm_Monotone_Usher::reload();
     }
+
+    /**
+     * Update the timeline after a push
+     *
+     */
+    public function processSyncTimeline($params)
+    {
+        $pname = $params['project'];
+        try {
+            $project = IDF_Project::getOr404($pname);
+        } catch (Pluf_HTTP_Error404 $e) {
+            Pluf_Log::event(array(
+                'IDF_Plugin_SyncMonotone::processSyncTimeline', 
+                'Project not found.',
+                array($pname, $params)
+            ));
+            return false; // Project not found
+        }
+
+        Pluf_Log::debug(array(
+            'IDF_Plugin_SyncMonotone::processSyncTimeline', 
+            'Project found', $pname, $project->id
+        ));
+        IDF_Scm::syncTimeline($project, true);
+        Pluf_Log::event(array(
+            'IDF_Plugin_SyncMonotone::processSyncTimeline',
+            'sync', array($pname, $project->id)
+        ));
+    }
 }

src/IDF/Plugin/SyncMonotone/monotonerc.tpl

@@ -0,0 +1,71 @@
+-- ***** BEGIN LICENSE BLOCK *****
+-- This file is part of InDefero, an open source project management application.
+-- Copyright (C) 2008 Céondo Ltd and contributors.
+--
+-- InDefero is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- InDefero is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+--
+-- ***** END LICENSE BLOCK *****
+
+--
+-- controls the access rights for remote_stdio which is used by IDFs frontend
+--
+function get_remote_automate_permitted(key_identity, command, options)
+    local read_only_commands = {
+        "get_corresponding_path", "get_content_changed", "tags", "branches",
+        "common_ancestors", "packet_for_fdelta", "packet_for_fdata",
+        "packets_for_certs", "packet_for_rdata", "get_manifest_of",
+        "get_revision", "select", "graph", "children", "parents", "roots",
+        "leaves", "ancestry_difference", "toposort", "erase_ancestors",
+        "descendents", "ancestors", "heads", "get_file_of", "get_file",
+        "interface_version", "get_attributes", "content_diff",
+        "file_merge", "show_conflicts", "certs", "keys"
+    }
+
+    for _,v in ipairs(read_only_commands) do
+        if (v == command[1]) then
+            return true
+        end
+    end
+            
+    return false
+end
+
+_idf_revs = {}
+function note_netsync_start(session_id)
+    _idf_revs[session_id] = {}
+end
+
+function note_netsync_revision_received(new_id, revision, certs, session_id)
+    table.insert(_idf_revs[session_id], new_id)
+end
+
+function note_netsync_end (session_id, ...)
+    if table.getn(_idf_revs[session_id]) == 0 then
+        return
+    end
+
+    local pin,pout,pid = spawn_pipe("%%MTNPOSTPUSH%%", "%%PROJECT%%");
+    if pid == -1 then
+        print("could execute %%MTNPOSTPUSH%%")
+        return
+    end
+    
+    for _,r in ipairs(_idf_revs[session_id]) do
+        pin:write(r .. "\n")
+    end
+    pin:close()
+    
+    wait(pid)
+end

src/IDF/relations.php

@@ -88,6 +88,9 @@ Pluf_Signal::connect('gitpostupdate.php::run',
 # monotone synchronization
 Pluf_Signal::connect('IDF_Project::created',
                      array('IDF_Plugin_SyncMonotone', 'entry'));
+Pluf_Signal::connect('phppostpush.php::run',
+                     array('IDF_Plugin_SyncMonotone', 'entry'));
+
 #
 # -- Processing of the webhook queue --
 Pluf_Signal::connect('queuecron.php::run',