Skip to content

fix: add errors="replace" to all subprocess.run calls in incremental.py #566

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

fix: add errors="replace" to all subprocess.run calls in incremental.py #566

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
34 changes: 18 additions & 16 deletions code_review_graph/incremental.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,25 +416,27 @@ def _git_branch_info(repo_root: Path) -> tuple[str, str]:
result = subprocess.run(
["git", "rev-parse", "--abbrev-ref", "HEAD"],
capture_output=True,
text=True, encoding='utf-8', cwd=str(repo_root),
text=True, encoding='utf-8', errors='replace',
cwd=str(repo_root),
timeout=_GIT_TIMEOUT,
stdin=subprocess.DEVNULL,
)
if result.returncode == 0:
branch = result.stdout.strip()
except (subprocess.TimeoutExpired, FileNotFoundError):
except (subprocess.TimeoutExpired, FileNotFoundError, UnicodeDecodeError):
pass
try:
result = subprocess.run(
["git", "rev-parse", "HEAD"],
capture_output=True,
text=True, encoding='utf-8', cwd=str(repo_root),
text=True, encoding='utf-8', errors='replace',
cwd=str(repo_root),
timeout=_GIT_TIMEOUT,
stdin=subprocess.DEVNULL,
)
if result.returncode == 0:
sha = result.stdout.strip()
except (subprocess.TimeoutExpired, FileNotFoundError):
except (subprocess.TimeoutExpired, FileNotFoundError, UnicodeDecodeError):
pass
return branch, sha

Expand Down Expand Up @@ -508,7 +510,8 @@ def get_changed_files(repo_root: Path, base: str = "HEAD~1") -> list[str]:
result = subprocess.run(
["git", "diff", "--name-only", base, "--"],
capture_output=True,
text=True, encoding='utf-8', cwd=str(repo_root),
text=True, encoding='utf-8', errors='replace',
cwd=str(repo_root),
timeout=_GIT_TIMEOUT,
stdin=subprocess.DEVNULL,
)
Expand All @@ -517,16 +520,16 @@ def get_changed_files(repo_root: Path, base: str = "HEAD~1") -> list[str]:
result = subprocess.run(
["git", "diff", "--name-only", "--cached"],
capture_output=True,
text=True, encoding='utf-8', cwd=str(repo_root),
text=True, encoding='utf-8', errors='replace',
cwd=str(repo_root),
timeout=_GIT_TIMEOUT,
stdin=subprocess.DEVNULL,
)
files = [f.strip() for f in result.stdout.splitlines() if f.strip()]
return files
except (FileNotFoundError, subprocess.TimeoutExpired):
except (FileNotFoundError, subprocess.TimeoutExpired, UnicodeDecodeError):
return []


def _get_svn_changed_files(repo_root: Path, rev_range: str | None = None) -> list[str]:
"""Return changed files in an SVN working copy.

Expand Down Expand Up @@ -570,10 +573,9 @@ def _get_svn_changed_files(repo_root: Path, rev_range: str | None = None) -> lis
path = line[8:].strip() if len(line) > 8 else line[1:].strip()
files.append(path)
return files
except (FileNotFoundError, subprocess.TimeoutExpired):
except (FileNotFoundError, subprocess.TimeoutExpired, UnicodeDecodeError):
return []


def get_staged_and_unstaged(repo_root: Path) -> list[str]:
"""Get all modified files (staged + unstaged + untracked)."""
if detect_vcs(repo_root) == "svn":
Expand All @@ -582,7 +584,8 @@ def get_staged_and_unstaged(repo_root: Path) -> list[str]:
result = subprocess.run(
["git", "status", "--porcelain"],
capture_output=True,
text=True, encoding='utf-8', cwd=str(repo_root),
text=True, encoding='utf-8', errors='replace',
cwd=str(repo_root),
timeout=_GIT_TIMEOUT,
stdin=subprocess.DEVNULL,
)
Expand All @@ -595,10 +598,9 @@ def get_staged_and_unstaged(repo_root: Path) -> list[str]:
entry = entry.split(" -> ", 1)[1]
files.append(entry)
return files
except (FileNotFoundError, subprocess.TimeoutExpired):
except (FileNotFoundError, subprocess.TimeoutExpired, UnicodeDecodeError):
return []


def get_all_tracked_files(
repo_root: Path,
recurse_submodules: bool | None = None,
Expand Down Expand Up @@ -627,15 +629,15 @@ def get_all_tracked_files(
result = subprocess.run(
cmd,
capture_output=True,
text=True, encoding='utf-8', cwd=str(repo_root),
text=True, encoding='utf-8', errors='replace',
cwd=str(repo_root),
timeout=_GIT_TIMEOUT,
stdin=subprocess.DEVNULL,
)
return [f.strip() for f in result.stdout.splitlines() if f.strip()]
except (FileNotFoundError, subprocess.TimeoutExpired):
except (FileNotFoundError, subprocess.TimeoutExpired, UnicodeDecodeError):
return []


def _get_svn_all_tracked_files(repo_root: Path) -> list[str]:
"""Return SVN-versioned files by walking the working copy.

Expand Down