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: Sun, 17 Jan 2021 13:10:01 -0800 [thread overview]
Message-ID: <xmqq7dobmfrq.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20210117110337.429994-2-kmarek@pdinc.us> (Kyle Marek's message of "Sun, 17 Jan 2021 06:03:36 -0500")
Kyle Marek <kmarek@pdinc.us> writes:
> This aids in identifying where an unrelated branch history starts when
> using `git log --graph --oneline --all`
>
> Signed-off-by: Kyle Marek <kmarek@pdinc.us>
> ---
> revision.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
No tests?
> diff --git a/revision.c b/revision.c
> index 9dff845bed..8556923de8 100644
> --- a/revision.c
> +++ b/revision.c
> @@ -4191,9 +4191,11 @@ const char *get_revision_mark(const struct rev_info *revs, const struct commit *
> return "<";
> else
> return ">";
> - } else if (revs->graph)
> + } else if (revs->graph) {
> + if (!commit->parents)
> + return "#";
> return "*";
> - else if (revs->cherry_mark)
> + } else if (revs->cherry_mark)
> return "+";
> return "";
> }
Here is what I tried to come up with, but somehow the "#" marker is
not showing for me.
The "counted plus --left-right" tests stress why a single "#" is not
good enough. I think the patch also needs to replace "<" and ">"
for root commits that are left and right---in the tests, I used "L"
to denote "root that is on the left side" (and "R" for the right
side) instead of single "#", so that we do not to lose information.
By the way, as I already said in the original thread, I do not think
the '#' marking is a good idea; I'd rather see the root commit shown
by shifting columns.
Anyway, here is to test [1/2].
t/t6020-rev-list-boundary.sh | 132 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 132 insertions(+)
diff --git i/t/t6020-rev-list-boundary.sh w/t/t6020-rev-list-boundary.sh
new file mode 100755
index 0000000000..f25e041951
--- /dev/null
+++ w/t/t6020-rev-list-boundary.sh
@@ -0,0 +1,132 @@
+#!/bin/sh
+
+test_description='rev-list/log boundary and root'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+ test_commit A &&
+ test_commit B &&
+ git reset --hard A &&
+ test_commit C &&
+
+ git checkout --orphan side &&
+ git rm -fr . &&
+ test_commit X &&
+ test_commit Y &&
+
+ test_tick && git merge --allow-unrelated-histories -m "M" B &&
+ test_tick && git merge -m "N" C &&
+ test_commit Z
+'
+
+test_expect_success 'log with boundary' '
+ git log --graph --boundary --format='%s' ^A ^X Z >actual &&
+ sed -e "s/Q$//" >expect <<-\EOF &&
+ * Z
+ * N
+ |\ Q
+ | * C
+ * | M
+ |\ \ Q
+ | * | B
+ | |/ Q
+ * | Y
+ o | X
+ / Q
+ o A
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'log --left-right with symmetric boundary' '
+ git log --graph --left-right --boundary --format='%s' B...C >actual &&
+ sed -e "s/Q$//" >expect <<-\EOF &&
+ > C
+ | < B
+ |/ Q
+ o A
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'log --left-right with asymmetric boundary' '
+ git log --graph --left-right --boundary --format='%s' ^A ^X Z >actual &&
+ sed -e "s/Q$//" >expect <<-\EOF &&
+ > Z
+ > N
+ |\ Q
+ | > C
+ > | M
+ |\ \ Q
+ | > | B
+ | |/ Q
+ > | Y
+ o | X
+ / Q
+ o A
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_failure 'log down to root' '
+ git log --graph --format='%s' Z >actual &&
+ sed -e "s/Q$//" >expect <<-\EOF &&
+ * Z
+ * N
+ |\ Q
+ | * C
+ * | M
+ |\ \ Q
+ | * | B
+ | |/ Q
+ | # A
+ * Y
+ # X
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_failure 'log down to root' '
+ git log --graph --format='%s' B Y >actual &&
+ sed -e "s/Q$//" >expect <<-\EOF &&
+ * Y
+ # X
+ * B
+ # A
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_failure 'log that happens to show root' '
+ git log --graph -3 --format='%s' B Y >actual &&
+ sed -e "s/Q$//" >expect <<-\EOF &&
+ * Y
+ # X
+ * B
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_failure 'log --left-right down to root' '
+ git log --graph --left-right --format='%s' B...Y >actual &&
+ sed -e "s/Q$//" >expect <<-\EOF &&
+ > Y
+ R X
+ < B
+ L A
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_failure 'log --left-right that happens to show root' '
+ git log --graph -3 --left-right --format='%s' B...Y >actual &&
+ sed -e "s/Q$//" >expect <<-\EOF &&
+ > Y
+ R X
+ < B
+ EOF
+ test_cmp expect actual
+'
+
+test_done
next prev parent reply other threads:[~2021-01-17 21: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 [this message]
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
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq7dobmfrq.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).