Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop support for ui.default-revset, move revsets.log to config file #3624

Merged
merged 2 commits into from
May 5, 2024
Merged

Drop support for ui.default-revset, move revsets.log to config file #3624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
740657d
cli: drop support for old `ui.default-revset` config
martinvonz May 5, 2024
cdc893d
cli: move `revsets.log` default to config file
martinvonz May 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Breaking changes

* Dropped support for `ui.default-revset` config (replaced by `revsets.log` in
0.8.0).

### Deprecations

### New features
Expand Down
3 changes: 3 additions & 0 deletions cli/src/config/revsets.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# NOTE: ensure you update docs/revsets.md with documentation when
# adding/updating any of these aliases

[revsets]
log = "@ | ancestors(immutable_heads().., 2) | trunk()"

[revset-aliases]
'trunk()' = '''
latest(
Expand Down
7 changes: 1 addition & 6 deletions lib/src/settings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,12 +205,7 @@ impl UserSettings {
}

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

pub fn signature(&self) -> Signature {
Expand Down