From 9d68e4e3da4ce68e28506d926c7de9fd6ffbf6a3 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 4 Apr 2022 20:42:14 +0200
Subject: Merging upstream version 2.18.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 pre_commit/clientlib.py | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

(limited to 'pre_commit/clientlib.py')

diff --git a/pre_commit/clientlib.py b/pre_commit/clientlib.py
index 47ebd54..bf4e2e4 100644
--- a/pre_commit/clientlib.py
+++ b/pre_commit/clientlib.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import argparse
 import functools
 import logging
@@ -5,8 +7,6 @@ import re
 import shlex
 import sys
 from typing import Any
-from typing import Dict
-from typing import Optional
 from typing import Sequence
 
 import cfgv
@@ -95,7 +95,7 @@ load_manifest = functools.partial(
 )
 
 
-def validate_manifest_main(argv: Optional[Sequence[str]] = None) -> int:
+def validate_manifest_main(argv: Sequence[str] | None = None) -> int:
     parser = _make_argparser('Manifest filenames.')
     args = parser.parse_args(argv)
 
@@ -116,7 +116,7 @@ META = 'meta'
 
 # should inherit from cfgv.Conditional if sha support is dropped
 class WarnMutableRev(cfgv.ConditionalOptional):
-    def check(self, dct: Dict[str, Any]) -> None:
+    def check(self, dct: dict[str, Any]) -> None:
         super().check(dct)
 
         if self.key in dct:
@@ -135,7 +135,7 @@ class WarnMutableRev(cfgv.ConditionalOptional):
 
 
 class OptionalSensibleRegexAtHook(cfgv.OptionalNoDefault):
-    def check(self, dct: Dict[str, Any]) -> None:
+    def check(self, dct: dict[str, Any]) -> None:
         super().check(dct)
 
         if '/*' in dct.get(self.key, ''):
@@ -154,7 +154,7 @@ class OptionalSensibleRegexAtHook(cfgv.OptionalNoDefault):
 
 
 class OptionalSensibleRegexAtTop(cfgv.OptionalNoDefault):
-    def check(self, dct: Dict[str, Any]) -> None:
+    def check(self, dct: dict[str, Any]) -> None:
         super().check(dct)
 
         if '/*' in dct.get(self.key, ''):
@@ -183,7 +183,7 @@ class MigrateShaToRev:
             ensure_absent=True,
         )
 
-    def check(self, dct: Dict[str, Any]) -> None:
+    def check(self, dct: dict[str, Any]) -> None:
         if dct.get('repo') in {LOCAL, META}:
             self._cond('rev').check(dct)
             self._cond('sha').check(dct)
@@ -194,7 +194,7 @@ class MigrateShaToRev:
         else:
             self._cond('rev').check(dct)
 
-    def apply_default(self, dct: Dict[str, Any]) -> None:
+    def apply_default(self, dct: dict[str, Any]) -> None:
         if 'sha' in dct:
             dct['rev'] = dct.pop('sha')
 
@@ -212,7 +212,7 @@ def _entry(modname: str) -> str:
 def warn_unknown_keys_root(
         extra: Sequence[str],
         orig_keys: Sequence[str],
-        dct: Dict[str, str],
+        dct: dict[str, str],
 ) -> None:
     logger.warning(f'Unexpected key(s) present at root: {", ".join(extra)}')
 
@@ -220,7 +220,7 @@ def warn_unknown_keys_root(
 def warn_unknown_keys_repo(
         extra: Sequence[str],
         orig_keys: Sequence[str],
-        dct: Dict[str, str],
+        dct: dict[str, str],
 ) -> None:
     logger.warning(
         f'Unexpected key(s) present on {dct["repo"]}: {", ".join(extra)}',
@@ -253,7 +253,7 @@ _meta = (
 
 
 class NotAllowed(cfgv.OptionalNoDefault):
-    def check(self, dct: Dict[str, Any]) -> None:
+    def check(self, dct: dict[str, Any]) -> None:
         if self.key in dct:
             raise cfgv.ValidationError(f'{self.key!r} cannot be overridden')
 
@@ -336,6 +336,11 @@ CONFIG_SCHEMA = cfgv.Map(
     'Config', None,
 
     cfgv.RequiredRecurse('repos', cfgv.Array(CONFIG_REPO_DICT)),
+    cfgv.Optional(
+        'default_install_hook_types',
+        cfgv.check_array(cfgv.check_one_of(C.HOOK_TYPES)),
+        ['pre-commit'],
+    ),
     cfgv.OptionalRecurse(
         'default_language_version', DEFAULT_LANGUAGE_VERSION, {},
     ),
@@ -355,6 +360,7 @@ CONFIG_SCHEMA = cfgv.Map(
     cfgv.WarnAdditionalKeys(
         (
             'repos',
+            'default_install_hook_types',
             'default_language_version',
             'default_stages',
             'files',
@@ -377,7 +383,7 @@ class InvalidConfigError(FatalError):
     pass
 
 
-def ordered_load_normalize_legacy_config(contents: str) -> Dict[str, Any]:
+def ordered_load_normalize_legacy_config(contents: str) -> dict[str, Any]:
     data = yaml_load(contents)
     if isinstance(data, list):
         logger.warning(
@@ -398,7 +404,7 @@ load_config = functools.partial(
 )
 
 
-def validate_config_main(argv: Optional[Sequence[str]] = None) -> int:
+def validate_config_main(argv: Sequence[str] | None = None) -> int:
     parser = _make_argparser('Config filenames.')
     args = parser.parse_args(argv)
 
-- 
cgit v1.2.3