Re: [PATCH] log --graph: draw '>' and '<' with --left-right

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Sat, May 24, 2008 at 10:27:12PM -0700, Junio C Hamano wrote:
> Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes:
> 
> > When calling "git log --left-right <branch1>...<branch2>", a single "<" or 
> > ">" is shown in front of the commit line, to indicate which branch1 this 
> > commit comes from, branch1 or branch2.
> >
> > However, it is easy to miss in the output of "git log --graph ...", since 
> > the graph still has "*" for regular commits and "M" for merge commits.  So 
> > imitate gitk, and show the "<" and ">" characters in the graph, too, 
> > instead of "*" (or "M").
> 
> This certainly makes it more visible which one is left and which one is
> right:
>
> ...
> 
> But is it just me who now finds the original marker redundant and ugly?
> IOW, I wonder if it is better to show this:
> 
>     < commit 205ffa9...
>     | Author: Gustaf Hendeby <hendeby@xxxxxxxxxx>
>     |
>     |     Make git add -n and git -u -n output consistent
>     |
>     < commit 38ed1d8...
>     | Author: Junio C Hamano <gitster@xxxxxxxxx>
>     |
>     |     "git-add -n -u" should not add but just report
>     ...
> 
> This is with --pretty=short, --pretty=oneline makes the issue even more
> obvious.

Yes, I agree that the original marker is now redundant, and it looks
better without it.

My recent patch to fix the "log --graph --boundary" behavior also
changes the graph code to print boundary commits as 'o' instead of
'*'.  We could probably also remove the original '-' prefix for
boundary commits when the graph output is enabled.

I was looking at the code, and noticed that it also outputs a '^'
prefix for non-boundary commits that are marked UNINTERESTING.  In
what situations will get_revision() return a commit that is
UNINTERESTING but not BOUNDARY?  I'm asking since the graph code
currently treats these commits as uninteresting, and won't print
branch lines for them.  If there are situations where these commits
are included in the log output, the graph code probably needs to be
updated to handle it.

-- 
Adam Simpkins
adam@xxxxxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux