Merge lp:~chipaca/snappy/precommit into lp:~snappy-dev/snappy/snappy-moved-to-github

[John Lenton]

Added a precommit hook. Made some changes to run-checks to make it better as a precommit script.

Also made vet happy wrt unreachable code in xgettext-go.

A very silly branch that you can ignore until things are less manic.

[Michael Vogt (mvo)]

Looks good

review: Approve

=== added file '.precommit'
--- .precommit	1970-01-01 00:00:00 +0000
+++ .precommit	2015-09-16 12:23:49 +0000
@@ -0,0 +1,32 @@
+#!/bin/sh
+set -e
+echo "$@"
+# put me in the project root, call me ".precommit".
+# And put this here-document in ~/.bazaar/plugins/precommit_script.py:
+<<EOF
+import os
+
+if not os.getenv("SKIP_COMMIT_HOOK"):
+    import subprocess
+    from bzrlib.mutabletree import MutableTree
+    from bzrlib import errors
+
+    def start_commit_hook(*_):
+        """This hook will execute '.precommit' script from root path of the bazaar
+        branch. Commit will be canceled if precommit fails."""
+
+        # this hook only makes sense if a precommit file exist.
+        if not os.path.exists(".precommit"):
+            return
+        try:
+            subprocess.check_call(os.path.abspath(".precommit"))
+        # if precommit fails (process return not zero) cancel commit.
+        except subprocess.CalledProcessError:
+            raise errors.BzrError("pre commit check failed (set SKIP_COMMIT_HOOK to skip).")
+
+    MutableTree.hooks.install_named_hook('start_commit', start_commit_hook,
+                                         'Run "precommit" script on start_commit')
+EOF
+
+./run-checks --quick
+
 
=== modified file '.tarmac.sh'
--- .tarmac.sh	2015-02-13 13:29:27 +0000
+++ .tarmac.sh	2015-09-16 12:23:49 +0000
@@ -11,4 +11,4 @@
 cp -a . $GOPATH/src/launchpad.net/snappy/
 cd $GOPATH/src/launchpad.net/snappy
 
-./run-checks
+sh -v ./run-checks
 
=== modified file 'i18n/xgettext-go/main.go'
--- i18n/xgettext-go/main.go	2015-09-10 06:16:31 +0000
+++ i18n/xgettext-go/main.go	2015-09-16 12:23:49 +0000
@@ -89,8 +89,6 @@
 	default:
 		panic(fmt.Sprintf("unknown type: %v", val))
 	}
-
-	return ""
 }
 
 func inspectNodeForTranslations(fset *token.FileSet, f *ast.File, n ast.Node) bool {
 
=== modified file 'run-checks'
--- run-checks	2015-09-02 18:11:49 +0000
+++ run-checks	2015-09-16 12:23:49 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -ev
+set -eu
 
 if which goctest >/dev/null; then
     goctest="goctest"
@@ -8,6 +8,11 @@
     goctest="go test"
 fi
 
+QUICK=""
+if [ "${1:-}" = "--quick" ]; then
+    QUICK=yes
+fi
+
 echo Checking docs
 ./mdlint.py docs/*.md
 
@@ -20,27 +25,26 @@
     exit 1
 fi
 
-echo Installing godeps
-go get launchpad.net/godeps
-export PATH=$PATH:$GOPATH/bin
-
-echo Install golint
-go get github.com/golang/lint/golint
-export PATH=$PATH:$GOPATH/bin
-
-echo Obtaining dependencies
-godeps -u dependencies.tsv
-
-
-
-echo Building
-go build -v launchpad.net/snappy/...
-
-
-# tests
-echo Running tests from $(pwd)
-$goctest -v -cover ./...
-
+if [ -z "$QUICK" ]; then
+    echo Installing godeps
+    go get launchpad.net/godeps
+    export PATH=$PATH:$GOPATH/bin
+
+    echo Install golint
+    go get github.com/golang/lint/golint
+    export PATH=$PATH:$GOPATH/bin
+
+    echo Obtaining dependencies
+    godeps -u dependencies.tsv
+
+    echo Building
+    go build -v launchpad.net/snappy/...
+
+
+    # tests
+    echo Running tests from $(pwd)
+    $goctest -v -cover ./...
+fi
 
 # go vet
 echo Running vet
@@ -67,21 +71,23 @@
 fi
 
 
-# integration tests
-echo Building the integration tests
-go build _integration-tests/main.go
-
-# the rabbit hole
-echo Running the tests for the integration testutils
-$goctest -v -cover ./_integration-tests/testutils/...
-
-# integration suite in kvm
-if which adt-run >/dev/null 2>&1; then
-    echo "Running integration tests on rolling edge"
-    go run _integration-tests/main.go --snappy-from-branch
-    # print the results.
-    if which subunit2pyunit >/dev/null 2>&1; then
-        subunit-1to2 /tmp/snappy-test/output/artifacts/results.subunit | subunit2pyunit
+if [ -z "$QUICK" ]; then
+    # integration tests
+    echo Building the integration tests
+    go build _integration-tests/main.go
+
+    # the rabbit hole
+    echo Running the tests for the integration testutils
+    $goctest -v -cover ./_integration-tests/testutils/...
+
+    # integration suite in kvm
+    if which adt-run >/dev/null 2>&1; then
+        echo "Running integration tests on rolling edge"
+        go run _integration-tests/main.go --snappy-from-branch
+        # print the results.
+        if which subunit2pyunit >/dev/null 2>&1; then
+            subunit-1to2 /tmp/snappy-test/output/artifacts/results.subunit | subunit2pyunit
+        fi
     fi
 fi