4 files changed, 42 insertions(+), 2 deletions(-)

M gitsrht-update-hook/main.go
A gitsrht-update-hook/pre-receive.go
M gitsrht/repos.py
M scripts/symlink-update-hook.py

@@ 17,11 17,14 @@ var (
 
 func main() {
 	log.SetFlags(0)
+	logger.Printf("%v", os.Args)
 	// The update hook is run on the update and post-update git hooks, and also
 	// runs a third stage directly. The first two stages are performance
 	// critical and take place while the user is blocked at their terminal. The
 	// third stage is done in the background.
-	if os.Args[0] == "hooks/update" {
+	if os.Args[0] == "hooks/pre-receive" {
+		preReceive()
+	} else if os.Args[0] == "hooks/update" {
 		update()
 	} else if os.Args[0] == "hooks/post-update" {
 		postUpdate()

@@ 0,0 1,32 @@
+package main
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"strconv"
+)
+
+func preReceive() {
+	// TODO: This would be a good place to enforce branch update restrictions
+	// and such, or to check OWNERS, etc.
+	pushUuid, ok := os.LookupEnv("SRHT_PUSH")
+	if !ok {
+		logger.Fatal("Missing SRHT_PUSH in environment, configuration error?")
+	}
+	logger.Printf("Running pre-receive for push %s", pushUuid)
+
+	if nopts, ok := os.LookupEnv("GIT_PUSH_OPTION_COUNT"); ok {
+		n, _ := strconv.Atoi(nopts)
+		configureOpts(pushUuid, n)
+	}
+}
+
+func configureOpts(pushUuid string, nopts int) {
+	for i := 0; i < nopts; i++ {
+		opt := os.Getenv(fmt.Sprintf("GIT_PUSH_OPTION_%d", i))
+		if opt == "debug" {
+			log.Printf("debug: %s", pushUuid)
+		}
+	}
+}

@@ 93,6 93,10 @@ class GitRepoApi(SimpleRepoApi):
             cwd=repo.path, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
         subprocess.run(["ln", "-s",
                 post_update,
+                os.path.join(repo.path, "hooks", "pre-receive")
+            ], check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+        subprocess.run(["ln", "-s",
+                post_update,
                 os.path.join(repo.path, "hooks", "update")
             ], check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
         subprocess.run(["ln", "-s",

@@ 25,5 25,6 @@ def migrate(path, link):
 
 for repo in Repository.query.all():
     if migrate(os.path.join(repo.path, "hooks", "update"), post_update) \
-        and migrate(os.path.join(repo.path, "hooks", "post-update"), post_update):
+        and migrate(os.path.join(repo.path, "hooks", "post-update"), post_update) \
+        and migrate(os.path.join(repo.path, "hooks", "pre-receive"), post_update):
         print("Migrated {}".format(repo.name))