From: Thomas Rast <hidden> Date: 2016-06-15 22:47:29
Attempt ref completion once we have seen a regular expression, to help
the user with entering the <treeish> arguments.
Signed-off-by: Thomas Rast <redacted>
---
The use-case for this is actually a bit protracted but came up on IRC
yesterday: pasky asked if there was a simple way to grep through a
certain file in all refs.
Turns out git-grep already has half the required support: when given a
series of refs, it prefixes the matches with the ref, so the output is
already in a useful format.
Sadly it does not appear to support --all, --branches or similar
(which would be material for a separate patch). But bash completion
can step in here: with M-*, it can expand all possible completions for
the current word onto the command line.
This is still RFC because, as you can see in the code below, I tried
to avoid completing at all while the user still needs to supply a
regex. Sadly, bash turns the COMPREPLY=() into filename completion
anyway. Is there a way to prevent this? Otherwise the regex
complication should probably just go away and we can complete refs
always.
contrib/completion/git-completion.bash | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
From: Shawn O. Pearce <hidden> Date: 2016-06-15 22:47:29
Thomas Rast [off-list ref] wrote:
This is still RFC because, as you can see in the code below, I tried
to avoid completing at all while the user still needs to supply a
regex. Sadly, bash turns the COMPREPLY=() into filename completion
anyway. Is there a way to prevent this?
Not that I know of. You can turn off default filename completion
when you register the completion function, but that then breaks
like every other git command for completion support because a lot
of them do want to complete filenames.
+ local i c=1 have_regex=""
+ while [ $c -lt $COMP_CWORD ]; do
+ i="${COMP_WORDS[c]}"
+ case "$i" in
+ -e) ;;
+ -e*) have_regex="$c" ; break ;;
+ -*) ;;
+ *) have_regex="$c"; break ;;
+ esac
+ c=$((++c))
+ done
What happens with `git grep -e a -e b`? Do we trigger into ref
completion too early when we should still be doing the regex
completion?
--
Shawn.
From: Thomas Rast <hidden> Date: 2016-06-15 22:47:29
Shawn O. Pearce wrote:
Thomas Rast [off-list ref] wrote:
quoted
+ local i c=1 have_regex=""
+ while [ $c -lt $COMP_CWORD ]; do
+ i="${COMP_WORDS[c]}"
+ case "$i" in
+ -e) ;;
+ -e*) have_regex="$c" ; break ;;
+ -*) ;;
+ *) have_regex="$c"; break ;;
+ esac
+ c=$((++c))
+ done
What happens with `git grep -e a -e b`? Do we trigger into ref
completion too early when we should still be doing the regex
completion?
Hmm, true, I would also have to check for the last argument (before
completion) being -e.
However, that is kind of moot because we currently complete filenames
anyway, and you said I can't stop that:
quoted
This is still RFC because, as you can see in the code below, I tried
to avoid completing at all while the user still needs to supply a
regex. Sadly, bash turns the COMPREPLY=() into filename completion
anyway. Is there a way to prevent this?
Not that I know of. You can turn off default filename completion
when you register the completion function, but that then breaks
like every other git command for completion support because a lot
of them do want to complete filenames.
So I'll roll a simpler patch that just always (before --) completes
refs instead, if that's ok.
--
Thomas Rast
trast@{inf,student}.ethz.ch
From: Thomas Rast <hidden> Date: 2016-06-15 22:47:30
Before the --, always attempt ref completion. This helps with
entering the <treeish> arguments to git-grep. As a bonus, you can
work around git-grep's current lack of --all by hitting M-*, ugly as
the resulting command line may be.
Strictly speaking, completing the regular expression argument (or
option argument) makes no sense. However, we cannot prevent _all_
completion (it will fall back to filenames), so we dispense with any
additional complication to detect whether the user still has to enter
a regular expression.
Signed-off-by: Thomas Rast <redacted>
---
Sorry for taking so long; I was swamped all weekend by, well, the
weekend. ;-)
I wrote:
Shawn O. Pearce wrote:
quoted
quoted
This is still RFC because, as you can see in the code below, I tried
to avoid completing at all while the user still needs to supply a
regex. Sadly, bash turns the COMPREPLY=() into filename completion
anyway. Is there a way to prevent this?
Not that I know of. You can turn off default filename completion
when you register the completion function, but that then breaks
like every other git command for completion support because a lot
of them do want to complete filenames.
So I'll roll a simpler patch that just always (before --) completes
refs instead, if that's ok.
So that's what this patch does.
contrib/completion/git-completion.bash | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
--
Shawn.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html