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 1/2] revision: Denote root commits with '#'
Date: Mon, 18 Jan 2021 12:33:15 -0800 [thread overview]
Message-ID: <xmqqr1mij88k.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <xmqqwnwajbuj.fsf@gitster.c.googlers.com> (Junio C. Hamano's message of "Mon, 18 Jan 2021 11:15:16 -0800")
Junio C Hamano <gitster@pobox.com> writes:
> [Footnote]
>
> *1* Stepping back a bit, I think concentrating too much on "is it
> root?" is a wrong way to think about the problem. Suppose you
> have two histories, e.g. (time flows from left to right; A and X
> are roots)
A shorter and more concrete example. Start from an empty repository:
$ git init
$ git commit --allow-empty -m Aroot
$ git checkout --orphan side
$ git commit --allow-empty -m Xroot
$ git log --all --graph --oneline
* a1f7cb2 (HEAD -> side) Xroot
* b6fb655 (master) Aroot
These depict two root commits, Aroot and Xroot, and no other
commits. We do want to show that these two commits do not have
parent-child relationship at all, and your (and a few proposals made
by other in the past) solution was to show them both with "#".
Continuing in the same repository:
$ git checkout --orphan another
$ git commit --allow-empty -m Oroot
$ git commit --allow-empty -m A
$ git log --graph --oneline ^another^ another side
* eddf116 (HEAD -> another) A
* a1f7cb2 (side) Xroot
These depict two commits, A and Xroot, and no other commits. We
also want to show that these two commits do not have parent-child
relationship at all, but if we paint Xroot with "#", it still makes
it appear that A is a child of Xroot.
> And the right way to look at it is "does A have any parent in
> the part of the history being shown?", not "does A have any
> parent?" Then 'A' will get exactly the same treatment in the
> two examples, and the visual problem that makes A appear as if
> it has parent-child relationship with unrelated commit X goes
> away.
So the condition we saw in your patches, !commit->parents, which
attempted to see if it was root, needs to be replaced with a helper
function that checks if there is any parent that is shown in the
output. Perhaps
int no_interesting_parents(struct commit *commit)
{
struct commit_list *parents = commit->parents;
while (parents) {
if (!(parents->object.flags & UNINTERESTING))
return 0;
parents = parents->next;
}
return 1;
}
or something like that should serve as a replacement, i.e.
return !commit->parents ? "#" : "*";
would become
return no_interesting_parents(commit) ? "#" : "*";
Hmm?
next prev parent reply other threads:[~2021-01-18 20:34 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 [this message]
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
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=xmqqr1mij88k.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).