mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-03 18:32:09 +00:00
log: enable synthetic elided nodes by default
We're early in the release cycle, so let's enable this feature and test it for a while before the next release.
This commit is contained in:
parent
8a7ccb1177
commit
e579bbad0c
6 changed files with 11 additions and 2 deletions
|
@ -20,6 +20,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||||
|
|
||||||
* Graph node symbols are now configurable via `ui.graph.default_node` and `ui.graph.elided_node`.
|
* Graph node symbols are now configurable via `ui.graph.default_node` and `ui.graph.elided_node`.
|
||||||
|
|
||||||
|
* `jj log` now includes synthetic nodes in the graph where some revisions were
|
||||||
|
elided.
|
||||||
|
|
||||||
* `jj squash` now accepts `--from` and `--into` (mutually exclusive with `-r`).
|
* `jj squash` now accepts `--from` and `--into` (mutually exclusive with `-r`).
|
||||||
It can thereby be for all use cases where `jj move` can be used.
|
It can thereby be for all use cases where `jj move` can be used.
|
||||||
|
|
||||||
|
|
|
@ -32,6 +32,9 @@ use crate::ui::Ui;
|
||||||
/// Renders a graphical view of the project's history, ordered with children
|
/// Renders a graphical view of the project's history, ordered with children
|
||||||
/// before parents. By default, the output only includes mutable revisions,
|
/// before parents. By default, the output only includes mutable revisions,
|
||||||
/// along with some additional revisions for context.
|
/// along with some additional revisions for context.
|
||||||
|
///
|
||||||
|
/// Spans of revisions that are not included in the graph per `--revisions` are
|
||||||
|
/// rendered as a synthetic node labeled "(elided revisions)".
|
||||||
#[derive(clap::Args, Clone, Debug)]
|
#[derive(clap::Args, Clone, Debug)]
|
||||||
pub(crate) struct LogArgs {
|
pub(crate) struct LogArgs {
|
||||||
/// Which revisions to show. Defaults to the `revsets.log` setting, or
|
/// Which revisions to show. Defaults to the `revsets.log` setting, or
|
||||||
|
|
|
@ -141,7 +141,7 @@
|
||||||
"log-synthetic-elided-nodes": {
|
"log-synthetic-elided-nodes": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"description": "Whether to render elided parts of the graph as synthetic nodes.",
|
"description": "Whether to render elided parts of the graph as synthetic nodes.",
|
||||||
"default": false
|
"default": true
|
||||||
},
|
},
|
||||||
"editor": {
|
"editor": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
|
|
|
@ -14,7 +14,7 @@ diff-instructions = true
|
||||||
paginate = "auto"
|
paginate = "auto"
|
||||||
pager = { command = ["less", "-FRX"], env = { LESSCHARSET = "utf-8" } }
|
pager = { command = ["less", "-FRX"], env = { LESSCHARSET = "utf-8" } }
|
||||||
log-word-wrap = false
|
log-word-wrap = false
|
||||||
log-synthetic-elided-nodes = false
|
log-synthetic-elided-nodes = true
|
||||||
|
|
||||||
[snapshot]
|
[snapshot]
|
||||||
max-new-file-size = "1MiB"
|
max-new-file-size = "1MiB"
|
||||||
|
|
|
@ -1014,6 +1014,8 @@ Show revision history
|
||||||
|
|
||||||
Renders a graphical view of the project's history, ordered with children before parents. By default, the output only includes mutable revisions, along with some additional revisions for context.
|
Renders a graphical view of the project's history, ordered with children before parents. By default, the output only includes mutable revisions, along with some additional revisions for context.
|
||||||
|
|
||||||
|
Spans of revisions that are not included in the graph per `--revisions` are rendered as a synthetic node labeled "(elided revisions)".
|
||||||
|
|
||||||
**Usage:** `jj log [OPTIONS] [PATHS]...`
|
**Usage:** `jj log [OPTIONS] [PATHS]...`
|
||||||
|
|
||||||
###### **Arguments:**
|
###### **Arguments:**
|
||||||
|
|
|
@ -1356,6 +1356,7 @@ fn test_elided() {
|
||||||
|
|
||||||
// Elide some commits from each side of the merge. It's unclear that a revision
|
// Elide some commits from each side of the merge. It's unclear that a revision
|
||||||
// was skipped on the left side.
|
// was skipped on the left side.
|
||||||
|
test_env.add_config("ui.log-synthetic-elided-nodes = false");
|
||||||
insta::assert_snapshot!(get_log("@ | @- | description(initial)"), @r###"
|
insta::assert_snapshot!(get_log("@ | @- | description(initial)"), @r###"
|
||||||
@ merge
|
@ merge
|
||||||
├─╮
|
├─╮
|
||||||
|
|
Loading…
Reference in a new issue