From: Andreas Ericsson <ae@op5•se>
To: "Shawn O. Pearce" <spearce@spearce•org>
Cc: Linus Torvalds <torvalds@linux-foundation•org>,
Junio C Hamano <gitster@pobox•com>, Petr Baudis <pasky@suse•cz>,
git@vger•kernel.org
Subject: Re: [PATCH] bash completion: Fix the . -> .. revision range completion
Date: Tue, 15 Jul 2008 10:05:01 +0200 [thread overview]
Message-ID: <487C5A2D.3000707@op5.se> (raw)
In-Reply-To: <20080715042553.GD2432@spearce.org>
Shawn O. Pearce wrote:
> Linus Torvalds <torvalds@linux-foundation•org> wrote:
>> On Mon, 14 Jul 2008, Shawn O. Pearce wrote:
>>> What is $COMP_WORDBREAKS set to in your shell? In mine it
>>> appears to be:
>>>
>>> " \"'@><=;|&(:"
>> Ahhah. Indeed. I don't have the ':'.
> ...
>> Umm, if so, git should just set it in the completion script, no?
>
> OK, so it turns out not having : in COMP_WORDBREAKS is a very common
> case that we should somehow deal with, to aid our users.
>
> I'm concerned about just setting COMP_WORDBREAKS back to the default
> in the git completion script because then we get into an ordering
> game with the profile scripts, don't we? If git completion sources
> before the gvfs script we don't get our COMP_WORDBREAKS setting.
>
> I think we may need to do two things.
>
> If COMP_WORDBREAKS doesn't contain a :, try to reset it to include
> one when the script is sourced. This may "fix" git completion but
> make gvfs completion act differently, resulting in a thread on the
> gvfs lists. ;-)
>
> If COMP_WORDBREAKS doesn't contain : during a completion event than
> we need to do what your original patch asked, which is to include
> "$ref:" in the prefix, so the ref isn't lost.
>
> At least we understand the problem now, finally. I'll try to write
> up a patch for it tomorrow. Unfortunately packing to move has been
> really sucking up my time lately.
>
I beat you to it ;-) This works just fine for me regardless of whether
or not I have a colon in COMP_WORDBREAKS.
--%<--%<--%<--
From: Andreas Ericsson <ae@op5•se>
Subject: git-completion.bash: Handle "rev:path" completion properly
The gvfs package on at least Fedora9 installs its own bash
completion script which removes the colon from COMP_WORDBREAKS,
which acts as a list of characters where bash should consider
as word boundaries. Doing so breaks the git bash completion
script when handling any rev:path style argument.
This patch fixes it by prepending the "rev" part and the colon
(which otherwise gets lost) before adding the "path" part if
COMP_WORDBREAKS doesn't contain the colon we would otherwise
need.
Also fixes a nearby indented-with-spaces issue.
Spotted-by: Linus Torvalds <torvalds@linux-foundation•org>
Investigated-by: Björn Steinbrink <b.steinbrink@gmx•de>
Signed-off-by: Andreas Ericsson <ae@op5•se>
---
contrib/completion/git-completion.bash | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index d268e6f..e138022 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -293,7 +293,11 @@ __git_complete_file ()
*)
ls="$ref"
;;
- esac
+ esac
+ # When completing something like 'rev:path', bash behaves
+ # differently whether or not COMP_WORDBREAKS contains a
+ # colon or not. This lets it handle both cases
+ test "${COMP_WORDBREAKS//:}" = "$COMP_WORDBREAKS" && pfx="$ref:$pfx"
COMPREPLY=($(compgen -P "$pfx" \
-W "$(git --git-dir="$(__gitdir)" ls-tree "$ls" \
| sed '/^100... blob /s,^.* ,,
--
1.5.6.3.315.g10ce0
--
Andreas Ericsson andreas.ericsson@op5•se
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
next prev parent reply other threads:[~2008-07-15 8:07 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-13 11:19 [PATCH] bash completion: Fix the . -> .. revision range completion Petr Baudis
2008-07-13 12:11 ` Jakub Narebski
2008-07-13 21:38 ` Junio C Hamano
2008-07-13 22:06 ` Shawn O. Pearce
2008-07-13 23:07 ` Petr Baudis
2008-07-13 23:25 ` Junio C Hamano
2008-07-13 23:52 ` Linus Torvalds
2008-07-14 0:00 ` Shawn O. Pearce
2008-07-14 5:38 ` Linus Torvalds
2008-07-14 5:57 ` Shawn O. Pearce
2008-07-14 6:27 ` Shawn O. Pearce
2008-07-14 6:47 ` Björn Steinbrink
2008-07-14 6:50 ` Björn Steinbrink
2008-07-14 12:39 ` Andreas Ericsson
2008-07-14 14:51 ` Linus Torvalds
2008-07-14 14:50 ` Linus Torvalds
2008-07-15 4:25 ` Shawn O. Pearce
2008-07-15 8:05 ` Andreas Ericsson [this message]
2008-07-15 8:10 ` Andreas Ericsson
2008-07-15 8:17 ` Andreas Ericsson
2008-07-15 23:38 ` Shawn O. Pearce
2008-07-16 7:20 ` Andreas Ericsson
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=487C5A2D.3000707@op5.se \
--to=ae@op5$(echo .)se \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=pasky@suse$(echo .)cz \
--cc=spearce@spearce$(echo .)org \
--cc=torvalds@linux-foundation$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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