Merge branch 'hooks'

Author: purplesyringa

src/assets/post-receive

@@ -14,14 +14,6 @@ fi
 
 ################################################################################
 
-cat "$GIT_DIR/../content.json" | "$python_path" -c "import sys, json; content = json.load(sys.stdin); sys.exit(1 if content.get('hooks', False) else 0)"
-if [ $? -eq 0 ]; then
-	# Hooks disabled
-	exit 0
-fi
-
-################################################################################
-
 sign=1
 publish=1
 

src/assets/pre-receive

@@ -13,12 +13,6 @@ fi
 
 ################################################################################
 
-cat "$GIT_DIR/../content.json" | "$python_path" -c "import sys, json; content = json.load(sys.stdin); sys.exit(1 if content.get('hooks', False) else 0)"
-if [ $? -eq 0 ]; then
-	# Hooks disabled
-	exit 0
-fi
-
 if test -n "$GIT_PUSH_OPTION_COUNT"
 then
 	i=0

src/js/git.js

@@ -1053,6 +1053,26 @@ class Git {
 			.catch(() => []);
 	}
 
+	changeHooks(hooks) {
+		if(hooks) {
+			return Promise.all([
+				this.zeroFS.readFile("assets/pre-receive")
+					.then(preReceive => {
+						return this.zeroFS.writeFile(this.root + "/hooks/pre-receive", preReceive);
+					}),
+				this.zeroFS.readFile("assets/post-receive")
+					.then(postReceive => {
+						return this.zeroFS.writeFile(this.root + "/hooks/post-receive", postReceive);
+					})
+			]);
+		} else {
+			return Promise.all([
+				this.zeroFS.deleteFile(this.root + "/hooks/pre-receive"),
+				this.zeroFS.deleteFile(this.root + "/hooks/post-receive")
+			]);
+		}
+	}
+
 	toString() {
 		return "<Git " + this.root + ">";
 	}
@@ -1095,17 +1115,5 @@ Git.init = (root, zeroPage, name, email) => {
 		.then(id => {
 			return git.setRef("refs/heads/master", id);
 		})
-		.then(() => {
-			return zeroFS.readFile("assets/post-receive");
-		})
-		.then(postReceive => {
-			return zeroFS.writeFile(root + "/hooks/post-receive", postReceive);
-		})
-		.then(() => {
-			return zeroFS.readFile("assets/pre-receive");
-		})
-		.then(preReceive => {
-			return zeroFS.writeFile(root + "/hooks/pre-receive", preReceive);
-		})
 		.then(() => git);
 };

src/js/repo.js

@@ -415,7 +415,8 @@ class Repository {
 
 	// Adds or removes hooks from repository
 	changeHooks(hooks) {
-		return this.getContent()
+		return this.git.changeHooks(hooks)
+			.then(() => this.getContent())
 			.then(content => {
 				content.hooks = hooks;
 				return this.setContent(content);