cli: change ui.default-revset to be based on trunk() #2264
Conversation
| @@ -355,7 +355,7 @@ struct StatusArgs {} | |||
| #[derive(clap::Args, Clone, Debug)] | |||
| struct LogArgs { | |||
| /// Which revisions to show. Defaults to the `revsets.log` setting, or | |||
| /// `@ | ancestors((remote_branches() | tags()).., 2)` if it is not set. | |||
| /// `(trunk()..@):: | (trunk()..@)-` if it is not set. | |||
There was a problem hiding this comment.
I prefer to see all unmerged branches (i.e. ancestors(trunk().., 2)) by default
There was a problem hiding this comment.
For either option, I'd change it a bit to add a few more revisions:
ancestors(trunk().., 2) | trunk() | @ in Yuya's case.
ancestors(trunk()..@, 2)| trunk() in your case.
Less actionable thoughts
I have the same preference as Yuya for my personal config, though I'm not sure this is everybody's preference. I think the revset you suggested is also useful. I'm trying out a stack alias for trunk()..@ and a logstack alias for the revset I proposed above.
I also put some thoughts about how a default revset could work in a world with immutable heads in #2247 (comment).
| @@ -159,7 +159,7 @@ impl UserSettings { | |||
| // For compatibility with old config files (<0.8.0) | |||
| self.config | |||
| .get_string("ui.default-revset") | |||
| .unwrap_or_else(|_| "@ | ancestors((remote_branches() | tags()).., 2)".to_string()) | |||
| .unwrap_or_else(|_| "(trunk()..@):: | (trunk()..@)-".to_string()) | |||
There was a problem hiding this comment.
You'll need to update cli/src/config-schema.json
There was a problem hiding this comment.
Re commit description and PR name: please change ui.default-revset to revsets.log. The former only seems to exists for backwards compatibility.
|
The last commit in #2247 probably replaces this PR. |
As with #2088, I'm not wedded to this, but it seems like a valuable change for my workflow at least and matches git-branchless sl.
Still a work in progress, requires updating tests which use raw
jj log. Most likely I'll throw in a PR before this one to change them all to usejj log -rall()for robustness if the default needs to be changed in the future.