diff options
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/git/commit-msg | 94 | ||||
| -rw-r--r-- | etc/snippets/tempel/scheme-mode | 22 | ||||
| -rw-r--r-- | etc/snippets/yas/scheme-mode/guix-package | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | etc/teams.scm (renamed from etc/teams.scm.in) | 21 |
4 files changed, 122 insertions, 20 deletions
diff --git a/etc/git/commit-msg b/etc/git/commit-msg new file mode 100755 index 0000000000..dfa07918bb --- /dev/null +++ b/etc/git/commit-msg @@ -0,0 +1,94 @@ +#!/bin/sh +# From Gerrit Code Review 3.6.1 +# +# Part of Gerrit Code Review (https://www.gerritcodereview.com/) +# +# 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. + +### Guix modifications start +COMMIT_MSG_MAGIC=VGhpcyBpcyB0aGUgY29tbWl0LW1zZyBob29rIG9mIEd1aXg= +top=$(git rev-parse --show-toplevel) +if test -d "$top/.git/hooks/commit-msg.d/"; then + for msg_hook in "$top/.git/hooks/commit-msg.d/"*; do + if ! sh "$msg_hook"; then + echo "error while running $msg_hook" + exit 1 + fi + done +fi +### Guix modifications end + +set -u + +# avoid [[ which is not POSIX sh. +if test "$#" != 1 ; then + echo "$0 requires an argument." + exit 1 +fi + +if test ! -f "$1" ; then + echo "file does not exist: $1" + exit 1 +fi + +# Do not create a change id if requested +if test "false" = "$(git config --bool --get gerrit.createChangeId)" ; then + exit 0 +fi + +if git rev-parse --verify HEAD >/dev/null 2>&1; then + refhash="$(git rev-parse HEAD)" +else + refhash="$(git hash-object -t tree /dev/null)" +fi + +random=$({ git var GIT_COMMITTER_IDENT ; echo "$refhash" ; cat "$1"; } | git hash-object --stdin) +dest="$1.tmp.${random}" + +trap 'rm -f "${dest}"' EXIT + +if ! git stripspace --strip-comments < "$1" > "${dest}" ; then + echo "cannot strip comments from $1" + exit 1 +fi + +if test ! -s "${dest}" ; then + echo "file is empty: $1" + exit 1 +fi + +reviewurl="$(git config --get gerrit.reviewUrl)" +if test -n "${reviewurl}" ; then + if ! git interpret-trailers --parse < "$1" | grep -q '^Link:.*/id/I[0-9a-f]\{40\}$' ; then + if ! git interpret-trailers \ + --trailer "Link: ${reviewurl%/}/id/I${random}" < "$1" > "${dest}" ; then + echo "cannot insert link footer in $1" + exit 1 + fi + fi +else + # Avoid the --in-place option which only appeared in Git 2.8 + # Avoid the --if-exists option which only appeared in Git 2.15 + if ! git -c trailer.ifexists=doNothing interpret-trailers \ + --trailer "Change-Id: I${random}" < "$1" > "${dest}" ; then + echo "cannot insert change-id line in $1" + exit 1 + fi +fi + +if ! mv "${dest}" "$1" ; then + echo "cannot mv ${dest} to $1" + exit 1 +fi diff --git a/etc/snippets/tempel/scheme-mode b/etc/snippets/tempel/scheme-mode index ef73a1e595..249f4ce8e3 100644 --- a/etc/snippets/tempel/scheme-mode +++ b/etc/snippets/tempel/scheme-mode @@ -18,32 +18,32 @@ scheme-mode "(origin" n> "(method " (p "url-fetch" method) ")" n> "(uri " (cl-case (and method (intern method)) - ('git-fetch "git-reference...") - ('svn-fetch "svn-reference...") - ('hg-fetch "hg-reference...") - ('cvs-fetch "cvs-reference...") - ('bzr-fetch "bzr-reference...") - (t "\"https://...\"")) + (git-fetch "git-reference...") + (svn-fetch "svn-reference...") + (hg-fetch "hg-reference...") + (cvs-fetch "cvs-reference...") + (bzr-fetch "bzr-reference...") + (otherwise "\"https://...\"")) ")" n> (cl-case (and method (intern method)) - ('git-fetch + (git-fetch (insert "(file-name (git-file-name name version))") (newline) (indent-according-to-mode)) - ('hg-fetch + (hg-fetch (insert "(file-name (hg-file-name name version))") (newline) (indent-according-to-mode)) - ('svn-fetch + (svn-fetch (insert "(file-name (string-append name \"-\" version \"-checkout\"))") (newline) (indent-according-to-mode)) - ('cvs-fetch + (cvs-fetch (insert "(file-name (string-append name \"-\" version \"-checkout\"))") (newline) (indent-according-to-mode)) - ('bzr-fetch + (bzr-fetch (insert "(file-name (string-append name \"-\" version \"-checkout\"))") (newline) (indent-according-to-mode)) diff --git a/etc/snippets/yas/scheme-mode/guix-package b/etc/snippets/yas/scheme-mode/guix-package index 724a392f81..3bb6307659 100644 --- a/etc/snippets/yas/scheme-mode/guix-package +++ b/etc/snippets/yas/scheme-mode/guix-package @@ -43,8 +43,9 @@ "scons-build-system" "texlive-build-system" "trivial-build-system" - "waf-build-system")}) + "waf-build-system" + "zig-build-system")}) (home-page "$4") (synopsis "$5") (description "$6") - (license $7)))
\ No newline at end of file + (license $7))) diff --git a/etc/teams.scm.in b/etc/teams.scm index 55242caad1..f3d4c73132 100644..100755 --- a/etc/teams.scm.in +++ b/etc/teams.scm @@ -1,5 +1,9 @@ -#!@GUILE@ \ ---no-auto-compile -s +#!/bin/sh +# Extra care is taken here to ensure this script can run in most environments, +# since it is invoked by 'git send-email'. +pre_inst_env_maybe= +command -v guix > /dev/null || pre_inst_env_maybe=./pre-inst-env +exec $pre_inst_env_maybe guix repl -- "$0" "$@" !# ;;; GNU Guix --- Functional package management for GNU @@ -770,13 +774,16 @@ and REV-END, two git revision strings." files)) (define (git-patch->commit-id file) - "Parse the commit ID from the first line of FILE, a patch produced with git." + "Parse the commit ID from FILE, a patch produced with git." (call-with-input-file file (lambda (port) - (let ((m (string-match "^From ([0-9a-f]{40})" (read-line port)))) - (unless m - (error "invalid patch file:" file)) - (match:substring m 1))))) + (let loop ((line (read-line port))) + (when (eof-object? line) + (error "could not find 'from' commit in patch" file)) + (let ((m (string-match "^From ([0-9a-f]{40})" line))) + (if m + (match:substring m 1) + (loop (read-line port)))))))) (define (git-patch->revisions file) "Return the start and end revisions of FILE, a patch file produced with git." |