third-party/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-04-15 10:01:46 +04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Added requested changes

Browse source
This commit is contained in:
Milos Pejanovic 2018-11-14 01:59:18 +01:00
parent bf8c8521cd
commit e339de22d7
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
pre_commit/commands/autoupdate.py
View file

@ -11,10 +11,10 @@ from cfgv import remove_defaults
import pre_commit.constants as C import pre_commit.constants as C
from pre_commit import output from pre_commit import output
from pre_commit.clientlib import CONFIG_SCHEMA from pre_commit.clientlib import CONFIG_SCHEMA
from pre_commit.clientlib import InvalidManifestError
from pre_commit.clientlib import is_local_repo from pre_commit.clientlib import is_local_repo
from pre_commit.clientlib import is_meta_repo from pre_commit.clientlib import is_meta_repo
from pre_commit.clientlib import load_config from pre_commit.clientlib import load_config
from pre_commit.clientlib import InvalidManifestError
from pre_commit.commands.migrate_config import migrate_config from pre_commit.commands.migrate_config import migrate_config
from pre_commit.repository import Repository from pre_commit.repository import Repository
from pre_commit.util import CalledProcessError from pre_commit.util import CalledProcessError
@ -54,14 +54,15 @@ def _update_repo(repo_config, store, tags_only):
# Construct a new config with the head rev # Construct a new config with the head rev
new_config = OrderedDict(repo_config) new_config = OrderedDict(repo_config)
new_config['rev'] = rev new_config['rev'] = rev
new_repo = Repository.create(new_config, store)
try:
new_hooks = Repository.create(new_config, store).manifest_hooks
except InvalidManifestError as e:
raise RepositoryCannotBeUpdatedError(e.args[0])
# See if any of our hooks were deleted with the new commits # See if any of our hooks were deleted with the new commits
hooks = {hook['id'] for hook in repo_config['hooks']} hooks = {hook['id'] for hook in repo_config['hooks']}
try: hooks_missing = hooks - set(new_hooks)
hooks_missing = hooks - (hooks & set(new_repo.manifest_hooks))
except InvalidManifestError as e:
raise RepositoryCannotBeUpdatedError(e.args[0])
if hooks_missing: if hooks_missing:
raise RepositoryCannotBeUpdatedError( raise RepositoryCannotBeUpdatedError(
'Cannot update because the tip of master is missing these hooks:\n' 'Cannot update because the tip of master is missing these hooks:\n'