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 #1011 from pre-commit/multi_install_windows

Browse source 
Fix double legacy install on windows
This commit is contained in:
Anthony Sottile 2019-04-27 16:01:32 -07:00 • committed by GitHub
commit 09e64e8ff6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pre_commit/commands/install_uninstall.py
View file

@ -5,6 +5,7 @@ import io
import itertools import itertools
import logging import logging
import os.path import os.path
import shutil
import sys import sys
from pre_commit import git from pre_commit import git
@ -84,7 +85,7 @@ def install(
# If we have an existing hook, move it to pre-commit.legacy # If we have an existing hook, move it to pre-commit.legacy
if os.path.lexists(hook_path) and not is_our_script(hook_path): if os.path.lexists(hook_path) and not is_our_script(hook_path):
os.rename(hook_path, legacy_path) shutil.move(hook_path, legacy_path)
# If we specify overwrite, we simply delete the legacy file # If we specify overwrite, we simply delete the legacy file
if overwrite and os.path.exists(legacy_path): if overwrite and os.path.exists(legacy_path):

10
tests/commands/install_uninstall_test.py
View file

@ -325,6 +325,16 @@ def test_install_existing_hooks_no_overwrite(tempdir_factory, store):
assert NORMAL_PRE_COMMIT_RUN.match(output[len('legacy hook\n'):]) assert NORMAL_PRE_COMMIT_RUN.match(output[len('legacy hook\n'):])
def test_legacy_overwriting_legacy_hook(tempdir_factory, store):
path = make_consuming_repo(tempdir_factory, 'script_hooks_repo')
with cwd(path):
_write_legacy_hook(path)
assert install(C.CONFIG_FILE, store) == 0
_write_legacy_hook(path)
# this previously crashed on windows. See #1010
assert install(C.CONFIG_FILE, store) == 0
def test_install_existing_hook_no_overwrite_idempotent(tempdir_factory, store): def test_install_existing_hook_no_overwrite_idempotent(tempdir_factory, store):
path = make_consuming_repo(tempdir_factory, 'script_hooks_repo') path = make_consuming_repo(tempdir_factory, 'script_hooks_repo')
with cwd(path): with cwd(path):