mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-29 23:57:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

cli: move revsets.log default to config file

Browse source
This commit is contained in:
Martin von Zweigbergk 2024-05-05 07:23:51 -07:00 committed by Martin von Zweigbergk
parent f958957f9e
commit 3dab92d2e9
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cli/src/config/revsets.toml
View file

@ -1,6 +1,9 @@
# NOTE: ensure you update docs/revsets.md with documentation when # NOTE: ensure you update docs/revsets.md with documentation when
# adding/updating any of these aliases # adding/updating any of these aliases
[revsets]
log = "@ | ancestors(immutable_heads().., 2) | trunk()"
[revset-aliases] [revset-aliases]
'trunk()' = ''' 'trunk()' = '''
latest( latest(

4
lib/src/settings.rs
View file

@ -205,9 +205,7 @@ impl UserSettings {
} }
pub fn default_revset(&self) -> String { pub fn default_revset(&self) -> String {
self.config self.config.get_string("revsets.log").unwrap_or_default()
.get_string("revsets.log")
.unwrap_or_else(|_| "@ | ancestors(immutable_heads().., 2) | trunk()".to_string())
} }
pub fn signature(&self) -> Signature { pub fn signature(&self) -> Signature {