-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3366 from trailofbits/matching-refactor
Matching Refactor
- Loading branch information
Showing
28 changed files
with
4,156 additions
and
3,416 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| # Default Git Hooks for PolyFile Development | ||
|
|
||
| To enable these hooks, developers must run this after cloning the repo: | ||
| ```bash | ||
| $ git config core.hooksPath ./hooks | ||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| #!/bin/sh | ||
| # | ||
| # An example hook script to verify what is about to be committed. | ||
| # Called by "git commit" with no arguments. The hook should | ||
| # exit with non-zero status after issuing an appropriate message if | ||
| # it wants to stop the commit. | ||
| # | ||
| # To enable this hook, rename this file to "pre-commit". | ||
|
|
||
| if git rev-parse --verify HEAD >/dev/null 2>&1 | ||
| then | ||
| against=HEAD | ||
| else | ||
| # Initial commit: diff against an empty tree object | ||
| against=$(git hash-object -t tree /dev/null) | ||
| fi | ||
|
|
||
| # If you want to allow non-ASCII filenames set this variable to true. | ||
| allownonascii=$(git config --bool hooks.allownonascii) | ||
|
|
||
| # Redirect output to stderr. | ||
| exec 1>&2 | ||
|
|
||
| # Cross platform projects tend to avoid non-ASCII filenames; prevent | ||
| # them from being added to the repository. We exploit the fact that the | ||
| # printable range starts at the space character and ends with tilde. | ||
| if [ "$allownonascii" != "true" ] && | ||
| # Note that the use of brackets around a tr range is ok here, (it's | ||
| # even required, for portability to Solaris 10's /usr/bin/tr), since | ||
| # the square bracket bytes happen to fall in the designated range. | ||
| test $(git diff --cached --name-only --diff-filter=A -z $against | | ||
| LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 | ||
| then | ||
| cat <<\EOF | ||
| Error: Attempt to add a non-ASCII file name. | ||
| This can cause problems if you want to work with people on other platforms. | ||
| To be portable it is advisable to rename the file. | ||
| If you know what you are doing you can disable this check using: | ||
| git config hooks.allownonascii true | ||
| EOF | ||
| exit 1 | ||
| fi | ||
|
|
||
| # If there are whitespace errors, print the offending file names and fail. | ||
| exec git diff-index --check --cached $against -- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| #!/bin/sh | ||
|
|
||
| # An example hook script to verify what is about to be pushed. Called by "git | ||
| # push" after it has checked the remote status, but before anything has been | ||
| # pushed. If this script exits with a non-zero status nothing will be pushed. | ||
| # | ||
| # This hook is called with the following parameters: | ||
| # | ||
| # $1 -- Name of the remote to which the push is being done | ||
| # $2 -- URL to which the push is being done | ||
| # | ||
| # If pushing without using a named remote those arguments will be equal. | ||
| # | ||
| # Information about the commits which are being pushed is supplied as lines to | ||
| # the standard input in the form: | ||
| # | ||
| # <local ref> <local sha1> <remote ref> <remote sha1> | ||
| # | ||
| # This sample shows how to prevent push of commits where the log message starts | ||
| # with "WIP" (work in progress). | ||
|
|
||
| #remote="$1" | ||
| #url="$2" | ||
| # | ||
| #z40=0000000000000000000000000000000000000000 | ||
| # | ||
| #while read 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 all commits | ||
| # range="$local_sha" | ||
| # else | ||
| # # Update to existing branch, examine new commits | ||
| # range="$remote_sha..$local_sha" | ||
| # fi | ||
| # | ||
| # # Check for WIP commit | ||
| # commit=`git rev-list -n 1 --grep '^WIP' "$range"` | ||
| # if [ -n "$commit" ] | ||
| # then | ||
| # echo >&2 "Found WIP commit in $local_ref, not pushing" | ||
| # exit 1 | ||
| # fi | ||
| # fi | ||
| #done | ||
|
|
||
| # We could do the following as a `pre-commit` hook, but it's expensive, so only do it pre-push: | ||
| echo Linting Python code... | ||
| flake8 polyfile tests --exclude polyfile/kaitai/parsers/ --select=E9,F63,F7,F82 1>/dev/null 2>/dev/null | ||
| RESULT=$? | ||
| if [ $RESULT -ne 0 ]; then | ||
| cat <<\EOF | ||
| Failed Python lint: | ||
| flake8 polyfile tests --exclude polyfile/kaitai/parsers/ --count --select=E9,F63,F7,F82 --show-source --statistics | ||
| EOF | ||
| exit 1 | ||
| fi | ||
|
|
||
| #flake8 polyfile tests --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics 1>/dev/null 2>/dev/null | ||
| #RESULT=$? | ||
| #if [ $RESULT -ne 0 ]; then | ||
| # cat <<\EOF | ||
| #Failed Python lint: | ||
| # | ||
| # flake8 polyfile tests --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics | ||
| #EOF | ||
| # exit 1 | ||
| #fi | ||
|
|
||
| echo Running Tests... | ||
| pytest tests | ||
|
|
||
| # echo Type-checking Python code... | ||
| # mypy --ignore-missing-imports polyfile tests | ||
| #exit $? |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| from . import nes, pdf, zipmatcher, trid, kaitaimatcher, polyfile | ||
| from . import nes, pdf, jpeg, zipmatcher, kaitaimatcher, languagematcher, polyfile | ||
| from .__main__ import main | ||
| from .polyfile import __version__ |
Oops, something went wrong.