From d534b1701f3b0665dea10995905048387408342c Mon Sep 17 00:00:00 2001 From: Stephan Hohe Date: Fri, 27 Oct 2023 13:38:37 +0200 Subject: [PATCH] Check excludes before symlink resolution for command line parameters This adjusts exclusion checking for command line parameters the same way as #3846 did for other files. Specifically, --force-exclude is now checked before symlink resolution. This way symlink handling is consistent between command line parameters and other collected files. Fixes #3826. --- src/black/__init__.py | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/black/__init__.py b/src/black/__init__.py index 7cf93b89e42..fb73063177e 100644 --- a/src/black/__init__.py +++ b/src/black/__init__.py @@ -50,6 +50,7 @@ get_gitignore, normalize_path_maybe_ignore, parse_pyproject_toml, + path_is_excluded, wrap_stream_for_windows, ) from black.handle_ipynb_magics import ( @@ -639,25 +640,26 @@ def get_sources( is_stdin = False if is_stdin or p.is_file(): + root_relative_path = p.absolute().relative_to(root).as_posix() + + root_relative_path = "/" + root_relative_path + if p.is_dir(): + root_relative_path += "/" + + # Hard-exclude any files that matches the `--force-exclude` regex. + if path_is_excluded(root_relative_path, force_exclude): + report.path_ignored(p, "matches the --force-exclude regular expression") + continue + normalized_path: Optional[str] = normalize_path_maybe_ignore( p, root, report ) if normalized_path is None: if verbose: - out(f'Skipping invalid source: "{normalized_path}"', fg="red") + out(f'Skipping invalid source: "{p}"', fg="red") continue if verbose: - out(f'Found input source: "{normalized_path}"', fg="blue") - - normalized_path = "/" + normalized_path - # Hard-exclude any files that matches the `--force-exclude` regex. - if force_exclude: - force_exclude_match = force_exclude.search(normalized_path) - else: - force_exclude_match = None - if force_exclude_match and force_exclude_match.group(0): - report.path_ignored(p, "matches the --force-exclude regular expression") - continue + out(f'Found input source: "{p}"', fg="blue") if is_stdin: p = Path(f"{STDIN_PLACEHOLDER}{str(p)}")