third-party/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-02-17 08:14:42 +04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #126 from pre-commit/readlink_woes

Browse source 
Use less readlink for osx peeps.
This commit is contained in:
Anthony Sottile 2014-06-17 20:22:33 -07:00
commit bcb1283267
2 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pre_commit/resources/pre-commit-hook
View file

@ -2,7 +2,9 @@
# This is a randomish md5 to identify this script # This is a randomish md5 to identify this script
# 4d9958c90bc262f47553e2c073f14cfe # 4d9958c90bc262f47553e2c073f14cfe
HERE=$(dirname $(readlink -f "$0")) pushd `dirname $0` > /dev/null
HERE=`pwd`
popd > /dev/null
retv=0 retv=0

18
tests/commands/install_uninstall_test.py
View file

@ -100,13 +100,23 @@ def _get_commit_output(tmpdir_factory, touch_file='foo'):
)[:2] )[:2]
# osx does this different :(
FILES_CHANGED = (
r'('
r' 1 file changed, 0 insertions\(\+\), 0 deletions\(-\)\n'
r'|'
r' 0 files changed\n'
r')'
)
NORMAL_PRE_COMMIT_RUN = re.compile( NORMAL_PRE_COMMIT_RUN = re.compile(
r'^\[INFO\] Installing environment for .+\.\n' r'^\[INFO\] Installing environment for .+\.\n'
r'\[INFO\] Once installed this environment will be reused\.\n' r'\[INFO\] Once installed this environment will be reused\.\n'
r'\[INFO\] This may take a few minutes\.\.\.\n' r'\[INFO\] This may take a few minutes\.\.\.\n'
r'Bash hook\.+Passed\n' r'Bash hook\.+Passed\n'
r'\[master [a-f0-9]{7}\] Commit!\n' r'\[master [a-f0-9]{7}\] Commit!\n' +
r' 0 files changed\n' FILES_CHANGED +
r' create mode 100644 foo\n$' r' create mode 100644 foo\n$'
) )
@ -174,8 +184,8 @@ def test_failing_hooks_returns_nonzero(tmpdir_factory):
EXISTING_COMMIT_RUN = re.compile( EXISTING_COMMIT_RUN = re.compile(
r'^legacy hook\n' r'^legacy hook\n'
r'\[master [a-f0-9]{7}\] Commit!\n' r'\[master [a-f0-9]{7}\] Commit!\n' +
r' 0 files changed\n' FILES_CHANGED +
r' create mode 100644 baz\n$' r' create mode 100644 baz\n$'
) )