From: Junio C Hamano <gitster@pobox.com>
To: Kyle Marek <kmarek@pdinc.us>
Cc: Jason Pyeron <jpyeron@pdinc.us>,
git@vger.kernel.org,
Philippe Blain <levraiphilippeblain@gmail.com>
Subject: Re: [PATCH 2/2] revision: implement --show-linear-break for --graph
Date: Sun, 17 Jan 2021 18:09:44 -0800 [thread overview]
Message-ID: <xmqq35yzknbr.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <xmqqsg6zkwa8.fsf@gitster.c.googlers.com> (Junio C. Hamano's message of "Sun, 17 Jan 2021 14:56:15 -0800")
Junio C Hamano <gitster@pobox.com> writes:
> In other words, revs->break_revision_mark is left NULL unless
> --show-linear-break is given.
>
>> @@ -4192,8 +4192,8 @@ const char *get_revision_mark(const struct rev_info *revs, const struct commit *
>> else
>> return ">";
>> } else if (revs->graph) {
>> - if (!commit->parents)
>> - return "#";
>> + if (revs->break_revision_mark && !commit->parents)
>> + return revs->break_revision_mark;
>
> And that causes this to break. Now "--graph" alone won't show '#'
> for the root commits, despite that is what [1/2] wanted to do.
>
> Here is a fix-up, plus some minimum tests.
Having said all that, I do not mind if the new markings were
activated only when --show-linear-break option (or a separate new
option) is given. But if that is where we want to go, your [1/2]
that uses the new markings unconditionally is a regression.
A better organization, if we wanted to have multiple and smaller
steps than a single whole thing, would be:
[1/2] Introduce a new "--mark-root-commits" option, or abuse the
existing "--show-linear-break" option, and change "*<>"
marking used for commits to "#LR" (or whatever appropriate)
when the option is in effect. Document the behaviour and add
tests.
[2/2] Introduce "--show-linear-break=<custom-value>" option.
Document the behaviour and add tests.
If you apply [1/2] and [2/2] with the earlier fixes I sent, you'll
see many fallouts from existing tests, as the representation of the
root commit is changed unconditionally. We view breakages of tests
as a rough estimate of how badly end-user scripts could break, and
the picture was not very pretty. And that is why I am suggesting
the above "only do the new markings when asked, not unconditionally"
approach.
I still am skeptical that spending 3 more letters to denote roots is
worth it, though.
Thanks.
next prev parent reply other threads:[~2021-01-18 2:14 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-14 18:30 add a blank line when a commit has no parent in log output? Jason Pyeron
2021-01-14 19:29 ` Philippe Blain
2021-01-14 20:44 ` Jason Pyeron
2021-01-17 11:03 ` [PATCH 0/2] Option to modify revision mark for root commits Kyle Marek
2021-01-17 11:03 ` [PATCH 1/2] revision: Denote root commits with '#' Kyle Marek
2021-01-17 21:10 ` Junio C Hamano
2021-01-18 7:56 ` Kyle Marek
2021-01-18 19:15 ` Junio C Hamano
2021-01-18 20:33 ` Junio C Hamano
2021-01-19 7:43 ` Kyle Marek
2021-01-19 22:10 ` Junio C Hamano
2021-01-20 3:25 ` Kyle Marek
2021-01-20 6:47 ` Junio C Hamano
2021-01-20 15:11 ` Jason Pyeron
2021-01-20 21:52 ` Junio C Hamano
2021-01-20 23:01 ` Jason Pyeron
2021-01-23 18:07 ` Junio C Hamano
2021-01-23 23:02 ` Jason Pyeron
2021-01-23 23:45 ` Junio C Hamano
2021-01-24 0:02 ` Jason Pyeron
2021-01-25 7:00 ` Junio C Hamano
2021-01-17 22:44 ` Junio C Hamano
2021-01-17 11:03 ` [PATCH 2/2] revision: implement --show-linear-break for --graph Kyle Marek
2021-01-17 22:56 ` Junio C Hamano
2021-01-18 2:09 ` Junio C Hamano [this message]
2021-01-18 7:56 ` Kyle Marek
2021-01-18 21:01 ` Junio C Hamano
2021-01-19 7:44 ` Kyle Marek
2021-01-15 1:12 ` add a blank line when a commit has no parent in log output? Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq35yzknbr.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jpyeron@pdinc.us \
--cc=kmarek@pdinc.us \
--cc=levraiphilippeblain@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).