Skip to content

Limit locating ignore files to both kind of repositories #2221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cedk wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −4
Open

Limit locating ignore files to both kind of repositories #2221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions backend/src/hatchling/builders/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,11 +752,11 @@ def get_distribution_path(self, relative_path: str) -> str:
def vcs_exclusion_files(self) -> dict[str, list[str]]:
exclusion_files: dict[str, list[str]] = {"git": [], "hg": []}

local_gitignore = locate_file(self.root, ".gitignore", boundary=".git")
local_gitignore = locate_file(self.root, ".gitignore", boundaries=[".git", ".hg"])
if local_gitignore is not None:
exclusion_files["git"].append(local_gitignore)

local_hgignore = locate_file(self.root, ".hgignore", boundary=".hg")
local_hgignore = locate_file(self.root, ".hgignore", boundaries=[".git", ".hg"])
if local_hgignore is not None:
exclusion_files["hg"].append(local_hgignore)

Expand Down
4 changes: 2 additions & 2 deletions backend/src/hatchling/utils/fs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
import os


def locate_file(root: str, file_name: str, *, boundary: str | None = None) -> str | None:
def locate_file(root: str, file_name: str, *, boundaries: list[str] | None = None) -> str | None:
while True:
file_path = os.path.join(root, file_name)
if os.path.isfile(file_path):
return file_path

if boundary is not None and os.path.exists(os.path.join(root, boundary)):
if boundaries is not None and any(os.path.exists(os.path.join(root, boundary)) for boundary in boundaries):
return None

new_root = os.path.dirname(root)
Expand Down