From: Karthik Nayak <karthik.188@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git <git@vger.kernel.org>,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
Christian Couder <christian.couder@gmail.com>
Subject: Re: [RFC] Porting builtin/branch.c to use the printing options of ref-filter.{c,h}
Date: Wed, 26 Aug 2015 12:09:45 +0530 [thread overview]
Message-ID: <CAOLa=ZRZpy8_KGNZL1TahEkOOdQ35e1168pwuCpkxbogRDXNnw@mail.gmail.com> (raw)
In-Reply-To: <xmqq4mjnyzfy.fsf@gitster.dls.corp.google.com>
On Wed, Aug 26, 2015 at 12:20 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Karthik Nayak <karthik.188@gmail.com> writes:
>
>> I'm working on porting over the printing options of ref-filter to `git
>> branch -l`.
>> This is a follow up to
>> http://article.gmane.org/gmane.comp.version-control.git/276377
>>
>> Theres a slight issue with this which I'd like to discuss about.
>>
>> When we use `-a` option in `git branch -l`
>> It lists local branches and remotes with each having a different output format.
>> This with reference to ref-filter would mean either
>>
>> 1. Change format in between local and remote refs
>
> I thought the end result of consolidation would be for for-each-ref,
> branch -l, and tag -l to be "first collect what to show, and then
> show them according to a single format given". How could it be
> possible to switch format? It's not even like each element collected
> in the first phase is marked so that the second "display" phase know
> which one is which.
>
Absolutely right! Currently this is not even possible, It was just a shot in the
dark. I was just shooting out possibilities I could think of :)
>> 2. Have a format like %(if)...local check....%(then)....local branch
>> format....%(else)....remote format %(end).
>
> That, if we had a working if/then/else/end, would be a good
> demonstration of it.
>
> If this were only for internal use by "branch -l", it might be
> overkill, but the end users with for-each-ref --format options would
> want to do the same thing as built-in patterns, so it is a good goal
> to aim at.
>
I have a version of that running in my local repo, I'll probably
post a WIP soon, when I get this done.
>> I prefer the latter, but that might lead to a large format. Any suggestions?
>
> A less ambitious option might be:
>
> 3. Invent "%(refname:<some magic>)" format similar to
> %(refname:short) but does your thing depending on the prefix
> refs/heads/ and refs/remotes/.
>
> but that will not work if the difference between local and remote
> format is not merely textual (e.g. paint them in different color).
It's more than just colors. The whole format changes.
$ git branch -a
For local:
"%(if)%(HEAD)%(then)%(HEAD) %(color:green)%(refname:short)%(else)
%(refname:short)%(end)"
For remote:
" remotes/%(color:red)%(refname:short)%(color:reset)%(if)%(symref)%(then)
-> %(symref:short)%(end)"
On Wed, Aug 26, 2015 at 1:36 AM, Matthieu Moy
<Matthieu.Moy@grenoble-inp.fr> wrote:
>
> Hmm, yes, colors would be difficult to get with this solution. Perhaps a
> %(refname:autoprefix,autocolor) that would pick the color and do the
> textual rendering?
>
That sounds, good, probably could work on something of this sort.
--
Regards,
Karthik Nayak
next prev parent reply other threads:[~2015-08-26 6:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-25 17:45 [RFC] Porting builtin/branch.c to use the printing options of ref-filter.{c,h} Karthik Nayak
2015-08-25 18:50 ` Junio C Hamano
2015-08-25 20:06 ` Matthieu Moy
2015-08-25 20:47 ` Junio C Hamano
2015-08-26 6:39 ` Karthik Nayak [this message]
2015-08-26 9:02 ` Matthieu Moy
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='CAOLa=ZRZpy8_KGNZL1TahEkOOdQ35e1168pwuCpkxbogRDXNnw@mail.gmail.com' \
--to=karthik.188@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).