Skip-worktree support, sparse checkout impl #1495
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously, IndexEntry did not store or expose the extended_flags field, causing any skip-worktree bits to be discarded when reading or writing the index. This patch adds flags and extended_flags fields to IndexEntry, and updates from_serialized/serialize to preserve them. In particular: - We store both flags and extended_flags from SerializedIndexEntry. - We clear/set stage bits in flags, preserving the rest (including the extended flag). - We introduce a helper method set_skip_worktree() to enable or disable the skip-worktree bit in extended_flags, and set/unset FLAG_EXTENDED as needed. With these changes, Dulwich can now retain and manipulate skip-worktree bits when reading and writing .git/index, enabling sparse checkout functionality to match Git’s behavior.
…ktree property read the extended flags bit
lmmx
changed the title
lmmx
changed the title
|
Removed the cone mode TDDs (doesn't make sense to introduce them prematurely) and ran the same tests the CI runs (I thought it was just make check
python -m mypy dulwich
python -m ruff check .
python -m ruff format check .Should go green now 🤞 |
jelmer
requested changes
Feb 12, 2025
|
Thanks for working on this - overall looks great, but some minor comments inline and one larger one about placement of the code in porcelain.py. |
|
Thanks for reviewing! Yes would be great to land this and extend to further steps. Apologies for the roughness, did not mean to include a uv lockfile, and yes I meant to remove those codenames. Will revise and resubmit shortly |
…tvals and side effects
Ready for re-review @jelmer 😎 |
|
Changes look good; please take a look at the ruff failures |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds and refines functionality around sparse checkout, including:
IndexEntry, preservingextended_flagsso that excluded files actually stay out of the working tree.write_indexso that index entries with extended flags are written as version 3 or higher.test_porcelain.pyfor cone-mode sparse checkout (currently skipped, as cone mode is not fully implemented yet, but the tests are in place for future development). I did my best but I decided to submit now and not potentially spoil it. (I can take these out but I am confident I'll be able to do cone mode with a bit more thought)test_index.pysparse_checkoutfunction, so we can raise or force-remove on excluded paths.All tests now pass (aside from the intentionally skipped cone-mode ones). I ran
make checkand hope this can land.