Add workspace config #3670
Open
Add workspace config #3670
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
yuja
reviewed
May 12, 2024
HybridEidolon
force-pushed
the
workspace-config
branch
3 times, most recently
from
9737caa
to
01b8970
Compare
ilyagr
reviewed
May 12, 2024
yuja
approved these changes
May 13, 2024
This adds support for per-workspace configuration as was described as a TODO in the LayeredConfig struct. Like repo configuration in `.jj/repo/config.toml`, the workspace config goes in `.jj/config.toml` in the workspace root, and its settings take precedence over repo, user and default configs. The config subcommands that take `--user` and `--repo` are additionally given `--workspace` which behaves as one would expect.
HybridEidolon
force-pushed
the
workspace-config
branch
from
01b8970
to
24450f6
Compare
|
Just FYI, you had a flaky test failure, I re-ran the testing job for you. You should be able to re-run it as well, I think, in the Actions tab. |
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 adds support for per-workspace configuration as was described as a TODO in the LayeredConfig struct. Like repo configuration in
.jj/repo/config.toml, the workspace config goes in.jj/config.tomlin the workspace root, and its settings take precedence over repo, user and default configs.The config subcommands that take
--userand--repoare additionally given--workspacewhich behaves as one would expect.Checklist
If applicable:
CHANGELOG.md