cli: load configs from .jj/repo/config.toml #982
Merged
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
martinvonz
approved these changes
Jan 6, 2023
UserSettings will be instantiated after both user and repo configs are loaded. We might want to add a wrapper for CLI settings, but I have no idea how that should be structured. Let's use bare config::Config until then.
…nfig For the same reason as the previous commit. -R/--repository can't be parsed until the real command name gets available.
The next commit will add a struct that keeps umerged configs, which will be used to insert repo config between user and override configs.
Thinking of config precedence, we'll probably need to store "base" (default + env_base + user) config and "override" (env_overrides + --config-toml) config separately to support repo config. Suppose env_overrides() is a temporary value, it's better to override any file-derived values with $JJ_ env.
Since CliRunner knows both defaults and envs, it makes sense to feed them to initialize ui.
It's unclear whether parse_args() or its caller should update LayeredConfigs. --config-toml is processed by callee to apply --color early. -R/--repository will be processed by caller since it will instantiate WorkspaceLoader. Maybe --config-toml can be removed from EarlyArgs, and handle_early_args() just updates ui state based on --color argument?
Since per-repo config may contain CLI settings, it must be visible to CLI. Therefore, UserSettings::with_repo() -> RepoSettings isn't used, and its implementation is nullified by this commit. #616
|
Could you explain how precedence is expected to work? I'm running jj at its github HEAD, and I set a per-repo alias inside |
Example (let us know if that doesn't work for you): $ jj config list aliases.foo
aliases.foo=["st"]
$ cd $(mktemp -d); jj init --git
Initialized repo in "."
$ echo 'aliases.foo = ["diff"]' > .jj/repo/config.toml
$ jj config list aliases.foo
aliases.foo=["diff"] |
|
This is what I got: |
This PR has been closed for a while, so I moved this to a new bug report instead: #2414 |
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.
Checklist
If applicable:
CHANGELOG.md