mirror/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-01-13 12:30:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #857 from runz0rd/master

Browse Source 
Reraises InvalidManifestError as RepositoryCannotBeUpdatedError
This commit is contained in:
Anthony Sottile
2018-11-14 17:29:43 -08:00
committed by GitHub
parent 76e0f11916 aaa3976a29
commit dc84f21dd4
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pre_commit/commands/autoupdate.py
View File

@@ -4,6 +4,7 @@ from __future__ import unicode_literals
import re
from collections import OrderedDict
import six
from aspy.yaml import ordered_dump
from aspy.yaml import ordered_load
from cfgv import remove_defaults
@@ -11,6 +12,7 @@ from cfgv import remove_defaults
import pre_commit.constants as C
from pre_commit import output
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_meta_repo
from pre_commit.clientlib import load_config
@@ -53,11 +55,15 @@ def _update_repo(repo_config, store, tags_only):
# Construct a new config with the head rev
new_config = OrderedDict(repo_config)
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(six.text_type(e))
# See if any of our hooks were deleted with the new commits
hooks = {hook['id'] for hook in repo_config['hooks']}
hooks_missing = hooks - (hooks & set(new_repo.manifest_hooks))
hooks_missing = hooks - set(new_hooks)
if hooks_missing:
raise RepositoryCannotBeUpdatedError(
'Cannot update because the tip of master is missing these hooks:\n'