Skip to content

Make the rmtree callback Windows-only #1739

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

Merged
merged 6 commits into from
Nov 15, 2023
Merged

Make the rmtree callback Windows-only #1739

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5335416
Test that rmtree doesn't chmod outside the tree
EliahKagan Oct 30, 2023
fd78a53
One approach to the symlink-following bug
EliahKagan Oct 30, 2023
6de8e67
Refactor current fix for symlink-following bug
EliahKagan Nov 5, 2023
e8cfae8
Test that PermissionError is only wrapped on Windows
EliahKagan Nov 5, 2023
8a22352
Extract some shared patching code to a helper
EliahKagan Nov 5, 2023
b226f3d
Remove demonstration script
EliahKagan Nov 6, 2023
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
Prev Previous commit
Next Next commit
One approach to the symlink-following bug
  • Loading branch information
@EliahKagan
EliahKagan committed Nov 14, 2023
commit fd78a53f70a70c2ce8d891f8eb0692f4ab787e25
13 changes: 12 additions & 1 deletion git/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ def patch_env(name: str, value: str) -> Generator[None, None, None]:
os.environ[name] = old_value


def rmtree(path: PathLike) -> None:
def _rmtree_windows(path: PathLike) -> None:
"""Remove the given directory tree recursively.

:note: We use :func:`shutil.rmtree` but adjust its behaviour to see whether files
Expand Down Expand Up @@ -225,6 +225,17 @@ def handler(function: Callable, path: PathLike, _excinfo: Any) -> None:
shutil.rmtree(path, onerror=handler)


def _rmtree_posix(path: PathLike) -> None:
"""Remove the given directory tree recursively."""
return shutil.rmtree(path)


if os.name == "nt":
rmtree = _rmtree_windows
else:
rmtree = _rmtree_posix


def rmfile(path: PathLike) -> None:
"""Ensure file deleted also on *Windows* where read-only files need special treatment."""
if osp.isfile(path):
Expand Down