Skip to content

worktree: rc_output_roots reads quoted paths with spaces (closes #6208) - #6425

Merged
TrapsterDK merged 1 commit into
mainfrom
fix-6208-rc-quoted-output-root
Nov 4, 2026
Merged

TrapsterDK merged 1 commit into
mainfrom
fix-6208-rc-quoted-output-root

Conversation

@TrapsterDK

Copy link
Copy Markdown
Collaborator

Closes #6208

rc_output_roots split .bazelrc lines on whitespace, so startup --output_user_root="/home/u/my cache" yielded /home/u/my and the real root was never reclaimed. Now it uses the quote-aware rc tokenizer from dx_process (made pub), for startup lines, the separate-value form --output_user_root "/path", and import/try-import paths. The # comment cutoff is kept.

Tests:

  • tools/dx check --apply //cli/worktree/... //cli/process/...: exit 0, no changes applied.
  • tools/dx test //cli/worktree:dx_worktree_test //cli/process:dx_process_test: 2 of 2 pass. New test rc_output_roots_keep_quoted_paths_with_spaces is next to rc_output_roots_read_startup_lines_and_imports.

Not run: nested-Bazel and *_consumer_test targets (CI runs them). Windows and macOS were not built or run; the new test uses unix absolute paths, as the existing test does.

Base: branched from origin/main at f394118. Main has since moved 5 commits (including #6368 touching cli/process/src/rc.rs, a different hunk). Not rebased here; the merge lane rebases.

🤖 Generated with Claude Code

Assisted by Claude.

rc_output_roots split rc lines on whitespace, so a quoted
--output_user_root path with spaces was cut at the first space and the
real root was never reclaimed. Use the quote-aware rc tokenizer from
dx_process, make it public, and accept the separate-value form of
--output_user_root too.

Co-Authored-By: Claude Haiku 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_011u9TXHDZrfmzFQ2WT8QAKK
@TrapsterDK
TrapsterDK force-pushed the fix-6208-rc-quoted-output-root branch from add6c1b to e12dde8 Compare November 4, 2026 20:30
@TrapsterDK
TrapsterDK merged commit b1e44c0 into main Nov 4, 2026
@TrapsterDK
TrapsterDK deleted the fix-6208-rc-quoted-output-root branch November 4, 2026 20:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

worktree/host: rc_output_roots honors quoted --output_user_root paths with spaces

1 participant