From: Thomas Rast <trast@student.ethz.ch>
To: <git@vger.kernel.org>
Cc: "Shawn O. Pearce" <spearce@spearce.org>
Subject: [RFC PATCH] bash completion: complete refs for git-grep
Date: Tue, 6 Oct 2009 12:08:12 +0200 [thread overview]
Message-ID: <14ac499280c9b17f862ab13201b48c64b4827713.1254823328.git.trast@student.ethz.ch> (raw)
Attempt ref completion once we have seen a regular expression, to help
the user with entering the <treeish> arguments.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---
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(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 6fd7e1d..c8cced6 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1048,6 +1048,24 @@ _git_grep ()
return
;;
esac
+
+ 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
+
+ if [ -n "$have_regex" ]; then
+ __gitcomp "$(__git_refs)"
+ return
+ fi
+
COMPREPLY=()
}
--
1.6.5.rc2.251.g34f85
next reply other threads:[~2009-10-06 10:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-06 10:08 Thomas Rast [this message]
2009-10-06 15:45 ` [RFC PATCH] bash completion: complete refs for git-grep Shawn O. Pearce
2009-10-07 15:27 ` Thomas Rast
2009-10-12 9:00 ` [PATCH] " Thomas Rast
2009-10-12 14:27 ` Shawn O. Pearce
2009-10-12 23:42 ` Junio C Hamano
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=14ac499280c9b17f862ab13201b48c64b4827713.1254823328.git.trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.org \
/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).