ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

cli: drop support for old ui.default-revset config

Browse source 
We replaced it by `revsets.log` in 0.8.0, which is long enough that
users should have been able to switch.
This commit is contained in:
Martin von Zweigbergk 2024-05-05 07:17:52 -07:00 committed by Martin von Zweigbergk
parent 3d898d0a06
commit f958957f9e
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Breaking changes ### Breaking changes
* Dropped support for `ui.default-revset` config (replaced by `revsets.log` in
0.8.0).
### Deprecations ### Deprecations
### New features ### New features

9
lib/src/settings.rs
View file

@ -205,12 +205,9 @@ impl UserSettings {
} }
pub fn default_revset(&self) -> String { pub fn default_revset(&self) -> String {
self.config.get_string("revsets.log").unwrap_or_else(|_| { self.config
// For compatibility with old config files (<0.8.0) .get_string("revsets.log")
self.config .unwrap_or_else(|_| "@ | ancestors(immutable_heads().., 2) | trunk()".to_string())
.get_string("ui.default-revset")
.unwrap_or_else(|_| "@ | ancestors(immutable_heads().., 2) | trunk()".to_string())
})
} }
pub fn signature(&self) -> Signature { pub fn signature(&self) -> Signature {