Sonder528 · Sonder528 · Apr 19, 2026
diff --git a/pre_commit/clientlib.py b/pre_commit/clientlib.py
@@ -16,7 +16,9 @@
 
 import pre_commit.constants as C
 from pre_commit.all_languages import language_names
+from pre_commit.errors import ConfigFileNotFoundError
 from pre_commit.errors import FatalError
+from pre_commit.errors import ManifestFileNotFoundError
 from pre_commit.yaml import yaml_load
 
 logger = logging.getLogger('pre_commit')
@@ -279,12 +281,19 @@ def _load_manifest_forward_compat(contents: str) -> object:
         return obj
 
 
-load_manifest = functools.partial(
-    cfgv.load_from_filename,
-    schema=MANIFEST_SCHEMA,
-    load_strategy=_load_manifest_forward_compat,
-    exc_tp=InvalidManifestError,
-)
+def _check_file_exists(filename: str, exc_type: type[Exception]) -> None:
+    if not os.path.isfile(filename):
+        raise exc_type(filename)
+
+
+def load_manifest(filename: str) -> Any:
+    _check_file_exists(filename, ManifestFileNotFoundError)
+    return cfgv.load_from_filename(
+        filename,
+        schema=MANIFEST_SCHEMA,
+        load_strategy=_load_manifest_forward_compat,
+        exc_tp=InvalidManifestError,
+    )
 
 
 LOCAL = 'local'
@@ -543,9 +552,11 @@ class InvalidConfigError(FatalError):
     pass
 
 
-load_config = functools.partial(
-    cfgv.load_from_filename,
-    schema=CONFIG_SCHEMA,
-    load_strategy=yaml_load,
-    exc_tp=InvalidConfigError,
-)
+def load_config(filename: str) -> Any:
+    _check_file_exists(filename, ConfigFileNotFoundError)
+    return cfgv.load_from_filename(
+        filename,
+        schema=CONFIG_SCHEMA,
+        load_strategy=yaml_load,
+        exc_tp=InvalidConfigError,
+    )
diff --git a/pre_commit/commands/validate_config.py b/pre_commit/commands/validate_config.py
@@ -3,16 +3,30 @@
 from collections.abc import Sequence
 
 from pre_commit import clientlib
+from pre_commit.errors import AggregateError
 
 
 def validate_config(filenames: Sequence[str]) -> int:
-    ret = 0
+    errors: list[tuple[str, Exception]] = []
 
     for filename in filenames:
         try:
             clientlib.load_config(filename)
-        except clientlib.InvalidConfigError as e:
-            print(e)
-            ret = 1
+        except (clientlib.InvalidConfigError, Exception) as e:
+            errors.append((filename, e))
 
-    return ret
+    if not errors:
+        return 0
+
+    if len(errors) == 1:
+        filename, exc = errors[0]
+        print(f'Error in config file {filename}:')
+        print(exc)
+    else:
+        agg = AggregateError.from_errors(
+            f'Found {len(errors)} config file error(s):',
+            errors,
+        )
+        print(agg)
+
+    return 1
diff --git a/pre_commit/commands/validate_manifest.py b/pre_commit/commands/validate_manifest.py
@@ -3,16 +3,30 @@
 from collections.abc import Sequence
 
 from pre_commit import clientlib
+from pre_commit.errors import AggregateError
 
 
 def validate_manifest(filenames: Sequence[str]) -> int:
-    ret = 0
+    errors: list[tuple[str, Exception]] = []
 
     for filename in filenames:
         try:
             clientlib.load_manifest(filename)
-        except clientlib.InvalidManifestError as e:
-            print(e)
-            ret = 1
+        except (clientlib.InvalidManifestError, Exception) as e:
+            errors.append((filename, e))
 
-    return ret
+    if not errors:
+        return 0
+
+    if len(errors) == 1:
+        filename, exc = errors[0]
+        print(f'Error in manifest file {filename}:')
+        print(exc)
+    else:
+        agg = AggregateError.from_errors(
+            f'Found {len(errors)} manifest file error(s):',
+            errors,
+        )
+        print(agg)
+
+    return 1
diff --git a/pre_commit/errors.py b/pre_commit/errors.py
@@ -1,5 +1,75 @@
 from __future__ import annotations
 
+import os.path
+from typing import Any
+
 
 class FatalError(RuntimeError):
     pass
+
+
+class ConfigFileNotFoundError(FatalError):
+    def __init__(self, config_file: str) -> None:
+        self.config_file = config_file
+        abs_path = os.path.abspath(config_file)
+        super().__init__(
+            f'Config file not found: {abs_path}\n'
+            f'Hint: Make sure you are in the correct directory or use '
+            f'`--config` to specify an alternate path.\n'
+            f'To create a sample config file, run: `pre-commit sample-config`'
+        )
+
+
+class ManifestFileNotFoundError(FatalError):
+    def __init__(self, manifest_file: str) -> None:
+        self.manifest_file = manifest_file
+        abs_path = os.path.abspath(manifest_file)
+        super().__init__(
+            f'Manifest file not found: {abs_path}'
+        )
+
+
+class InvalidGitRepositoryError(FatalError):
+    def __init__(self, path: str) -> None:
+        self.path = path
+        abs_path = os.path.abspath(path)
+        super().__init__(
+            f'Not a git repository (or any of the parent directories): {abs_path}\n'
+            f'Hint: Run `git init` to initialize a git repository, or '
+            f'change to a directory that is already a git repository.'
+        )
+
+
+class InsideGitDirectoryError(FatalError):
+    def __init__(self, git_dir: str) -> None:
+        self.git_dir = git_dir
+        super().__init__(
+            f'Cannot operate inside the .git directory: {git_dir}\n'
+            f'Hint: Change to the working tree directory instead of the .git directory.'
+        )
+
+
+class AggregateError(FatalError):
+    def __init__(self, message: str, errors: list[Any]) -> None:
+        self.errors = errors
+        super().__init__(message)
+
+    @classmethod
+    def from_errors(
+            cls,
+            header: str,
+            errors: list[tuple[str, Exception]],
+    ) -> 'AggregateError':
+        if len(errors) == 1:
+            filename, exc = errors[0]
+            return cls(f'Error in {filename}:\n{exc}', errors)
+
+        lines = [header, '']
+        for i, (filename, exc) in enumerate(errors, 1):
+            lines.append(f'{i}. {filename}:')
+            for line in str(exc).splitlines():
+                lines.append(f'   {line}')
+            if i < len(errors):
+                lines.append('')
+
+        return cls('\n'.join(lines), errors)
diff --git a/pre_commit/git.py b/pre_commit/git.py
@@ -6,6 +6,8 @@
 from collections.abc import Mapping
 
 from pre_commit.errors import FatalError
+from pre_commit.errors import InsideGitDirectoryError
+from pre_commit.errors import InvalidGitRepositoryError
 from pre_commit.util import CalledProcessError
 from pre_commit.util import cmd_output
 from pre_commit.util import cmd_output_b
@@ -61,15 +63,9 @@ def get_root() -> str:
             'git', 'rev-parse', '--is-inside-git-dir',
         )[1].strip()
     except CalledProcessError:
-        raise FatalError(
-            'git failed. Is it installed, and are you in a Git repository '
-            'directory?',
-        )
+        raise InvalidGitRepositoryError('.')
     if inside_git_dir != 'false':
-        raise FatalError(
-            'git toplevel unexpectedly empty! make sure you are not '
-            'inside the `.git` directory of your repository.',
-        )
+        raise InsideGitDirectoryError(os.path.abspath('.'))
     return root