remove overwrought bake.go stuff
Change-Id: I97b548ea80d706416e0e3f7279a70070dd982a39
diff --git a/bake.go b/bake.go
deleted file mode 100644
index e94a53d..0000000
--- a/bake.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-// Command bake takes a list of file names and writes a Go source file
-// "baked.go" that declares a map of string constants containing the input
-// files.
-//
-// For example, the command
-// bake foo.html bar.txt
-// produces a source file that declares the variable bakedFiles
-// that is a map with keys "foo.html" and "bar.txt" that contain the contents
-// of foo.html and bar.txt.
-package main
-
-import (
- "bufio"
- "bytes"
- "fmt"
- "io/ioutil"
- "os"
- "unicode/utf8"
-)
-
-func main() {
- if err := bake(os.Args[1:]); err != nil {
- fmt.Fprintln(os.Stderr, err)
- os.Exit(1)
- }
-}
-
-func bake(files []string) error {
- f, err := os.Create("baked.go")
- if err != nil {
- return err
- }
- defer f.Close()
- w := bufio.NewWriter(f)
- fmt.Fprintf(w, "%v\n\npackage main\n\n", warning)
- fmt.Fprintf(w, "var baked = map[string]string{\n")
- for _, fn := range files {
- b, err := ioutil.ReadFile(fn)
- if err != nil {
- return err
- }
- fmt.Fprintf(w, "\t%q: ", fn)
- if utf8.Valid(b) {
- fmt.Fprintf(w, "`%s`", sanitize(b))
- } else {
- fmt.Fprintf(w, "%q", b)
- }
- fmt.Fprintln(w, ",\n")
- }
- fmt.Fprintln(w, "}")
- if err := w.Flush(); err != nil {
- return err
- }
- return f.Close()
-}
-
-// sanitize prepares a valid UTF-8 string as a raw string constant.
-func sanitize(b []byte) []byte {
- // Replace ` with `+"`"+`
- b = bytes.Replace(b, []byte("`"), []byte("`+\"`\"+`"), -1)
-
- // Replace BOM with `+"\xEF\xBB\xBF"+`
- // (A BOM is valid UTF-8 but not permitted in Go source files.
- // I wouldn't bother handling this, but for some insane reason
- // jquery.js has a BOM somewhere in the middle.)
- return bytes.Replace(b, []byte("\xEF\xBB\xBF"), []byte("`+\"\\xEF\\xBB\\xBF\"+`"), -1)
-}
-
-const warning = "// DO NOT EDIT ** This file was generated with the bake tool ** DO NOT EDIT //"
diff --git a/commit-msg.githook b/commit-msg.githook
deleted file mode 100755
index 985016b..0000000
--- a/commit-msg.githook
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-# From Gerrit Code Review 2.2.1
-#
-# Part of Gerrit Code Review (http://code.google.com/p/gerrit/)
-#
-# Copyright (C) 2009 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-CHANGE_ID_AFTER="Bug|Issue"
-MSG="$1"
-
-# Check for, and add if missing, a unique Change-Id
-#
-add_ChangeId() {
- clean_message=`sed -e '
- /^diff --git a\/.*/{
- s///
- q
- }
- /^Signed-off-by:/d
- /^#/d
- ' "$MSG" | git stripspace`
- if test -z "$clean_message"
- then
- return
- fi
-
- if grep -i '^Change-Id:' "$MSG" >/dev/null
- then
- return
- fi
-
- id=`_gen_ChangeId`
- perl -e '
- $MSG = shift;
- $id = shift;
- $CHANGE_ID_AFTER = shift;
-
- undef $/;
- open(I, $MSG); $_ = <I>; close I;
- s|^diff --git a/.*||ms;
- s|^#.*$||mg;
- exit unless $_;
-
- @message = split /\n/;
- $haveFooter = 0;
- $startFooter = @message;
- for($line = @message - 1; $line >= 0; $line--) {
- $_ = $message[$line];
-
- if (/^[a-zA-Z0-9-]+:/ && !m,^[a-z0-9-]+://,) {
- $haveFooter++;
- next;
- }
- next if /^[ []/;
- $startFooter = $line if ($haveFooter && /^\r?$/);
- last;
- }
-
- @footer = @message[$startFooter+1..@message];
- @message = @message[0..$startFooter];
- push(@footer, "") unless @footer;
-
- for ($line = 0; $line < @footer; $line++) {
- $_ = $footer[$line];
- next if /^($CHANGE_ID_AFTER):/i;
- last;
- }
- splice(@footer, $line, 0, "Change-Id: I$id");
-
- $_ = join("\n", @message, @footer);
- open(O, ">$MSG"); print O; close O;
- ' "$MSG" "$id" "$CHANGE_ID_AFTER"
-}
-_gen_ChangeIdInput() {
- echo "tree `git write-tree`"
- if parent=`git rev-parse HEAD^0 2>/dev/null`
- then
- echo "parent $parent"
- fi
- echo "author `git var GIT_AUTHOR_IDENT`"
- echo "committer `git var GIT_COMMITTER_IDENT`"
- echo
- printf '%s' "$clean_message"
-}
-_gen_ChangeId() {
- _gen_ChangeIdInput |
- git hash-object -t commit --stdin
-}
-
-
-add_ChangeId
diff --git a/baked.go b/hook.go
similarity index 79%
rename from baked.go
rename to hook.go
index 243b1a0..c7865a2 100644
--- a/baked.go
+++ b/hook.go
@@ -1,9 +1,10 @@
-// DO NOT EDIT ** This file was generated with the bake tool ** DO NOT EDIT //
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
package main
-var baked = map[string]string{
- "commit-msg.githook": `#!/bin/sh
+var commitMsgHook = `#!/bin/sh
# From Gerrit Code Review 2.2.1
#
# Part of Gerrit Code Review (http://code.google.com/p/gerrit/)
@@ -29,14 +30,14 @@
# Check for, and add if missing, a unique Change-Id
#
add_ChangeId() {
- clean_message=`+"`"+`sed -e '
+ clean_message=` + "`" + `sed -e '
/^diff --git a\/.*/{
s///
q
}
/^Signed-off-by:/d
/^#/d
- ' "$MSG" | git stripspace`+"`"+`
+ ' "$MSG" | git stripspace` + "`" + `
if test -z "$clean_message"
then
return
@@ -47,7 +48,7 @@
return
fi
- id=`+"`"+`_gen_ChangeId`+"`"+`
+ id=` + "`" + `_gen_ChangeId` + "`" + `
perl -e '
$MSG = shift;
$id = shift;
@@ -90,13 +91,13 @@
' "$MSG" "$id" "$CHANGE_ID_AFTER"
}
_gen_ChangeIdInput() {
- echo "tree `+"`"+`git write-tree`+"`"+`"
- if parent=`+"`"+`git rev-parse HEAD^0 2>/dev/null`+"`"+`
+ echo "tree ` + "`" + `git write-tree` + "`" + `"
+ if parent=` + "`" + `git rev-parse HEAD^0 2>/dev/null` + "`" + `
then
echo "parent $parent"
fi
- echo "author `+"`"+`git var GIT_AUTHOR_IDENT`+"`"+`"
- echo "committer `+"`"+`git var GIT_COMMITTER_IDENT`+"`"+`"
+ echo "author ` + "`" + `git var GIT_AUTHOR_IDENT` + "`" + `"
+ echo "committer ` + "`" + `git var GIT_COMMITTER_IDENT` + "`" + `"
echo
printf '%s' "$clean_message"
}
@@ -107,6 +108,4 @@
add_ChangeId
-`,
-
-}
+`
diff --git a/review.go b/review.go
index ee73482..fd55d8b 100644
--- a/review.go
+++ b/review.go
@@ -4,8 +4,6 @@
package main
-//go:generate go run bake.go commit-msg.githook
-
import (
"flag"
"fmt"
@@ -199,7 +197,7 @@
dief("checking for hook file: %v\n", err)
}
fmt.Printf("Presubmit hook to add Change-Id to commit messages is missing.\nNow automatically creating it at %v.\n\n", hookFile)
- hookContent := []byte(baked["commit-msg.githook"])
+ hookContent := []byte(commitMsgHook)
if err := ioutil.WriteFile(hookFile, hookContent, 0700); err != nil {
dief("writing hook file: %v\n", err)
}
