From: Felipe Contreras <felipe.contreras@gmail.com>
To: Johannes Sixt <j.sixt@viscovery.net>
Cc: "Junio C Hamano" <gitster@pobox.com>,
git@vger.kernel.org, "René Scharfe" <l.s.r@web.de>
Subject: Re: [PATCH] revision: add --except option
Date: Mon, 2 Sep 2013 01:48:37 -0500 [thread overview]
Message-ID: <CAMP44s3eUmA9pVfZFbXHNvDiYwp9jttSTb6DBr8JrgTfhfD+_Q@mail.gmail.com> (raw)
In-Reply-To: <52242F61.3090404@viscovery.net>
On Mon, Sep 2, 2013 at 1:25 AM, Johannes Sixt <j.sixt@viscovery.net> wrote:
> Am 8/31/2013 21:27, schrieb Felipe Contreras:
>> On Fri, Aug 30, 2013 at 2:56 AM, Johannes Sixt <j.sixt@viscovery.net> wrote:
>>> Am 8/30/2013 8:32, schrieb Junio C Hamano:
>>>> If you have a history where
>>>>
>>>> - branches "master" and "maint" point at commit A;
>>>> - branch "next" points at commit B that is a descendant of A; and
>>>> - there are tags X and Y pointing at commits that are ahead of B
>>>> or behind A
>>>>
>>>> i.e.
>>>>
>>>> ----X----A----B----Y
>>>>
>>>> what are the desired semantics for these?
>>>
>>> I think the simplest were that --except trumps everything and means
>>> "whatever else I say, do as if I did not mention the following".
>>
>> Actually, my patch is almost there, I attach the necessary changed
>> below to make everything work. I've added debug prints to show what
>> it's actually doing:
>>
>>>> (1) --branches --except maint
>>>
>>> => master next
>>
>> => master next
>>
>>>> (2) --all --not --branches --except maint
>>>
>>> => X Y --not master next
>>
>> => ^master ^next X Y HEAD
>>
>>>> (3) ^master next --except maint
>>>
>>> => ^master next
>>
>> => ^master next
>>
>>> (4) Y next --except master next --not --branches
>>>
>>> this => Y --not maint
>>> or this => Y --not maint master next
>>
>> => Y
>>
>> Remember that maint (or rather ^maint) is after --except.
>
> Sure, but why is it not in the result? maint is not even mentioned under
> --except. Confused...
It is mentioned under --except, by --branches.
> Ah, are you treating the union of master, next, and --branches as --except
> and ignore --not?
These are the same:
Y next --except master next --not --branches
Y next --except master next --not master next maint
If you add more positive branches:
They get removed anyway by --except:
Y next master maint --except master next --not master next maint
Y master maint --except master --not master maint
Y maint --except --not maint
Y
--
Felipe Contreras
next prev parent reply other threads:[~2013-09-02 6:48 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-30 5:00 [PATCH] revision: add --except option Felipe Contreras
2013-08-30 5:40 ` Felipe Contreras
2013-08-30 6:32 ` Junio C Hamano
2013-08-30 7:17 ` Felipe Contreras
[not found] ` <CAPc5daVSqoE74kmsobg7RpMtiL3vzKN+ckAcWEKU_Q_wF8HYuA@mail.gmail.com>
2013-08-30 7:32 ` Felipe Contreras
2013-08-30 9:08 ` Johannes Sixt
2013-08-30 16:48 ` Junio C Hamano
2013-08-30 18:37 ` Felipe Contreras
2013-08-30 23:55 ` [PATCH] revision: introduce --exclude=<glob> to tame wildcards Junio C Hamano
2013-08-31 0:22 ` Duy Nguyen
2013-08-31 0:29 ` Junio C Hamano
2013-08-31 19:33 ` Felipe Contreras
2013-09-03 15:45 ` Junio C Hamano
2013-09-03 22:03 ` Felipe Contreras
2013-09-02 20:11 ` Johannes Sixt
2013-09-02 23:09 ` Felipe Contreras
2013-09-03 4:05 ` Michael Haggerty
2013-09-03 16:03 ` Junio C Hamano
2013-09-03 20:02 ` Johannes Sixt
2013-11-01 19:34 ` [PATCH 0/5] ref glob exclusion follow-up Junio C Hamano
2013-11-01 19:34 ` [PATCH 3/5] rev-list --exclude: tests Junio C Hamano
2013-11-01 19:34 ` [PATCH 4/5] rev-list --exclude: export add/clear-ref-exclusion and ref-excluded API Junio C Hamano
2013-11-01 19:34 ` [PATCH 5/5] rev-parse: introduce --exclude=<glob> to tame wildcards Junio C Hamano
2013-11-01 19:43 ` Eric Sunshine
2013-11-01 20:01 ` Junio C Hamano
2013-11-01 21:08 ` [PATCH 0/5] ref glob exclusion follow-up Johannes Sixt
2013-08-30 7:56 ` [PATCH] revision: add --except option Johannes Sixt
2013-08-31 19:27 ` Felipe Contreras
2013-09-02 6:25 ` Johannes Sixt
2013-09-02 6:48 ` Felipe Contreras [this message]
2013-08-30 7:11 ` Johannes Sixt
2013-08-30 7:24 ` Felipe Contreras
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=CAMP44s3eUmA9pVfZFbXHNvDiYwp9jttSTb6DBr8JrgTfhfD+_Q@mail.gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
--cc=l.s.r@web.de \
/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).