October 2019 - tor-commits - lists.torproject.org

[translation/torbutton-browseronboardingproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseronboardingproperties
by translation＠torproject.org 25 Oct '19

25 Oct '19

commit e507a33bc1a82f143544f8e13c26af776e32b933 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 25 07:22:10 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseron… --- id/browserOnboarding.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id/browserOnboarding.properties b/id/browserOnboarding.properties index 958fba003..541a0b13b 100644 --- a/id/browserOnboarding.properties +++ b/id/browserOnboarding.properties @@ -16,7 +16,7 @@ onboarding.tour-tor-network=Jaringan Tor onboarding.tour-tor-network.title=Mengelilingi jaringan yang terdesentralisasi. onboarding.tour-tor-network.description=Tor Browser menghubungkan Anda ke jaringan Tor yang dijalankan oleh ribuan relawan di seluruh dunia. Tidak seperti VPN, tidak ada satu titik kesalahan atau entitas sentral yang perlu anda percaya untuk menikmati internet secara privat. onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences. -onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings +onboarding.tour-tor-network.action-button=Sesuaikan Pengaturan Jaringan Tor Anda onboarding.tour-tor-network.button=Pergi ke Tampilan Sirkuit onboarding.tour-tor-circuit-display=Tampilan Sirkuit

1 0

[tor/master] scripts/maint: Stop assuming that python3 is in /usr/bin
by teor＠torproject.org 25 Oct '19

25 Oct '19

commit 00c3fba61c778981903bd9598d2eaa27f51e51a7 Author: teor <teor(a)torproject.org> Date: Fri Oct 25 16:46:54 2019 +1000 scripts/maint: Stop assuming that python3 is in /usr/bin Obviously correct fix to rename_c_identifier.py. Bugfix on 32237; not in any released version of tor. --- scripts/maint/rename_c_identifier.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/maint/rename_c_identifier.py b/scripts/maint/rename_c_identifier.py index 0e56dc48d..e8cdb895a 100755 --- a/scripts/maint/rename_c_identifier.py +++ b/scripts/maint/rename_c_identifier.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # # Copyright (c) 2001 Matej Pfajfar. # Copyright (c) 2001-2004, Roger Dingledine.

1 0

[tor/master] scripts/git: Add check_cocci_parse.sh to the pre-commit hook
by teor＠torproject.org 25 Oct '19

25 Oct '19

commit b9a2286765ff2c6dcd51254669480982962982e8 Author: teor <teor(a)torproject.org> Date: Wed Oct 23 15:43:27 2019 +1000 scripts/git: Add check_cocci_parse.sh to the pre-commit hook But only check modified files, which dramatically speeds up check_cocci_parse.sh. Part of 31919. --- scripts/git/pre-commit.git-hook | 41 ++++++++++++++++++++++++++++++++ scripts/git/pre-push.git-hook | 52 +++++++++++++++++++++++++++-------------- 2 files changed, 76 insertions(+), 17 deletions(-) diff --git a/scripts/git/pre-commit.git-hook b/scripts/git/pre-commit.git-hook index 1c381ec60..7437bc085 100755 --- a/scripts/git/pre-commit.git-hook +++ b/scripts/git/pre-commit.git-hook @@ -19,6 +19,7 @@ fi if [ -d src/lib ]; then # This is the layout in 0.3.5 + # There are two copies of this list in this file perl scripts/maint/checkSpace.pl -C \ src/lib/*/*.[ch] \ src/core/*/*.[ch] \ @@ -57,3 +58,43 @@ fi if [ -e scripts/maint/checkShellScripts.sh ]; then scripts/maint/checkShellScripts.sh fi + +if [ -e scripts/coccinelle/check_cocci_parse.sh ]; then + + if [ $# -eq 0 ]; then + # When called in pre-commit, check the files modified in this commit + CHECK_FILTER="git diff --cached --name-only --diff-filter=ACMR" + # Use the owned tor source layout from 0.3.5 to filter the changed + # files. + # (There are two copies of this list in this file.) + CHECK_FILES="$($CHECK_FILTER \ + src/lib/*/*.[ch] \ + src/core/*/*.[ch] \ + src/feature/*/*.[ch] \ + src/app/*/*.[ch] \ + src/test/*.[ch] \ + src/test/*/*.[ch] \ + src/tools/*.[ch] \ + )" + fi + + if [ "${CHECK_FILES:-$*}" ]; then + printf "Modified files:\n%s\n" "${CHECK_FILES:-$*}" + + # Run a verbose cocci parse check on the changed files + # (spatch is slow, so we don't want to check all the files.) + if [ $# -eq 0 ]; then + # pre-commit: use $CHECK_FILES, fails on spaces in file names + # + # We want word splitting here, because file names are space + # separated + # shellcheck disable=SC2086 + VERBOSE=1 scripts/coccinelle/check_cocci_parse.sh \ + $CHECK_FILES + else + # pre-push: use "$@" to preserve spaces in arguments + VERBOSE=1 scripts/coccinelle/check_cocci_parse.sh \ + "$@" + fi + fi +fi diff --git a/scripts/git/pre-push.git-hook b/scripts/git/pre-push.git-hook index f4504c421..6a44e93dd 100755 --- a/scripts/git/pre-push.git-hook +++ b/scripts/git/pre-push.git-hook @@ -16,32 +16,21 @@ # The following sample script was used as starting point: # https://github.com/git/git/blob/master/templates/hooks--pre-push.sample +# Are you adding a new check to the git hooks? +# - Common checks belong in the pre-commit hook +# - Push-only checks belong in the pre-push hook + echo "Running pre-push hook" z40=0000000000000000000000000000000000000000 upstream_name=${TOR_UPSTREAM_REMOTE_NAME:-"upstream"} -# Are you adding a new check to the git hooks? -# - Common checks belong in the pre-commit hook -# - Push-only checks belong in the pre-push hook -# -# Call the pre-commit hook for the common checks, if it is executable. workdir=$(git rev-parse --show-toplevel) -if [ -x "$workdir/.git/hooks/pre-commit" ]; then - if ! "$workdir"/.git/hooks/pre-commit; then - exit 1 - fi -fi remote="$1" - remote_name=$(git remote --verbose | grep "$2" | awk '{print $1}' | head -n 1) -if [[ "$remote_name" != "$upstream_name" ]]; then - echo "Not pushing to upstream - refraining from further checks" - exit 0 -fi ref_is_upstream_branch() { if [ "$1" == "refs/heads/master" ] || @@ -62,13 +51,42 @@ do else if [ "$remote_sha" = $z40 ] then - # New branch, examine all commits - range="$local_sha" + # New branch, examine commits not in master + range="master...$local_sha" else # Update to existing branch, examine new commits range="$remote_sha..$local_sha" fi + # Call the pre-commit hook for the common checks, if it is executable. + # Use the owned tor source layout from 0.3.5 to filter the changed + # files. + if [ -x "$workdir/scripts/git/pre-commit.git-hook" ]; then + CHECK_FILES="$(git diff --name-only --diff-filter=ACMR \ + "$range" \ + src/lib/*/*.[ch] \ + src/core/*/*.[ch] \ + src/feature/*/*.[ch] \ + src/app/*/*.[ch] \ + src/test/*.[ch] \ + src/test/*/*.[ch] \ + src/tools/*.[ch] \ + )" + + # We want word splitting here, because file names are space + # separated + # shellcheck disable=SC2086 + if ! "$workdir/"scripts/git/pre-commit.git-hook $CHECK_FILES; then + exit 1 + fi + fi + + if [[ "$remote_name" != "$upstream_name" ]]; then + echo "Not pushing to upstream - refraining from further checks" + continue + fi + + if (ref_is_upstream_branch "$local_ref" == 0 || ref_is_upstream_branch "$remote_ref" == 0) && [ "$local_ref" != "$remote_ref" ]

1 0

[tor/master] scripts/cocci: Remove unused arguments from try_parse.sh spatch
by teor＠torproject.org 25 Oct '19

25 Oct '19

commit 87ee49e016a100951bb1dd37f2ef57826a951eb1 Author: teor <teor(a)torproject.org> Date: Thu Oct 24 11:34:28 2019 +1000 scripts/cocci: Remove unused arguments from try_parse.sh spatch Part of 31919. --- scripts/coccinelle/try_parse.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/coccinelle/try_parse.sh b/scripts/coccinelle/try_parse.sh index 6cdd968a0..a90e51b4a 100755 --- a/scripts/coccinelle/try_parse.sh +++ b/scripts/coccinelle/try_parse.sh @@ -24,16 +24,18 @@ for fn in "$@"; do fi fi - if spatch -macro_file_builtins "$top"/scripts/coccinelle/tor-coccinelle.h \ - -I "$top" -I "$top"/src -I "$top"/ext --defined COCCI \ + if spatch --macro-file-builtins \ + "$top"/scripts/coccinelle/tor-coccinelle.h \ + --defined COCCI \ --parse-c "$fn" \ 2>/dev/null | grep "perfect = 1" > /dev/null; then : # it's perfect else echo "$fn" if test "${VERBOSE}" != ""; then - spatch -macro_file_builtins "$top"/scripts/coccinelle/tor-coccinelle.h \ - -I "$top" -I "$top"/src -I "$top"/ext --defined COCCI \ + spatch --macro-file-builtins \ + "$top"/scripts/coccinelle/tor-coccinelle.h \ + --defined COCCI \ --parse-c "$fn" fi exitcode=1

1 0

[tor/master] scripts/cocci: Add an exceptions file to try_parse.sh
by teor＠torproject.org 25 Oct '19

25 Oct '19

commit 9a96068a0be44bc94ae771225abde3ad8698a800 Author: teor <teor(a)torproject.org> Date: Wed Oct 23 15:37:20 2019 +1000 scripts/cocci: Add an exceptions file to try_parse.sh Set $TOR_COCCI_EXCEPTIONS_FILE to the name of an exceptions file, containing a list of filename patterns matched by 'grep -f'. Part of 31919. --- scripts/coccinelle/try_parse.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/scripts/coccinelle/try_parse.sh b/scripts/coccinelle/try_parse.sh index 0f91e3170..6cdd968a0 100755 --- a/scripts/coccinelle/try_parse.sh +++ b/scripts/coccinelle/try_parse.sh @@ -2,6 +2,11 @@ # Echo the name of every argument of this script that is not "perfect" # according to coccinelle's --parse-c. +# +# If $TOR_COCCI_EXCEPTIONS_FILE is non-empty, skip any files that match the +# patterns in the exception file, according to "grep -f" +# +# If VERBOSE is non-empty, log spatch errors and skipped files. top="$(dirname "$0")/../.." @@ -9,6 +14,16 @@ exitcode=0 for fn in "$@"; do + if test "${TOR_COCCI_EXCEPTIONS_FILE}" ; then + skip_fn=$(echo "$fn" | grep -f "${TOR_COCCI_EXCEPTIONS_FILE}") + if test "${skip_fn}" ; then + if test "${VERBOSE}" != ""; then + echo "Skipping '${skip_fn}'" + fi + continue + fi + fi + if spatch -macro_file_builtins "$top"/scripts/coccinelle/tor-coccinelle.h \ -I "$top" -I "$top"/src -I "$top"/ext --defined COCCI \ --parse-c "$fn" \

1 0

[tor/master] scripts/cocci: Check owned src in check_cocci_parse.sh by default
by teor＠torproject.org 25 Oct '19

25 Oct '19

commit 71b8b7ee2ddfa5e2f8d6bf8f754276f512b5fd1c Author: teor <teor(a)torproject.org> Date: Wed Oct 23 22:17:37 2019 +1000 scripts/cocci: Check owned src in check_cocci_parse.sh by default Check the tor-owned sources in an 0.3.5 directory layout, if no files are provided on the command line. Part of 31919. --- scripts/coccinelle/check_cocci_parse.sh | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/scripts/coccinelle/check_cocci_parse.sh b/scripts/coccinelle/check_cocci_parse.sh index a422a99da..5c27c7bc8 100755 --- a/scripts/coccinelle/check_cocci_parse.sh +++ b/scripts/coccinelle/check_cocci_parse.sh @@ -1,8 +1,11 @@ #!/bin/sh # If we have coccinelle installed, run try_parse.sh on every filename passed -# as an argument. Uses the default coccinelle exceptions file, if -# $TOR_COCCI_EXCEPTIONS_FILE is not set. +# as an argument. If no filenames are supplied, scan a standard Tor 0.3.5 or +# later directory layout. +# +# Uses the default coccinelle exceptions file, or $TOR_COCCI_EXCEPTIONS_FILE, +# if it is set. # # Use TOR_COCCI_EXCEPTIONS_FILE=/dev/null check_cocci_parse.sh to disable # the default exception file. @@ -23,8 +26,21 @@ if ! command -v spatch; then exit "$exitcode" fi -"$try_parse" "$@" -exitcode=$? +if test $# -ge 1 ; then + "$try_parse" "$@" + exitcode=$? +else + # This is the layout in 0.3.5 + "$try_parse" \ + src/lib/*/*.[ch] \ + src/core/*/*.[ch] \ + src/feature/*/*.[ch] \ + src/app/*/*.[ch] \ + src/test/*.[ch] \ + src/test/*/*.[ch] \ + src/tools/*.[ch] + exitcode=$? +fi if test "$exitcode" != 0 ; then echo "Please fix these cocci parsing errors in the above files"

1 0

[tor/master] scripts/cocci: Add check_cocci_parse.sh and default exceptions
by teor＠torproject.org 25 Oct '19

25 Oct '19

commit 330717f01845a2fea45b79d914161d6a2a897815 Author: teor <teor(a)torproject.org> Date: Wed Oct 23 15:40:09 2019 +1000 scripts/cocci: Add check_cocci_parse.sh and default exceptions Add check_cocci_parse.sh, which is a thin wrapper around try_parse.sh. Add a default exceptions file, and use it in check_cocci_parse.sh. Part of 31919. --- scripts/coccinelle/check_cocci_parse.sh | 36 +++++++++++++++++++++++++++++++++ scripts/coccinelle/exceptions.txt | 24 ++++++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/scripts/coccinelle/check_cocci_parse.sh b/scripts/coccinelle/check_cocci_parse.sh new file mode 100755 index 000000000..a422a99da --- /dev/null +++ b/scripts/coccinelle/check_cocci_parse.sh @@ -0,0 +1,36 @@ +#!/bin/sh + +# If we have coccinelle installed, run try_parse.sh on every filename passed +# as an argument. Uses the default coccinelle exceptions file, if +# $TOR_COCCI_EXCEPTIONS_FILE is not set. +# +# Use TOR_COCCI_EXCEPTIONS_FILE=/dev/null check_cocci_parse.sh to disable +# the default exception file. +# +# If spatch is not installed, remind the user to install it, but exit with +# a success error status. + +scripts_cocci="$(dirname "$0")" +top="$scripts_cocci/../.." +try_parse="$scripts_cocci/try_parse.sh" + +exitcode=0 + +export TOR_COCCI_EXCEPTIONS_FILE="${TOR_COCCI_EXCEPTIONS_FILE:-$scripts_cocci/exceptions.txt}" + +if ! command -v spatch; then + echo "Install coccinelle's spatch to check cocci C parsing!" + exit "$exitcode" +fi + +"$try_parse" "$@" +exitcode=$? + +if test "$exitcode" != 0 ; then + echo "Please fix these cocci parsing errors in the above files" + echo "Set VERBOSE=1 for more details" + echo "Try running test-operator-cleanup or 'make autostyle-operators'" + echo "As a last resort, you can modify scripts/coccinelle/exceptions.txt" +fi + +exit "$exitcode" diff --git a/scripts/coccinelle/exceptions.txt b/scripts/coccinelle/exceptions.txt new file mode 100644 index 000000000..473f4b22c --- /dev/null +++ b/scripts/coccinelle/exceptions.txt @@ -0,0 +1,24 @@ +# A list of exception patterns for check_cocci_parse.sh +# Passed to 'grep -f' +src/lib/cc/compat_compiler.h +src/lib/container/handles.h +src/lib/container/map.c +src/lib/container/map.h +src/lib/container/order.c +src/lib/crypt_ops/crypto_rand.c +src/lib/fs/files.h +src/lib/log/util_bug.c +src/lib/pubsub/pubsub_macros.h +src/lib/smartlist_core/smartlist_foreach.h +src/lib/testsupport/testsupport.h +src/lib/tls/tortls.h +src/lib/tls/tortls_openssl.c +src/lib/tls/x509.h +src/lib/version/version.c +src/core/mainloop/connection.c +src/core/or/reasons.c +src/feature/dirclient/dirclient.c +src/feature/nodelist/networkstatus.c +src/test/test_address.c +src/test/test_hs_cache.c +src/test/test_hs_descriptor.c

1 0

[tor/master] scripts/git: Only check modified files in existing git hook checks
by teor＠torproject.org 25 Oct '19

25 Oct '19

commit b4b316631d10daf7ff22d42724c9bfb7381f4265 Author: teor <teor(a)torproject.org> Date: Thu Oct 24 13:59:02 2019 +1000 scripts/git: Only check modified files in existing git hook checks Part of 31919. --- scripts/git/pre-commit.git-hook | 115 +++++++++++++++++++--------------------- scripts/git/pre-push.git-hook | 33 +++++++----- 2 files changed, 77 insertions(+), 71 deletions(-) diff --git a/scripts/git/pre-commit.git-hook b/scripts/git/pre-commit.git-hook index 7437bc085..2e476c310 100755 --- a/scripts/git/pre-commit.git-hook +++ b/scripts/git/pre-commit.git-hook @@ -13,31 +13,61 @@ cd "$workdir" || exit 1 set -e +if [ $# -eq 0 ]; then + # When called in pre-commit, check the files modified in this commit + CHECK_FILTER="git diff --cached --name-only --diff-filter=ACMR" + # Use the appropriate owned tor source list to filter the changed files + if [ -d src/lib ]; then + # This is the layout in 0.3.5 + CHECK_FILES="$($CHECK_FILTER \ + src/lib/*/*.[ch] \ + src/core/*/*.[ch] \ + src/feature/*/*.[ch] \ + src/app/*/*.[ch] \ + src/test/*.[ch] \ + src/test/*/*.[ch] \ + src/tools/*.[ch] \ + )" + elif [ -d src/common ]; then + # This was the layout before 0.3.5 + CHECK_FILES="$($CHECK_FILTER \ + src/common/*/*.[ch] \ + src/or/*/*.[ch] \ + src/test/*.[ch] \ + src/test/*/*.[ch] \ + src/tools/*.[ch] + )" + fi +else + # When called in pre-push, concatenate the argument array + # Fails on special characters in file names + CHECK_FILES="$*" +fi + +## General File Checks + if [ -n "$(ls ./changes/)" ]; then python scripts/maint/lintChanges.py ./changes/* fi -if [ -d src/lib ]; then - # This is the layout in 0.3.5 - # There are two copies of this list in this file - perl scripts/maint/checkSpace.pl -C \ - src/lib/*/*.[ch] \ - src/core/*/*.[ch] \ - src/feature/*/*.[ch] \ - src/app/*/*.[ch] \ - src/test/*.[ch] \ - src/test/*/*.[ch] \ - src/tools/*.[ch] -elif [ -d src/common ]; then - # This was the layout before 0.3.5 - perl scripts/maint/checkSpace.pl -C \ - src/common/*/*.[ch] \ - src/or/*/*.[ch] \ - src/test/*.[ch] \ - src/test/*/*.[ch] \ - src/tools/*.[ch] +if [ -e scripts/maint/checkShellScripts.sh ]; then + scripts/maint/checkShellScripts.sh +fi + +if [ ! "$CHECK_FILES" ]; then + echo "No modified tor-owned source files, skipping further checks" + exit 0 fi +## Owned Source File Checks + +printf "Modified tor-owned source files:\n%s\n" "$CHECK_FILES" + +# We want word splitting here, because file names are space separated +# shellcheck disable=SC2086 +perl scripts/maint/checkSpace.pl -C \ + $CHECK_FILES + if test -e scripts/maint/practracker/includes.py; then python scripts/maint/practracker/includes.py fi @@ -55,46 +85,13 @@ if [ -e "${PT_DIR}/practracker.py" ]; then fi fi -if [ -e scripts/maint/checkShellScripts.sh ]; then - scripts/maint/checkShellScripts.sh -fi - if [ -e scripts/coccinelle/check_cocci_parse.sh ]; then - if [ $# -eq 0 ]; then - # When called in pre-commit, check the files modified in this commit - CHECK_FILTER="git diff --cached --name-only --diff-filter=ACMR" - # Use the owned tor source layout from 0.3.5 to filter the changed - # files. - # (There are two copies of this list in this file.) - CHECK_FILES="$($CHECK_FILTER \ - src/lib/*/*.[ch] \ - src/core/*/*.[ch] \ - src/feature/*/*.[ch] \ - src/app/*/*.[ch] \ - src/test/*.[ch] \ - src/test/*/*.[ch] \ - src/tools/*.[ch] \ - )" - fi - - if [ "${CHECK_FILES:-$*}" ]; then - printf "Modified files:\n%s\n" "${CHECK_FILES:-$*}" - - # Run a verbose cocci parse check on the changed files - # (spatch is slow, so we don't want to check all the files.) - if [ $# -eq 0 ]; then - # pre-commit: use $CHECK_FILES, fails on spaces in file names - # - # We want word splitting here, because file names are space - # separated - # shellcheck disable=SC2086 - VERBOSE=1 scripts/coccinelle/check_cocci_parse.sh \ - $CHECK_FILES - else - # pre-push: use "$@" to preserve spaces in arguments - VERBOSE=1 scripts/coccinelle/check_cocci_parse.sh \ - "$@" - fi - fi + # Run a verbose cocci parse check on the changed files + # (spatch is slow, so we don't want to check all the files.) + # + # We want word splitting here, because file names are space separated + # shellcheck disable=SC2086 + VERBOSE=1 scripts/coccinelle/check_cocci_parse.sh \ + $CHECK_FILES fi diff --git a/scripts/git/pre-push.git-hook b/scripts/git/pre-push.git-hook index 6a44e93dd..1b88f1d5d 100755 --- a/scripts/git/pre-push.git-hook +++ b/scripts/git/pre-push.git-hook @@ -58,12 +58,13 @@ do range="$remote_sha..$local_sha" fi - # Call the pre-commit hook for the common checks, if it is executable. - # Use the owned tor source layout from 0.3.5 to filter the changed - # files. - if [ -x "$workdir/scripts/git/pre-commit.git-hook" ]; then - CHECK_FILES="$(git diff --name-only --diff-filter=ACMR \ - "$range" \ + # Call the pre-commit hook for the common checks, if it is executable + # Only check the files newly modified in this branch + CHECK_FILTER="git diff --name-only --diff-filter=ACMR $range" + # Use the appropriate owned tor source list to filter the changed files + if [ -d src/lib ]; then + # This is the layout in 0.3.5 + CHECK_FILES="$($CHECK_FILTER \ src/lib/*/*.[ch] \ src/core/*/*.[ch] \ src/feature/*/*.[ch] \ @@ -72,13 +73,21 @@ do src/test/*/*.[ch] \ src/tools/*.[ch] \ )" + elif [ -d src/common ]; then + # This was the layout before 0.3.5 + CHECK_FILES="$($CHECK_FILTER \ + src/common/*/*.[ch] \ + src/or/*/*.[ch] \ + src/test/*.[ch] \ + src/test/*/*.[ch] \ + src/tools/*.[ch] + )" + fi - # We want word splitting here, because file names are space - # separated - # shellcheck disable=SC2086 - if ! "$workdir/"scripts/git/pre-commit.git-hook $CHECK_FILES; then - exit 1 - fi + # We want word splitting here, because file names are space separated + # shellcheck disable=SC2086 + if ! "$workdir/"scripts/git/pre-commit.git-hook $CHECK_FILES; then + exit 1 fi if [[ "$remote_name" != "$upstream_name" ]]; then

1 0

[tor/master] scripts/git: Make spaces consistent in pre-push.git-hook
by teor＠torproject.org 25 Oct '19

25 Oct '19

commit 1094389d8215ce5398a4cd145560bb2686cbf0f5 Author: teor <teor(a)torproject.org> Date: Thu Oct 24 14:03:48 2019 +1000 scripts/git: Make spaces consistent in pre-push.git-hook Part of 31919. --- scripts/git/pre-push.git-hook | 94 ++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 51 deletions(-) diff --git a/scripts/git/pre-push.git-hook b/scripts/git/pre-push.git-hook index 1b88f1d5d..2f3608029 100755 --- a/scripts/git/pre-push.git-hook +++ b/scripts/git/pre-push.git-hook @@ -33,30 +33,27 @@ remote_name=$(git remote --verbose | grep "$2" | awk '{print $1}' | head -n 1) ref_is_upstream_branch() { - if [ "$1" == "refs/heads/master" ] || - [[ "$1" == refs/heads/release-* ]] || - [[ "$1" == refs/heads/maint-* ]] - then - return 1 - fi + if [ "$1" == "refs/heads/master" ] || + [[ "$1" == refs/heads/release-* ]] || + [[ "$1" == refs/heads/maint-* ]]; then + return 1 + fi } # shellcheck disable=SC2034 while read -r local_ref local_sha remote_ref remote_sha do - if [ "$local_sha" = $z40 ] - then - # Handle delete - : - else - if [ "$remote_sha" = $z40 ] - then - # New branch, examine commits not in master - range="master...$local_sha" - else - # Update to existing branch, examine new commits - range="$remote_sha..$local_sha" - fi + if [ "$local_sha" = $z40 ]; then + # Handle delete + : + else + if [ "$remote_sha" = $z40 ]; then + # New branch, examine commits not in master + range="master...$local_sha" + else + # Update to existing branch, examine new commits + range="$remote_sha..$local_sha" + fi # Call the pre-commit hook for the common checks, if it is executable # Only check the files newly modified in this branch @@ -95,39 +92,34 @@ do continue fi + if (ref_is_upstream_branch "$local_ref" == 0 || + ref_is_upstream_branch "$remote_ref" == 0) && + [ "$local_ref" != "$remote_ref" ]; then + if [ "$remote" == "origin" ]; then + echo >&2 "Not pushing: $local_ref to $remote_ref" + echo >&2 "If you really want to push this, use --no-verify." + exit 1 + else + continue + fi + fi + + # Check for fixup! commit + commit=$(git rev-list -n 1 --grep '^fixup!' "$range") + if [ -n "$commit" ]; then + echo >&2 "Found fixup! commit in $local_ref, not pushing" + echo >&2 "If you really want to push this, use --no-verify." + exit 1 + fi - if (ref_is_upstream_branch "$local_ref" == 0 || - ref_is_upstream_branch "$remote_ref" == 0) && - [ "$local_ref" != "$remote_ref" ] - then - if [ "$remote" == "origin" ] - then - echo >&2 "Not pushing: $local_ref to $remote_ref" - echo >&2 "If you really want to push this, use --no-verify." - exit 1 - else - continue - fi - fi - - # Check for fixup! commit - commit=$(git rev-list -n 1 --grep '^fixup!' "$range") - if [ -n "$commit" ] - then - echo >&2 "Found fixup! commit in $local_ref, not pushing" - echo >&2 "If you really want to push this, use --no-verify." - exit 1 - fi - - # Check for squash! commit - commit=$(git rev-list -n 1 --grep '^squash!' "$range") - if [ -n "$commit" ] - then - echo >&2 "Found squash! commit in $local_ref, not pushing" - echo >&2 "If you really want to push this, use --no-verify." - exit 1 - fi - fi + # Check for squash! commit + commit=$(git rev-list -n 1 --grep '^squash!' "$range") + if [ -n "$commit" ]; then + echo >&2 "Found squash! commit in $local_ref, not pushing" + echo >&2 "If you really want to push this, use --no-verify." + exit 1 + fi + fi done exit 0

1 0

[tor/master] Makefile: Add check_cocci_parse.sh as check-cocci
by teor＠torproject.org 25 Oct '19

25 Oct '19

commit ba64caee87146a8eda1b2b229236040d46d0f076 Author: teor <teor(a)torproject.org> Date: Wed Oct 23 15:44:17 2019 +1000 Makefile: Add check_cocci_parse.sh as check-cocci And add it to check-local. Part of 31919. --- Makefile.am | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 32cb21f38..539541f7f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -188,7 +188,13 @@ EXTRA_DIST+= \ scripts/maint/practracker/testdata/header.h \ scripts/maint/practracker/testdata/not_c_file \ scripts/maint/practracker/test_practracker.sh \ - scripts/maint/practracker/util.py + scripts/maint/practracker/util.py \ + scripts/coccinelle/apply.sh \ + scripts/coccinelle/check_cocci_parse.sh \ + scripts/coccinelle/exceptions.txt \ + scripts/coccinelle/test-operator-cleanup \ + scripts/coccinelle/tor-coccinelle.h \ + scripts/coccinelle/try_parse.sh ## This tells etags how to find mockable function definitions. AM_ETAGSFLAGS=--regex='{c}/MOCK_IMPL([^,]+,\W*$[a-zA-Z0-9_]+$\W*,/\1/s' @@ -246,7 +252,7 @@ test: all shellcheck: $(top_srcdir)/scripts/maint/checkShellScripts.sh -check-local: check-spaces check-changes check-includes check-best-practices shellcheck +check-local: check-spaces check-changes check-includes check-best-practices shellcheck check-cocci need-chutney-path: @if test ! -d "$$CHUTNEY_PATH"; then \ @@ -379,6 +385,9 @@ if USEPYTHON @$(PYTHON) $(top_srcdir)/scripts/maint/practracker/practracker.py $(top_srcdir) $(TOR_PRACTRACKER_OPTIONS) endif +check-cocci: + VERBOSE=1 $(top_srcdir)/scripts/coccinelle/check_cocci_parse.sh $(OWNED_TOR_C_FILES) + practracker-regen: $(PYTHON) $(top_srcdir)/scripts/maint/practracker/practracker.py --regen $(top_srcdir)

1 0