Skip to content

dulwich: use worktree, since repo stage is deprecated #447

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 1 commit into from
Nov 17, 2025
Merged

dulwich: use worktree, since repo stage is deprecated #447

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
10 changes: 6 additions & 4 deletions src/scmrepo/git/backend/dulwich/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,8 +333,10 @@ def add(

paths = [paths] if isinstance(paths, str) else list(paths)

worktree = self.repo.get_worktree()

if update and not paths:
self.repo.stage(list(self.repo.open_index()))
worktree.stage(list(self.repo.open_index()))
return

files: list[bytes] = [
Expand All @@ -345,13 +347,13 @@ def add(
if os.name == "nt":
# NOTE: we need git/unix separator to compare against index
# paths but repo.stage() expects to be called with OS paths
self.repo.stage(
worktree.stage(
[fname for fname in files if fname.replace(b"\\", b"/") in index]
)
else:
self.repo.stage([fname for fname in files if fname in index])
worktree.stage([fname for fname in files if fname in index])
else:
self.repo.stage(files)
worktree.stage(files)

def _expand_paths(self, paths: list[str], force: bool = False) -> Iterator[str]:
for path in paths:
Expand Down