config: add hostname-based conditional config scopes #7923
Conversation
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
kaffarell
force-pushed
the
push-quymyxnmxpkw
branch
from
31e9c9d to
7d57a13
Compare
kaffarell
force-pushed
the
push-quymyxnmxpkw
branch
from
7d57a13 to
971eddb
Compare
This enables configuration to be conditionally applied based on the hostname set in `operation.hostname`. Users can now use `--when.hostnames = ["host-a", "host-b"]` in their config files to apply settings only on specific machines. Fixes: jj-vcs#6441
kaffarell
force-pushed
the
push-quymyxnmxpkw
branch
from
971eddb to
a8716d5
Compare
yuja
approved these changes
Nov 3, 2025
Comment on lines
+3919
to
+3922
| // Set hostname for --when.hostnames conditional config scopes. | ||
| if let Ok(hostname) = whoami::fallible::hostname() { | ||
| config_env.set_hostname(hostname); | ||
| } |
There was a problem hiding this comment.
nit: simply initialize it by ConfigEnv::from_environment() and delete setter. It doesn't make sense to update static value here.
Comment on lines
+146
to
+149
| match (candidates, actual) { | ||
| (Some(candidates), actual) => candidates.iter().any(|candidate| actual == candidate), | ||
| (None, _) => true, // no constraints | ||
| } |
There was a problem hiding this comment.
nit: candidates.is_none_or(|candidates| ...). actual doesn't have to be a part of match.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 enables configuration to be conditionally applied based on the hostname set in
operation.hostname. Users can now use--when.hostnames = ["host-a", "host-b"]in their config files to apply settings only on specific machines. I think this would be a great addition as e.g. I have the same folder structure on my work and personal machine, so I can't use--when.repositoriesto distinguish config scopes.This is my first contribution to jj, so if I did something wrong let me know!
Checklist
If applicable:
CHANGELOG.mdREADME.md,docs/,demos/)cli/src/config-schema.json)