Repository navigation
worktree/host: rc_output_roots keeps relative --output_user_root values - #6421
Merged
Merged
Conversation
…es (closes #6209) A relative `startup --output_user_root=` in a bazelrc is resolved against the workspace by Bazel and by dx_process. rc_output_roots dropped it because of the is_absolute check, so reclaim_host_wide did not scan it. Join relative roots to the workspace instead; absolute roots are unchanged because Path::join keeps them as they are. Co-Authored-By: Claude Haiku 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011u9TXHDZrfmzFQ2WT8QAKK
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.
Closes #6209
Change
rc_output_roots(cli/worktree/src/host.rs) joins a relativestartup --output_user_root=value to the workspace instead of skipping it. Absolute values are unchanged (Path::joinkeeps them). The dedupe check stays.rc_output_roots_join_relative_startup_roots_to_the_workspacecovers bare and quoted relative roots. The relativerelline is removed fromrc_output_roots_read_startup_lines_and_importsbecause it now resolves to the workspace.Checks
tools/dx check --apply //cli/worktree/...: pass.tools/dx test //cli/worktree:dx_worktree_test: 1 passed, 0 failed.*_consumer_testtargets (CI runs them). No macOS/Windows run; the change is platform-independent.Remaining
dx_processroot resolution so the two crates cannot disagree. Not done here; this change keeps the sameworkspace.joinrule, so they agree today.🤖 Generated with Claude Code
Assisted by Claude.