Repository navigation
feat(vcs): support layered gitignored file seeding - #2
Merged
Merged
Conversation
…sition-resolved common Git directory through Git and jj seeding, including colocated jj, while preserving non-colocated discovery. Added executable regressions for older-Git fallback, single config lookup, and dangling/absent sidecar behavior; restored the authorized state comment. Verified make test, make lint, Windows cross-build, focused tests, and real jj tests. External PR Testing-section publication was not performed in this ci phase
This file contains hidden or 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
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.
Intent
go ahead with the treehouse windows fix
Context: upstream PR kunchenguid#191 (branch fm/th-189-upstream on the ironerumi fork, head b04ec6f, "feat(vcs): support layered gitignored file seeding", Closes
kunchenguid/treehouse#189) and its fork twin #2 carry the same commit. On the fork's Windows CI the Go test packagescmdandinternal/poolhit Go's 10-minute per-package timeout (605s and 600s, run 39165421579). Measured Windows package times: upstream main 396s (cmd) / 427s (internal/pool); earlier fork head db51f32 532s / 578s; current head 605s+ / 600s+. The feature adds about 35% test time on Windows, so upstream CI will fail the same way once the maintainer approves it to run.What Changed
--include-filereplace all default layers.Risk Assessment
Testing
The real CLI passed layered seeding, override, committed-manifest, and unreadable-include scenarios after rerunning with an isolated XDG config; targeted acquisition and Git resolver tests passed, and the Windows cross-build passed. JJ runtime and Windows runtime/performance could not be exercised because
jjand a Windows runner are unavailable. The prior payload did not establish live results for the pool acquisition or Git resolver scenarios, so both are reported as untested.jjis unavailable, and there is no repository-local JJ binary or source from which to build one without installing or searching outside the workspace…Evidence: CLI layered seeding evidence
Evidence: CLI regression evidence
Evidence: Pool error-handling evidence
Evidence: Git layered resolver evidence
Evidence: JJ availability check
Pipeline
Updates from git push no-mistakes
✅ **Intent** - passed
✅ No issues found.
✅ **Rebase** - passed
✅ No issues found.
✅ No issues found.
jjis unavailable, and there is no repository-local JJ binary or source from which to build one without installing or searching outside the workspace…env -u GIT_CONFIG_GLOBAL GIT_CONFIG_NOSYSTEM=1 XDG_CONFIG_HOME=<temporary> go test ./cmd -run '^(TestGetIncludeFileReplacesCommittedManifest|TestGetIncludeLayersAndOverride|TestGetIncludeFileReadFailureLeavesPoolUntouched)$' -count=1 -venv -u GIT_CONFIG_GLOBAL GIT_CONFIG_NOSYSTEM=1 go test ./internal/pool -run '^TestAcquire_(PersonalLayersRefreshAndInventoryCleanup|PersistentLayerReadErrorsRemoveOrQuarantine)$' -count=1 -venv -u GIT_CONFIG_GLOBAL GIT_CONFIG_NOSYSTEM=1 go test ./internal/vcs/gitvcs -run '^(TestCommonGitDirEnvFallsBackForOlderGitWithSourceEnvironment|TestSeedWorktree.*|TestSeedLayers.*|TestMainRepoRootUsesOneCommonDirectoryQuery)$' -count=1 -vGOOS=windows GOARCH=amd64 go build ./...command -v jjand targeted JJ availability check✅ **Document** - passed
✅ No issues found.
✅ **Lint** - passed
✅ No issues found.
✅ **Push** - passed
✅ No issues found.
Issues
Closes kunchenguid#189