Re: [GSoC PATCH v4 3/3] graph: add documentation and tests about --graph-lane-limit
- From
Johannes Sixt <j6t@kdbg.org>
- Date
- Mar 25, 2026, 10:07 UTC
- Message-ID
- <6cdcece0-8cc5-4c87-8727-6d3e17424a9e@kdbg.org>
- In-Reply-To
- <20260323215935.74486-4-pabloosabaterr@gmail.com>
Am 23.03.26 um 22:59 schrieb Pablo Sabater:
Show 8 quoted lines
> @@ -1259,6 +1259,11 @@ This implies the `--topo-order` option by default, but the > in between them in that case. If _<barrier>_ is specified, it > is the string that will be shown instead of the default one. > > +`--graph-lane-limit=<n>`:: > + When `--graph` is used, limit the number of graph lanes to be shown. > + Lanes over the limit are replaced with a truncation mark '.'. By default > + there is no limit.
This should probably mention that 0 means no limit.
Show 26 quoted lines
> + > ifdef::git-rev-list[] > `--count`:: > Print a number stating how many commits would have been > diff --git a/t/t4215-log-skewed-merges.sh b/t/t4215-log-skewed-merges.sh > index 28d0779a8c..650701df42 100755 > --- a/t/t4215-log-skewed-merges.sh > +++ b/t/t4215-log-skewed-merges.sh > @@ -370,4 +370,57 @@ test_expect_success 'log --graph with multiple tips' ' > EOF > ' > > +test_expect_success 'log --graph --graph-lane-limit=2 limited to two lanes' ' > + check_graph --graph-lane-limit=2 M_7 <<-\EOF > + *-. 7_M4 > + |\ \ > + | | * 7_G > + | | * 7_F > + | * . 7_E > + | * . 7_D > + * | . 7_C > + | |/ > + |/| > + * | 7_B > + |/ > + * 7_A
I'm confused. If the lane limit is 2, why do we have actually have 3 lanes?
Show 33 quoted lines
> +test_expect_success 'log --graph --graph-lane-limit=3 limited to three lanes' ' > + check_graph --graph-lane-limit=3 M_1 M_3 M_5 M_7 <<-\EOF > + * 7_M1 > + |\ > + | | * 7_M2 > + | | |\ > + | | | * 7_H > + | | | . 7_M3 > + | | | . 7_J > + | | | . 7_I > + | | | . 7_M4 > + | |_|_. > + |/| | . > + | | |_. > + | |/| . > + | | | . > + | | |/. > + | | * . 7_G > + | | | . > + | | |/. > + | | * . 7_F > + | * | . 7_E > + | | |/. > + | |/| . > + | * | . 7_D > + | | |/ > + | |/| > + * | | 7_C > + | |/ > + |/| > + * | 7_B > + |/ > + * 7_A
Same here. Why is there a fourth lane?
Oh! "Truncation" here does not mean that the vertial lines are cut off and are supposed to continue sometime later in the chart. It literally means that the *line* is truncated and just some stuff *on that line* is omitted.
Ouch! That was not what I was expecting. I thought that truncation means that when the eye follows a line vertically, it finds the truncation point of the line at some point, and then the continuation of that line is again some time later down the chart. The only clue which lanes are the same would be the color, which would have to be remedied somehow.
I don't know what to make of it. I have to reconsider.
-- Hannes