Skip to content

fix: accept .svn directories in repo root validation #456

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
zxyDEDIRE wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: accept .svn directories in repo root validation #456

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
8 changes: 4 additions & 4 deletions code_review_graph/daemon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,9 @@ def load_config(path: Path | None = None) -> DaemonConfig:
logger.warning("Skipping repo %s — directory does not exist", repo_path)
continue

if not (repo_path / ".git").exists() and not (repo_path / ".code-review-graph").exists():
if not (repo_path / ".git").exists() and not (repo_path / ".svn").exists() and not (repo_path / ".code-review-graph").exists():
logger.warning(
"Skipping repo %s — no .git or .code-review-graph directory found",
"Skipping repo %s — no .git, .svn, or .code-review-graph directory found",
repo_path,
)
continue
Expand Down Expand Up @@ -222,8 +222,8 @@ def add_repo_to_config(
if not resolved.is_dir():
raise ValueError(f"Not a directory: {resolved}")

if not (resolved / ".git").exists() and not (resolved / ".code-review-graph").exists():
raise ValueError(f"No .git or .code-review-graph directory in {resolved}")
if not (resolved / ".git").exists() and not (resolved / ".svn").exists() and not (resolved / ".code-review-graph").exists():
raise ValueError(f"No .git, .svn, or .code-review-graph directory in {resolved}")

effective_alias = alias or resolved.name

Expand Down
4 changes: 2 additions & 2 deletions code_review_graph/registry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@ def register(
resolved = Path(path).resolve()
if not resolved.is_dir():
raise ValueError(f"Path is not a directory: {resolved}")
if not (resolved / ".git").exists() and not (resolved / ".code-review-graph").exists():
if not (resolved / ".git").exists() and not (resolved / ".svn").exists() and not (resolved / ".code-review-graph").exists():
raise ValueError(
f"Path does not look like a repository "
f"(no .git or .code-review-graph): {resolved}"
f"(no .git, .svn, or .code-review-graph): {resolved}"
)

with self._lock:
Expand Down
18 changes: 12 additions & 6 deletions code_review_graph/tools/_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,25 @@ def _error_response(
def _validate_repo_root(path: "Path | str") -> Path:
"""Validate that a path is a plausible project root.

Ensures the path is an existing directory that contains a ``.git``
or ``.code-review-graph`` directory, preventing arbitrary file-system
traversal via the ``repo_root`` parameter.
Ensures the path is an existing directory that contains a ``.git``,
``.svn``, or ``.code-review-graph`` directory, preventing arbitrary
file-system traversal via the ``repo_root`` parameter.
"""
resolved = Path(path).resolve()
if not resolved.is_dir():
raise ValueError(
f"repo_root is not an existing directory: {resolved}"
)
if not (resolved / ".git").exists() and not (resolved / ".code-review-graph").exists():
has_vcs = (
(resolved / ".git").exists()
or (resolved / ".svn").exists()
or (resolved / ".code-review-graph").exists()
)
if not has_vcs:
raise ValueError(
f"repo_root does not look like a project root (no .git or "
f".code-review-graph directory found): {resolved}"
f"repo_root does not look like a project root "
f"(no .git, .svn, or .code-review-graph directory found): "
f"{resolved}"
)
return resolved

Expand Down