git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Michael Haggerty <mhagger@alum.mit.edu>
Date
Sep 3, 2013, 04:05 UTC
Message-ID
<52256014.70203@alum.mit.edu>
In-Reply-To
<5224F0EE.1080205@kdbg.org>
On 09/02/2013 10:11 PM, Johannes Sixt wrote:
Show 74 quoted lines
> 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.
> 
> 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.
> 
> So I like the relative simplicity of this approach. Here is a bit of
> documentation.
> 
> --- 8< ---
> Subject: [PATCH] document --exclude option
> 
> Signed-off-by: Johannes Sixt <j6t@kdbg.org>
> ---
>  Documentation/rev-list-options.txt | 15 +++++++++++++++
>  1 file changed, 15 insertions(+)
> 
> diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
> index 5bdfb42..650c252 100644
> --- a/Documentation/rev-list-options.txt
> +++ b/Documentation/rev-list-options.txt
> @@ -174,6 +174,21 @@ parents) and `--max-parents=-1` (negative numbers denote no upper limit).
>  	is automatically prepended if missing. If pattern lacks '?', '{asterisk}',
>  	or '[', '/{asterisk}' at the end is implied.
>  
> +--exclude=<glob-pattern>::
> +
> +	Do not include refs matching '<glob-pattern>' that the next `--all`,
> +	`--branches`, `--tags`, `--remotes`, or `--glob` would otherwise
> +	consider. Repetitions of this option accumulate exclusion patterns
> +	up to the next `--all`, `--branches`, `--tags`, `--remotes`, or
> +	`--glob` option (other options or arguments do not clear
> +	accumlated patterns).
> ++
> +The patterns given should not begin with `refs/heads`, `refs/tags`, or
> +`refs/remotes` when applied to `--branches`, `--tags`, or `--remotes`,
> +restrictively, and they must begin with `refs/` when applied to `--glob`
s/restrictively/respectively/
Show 7 quoted lines
> +or `--all`. If a trailing '/{asterisk}' is intended, it must be given
> +explicitly.
> +
>  --ignore-missing::
>  
>  	Upon seeing an invalid object name in the input, pretend as if
> 

It seems to me that this is growing into a language for expressing boolean expressions without allowing terms to be combined in the full generality that, say, a real programming language would allow. Maybe instead of trying to decide on the "perfect" grouping and precedence rules, it would be clearer to allow the user to specify them. I almost hate to suggest it, but have you considered making the expression "syntax" a little bit more flexible by allowing parentheses, à la find(1), or something analogous?:

'(' --tags --except='v[0-9]*' ')' -o '(' --branches --except='mh/*' ')'
Michael
-- 
Michael Haggerty
mhagger@alum.mit.edu
http://softwareswirl.blogspot.com/
Previous: Felipe ContrerasNext: Junio C Hamano
Message 23 of 32 in “revision: add --except option”
  1. revision: add --except optionFelipe Contreras, Aug 30, 2013
  2. Felipe ContrerasAug 30, 2013
  3. Junio C HamanoAug 30, 2013
  4. Felipe ContrerasAug 30, 2013
  5. Johannes SixtAug 30, 2013
  6. Felipe ContrerasAug 31, 2013
  7. Johannes SixtSep 2, 2013
  8. Felipe ContrerasSep 2, 2013
  9. Johannes SixtAug 30, 2013
  10. Felipe ContrerasAug 30, 2013
  11. Felipe ContrerasAug 30, 2013
  12. Johannes SixtAug 30, 2013
  13. Junio C HamanoAug 30, 2013
  14. Felipe ContrerasAug 30, 2013
  15. revision: introduce --exclude=<glob> to tame wildcardsJunio C Hamano, Aug 30, 2013
  16. Duy NguyenAug 31, 2013
  17. Junio C HamanoAug 31, 2013
  18. Felipe ContrerasAug 31, 2013
  19. Junio C HamanoSep 3, 2013
  20. Felipe ContrerasSep 3, 2013
  21. Johannes SixtSep 2, 2013
  22. Felipe ContrerasSep 2, 2013
  23. Michael HaggertySep 3, 2013
  24. Junio C HamanoSep 3, 2013
  25. Johannes SixtSep 3, 2013
  26. 0/5 ref glob exclusion follow-upJunio C Hamano, Nov 1, 2013
  27. 3/5 rev-list --exclude: testsJunio C Hamano, Nov 1, 2013
  28. 4/5 rev-list --exclude: export add/clear-ref-exclusion and ref-excluded APIJunio C Hamano, Nov 1, 2013
  29. 5/5 rev-parse: introduce --exclude=<glob> to tame wildcardsJunio C Hamano, Nov 1, 2013
  30. Eric SunshineNov 1, 2013
  31. Junio C HamanoNov 1, 2013
  32. Johannes SixtNov 1, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.