Roll repo creation hook into general hook script

diff --git a/build-hooks/post-add-repo b/build-hooks/post-add-repo
deleted file mode 100755 (executable)
index d86bb2062bc9c786115ac0aaa441b03c8b1a8b59..0000000000000000000000000000000000000000
--- a/build-hooks/post-add-repo
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-set -e
-set -u
-
-escape() {
-    echo "$1" | sed -e 's/@/@@/g'
-}
-
-category=$(escape "$1")
-name=$(escape "$2")
-principal=$(escape "$3")
-
-base=build.hooks.post_add_repo.zephyr
-class=$(invirt-getconf "$base.class" 2>/dev/null || :)
-instance=$(invirt-getconf "$base.instance" 2>/dev/null || :)
-zsig=$(invirt-getconf "$base.zsig" 2>/dev/null || :)
-
-if [ -z "$class" ]; then
-  echo "I don't know where to send a commit zephyr!" >&2
-  echo "Please provide a value for $base.class in" >&2
-  echo "your invirt config file." >&2
-  exit 1
-fi
-
-(echo "$principal just created a new repository, $category/$name.git") | zwrite -c "$class" -i "${instance:-add-repo}" -s "${zsig:-Make a new repo}" -d

diff --git a/build-hooks/post-add-repo b/build-hooks/post-add-repo
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..b3ca0242fcf1583721bd213a4b9e3994325bd1f2
--- /dev/null
+++ b/build-hooks/post-add-repo
@@ -0,0 +1 @@
+post-build
\ No newline at end of file

diff --git a/build-hooks/post-build b/build-hooks/post-build
index 0fcaee6..277f8f2 100755 (executable)
--- a/build-hooks/post-build
+++ b/build-hooks/post-build
@@ -86,12 +86,18 @@ def submit_completion_msg(succeeded, values, verbose=True, success=lambda x: x,
 Build submitted by %(principal)s.""" % values
     return msg
 
+def repo_creation_msg(succeeded, values, verbose=True, success=lambda x: x, failure=lambda x: x):
+    values = dict(values)
+    assert succeeded
+    msg = '%(principal)s just created a new repository, %(category)s/%(name)s.git' % values
+    return msg
 
 # Names of hooks
 POST_BUILD = 'post-build'
 FAILED_BUILD = 'failed-build'
 POST_SUBMIT = 'post-submit'
 FAILED_SUBMIT = 'failed-submit'
+POST_ADD_REPO = 'post-add-repo'
 
 # Types of communication
 
@@ -102,11 +108,13 @@ message_generators = {
     ZEPHYR : { POST_BUILD : build_completion_msg,
                FAILED_BUILD : build_completion_msg,
                POST_SUBMIT : submit_completion_msg,
-               FAILED_SUBMIT : submit_completion_msg },
+               FAILED_SUBMIT : submit_completion_msg,
+               POST_ADD_REPO : repo_creation_msg },
     MAIL   : { POST_BUILD : build_completion_msg,
                FAILED_BUILD : build_completion_msg,
                POST_SUBMIT : submit_completion_msg,
-               FAILED_SUBMIT : submit_completion_msg }
+               FAILED_SUBMIT : submit_completion_msg,
+               POST_ADD_REPO : repo_creation_msg }
     }
 
 def zephyr_escape(m):
@@ -134,6 +142,8 @@ def main():
             hook_config = config.build.hooks.post_submit
         elif prog == FAILED_SUBMIT:
             hook_config = config.build.hooks.failed_submit
+        elif prog == POST_ADD_REPO:
+            hook_config = config.build.hooks.post_add_repo
         else:
             parser.error('hook script invoked with unrecognized name %s' % prog)
             return 2
@@ -186,6 +196,17 @@ def main():
         else:
             values['result'] = 'failed'
             succeeded = False
+    elif prog in [POST_ADD_REPO]:
+        if len(args) != 3:
+            parser.set_usage('Usage: %prog [options] category name principal')
+            parser.print_help()
+            return 3
+        values = { 'category' : args[0],
+                   'name' : args[1],
+                   'principal' : args[2],
+                   'default_instance' : 'new-repo',
+                   'default_subject' : 'New repository %(category)s/%(name)s'}
+        succeeded = True
     else:
         raise AssertionError('Impossible state')