Re: [PATCH] revision: introduce --exclude=<glob> to tame wildcards

From

Felipe Contreras <felipe.contreras@gmail.com>

Date

Sep 2, 2013, 23:09 UTC

Message-ID

<CAMP44s2+cG2kb=o9OTT=8=2pm+xCwZEJE5dNkmyKx6P=03sX-Q@mail.gmail.com>

In-Reply-To

<5224F0EE.1080205@kdbg.org>

On Mon, Sep 2, 2013 at 3:11 PM, Johannes Sixt <j6t@kdbg.org> wrote:

> Am 31.08.2013 01:55, schrieb Junio C Hamano:
>> People often find "git log --branches" etc. that includes _all_
>> branches is cumbersome to use when they want to grab most but except
>> some.  The same applies to --tags, --all and --glob.
>>
>> Teach the revision machinery to remember patterns, and then upon the
>> next such a globbing option, exclude those that match the pattern.
>>
>> With this, I can view only my integration branches (e.g. maint,
>> master, etc.) without topic branches, which are named after two
>> letters from primary authors' names, slash and topic name.
>>
>>     git rev-list --no-walk --exclude=??/* --branches |
>>     git name-rev --refs refs/heads/* --stdin
>>
>> This one shows things reachable from local and remote branches that
>> have not been merged to the integration branches.
>>
>>     git log --remotes --branches --not --exclude=??/* --branches
>>
>> It may be a bit rough around the edges, in that the pattern to give
>> the exclude option depends on what globbing option follows.  In
>> these examples, the pattern "??/*" is used, not "refs/heads/??/*",
>> because the globbing option that follows the -"-exclude=<pattern>"
>> is "--branches".  As each use of globbing option resets previously
>> set "--exclude", this may not be such a bad thing, though.
>
> I argued "--except should trump everything" earlier, but the case
> involving --not
>
>   --branches --except maint --not master
>
> to mean the same as
>
>   --branches --except maint master
>
> just does not make sense.

No, but this could make sense:

> An alternative would be that --not would divide the command line
> arguments into ranges within which one --except would subtract
> subsequent refs from earlier globbing arguments in the same range.
> That's not simpler to explain than your current proposal.

Something like that can be easily done in my approach:

--- a/revision.c
+++ b/revision.c
@@ -1984,6 +1984,7 @@ static int handle_revision_pseudo_opt(const char
*submodule,
                handle_reflog(revs, *flags);
        } else if (!strcmp(arg, "--not")) {
                *flags ^= UNINTERESTING | BOTTOM;
+               *flags &= ~SKIP;
        } else if (!strcmp(arg, "--except")) {
                *flags |= SKIP;
        } else if (!strcmp(arg, "--no-walk")) {
@@ -2628,7 +2629,8 @@ int prepare_revision_walk(struct rev_info *revs)
                for (i = 0; i < revs->cmdline.nr; i++) {
                        struct rev_cmdline_entry *ce;
                        ce = &revs->cmdline.rev[i];
-                       if ((ce->flags & SKIP) && !refcmp(ce->name, e->name)) {
+                       if ((ce->flags & SKIP) && !refcmp(ce->name, e->name) &&
+                                       ((ce->flags & UNINTERESTING)
== (e->item->flags & UNINTERESTING))) {
                                e->item->flags =
recalculate_flag(revs, e->item->sha1, ce->name);
                                goto next;
                        }
diff --git a/t/t6112-rev-list-except.sh b/t/t6112-rev-list-except.sh
index a40a641..441e1da 100755
--- a/t/t6112-rev-list-except.sh
+++ b/t/t6112-rev-list-except.sh
@@ -57,4 +57,21 @@ test_expect_success 'rev-list --except and --not
with proper flags' '
        test_cmp expect actual
 '

+test_expect_success 'rev-list --not ranges' '
+
+       git rev-list --topo-order test --not master --except master
test > actual &&
+       git rev-list --topo-order test > expect &&
+       test_cmp expect actual
+'
+
+test_expect_success 'rev-list multiple --not ranges' '
+
+       git checkout -b extra test &&
+       echo five > content &&
+       git commit -a -m five &&
+       git rev-list --topo-order test --not master --except master
test --not extra > actual &&
+       git rev-list --topo-order test extra > expect &&
+       test_cmp expect actual
+'
+

-- 
Felipe Contreras