Skip to content

Commit

Permalink
Enable the new graph nodes by default.
Browse files Browse the repository at this point in the history
It's been tested in various places now, so this is probably mature
enough to be the default.
  • Loading branch information
algmyr committed Jul 16, 2024
1 parent a757fdd commit 546e1ac
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
branches aren't managed by you. Therefore, untracked branches are no longer
displayed in `jj log` by default.

* Updated defaults for graph node symbol templates `templates.log_node` and
`templates.op_log_node`.

### Deprecations

### New features
Expand Down
8 changes: 4 additions & 4 deletions lib/src/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -236,16 +236,16 @@ impl UserSettings {
pub fn commit_node_template(&self) -> String {
self.node_template_for_key(
"templates.log_node",
r#"if(self, if(current_working_copy, "@", "◉"), "◌")"#,
r#"if(self, if(current_working_copy, "@", "o"), ".")"#,
"builtin_log_node",
"builtin_log_node_ascii",
)
}

pub fn op_node_template(&self) -> String {
self.node_template_for_key(
"templates.op_log_node",
r#"if(current_operation, "@", "◉")"#,
r#"if(current_operation, "@", "o")"#,
"builtin_op_log_node",
"builtin_op_log_node_ascii",
)
}

Expand Down

0 comments on commit 546e1ac

Please sign in to comment.