Find pyproject from vim relative to current file (#1871)

[etc/vim.git] / src / black / files.py

diff --git a/src/black/files.py b/src/black/files.py
index 1be560643a1cae6500cb2fb81b645542b6feef39..b9cefd317e09cfebbb36ed8665c0551d3405d04b 100644 (file)
--- a/src/black/files.py
+++ b/src/black/files.py
@@ -38,7 +38,7 @@ def find_project_root(srcs: Sequence[str]) -> Path:
     project root, the root of the file system is returned.
     """
     if not srcs:
     project root, the root of the file system is returned.
     """
     if not srcs:

-        return Path("/").resolve()
+        srcs = [str(Path.cwd().resolve())]

 
     path_srcs = [Path(Path.cwd(), src).resolve() for src in srcs]
 
 
     path_srcs = [Path(Path.cwd(), src).resolve() for src in srcs]
 


@@ -118,7 +118,7 @@ def get_gitignore(root: Path) -> PathSpec:
     gitignore = root / ".gitignore"
     lines: List[str] = []
     if gitignore.is_file():
     gitignore = root / ".gitignore"
     lines: List[str] = []
     if gitignore.is_file():

-        with gitignore.open() as gf:
+        with gitignore.open(encoding="utf-8") as gf:

             lines = gf.readlines()
     return PathSpec.from_lines("gitwildmatch", lines)
 
             lines = gf.readlines()
     return PathSpec.from_lines("gitwildmatch", lines)
 


@@ -204,6 +204,8 @@ def gen_python_files(
             continue
 
         if child.is_dir():
             continue
 
         if child.is_dir():

+            # If gitignore is None, gitignore usage is disabled, while a Falsey
+            # gitignore is when the directory doesn't have a .gitignore file.

             yield from gen_python_files(
                 child.iterdir(),
                 root,
             yield from gen_python_files(
                 child.iterdir(),
                 root,


@@ -212,7 +214,7 @@ def gen_python_files(
                 extend_exclude,
                 force_exclude,
                 report,
                 extend_exclude,
                 force_exclude,
                 report,

-                gitignore,
+                gitignore + get_gitignore(child) if gitignore is not None else None,

             )
 
         elif child.is_file():
             )
 
         elif child.is_file():