Re: [GSoC PATCH v4 3/3] graph: add documentation and tests about --graph-lane-limit
- From
Pablo <pabloosabaterr@gmail.com>
- Date
- Mar 25, 2026, 11:49 UTC
- Message-ID
- <CAN5EUNT+x=OmQb0JqcTYn_6xNSpKKTz71aZOfdM-CShjSbAyPw@mail.gmail.com>
- In-Reply-To
- <6cdcece0-8cc5-4c87-8727-6d3e17424a9e@kdbg.org>
Johannes Sixt (<j6t@kdbg.org>) writes:
Show 12 quoted lines
> > Am 23.03.26 um 22:59 schrieb Pablo Sabater: > > @@ -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.
I'll add that, it is for zero or any negative number.
Show 65 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? > > > +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?
The extra column is the truncation marker that shows in every lane that had to be truncated horizontally, not an actual lane, even tho that by keeping the right side edge might seem confusing.
Show 13 quoted lines
> > Oh! "Truncation" here does not mean that the vertical 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.
Yes, the truncation is horizontal, each lane is cut at the lane limit. I went with this because it is more accessible starting to work at the graph and understanding it (it is a 17 years old code).
Vertical truncation needs rearranging which lanes are visible and which ones come and go, similar to gitk (This is the TODO idea that is present on the graph.c code) I think it will be hard to do it even if there is a way of not having to rewrite the whole graph rendering code. prob if this is done it won't replace the actual --graph but actually become something like --rgraph as a different graph rendering option.
> > -- Hannes >
I hope I a made my intentions with horizontal truncation more clear. I'll send a v5 with all the changes talked about.
Thanks for the feedback throughout all the patches! Pablo