diff --git a/doc/syncmonotone.mdtext b/doc/syncmonotone.mdtext
index c21a325..4a25b50 100644
--- a/doc/syncmonotone.mdtext
+++ b/doc/syncmonotone.mdtext
@@ -187,10 +187,11 @@ Remote commands can be helpful for a user or a 3rd party tool (like
contents remotely without having to pull everything in first instance.
Private projects on the other hand can only be synced by team members
-or additional invited people. Remote command execution is still enabled
-by default - if you want to disable that, simply remove the symlink to
-the file `indefero_authorize_remote_automate.conf` in your project's `hooks.d`
-directory or copy the file from the original location and adapt it.
+or additional invited people. Remote command execution is disabled
+by default. If you want to enable that, simply put the keys of the users
+you want to give access to in your project's `remote-automate-permissions`
+file. In the future this plugin might handle this file just as it handles
+`read-permissions` and `write-permissions`.
## Notifications
diff --git a/src/IDF/Plugin/SyncMonotone.php b/src/IDF/Plugin/SyncMonotone.php
index f75f530..bc12e2a 100644
--- a/src/IDF/Plugin/SyncMonotone.php
+++ b/src/IDF/Plugin/SyncMonotone.php
@@ -117,6 +117,12 @@ class IDF_Plugin_SyncMonotone
'hooks.d/indefero_post_push.conf.in',
'hooks.d/indefero_post_push.lua',
);
+ if (!$project->private) {
+ // this is linked and not copied to be able to update
+ // the list of read-only commands on upgrades
+ $confdir_contents[] = 'hooks.d/indefero_authorize_remote_automate.conf';
+ }
+
// check whether we should handle additional files in the config directory
$confdir_extra_contents = Pluf::f('mtn_confdir_extra', false);
if ($confdir_extra_contents !== false) {
@@ -383,6 +389,41 @@ class IDF_Plugin_SyncMonotone
__('Could not write read-permissions file "%s"'), $rcfile
));
}
+
+ // link / unlink the read-only automate permissions for the project
+ $confdir = Pluf::f('mtn_confdir', false);
+ if ($confdir === false) {
+ $confdir = dirname(__FILE__).'/SyncMonotone/';
+ }
+ $file = 'hooks.d/indefero_authorize_remote_automate.conf';
+ $projectfile = $projectpath.'/'.$file;
+ $templatefile = $confdir.'/'.$file;
+
+ $serverRestartRequired = false;
+ if ($project->private && file_exists($projectfile) && is_link($projectfile)) {
+ if (!unlink($projectfile)) {
+ IDF_Scm_Exception(sprintf(
+ __('Could not remove symlink "%s"'), $projectfile
+ ));
+ }
+ $serverRestartRequired = true;
+ } else
+ if (!$project->private && !file_exists($projectfile)) {
+ if (!symlink($templatefile, $projectfile)) {
+ throw new IDF_Scm_Exception(sprintf(
+ __('Could not create symlink "%s"'), $projectfile
+ ));
+ }
+ $serverRestartRequired = true;
+ }
+
+ if ($serverRestartRequired) {
+ // FIXME: we should actually use stopServer() here, but this
+ // seems to be ignored when the server should be started
+ // again immediately afterwards
+ IDF_Scm_Monotone_Usher::killServer($project->shortname);
+ IDF_Scm_Monotone_Usher::startServer($project->shortname);
+ }
}
/**
diff --git a/src/IDF/Scm/Monotone.php b/src/IDF/Scm/Monotone.php
index fb39d5b..39e2fc2 100644
--- a/src/IDF/Scm/Monotone.php
+++ b/src/IDF/Scm/Monotone.php
@@ -749,10 +749,9 @@ class IDF_Scm_Monotone extends IDF_Scm
// read in the initial branches we should follow
if (count($initialBranches) == 0) {
if (!isset($certs['branch'])) {
- throw new IDF_Scm_Exception(sprintf(
- __("revision %s has no branch cert - cannot start ".
- "logging from this revision"), $rev
- ));
+ // this revision has no branch cert, we cannot start logging
+ // from this revision
+ continue;
}
$initialBranches = $certs['branch'];
}
diff --git a/src/IDF/Views/Source.php b/src/IDF/Views/Source.php
index a0748da..472d710 100644
--- a/src/IDF/Views/Source.php
+++ b/src/IDF/Views/Source.php
@@ -342,7 +342,7 @@ class IDF_Views_Source
if (!$cobject) {
throw new Exception('could not retrieve commit object for '. $commit);
}
- $rep = new Pluf_HTTP_Response($cobject->changes, 'text/plain');
+ $rep = new Pluf_HTTP_Response($cobject->diff, 'text/plain');
$rep->headers['Content-Disposition'] = 'attachment; filename="'.$commit.'.diff"';
return $rep;
}
diff --git a/src/IDF/templates/idf/base-full.html b/src/IDF/templates/idf/base-full.html
index 5f505d8..d2e69fa 100644
--- a/src/IDF/templates/idf/base-full.html
+++ b/src/IDF/templates/idf/base-full.html
@@ -69,6 +69,7 @@